From 3f086add3a2f5fd120435ebaa6e9dc8716b472f7 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Mon, 24 Oct 2022 14:20:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20eslint=E6=8A=A5=E9=94=99=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=82=E8=80=83=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 2 +- frontend/src/lang/tw.js | 2 +- frontend/src/lang/zh.js | 2 +- frontend/src/views/dataset/add/AddSQL.vue | 4 ++-- .../src/views/panel/GrantAuth/shareTree.vue | 8 ++++---- .../src/views/panel/filter/filterDialog.vue | 20 +++++++++---------- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index d25f4ebb49..7fedee80c1 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1437,7 +1437,7 @@ export default { field_rename: 'Rename Field', params_work: 'Effective only when editing SQL', sql_variable_limit_1: '1、SQL variables can only be used in where conditions', - sql_variable_limit_2: "2、Example：select * from table_name where column_name1='${parm_name1}' and column_name2 in '${parm_name2}'", + sql_variable_limit_2: "2、Example：select * from table_name where column_name1='${param_name1}' and column_name2 in '${param_name2}'", select_year: 'Select Year', select_month: 'Select Month', select_date: 'Select Date', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 22b8d95158..f1830592ef 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1437,7 +1437,7 @@ export default { field_rename: '字段重命名', params_work: '僅在編輯 sql 時生效', sql_variable_limit_1: '1、SQL變數只能在WHERE條件中使用', - sql_variable_limit_2: "2、示例：select * from table_name where column_name1='${parm_name1}' and column_name2 in '${parm_name2}'", + sql_variable_limit_2: "2、示例：select * from table_name where column_name1='${param_name1}' and column_name2 in '${param_name2}'", selesql_variable_limit_2ct_year: '選擇年', select_month: '選擇月', select_date: '選擇日期', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index cfc0ac3f27..997a236a22 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1437,7 +1437,7 @@ export default { params_work: '仅在编辑sql时生效', select_year: '选择年', sql_variable_limit_1: '1、SQL 变量只能在 WHERE 条件中使用', - sql_variable_limit_2: "2、示例：select * from table_name where column_name1='${parm_name1}' and column_name2 in '${parm_name2}'", + sql_variable_limit_2: "2、示例：select * from table_name where column_name1='${param_name1}' and column_name2 in '${param_name2}'", select_month: '选择月', select_date: '选择日期', select_time: '选择时间', diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue index e3cc00cdd6..4426915030 100644 --- a/frontend/src/views/dataset/add/AddSQL.vue +++ b/frontend/src/views/dataset/add/AddSQL.vue @@ -263,7 +263,7 @@ :title="dialogTitle" :visible.sync="showVariableMgm" custom-class="de-user-drawer sql-dataset-drawer" - size="840px" + size="870px" direction="rtl" >
@@ -868,7 +868,7 @@ export default { } .content { height: 62px; - width: 792px; + width: 822px; border-radius: 4px; background: #e1eaff; position: relative; diff --git a/frontend/src/views/panel/GrantAuth/shareTree.vue b/frontend/src/views/panel/GrantAuth/shareTree.vue index 98adbb9e72..88955c5479 100644 --- a/frontend/src/views/panel/GrantAuth/shareTree.vue +++ b/frontend/src/views/panel/GrantAuth/shareTree.vue @@ -8,7 +8,7 @@ > { - this.data = res.data + this.treeData = res.data if (this.msgPanelIds && this.msgPanelIds.length > 0) { this.expandMsgNode(this.msgPanelIds) } @@ -188,7 +188,7 @@ export default { }) }, getMsgNodes(panelIds) { - this.data.forEach(item => { + this.treeData.forEach(item => { if (item.children && item.children.length > 0) { item.children.forEach(node => { if (panelIds.includes(node.id)) { diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue index c9fe37ef69..bf6c0b64ef 100644 --- a/frontend/src/views/panel/filter/filterDialog.vue +++ b/frontend/src/views/panel/filter/filterDialog.vue @@ -53,7 +53,7 @@ v-if="showDomType === 'tree'" :default-expanded-keys="expandedArray" node-key="id" - :data="tempTreeData || data" + :data="tempTreeData || treeData" :props="defaultProps" @node-click="handleNodeClick" @@ -347,7 +347,7 @@ export default { link: false, type: 'root' }], - data: [], + treeData: [], sceneData: [], fieldData: [], originFieldData: [], @@ -472,7 +472,7 @@ export default { this.tData = JSON.parse(modelInfo) const results = this.buildTree(this.tData) this.defaultData = JSON.parse(JSON.stringify(results)) - this.data = JSON.parse(JSON.stringify(results)) + this.treeData = JSON.parse(JSON.stringify(results)) } queryAuthModel({ modelType: 'dataset' }, !userCache).then(res => { localStorage.setItem('dataset-tree', JSON.stringify(res.data)) @@ -480,7 +480,7 @@ export default { this.tData = res.data const results = this.buildTree(this.tData) this.defaultData = JSON.parse(JSON.stringify(results)) - this.data = JSON.parse(JSON.stringify(results)) + this.treeData = JSON.parse(JSON.stringify(results)) } }) }, @@ -513,7 +513,7 @@ export default { name: val } authModel(queryCondition).then(res => { - this.data = this.buildTree(res.data) + this.treeData = this.buildTree(res.data) }) }, buildTree(arrs) { @@ -602,7 +602,7 @@ export default { groupTree({}).then(res => { const data = res.data - this.data = data + this.treeData = data }) }, @@ -629,7 +629,7 @@ export default { this.dataSetBreads = this.dataSetBreads.slice(0, 1) const root = { id: null, - children: JSON.parse(JSON.stringify(this.data)) + children: JSON.parse(JSON.stringify(this.treeData)) } this.getPathById(node.id, root, res => { if (res.length > 1) { @@ -709,7 +709,7 @@ export default { this.keyWord = '' this.isTreeSearch = false if (bread.id) { - const node = this.getNode(bread.id, this.data) + const node = this.getNode(bread.id, this.treeData) if (node) { this.tempTreeData = node.children } @@ -717,7 +717,7 @@ export default { this.tempTreeData = null } - this.data = JSON.parse(JSON.stringify(this.defaultData)) + this.treeData = JSON.parse(JSON.stringify(this.defaultData)) }) }, comBackLink(bread) { @@ -795,7 +795,7 @@ export default { }) if (xItems && xItems.length > 1) { - this.data.splice(e.newDraggableIndex, 1) + this.treeData.splice(e.newDraggableIndex, 1) } }, removeCheckedKey(e) {