@ibiz-template/model-helper 0.7.41-alpha.10 → 0.7.41-alpha.11
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-de-form.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-de-form.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAU3C,aAAa;AACb,QAAA,MAAM,WAAW;IACf,cAAc;;CAEf,CAAC;AAiCF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,EACb,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,OAAO,GAAG,IAAI,EACrD,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,GACjC,IAAI,CAaN;
|
|
1
|
+
{"version":3,"file":"merge-de-form.d.ts","sourceRoot":"","sources":["../../../src/utils/merge-model/merge-de-form.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAU3C,aAAa;AACb,QAAA,MAAM,WAAW;IACf,cAAc;;CAEf,CAAC;AAiCF;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,KAAK,EACb,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,KAAK,OAAO,GAAG,IAAI,EACrD,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,WAAW,CAAC,GACjC,IAAI,CAaN;AA2ID;;;;;;GAMG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,OAAO,GAAG,SAAS,GACvB,IAAI,CAKN"}
|
|
@@ -101,6 +101,8 @@ function computeSubAppFormItems(src) {
|
|
|
101
101
|
const tempItem = {
|
|
102
102
|
position: tags[1],
|
|
103
103
|
model: item,
|
|
104
|
+
// 定义当前项是否已经被合并
|
|
105
|
+
merge: false,
|
|
104
106
|
};
|
|
105
107
|
const targetMergeArray = subAppMergeItemsMap.get(tags[2]);
|
|
106
108
|
targetMergeArray.push(tempItem);
|
|
@@ -164,6 +166,8 @@ function mergeSubAppFormItemToDst(item, parent, mergeItem) {
|
|
|
164
166
|
}
|
|
165
167
|
break;
|
|
166
168
|
}
|
|
169
|
+
// 标记当前项已被合并
|
|
170
|
+
mergeItem.merge = true;
|
|
167
171
|
}
|
|
168
172
|
/**
|
|
169
173
|
* @description 合并子应用表单表单项
|
|
@@ -181,7 +185,10 @@ function mergeSubAppFormItems(dst, subAppMergeItems) {
|
|
|
181
185
|
const mergeItems = subAppMergeItems.get(item.codeName);
|
|
182
186
|
if (mergeItems && mergeItems.length > 0) {
|
|
183
187
|
mergeItems.forEach((mergeItem) => {
|
|
184
|
-
|
|
188
|
+
// 判断当前项是否已经被合并，若已经被合并则不再处理
|
|
189
|
+
if (!mergeItem.merge) {
|
|
190
|
+
mergeSubAppFormItemToDst(item, parent, mergeItem);
|
|
191
|
+
}
|
|
185
192
|
});
|
|
186
193
|
}
|
|
187
194
|
}, {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibiz-template/model-helper",
|
|
3
|
-
"version": "0.7.41-alpha.
|
|
3
|
+
"version": "0.7.41-alpha.11",
|
|
4
4
|
"description": "模型辅助库",
|
|
5
5
|
"main": "out/index.js",
|
|
6
6
|
"types": "out/index.d.ts",
|
|
@@ -31,13 +31,13 @@
|
|
|
31
31
|
"license": "MIT",
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@ibiz-template/core": "^0.7.41-alpha.9",
|
|
34
|
-
"@ibiz/model-core": "^0.1.
|
|
35
|
-
"@ibiz/rt-model-api": "0.2.
|
|
34
|
+
"@ibiz/model-core": "^0.1.79",
|
|
35
|
+
"@ibiz/rt-model-api": "0.2.77",
|
|
36
36
|
"pluralize": "^8.0.0",
|
|
37
37
|
"ramda": "^0.29.1"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@ibiz-template/runtime": "^0.7.41-alpha.
|
|
40
|
+
"@ibiz-template/runtime": "^0.7.41-alpha.11",
|
|
41
41
|
"@types/pluralize": "^0.0.33",
|
|
42
42
|
"@types/ramda": "^0.29.10"
|
|
43
43
|
},
|
|
@@ -45,5 +45,5 @@
|
|
|
45
45
|
"@ibiz-template/runtime": "^0.6.0",
|
|
46
46
|
"ramda": "^0.29.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "2178dbbddab047b198a6908e16ff3ee6c1a34b33"
|
|
49
49
|
}
|