diff --git a/src/views/bigscreenDesigner/designer/components/datasourceSelect.vue b/src/views/bigscreenDesigner/designer/components/datasourceSelect.vue index a5db354..3b0671a 100644 --- a/src/views/bigscreenDesigner/designer/components/datasourceSelect.vue +++ b/src/views/bigscreenDesigner/designer/components/datasourceSelect.vue @@ -80,7 +80,7 @@ export default { //选中,回刷父节点 async selectDataSet() { this.$emit("input", this.selectedOption); - // this.$emit("change", this.selectedOption); + this.$emit("change", this.selectedOption); }, // 数据集回显 async echoDataSet(val) { diff --git a/src/views/bigscreenDesigner/designer/tools/index.js b/src/views/bigscreenDesigner/designer/tools/index.js index e14c43d..6de4352 100644 --- a/src/views/bigscreenDesigner/designer/tools/index.js +++ b/src/views/bigscreenDesigner/designer/tools/index.js @@ -48,7 +48,7 @@ const screenConfig = { }, { type: 'data-source-select', - label: '全局数据源', + label: '主数据源', name: 'master', required: false, placeholder: '全局数据源[List:sName、sValue] ',/**LIST sName、sValue 后台代码自动转成 sName:sValue Map形式*/ @@ -79,8 +79,58 @@ const screenConfig = { value: '', } ], - data: [], - position: [], + data: [], // 数据 + // 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: {title:'标题', name: '测试名字', address: '上海市普陀区金沙江路 1518 弄0001'}, + // }, + // { + // type: 'dycustComponents', + // label: '', + // name: 'dynamicData', + // required: false, + // placeholder: '', + // relactiveDom: 'dataType', + // relactiveDomValue: 'dynamicData', + // chartType: 'widget-text', + // dictKey: 'TEXT_PROPERTIES', + // value: '', + // } + // ], + position: [], } }