From 9d5173411f95374dbd65605d5efe10fc3e561f14 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 18 Aug 2021 17:10:52 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=E8=81=94=E5=8A=A8=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=9C=AA=E5=8C=B9=E9=85=8D=E7=9A=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=97=B6=EF=BC=8C=E7=BB=99=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/LinkageField.vue | 101 ++++++++++-------- .../components/canvas/components/Toolbar.vue | 32 ++++++ frontend/src/lang/en.js | 3 +- frontend/src/lang/tw.js | 3 +- frontend/src/lang/zh.js | 3 +- 5 files changed, 92 insertions(+), 50 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/LinkageField.vue b/frontend/src/components/canvas/components/Editor/LinkageField.vue index d4f50e9421..94c7783bef 100644 --- a/frontend/src/components/canvas/components/Editor/LinkageField.vue +++ b/frontend/src/components/canvas/components/Editor/LinkageField.vue @@ -3,6 +3,7 @@ @@ -13,52 +14,55 @@ - - -
- - - - - - - - - {{ item.name }} - - -
- - -
- - - - - - - - - {{ item.name }} - - -
- - -
- -
- + + + + +
+ + + + + + + + + {{ item.name }} + + +
+ + +
+ + + + + + + + + {{ item.name }} + + +
+ + +
+ +
+ + @@ -67,7 +71,6 @@ - @@ -183,5 +186,9 @@ export default { height: 35px; border-radius: 3px; } + >>>.el-popover{ + height: 200px; + overflow: auto; + } diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue index 53b2e6bc5a..10cea07695 100644 --- a/frontend/src/components/canvas/components/Toolbar.vue +++ b/frontend/src/components/canvas/components/Toolbar.vue @@ -320,6 +320,38 @@ export default { this.close() }, saveLinkage() { + // 字段检查 + // let checkCount = 0 + for (const key in this.targetLinkageInfo) { + let subCheckCount = 0 + const linkageInfo = this.targetLinkageInfo[key] + const linkageFields = linkageInfo['linkageFields'] + if (linkageFields) { + linkageFields.forEach(function(linkage) { + if (!(linkage.sourceField && linkage.targetField)) { + subCheckCount++ + } + }) + } + + if (subCheckCount > 0) { + this.$message({ + message: this.$t('chart.datalist') + '【' + linkageInfo.targetViewName + '】' + this.$t('panel.exit_un_march_linkage_field'), + type: 'error', + showClose: true + }) + return + } + } + // if (checkCount > 0) { + // this.$message({ + // message: this.$t('panel.exit_un_march_linkage_field'), + // type: 'error', + // showClose: true + // }) + // return + // } + const request = { panelId: this.$store.state.panel.panelInfo.id, sourceViewId: this.curLinkageView.propValue.viewId, diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index a675e04981..6f91236f08 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1212,7 +1212,8 @@ export default { drill: 'drill', linkage: 'linkage', cancel_linkage: 'Cancel Linkage', - remove_all_linkage: 'Remove All Linkage' + remove_all_linkage: 'Remove All Linkage', + exit_un_march_linkage_field: 'Exit Un March Linkage Field' }, plugin: { local_install: 'Local installation', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 7acc6d82fe..01a01aed73 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1211,7 +1211,8 @@ export default { drill: '下钻', linkage: '联动', cancel_linkage: '取消联动', - remove_all_linkage: '清除所有联动' + remove_all_linkage: '清除所有联动', + exit_un_march_linkage_field: '存在未匹配联动关系的字段' }, plugin: { local_install: '本地安裝', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 9f129a8aa8..61f9b5c159 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1213,7 +1213,8 @@ export default { drill: '下钻', linkage: '联动', cancel_linkage: '取消联动', - remove_all_linkage: '清除所有联动' + remove_all_linkage: '清除所有联动', + exit_un_march_linkage_field: '存在未匹配联动关系的字段' }, plugin: { local_install: '本地安装',