From dced8744ecfb3a09eb42ccea97a2f60bcf39838b Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Tue, 26 Sep 2023 15:32:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E6=9A=82=E6=97=B6=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../js/config/basicComponentsConfig.js | 2 +- .../packages/js/utils/getComponentConfig.js | 24 +++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data-room-ui/packages/js/config/basicComponentsConfig.js b/data-room-ui/packages/js/config/basicComponentsConfig.js index ce8ab29d..fac25ca7 100644 --- a/data-room-ui/packages/js/config/basicComponentsConfig.js +++ b/data-room-ui/packages/js/config/basicComponentsConfig.js @@ -26,7 +26,7 @@ const typeList = [ 'screenScrollBoard', 'video', 'input', - 'button', + // 'button', 'marquee', 'chartTab', 'themeSwitcher', diff --git a/data-room-ui/packages/js/utils/getComponentConfig.js b/data-room-ui/packages/js/utils/getComponentConfig.js index 1c174382..114490ce 100644 --- a/data-room-ui/packages/js/utils/getComponentConfig.js +++ b/data-room-ui/packages/js/utils/getComponentConfig.js @@ -188,18 +188,18 @@ export default function getComponentConfig (type) { y: 0, type } - case 'button': - return { - name: '按钮', - title: '按钮', - icon: Icon.getNameList()[14], - className: 'com.gccloud.dataroom.core.module.chart.components.ScreenButtonChart', - w: 80, - h: 40, - x: 0, - y: 0, - type - } + // case 'button': + // return { + // name: '按钮', + // title: '按钮', + // icon: Icon.getNameList()[14], + // className: 'com.gccloud.dataroom.core.module.chart.components.ScreenButtonChart', + // w: 80, + // h: 40, + // x: 0, + // y: 0, + // type + // } case 'marquee': return { name: '跑马灯', From 5225566d404934de373570d596f84f3bc8e68410 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Tue, 26 Sep 2023 15:43:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E8=BE=93=E5=85=A5=E6=A1=86?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=B8=8E=E6=8C=89=E9=92=AE=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=EF=BC=8C=E5=8F=AF=E7=9B=B4=E6=8E=A5=E4=B8=8E?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E7=BB=84=E4=BB=B6=E7=BB=91=E5=AE=9A=EF=BC=8C?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E4=BA=8B=E4=BB=B6=E4=B8=BA=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A1=86=E8=BE=93=E5=85=A5=E5=80=BC=E5=8F=98=E5=8C=96=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=EF=BC=8C=E6=B7=BB=E5=8A=A0500ms=E9=98=B2=E6=8A=96?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packages/BasicComponents/Input/index.vue | 21 ++++++++++++++++++- .../BasicComponents/Input/settingConfig.js | 11 +++++----- .../RightSetting/DataSetting.vue | 2 +- 3 files changed, 27 insertions(+), 7 deletions(-) diff --git a/data-room-ui/packages/BasicComponents/Input/index.vue b/data-room-ui/packages/BasicComponents/Input/index.vue index 75f51516..116c78c5 100644 --- a/data-room-ui/packages/BasicComponents/Input/index.vue +++ b/data-room-ui/packages/BasicComponents/Input/index.vue @@ -15,6 +15,7 @@ class="input" :placeholder="config.customize.placeholderStyle.placeholder" :style="{ backgroundColor: config.customize.backgroundStyle.backgroundColor }" + @input="handleInput" > { + this.linkage({ [this.config.code]: val }) + }) + }, + debounce (fn, delay = 500) { + clearTimeout(this.timer) + this.timer = setTimeout(() => { + fn() + }, delay) } } } diff --git a/data-room-ui/packages/BasicComponents/Input/settingConfig.js b/data-room-ui/packages/BasicComponents/Input/settingConfig.js index 4a8b3b26..bd796fa9 100644 --- a/data-room-ui/packages/BasicComponents/Input/settingConfig.js +++ b/data-room-ui/packages/BasicComponents/Input/settingConfig.js @@ -1,12 +1,13 @@ -import { commonConfig } from 'data-room-ui/js/config' +import { commonConfig, displayOption } from 'data-room-ui/js/config' export const settingConfig = { + title: '输入框', displayOption: { - dataAllocation: { - // 是否存在数据配置 - enable: false - } + ...displayOption, + dataAllocation: { enable: true }, + dataSourceType: { enable: false }, + params: { enable: false } } } const customConfig = { diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue index 22051172..46b73d90 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/DataSetting.vue @@ -674,7 +674,7 @@ export default { value: field.name || field.fieldName })) || [] - if (this.config.type === 'timePicker') { + if (['input', 'timePicker', 'dateTimePicker'].includes(this.config.type)) { modifiedList.push({ label: '当前组件值', value: this.config.code }) } return modifiedList From 5fb0c507b2ee8a5cceccfa3816c5b071271d29bb Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Tue, 26 Sep 2023 15:48:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E7=BB=84=E4=BB=B6=E8=81=94?= =?UTF-8?q?=E5=8A=A8=E4=B8=AD=E9=97=B4=E7=9A=84=E6=93=8D=E4=BD=9C=E7=AC=A6?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8E=BB=E6=8E=89=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=AD=89=E4=BA=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ComponentRelation/RelationSetting.vue | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentRelation/RelationSetting.vue b/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentRelation/RelationSetting.vue index d404fe4f..d6c6a391 100644 --- a/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentRelation/RelationSetting.vue +++ b/data-room-ui/packages/BigScreenDesign/RightSetting/ComponentRelation/RelationSetting.vue @@ -45,23 +45,10 @@ - + 等于 Date: Tue, 26 Sep 2023 15:50:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E7=BB=84=E4=BB=B6=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=91=E5=AE=9A=E6=97=B6=EF=BC=8Cloading?= =?UTF-8?q?=20=E6=8A=A5=E9=94=99=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data-room-ui/packages/js/mixins/commonMixins.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/data-room-ui/packages/js/mixins/commonMixins.js b/data-room-ui/packages/js/mixins/commonMixins.js index e95b719f..a39abaf0 100644 --- a/data-room-ui/packages/js/mixins/commonMixins.js +++ b/data-room-ui/packages/js/mixins/commonMixins.js @@ -185,7 +185,9 @@ export default { }).catch(err => { console.info(err) }).finally(() => { - config.loading = false + if (config) { + config.loading = false + } resolve(config) }) })