doway-coms 1.4.98 → 1.5.0
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/package.json
CHANGED
|
@@ -1490,6 +1490,9 @@ export default {
|
|
|
1490
1490
|
originCol.filters === true
|
|
1491
1491
|
) {
|
|
1492
1492
|
let filterTypeName = `${originCol.controlType}_filter`;
|
|
1493
|
+
if(originCol.filterControlType){
|
|
1494
|
+
filterTypeName = `${originCol.filterControlType}_filter`;
|
|
1495
|
+
}
|
|
1493
1496
|
//网格筛选
|
|
1494
1497
|
colInfo["filters"] = [
|
|
1495
1498
|
{ data: { bindingValues: [], displayValues: [],displayValueSearchText:'' }, checked: false },
|
package/packages/utils/store.js
CHANGED
|
@@ -78,11 +78,15 @@ export default new Vuex.Store({
|
|
|
78
78
|
tempField['editStatuss'] = loopField.editStatuss.split(',')
|
|
79
79
|
}
|
|
80
80
|
let extraInfo = loopField.extraInfo
|
|
81
|
-
|
|
82
|
-
|
|
81
|
+
? JSON.parse(loopField.extraInfo)
|
|
82
|
+
: {}
|
|
83
|
+
let userExtraInfo = loopField.userExtraInfo
|
|
84
|
+
? JSON.parse(loopField.userExtraInfo)
|
|
85
|
+
: {}
|
|
86
|
+
extraInfo = {...extraInfo, ...userExtraInfo}
|
|
83
87
|
//存在额外参数，就赋值
|
|
84
|
-
if(extraInfo){
|
|
85
|
-
|
|
88
|
+
if (Object.keys(extraInfo).length) {
|
|
89
|
+
tempField = XEUtils.assign(extraInfo, tempField)
|
|
86
90
|
}
|
|
87
91
|
if (tempField.controlType === controlType.select) {
|
|
88
92
|
tempField['dataSource'] = XEUtils.filter(
|