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/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 @@ - + 等于 { console.info(err) }).finally(() => { - config.loading = false + if (config) { + config.loading = false + } resolve(config) }) }) diff --git a/data-room-ui/packages/js/utils/getComponentConfig.js b/data-room-ui/packages/js/utils/getComponentConfig.js index 10ea7ff1..d296e659 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: '跑马灯',