cnhis-design-vue 0.2.0-beta → 0.2.1-beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/age/index.js +2 -2
- package/es/big-table/index.js +21 -21
- package/es/button/index.js +2 -2
- package/es/captcha/index.js +3 -3
- package/es/checkbox/index.js +1 -1
- package/es/color-picker/index.js +1 -1
- package/es/drag-layout/index.js +3 -3
- package/es/editor/index.js +1 -1
- package/es/fabric-chart/index.js +9 -9
- package/es/index/index.js +193 -298
- package/es/input/index.js +1 -1
- package/es/map/index.js +1 -1
- package/es/multi-chat/index.js +24 -24
- package/es/multi-chat-client/index.js +18 -18
- package/es/multi-chat-history/index.js +4 -4
- package/es/multi-chat-record/index.js +4 -4
- package/es/multi-chat-setting/index.js +20 -20
- package/es/multi-chat-sip/index.js +1 -1
- package/es/radio/index.js +1 -1
- package/es/scale-view/index.js +22 -22
- package/es/select/index.js +3 -3
- package/es/select-label/index.js +2 -2
- package/es/select-person/index.js +2 -2
- package/es/table-filter/index.js +66 -36
- package/es/tag/index.js +1 -1
- package/es/verification-code/index.js +2 -2
- package/package.json +9 -9
- package/packages/table-filter/src/components/c-tree-select/tree-select.vue +14 -1
- package/packages/table-filter/src/components/out-quick-search/out-quick-search.vue +7 -1
|
@@ -46,6 +46,10 @@ export default {
|
|
|
46
46
|
handleGetConfigApi: {
|
|
47
47
|
type: Function,
|
|
48
48
|
default: () => {}
|
|
49
|
+
},
|
|
50
|
+
outFilterChange:{
|
|
51
|
+
type: Function,
|
|
52
|
+
default: ()=>{}
|
|
49
53
|
}
|
|
50
54
|
},
|
|
51
55
|
computed: {},
|
|
@@ -162,7 +166,16 @@ export default {
|
|
|
162
166
|
});
|
|
163
167
|
},
|
|
164
168
|
|
|
165
|
-
hanldeSetTreeDef() {
|
|
169
|
+
hanldeSetTreeDef() {
|
|
170
|
+
let df = this?.item?.explicitDefaultVal || "";
|
|
171
|
+
if(df === 'firstOption'){
|
|
172
|
+
let [v] = this.treeData;
|
|
173
|
+
this.item.value = v?.value || undefined;
|
|
174
|
+
if(typeof this.outFilterChange === 'function'){
|
|
175
|
+
this.outFilterChange();
|
|
176
|
+
}
|
|
177
|
+
}
|
|
178
|
+
},
|
|
166
179
|
|
|
167
180
|
treeSelect(key, vnode) {}
|
|
168
181
|
},
|
|
@@ -20,6 +20,7 @@
|
|
|
20
20
|
v-if="item.comType === 'treeSelect'"
|
|
21
21
|
:item="item"
|
|
22
22
|
:handleGetConfigApi="handleGetConfigApi"
|
|
23
|
+
:outFilterChange="outFilterChange"
|
|
23
24
|
style="margin: 0 8px 8px 0"
|
|
24
25
|
/>
|
|
25
26
|
<multiSelect
|
|
@@ -235,6 +236,7 @@ export default {
|
|
|
235
236
|
const {rows,hasFieldList,searchPageConfig} = wordBookutils.handleWordbookData(item,data,params);
|
|
236
237
|
this.$set(item, "hasFieldList", hasFieldList);
|
|
237
238
|
this.$set(item, "dataSource", rows);
|
|
239
|
+
let showKeys = item?.setting?.wordbook?.showKeys || [];
|
|
238
240
|
item.searchPageConfig = Object.assign(item.searchPageConfig, searchPageConfig);
|
|
239
241
|
// 初始化获取值
|
|
240
242
|
if(!this.initSearch){
|
|
@@ -242,7 +244,11 @@ export default {
|
|
|
242
244
|
if(df){
|
|
243
245
|
let defval = [];
|
|
244
246
|
if(df === 'firstOption'){
|
|
245
|
-
let [v] = rows;
|
|
247
|
+
let [v,k] = rows;
|
|
248
|
+
// 如果有添加提示标题，取第二个
|
|
249
|
+
if(showKeys.length > 0 && item.hasFieldList){
|
|
250
|
+
v = k;
|
|
251
|
+
}
|
|
246
252
|
v && (defval = [v.myName])
|
|
247
253
|
} else {
|
|
248
254
|
let f = rows.find(v => v.myName.includes(df));
|