fix: 修复匿名化处理问题
Showing
2 changed files
with
38 additions
and
7 deletions
| ... | @@ -437,7 +437,13 @@ const parseFileData = (fileRaw) => { | ... | @@ -437,7 +437,13 @@ const parseFileData = (fileRaw) => { |
| 437 | sampleTableFields.value = []; | 437 | sampleTableFields.value = []; |
| 438 | sampleTableData.value = []; | 438 | sampleTableData.value = []; |
| 439 | } else { | 439 | } else { |
| 440 | const res = await chTransformEn(json[0]); | 440 | try { |
| 441 | const res: any = await chTransformEn(json[0]); | ||
| 442 | if (res?.code != proxy.$passCode) { | ||
| 443 | sampleTableDataLoading.value = false; | ||
| 444 | proxy.$ElMessage.error(res.msg); | ||
| 445 | return; | ||
| 446 | } | ||
| 441 | let fields = res.data || []; | 447 | let fields = res.data || []; |
| 442 | sampleTableFields.value = fields?.map((j, index) => { | 448 | sampleTableFields.value = fields?.map((j, index) => { |
| 443 | return { | 449 | return { |
| ... | @@ -469,8 +475,11 @@ const parseFileData = (fileRaw) => { | ... | @@ -469,8 +475,11 @@ const parseFileData = (fileRaw) => { |
| 469 | }); | 475 | }); |
| 470 | }) | 476 | }) |
| 471 | transferSampleData(); | 477 | transferSampleData(); |
| 472 | } | ||
| 473 | sampleTableDataLoading.value = false; | 478 | sampleTableDataLoading.value = false; |
| 479 | } catch (error) { | ||
| 480 | sampleTableDataLoading.value = false; | ||
| 481 | } | ||
| 482 | } | ||
| 474 | }); | 483 | }); |
| 475 | } | 484 | } |
| 476 | 485 | ||
| ... | @@ -745,6 +754,7 @@ onBeforeMount(() => { | ... | @@ -745,6 +754,7 @@ onBeforeMount(() => { |
| 745 | dataSelectInfoItems.value[4].visible = dataSource == 1; | 754 | dataSelectInfoItems.value[4].visible = dataSource == 1; |
| 746 | dataSelectInfoItems.value[5].visible = dataSource == 1; | 755 | dataSelectInfoItems.value[5].visible = dataSource == 1; |
| 747 | dataSelectInfoItems.value[6].visible = dataSource == 2; | 756 | dataSelectInfoItems.value[6].visible = dataSource == 2; |
| 757 | try { | ||
| 748 | //文件解析 | 758 | //文件解析 |
| 749 | if (dataSource == 2) { | 759 | if (dataSource == 2) { |
| 750 | let url = detailInfo.value.filePath?.url; | 760 | let url = detailInfo.value.filePath?.url; |
| ... | @@ -755,14 +765,13 @@ onBeforeMount(() => { | ... | @@ -755,14 +765,13 @@ onBeforeMount(() => { |
| 755 | refSignInfo?.msg && ElMessage.error(refSignInfo?.msg); | 765 | refSignInfo?.msg && ElMessage.error(refSignInfo?.msg); |
| 756 | return; | 766 | return; |
| 757 | } | 767 | } |
| 758 | obsDownloadRequest(refSignInfo?.data).then((res: any) => { | 768 | const fileRes: any = await obsDownloadRequest(refSignInfo?.data); |
| 759 | sampleTableDataLoading.value = false; | 769 | sampleTableDataLoading.value = false; |
| 760 | if (res && !res.msg) { | 770 | if (fileRes && !fileRes.msg) { |
| 761 | parseFileData(res); | 771 | parseFileData(fileRes); |
| 762 | } else { | 772 | } else { |
| 763 | res?.msg && ElMessage.error(res?.msg); | 773 | fileRes?.msg && ElMessage.error(fileRes?.msg); |
| 764 | } | 774 | } |
| 765 | }) | ||
| 766 | // 会出现从文件切换到数据库时没有数据库列表的问题。 | 775 | // 会出现从文件切换到数据库时没有数据库列表的问题。 |
| 767 | const res: any = await getDatabase({ connectStatus: 1 }); | 776 | const res: any = await getDatabase({ connectStatus: 1 }); |
| 768 | if (res?.code == proxy.$passCode) { | 777 | if (res?.code == proxy.$passCode) { |
| ... | @@ -821,6 +830,9 @@ onBeforeMount(() => { | ... | @@ -821,6 +830,9 @@ onBeforeMount(() => { |
| 821 | }); | 830 | }); |
| 822 | } | 831 | } |
| 823 | fullscreenLoading.value = false; | 832 | fullscreenLoading.value = false; |
| 833 | } catch (error) { | ||
| 834 | fullscreenLoading.value = false; | ||
| 835 | } | ||
| 824 | } else { | 836 | } else { |
| 825 | fullscreenLoading.value = false; | 837 | fullscreenLoading.value = false; |
| 826 | proxy.$ElMessage.error(res.msg); | 838 | proxy.$ElMessage.error(res.msg); | ... | ... |
| ... | @@ -139,6 +139,8 @@ const ruleModelTableInfo = ref({ | ... | @@ -139,6 +139,8 @@ const ruleModelTableInfo = ref({ |
| 139 | return rd; | 139 | return rd; |
| 140 | }) || []; | 140 | }) || []; |
| 141 | } | 141 | } |
| 142 | fieldRulesEndFormInfo.value.formInfo.items[0].default = ''; | ||
| 143 | fieldRulesEndFormInfo.value.formInfo.items[1].default = ''; | ||
| 142 | if (!row.desensitiveRuleCode) { | 144 | if (!row.desensitiveRuleCode) { |
| 143 | drawerInfo.value.container.contents = [fieldRulesFormInfo.value]; | 145 | drawerInfo.value.container.contents = [fieldRulesFormInfo.value]; |
| 144 | } else { | 146 | } else { |
| ... | @@ -450,6 +452,8 @@ const addRowRules = () => { | ... | @@ -450,6 +452,8 @@ const addRowRules = () => { |
| 450 | fieldChName: '', | 452 | fieldChName: '', |
| 451 | upperOperator: '≤' | 453 | upperOperator: '≤' |
| 452 | }]; | 454 | }]; |
| 455 | fieldRulesEndFormInfo.value.formInfo.items[0].default = ''; | ||
| 456 | fieldRulesEndFormInfo.value.formInfo.items[1].default = ''; | ||
| 453 | drawerInfo.value.container.contents = [fieldRulesFormInfo.value, fieldRulesEndFormInfo.value]; | 457 | drawerInfo.value.container.contents = [fieldRulesFormInfo.value, fieldRulesEndFormInfo.value]; |
| 454 | } | 458 | } |
| 455 | 459 | ||
| ... | @@ -475,6 +479,7 @@ const drawerBtnClick = async (btn, info) => { | ... | @@ -475,6 +479,7 @@ const drawerBtnClick = async (btn, info) => { |
| 475 | let desensitiveRuleDetailInfo = getDesensitiveRuleDetailInfo(info); | 479 | let desensitiveRuleDetailInfo = getDesensitiveRuleDetailInfo(info); |
| 476 | // 脱敏规则为掩盖,字符,区间替换存在时需要调用接口检验 | 480 | // 脱敏规则为掩盖,字符,区间替换存在时需要调用接口检验 |
| 477 | if (info.desensitiveRuleCode == 'DISSEMBLE' || info.desensitiveRuleCode == 'CHARREPLACE' || info.desensitiveRuleCode == 'RANGEREPLACE') { | 481 | if (info.desensitiveRuleCode == 'DISSEMBLE' || info.desensitiveRuleCode == 'CHARREPLACE' || info.desensitiveRuleCode == 'RANGEREPLACE') { |
| 482 | try { | ||
| 478 | let res: any = await validateAnonRule({ | 483 | let res: any = await validateAnonRule({ |
| 479 | desensitiveRuleCode: info.desensitiveRuleCode, | 484 | desensitiveRuleCode: info.desensitiveRuleCode, |
| 480 | value: '', | 485 | value: '', |
| ... | @@ -482,6 +487,11 @@ const drawerBtnClick = async (btn, info) => { | ... | @@ -482,6 +487,11 @@ const drawerBtnClick = async (btn, info) => { |
| 482 | }) | 487 | }) |
| 483 | if (res?.code != proxy.$passCode) { | 488 | if (res?.code != proxy.$passCode) { |
| 484 | proxy.$ElMessage.error(res.msg); | 489 | proxy.$ElMessage.error(res.msg); |
| 490 | drawerInfo.value.footer.btns[1].loading = false; | ||
| 491 | return; | ||
| 492 | } | ||
| 493 | } catch (error) { | ||
| 494 | drawerInfo.value.footer.btns[1].loading = false; | ||
| 485 | } | 495 | } |
| 486 | } | 496 | } |
| 487 | drawerInfo.value.footer.btns[1].loading = false; | 497 | drawerInfo.value.footer.btns[1].loading = false; |
| ... | @@ -553,6 +563,15 @@ const drawerSelectChange = (val, row, info) => { | ... | @@ -553,6 +563,15 @@ const drawerSelectChange = (val, row, info) => { |
| 553 | } | 563 | } |
| 554 | } | 564 | } |
| 555 | }); | 565 | }); |
| 566 | if (val == 'RANGEREPLACE') { | ||
| 567 | let fieldName = info.fieldName; | ||
| 568 | let fieldChName = fieldName && props.fieldNameList.find(f => f.enName == fieldName)?.chName; | ||
| 569 | rangeReplaceRuleDetails.value.forEach(r => { | ||
| 570 | if (fieldChName && r.fieldChName != fieldChName) { | ||
| 571 | r.fieldChName = fieldChName; | ||
| 572 | } | ||
| 573 | }); | ||
| 574 | } | ||
| 556 | if (!val) { | 575 | if (!val) { |
| 557 | drawerInfo.value.container.contents = [fieldRulesFormInfo.value]; | 576 | drawerInfo.value.container.contents = [fieldRulesFormInfo.value]; |
| 558 | } else { | 577 | } else { | ... | ... |
-
Please register or sign in to post a comment