From 97fbc9769aefc677dd40554aa80f90d87d336aa5 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Wed, 21 Jun 2023 15:39:48 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=95=B0=E6=8D=AE=E9=9B=86=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E9=80=89=E6=8B=A9=E7=9B=B4=E6=8E=A5=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=A1=AE=E5=AE=9A=EF=BC=8C=E5=87=BA=E7=8E=B0=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?404=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RightSetting/DataSetting.vue | 84 +++++++++---------- .../packages/js/mixins/commonMixins.js | 2 - data-room-ui/packages/js/store/actions.js | 1 - 3 files changed, 41 insertions(+), 46 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue index 9e9eb147..9bdb53f2 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue @@ -28,11 +28,7 @@ @@ -713,57 +709,58 @@ export default { }, // 根据数据集来获取数据集详情 getDataSetDetailsById (id, type) { - this.config.dataSource.businessKey = id - getDataSetDetails(id).then(res => { - this.fieldsList = res.fields - // 初始化时以组件本来的参数设置为主 - if (type === 'initial') { - for (const key in this.config.dataSource.params) { - const param = res?.params?.find(field => field.name === key) - this.params.push({ - name: key, - value: this.config.dataSource.params[key], - type: param?.type, - remark: param?.remark - }) + if (id) { + this.config.dataSource.businessKey = id + getDataSetDetails(id).then(res => { + this.fieldsList = res.fields + // 初始化时以组件本来的参数设置为主 + if (type === 'initial') { + for (const key in this.config.dataSource.params) { + const param = res?.params?.find(field => field.name === key) + this.params.push({ + name: key, + value: this.config.dataSource.params[key], + type: param?.type, + remark: param?.remark + }) + } + } else { + this.params = res.params } - } else { - this.params = res.params - } - this.datasetName = res.name - // 选择数据集的时候，如果数据集类型是dataModel,则不显示参数配置 - this.config.option.displayOption.params.enable = res.type !== 'dataModel' - // 根据数据集初始化组件的入参：inparams - if (res.type !== 'dataModel') { - this.config.inParams = + this.datasetName = res.name + // 选择数据集的时候，如果数据集类型是dataModel,则不显示参数配置 + this.config.option.displayOption.params.enable = res.type !== 'dataModel' + // 根据数据集初始化组件的入参：inparams + if (res.type !== 'dataModel') { + this.config.inParams = this.params?.map(param => { return { name: param.remark, // 参数名 code: param.name // 参数值 } }) || [] - } else { - this.config.inParams = + } else { + this.config.inParams = this.fieldsList?.map(field => { return { name: field.fieldDesc, // 参数名 code: field.fieldName // 参数值 } }) || [] - } - - // 根据数据集的参数初始化表单项 - this.config.paramsList = this.params - if (type === 'treeTable') { - const enumeration = { - dataSetType: '1', // 数据集类型 - dataSetKey: '', // 数据集 - itemKeyName: '', // 选项显示字段 - itemValueName: '', // 选项value字段 - params: [] } - this.config.fields = + + // 根据数据集的参数初始化表单项 + this.config.paramsList = this.params + if (type === 'treeTable') { + const enumeration = { + dataSetType: '1', // 数据集类型 + dataSetKey: '', // 数据集 + itemKeyName: '', // 选项显示字段 + itemValueName: '', // 选项value字段 + params: [] + } + this.config.fields = this.params?.map(param => { return { name: param.name, @@ -776,8 +773,9 @@ export default { queryRule: 'like' } }) || [] - } - }) + } + }) + } }, // 改变维度 dimensionFieldListChange (list) { diff --git a/data-room-ui/packages/js/mixins/commonMixins.js b/data-room-ui/packages/js/mixins/commonMixins.js index a4167dbe..04e965d6 100644 --- a/data-room-ui/packages/js/mixins/commonMixins.js +++ b/data-room-ui/packages/js/mixins/commonMixins.js @@ -139,8 +139,6 @@ export default { // return // } getUpdateChartInfo(params).then((res) => { - console.log('更新组件数据', res) - console.log('更新组件数据', config) // 数据集脚本前端执行 if (res.executionByFrontend) { try { diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js index 07021906..780143de 100644 --- a/data-room-ui/packages/js/store/actions.js +++ b/data-room-ui/packages/js/store/actions.js @@ -38,7 +38,6 @@ export default { // 初始化缓存数据集字段 getCacheDataFields ({ commit, dispatch }, { dataSetId }) { getDataSetDetails(dataSetId).then(data => { - console.log(2, data) commit('changeCacheDataFields', { dataSetId, data }) commit('changeCacheDataParams', { dataSetId, data }) })