Commit 9f9c110212d401b4c276c47594a7f1c991b93604
1 parent
a8ba187f
1111
Showing
2 changed files
with
54 additions
and
4 deletions
src/views/bigscreenDesigner/designer/components/datasourceSelect.vue
| @@ -80,7 +80,7 @@ export default { | @@ -80,7 +80,7 @@ export default { | ||
| 80 | //选中，回刷父节点 | 80 | //选中，回刷父节点 |
| 81 | async selectDataSet() { | 81 | async selectDataSet() { |
| 82 | this.$emit("input", this.selectedOption); | 82 | this.$emit("input", this.selectedOption); |
| 83 | - // this.$emit("change", this.selectedOption); | 83 | + this.$emit("change", this.selectedOption); |
| 84 | }, | 84 | }, |
| 85 | // 数据集回显 | 85 | // 数据集回显 |
| 86 | async echoDataSet(val) { | 86 | async echoDataSet(val) { |
src/views/bigscreenDesigner/designer/tools/index.js
| @@ -48,7 +48,7 @@ const screenConfig = { | @@ -48,7 +48,7 @@ const screenConfig = { | ||
| 48 | }, | 48 | }, |
| 49 | { | 49 | { |
| 50 | type: 'data-source-select', | 50 | type: 'data-source-select', |
| 51 | - label: '全局数据源', | 51 | + label: '主数据源', |
| 52 | name: 'master', | 52 | name: 'master', |
| 53 | required: false, | 53 | required: false, |
| 54 | placeholder: '全局数据源[List:sName、sValue] ',/**LIST sName、sValue 后台代码自动转成 sName:sValue Map形式*/ | 54 | placeholder: '全局数据源[List:sName、sValue] ',/**LIST sName、sValue 后台代码自动转成 sName:sValue Map形式*/ |
| @@ -79,8 +79,58 @@ const screenConfig = { | @@ -79,8 +79,58 @@ const screenConfig = { | ||
| 79 | value: '', | 79 | value: '', |
| 80 | } | 80 | } |
| 81 | ], | 81 | ], |
| 82 | - data: [], | ||
| 83 | - position: [], | 82 | + data: [], // 数据 |
| 83 | + // data: [{ | ||
| 84 | + // type: 'el-radio-group', | ||
| 85 | + // label: '数据类型', | ||
| 86 | + // name: 'dataType', | ||
| 87 | + // require: false, | ||
| 88 | + // placeholder: '', | ||
| 89 | + // selectValue: true, | ||
| 90 | + // selectOptions: [ | ||
| 91 | + // { | ||
| 92 | + // code: 'staticData', | ||
| 93 | + // name: '静态数据', | ||
| 94 | + // }, | ||
| 95 | + // { | ||
| 96 | + // code: 'dynamicData', | ||
| 97 | + // name: '动态数据', | ||
| 98 | + // }, | ||
| 99 | + // ], | ||
| 100 | + // value: 'staticData', | ||
| 101 | + // }, | ||
| 102 | + // { | ||
| 103 | + // type: 'el-input-number', | ||
| 104 | + // label: '刷新时间(毫秒)', | ||
| 105 | + // name: 'refreshTime', | ||
| 106 | + // relactiveDom: 'dataType', | ||
| 107 | + // relactiveDomValue: 'dynamicData', | ||
| 108 | + // value: 600000 | ||
| 109 | + // }, | ||
| 110 | + // { | ||
| 111 | + // type: 'el-button', | ||
| 112 | + // label: '静态数据', | ||
| 113 | + // name: 'staticData', | ||
| 114 | + // required: false, | ||
| 115 | + // placeholder: '', | ||
| 116 | + // relactiveDom: 'dataType', | ||
| 117 | + // relactiveDomValue: 'staticData', | ||
| 118 | + // value: {title:'标题', name: '测试名字', address: '上海市普陀区金沙江路 1518 弄0001'}, | ||
| 119 | + // }, | ||
| 120 | + // { | ||
| 121 | + // type: 'dycustComponents', | ||
| 122 | + // label: '', | ||
| 123 | + // name: 'dynamicData', | ||
| 124 | + // required: false, | ||
| 125 | + // placeholder: '', | ||
| 126 | + // relactiveDom: 'dataType', | ||
| 127 | + // relactiveDomValue: 'dynamicData', | ||
| 128 | + // chartType: 'widget-text', | ||
| 129 | + // dictKey: 'TEXT_PROPERTIES', | ||
| 130 | + // value: '', | ||
| 131 | + // } | ||
| 132 | + // ], | ||
| 133 | + position: [], | ||
| 84 | } | 134 | } |
| 85 | } | 135 | } |
| 86 | 136 |