@cloudbase/framework-plugin-low-code 0.4.42-alpha.2 → 0.4.45

package/lib/builder/mp/wxml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,uBAAuB,EAEvB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAyD/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,UAyU7D;AA6CD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,eAAoB,UAS/B;AAuBD,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"}
+{"version":3,"file":"wxml.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/wxml.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,uBAAuB,EAEvB,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAU3B,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,UA0U7D;AA4BD,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,MAAM,EACf,QAAQ,GAAE,eAAoB,UAS/B;AAuBD,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

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
@@ -34,8 +15,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsedComponents = exports.getMpEventHanlderName = exports.generateWxml = void 0;
-const core_1 = require("@babel/core");
-const prettier = __importStar(require("prettier"));
 const chalk_1 = __importDefault(require("chalk"));
 const weapps_core_1 = require("../../weapps-core");
 const xml_js_1 = require("xml-js");
@@ -207,8 +186,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, nod
             listeners.forEach((l) => {
                 const evtName = getMpEventName(l.trigger);
                 const modifiers = l;
-                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] =
-                    getMpEventHanlderName(id, evtName, modifiers);
+                node.attributes[getMpEventAttr(evtName, modifiers, tagName)] = getMpEventHanlderName(id, evtName, modifiers);
             });
             const compConfig = componentProto.compConfig;
             if (compConfig && compConfig.pluginConfig) {
@@ -270,20 +248,6 @@ function xmlJsonSetCustomAttr(node, prop, value, comp) {
         node.elements.push({ type: 'text', text: value });
     }
 }
-function transpileJsExpr(expr) {
-    let result = core_1.transformSync(expr, {
-        cwd: __dirname,
-        plugins: [['@babel/plugin-transform-template-literals', { loose: true }]],
-    });
-    let code = (result === null || result === void 0 ? void 0 : result.code) || '';
-    code = prettier.format(code, {
-        semi: false,
-        singleQuote: true,
-        parser: 'babel',
-        printWidth: Number.MAX_SAFE_INTEGER,
-    });
-    return code.substr(0, code.length - 1);
-}
 const evtNameMap = {
     __weapps_action_trigger_click: 'tap',
 };

package/lib/builder/service/builder/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/generate.ts"],"names":[],"mappings":"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"}

package/lib/builder/service/builder/generate.js

@@ -89,7 +89,7 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
     return __awaiter(this, void 0, void 0, function* () {
         const fixedDependencies = dependencies;
         const { componentSchemaJson, pluginInstances, listenerInstances: pageListenerInstances, style: PageStyle, data, } = pageInstance;
-        const { originComponentList, originActionList } = getOriginComponentAndActionList(componentSchemaJson, fixedDependencies);
+        const { originComponentList, originActionList, } = getOriginComponentAndActionList(componentSchemaJson, fixedDependencies);
         const componentsMeta = yield util_1.getComponentsInfo(appBuildDir, dependencies);
         const originPluginList = getOriginPluginList(pluginInstances, dependencies);
         pullActionToListByInstances(pageListenerInstances, originActionList, fixedDependencies);
@@ -119,9 +119,11 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
         const actionImportStringArr = getActionImportStringArr(originActionList);
         const pluginImportStringArr = getPluginImportStringArr(originPluginList);
         const { widgets, dataBinds, componentSchema } = getComponentSchemaString(componentSchemaJson, false, componentsMeta);
+        const pageStyleString = weapps_core_1.toCssText(weapps_core_1.toCssStyle(PageStyle), common_1.buildAsWebByBuildType(buildTypeList) ? 'body' : 'page');
         const templateData = {
             pageUUID: rootPath ? `${rootPath}/${pageInstance.id}` : pageInstance.id,
             pageName: pageInstance.id,
+            pageStyleText: pageStyleString,
             entryImports: entryImportStringArr.join(';\n'),
             componentImports: componentImportStringArr.join(';\n'),
             pluginImports: pluginImportStringArr.join(';\n'),
@@ -144,10 +146,9 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
         yield fs_extra_1.default.ensureFile(dest);
         yield fs_extra_1.default.writeFile(dest, jsx);
         const pageStyleDest = path_1.default.resolve(appBuildDir, `./pages/${pageInstance.id}/index.less`);
-        const pageStyleString = weapps_core_1.toCssText(weapps_core_1.toCssStyle(PageStyle), common_1.buildAsWebByBuildType(buildTypeList) ? 'body' : 'page');
         const prefixStyleImport = `@import "../../lowcode/${pageInstance.id}/style.less";`;
         yield fs_extra_1.default.ensureFile(pageStyleDest);
-        yield fs_extra_1.default.writeFile(pageStyleDest, prefixStyleImport + os_1.default.EOL + pageStyleString);
+        yield fs_extra_1.default.writeFile(pageStyleDest, prefixStyleImport + os_1.default.EOL);
     });
 }
 exports.generateSinglePageJsxFile = generateSinglePageJsxFile;
