@cloudbase/framework-plugin-low-code 0.7.30 → 0.7.33
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/builder/mp/util.d.ts.map +1 -1
- package/lib/builder/mp/util.js +4 -0
- package/lib/builder/mp/wxml.d.ts.map +1 -1
- package/lib/builder/mp/wxml.js +8 -18
- package/lib/builder/service/builder/copy.d.ts.map +1 -1
- package/lib/builder/service/builder/copy.js +6 -2
- package/lib/builder/service/builder/generate.d.ts.map +1 -1
- package/lib/builder/service/builder/generate.js +12 -23
- package/lib/builder/service/builder/webpack.d.ts.map +1 -1
- package/lib/builder/service/builder/webpack.js +1 -6
- package/lib/weapps-core/types/app.d.ts +1 -0
- package/lib/weapps-core/types/app.d.ts.map +1 -1
- package/lib/weapps-core/utils/file.d.ts +1 -1
- package/lib/weapps-core/utils/formily.d.ts.map +1 -1
- package/lib/weapps-core/utils/formily.js +12 -3
- package/package.json +2 -2
- package/template/html/index.html.ejs +1 -1
- package/template/mp/common/util.js +1 -0
- package/template/mp/common/widget.js +375 -209
- package/template/mp/component/index.js +1 -1
- package/template/mp/page/index.js +1 -1
- package/template/src/handlers/FieldMiddleware/renderer.jsx +6 -3
- package/template/src/handlers/render.jsx +16 -4
- package/template/src/handlers/utils/widgets.js +160 -76
- package/template/src/index.jsx +3 -1
- package/template/src/pages/composite.tpl +17 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,uBAAuB,EAKxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,wBAAgB,kBAAkB,
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/util.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EACb,uBAAuB,EAKxB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI/C,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,OAepF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAA;CAAE;;;EAa1E;AAGD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,UA0CnD;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EAAE,GAAG,EAAE,aAAa,MAuBxG;AAED,wBAAgB,mBAAmB,CACjC,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,YAAY,EAAE,MAAM,EACpB,GAAG,EAAE,aAAa,MA6FnB;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EAAE,GAAG,EAAE,aAAa,MA2CtG"}
|
package/lib/builder/mp/util.js
CHANGED
|
@@ -6,6 +6,7 @@ const weapp_1 = require("../util/weapp");
|
|
|
6
6
|
const wxml_1 = require("./wxml");
|
|
7
7
|
const mp_1 = require("../config/mp");
|
|
8
8
|
function extractWidgetProps(props) {
|
|
9
|
+
var _a, _b;
|
|
9
10
|
const { classList } = props;
|
|
10
11
|
const staticProps = {
|
|
11
12
|
style: (0, weapps_core_1.toCssStyle)(props.commonStyle, {
|
|
@@ -16,6 +17,9 @@ function extractWidgetProps(props) {
|
|
|
16
17
|
};
|
|
17
18
|
const { data = {} } = props;
|
|
18
19
|
Object.assign(staticProps, generatedDynamicData(data).staticProps);
|
|
20
|
+
if ((_a = props.directives) === null || _a === void 0 ? void 0 : _a.waForKey) {
|
|
21
|
+
staticProps._waForKey = (_b = props.directives) === null || _b === void 0 ? void 0 : _b.waForKey.value;
|
|
22
|
+
}
|
|
19
23
|
return staticProps;
|
|
20
24
|
}
|
|
21
25
|
exports.extractWidgetProps = extractWidgetProps;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,uBAAuB,EAAgB,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAU1G,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAkB/C,wBAAgB,YAAY,CAC1B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,MAAM,EAAE,MAAM,EACd,cAAc,KAAA,EACd,GAAG,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,EACxC,eAAe,KAAA,EACf,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,KAAA,KAAK,IAAI,UAqS7D;AAyBD,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAE,eAAoB,UAQtG;AAmBD,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,uBAAuB,CAAA;CAAE,EACnD,QAAQ,GAAE;IAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAA;CAAO;;EAYlD"}
|
package/lib/builder/mp/wxml.js
CHANGED
|
@@ -25,9 +25,7 @@ const name_mangler_1 = __importDefault(require("../util/name-mangler"));
|
|
|
25
25
|
const error = chalk_1.default.redBright;
|
|
26
26
|
function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nodeTransform) {
|
|
27
27
|
var _a;
|
|
28
|
-
const nameMangler = ctx.isProduction
|
|
29
|
-
? new name_mangler_1.default({ blackList: mp_1.builtinMpTags })
|
|
30
|
-
: undefined;
|
|
28
|
+
const nameMangler = ctx.isProduction ? new name_mangler_1.default({ blackList: mp_1.builtinMpTags }) : undefined;
|
|
31
29
|
const xmlJson = {
|
|
32
30
|
elements: [
|
|
33
31
|
{
|
|
@@ -65,11 +63,11 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
|
|
|
65
63
|
];
|
|
66
64
|
}
|
|
67
65
|
function createXml(widgets, parent = null, parentForNodes = []) {
|
|
68
|
-
var _a;
|
|
66
|
+
var _a, _b;
|
|
69
67
|
const elements = [];
|
|
70
68
|
for (const id in widgets) {
|
|
71
69
|
const { xComponent, xProps, properties, xIndex } = widgets[id];
|
|
72
|
-
const { data: data0 = {}, listeners = [], directives = {}, staticResourceAttribute = ['src']
|
|
70
|
+
const { data: data0 = {}, listeners = [], directives = {}, staticResourceAttribute = ['src'] } = xProps || {};
|
|
73
71
|
const data = Object.assign({}, data0);
|
|
74
72
|
if (directives.waIf && directives.waIf.value === false) {
|
|
75
73
|
continue;
|
|
@@ -114,17 +112,13 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
|
|
|
114
112
|
.join('')}.`;
|
|
115
113
|
const idAttr = curForNodes.length < 1
|
|
116
114
|
? id
|
|
117
|
-
: `{{'${id}'${curForNodes
|
|
118
|
-
.map((forNodeId) => `+ '-' + ${wxmlDataPrefix.forIndex}${forNodeId}`)
|
|
119
|
-
.join('')}}}`;
|
|
115
|
+
: `{{'${id}'${curForNodes.map((forNodeId) => `+ '-' + ${wxmlDataPrefix.forIndex}${forNodeId}`).join('')}}}`;
|
|
120
116
|
if (tagName === 'slot') {
|
|
121
117
|
const slotNode = {
|
|
122
118
|
type: 'element',
|
|
123
119
|
name: tagName,
|
|
124
120
|
attributes: {
|
|
125
|
-
name: data0.name.type && data0.name.type !== 'static'
|
|
126
|
-
? `{{${id}.name}}`
|
|
127
|
-
: data0.name.value,
|
|
121
|
+
name: data0.name.type && data0.name.type !== 'static' ? `{{${id}.name}}` : data0.name.value,
|
|
128
122
|
},
|
|
129
123
|
elements: [],
|
|
130
124
|
_order: xIndex || 0,
|
|
@@ -162,7 +156,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
|
|
|
162
156
|
.map((forNodeId) => `[${wxmlDataPrefix.forIndex}${forNodeId}]`)
|
|
163
157
|
.join('')}`);
|
|
164
158
|
node.attributes['wx:for-index'] = wxmlDataPrefix.forIndex + id;
|
|
165
|
-
node.attributes['wx:key'] = '
|
|
159
|
+
node.attributes['wx:key'] = node.attributes['wx:key'] = ((_b = directives.waForKey) === null || _b === void 0 ? void 0 : _b.value) ? '_key' : '$$i';
|
|
166
160
|
}
|
|
167
161
|
const compSchema = componentProto.dataForm;
|
|
168
162
|
for (const prop in data) {
|
|
@@ -211,9 +205,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
|
|
|
211
205
|
}
|
|
212
206
|
}
|
|
213
207
|
node.elements = node.elements.concat(createXml(properties, node, curForNodes));
|
|
214
|
-
if (tagName === 'swiper' ||
|
|
215
|
-
componentKey === 'weda:Swiper' ||
|
|
216
|
-
componentKey === 'gsd-h5-react:Swiper') {
|
|
208
|
+
if (tagName === 'swiper' || componentKey === 'weda:Swiper' || componentKey === 'gsd-h5-react:Swiper') {
|
|
217
209
|
node.elements = node.elements.map((item, index) => {
|
|
218
210
|
var _a, _b;
|
|
219
211
|
let _c = item.attributes || {}, { ['wx:for']: wxFor, ['wx:for-index']: wxForIndex, ['wx:key']: wxKey, ['wx:if']: wxIf } = _c, itemRestKey = __rest(_c, ['wx:for', 'wx:for-index', 'wx:key', 'wx:if']);
|
|
@@ -304,7 +296,5 @@ exports.getUsedComponents = getUsedComponents;
|
|
|
304
296
|
function getAttrBind(dVale, widgetBind, isStaticResource) {
|
|
305
297
|
const { type, value } = dVale;
|
|
306
298
|
const attrVal = type === weapps_core_1.PropBindType.prop ? value : widgetBind;
|
|
307
|
-
return isStaticResource
|
|
308
|
-
? `{{wxsUtils._getStaticResourceAttribute(${attrVal})}}`
|
|
309
|
-
: `{{${attrVal}}}`;
|
|
299
|
+
return isStaticResource ? `{{wxsUtils._getStaticResourceAttribute(${attrVal})}}` : `{{${attrVal}}}`;
|
|
310
300
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/copy.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,aAAa,EACb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAwB,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/copy.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,aAAa,EACb,kBAAkB,EAIlB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAwB,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAI9E,wBAAsB,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,cAAc,KAAA,iBActG;AAED,wBAAsB,qBAAqB,CACzC,YAAY,6BAAsB,EAClC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,iBAiEpB;AAED,wBAAsB,8BAA8B,CAClD,YAAY,6BAAsB,EAClC,WAAW,EAAE,MAAM,EACnB,oBAAoB;;qBAEH,OAAO;;;;;;aAMlB,EACN,iBAAiB,EAAE,kBAAkB,iBAkGtC"}
|
|
@@ -75,6 +75,11 @@ function copyMaterialLibraries(dependencies = [], materialsDir, appBuildDir) {
|
|
|
75
75
|
return !junk.is(path[path.length - 1]);
|
|
76
76
|
},
|
|
77
77
|
});
|
|
78
|
+
const nodeModulesPath = path_1.default.join(materialDir, 'node_modules');
|
|
79
|
+
const targetNodeModulesPath = path_1.default.join(librariesDir, 'node_modules');
|
|
80
|
+
if (fs_extra_1.default.existsSync(nodeModulesPath) && !fs_extra_1.default.existsSync(targetNodeModulesPath)) {
|
|
81
|
+
yield fs_extra_1.default.symlink(nodeModulesPath, targetNodeModulesPath, 'dir');
|
|
82
|
+
}
|
|
78
83
|
try {
|
|
79
84
|
const meta = (0, util_1.readComponentLibMata)(librariesDir);
|
|
80
85
|
if (meta === null || meta === void 0 ? void 0 : meta.schemaVersion) {
|
|
@@ -131,8 +136,7 @@ function genCompositeComponentLibraries(dependencies = [], appBuildDir, material
|
|
|
131
136
|
}),
|
|
132
137
|
compConfig: compItem.compConfig || {},
|
|
133
138
|
emitEvents: JSON.stringify(compItem.emitEvents.map((evt) => evt.eventName)),
|
|
134
|
-
handlersImports: compItem.lowCodes.filter((codeItem) => codeItem.type === 'handler-fn' &&
|
|
135
|
-
codeItem.name !== '____index____'),
|
|
139
|
+
handlersImports: compItem.lowCodes.filter((codeItem) => codeItem.type === 'handler-fn' && codeItem.name !== '____index____'),
|
|
136
140
|
useComponents: (function () {
|
|
137
141
|
const list = [];
|
|
138
142
|
JSON.stringify(compItem.componentInstances, (key, value) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/generate.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAGxD,OAAO,EACL,aAAa,EACb,aAAa,EACb,iBAAiB,EAEjB,oBAAoB,EACpB,eAAe,EAEf,aAAa,EAEb,kBAAkB,EAWlB,kBAAkB,EACnB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,7 +78,7 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
|
|
|
78
78
|
return __awaiter(this, void 0, void 0, function* () {
|
|
79
79
|
const fixedDependencies = dependencies;
|
|
80
80
|
const { componentSchemaJson, pluginInstances, listenerInstances: pageListenerInstances, style: PageStyle, data, } = pageInstance;
|
|
81
|
-
const { originComponentList, originActionList
|
|
81
|
+
const { originComponentList, originActionList } = getOriginComponentAndActionList(componentSchemaJson, fixedDependencies);
|
|
82
82
|
const componentsMeta = yield (0, util_1.getComponentsInfo)(appBuildDir, dependencies);
|
|
83
83
|
const originPluginList = getOriginPluginList(pluginInstances, dependencies);
|
|
84
84
|
pullActionToListByInstances(pageListenerInstances, originActionList, fixedDependencies);
|
|
@@ -127,7 +127,7 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
|
|
|
127
127
|
isComposite: extraData.isComposite,
|
|
128
128
|
compProps: extraData.compProps,
|
|
129
129
|
title: data.navigationBarTitleText || data.title || '',
|
|
130
|
-
reachBottomDistance: data.reachBottomDistance || 0
|
|
130
|
+
reachBottomDistance: data.reachBottomDistance || 0,
|
|
131
131
|
};
|
|
132
132
|
const dest = path_1.default.resolve(appBuildDir, `./pages/${pageInstance.id}/index.jsx`);
|
|
133
133
|
const template = yield fs_extra_1.default.readFile(path_1.default.resolve(config_1.appTemplateDir, './src/pages/app.tpl'), {
|
|
@@ -148,7 +148,7 @@ function getOriginComponentAndActionList(componentSchema, fixedDependencies, ori
|
|
|
148
148
|
if (fieldSchema.isObject()) {
|
|
149
149
|
const { 'x-props': xProps } = fieldSchema;
|
|
150
150
|
if (xProps) {
|
|
151
|
-
const { listenerInstances, sourceKey
|
|
151
|
+
const { listenerInstances, sourceKey } = xProps;
|
|
152
152
|
pullComponentToListByInstance(sourceKey, originComponentList, fixedDependencies);
|
|
153
153
|
pullActionToListByInstances(listenerInstances, originActionList, fixedDependencies);
|
|
154
154
|
}
|
|
@@ -236,9 +236,7 @@ exports.pullComponentToListByInstance = pullComponentToListByInstance;
|
|
|
236
236
|
function getVirtualFieldsString(components) {
|
|
237
237
|
const fields = components.reduce((result, component) => {
|
|
238
238
|
const { name, materialName, variableName, isPlainProps } = component;
|
|
239
|
-
result[`${materialName}:${name}`] = `%%%React.forwardRef((props, ref) => <${lodash_1.default.upperFirst(variableName)} ${isPlainProps
|
|
240
|
-
? '{...resolveComponentProps(props, 1)}'
|
|
241
|
-
: '{...resolveComponentProps(props, 0)}'} ref={ref} pageVirtualFields={virtualFields}/>)%%%`;
|
|
239
|
+
result[`${materialName}:${name}`] = `%%%React.forwardRef((props, ref) => <${lodash_1.default.upperFirst(variableName)} ${isPlainProps ? '{...resolveComponentProps(props, 1)}' : '{...resolveComponentProps(props, 0)}'} ref={ref} pageVirtualFields={virtualFields}/>)%%%`;
|
|
242
240
|
return result;
|
|
243
241
|
}, {});
|
|
244
242
|
return JSON.stringify(fields, null, 2).replace(/"%%%(.*?)%%%"/g, function (match, expression) {
|
|
@@ -273,9 +271,7 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
|
|
|
273
271
|
schema['emitEvents'] = componentInfo.emitEvents.map((item) => item.eventName);
|
|
274
272
|
}
|
|
275
273
|
if (!isSlot(schema) && schema.key) {
|
|
276
|
-
compWidgets[schema.key] = Object.assign(Object.assign({}, data), { style: (0, weapps_core_1.toCssStyle)(commonStyle), classList: classNameList, widgetType: sourceKey, _parentId: isSlot(schema.parent)
|
|
277
|
-
? (_g = (_f = schema === null || schema === void 0 ? void 0 : schema.parent) === null || _f === void 0 ? void 0 : _f.parent) === null || _g === void 0 ? void 0 : _g.key
|
|
278
|
-
: (_h = schema === null || schema === void 0 ? void 0 : schema.parent) === null || _h === void 0 ? void 0 : _h.key });
|
|
274
|
+
compWidgets[schema.key] = Object.assign(Object.assign({}, data), { style: (0, weapps_core_1.toCssStyle)(commonStyle), classList: classNameList, widgetType: sourceKey, _parentId: isSlot(schema.parent) ? (_g = (_f = schema === null || schema === void 0 ? void 0 : schema.parent) === null || _f === void 0 ? void 0 : _f.parent) === null || _g === void 0 ? void 0 : _g.key : (_h = schema === null || schema === void 0 ? void 0 : schema.parent) === null || _h === void 0 ? void 0 : _h.key });
|
|
279
275
|
if (dataBinds.length > 0) {
|
|
280
276
|
compDataBinds[schema.key] = generateDataBinds(dataBinds, isComposite);
|
|
281
277
|
}
|
|
@@ -304,8 +300,7 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
|
|
|
304
300
|
if (propsVaule && Array.isArray(propsVaule)) {
|
|
305
301
|
propsVaule.map((block) => {
|
|
306
302
|
var _a, _b;
|
|
307
|
-
const blockInstance = (block === null || block === void 0 ? void 0 : block.selectableBlock) &&
|
|
308
|
-
((_b = (_a = block === null || block === void 0 ? void 0 : block.selectableBlock) === null || _a === void 0 ? void 0 : _a['x-props']) === null || _b === void 0 ? void 0 : _b.listenerInstances);
|
|
303
|
+
const blockInstance = (block === null || block === void 0 ? void 0 : block.selectableBlock) && ((_b = (_a = block === null || block === void 0 ? void 0 : block.selectableBlock) === null || _a === void 0 ? void 0 : _a['x-props']) === null || _b === void 0 ? void 0 : _b.listenerInstances);
|
|
309
304
|
if (blockInstance) {
|
|
310
305
|
block.selectableBlock['x-props'].listenerInstances = generateListnerInstances(blockInstance, isComposite);
|
|
311
306
|
}
|
|
@@ -333,8 +328,7 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
|
|
|
333
328
|
if (xProps['dataBinds'] && xProps['dataBinds'].length === 0) {
|
|
334
329
|
delete xProps['dataBinds'];
|
|
335
330
|
}
|
|
336
|
-
if (xProps['listenerInstances'] &&
|
|
337
|
-
xProps['listenerInstances'].length === 0) {
|
|
331
|
+
if (xProps['listenerInstances'] && xProps['listenerInstances'].length === 0) {
|
|
338
332
|
delete xProps['listenerInstances'];
|
|
339
333
|
}
|
|
340
334
|
if (xProps['data']) {
|
|
@@ -345,8 +339,7 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
|
|
|
345
339
|
if (xPropsData.title === '') {
|
|
346
340
|
delete xPropsData.title;
|
|
347
341
|
}
|
|
348
|
-
if (xPropsData.staticResourceAttribute &&
|
|
349
|
-
xPropsData.staticResourceAttribute.length === 0) {
|
|
342
|
+
if (xPropsData.staticResourceAttribute && xPropsData.staticResourceAttribute.length === 0) {
|
|
350
343
|
delete xPropsData.staticResourceAttribute;
|
|
351
344
|
}
|
|
352
345
|
if ((0, weapps_core_1.isEmptyObj)(xPropsData)) {
|
|
@@ -546,7 +539,7 @@ function getPluginImportStringArr(plugins, pluginImportStringArr = []) {
|
|
|
546
539
|
exports.getPluginImportStringArr = getPluginImportStringArr;
|
|
547
540
|
function getComponentImportStringArr(components, componentImportStringArr = []) {
|
|
548
541
|
components.map((component) => __awaiter(this, void 0, void 0, function* () {
|
|
549
|
-
const { name, materialName, materialVersion, variableName, entries
|
|
542
|
+
const { name, materialName, materialVersion, variableName, entries } = component;
|
|
550
543
|
let importString = '';
|
|
551
544
|
if (entries === null || entries === void 0 ? void 0 : entries.components) {
|
|
552
545
|
importString = `import { ${name} as ${lodash_1.default.upperFirst(variableName)} } from '${path_1.default.posix.join(`libraries/${materialName}@${materialVersion}`, entries === null || entries === void 0 ? void 0 : entries.components)}'`;
|
|
@@ -588,7 +581,7 @@ function getActionImportStringArr(originActionList, actionImportStringArr = [])
|
|
|
588
581
|
}
|
|
589
582
|
exports.getActionImportStringArr = getActionImportStringArr;
|
|
590
583
|
function pushActionToImportStringArr(listenerInstance, actionImportStringArr) {
|
|
591
|
-
const { name, materialName, materialVersion, variableName, entries
|
|
584
|
+
const { name, materialName, materialVersion, variableName, entries } = listenerInstance;
|
|
592
585
|
const componentsLibVariableName = (0, util_3.camelcase)(`${materialName}`);
|
|
593
586
|
const importString = (entries === null || entries === void 0 ? void 0 : entries.actions)
|
|
594
587
|
? `import { ${name} as ${variableName} } from '${path_1.default.posix.join(`libraries/${materialName}@${materialVersion}`, entries === null || entries === void 0 ? void 0 : entries.actions)}'`
|
|
@@ -644,9 +637,7 @@ function writeLowCodeFiles(appData, appBuildDir) {
|
|
|
644
637
|
yield Promise.all(appData.codeModules.map((m) => writeCode2file(m, 'global')));
|
|
645
638
|
yield Promise.all((0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList, (page) => __awaiter(this, void 0, void 0, function* () {
|
|
646
639
|
(0, style_1.generateDefaultStyle)(page);
|
|
647
|
-
yield page.codeModules
|
|
648
|
-
.filter((m) => m.name !== '____index____')
|
|
649
|
-
.forEach((m) => writeCode2file(m, page.id));
|
|
640
|
+
yield page.codeModules.filter((m) => m.name !== '____index____').forEach((m) => writeCode2file(m, page.id));
|
|
650
641
|
})));
|
|
651
642
|
function writeCode2file(mod, pageId) {
|
|
652
643
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -785,9 +776,7 @@ function generateCodeFromTpl(appData, appBuildDir, dependencies, appKey, rootPat
|
|
|
785
776
|
interpolate: /<%=([\s\S]+?)%>/g,
|
|
786
777
|
})(templatesData[file]);
|
|
787
778
|
const outFile = path_1.default.resolve(appBuildDir, file.replace(/.tpl$/, ''));
|
|
788
|
-
const outTplPath = /.tpl$/.test(file)
|
|
789
|
-
? path_1.default.resolve(appBuildDir, file)
|
|
790
|
-
: null;
|
|
779
|
+
const outTplPath = /.tpl$/.test(file) ? path_1.default.resolve(appBuildDir, file) : null;
|
|
791
780
|
yield fs_extra_1.default.ensureFile(outFile);
|
|
792
781
|
console.log(outFile);
|
|
793
782
|
yield fs_extra_1.default.writeFile(outFile, generatedCode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/webpack.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAiB,kBAAkB,EAAE,OAAO,EAAkB,MAAM,sBAAsB,CAAC;AAKjH,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,oBAAoB,EAAiC,MAAM,oBAAoB,CAAC;AAErH,OAAO,EAAgB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAOvD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IACjC,QAAQ,EAAE;QACR,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,QAAQ,EAAE;QACR,GAAG,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;QACvC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;KACxC,CAAC;IACF,OAAO,EAAE;QACP,WAAW,EAAE,SAAS,GAAG,UAAU,CAAC;KACrC,CAAC;IACF,GAAG,EAAE;QACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;IACF,aAAa,EAAE;QACb,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;IACF,aAAa,EAAE;QACb,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAID,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,CAAC,EAAE,KAAK,GAAG,YAAY,CAAC;IACtC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;CACrB;AACD,wBAAgB,YAAY,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,oBAAoB,QAwC3E;AAED,wBAAsB,UAAU,CAAC,WAAW,EAAE,MAAM,iBAkBnD;AAED,wBAAsB,iCAAiC,CAAC,EACtD,KAAK,EACL,cAAc,EACd,WAAW,EACX,YAAY,EACZ,YAAiB,EACjB,eAAe,EACf,UAAU,EACV,IAAI,EACJ,KAAK,EACL,aAAa,EACb,MAAW,GACZ,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,kBAAkB,EAAE,CAAC;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,aAAa,EAAE,CAAC;IAC9B,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,eAAe,CAAC;IACtB,KAAK,EAAE,OAAO,CAAC;IACf,aAAa,EAAE,SAAS,EAAE,CAAC;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB,mBAuBA;AACD,MAAM,WAAW,6BAA6B;IAC5C,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,KAAK,GAAG,YAAY,CAAC;CACtC;AAED,wBAAsB,wBAAwB,CAC5C,WAAW,EAAE,kBAAkB,EAC/B,cAAc,EAAE,kBAAkB,EAAE,EACpC,WAAW,EAAE,MAAM,eAuBpB;AAED,wBAAsB,yBAAyB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,KAAA,iBAqBzF;AAED,wBAAsB,0BAA0B,CAAC,QAAQ,KAAA,EAAE,QAAQ,KAAA,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,oBA4BzG;AAGD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC7B,WAAW,EAAE,kBAAkB,EAC/B,cAAc,GAAE,kBAAkB,EAAO,uBA+B1C;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,WAAW,EAAE,kBAAkB,QAUpG;AAGD,wBAAsB,wBAAwB,CAC5C,cAAc,EAAE,kBAAkB,EAAE,EACpC,UAAU,EAAE,GAAG,EACf,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE,OAAO,EAAE,EAClB,OAAO,EAAE,6BAA6B,iBAsEvC;AAED,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,kBAAkB,EAAE,kCAExE;AAGD,wBAAgB,mBAAmB,CAAC,gBAAgB,EAAE,GAAG,OASxD;AAGD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,UAEvC;AAED,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,kBAAkB,EAAE,EAAE,OAAO,UAAQ,OAqBzF;AAED,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,MAAM,EACb,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,EACpB,YAAY,6BAAsB,EAClC,eAAe,EAAE,MAAM,EACvB,UAAU,SAAM,EAChB,IAAI,kBAAuB,EAC3B,KAAK,UAAQ,EACb,aAAa,cAAkB,EAC/B,WAAW,KAAK,EAChB,MAAM,GAAE,MAAM,EAAO,
|
|
1
|
+
{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/webpack.ts"],"names":[],"mappings":"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"}
|
|
@@ -349,12 +349,7 @@ function getWebpackWebBuildParams(appId, appBuildDir, materialsDir, dependencies
|
|
|
349
349
|
'@zxing/library': 'window.ZXing',
|
|
350
350
|
'@cloudbase/weda-client': 'window.WedaClientSDK',
|
|
351
351
|
},
|
|
352
|
-
resolveModules: [
|
|
353
|
-
path_1.default.resolve(appBuildDir, 'node_modules'),
|
|
354
|
-
path_1.default.resolve(appBuildDir, 'src'),
|
|
355
|
-
...getMaterialNodeModulesPathList(dependencies, materialsDir, appBuildDir),
|
|
356
|
-
'node_modules',
|
|
357
|
-
],
|
|
352
|
+
resolveModules: ['./src', 'node_modules'],
|
|
358
353
|
definePlugin: Object.assign({ 'process.env.buildType': `"${buildTypeList[0]}"`, 'process.env.isApp': buildTypeList.includes("app"), 'process.env.isAdminPortal': (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList) }, extraDefine),
|
|
359
354
|
devtool: ['app-nvzcvt10', 'app-msa2ihs9'].includes(appId)
|
|
360
355
|
? 'source-map'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,WAAW,cAAc;IAE7B,OAAO,CAAC,EAAE;QACR,KAAK,CAAC,EAAE,EAAE,CAAC;QACX,KAAK,CAAC,EAAE,EAAE,CAAC;KACZ,CAAC;IACF,IAAI,EAAE;QAEJ,IAAI,EAAE,GAAG,EAAE,CAAC;KACb,CAAC;CACH;AACD,MAAM,WAAW,UAAU;IAMzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,YAAY,CAAC;IAC3B,gBAAgB,EAAE,UAAU,EAAE,CAAC;IAC/B,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,eAAe,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACnD,OAAO,EAAE,OAAO,EAAE,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAC7B,kBAAkB,EAAE,kBAAkB,EAAE,CAAC;IACzC,KAAK,EAAE;QACL,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/types/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@ export declare function originJsonToFileList(appData: IWeAppData): (import("../t
|
|
|
6
6
|
code: string;
|
|
7
7
|
pageId: string;
|
|
8
8
|
})[];
|
|
9
|
-
export declare function getExtByType(type: CodeType): ".
|
|
9
|
+
export declare function getExtByType(type: CodeType): ".less" | ".json" | ".js";
|
|
10
10
|
export declare function HACK_FIX_LOWCODE_IN(code?: string): string;
|
|
11
11
|
export declare function HACK_FIX_LOWCODE_OUT(code?: string): string;
|
|
12
12
|
//# sourceMappingURL=file.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formily.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/utils/formily.ts"],"names":[],"mappings":"AASA,OAAO,EACL,UAAU,EAEV,UAAU,EAQV,kBAAkB,EACnB,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"formily.d.ts","sourceRoot":"","sources":["../../../src/weapps-core/utils/formily.ts"],"names":[],"mappings":"AASA,OAAO,EACL,UAAU,EAEV,UAAU,EAQV,kBAAkB,EACnB,MAAM,UAAU,CAAC;AAUlB,wBAAgB,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,GAAG,UAAU,CAwM3E;AAMD,wBAAgB,WAAW,CAAC,SAAS,EAAE,UAAU,GAAG,kBAAkB,CA+DrE;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,UAAU,CAAC,oBAAoB,CAAC,MA2GtE"}
|
|
@@ -103,7 +103,7 @@ function serialize(webRuntimeAppData) {
|
|
|
103
103
|
return cmps;
|
|
104
104
|
}
|
|
105
105
|
function readDirectives(cmp) {
|
|
106
|
-
var _a;
|
|
106
|
+
var _a, _b, _c;
|
|
107
107
|
const directives = {};
|
|
108
108
|
if (cmp.data && cmp.data._visible !== true) {
|
|
109
109
|
directives.waIf = {
|
|
@@ -129,12 +129,17 @@ function serialize(webRuntimeAppData) {
|
|
|
129
129
|
};
|
|
130
130
|
}
|
|
131
131
|
}
|
|
132
|
+
if (directives.waFor && ((_b = cmp.data) === null || _b === void 0 ? void 0 : _b._waForKey)) {
|
|
133
|
+
directives.waForKey = {
|
|
134
|
+
value: (_c = cmp.data) === null || _c === void 0 ? void 0 : _c._waForKey,
|
|
135
|
+
};
|
|
136
|
+
}
|
|
132
137
|
return directives;
|
|
133
138
|
}
|
|
134
139
|
function readDynamicData(cmp) {
|
|
135
140
|
var _a;
|
|
136
141
|
const data = {};
|
|
137
|
-
const ignoredProps = ['_visible', '_waFor'];
|
|
142
|
+
const ignoredProps = ['_visible', '_waFor', '_waForKey'];
|
|
138
143
|
for (const prop in cmp.data) {
|
|
139
144
|
if (ignoredProps.indexOf(prop) > -1) {
|
|
140
145
|
continue;
|
|
@@ -294,7 +299,7 @@ function readCmpInstances(cmps) {
|
|
|
294
299
|
xProps.listenerInstances = readListeners(cmp.xProps.listeners) || [];
|
|
295
300
|
readDynamicData(cmp.xProps.data, xProps, cmp.properties);
|
|
296
301
|
if (cmp.xProps.directives) {
|
|
297
|
-
const { waIf, waFor } = cmp.xProps.directives;
|
|
302
|
+
const { waIf, waFor, waForKey } = cmp.xProps.directives;
|
|
298
303
|
if (waIf) {
|
|
299
304
|
if (waIf.type === 'static' || waIf.type === undefined) {
|
|
300
305
|
xProps.data = xProps.data || {};
|
|
@@ -324,6 +329,10 @@ function readCmpInstances(cmps) {
|
|
|
324
329
|
propertyPath: '_waFor',
|
|
325
330
|
type: 'bind',
|
|
326
331
|
});
|
|
332
|
+
if (waForKey && (waForKey.type === 'static' || waForKey.type === undefined)) {
|
|
333
|
+
xProps.data = xProps.data || {};
|
|
334
|
+
xProps.data._waForKey = waForKey.value;
|
|
335
|
+
}
|
|
327
336
|
}
|
|
328
337
|
}
|
|
329
338
|
else {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cloudbase/framework-plugin-low-code",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.33",
|
|
4
4
|
"description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
|
|
5
5
|
"author": "yhsunshining@gmail.com",
|
|
6
6
|
"homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
|
|
@@ -35,7 +35,7 @@
|
|
|
35
35
|
"url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
|
|
36
36
|
},
|
|
37
37
|
"dependencies": {
|
|
38
|
-
"@cloudbase/cals": "0.3.
|
|
38
|
+
"@cloudbase/cals": "0.3.34",
|
|
39
39
|
"@cloudbase/framework-core": "^1.8.16",
|
|
40
40
|
"@cloudbase/framework-plugin-auth": "^1.8.16",
|
|
41
41
|
"@cloudbase/framework-plugin-mp": "v1.3.6-beta.8",
|
|
@@ -450,7 +450,7 @@
|
|
|
450
450
|
></script>
|
|
451
451
|
<script
|
|
452
452
|
crossorigin="anonymous"
|
|
453
|
-
src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-client@0.2.
|
|
453
|
+
src="https://qbase.cdn-go.cn//lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-client@0.2.18-alpha.1/dist/web.browser.js"
|
|
454
454
|
></script>
|
|
455
455
|
</body>
|
|
456
456
|
</html>
|