From db1e34cb7829756e334ab46e12c64d8965be5397 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Mon, 26 Jun 2023 16:19:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9A=E6=97=B6=E5=99=A8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/BigScreenRun/index.vue | 4 +++- data-room-ui/packages/ComponentList/index.vue | 1 - .../packages/DataSetManagement/src/DatasetTypeDialog.vue | 1 - .../packages/DataSetManagement/src/OriginalEditForm.vue | 1 - .../packages/DataSetManagement/src/ScriptEditForm.vue | 2 -- data-room-ui/packages/assets/images/alignIcon/export.js | 1 - data-room-ui/packages/js/mixins/linkageMixins.js | 1 - data-room-ui/packages/js/mixins/multipleSelectMixin.js | 1 - data-room-ui/packages/js/store/actions.js | 1 + data-room-ui/packages/js/store/state.js | 1 + 10 files changed, 5 insertions(+), 9 deletions(-) diff --git a/data-room-ui/packages/BigScreenRun/index.vue b/data-room-ui/packages/BigScreenRun/index.vue index 39dcb99e..8e57e88e 100644 --- a/data-room-ui/packages/BigScreenRun/index.vue +++ b/data-room-ui/packages/BigScreenRun/index.vue @@ -154,7 +154,9 @@ export default { this.windowSize() }, mounted () { - this.startTimer() + if (this.pageInfo.pageConfig.refreshConfig && this.pageInfo.pageConfig.refreshConfig.length > 0) { + this.startTimer() + } }, beforeDestroy () { this.stopTimer() diff --git a/data-room-ui/packages/ComponentList/index.vue b/data-room-ui/packages/ComponentList/index.vue index 06175a43..b27d62f1 100644 --- a/data-room-ui/packages/ComponentList/index.vue +++ b/data-room-ui/packages/ComponentList/index.vue @@ -226,7 +226,6 @@ export default { } }, code () { - // return this.catalogInfo?.page?.code return '' }, gridComputed () { diff --git a/data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue b/data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue index 8399d3ef..ddcec59e 100644 --- a/data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue +++ b/data-room-ui/packages/DataSetManagement/src/DatasetTypeDialog.vue @@ -138,7 +138,6 @@ export default { methods: { // 选择新增类型 openAddForm (type, componentName) { - console.log() this.dialogVisible = false this.$emit('openAddForm', type, componentName) } diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue index 6081fa16..2143835a 100644 --- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue @@ -945,7 +945,6 @@ export default { this.currentCount = data.data.currentCount this.tableLoading = false }).catch((e) => { - console.log(e) this.dataPreviewList = [] this.structurePreviewList = [] this.structurePreviewListCopy = [] diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue index 1573f5a1..d3bf9b4e 100644 --- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue @@ -772,7 +772,6 @@ export default { } }) } - console.log(this.structurePreviewList) if (this.structurePreviewList.length && this.dataForm.fieldDesc) { this.buildFieldDesc() } @@ -780,7 +779,6 @@ export default { this.saveLoading = false this.passTest = true }).catch((e) => { - console.log(e) this.passTest = false this.saveLoading = false }) diff --git a/data-room-ui/packages/assets/images/alignIcon/export.js b/data-room-ui/packages/assets/images/alignIcon/export.js index d49f9b84..360552a7 100644 --- a/data-room-ui/packages/assets/images/alignIcon/export.js +++ b/data-room-ui/packages/assets/images/alignIcon/export.js @@ -3,7 +3,6 @@ const svgFiles = require.context('./svg', true, /\.svg$/) const iconList = svgFiles.keys()?.map(item => svgFiles(item)) export default { getNameList () { - console.log(iconList) return iconList?.map(item => { return item?.default?.id?.split('-')[1] }) || [] diff --git a/data-room-ui/packages/js/mixins/linkageMixins.js b/data-room-ui/packages/js/mixins/linkageMixins.js index b7cc2d97..c1223b50 100644 --- a/data-room-ui/packages/js/mixins/linkageMixins.js +++ b/data-room-ui/packages/js/mixins/linkageMixins.js @@ -45,7 +45,6 @@ export default { this.dataLoading = true return getUpdateChartInfo(params) .then(res => { - console.log(2, res) config = this.buildOption(config, res) this.changeChartConfig(config) this.changeChartKey(config.code) diff --git a/data-room-ui/packages/js/mixins/multipleSelectMixin.js b/data-room-ui/packages/js/mixins/multipleSelectMixin.js index 1892e894..d10413ad 100644 --- a/data-room-ui/packages/js/mixins/multipleSelectMixin.js +++ b/data-room-ui/packages/js/mixins/multipleSelectMixin.js @@ -125,7 +125,6 @@ export default { } if ((event.ctrlKey || event.metaKey) && event.keyCode === 86) { - console.log('粘贴') // 粘贴 this.pasteCharts() } diff --git a/data-room-ui/packages/js/store/actions.js b/data-room-ui/packages/js/store/actions.js index 780143de..af942905 100644 --- a/data-room-ui/packages/js/store/actions.js +++ b/data-room-ui/packages/js/store/actions.js @@ -64,6 +64,7 @@ export function handleResData (data) { } // 如果pageConfig中的cacheDataSets为null，赋值[] pageInfo.pageConfig.cacheDataSets = pageInfo.pageConfig.cacheDataSets || [] + pageInfo.pageConfig.refreshConfig = pageInfo.pageConfig.refreshConfig || [] pageInfo.chartList.forEach((chart) => { if (!['customComponent', 'remoteComponent'].includes(chart.type)) { chart.option = _.cloneDeep(setModules[chart.type]) diff --git a/data-room-ui/packages/js/store/state.js b/data-room-ui/packages/js/store/state.js index db8d4a14..6945902e 100644 --- a/data-room-ui/packages/js/store/state.js +++ b/data-room-ui/packages/js/store/state.js @@ -26,6 +26,7 @@ export const defaultData = { themeJson: {}, // 自定义主题配置 // 缓存的数据集 { name: '', dataSetId: '' } cacheDataSets: [], + refreshConfig: [], // 自适应模式 无(none) 、自动(auto)、宽度铺满(fitWidth)、高度铺满(fitHeight)和 双向铺满（cover） 5 种自适应模式 fitMode: 'none' },