@@ -156,7 +157,7 @@ function getOriginComponentAndActionList(componentSchema, fixedDependencies, ori
     if (fieldSchema.isObject()) {
         const { 'x-props': xProps } = fieldSchema;
         if (xProps) {
-            const { listenerInstances, sourceKey } = xProps;
+            const { listenerInstances, sourceKey, } = xProps;
             pullComponentToListByInstance(sourceKey, originComponentList, fixedDependencies);
             pullActionToListByInstances(listenerInstances, originActionList, fixedDependencies);
         }
@@ -244,7 +245,9 @@ exports.pullComponentToListByInstance = pullComponentToListByInstance;
 function getVirtualFieldsString(components) {
     const fields = components.reduce((result, component) => {
         const { name, materialName, variableName, isPlainProps } = component;
-        result[`${materialName}:${name}`] = `%%%(props) => <${lodash_1.default.upperFirst(variableName)} ${isPlainProps ? '{...resolveComponentProps(props, 1)}' : '{...resolveComponentProps(props, 0)}'} pageVirtualFields={virtualFields}/>%%%`;
+        result[`${materialName}:${name}`] = `%%%(props) => <${lodash_1.default.upperFirst(variableName)} ${isPlainProps
+            ? '{...resolveComponentProps(props, 1)}'
+            : '{...resolveComponentProps(props, 0)}'} pageVirtualFields={virtualFields}/>%%%`;
         return result;
     }, {});
     return JSON.stringify(fields, null, 2).replace(/"%%%(.*?)%%%"/g, function (match, expression) {
@@ -264,7 +267,7 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
     const componentSchemaJson = util_1.deepDealSchema(copyJson, (schema) => {
         var _a, _b, _c, _d, _e, _f, _g;
         const { 'x-props': xProps = {}, properties } = schema;
-        const { dataBinds = [], commonStyle = {}, data = {}, classNameList = [], sourceKey, styleBind, classNameListBind, staticResourceAttribute = [] } = xProps;
+        const { dataBinds = [], commonStyle = {}, data = {}, classNameList = [], sourceKey, styleBind, classNameListBind, staticResourceAttribute = [], } = xProps;
         const componentInfo = componentsInfoMap[sourceKey];
         if ((_a = componentInfo) === null || _a === void 0 ? void 0 : _a.events) {
             schema['emitEvents'] = (_b = componentInfo) === null || _b === void 0 ? void 0 : _b.events.map((item) => item.name);
@@ -327,7 +330,8 @@ function getComponentSchemaString(componentSchema, isComposite = false, componen
                 if (xPropsData.title === '') {
                     delete xPropsData.title;
                 }
-                if (xPropsData.staticResourceAttribute && xPropsData.staticResourceAttribute.length === 0) {
+                if (xPropsData.staticResourceAttribute &&
+                    xPropsData.staticResourceAttribute.length === 0) {
                     delete xPropsData.staticResourceAttribute;
                 }
                 if (weapps_core_1.isEmptyObj(xPropsData)) {
@@ -527,7 +531,7 @@ function getPluginImportStringArr(plugins, pluginImportStringArr = []) {
 exports.getPluginImportStringArr = getPluginImportStringArr;
 function getComponentImportStringArr(components, componentImportStringArr = []) {
     components.map((component) => __awaiter(this, void 0, void 0, function* () {
-        const { name, materialName, materialVersion, variableName, entry } = component;
+        const { name, materialName, materialVersion, variableName, entry, } = component;
         let importString = '';
         if (entry) {
             const componentsLibVariableName = util_3.camelcase(`${materialName}`);
@@ -566,7 +570,7 @@ function getActionImportStringArr(originActionList, actionImportStringArr = [])
 }
 exports.getActionImportStringArr = getActionImportStringArr;
 function pushActionToImportStringArr(listenerInstance, actionImportStringArr) {
-    const { name, materialName, materialVersion, variableName, entry } = listenerInstance;
+    const { name, materialName, materialVersion, variableName, entry, } = listenerInstance;
     const componentsLibVariableName = util_3.camelcase(`${materialName}`);
     const importString = entry
         ? `const { ${name}: ${variableName} } = ${componentsLibVariableName}.actions`

package/lib/builder/service/builder/webpack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/webpack.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../../../src/builder/service/builder/webpack.ts"],"names":[],"mappings":"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"}

package/lib/builder/util/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/builder/util/common.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,YAAY,EACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,aAAa,EACd,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EACL,sBAAsB,EACtB,OAAO,EACP,aAAa,EACb,QAAQ,EACR,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AAMrC,oBAAY,aAAa,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAClE,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAQjE;AAOD,wBAAgB,qBAAqB;;;cAUpC;AAED,wBAAgB,kBAAkB,IAAI,YAAY,GAAG,SAAS,CAI7D;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CAMlE;AAED,wBAAgB,eAAe,CAAC,MAAM,KAAA,OAIrC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,SAAK,QAI9C;AAED,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,kBAAkB,GACpC,oBAAoB,CA2BtB;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,aAAa,EAAE,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAuD7B;AAED,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,GAAG;;;;GA2BrD;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,iBAgChB;AAED,wBAAgB,oBAAoB,CAAC,MAAM,KAAA,GAAG;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC7C,UAAU,EAAE;QACV,CAAC,aAAa,EAAE,MAAM,GAAG;YACvB,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;CACH,GAAG,IAAI,CA0BP;AAOD,wBAAgB,sBAAsB,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,GAAG,OAAO,CAE7D"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../../src/builder/util/common.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,kBAAkB,EAClB,YAAY,EACb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAEL,aAAa,EACd,MAAM,kCAAkC,CAAC;AAI1C,OAAO,EACL,sBAAsB,EACtB,OAAO,EACP,aAAa,EACb,QAAQ,EACR,eAAe,EACf,cAAc,EACd,gBAAgB,GACjB,MAAM,6BAA6B,CAAC;AAMrC,oBAAY,aAAa,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC;AAClE,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAQjE;AAOD,wBAAgB,qBAAqB;;;cAUpC;AAED,wBAAgB,kBAAkB,IAAI,YAAY,GAAG,SAAS,CAI7D;AAED,wBAAgB,4BAA4B,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CAMlE;AAED,wBAAgB,eAAe,CAAC,MAAM,KAAA,OAIrC;AAED,wBAAgB,qBAAqB,CAAC,IAAI,SAAK,QAI9C;AAED,wBAAgB,aAAa,CAC3B,iBAAiB,EAAE,kBAAkB,GACpC,oBAAoB,CA2BtB;AAED,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,aAAa,EAAE,GAC5B,OAAO,CAAC,kBAAkB,CAAC,CAuD7B;AAED,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,GAAG;;;;GA2BrD;AAED,wBAAsB,sBAAsB,CAC1C,KAAK,EAAE,aAAa,EACpB,OAAO,EAAE,MAAM,iBAgChB;AAED,wBAAgB,oBAAoB,CAClC,MAAM,KAAA,GACL;IACD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAC;IACjC,YAAY,CAAC,EAAE,aAAa,CAAC,cAAc,CAAC,CAAC;IAC7C,UAAU,EAAE;QACV,CAAC,aAAa,EAAE,MAAM,GAAG;YACvB,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;SACd,CAAC;KACH,CAAC;CACH,GAAG,IAAI,CA0BP;AAUD,wBAAgB,sBAAsB,CAAC,IAAI,KAAA,EAAE,OAAO,KAAA,GAAG,OAAO,CAK7D"}

package/lib/builder/util/common.js

@@ -221,9 +221,12 @@ exports.readComponentLibMata = readComponentLibMata;
 const _OFFICIAL_COMPONENT_LIB = {
     'gsd-h5-react': ['0.0.61', '0.0.70'],
     CLOUDBASE_BUSSINESS: ['1627377179261'],
+    crm_basis: ['*', '1629778630449'],
+    tea_basis: ['*', '1629209320310'],
+    tea_shop: ['*'],
 };
 function isOfficialComponentLib(name, version) {
-    var _a;
-    return !!((_a = _OFFICIAL_COMPONENT_LIB[name]) === null || _a === void 0 ? void 0 : _a.includes(version));
+    var _a, _b;
+    return (!!((_a = _OFFICIAL_COMPONENT_LIB[name]) === null || _a === void 0 ? void 0 : _a.includes(version)) || ((_b = _OFFICIAL_COMPONENT_LIB[name]) === null || _b === void 0 ? void 0 : _b.includes('*')));
 }
 exports.isOfficialComponentLib = isOfficialComponentLib;

package/lib/generator/core/generate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/generator/core/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../src/generator/core/generate.ts"],"names":[],"mappings":"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"}

package/lib/generator/core/generate.js

@@ -78,9 +78,9 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
 }, fileCodeMap, isSandbox) {
     return __awaiter(this, void 0, void 0, function* () {
         const dstDir = path_1.default.join(appBuildDir, 'src', rootPath ? `packages/${rootPath}` : '');
-        const { componentSchemaJson, data } = pageInstance;
+        const { componentSchemaJson, data, style } = pageInstance;
         const genericCompMap = getGenericCompFromDep(dependencies);
-        const { originComponentList, originActionList } = getOriginComponentAndActionList(componentSchemaJson, dependencies, [], [], genericCompMap);
+        const { originComponentList, originActionList, } = getOriginComponentAndActionList(componentSchemaJson, dependencies, [], [], genericCompMap);
         const componentInfo = yield util_1.getComponentsInfo(appBuildDir, dependencies, fileCodeMap);
         const { widgets, dataBinds, componentSchema } = getComponentSchemaString(componentSchemaJson, false, componentInfo);
         const pageClass = [rootPath, pageInstance.id].filter(Boolean).join('-');
@@ -89,6 +89,7 @@ function generateSinglePageJsxFile(pageInstance, appBuildDir, rootPath, dependen
             cleanVarName: util_1.cleanVarName,
             isSandbox,
             pageName: pageInstance.id,
+            pageStyleText: weapps_core_1.toCssText(weapps_core_1.toCssStyle(style), `body`),
             useComponents: originComponentList,
             useActions: originActionList.filter((action) => action.type === weapps_core_1.ActionType.Material),
             componentSchema,
@@ -113,7 +114,7 @@ function getOriginComponentAndActionList(componentSchema, dependencies, originCo
     if (fieldSchema.isObject()) {
         const { 'x-props': xProps } = fieldSchema;
         if (xProps) {
-            const { listenerInstances, sourceKey } = xProps;
+            const { listenerInstances, sourceKey, } = xProps;
             if (genericCompMap[sourceKey]) {
                 const genericProps = genericCompMap[sourceKey];
                 const genericComp = xProps.data[genericProps.propName];
@@ -547,7 +548,6 @@ function writeLowCodeFiles(appData, appBuildDir, fileCodeMap, rootPath) {
                         pageStyleString = weapps_core_1.toCssText(weapps_core_1.toCssStyle(page.style), `.weapps-page-${pageClass}`);
                     }
                     code = yield style_1.processLess(((themeCode === null || themeCode === void 0 ? void 0 : themeCode.code) || style_1.defaultThemeCode) + code);
-                    code = pageStyleString + os_1.default.EOL + code;
                 }
                 if (mod.type === 'theme') {
                     return;
@@ -589,7 +589,7 @@ function generateCodeFromTpl(appKey, appData, appBuildDir, rootPath, extraData,
             'app/global-api.js': {
                 appId: appKey,
                 subPackageName: rootPath,
-                domain: domain
+                domain: domain,
             },
             'app/handlers.js': {
                 pageModules,

package/lib/generator/template.js

@@ -35,7 +35,7 @@ exports.default = {
         "code": "// 针对小程序样式做适配\n// 请注意与weapps/src/pages/editor/components/Main/EditAndPreview/index.iframe.scss的一致性，以确保小程序端样式与\n\nbody {\n  margin: 0;\n  padding: 0;\n}\n\n#weapp-scancode-video {\n  width: 100%;\n  height: 100%;\n  object-fit: cover;\n}\n\n.weapp-scancode {\n  &-close-button {\n    background: white;\n    color: black;\n    display: flex;\n    position: absolute;\n    top: 14px;\n    left: 14px;\n    width: 24px;\n    height: 24px;\n    border-radius: 50%;\n    cursor: pointer;\n    justify-content: center;\n    align-items: center;\n    z-index: 500;\n  }\n  &-modal {\n    position: fixed;\n    background-color: black;\n    left: 0px;\n    right: 0px;\n    top: 0px;\n    bottom: 0px;\n    &-main {\n      height: 100%;\n      position: relative;\n    }\n  }\n  &-scan {\n    &-wrapper {\n      display: flex;\n      flex-direction: column;\n      justify-content: center;\n      align-items: center;\n      height: 100%;\n      width: 100%;\n      position: absolute;\n      top: 0;\n      left: 0;\n    }\n    &-square {\n      --square-size: 16rem;\n      width: var(--square-size);\n      height: var(--square-size);\n      position: relative;\n    }\n    &-bar {\n      position: absolute;\n      height: 10px;\n      width: 100%;\n      background: linear-gradient(90deg, transparent, #07c160 50%, transparent);\n      top: 0%;\n      border-top-left-radius: 50%;\n      border-top-right-radius: 50%;\n      animation: slideinout-top-down 2s;\n      animation-direction: normal;\n      animation-timing-function: linear;\n      animation-iteration-count: infinite;\n    }\n    &-tip {\n      margin-top: 10rem;\n      color: white;\n    }\n    &-not-found {\n      color: white;\n    }\n    &-not-found + p {\n      color: #999;\n    }\n  }\n\n  &-img-selector {\n    position: absolute;\n    bottom: 32px;\n    right: 32px;\n    z-index: 500;\n  }\n  &-img-picker {\n    z-index: 500;\n    padding: 5px;\n    display: block;\n    cursor: pointer;\n  }\n}\n\n@keyframes slideinout-top-down {\n  // use transform to prevent relayout\n  0% {\n    transform: translateY(0px);\n    opacity: 0;\n  }\n  50% {\n    transform: translateY(calc(var(--square-size) / 2));\n    opacity: 0.5;\n  }\n  100% {\n    transform: translateY(var(--square-size));\n    opacity: 0;\n  }\n}\n\n@media (min-width: 1024px) {\n  .weda-responsive_flex_flow {\n    flex-flow: row !important;\n  }\n}\n"
     },
     "/src/pages/app.tpl": {
-        "code": "// Import Libs and Handlers\nimport * as React from 'react'\nimport { observable, autorun, reaction } from 'mobx'\nimport { observer } from \"mobx-react-lite\";\nimport get from 'lodash.get'\nimport { app } from '../../app/global-api' // 取对应子包app\nimport '../../utils/initGlobalVar'\nimport { AppRender } from '/src/handlers/RenderWrapper'\nimport { createDataset, createStateDataSourceVar, generateParamsParser, EXTRA_API } from '../../datasources'\nimport { createComputed, createWidgets, retryDataBinds, bindFuncObj, resolveComponentProps } from '/src/utils/index'\nimport { pageLifeCycleMount } from '/src/utils/lifecycle'\nimport { useScrollTop } from '/src/utils/hooks'\nimport PageLifeCycle from '../../lowcode/<%= pageName %>/lifecycle'\nimport initPageState from '../../lowcode/<%= pageName %>/state'\nimport computed from '../../lowcode/<%= pageName %>/computed'\nimport pageAPI from '../../lowcode/<%= pageName %>/index';\nimport { $$_<%= pageName %> as handler } from '../../app/handlers'\nimport { createPageApi } from '/src/app/global-api' // 取主包app\n\nimport '../../lowcode/<%= pageName %>/style.css'\n\n// Import Components\n<% useComponents.forEach(compItem => {%>\n<% if(isSandbox) { %>\nconst <%= upperFirst(compItem.variableName) %> = window[\"@weapps-materials-main-<%= compItem.materialName %>\"].components[\"<%= compItem.name %>\"];\n<% } else if(!isSandbox) { %>\nimport <%= upperFirst(compItem.variableName) %> from \"/src/libraries/<%= compItem.materialName %>@<%= compItem.materialVersion %>/components/<%= compItem.name %>\";\n<% }}) %>\n\n// Import Actions\n<% useActions.forEach(action => {%>\n<% if(isSandbox) { %>\nconst <%= action.variableName %> = window[\"@weapps-materials-main-<%= action.materialName %>\"].actions[\"<%= action.name %>\"];\n<% } else { %>\nimport <%= action.variableName %> from \"/src/libraries/<%= action.materialName %>@<%= action.materialVersion %>/actions/<%= action.name %>\";\n<% }}) %>\n\nconst virtualFields = {\n  <% useComponents.forEach(compItem => {%>\n  <% if(compItem.isPlainProps) { %>\n  '<%= compItem.materialName %>:<%= compItem.name %>': (props) => <<%= upperFirst(compItem.variableName) %> {...resolveComponentProps(props, 1)} pageVirtualFields={virtualFields}/>,\n  <% } else { %>\n  '<%= compItem.materialName %>:<%= compItem.name %>': (props) => <<%= upperFirst(compItem.variableName) %> {...resolveComponentProps(props, 0)} pageVirtualFields={virtualFields}/>,\n  <% }}) %>\n};\n\n// Init\nexport default function App() {\n  // 检查权限\n  // const [weDaHasLogin, setWeDaHasLogin] = React.useState(false);\n\n  // 兼容 this.state / $page.state 两种模式\n  const pageCodeContext = createPageApi()\n  const $page = pageCodeContext\n  Object.defineProperty(pageCodeContext, '$page', {\n    get() {\n      return pageCodeContext\n    }\n  })\n\n  const widgetsContext = <%= widgets %>;\n  const dataBinds = $page._dataBinds = <%= dataBinds %>;\n  const componentSchema = <%= componentSchema %>;\n\n  Object.assign($page, {\n    id:'<%= pageName %>',\n    state: observable(initPageState),\n    computed: createComputed(computed, pageCodeContext),\n    handler: bindFuncObj(handler, pageCodeContext)\n  })\n  let dataset = createDataset('<%= pageName %>', {app, $page: pageCodeContext})\n  $page.dataset = dataset\n  $page.state.dataset = dataset\n  $page.setState = (userSetState) => {\n    Object.keys(userSetState).forEach((keyPath) => {\n      app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);\n    });\n  };\n\n  $page.widgets = createWidgets(widgetsContext, dataBinds)\n  // widgets 内的 dataBinds 可能需要关联 widgets，需要重新执行 dataBinds\n  retryDataBinds()\n\n  // Web 环境页面级别生命周期\n  React.useEffect(() => {\n    document.title = \"<%= title %>\";\n    initWatchMethods(pageCodeContext)\n    /*checkAuth(app, app.id, '<%= pageName %>').then((checkAuthResult) =>\n      setWeDaHasLogin(checkAuthResult)\n    );*/\n  }, [])\n\n  pageLifeCycleMount(\n    React.useEffect,\n    {\n      ...PageLifeCycle,\n      beforePageCustomLaunch: (query) => {\n        EXTRA_API.setParams('<%= pageName %>', query || {})\n        createStateDataSourceVar('<%= pageName %>', generateParamsParser({ app, $page: pageCodeContext }))\n      },\n    },\n    app,\n    pageCodeContext\n  )\n  // 切换页面滚动到顶部\n  useScrollTop()\n  return (\n    <div className=\"weapps-page weapps-page-<%= pageClass %>\">\n      <AppRender\n        virtualFields={virtualFields}\n        componentSchema={componentSchema}\n        codeContext={pageCodeContext}\n      />\n    </div>\n  );\n\n  function initWatchMethods(pageContext) {\n    const { watch = {}, watchState = {}, watchWidget = {}, watchEffects = {}} = pageAPI\n\n\n    // # watch effect\n    const watchEffectDisposers = Object.keys(watchEffects).map(fnName => {\n      return autorun(watchEffects[fnName].bind(pageContext))\n    })\n    const disposers = watchEffectDisposers\n\n    // # watch state\n    Object.keys(watchState).map(key => runWatcher(parseWatcher(watchState[key]), pageContext.state, key, 'watchState'))\n\n    // # watch widgets\n    Object.keys(watchWidget).map(key => runWatcher(parseWatcher(watchWidget[key]), pageContext.widgets, key, 'watchWidgets'))\n\n    function runWatcher({ handler, immediate } = {}, target, key, label) {\n      if (!handler) {\n        console.error(`Invalid ${label}(${key}) of ${pageContext.node.widgetType}, watch must a function or {handler: function}`)\n        return\n      }\n      const disposer = reaction(() => get(target, key), handler.bind(pageContext), { fireImmediately: immediate })\n      disposers.push(disposer)\n    }\n  }\n}\n\nfunction parseWatcher(watcher) {\n  if (!watcher) return\n  if (watcher instanceof Function) {\n    return { handler: watcher, immediate: false }\n  }\n  const { handler, immediate = false } = watcher\n  if (!(handler instanceof Function)) return\n  return { handler, immediate }\n}\n"
+        "code": "// Import Libs and Handlers\nimport * as React from 'react'\nimport { observable, autorun, reaction } from 'mobx'\nimport { observer } from \"mobx-react-lite\";\nimport get from 'lodash.get'\nimport { app } from '../../app/global-api' // 取对应子包app\nimport '../../utils/initGlobalVar'\nimport { AppRender } from '/src/handlers/RenderWrapper'\nimport { createDataset, createStateDataSourceVar, generateParamsParser, EXTRA_API } from '../../datasources'\nimport { createComputed, createWidgets, retryDataBinds, bindFuncObj, resolveComponentProps } from '/src/utils/index'\nimport { pageLifeCycleMount } from '/src/utils/lifecycle'\nimport { useScrollTop } from '/src/utils/hooks'\nimport PageLifeCycle from '../../lowcode/<%= pageName %>/lifecycle'\nimport initPageState from '../../lowcode/<%= pageName %>/state'\nimport computed from '../../lowcode/<%= pageName %>/computed'\nimport pageAPI from '../../lowcode/<%= pageName %>/index';\nimport { $$_<%= pageName %> as handler } from '../../app/handlers'\nimport { createPageApi } from '/src/app/global-api' // 取主包app\n\nimport '../../lowcode/<%= pageName %>/style.css'\n\n// Import Components\n<% useComponents.forEach(compItem => {%>\n<% if(isSandbox) { %>\nconst <%= upperFirst(compItem.variableName) %> = window[\"@weapps-materials-main-<%= compItem.materialName %>\"].components[\"<%= compItem.name %>\"];\n<% } else if(!isSandbox) { %>\nimport <%= upperFirst(compItem.variableName) %> from \"/src/libraries/<%= compItem.materialName %>@<%= compItem.materialVersion %>/components/<%= compItem.name %>\";\n<% }}) %>\n\n// Import Actions\n<% useActions.forEach(action => {%>\n<% if(isSandbox) { %>\nconst <%= action.variableName %> = window[\"@weapps-materials-main-<%= action.materialName %>\"].actions[\"<%= action.name %>\"];\n<% } else { %>\nimport <%= action.variableName %> from \"/src/libraries/<%= action.materialName %>@<%= action.materialVersion %>/actions/<%= action.name %>\";\n<% }}) %>\n\nconst virtualFields = {\n  <% useComponents.forEach(compItem => {%>\n  <% if(compItem.isPlainProps) { %>\n  '<%= compItem.materialName %>:<%= compItem.name %>': (props) => <<%= upperFirst(compItem.variableName) %> {...resolveComponentProps(props, 1)} pageVirtualFields={virtualFields}/>,\n  <% } else { %>\n  '<%= compItem.materialName %>:<%= compItem.name %>': (props) => <<%= upperFirst(compItem.variableName) %> {...resolveComponentProps(props, 0)} pageVirtualFields={virtualFields}/>,\n  <% }}) %>\n};\n\n// Init\nexport default function App() {\n  // 检查权限\n  // const [weDaHasLogin, setWeDaHasLogin] = React.useState(false);\n\n  // 兼容 this.state / $page.state 两种模式\n  const pageCodeContext = createPageApi()\n  const $page = pageCodeContext\n  Object.defineProperty(pageCodeContext, '$page', {\n    get() {\n      return pageCodeContext\n    }\n  })\n\n  const widgetsContext = <%= widgets %>;\n  const dataBinds = $page._dataBinds = <%= dataBinds %>;\n  const componentSchema = <%= componentSchema %>;\n\n  Object.assign($page, {\n    id:'<%= pageName %>',\n    state: observable(initPageState),\n    computed: createComputed(computed, pageCodeContext),\n    handler: bindFuncObj(handler, pageCodeContext)\n  })\n  let dataset = createDataset('<%= pageName %>', {app, $page: pageCodeContext})\n  $page.dataset = dataset\n  $page.state.dataset = dataset\n  $page.setState = (userSetState) => {\n    Object.keys(userSetState).forEach((keyPath) => {\n      app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);\n    });\n  };\n\n  $page.widgets = createWidgets(widgetsContext, dataBinds)\n  // widgets 内的 dataBinds 可能需要关联 widgets，需要重新执行 dataBinds\n  retryDataBinds()\n\n  // Web 环境页面级别生命周期\n  React.useEffect(() => {\n    document.title = \"<%= title %>\";\n    initWatchMethods(pageCodeContext)\n    /*checkAuth(app, app.id, '<%= pageName %>').then((checkAuthResult) =>\n      setWeDaHasLogin(checkAuthResult)\n    );*/\n  }, [])\n\n  pageLifeCycleMount(\n    React.useEffect,\n    {\n      ...PageLifeCycle,\n      beforePageCustomLaunch: (query) => {\n        EXTRA_API.setParams('<%= pageName %>', query || {})\n        createStateDataSourceVar('<%= pageName %>', generateParamsParser({ app, $page: pageCodeContext }))\n      },\n    },\n    app,\n    pageCodeContext\n  )\n  // 切换页面滚动到顶部\n  useScrollTop()\n  return (\n    <div className=\"weapps-page weapps-page-<%= pageClass %>\">\n      <style\n        type=\"text/css\"\n        dangerouslySetInnerHTML={{\n          __html: `<%= pageStyleText %>`,\n        }}\n      />\n      <AppRender\n        virtualFields={virtualFields}\n        componentSchema={componentSchema}\n        codeContext={pageCodeContext}\n      />\n    </div>\n  );\n\n  function initWatchMethods(pageContext) {\n    const { watch = {}, watchState = {}, watchWidget = {}, watchEffects = {}} = pageAPI\n\n\n    // # watch effect\n    const watchEffectDisposers = Object.keys(watchEffects).map(fnName => {\n      return autorun(watchEffects[fnName].bind(pageContext))\n    })\n    const disposers = watchEffectDisposers\n\n    // # watch state\n    Object.keys(watchState).map(key => runWatcher(parseWatcher(watchState[key]), pageContext.state, key, 'watchState'))\n\n    // # watch widgets\n    Object.keys(watchWidget).map(key => runWatcher(parseWatcher(watchWidget[key]), pageContext.widgets, key, 'watchWidgets'))\n\n    function runWatcher({ handler, immediate } = {}, target, key, label) {\n      if (!handler) {\n        console.error(`Invalid ${label}(${key}) of ${pageContext.node.widgetType}, watch must a function or {handler: function}`)\n        return\n      }\n      const disposer = reaction(() => get(target, key), handler.bind(pageContext), { fireImmediately: immediate })\n      disposers.push(disposer)\n    }\n  }\n}\n\nfunction parseWatcher(watcher) {\n  if (!watcher) return\n  if (watcher instanceof Function) {\n    return { handler: watcher, immediate: false }\n  }\n  const { handler, immediate = false } = watcher\n  if (!(handler instanceof Function)) return\n  return { handler, immediate }\n}\n"
     },
     "/src/pages/composite.tpl": {
         "code": "import * as React from \"react\";\nimport { observer } from \"mobx-react-lite\";\nimport { observable, autorun, reaction, runInAction } from \"mobx\";\nimport { AppRender } from \"/src/handlers/RenderWrapper\";\nimport { createWidgets, retryDataBinds, WidgetsContext, bindFuncObj, createComputed, resolveComponentProps} from '/src/utils/index'\nimport getStateFn from \"./lowcode/state.js\";\nimport computed from \"./lowcode/computed.js\";\nimport lifecycle from \"./lowcode/lifecycle.js\";\n// import i18n from '@tcwd/weapps-sdk/lib/i18n'\n<% if(isSandbox) { %>\nimport { ErrorBoundary } from 'react-error-boundary'\nimport { createErrorFallback } from '/src/utils/error'\n<% } %>\nimport componentAPI from './lowcode/index';\nimport get from 'lodash.get'\n\n<% handlersImports.forEach(handler => { %>\nimport handler$<%= handler.name %> from \"./lowcode/handler/<%= handler.name %>.js\";\n<% }) %>\n\n// Import Components outof sandbox\n<% useComponents.forEach(compItem => {%>\n<% if(!isSandbox && compItem.isComposite){ %>\nimport <%= compItem.var %> from \"/src/libraries/<%= compItem.moduleName %>@<%= compItem.version %>/components/<%= compItem.name %>\";\n<% } else if(!isSandbox) { %>\nconst <%= compItem.var %> = window[\"@weapps-materials-main-<%= compItem.moduleName %>\"].components[\"<%= compItem.name %>\"];\n<% } %>\n<%}) %>\n\nimport * as constObj from '../../libCommonRes/const'\nimport * as toolsObj from '../../libCommonRes/tools'\n\nimport \"./lowcode/style.css\";\n\nconst libCode = '<%= materialName %>'\n\nclass CompositeCompWrapper extends React.Component {\n\n  $WEAPPS_COMP = {}\n\n  componentDidUpdate() {\n    runInAction(() => {\n      const { data } = this.props\n      for(let prop in data) {\n        // 更新 propsData\n        if (typeof data[prop] !== 'function') {\n          this.propsData[prop] = data[prop]\n        }\n      }\n    })\n  }\n\n\n  constructor(props) {\n    super(props);\n\n    this.compConfig = <%= JSON.stringify(compConfig, null, 2) %>\n\n    // Import Components in sandbox\n    <% useComponents.forEach(compItem => {%>\n    <% if(isSandbox){ %>\n    const <%= compItem.var %> = window[\"@weapps-materials-main-<%= compItem.moduleName %>\"].components[\"<%= compItem.name %>\"];\n    <% } %>\n    <%}) %>\n\n    this.virtualFields = Object.assign({}, props.pageVirtualFields || {}, {\n    <% useComponents.forEach(compItem => {%>\n      \"<%= compItem.key %>\": <% if(compItem.isPlainProps) {%> (props) => <<%= compItem.var %> {...resolveComponentProps(props, 1)} /> <% } else {%>  (props) => <<%= compItem.var %>{...resolveComponentProps(props, 0)} />  <% }%>,\n    <%}) %>\n    });\n\n    // 挂载给到 $comp.props.events 使用\n    this.events = (<%= emitEvents %>).reduce((obj, trigger) => {\n      obj[trigger] = (eventData, domEvent) => {\n        this.props.emit(trigger, eventData, domEvent);\n        this.node._listeners && this.node._listeners.emit(trigger, eventData, domEvent)\n      };\n      return obj;\n    }, {});\n    this.handler = this.$WEAPPS_COMP.handler = {\n      <% handlersImports.forEach(handler => { %>\n      <%= handler.name %>: handler$<%= handler.name %>.bind(this),\n      <% }) %>\n    };\n    const widgetContext = <%= widgets %>\n    const dataBinds = this._dataBinds = <%= dataBinds %>\n    this.componentSchema = <%= componentSchema %>;\n\n    const defaultProps = <%= JSON.stringify(defaultProps, null, 2) %>\n    this.propsData = observable(Object.assign({}, defaultProps, this.props.data || {}))\n    this.$WEAPPS_COMP.lib = { const: constObj, tools: toolsObj }\n    /*\n    this.i18n = this.$WEAPPS_COMP.i18n = {\n      ...i18n,\n      t (key, data) {\n        return i18n.t(libCode + ':' + key, data)\n      },\n    }\n    */\n    this.$WEAPPS_COMP.props = { ...this.props, events: this.events, data: this.propsData }\n\n    this.state = this.$WEAPPS_COMP.state = observable(getStateFn.bind(this)())\n    this.computed = this.$WEAPPS_COMP.computed = createComputed(computed, this)\n    this.node = this.$WEAPPS_COMP.node = this.createWidgetNode(this) || {}\n    this.initPublicMethods()\n\n    this.widgets = this.$WEAPPS_COMP.widgets = createWidgets(widgetContext, dataBinds)\n    // widgets 内的 dataBinds 可能需要关联 widgets，需要重新执行 dataBinds\n    retryDataBinds()\n    Object.keys(this.widgets || {}).forEach(widgetId => {\n      // 将实例 ownerWidget 挂到内部组件上。内部组件就可以通过 $comp.node.ownerWidget 获取到所在的组件实例\n      const node = this.widgets[widgetId]\n      if (Array.isArray(node)) {\n        node.forEach(item => {\n          item.ownerWidget = this.node;\n          item.getOwnerWidget = () => this.node;\n        })\n      }\n      else {\n        node.ownerWidget = this.node\n        node.getOwnerWidget = () => this.node\n      }\n      // this.widgets[widgetId].ownerWidget = this.node\n      // this.widgets[widgetId].getOwnerWidget = () => this.node\n    })\n\n    this.pageListenerInstances = [];\n    this.createCompAPI(this)\n  }\n\n  // publicMthods 挂载内部，使用 $comp.api。挂载到外部使用 $comp.node.api\n  initPublicMethods() {\n    const publicMethods = componentAPI.publicMethods || {}\n    Object.keys(publicMethods).map(fnName => {\n      const bindFunc = publicMethods[fnName].bind(this)\n      this[fnName] = bindFunc\n      this.$WEAPPS_COMP[fnName] = bindFunc\n      if(this.node) this.node[fnName] = bindFunc\n    })\n  }\n\n  // 创建自身节点\n  createWidgetNode(compThis) {\n    // 当为数组时，需要判断自己属于 widgets 的哪一项\n    const {\n      compositeParent,\n      forIndexes,\n      id\n    } = compThis.props\n    let widgetData = compositeParent.$WEAPPS_COMP\n      ? compositeParent.$WEAPPS_COMP.widgets[id]\n      : compositeParent.$page.widgets[id]\n    if(Array.isArray(widgetData)) {\n      widgetData = widgetData.length > 0 ? get(widgetData, forIndexes) : {}\n    }\n    widgetData = widgetData || {}\n    Object.assign(widgetData, {\n      getConfig: () => compThis.compConfig,\n    }, bindFuncObj(componentAPI.publicMethods || {}, compThis)\n    )\n\n    return widgetData\n  }\n\n  createCompAPI(compThis) {\n    compThis.$WEAPPS_COMP = {\n      _dataBinds: compThis._dataBinds,\n      compConfig: compThis.compConfig,\n      widgets: compThis.widgets,\n      node: compThis.node,\n      handler: compThis.handler,\n      lib: { const: constObj, tools: toolsObj },\n      // i18n: compThis.i18n,\n      get props() {\n        return {...compThis.props, events: compThis.events, data: compThis.propsData }\n      },\n      get state() {\n        return compThis.state\n      },\n      get computed() {\n        return compThis.computed\n      },\n    };\n  }\n\n  initWatchMethods() {\n    const { watch = {}, watchState = {}, watchWidget = {}, watchEffects = {}} = componentAPI\n    const _this = this\n    const weappInst = _this.$WEAPPS_COMP\n\n    // # watch effect\n    this.watchEffectDisposers = Object.keys(watchEffects).map(fnName => {\n      return autorun(watchEffects[fnName].bind(this))\n    })\n    const disposers = this.watchEffectDisposers\n\n    // # watch props\n    Object.keys(watch).map(key => runWatcher(parseWatcher(watch[key]), weappInst.props.data, key, 'watch'))\n\n    // # watch state\n    Object.keys(watchState).map(key => runWatcher(parseWatcher(watchState[key]), weappInst.state, key, 'watchState'))\n\n    // # watch widgets\n    Object.keys(watchWidget).map(key => runWatcher(parseWatcher(watchWidget[key]), weappInst.widgets, key, 'watchWidgets'))\n\n    function runWatcher({ handler, immediate } = {}, target, key, label) {\n      if (!handler) {\n        console.error(`Invalid ${label}(${key}) of ${weappInst.node.widgetType}, watch must a function or {handler: function}`)\n        return\n      }\n      const disposer = reaction(() => get(target, key), handler.bind(_this), { fireImmediately: immediate })\n      disposers.push(disposer)\n    }\n  }\n\n  componentDidMount() {\n    this.initPublicMethods()\n    this.initWatchMethods()\n\n    lifecycle.onAttached && lifecycle.onAttached.bind(this)()\n    lifecycle.onReady && lifecycle.onReady.bind(this)()\n  }\n\n  componentWillUnmount() {\n    if(this.watchEffectDisposers) {\n      this.watchEffectDisposers.forEach(disposer => disposer())\n      this.watchEffectDisposers = null\n    }\n    this.node._listeners && this.node._listeners.clear()\n    lifecycle.onDetached && lifecycle.onDetached.bind(this)()\n  }\n\n  render() {\n    return (\n      <WidgetsContext.Provider value={{ parent: this }}>\n        <AppRender\n          className={this.props.className}\n          virtualFields={this.virtualFields}\n          componentSchema={this.componentSchema}\n          codeContext={this}\n        />\n      </WidgetsContext.Provider>\n    );\n  }\n}\n\nCompositeCompWrapper.contextType = WidgetsContext\n\nexport default observer((props) => (\n  <% if(isSandbox) { %>\n  <ErrorBoundary FallbackComponent={createErrorFallback('<%= name %>', '<%= id %>')}>\n  <% } %>\n    <CompositeCompWrapper {...props}></CompositeCompWrapper>\n  <% if(isSandbox) { %>\n  </ErrorBoundary>\n  <% } %>\n));\n\nfunction parseWatcher(watcher) {\n  if (!watcher) return\n  if (watcher instanceof Function) {\n    return { handler: watcher, immediate: false }\n  }\n  const { handler, immediate = false } = watcher\n  if (!(handler instanceof Function)) return\n  return { handler, immediate }\n}\n"
@@ -50,7 +50,7 @@ exports.default = {
         "code": "import { observable } from 'mobx';\nimport initState from '../lowcode/state';\n\nconst globalState = observable(initState);\nexport default globalState;\n"
     },
     "/src/utils/actionHandler.js": {
-        "code": "import { resolveDataBinds } from './common';\nimport lodashSet from 'lodash.set';\n\nconst DEFAULT_MAX_TIMEOUT = 10 * 1000;\n\nexport function getMetaInfoBySourceKey(sourceKey) {\n  const [materialName, name] = sourceKey.split(':');\n  return {\n    materialName,\n    name,\n  };\n}\n\nexport function emitEvent(trigger, listeners = [], args, scopeContext = {}) {\n  const targetListeners = listeners.filter((l) => l.trigger === trigger);\n  targetListeners.forEach(async (listener) => {\n    // 当前非捕获Event，再判断冒泡行为\n    if (!args?.event?.detail?.isCapturePhase && listener.noPropagation) {\n      args?.domEvent?.stopPropagation && args?.domEvent?.stopPropagation();\n    }\n\n    // 判断捕获的执行，只有执行的捕获与配置的捕获一致时。才会执行。\n    if (\n      (listener?.isCapturePhase || false) ===\n      (args?.customEventData?.detail?.isCapturePhase || false)\n    ) {\n      try {\n        const res = await invokeListener(listener, args, scopeContext);\n        const eventName = `${listener.key}.success`;\n        const event = {\n          detail: {\n            value: res,\n            origin: args.event,\n            isCapturePhase: !!args.event?.isCapturePhase,\n          },\n          name: eventName,\n        };\n        emitEvent(\n          eventName,\n          listeners,\n          {\n            ...args,\n            event,\n            customEventData: event,\n          },\n          scopeContext\n        );\n      } catch (e) {\n        const eventName = `${listener.key}.fail`;\n        const event = {\n          detail: {\n            value: e,\n            origin: args.event,\n            isCapturePhase: !!args.event?.isCapturePhase,\n          },\n          name: eventName,\n        };\n        emitEvent(\n          eventName,\n          listeners,\n          {\n            ...args,\n            event,\n            customEventData: event,\n          },\n          scopeContext\n        );\n        // 之前 invoke 内部catch 了错误，不会抛错\n        // throw e\n      }\n    }\n  });\n}\n\nfunction invokeListener(\n  { instanceFunction, data = {}, dataBinds = {} },\n  args,\n  scopeContext\n) {\n  // ToDo resolve databinds\n  const action = instanceFunction;\n  const resolvedData = {\n    ...data,\n  };\n  const resolvedDataBinds = resolveDataBinds(\n    dataBinds,\n    args.forItems,\n    { event: args.event },\n    scopeContext,\n    true\n  );\n\n  // eslint-disable-next-line no-restricted-syntax\n  for (const key in resolvedDataBinds) {\n    if (\n      resolvedDataBinds[key] &&\n      resolvedDataBinds[key].__type === 'scopedValue'\n    ) {\n      try {\n        lodashSet(\n          resolvedData,\n          key,\n          resolvedDataBinds[key].getValue(scopeContext)\n        );\n      } catch (e) {\n        lodashSet(resolvedData, key, '');\n      }\n    } else {\n      lodashSet(resolvedData, key, resolvedDataBinds[key]);\n    }\n  }\n  const params = {\n    data: resolvedData,\n    ...args,\n  };\n\n  return action(params);\n}\n"
+        "code": "import { resolveDataBinds } from './common';\nimport lodashSet from 'lodash.set';\n\nconst DEFAULT_MAX_TIMEOUT = 10 * 1000;\n\nexport function getMetaInfoBySourceKey(sourceKey) {\n  const [materialName, name] = sourceKey.split(':');\n  return {\n    materialName,\n    name,\n  };\n}\n\nexport function emitEvent(trigger, listeners = [], args, scopeContext = {}) {\n  const targetListeners = listeners.filter((l) => l.trigger === trigger);\n  targetListeners.forEach(async (listener) => {\n    // 当前非捕获Event，再判断冒泡行为\n    if (!args?.event?.detail?.isCapturePhase && listener.noPropagation) {\n      args?.domEvent?.stopPropagation && args?.domEvent?.stopPropagation();\n    }\n\n    // 判断捕获的执行，只有执行的捕获与配置的捕获一致时。才会执行。\n    if (\n      (listener?.isCapturePhase || false) ===\n      (args?.customEventData?.detail?.isCapturePhase || false)\n    ) {\n      try {\n        const res = await invokeListener(listener, args, scopeContext);\n        const eventName = `${listener.key}.success`;\n        const event = {\n          detail: {\n            value: res,\n            origin: args.event,\n            isCapturePhase: !!args.event?.isCapturePhase,\n          },\n          name: eventName,\n        };\n        emitEvent(\n          eventName,\n          listeners,\n          {\n            ...args,\n            event,\n            customEventData: event,\n          },\n          scopeContext\n        );\n      } catch (e) {\n        const eventName = `${listener.key}.fail`;\n        const event = {\n          detail: {\n            value: e,\n            origin: args.event,\n            isCapturePhase: !!args.event?.isCapturePhase,\n          },\n          name: eventName,\n        };\n        emitEvent(\n          eventName,\n          listeners,\n          {\n            ...args,\n            event,\n            customEventData: event,\n          },\n          scopeContext\n        );\n        // 之前 invoke 内部catch 了错误，不会抛错\n        // throw e\n        console.error(`Action error: [${listener.trigger}]`, e);\n      }\n    }\n  });\n}\n\nfunction invokeListener(\n  { instanceFunction, data = {}, dataBinds = {} },\n  args,\n  scopeContext\n) {\n  // ToDo resolve databinds\n  const action = instanceFunction;\n  const resolvedData = {\n    ...data,\n  };\n  const resolvedDataBinds = resolveDataBinds(\n    dataBinds,\n    args.forItems,\n    { event: args.event },\n    scopeContext,\n    true\n  );\n\n  // eslint-disable-next-line no-restricted-syntax\n  for (const key in resolvedDataBinds) {\n    if (\n      resolvedDataBinds[key] &&\n      resolvedDataBinds[key].__type === 'scopedValue'\n    ) {\n      try {\n        lodashSet(\n          resolvedData,\n          key,\n          resolvedDataBinds[key].getValue(scopeContext)\n        );\n      } catch (e) {\n        lodashSet(resolvedData, key, '');\n      }\n    } else {\n      lodashSet(resolvedData, key, resolvedDataBinds[key]);\n    }\n  }\n  const params = {\n    data: resolvedData,\n    ...args,\n  };\n\n  return action(params);\n}\n"
     },
     "/src/utils/common.js": {
         "code": "/**\n * All data bindings are generated as functions: (forItems) => any\n * @param {*} dataBinds\n * @param {*} forItems\n */\nimport { app } from '../app/global-api';\nexport function resolveDataBinds(\n  dataBinds,\n  forItems,\n  codeContext,\n  scopeContext,\n  throwError\n) {\n  const resolvedProps = {};\n  for (const prop in dataBinds) {\n    let fn = dataBinds[prop];\n    try {\n      if (codeContext && codeContext.$WEAPPS_COMP) {\n        fn = fn.bind(codeContext.$WEAPPS_COMP);\n      }\n      resolvedProps[prop] = fn(\n        forItems,\n        codeContext && codeContext.event,\n        scopeContext\n      );\n    } catch (e) {\n      console.error('Error resolving data binding', prop, dataBinds[prop], e);\n      if (throwError) {\n        throw e;\n      }\n    }\n  }\n  return resolvedProps;\n}\n\n/**\n * 对函数进行批量绑定\n * @param {*} funcObj\n * @param {*} context\n */\nexport function bindFuncObj(funcObj = {}, context) {\n  return Object.keys(funcObj).reduce((obj, fnName) => {\n    obj[fnName] = funcObj[fnName].bind(context);\n    return obj;\n  }, {});\n}\n\nexport function kebabCase(str) {\n  return str.replace(KEBAB_REGEX, function (match) {\n    return '-' + match.toLowerCase();\n  });\n}\n\nexport function camelcase(str, firstUpperCase = false) {\n  str = str.replace(/[_-]([a-z])/g, function (l) {\n    return l[1].toUpperCase();\n  });\n\n  if (firstUpperCase) str = str.charAt(0).toUpperCase() + str.slice(1);\n\n  return str;\n}\n\nexport const isEmptyObj = (obj) => {\n  if (!isPlainObject(obj)) {\n    return false;\n  }\n  for (const i in obj) {\n    if (Object.prototype.hasOwnProperty.call(obj, i)) {\n      return false;\n    }\n  }\n  return true;\n};\n\nexport function isPlainObject(src) {\n  return Object.prototype.toString.call(src) === '[object Object]';\n}\n\n/**\n * 用于处理自定义组件props传参结构，对系统变量进行保留\n */\nexport function resolveComponentProps(props, isPlainProps) {\n  const { staticResourceAttribute } = props;\n  staticResourceAttribute &&\n    staticResourceAttribute.map((property) => {\n      if (props.data && props.data[property]) {\n        props.data[property] = getStaticResourceAttribute(props.data[property]);\n      }\n    });\n  if (!isPlainProps) {\n    return {\n      ...props,\n    };\n  }\n  const { data = {}, events = [], ...restProps } = props;\n  const customProps = { ...data };\n  const builtinProps = [\n    // react 保留字\n    'ref',\n    'key',\n    'dangerouslySetInnerHTML',\n    'className',\n    'htmlFor',\n    'style',\n    'contentEditable',\n    // lowcode 保留字\n    'events',\n    'children',\n    '_parentId',\n    '_visible',\n    'classList',\n    'widgetType',\n    'getWidgetsByType',\n    'getDom',\n    'domRef',\n    'extends',\n    // 小程序保留字\n    'id',\n    'class',\n    'hidden',\n    'slot',\n  ];\n  // delete builtin props\n  builtinProps.map((prop) => delete customProps[prop]);\n  return {\n    ...data,\n    ...restProps,\n    events: new Proxy(\n      events.reduce((events, item) => {\n        const propName = item;\n        events[propName] = (e) => restProps.emit(propName, e);\n        return events;\n      }, {}),\n      {\n        get(obj, prop) {\n          return prop in obj ? obj[prop] : (e) => restProps.emit(prop, e);\n        },\n      }\n    ),\n  };\n}\n\nconst SCOPE_SLOT_COMPONENT_LIB = ['tea_basis', 'tea_shop', 'crm_basis'];\n\nconst SCOPE_SLOT_MAP = SCOPE_SLOT_COMPONENT_LIB.reduce((map, lib) => {\n  map[`${lib}:TableMatching`] = {\n    headerSlot: true,\n    recordSlot: true,\n  };\n\n  map[`${lib}:TableExpanded`] = {\n    headerSlot: true,\n    recordSlot: true,\n  };\n\n  map[`${lib}:TabsTable`] = {\n    headerSlot: true,\n    recordSlot: true,\n  };\n\n  map[`${lib}:Table`] = {\n    headerSlot: true,\n    recordSlot: true,\n  };\n\n  return map;\n}, {});\n\nexport function isScopeSlot(comp, slot) {\n  const { 'x-props': xProps } = comp;\n  const sourceKey = xProps && xProps.sourceKey;\n  const map = SCOPE_SLOT_MAP[sourceKey];\n  return map && map[slot];\n}\n\nexport function getStaticResourceAttribute(staticUrl) {\n  if (/^\\//.test(staticUrl)) {\n    const { domain = '' } = app;\n    const url = `https://${domain}${staticUrl}`;\n    return url;\n  }\n  return staticUrl;\n}\n/**\n * 检查页面权限\n **/\nexport async function checkAuth(app, appId, pageId) {\n  app.showNavigationBarLoading();\n  const checkAuthResult = await app.cloud.checkAuth({\n    type: 'app',\n    extResourceId: `${appId}-${pageId}`,\n  });\n  let isLogin = false;\n  if (Array.isArray(checkAuthResult) && checkAuthResult.length > 0) {\n    isLogin = checkAuthResult[0]?.IsAccess ?? false;\n  }\n  app.hideNavigationBarLoading();\n\n  if (!isLogin) {\n    app.showToast({\n      title: '页面无访问权限',\n      icon: 'error',\n    });\n  }\n  return isLogin;\n}\n"

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -550,19 +550,6 @@ class LowCodePlugin extends framework_core_1.Plugin {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 this._time("DEPLOY");
-                if (this._skipInstallExt) {
-                    try {
-                        yield this.api.cloudApi.tcbService.request('CloudBaseCIResultCallback', {
-                            CIID: this.api.ciId,
-                            TraceId: this.api.ciId,
-                            Status: 0,
-                        });
-                        this.api.logger.debug('回调云项目成功');
-                    }
-                    catch (e) {
-                        this.api.logger.error('通知云项目状态失败[CloudBaseCIResultCallback]', e);
-                    }
-                }
                 if (this._miniprogramePlugin) {
                     yield this._miniprogramePlugin.deploy();
                 }
@@ -597,6 +584,19 @@ class LowCodePlugin extends framework_core_1.Plugin {
                         throw e;
                     }
                 }
+                if (this._skipInstallExt) {
+                    try {
+                        yield this.api.cloudApi.tcbService.request('CloudBaseCIResultCallback', {
+                            CIID: this.api.ciId,
+                            TraceId: this.api.ciId,
+                            Status: 0,
+                        });
+                        this.api.logger.debug('回调云项目成功');
+                    }
+                    catch (e) {
+                        this.api.logger.error('通知云项目状态失败[CloudBaseCIResultCallback]', e);
+                    }
+                }
                 this.api.logger.info(`${this.api.emoji('🚀')} low - code deploy end, cost ${this._timeEnd("DEPLOY")}s`);
             }
             catch (e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.4.42-alpha.2",
+  "version": "0.4.45",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/generator/pages/app.tpl

@@ -106,6 +106,12 @@ export default function App() {
   useScrollTop()
   return (
     <div className="weapps-page weapps-page-<%= pageClass %>">
+      <style
+        type="text/css"
+        dangerouslySetInnerHTML={{
+          __html: `<%= pageStyleText %>`,
+        }}
+      />
       <AppRender
         virtualFields={virtualFields}
         componentSchema={componentSchema}

package/template/generator/utils/actionHandler.js

@@ -67,6 +67,7 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}) {
         );
         // 之前 invoke 内部catch 了错误，不会抛错
         // throw e
+        console.error(`Action error: [${listener.trigger}]`, e);
       }
     }
   });

package/template/html/index.html.ejs

@@ -63,13 +63,13 @@
         min-height: 100%;
       }
 
-      /* body > #root {
+      body > #react-body {
         height: 100%;
       }
 
       .weapps-page {
         min-height: 100%;
-      } */
+      }
 
       article,
       aside,
@@ -378,10 +378,10 @@
     <script src="//imgcache.qq.com/qcloud/cloudbase-js-sdk/1.5.3-alpha.0/cloudbase.full.js"></script>
     <% }%>
     <script>
-      if (cloudbase) {
-        const _callFunction = cloudbase.__proto__.callFunction;
-        cloudbase.__proto__.callFunction = function (args) {
-          let promise = _callFunction.call(cloudbase, ...arguments);
+      if (window.cloudbase) {
+        const _callFunction = window.cloudbase.__proto__.callFunction;
+        window.cloudbase.__proto__.callFunction = function (args) {
+          let promise = _callFunction.call(window.cloudbase, ...arguments);
           if (promise instanceof Promise) {
             return promise
               .then((res) => {
@@ -430,11 +430,10 @@
       }
     </script>
     <script
-      src="//cdnjs.cloudflare.com/ajax/libs/mobx/5.15.7/mobx.umd.js"
-      integrity="sha512-eVSAFJAkqn7381lHvfGgHKrZWDr75+Do7qZdD0kfFz/4Eq5hntLp/IS66l85BGClN1oYxLwd4G/bxrgIIvedag=="
+      src="//qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js"
       crossorigin="anonymous"
     ></script>
-    <script src="//unpkg.com/@cloudbase/weda-cloud-sdk@stable/dist/h5.browser.js"></script>
-    <script src="//cdn.jsdelivr.net/npm/@zxing/library@0.18.6/umd/index.min.js"></script>
+    <script src="//qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_npm/@cloudbase/weda-cloud-sdk@latest/dist/h5.browser.js"></script>
+    <script src="//qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/npm/@zxing/library@0.18.6/umd/index.min.js"></script>
   </body>
 </html>

package/template/node_modules/@zxing/library/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 ZXing for JS
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.