ns-base-module 1.1.75 → 1.1.76
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.
|
@@ -76,16 +76,25 @@ var flatColumns = function flatColumns(_columns) {
|
|
|
76
76
|
var updateTemplateSort = function updateTemplateSort(columns, JsonPares) {
|
|
77
77
|
var sortArr = [];
|
|
78
78
|
for (var r = 0, t = JsonPares.length; r < t; r++) {
|
|
79
|
-
|
|
79
|
+
var _loop = function _loop(n) {
|
|
80
80
|
var _JsonPares$r;
|
|
81
81
|
var _key = (_JsonPares$r = JsonPares[r]) !== null && _JsonPares$r !== void 0 && _JsonPares$r.code ? "code" : "dataIndex";
|
|
82
82
|
if (columns[n][_key] === JsonPares[r][_key]) {
|
|
83
|
+
var sortFindITem = find(sortArr, function (o) {
|
|
84
|
+
return o[_key] === columns[n][_key];
|
|
85
|
+
});
|
|
86
|
+
if (sortFindITem) {
|
|
87
|
+
return 1; // break
|
|
88
|
+
}
|
|
83
89
|
sortArr.push(columns[n]);
|
|
84
90
|
if (columns[n].children && columns[n].children.length && JsonPares[r].children && JsonPares[r].children.length) {
|
|
85
91
|
// 有子级 递归
|
|
86
92
|
sortArr[sortArr.length - 1].children = updateTemplateSort(columns[n].children, JsonPares[r].children);
|
|
87
93
|
}
|
|
88
94
|
}
|
|
95
|
+
};
|
|
96
|
+
for (var n = 0, l = columns.length; n < l; n++) {
|
|
97
|
+
if (_loop(n)) break;
|
|
89
98
|
}
|
|
90
99
|
}
|
|
91
100
|
var lastArr = columns.filter(function (d) {
|
|
@@ -99,7 +108,7 @@ var updateTemplateSort = function updateTemplateSort(columns, JsonPares) {
|
|
|
99
108
|
|
|
100
109
|
// 遍历数据 引用旧模板的配置： width fixed checked frontEndFold
|
|
101
110
|
var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
|
|
102
|
-
var
|
|
111
|
+
var _loop2 = function _loop2(r) {
|
|
103
112
|
var _JsonPares$r2;
|
|
104
113
|
if (JsonPares[r].children && JsonPares[r].children.length) {
|
|
105
114
|
updateTemplateFilds(JsonPares[r].children, _columns);
|
|
@@ -125,7 +134,7 @@ var updateTemplateFilds = function updateTemplateFilds(JsonPares, _columns) {
|
|
|
125
134
|
}
|
|
126
135
|
};
|
|
127
136
|
for (var r = 0, t = JsonPares.length; r < t; r++) {
|
|
128
|
-
|
|
137
|
+
_loop2(r);
|
|
129
138
|
}
|
|
130
139
|
};
|
|
131
140
|
|