@cloudbase/cals 1.1.12 → 1.1.14-alpha.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/lib/parser/cals/index.d.ts +3 -1
- package/lib/parser/cals/index.d.ts.map +1 -1
- package/lib/parser/cals/index.js +12 -5
- package/lib/parser/cals/utils/block/helpers/remap-component-ids.d.ts.map +1 -1
- package/lib/parser/cals/utils/block/helpers/remap-component-ids.js +4 -1
- package/lib/parser/cals/utils/block/index.d.ts +13 -0
- package/lib/parser/cals/utils/block/index.d.ts.map +1 -1
- package/lib/parser/cals/utils/block/index.js +75 -27
- package/lib/parser/index.d.ts +1 -1
- package/lib/parser/index.d.ts.map +1 -1
- package/lib/parser/index.js +2 -1
- package/lib/utils/constant.d.ts +1 -0
- package/lib/utils/constant.d.ts.map +1 -1
- package/lib/utils/constant.js +2 -1
- package/package.json +2 -1
|
@@ -4,7 +4,7 @@ IPlatformDataSource, IDependencies, LCDS } from '../../types';
|
|
|
4
4
|
import { IDynamicValue, PropBindType } from '../expression';
|
|
5
5
|
import { IEventFlow } from '../../types/platform/eventFlow';
|
|
6
6
|
import { IHandler, IPlatformSubApp, IPlatformComponentExtra } from '../../utils';
|
|
7
|
-
import { IBlockTemplate } from './utils/block/index';
|
|
7
|
+
import { IBlockTemplate, ICalsReferenceContext } from './utils/block/index';
|
|
8
8
|
export { getUsedComps, generateCustomLoginConfigPathname, replaceGloalIdentifier } from './utils/common';
|
|
9
9
|
export { generateDefaultCode } from './utils/template';
|
|
10
10
|
interface IDeserializeContext {
|
|
@@ -619,5 +619,7 @@ export declare function collapseCalsReference(cals: IPlatformApp | IPlatformSubA
|
|
|
619
619
|
export declare function expandCalsReference(cals: IPlatformApp | IPlatformSubApp, options: {
|
|
620
620
|
blockTemplates: IBlockTemplate[];
|
|
621
621
|
strict?: boolean;
|
|
622
|
+
enableRestore?: boolean;
|
|
623
|
+
processPickedTeamplate?: ICalsReferenceContext['processPickedTeamplate'];
|
|
622
624
|
}): IPlatformApp | IPlatformSubApp;
|
|
623
625
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAuC,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAEvH,OAAO,EACL,WAAW,EACX,YAAY,EAGZ,cAAc,EACd,kBAAkB,EAElB,mBAAmB,EACnB,cAAc,EAAE,cAAc;AAC9B,mBAAmB,EACnB,aAAa,EACb,IAAI,EAEL,MAAM,aAAa,CAAC;AAErB,OAAO,EAAkC,aAAa,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAmB5F,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EACL,QAAQ,EACR,eAAe,EACf,uBAAuB,EAIxB,MAAM,aAAa,CAAC;AAIrB,OAAO,EAGL,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/parser/cals/index.ts"],"names":[],"mappings":"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"}
|
package/lib/parser/cals/index.js
CHANGED
|
@@ -1533,6 +1533,7 @@ function collapseCalsReference(cals, options) {
|
|
|
1533
1533
|
const { blockTemplates = [] } = options;
|
|
1534
1534
|
const ctx = {
|
|
1535
1535
|
blockTemplateMap: (0, getUsedReference_1.generateBlockTemplateMap)(blockTemplates),
|
|
1536
|
+
enableRestore: true,
|
|
1536
1537
|
};
|
|
1537
1538
|
const res = Object.assign(Object.assign({}, cals), { items: (_a = cals.items) === null || _a === void 0 ? void 0 : _a.map((page) => {
|
|
1538
1539
|
var _a;
|
|
@@ -1545,7 +1546,6 @@ exports.collapseCalsReference = collapseCalsReference;
|
|
|
1545
1546
|
* 展开引用
|
|
1546
1547
|
*/
|
|
1547
1548
|
function expandCalsReference(cals, options) {
|
|
1548
|
-
var _a;
|
|
1549
1549
|
const { blockTemplates = [] } = options;
|
|
1550
1550
|
const blockTemplateMap = (0, getUsedReference_1.generateBlockTemplateMap)(blockTemplates);
|
|
1551
1551
|
const ctx = {
|
|
@@ -1555,6 +1555,7 @@ function expandCalsReference(cals, options) {
|
|
|
1555
1555
|
existing: new remap_component_ids_1.VisitedMap(),
|
|
1556
1556
|
untilNow: new remap_component_ids_1.VisitedMap(),
|
|
1557
1557
|
},
|
|
1558
|
+
processPickedTeamplate: options.processPickedTeamplate,
|
|
1558
1559
|
};
|
|
1559
1560
|
const { refs } = (0, utils_1.getUsedReference)([cals], blockTemplates);
|
|
1560
1561
|
[cals]
|
|
@@ -1577,9 +1578,15 @@ function expandCalsReference(cals, options) {
|
|
|
1577
1578
|
});
|
|
1578
1579
|
});
|
|
1579
1580
|
});
|
|
1580
|
-
|
|
1581
|
-
|
|
1582
|
-
|
|
1583
|
-
|
|
1581
|
+
const res = Object.assign(Object.assign({}, cals), {
|
|
1582
|
+
// 先置空，等待后续填充
|
|
1583
|
+
items: [] });
|
|
1584
|
+
res.items = cals === null || cals === void 0 ? void 0 : cals.items.map((_a) => {
|
|
1585
|
+
var _b;
|
|
1586
|
+
var { items: orignItems } = _a, page = __rest(_a, ["items"]);
|
|
1587
|
+
const items = (_b = orignItems === null || orignItems === void 0 ? void 0 : orignItems.map) === null || _b === void 0 ? void 0 : _b.call(orignItems, (component) => (0, index_1.expandComponentReference)(Object.assign(Object.assign({}, ctx), { patchRef: options.enableRestore ? undefined : { cals: res, page } }), component));
|
|
1588
|
+
return Object.assign(Object.assign({}, page), { items });
|
|
1589
|
+
});
|
|
1590
|
+
return res;
|
|
1584
1591
|
}
|
|
1585
1592
|
exports.expandCalsReference = expandCalsReference;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remap-component-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/remap-component-ids.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,aAAK,kBAAkB,GAAG,MAAM,CAAC;AACjC,aAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,sCAAsC;IACtC,QAAQ,EAAE,UAAU,CAAC;IAErB,wCAAwC;IACxC,QAAQ,EAAE,UAAU,CAAC;CACtB;AAED,qBAAa,UAAU;;;IAMrB,GAAG,CAAC,GAAG,IAAI,OAAA;IAIX,GAAG,CAAC,SAAS,EAAE,kBAAkB;IAGjC,GAAG,CAAC,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE,WAAW;IAOlD,IAAI,IAAI,WAEP;CACF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,EAAE,EAAE,cAAc,EAAE,eAAe;;EAiClG;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE;IAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAAE,SAAS,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"remap-component-ids.d.ts","sourceRoot":"","sources":["../../../../../../src/parser/cals/utils/block/helpers/remap-component-ids.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAK1D,aAAK,kBAAkB,GAAG,MAAM,CAAC;AACjC,aAAK,WAAW,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,eAAe;IAC9B,sCAAsC;IACtC,QAAQ,EAAE,UAAU,CAAC;IAErB,wCAAwC;IACxC,QAAQ,EAAE,UAAU,CAAC;CACtB;AAED,qBAAa,UAAU;;;IAMrB,GAAG,CAAC,GAAG,IAAI,OAAA;IAIX,GAAG,CAAC,SAAS,EAAE,kBAAkB;IAGjC,GAAG,CAAC,SAAS,EAAE,kBAAkB,EAAE,EAAE,EAAE,WAAW;IAOlD,IAAI,IAAI,WAEP;CACF;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,kBAAkB,EAAE,EAAE,cAAc,EAAE,eAAe;;EAiClG;AAED,wBAAgB,mBAAmB,CAAC,GAAG,EAAE;IAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,EAAE,SAAS,EAAE,kBAAkB,OAyD9G"}
|
|
@@ -109,13 +109,16 @@ function refreshComponentIds(ctx, component) {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
(_e = (_d = processed === null || processed === void 0 ? void 0 : processed.listeners) === null || _d === void 0 ? void 0 : _d.forEach) === null || _e === void 0 ? void 0 : _e.call(_d, (listener) => {
|
|
112
|
-
var _a, _b, _c;
|
|
112
|
+
var _a, _b, _c, _d;
|
|
113
113
|
if (((_a = listener === null || listener === void 0 ? void 0 : listener.handler) === null || _a === void 0 ? void 0 : _a.module) === 'platform' && ((_b = listener === null || listener === void 0 ? void 0 : listener.handler) === null || _b === void 0 ? void 0 : _b.name) === 'invoke') {
|
|
114
114
|
const oldId = (_c = listener.handler.params) === null || _c === void 0 ? void 0 : _c.component;
|
|
115
115
|
if (oldId && componentIdMap.has(oldId)) {
|
|
116
116
|
listener.handler.params.component = componentIdMap.get(oldId);
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
|
+
if ((_d = listener.handler) === null || _d === void 0 ? void 0 : _d[':code']) {
|
|
120
|
+
listener.handler[':code'] = (0, renew_id_in_code_1.renewIdInCode)(listener.handler[':code'], componentIdMap);
|
|
121
|
+
}
|
|
119
122
|
});
|
|
120
123
|
if (processed === null || processed === void 0 ? void 0 : processed.resources) {
|
|
121
124
|
processed.resources = processed.resources.map((item) => (0, renew_id_in_resource_1.renewIdInResource)(item, componentIdMap));
|
|
@@ -19,8 +19,21 @@ export interface ICalsReferenceContext {
|
|
|
19
19
|
referenceMap?: Record<string, boolean>;
|
|
20
20
|
strict?: boolean;
|
|
21
21
|
visiting?: IVisitedContext;
|
|
22
|
+
enableRestore?: boolean;
|
|
23
|
+
patchRef?: {
|
|
24
|
+
cals: Partial<Omit<IPlatformApp, 'items'>>;
|
|
25
|
+
page: Partial<Omit<IPageComponent, 'items'>>;
|
|
26
|
+
};
|
|
27
|
+
processPickedTeamplate?: (template: IBlockTemplate, options: {
|
|
28
|
+
ref: string;
|
|
29
|
+
component: IPlatformComponent;
|
|
30
|
+
}) => IBlockTemplate;
|
|
22
31
|
}
|
|
23
32
|
export declare function parseComponentCals(ctx: IParseContext, cals: IPlatformComponent): IParseContext;
|
|
33
|
+
export declare function regenBlockTemplateCals(ctx: ICalsReferenceContext & {
|
|
34
|
+
visiting: ICalsReferenceContext['visiting'];
|
|
35
|
+
componentIdMap?: Map<string, string>;
|
|
36
|
+
}, cals: IBlockTemplate['content']): IPlatformApp;
|
|
24
37
|
export declare function regenBlockTemplateComponents(ctx: ICalsReferenceContext & {
|
|
25
38
|
visiting: ICalsReferenceContext['visiting'];
|
|
26
39
|
componentIdMap?: Map<string, string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/block/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/parser/cals/utils/block/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.processPage2Template = exports.collapseComponentReference = exports.expandComponentReference = exports.mergeCals = exports.regenBlockTemplateComponents = exports.parseComponentCals = exports.VisitedMap = exports.refreshComponentIds = exports.remapComponentIds = exports.renewIdInResource = void 0;
|
|
17
|
+
exports.processPage2Template = exports.collapseComponentReference = exports.expandComponentReference = exports.mergeCals = exports.regenBlockTemplateComponents = exports.regenBlockTemplateCals = exports.parseComponentCals = exports.VisitedMap = exports.refreshComponentIds = exports.remapComponentIds = exports.renewIdInResource = void 0;
|
|
18
|
+
const types_1 = require("../../../../types");
|
|
18
19
|
const get_1 = __importDefault(require("lodash/get"));
|
|
19
20
|
const set_1 = __importDefault(require("lodash/set"));
|
|
20
21
|
const isEqual_1 = __importDefault(require("lodash/isEqual"));
|
|
@@ -29,6 +30,7 @@ const merge_resources_1 = require("./helpers/merge-resources");
|
|
|
29
30
|
const merge_dataset_1 = require("./helpers/merge-dataset");
|
|
30
31
|
const merge_listeners_1 = require("./helpers/merge-listeners");
|
|
31
32
|
const utils_1 = require("../../../../utils");
|
|
33
|
+
const renew_id_in_code_1 = require("./helpers/renew-id-in-code");
|
|
32
34
|
var renew_id_in_resource_2 = require("./helpers/renew-id-in-resource");
|
|
33
35
|
Object.defineProperty(exports, "renewIdInResource", { enumerable: true, get: function () { return renew_id_in_resource_2.renewIdInResource; } });
|
|
34
36
|
var remap_component_ids_2 = require("./helpers/remap-component-ids");
|
|
@@ -220,6 +222,25 @@ function parseValueCals(ctx, value) {
|
|
|
220
222
|
}
|
|
221
223
|
}
|
|
222
224
|
}
|
|
225
|
+
function regenBlockTemplateCals(ctx, cals) {
|
|
226
|
+
var _a, _b, _c;
|
|
227
|
+
const page = cals.items[0];
|
|
228
|
+
const { componentIdMap } = (0, remap_component_ids_1.remapComponentIds)(page.items, ctx.visiting);
|
|
229
|
+
page.items = regenBlockTemplateComponents(Object.assign(Object.assign({}, ctx), { componentIdMap }), page.items);
|
|
230
|
+
// 应用资源更新 ID
|
|
231
|
+
cals.resources = (_a = cals.resources) === null || _a === void 0 ? void 0 : _a.map((resource) => (0, renew_id_in_resource_1.renewIdInResource)(resource, componentIdMap));
|
|
232
|
+
// 页面资源更新 ID
|
|
233
|
+
page.resources = (_b = page.resources) === null || _b === void 0 ? void 0 : _b.map((resource) => (0, renew_id_in_resource_1.renewIdInResource)(resource, componentIdMap));
|
|
234
|
+
Object.keys(((_c = page === null || page === void 0 ? void 0 : page.dataset) === null || _c === void 0 ? void 0 : _c.query) || {}).forEach((key) => {
|
|
235
|
+
var _a, _b;
|
|
236
|
+
const query = (_b = (_a = page.dataset) === null || _a === void 0 ? void 0 : _a.query) === null || _b === void 0 ? void 0 : _b[key];
|
|
237
|
+
if ((query === null || query === void 0 ? void 0 : query.type) === types_1.EQueryType.GeneralFunc && query.handler[':code']) {
|
|
238
|
+
query.handler[':code'] = (0, renew_id_in_code_1.renewIdInCode)(query.handler[':code'], componentIdMap);
|
|
239
|
+
}
|
|
240
|
+
});
|
|
241
|
+
return cals;
|
|
242
|
+
}
|
|
243
|
+
exports.regenBlockTemplateCals = regenBlockTemplateCals;
|
|
223
244
|
function regenBlockTemplateComponents(ctx, components) {
|
|
224
245
|
let { componentIdMap } = ctx, restContext = __rest(ctx, ["componentIdMap"]);
|
|
225
246
|
if (!componentIdMap) {
|
|
@@ -235,7 +256,6 @@ exports.regenBlockTemplateComponents = regenBlockTemplateComponents;
|
|
|
235
256
|
* todo: dataForm 追加
|
|
236
257
|
*/
|
|
237
258
|
function mergeCals(ctx, list) {
|
|
238
|
-
var _a, _b;
|
|
239
259
|
const visitedContext = {
|
|
240
260
|
existing: new remap_component_ids_1.VisitedMap(),
|
|
241
261
|
untilNow: new remap_component_ids_1.VisitedMap(),
|
|
@@ -264,31 +284,48 @@ function mergeCals(ctx, list) {
|
|
|
264
284
|
* 组件id是页面隔离的，因此限制约定，只处理 0 号页面
|
|
265
285
|
*/
|
|
266
286
|
for (const { cals } of clonedCalsList) {
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
page.items = regenBlockTemplateComponents({ visiting: visitedContext, componentIdMap, blockTemplateMap: ctx.blockTemplateMap }, page.items);
|
|
270
|
-
// 应用资源更新 ID
|
|
271
|
-
cals.resources = (_a = cals.resources) === null || _a === void 0 ? void 0 : _a.map((resource) => (0, renew_id_in_resource_1.renewIdInResource)(resource, componentIdMap));
|
|
272
|
-
// 页面资源更新 ID
|
|
273
|
-
page.resources = (_b = page.resources) === null || _b === void 0 ? void 0 : _b.map((resource) => (0, renew_id_in_resource_1.renewIdInResource)(resource, componentIdMap));
|
|
287
|
+
// 包含副作用，修改 cals 上id 为新id
|
|
288
|
+
regenBlockTemplateCals({ visiting: visitedContext, blockTemplateMap: ctx.blockTemplateMap }, cals);
|
|
274
289
|
}
|
|
275
290
|
const mergedCals = clonedCalsList
|
|
276
291
|
.map((meta) => meta.cals)
|
|
277
292
|
.reduce((first, second) => {
|
|
278
|
-
|
|
279
|
-
const secondPage = second.items[0];
|
|
280
|
-
const mergedPage = Object.assign(Object.assign(Object.assign({}, secondPage), firstPage), { items: [...firstPage.items, ...secondPage.items], resources: (0, merge_resources_1.mergeResources)(firstPage.resources, secondPage.resources) || [], dataset: (0, merge_dataset_1.mergeDataset)(firstPage.dataset, secondPage.dataset) || {}, listeners: (0, merge_listeners_1.mergeListeners)(firstPage.listeners, secondPage.listeners) });
|
|
281
|
-
if (!mergedPage.listeners) {
|
|
282
|
-
delete mergedPage.listeners;
|
|
283
|
-
}
|
|
284
|
-
return Object.assign(Object.assign(Object.assign({}, second), first), { items: [mergedPage], resources: (0, merge_resources_1.mergeResources)(first.resources, second.resources) || [], dataset: (0, merge_dataset_1.mergeDataset)(first.dataset, second.dataset) || {} });
|
|
293
|
+
return pureMergeCals(first, second, () => [mergePage(first.items[0], second.items[0])]);
|
|
285
294
|
});
|
|
286
295
|
return mergedCals;
|
|
287
296
|
}
|
|
288
297
|
exports.mergeCals = mergeCals;
|
|
298
|
+
function pureMergeCals(first, second, resolveItems = (first, second) => {
|
|
299
|
+
return [...(first.items || []), ...(second.items || [])];
|
|
300
|
+
}) {
|
|
301
|
+
return Object.assign(Object.assign(Object.assign({}, second), first), { items: resolveItems(first, second), resources: (0, merge_resources_1.mergeResources)(first.resources, second.resources) || [], dataset: (0, merge_dataset_1.mergeDataset)(first.dataset, second.dataset) || {}, theme: first.theme || second.theme, extra: Object.assign(Object.assign({}, second.extra), first.extra), externalResources: mergeExternalResources(first.externalResources, second.externalResources) });
|
|
302
|
+
}
|
|
303
|
+
function mergeExternalResources(origin = [], current = []) {
|
|
304
|
+
const MAP = origin.reduce((map, item) => {
|
|
305
|
+
const { type, url, code } = item;
|
|
306
|
+
map[`${type}:${url}:${code}`] = item;
|
|
307
|
+
return map;
|
|
308
|
+
}, {});
|
|
309
|
+
return [
|
|
310
|
+
...origin,
|
|
311
|
+
...current.filter((item) => {
|
|
312
|
+
const { type, url, code } = item;
|
|
313
|
+
return !MAP[`${type}:${url}:${code}`];
|
|
314
|
+
}),
|
|
315
|
+
];
|
|
316
|
+
}
|
|
317
|
+
function mergePage(firstPage, secondPage, resolveItems = (first, second) => {
|
|
318
|
+
return [...(first.items || []), ...(second.items || [])];
|
|
319
|
+
}) {
|
|
320
|
+
const mergedPage = Object.assign(Object.assign(Object.assign({}, secondPage), firstPage), { items: resolveItems(firstPage, secondPage), resources: (0, merge_resources_1.mergeResources)(firstPage.resources, secondPage.resources) || [], dataset: (0, merge_dataset_1.mergeDataset)(firstPage.dataset, secondPage.dataset) || {}, listeners: (0, merge_listeners_1.mergeListeners)(firstPage.listeners, secondPage.listeners), attributes: Object.assign(Object.assign({}, secondPage.attributes), firstPage.attributes), extra: Object.assign(Object.assign({}, secondPage.extra), firstPage.extra) });
|
|
321
|
+
if (!mergedPage.listeners) {
|
|
322
|
+
delete mergedPage.listeners;
|
|
323
|
+
}
|
|
324
|
+
return mergedPage;
|
|
325
|
+
}
|
|
289
326
|
function expandComponentReference(ctx, component) {
|
|
290
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k
|
|
291
|
-
const { blockTemplateMap, strict } = ctx;
|
|
327
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
328
|
+
const { blockTemplateMap, strict, enableRestore, processPickedTeamplate = (template) => template } = ctx;
|
|
292
329
|
const { extra = {}, id, component: componentName } = component;
|
|
293
330
|
const { ref } = extra;
|
|
294
331
|
if (ref) {
|
|
@@ -301,23 +338,34 @@ function expandComponentReference(ctx, component) {
|
|
|
301
338
|
return undefined;
|
|
302
339
|
}
|
|
303
340
|
}
|
|
304
|
-
const block = blockTemplateMap[ref];
|
|
305
|
-
const
|
|
341
|
+
const block = processPickedTeamplate((0, cloneDeep_1.default)(blockTemplateMap[ref]), { ref, component });
|
|
342
|
+
const cals = regenBlockTemplateCals(Object.assign(Object.assign({}, ctx), { referenceMap: Object.assign(Object.assign({}, ctx.referenceMap), { [ref]: true }) }), block.content);
|
|
343
|
+
if (ctx.patchRef) {
|
|
344
|
+
const global = ctx.patchRef.cals;
|
|
345
|
+
const page = ctx.patchRef.page;
|
|
346
|
+
if (page) {
|
|
347
|
+
Object.assign(page, mergePage(page, cals.items[0]), () => []);
|
|
348
|
+
}
|
|
349
|
+
if (global) {
|
|
350
|
+
Object.assign(global, pureMergeCals(global, cals), () => []);
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
const blockContent = (_b = cals.items[0].items) === null || _b === void 0 ? void 0 : _b[0];
|
|
306
354
|
/**
|
|
307
355
|
* 动态配置协议有修改未定
|
|
308
356
|
* 因此先写死限制
|
|
309
357
|
*/
|
|
310
|
-
if (!((
|
|
358
|
+
if (!((_c = blockContent === null || blockContent === void 0 ? void 0 : blockContent.extra) === null || _c === void 0 ? void 0 : _c.dataForm) &&
|
|
311
359
|
blockContent.component === 'Container' &&
|
|
312
|
-
(((
|
|
313
|
-
((
|
|
314
|
-
((
|
|
315
|
-
blockContent.extra = Object.assign(Object.assign({}, blockContent.extra), { dataForm: { data: (
|
|
360
|
+
(((_d = blockContent.attributes) === null || _d === void 0 ? void 0 : _d.data) || ((_e = blockContent.attributes) === null || _e === void 0 ? void 0 : _e[':data'])) &&
|
|
361
|
+
((_f = block.dynamicConfig) === null || _f === void 0 ? void 0 : _f.type) === 'object' &&
|
|
362
|
+
((_g = block.dynamicConfig) === null || _g === void 0 ? void 0 : _g.properties.configs)) {
|
|
363
|
+
blockContent.extra = Object.assign(Object.assign({}, blockContent.extra), { dataForm: { data: (_h = block.dynamicConfig) === null || _h === void 0 ? void 0 : _h.properties.configs } });
|
|
316
364
|
}
|
|
317
365
|
const { attributes: blockAttributes = {} } = blockContent;
|
|
318
366
|
return Object.assign(Object.assign({}, blockContent), {
|
|
319
367
|
// todo: 这里合并有问题，无法简单的合并
|
|
320
|
-
attributes: Object.assign(Object.assign({}, blockAttributes), component.attributes), ':style': component[':style'] || blockContent[':style'], ':class': component[':class'] || blockContent[':class'], extra: Object.assign(Object.assign({}, blockContent.extra), { refAttributes: Object.keys(blockAttributes) ? blockAttributes : undefined, ref }) });
|
|
368
|
+
attributes: Object.assign(Object.assign({}, blockAttributes), component.attributes), ':style': component[':style'] || blockContent[':style'], ':class': component[':class'] || blockContent[':class'], extra: Object.assign(Object.assign({}, blockContent.extra), { refAttributes: enableRestore && Object.keys(blockAttributes) ? blockAttributes : undefined, ref: enableRestore ? ref : undefined }) });
|
|
321
369
|
}
|
|
322
370
|
else {
|
|
323
371
|
if (strict) {
|
|
@@ -328,7 +376,7 @@ function expandComponentReference(ctx, component) {
|
|
|
328
376
|
}
|
|
329
377
|
}
|
|
330
378
|
}
|
|
331
|
-
return Object.assign(Object.assign({}, component), { items: (
|
|
379
|
+
return Object.assign(Object.assign({}, component), { items: (_k = (_j = component.items) === null || _j === void 0 ? void 0 : _j.map) === null || _k === void 0 ? void 0 : _k.call(_j, (item) => expandComponentReference(ctx, item)) });
|
|
332
380
|
}
|
|
333
381
|
exports.expandComponentReference = expandComponentReference;
|
|
334
382
|
function collapseComponentReference(ctx, component) {
|
package/lib/parser/index.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ export * from './cals/index';
|
|
|
2
2
|
export { upgrageToVersion2 } from './cals/utils/version';
|
|
3
3
|
export { processComponentModule } from './cals/utils/spinoff';
|
|
4
4
|
export { calsToCode, codeToCals, type ICodeItem, checkForConflicts, autoResolveConflicts, findAllConflicts, } from './cals/utils/code';
|
|
5
|
-
export { parseComponentCals, regenBlockTemplateComponents, processPage2Template, renewIdInResource, VisitedMap, remapComponentIds, refreshComponentIds, mergeCals, } from './cals/utils/block';
|
|
5
|
+
export { parseComponentCals, regenBlockTemplateCals, regenBlockTemplateComponents, processPage2Template, renewIdInResource, VisitedMap, remapComponentIds, refreshComponentIds, mergeCals, } from './cals/utils/block';
|
|
6
6
|
export { ActionType, type IDataBind, PropBindType } from './expression/index';
|
|
7
7
|
export { processCommonStyle2CSSProperties, processCSSProperties2Rem, processCSSPropertiesUnit, } from './cals/utils/style';
|
|
8
8
|
export { getUsedResources, getNavUsedStaticResource, _simpleGetUsedResourceOfComponent, } from './cals/utils/getUsedResources';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,UAAU,EACV,UAAU,EACV,KAAK,SAAS,EACd,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,4BAA4B,EAC5B,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,gCAAgC,EAChC,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/parser/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EACL,UAAU,EACV,UAAU,EACV,KAAK,SAAS,EACd,iBAAiB,EACjB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,kBAAkB,EAClB,sBAAsB,EACtB,4BAA4B,EAC5B,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,iBAAiB,EACjB,mBAAmB,EACnB,SAAS,GACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAC9E,OAAO,EACL,gCAAgC,EAChC,wBAAwB,EACxB,wBAAwB,GACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,iCAAiC,GAClC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEjE,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,4BAA4B,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC"}
|
package/lib/parser/index.js
CHANGED
|
@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
17
17
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
18
18
|
};
|
|
19
19
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
20
|
-
exports.DYNAMIC_KEY_REG = exports.walkThroughComponents = exports.Dependencies = exports.PostcssRpx2Calc = exports.getUsedReference = exports._simpleGetUsedResourceOfComponent = exports.getNavUsedStaticResource = exports.getUsedResources = exports.processCSSPropertiesUnit = exports.processCSSProperties2Rem = exports.processCommonStyle2CSSProperties = exports.PropBindType = exports.ActionType = exports.mergeCals = exports.refreshComponentIds = exports.remapComponentIds = exports.VisitedMap = exports.renewIdInResource = exports.processPage2Template = exports.regenBlockTemplateComponents = exports.parseComponentCals = exports.findAllConflicts = exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = exports.processComponentModule = exports.upgrageToVersion2 = void 0;
|
|
20
|
+
exports.DYNAMIC_KEY_REG = exports.walkThroughComponents = exports.Dependencies = exports.PostcssRpx2Calc = exports.getUsedReference = exports._simpleGetUsedResourceOfComponent = exports.getNavUsedStaticResource = exports.getUsedResources = exports.processCSSPropertiesUnit = exports.processCSSProperties2Rem = exports.processCommonStyle2CSSProperties = exports.PropBindType = exports.ActionType = exports.mergeCals = exports.refreshComponentIds = exports.remapComponentIds = exports.VisitedMap = exports.renewIdInResource = exports.processPage2Template = exports.regenBlockTemplateComponents = exports.regenBlockTemplateCals = exports.parseComponentCals = exports.findAllConflicts = exports.autoResolveConflicts = exports.checkForConflicts = exports.codeToCals = exports.calsToCode = exports.processComponentModule = exports.upgrageToVersion2 = void 0;
|
|
21
21
|
__exportStar(require("./cals/index"), exports);
|
|
22
22
|
var version_1 = require("./cals/utils/version");
|
|
23
23
|
Object.defineProperty(exports, "upgrageToVersion2", { enumerable: true, get: function () { return version_1.upgrageToVersion2; } });
|
|
@@ -31,6 +31,7 @@ Object.defineProperty(exports, "autoResolveConflicts", { enumerable: true, get:
|
|
|
31
31
|
Object.defineProperty(exports, "findAllConflicts", { enumerable: true, get: function () { return code_1.findAllConflicts; } });
|
|
32
32
|
var block_1 = require("./cals/utils/block");
|
|
33
33
|
Object.defineProperty(exports, "parseComponentCals", { enumerable: true, get: function () { return block_1.parseComponentCals; } });
|
|
34
|
+
Object.defineProperty(exports, "regenBlockTemplateCals", { enumerable: true, get: function () { return block_1.regenBlockTemplateCals; } });
|
|
34
35
|
Object.defineProperty(exports, "regenBlockTemplateComponents", { enumerable: true, get: function () { return block_1.regenBlockTemplateComponents; } });
|
|
35
36
|
Object.defineProperty(exports, "processPage2Template", { enumerable: true, get: function () { return block_1.processPage2Template; } });
|
|
36
37
|
Object.defineProperty(exports, "renewIdInResource", { enumerable: true, get: function () { return block_1.renewIdInResource; } });
|
package/lib/utils/constant.d.ts
CHANGED
|
@@ -36,6 +36,7 @@ export declare const WEDA_COMP_DEPENDENCIES_PREFIX: string;
|
|
|
36
36
|
*/
|
|
37
37
|
export declare const OFFICIAL_LIB_KEY = "gsd-h5-react";
|
|
38
38
|
export declare const OFFICIAL_LIB_MP_NPM_PACKAGENAME = "@cloudbase/weda-ui-mp";
|
|
39
|
+
export declare const OFFICIAL_LIB_NPM_PACKAGENAME = "@cloudbase/weda-ui";
|
|
39
40
|
/**
|
|
40
41
|
* 官方低码组件库标识
|
|
41
42
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../src/utils/constant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,oBAAY,iBAAiB;IAC3B,UAAU,eAAe;CAC1B;AACD;;GAEG;AACH,eAAO,MAAM,aAAa,SAAS,CAAC;AAEpC,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,6BAA6B,QAAqD,CAAC;AAEhG;;GAEG;AACH,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAC/C,eAAO,MAAM,+BAA+B,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"constant.d.ts","sourceRoot":"","sources":["../../src/utils/constant.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,oBAAY,iBAAiB;IAC3B,UAAU,eAAe;CAC1B;AACD;;GAEG;AACH,eAAO,MAAM,aAAa,SAAS,CAAC;AAEpC,eAAO,MAAM,uBAAuB,WAAW,CAAC;AAEhD;;GAEG;AACH,eAAO,MAAM,6BAA6B,QAAqD,CAAC;AAEhG;;GAEG;AACH,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAC/C,eAAO,MAAM,+BAA+B,0BAA0B,CAAC;AACvE,eAAO,MAAM,4BAA4B,uBAAuB,CAAC;AAEjE;;GAEG;AACH,eAAO,MAAM,2BAA2B,uBAAuB,CAAC;AAEhE;;GAEG;AACH,eAAO,MAAM,0BAA0B,wBAAwB,CAAC;AAEhE;;GAEG;AACH,eAAO,MAAM,aAAa,UAA8E,CAAC;AAEzG;;GAEG;AAEH,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAE9C;;GAEG;AACH,eAAO,MAAM,sBAAsB,EAAE,aAIpC,CAAC;AAEF,oBAAY,kBAAkB;IAC5B,KAAK,UAAU;IACf,KAAK,UAAU;IACf,KAAK,UAAU;CAChB"}
|
package/lib/utils/constant.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SEMVER_VERSION_TAG = exports.BASE_CALS_DEPENDENCIES = exports.SPINOFF_SUFFIX = exports.OFFICIAL_LIBS = exports.OFFICIAL_BUSINESS_LIB_NAME = exports.OFFICIAL_COMPONENT_LIB_NAME = exports.OFFICIAL_LIB_MP_NPM_PACKAGENAME = exports.OFFICIAL_LIB_KEY = exports.WEDA_COMP_DEPENDENCIES_PREFIX = exports.WEDA_OFFICIAL_NAMESPACE = exports.WEDA_PROTOCOL = exports.DEPENDENCIES_TYPE = void 0;
|
|
3
|
+
exports.SEMVER_VERSION_TAG = exports.BASE_CALS_DEPENDENCIES = exports.SPINOFF_SUFFIX = exports.OFFICIAL_LIBS = exports.OFFICIAL_BUSINESS_LIB_NAME = exports.OFFICIAL_COMPONENT_LIB_NAME = exports.OFFICIAL_LIB_NPM_PACKAGENAME = exports.OFFICIAL_LIB_MP_NPM_PACKAGENAME = exports.OFFICIAL_LIB_KEY = exports.WEDA_COMP_DEPENDENCIES_PREFIX = exports.WEDA_OFFICIAL_NAMESPACE = exports.WEDA_PROTOCOL = exports.DEPENDENCIES_TYPE = void 0;
|
|
4
4
|
/**
|
|
5
5
|
* 格式和npm一样
|
|
6
6
|
* 格式：{ '@命名空间/组件库名称': <protocal>:<path>?v=<版本号> } 遵循URL规范
|
|
@@ -39,6 +39,7 @@ exports.WEDA_COMP_DEPENDENCIES_PREFIX = `${exports.WEDA_PROTOCOL}:${DEPENDENCIES
|
|
|
39
39
|
*/
|
|
40
40
|
exports.OFFICIAL_LIB_KEY = 'gsd-h5-react';
|
|
41
41
|
exports.OFFICIAL_LIB_MP_NPM_PACKAGENAME = '@cloudbase/weda-ui-mp';
|
|
42
|
+
exports.OFFICIAL_LIB_NPM_PACKAGENAME = '@cloudbase/weda-ui';
|
|
42
43
|
/**
|
|
43
44
|
* 官方低码组件库标识
|
|
44
45
|
*/
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/cals",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.14-alpha.0",
|
|
4
4
|
"description": "Common application specifications",
|
|
5
5
|
"main": "lib/utils/index.js",
|
|
6
6
|
"source": "src/utils/index.ts",
|
|
@@ -57,6 +57,7 @@
|
|
|
57
57
|
"jsdom-worker": "^0.3.0",
|
|
58
58
|
"json-schema-to-typescript-for-browser": "^11.0.3",
|
|
59
59
|
"minimist": "^1.2.8",
|
|
60
|
+
"node-fetch": "^2.6.7",
|
|
60
61
|
"node-watch": "^0.7.3",
|
|
61
62
|
"ts-node": "^10.4.0",
|
|
62
63
|
"tsc-watch": "^6.0.4",
|