From 178ae53530219578c7b5793ea8f70cbd7819aa6f Mon Sep 17 00:00:00 2001 From: qianming Date: Tue, 9 May 2023 13:29:48 +0800 Subject: [PATCH] =?UTF-8?q?update--form=E8=A1=A8=E5=8D=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/configure/form/widget-form-time.js | 66 ++----------------- .../tools/configure/form/widget-input.js | 2 +- .../tools/configure/form/widget-select.js | 4 +- .../designer/widget/form/widgetFormTime.vue | 42 ++---------- .../designer/widget/form/widgetInput.vue | 8 +-- .../designer/widget/form/widgetSelect.vue | 8 +-- 6 files changed, 19 insertions(+), 111 deletions(-) diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js index 600aba74..c3679ecc 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-form-time.js @@ -20,16 +20,8 @@ export const widgetFormTime = { }, { type: 'vue-color', - label: '字体颜色', - name: 'select_color', - required: false, - placeholder: '', - value: '#FAD400', - }, - { - type: 'vue-color', - label: '字体背景', - name: 'select_fontSize', + label: '背景', + name: 'select_background', required: false, placeholder: '', value: 'rgba(115,170,229,.5)', @@ -60,57 +52,7 @@ export const widgetFormTime = { ] }] ], - data: [ - { - type: 'el-radio-group', - label: '数据类型', - name: 'dataType', - require: false, - placeholder: '', - selectValue: true, - selectOptions: [ - { - code: 'staticData', - name: '静态数据', - }, - { - code: 'dynamicData', - name: '动态数据', - }, - ], - value: 'staticData', - }, - { - type: 'el-input-number', - label: '刷新时间(毫秒)', - name: 'refreshTime', - relactiveDom: 'dataType', - relactiveDomValue: 'dynamicData', - value: 600000 - }, - { - type: 'el-button', - label: '静态数据', - name: 'staticData', - required: false, - placeholder: '', - relactiveDom: 'dataType', - relactiveDomValue: 'staticData', - value: [], - }, - { - type: 'dycustComponents', - label: '', - name: 'dynamicData', - required: false, - placeholder: '', - relactiveDom: 'dataType', - relactiveDomValue: 'dynamicData', - chartType: 'widget-select', - dictKey: 'SELECT_PROPERTIES', - value: '', - }, - ], + data: [], position: [ { type: 'el-input-number', @@ -134,7 +76,7 @@ export const widgetFormTime = { name: 'width', required: false, placeholder: '该容器在1920px大屏中的宽度', - value: 200, + value: 400, }, { type: 'el-input-number', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js index 7987fed9..db9854bd 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-input.js @@ -25,7 +25,7 @@ export const widgetInput = { { type: 'vue-color', label: '字体背景', - name: 'select_fontSize', + name: 'select_background', required: false, placeholder: '', value: 'rgba(115,170,229,.5)', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js index c45ec0b7..4e8d5d0f 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/form/widget-select.js @@ -33,7 +33,7 @@ export const widgetSelect = { { type: 'vue-color', label: '字体背景', - name: 'select_fontSize', + name: 'select_background', required: false, placeholder: '', value: 'rgba(115,170,229,.5)', @@ -144,7 +144,7 @@ export const widgetSelect = { name: 'width', required: false, placeholder: '该容器在1920px大屏中的宽度', - value: 100, + value: 200, }, { type: 'el-input-number', diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue index 74ec8aa8..039b5b06 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetFormTime.vue @@ -91,13 +91,12 @@ export default { height: this.optionsStyle.height + "px", left: this.optionsStyle.left + "px", top: this.optionsStyle.top + "px", - background: this.optionsSetup.select_fontSize, - color: this.optionsSetup.select_color, + background: this.optionsSetup.select_background, }; }, -/* eventChange() { - return this.optionsSetup.event || "change"; - },*/ + eventChange() { + return "change"; + }, allComponentLinkage() { return this.$store.state.designer.allComponentLinkage; }, @@ -108,7 +107,6 @@ export default { this.optionsSetup = val.setup; this.optionsData = val.data; this.optionsStyle = val.position; - this.setOptions(); }, deep: true, }, @@ -117,13 +115,11 @@ export default { this.optionsSetup = this.value.setup; this.optionsData = this.value.data; this.optionsStyle = this.value.position; - this.setOptions(); targetWidgetLinkageLogic(this); // 联动-目标组件逻辑 }, methods: { change(event) { - console.log(event); const formTimeData = {} formTimeData['startTime'] = event[0] //startTime formTimeData['endTime'] = event[1] //endTime @@ -131,36 +127,6 @@ export default { currentData: formTimeData, }); // 联动-源组件逻辑 }, - setOptions() { - const optionsData = this.optionsData; - return optionsData.dataType == "staticData" - ? this.staticData(optionsData.staticData) - : this.dynamicDataFn(optionsData.dynamicData, optionsData.refreshTime); - }, - staticData(data) { - this.options = data; - }, - //动态数据字典解析 - dynamicDataFn(val, refreshTime) { - if (!val) return; - if (this.ispreview) { - this.getEchartData(val); - this.flagInter = setInterval(() => { - this.getEchartData(val); - }, refreshTime); - } else { - this.getEchartData(val); - } - }, - getEchartData(val) { - const data = this.queryEchartsData(val); - data.then((res) => { - this.renderingFn(res); - }); - }, - renderingFn(val) { - this.options = val; - }, }, }; diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue index f444d6ff..7e392d35 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetInput.vue @@ -32,13 +32,13 @@ export default { height: this.optionsStyle.height + "px", left: this.optionsStyle.left + "px", top: this.optionsStyle.top + "px", - background: this.optionsSetup.select_fontSize, + background: this.optionsSetup.select_background, color: this.optionsSetup.select_color, }; }, -/* eventChange() { - return this.optionsSetup.event || "change"; - },*/ + eventChange() { + return "change"; + }, }, watch: { value: { diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetSelect.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetSelect.vue index 93d72446..fa1f9afa 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetSelect.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/form/widgetSelect.vue @@ -42,13 +42,13 @@ export default { height: this.optionsStyle.height + "px", left: this.optionsStyle.left + "px", top: this.optionsStyle.top + "px", - background: this.optionsSetup.select_fontSize, + background: this.optionsSetup.select_background, color: this.optionsSetup.select_color, }; }, -/* eventChange() { - return this.optionsSetup.event || "change"; - },*/ + eventChange() { + return "change"; + }, allComponentLinkage() { return this.$store.state.designer.allComponentLinkage; },