@cloudbase/lowcode-builder 1.8.18 → 1.8.19

package/lib/utils/transform.d.ts

@@ -0,0 +1,3 @@
+export declare function BabelTransform(code: any, options?: {
+    IIFE?: boolean;
+}): any;

package/lib/utils/transform.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BabelTransform = void 0;
+const core_1 = require("@babel/core");
+function BabelTransform(code, options = {}) {
+    var _a;
+    const { IIFE = false } = options;
+    try {
+        const simpleWrapped = `(\n${code || 'undefined'}\n)`;
+        const { code: expression } = (0, core_1.transformSync)(IIFE ? `(()=>${simpleWrapped})()` : simpleWrapped, {
+            // plugins: ['transform-modules-commonjs', 'transform-react-jsx'],
+            cwd: __dirname,
+            sourceType: 'script',
+            comments: false,
+            // minified: true,
+            presets: [
+                [
+                    '@babel/preset-env',
+                    {
+                        targets: {
+                            // esmodules: true,
+                            browsers: ['defaults', 'iOS >= 10', 'safari >= 10'],
+                        },
+                    },
+                ],
+            ],
+        }) || {};
+        return ((_a = expression === null || expression === void 0 ? void 0 : expression.replace) === null || _a === void 0 ? void 0 : _a.call(expression, /;$/, '')) || code;
+    }
+    catch (e) {
+        console.error(`transform [${code}] fail:`, e === null || e === void 0 ? void 0 : e.message);
+        return code;
+    }
+}
+exports.BabelTransform = BabelTransform;

package/lib/weapp-page.d.ts

@@ -0,0 +1,17 @@
+export declare function createPage({ app, id, widgetProps, index, lifecycle, state, computed, evtListeners, dataBinds, handlers, query: datasetQuery, eventFlows, pageContext, pageAttributes, enableShare, }: {
+    app: any;
+    id: any;
+    widgetProps: any;
+    index?: {} | undefined;
+    lifecycle: any;
+    state: any;
+    computed: any;
+    evtListeners: any;
+    dataBinds: any;
+    handlers: any;
+    query?: {} | undefined;
+    eventFlows?: never[] | undefined;
+    pageContext?: {} | undefined;
+    pageAttributes?: {} | undefined;
+    enableShare?: boolean | undefined;
+}): string;

package/lib/weapp-page.js

@@ -0,0 +1,301 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createPage = void 0;
+const mobx_1 = require("mobx");
+const util_1 = require("./util");
+const widget_1 = require("./widget");
+const merge_renderer_1 = __importDefault(require("./merge-renderer"));
+const index_1 = require("../datasources/index");
+const watch_1 = require("./watch");
+const weapps_api_1 = require("../app/weapps-api");
+const event_emitter_1 = require("./event-emitter");
+const weda_client_1 = require("@cloudbase/weda-client");
+const wxApp = getApp();
+function extractLifecycles(ctx, lifecycle, appShareMessage, enableShare = false) {
+    const result = {};
+    Object.keys(lifecycle).map((name) => {
+        result[name] = function () {
+            return lifecycle[name].apply(this._getInstance(), arguments);
+        };
+    });
+    if (enableShare) {
+        result['onShareAppMessage'] = (res) => {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            if ((res === null || res === void 0 ? void 0 : res.from) === 'button' && ((_b = (_a = res === null || res === void 0 ? void 0 : res.target) === null || _a === void 0 ? void 0 : _a.dataset) === null || _b === void 0 ? void 0 : _b.weda_share_info)) {
+                return (_d = (_c = res === null || res === void 0 ? void 0 : res.target) === null || _c === void 0 ? void 0 : _c.dataset) === null || _d === void 0 ? void 0 : _d.weda_share_info;
+            }
+            else if ((res === null || res === void 0 ? void 0 : res.from) === 'menu' && (appShareMessage === null || appShareMessage === void 0 ? void 0 : appShareMessage.enable)) {
+                let { pageId, params, imageUrl, title, packageName } = appShareMessage || {};
+                return {
+                    path: (0, weda_client_1.generatePageUrl)({
+                        pageId,
+                        packageName,
+                        params,
+                    }),
+                    imageUrl: ((_g = (_f = (_e = ctx.app) === null || _e === void 0 ? void 0 : _e.__internal__) === null || _f === void 0 ? void 0 : _f.resolveStaticResourceUrl) === null || _g === void 0 ? void 0 : _g.call(_f, imageUrl)) || imageUrl,
+                    title,
+                };
+            }
+            try {
+                return ((_h = lifecycle === null || lifecycle === void 0 ? void 0 : lifecycle['onShareAppMessage']) === null || _h === void 0 ? void 0 : _h.call(lifecycle)) || {};
+            }
+            catch (error) {
+                console.log(error);
+                return {};
+            }
+        };
+    }
+    // 更新设备信息 窗口信息
+    result['onResize'] = (res) => {
+        var _a, _b, _c, _d;
+        let device = weapps_api_1.$w.device;
+        if (!device) {
+            return;
+        }
+        const width = (_a = res === null || res === void 0 ? void 0 : res.size) === null || _a === void 0 ? void 0 : _a.windowWidth;
+        const height = (_b = res === null || res === void 0 ? void 0 : res.size) === null || _b === void 0 ? void 0 : _b.windowHeight;
+        if (width !== ((_c = device === null || device === void 0 ? void 0 : device.viewport) === null || _c === void 0 ? void 0 : _c.width) || height !== ((_d = device === null || device === void 0 ? void 0 : device.viewport) === null || _d === void 0 ? void 0 : _d.height)) {
+            device.viewport = {
+                width,
+                height,
+            };
+        }
+    };
+    return result;
+}
+function createPage({ app, id, widgetProps, index = {}, lifecycle, state, computed, evtListeners, dataBinds, handlers, query: datasetQuery = {}, eventFlows = [], pageContext = {}, pageAttributes = {}, enableShare = false, }) {
+    const evtHandlers = (0, util_1.createEventHandlers)(evtListeners);
+    return Component({
+        _componentType: 'page',
+        data: {
+            ...(0, widget_1.createInitData)(widgetProps, dataBinds),
+            _isCheckingAtuh: false,
+            weDaHasLogin: false,
+        },
+        lifetimes: {
+            attached() {
+                this._disposers = [];
+                const $page = this._getInstance();
+                this._pageActive = true;
+                /**
+                 * @deprecated
+                 * 使用 behavior 的方式挂载methods
+                 */
+                this.__mnt__ = (e) => {
+                    const widget = (0, widget_1.getWidget)($page.widgets, e.target.id);
+                    widget._methods = e.detail.methods;
+                };
+                /**
+                 * @deprecated
+                 * 使用 behavior 的方式挂载methods
+                 */
+                this.__unmnt__ = (e) => {
+                    const widget = (0, widget_1.getWidget)($page.widgets, e.target.id);
+                    widget._methods = {};
+                };
+                this._disposers.push(...this.initMergeRenderer($page.widgets));
+            },
+            detached() {
+                const $page = this._getInstance();
+                this._pageActive = false;
+                $page.__internal__.active = this._pageActive;
+                (0, widget_1.disposeWidget)($page._rootWidget);
+                this._disposers.forEach((dispose) => dispose());
+            },
+        },
+        pageLifetimes: {
+            // 组件所在页面的生命周期函数，定义下给运营平台上报用
+            show: function () { },
+            hide: function () { },
+        },
+        methods: {
+            _pageActive: true,
+            _beforePageCustomLaunchPromise: null,
+            _query: {},
+            _disposers: [],
+            /** page lifecycles **/
+            ...extractLifecycles({ app }, lifecycle, pageAttributes === null || pageAttributes === void 0 ? void 0 : pageAttributes.appShareMessage, enableShare),
+            ...evtHandlers,
+            ...merge_renderer_1.default,
+            async beforePageCustomLaunch(query) {
+                if (!this._beforePageCustomLaunchPromise) {
+                    this._beforePageCustomLaunchPromise = new Promise(async (resolve) => {
+                        var _a, _b, _c, _d, _e;
+                        await ((_a = wxApp.globaldata) === null || _a === void 0 ? void 0 : _a._beforePageCustomLaunchPromise);
+                        const $page = this._getInstance();
+                        if (query) {
+                            index_1.EXTRA_API.setParams($page.uuid, query);
+                        }
+                        try {
+                            this.setData({ _isCheckingAtuh: true });
+                            const auth = await (0, util_1.checkAuth)(app, app.id, $page);
+                            if (auth) {
+                                this.setData({
+                                    weDaHasLogin: true,
+                                });
+                                (0, index_1.createStateDataSourceVar)($page.uuid, (0, index_1.generateParamsParser)({ app, $page, $w: (_b = $page.__internal__) === null || _b === void 0 ? void 0 : _b.$w }));
+                            }
+                        }
+                        finally {
+                            this.setData({ _isCheckingAtuh: false });
+                        }
+                        // eslint-disable-next-line no-restricted-syntax
+                        for (const queryId in ((_c = $page.dataset) === null || _c === void 0 ? void 0 : _c.query) || {}) {
+                            if (((_e = (_d = $page.dataset.query[queryId]) === null || _d === void 0 ? void 0 : _d._schema) === null || _e === void 0 ? void 0 : _e.trigger) === 'auto') {
+                                try {
+                                    $page.dataset.query[queryId].trigger();
+                                    this._disposers.push(() => $page.dataset.query[queryId].destroy());
+                                }
+                                catch (e) {
+                                    console.error(`query ${queryId} 初始化失败：`, e);
+                                }
+                            }
+                        }
+                        resolve();
+                    });
+                }
+                return this._beforePageCustomLaunchPromise;
+            },
+            async onLoad(options) {
+                var _a, _b;
+                const $page = this._getInstance();
+                (0, index_1.setConfig)({ currentPageId: $page.uuid });
+                this._pageActive = true;
+                $page.__internal__.active = this._pageActive;
+                app.__internal__.activePage = $page;
+                this._query = decodePageQuery(options || {});
+                await ((_a = this.beforePageCustomLaunch) === null || _a === void 0 ? void 0 : _a.call(this, this._query));
+                const hook = lifecycle.onLoad || lifecycle.onPageLoad;
+                await ((_b = hook === null || hook === void 0 ? void 0 : hook.call) === null || _b === void 0 ? void 0 : _b.call(hook, $page, this._query));
+                this._invokeEventHandler('load', { query: this._query });
+            },
+            async onReady() {
+                var _a;
+                const $page = this._getInstance();
+                this._disposers.push(...(0, watch_1.runWatchers)(index, this));
+                const hook = lifecycle.onReady || lifecycle.onPageReady;
+                await ((_a = hook === null || hook === void 0 ? void 0 : hook.call) === null || _a === void 0 ? void 0 : _a.call(hook, $page));
+                this._invokeEventHandler('ready');
+            },
+            onUnload() {
+                var _a;
+                const $page = this._getInstance();
+                const hook = lifecycle.onUnload || lifecycle.onPageUnload;
+                (_a = hook === null || hook === void 0 ? void 0 : hook.call) === null || _a === void 0 ? void 0 : _a.call(hook, $page);
+                this._invokeEventHandler('unload');
+            },
+            async onShow() {
+                var _a, _b;
+                const $page = this._getInstance();
+                (0, index_1.setConfig)({ currentPageId: $page.uuid });
+                this._pageActive = true;
+                $page.__internal__.active = this._pageActive;
+                app.__internal__.activePage = $page;
+                await ((_a = this.beforePageCustomLaunch) === null || _a === void 0 ? void 0 : _a.call(this, this._query));
+                const hook = lifecycle.onShow || lifecycle.onPageShow;
+                await ((_b = hook === null || hook === void 0 ? void 0 : hook.call) === null || _b === void 0 ? void 0 : _b.call(hook, $page));
+                this._invokeEventHandler('show');
+            },
+            onHide() {
+                var _a;
+                const $page = this._getInstance();
+                const hook = lifecycle.onHide || lifecycle.onPageHide;
+                (_a = hook === null || hook === void 0 ? void 0 : hook.call) === null || _a === void 0 ? void 0 : _a.call(hook, $page);
+                this._pageActive = false;
+                // 触发页面节点事件
+                this._invokeEventHandler('hide');
+                $page.__internal__.active = this._pageActive;
+            },
+            _invokeEventHandler(triggerName, params = {}) {
+                var _a, _b;
+                const keyName = (0, util_1.getMpEventHandlerName)(id, triggerName);
+                const event = new event_emitter_1.Event({
+                    type: triggerName,
+                    detail: params,
+                });
+                return (_b = (_a = this[keyName]) === null || _a === void 0 ? void 0 : _a.call) === null || _b === void 0 ? void 0 : _b.call(_a, this, event);
+            },
+            _getInstance() {
+                let $page = this.$WEAPPS_PAGE;
+                if ($page) {
+                    return $page;
+                }
+                Object.assign(pageContext, {
+                    id,
+                    state: (0, mobx_1.observable)(state),
+                    path: this.route,
+                    widgets: {},
+                });
+                $page = pageContext;
+                this.$WEAPPS_PAGE = $page;
+                $page.handler = Object.keys(handlers).reduce((result, key) => {
+                    try {
+                        result[key] = handlers[key].bind($page);
+                    }
+                    catch (e) {
+                        console.error('添加页面handler失败', e);
+                    }
+                    return result;
+                }, {});
+                $page.computed = (0, util_1.createComputed)(computed, $page);
+                let dataset = (0, index_1.createDataset)($page.uuid);
+                dataset.query = (0, util_1.generateDatasetQuery)(datasetQuery, {
+                    $w: $page.__internal__.$w,
+                    $app: app,
+                    $page,
+                });
+                $page.dataset = dataset;
+                $page.state.dataset = dataset;
+                $page.setState = (userSetState) => {
+                    Object.keys(userSetState).forEach((keyPath) => {
+                        app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);
+                    });
+                };
+                const { widgets, rootWidget } = (0, widget_1.createWidgets)(widgetProps, dataBinds, this, $page.widgets);
+                $page.widgets = widgets;
+                $page._rootWidget = rootWidget;
+                $page.invokeComponentMethod = ({ component, method, params }) => {
+                    var _a;
+                    const components = $page.widgets[component];
+                    let componentInstance = undefined;
+                    if (Array.isArray(components)) {
+                        if (components.length > 1) {
+                            throw new Error(`调用方法失败：id为${component}的组件拥有多个实例`);
+                        }
+                        componentInstance = components[0];
+                    }
+                    else {
+                        componentInstance = components;
+                    }
+                    const currentInstanceRef = ((_a = componentInstance === null || componentInstance === void 0 ? void 0 : componentInstance._getInstanceRef()) === null || _a === void 0 ? void 0 : _a.current) || {};
+                    const { methods = {}, ...restInstanceRef } = currentInstanceRef;
+                    const readonlyMap = {
+                        ...componentInstance === null || componentInstance === void 0 ? void 0 : componentInstance._methods,
+                        ...restInstanceRef,
+                        ...methods,
+                    };
+                    if (typeof readonlyMap[method] !== 'function') {
+                        throw new Error(`调用方法失败：未找到id为${component}下的方法${method}`);
+                    }
+                    return readonlyMap[method](params);
+                };
+                $page.__internal__.eventFlows = (0, util_1.generateEventFlows)(eventFlows, {
+                    $w: $page.__internal__.$w,
+                    $app: app,
+                    $page,
+                });
+                return $page;
+            },
+        },
+    });
+}
+exports.createPage = createPage;
+function decodePageQuery(query) {
+    return Object.keys(query).reduce((decoded, key) => {
+        decoded[key] = decodeURIComponent(query[key]);
+        return decoded;
+    }, {});
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.18",
+  "version": "1.8.19",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -32,14 +32,17 @@
     "test": "jest",
     "test:build": "ts-node ./__tests__/build.ts",
     "dev:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/web.config.js",
-    "build:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js"
+    "build:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js",
+    "build:template": "./scripts/buildTemplate.sh"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^1.0.14",
-    "@cloudbase/lowcode-generator": "^1.8.8",
+    "@babel/core": "^7.11.6",
+    "@babel/preset-env": "^7.4.4",
+    "@cloudbase/cals": "^1.0.15",
+    "@cloudbase/lowcode-generator": "^1.8.9",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -525,7 +525,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.39/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.42/dist/h5.browser.js"
     ></script>
     <script
       crossorigin
@@ -551,7 +551,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.8bdf2bc04fec833b06b7.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.f12ad33da9108405a333.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js

@@ -96,7 +96,9 @@ export function createEventHandlers(
            * 取消判断待兼容
            */
           if (pageId !== id /* || (__internal__ && !__internal__.active)*/) {
-            console.error(`Action error: [${name}] 页面生命周期结束，链式调用中断`);
+            if (!name?.includes?.('onDataChange')) {
+              console.error(`Action error: [${name}] 页面生命周期结束，链式调用中断`);
+            }
             return false;
           }
         }
@@ -160,7 +162,7 @@ export function createEventHandlers(
           }
         } catch (e) {
           if (e.message) {
-            e.message = `${currentTarget?.id || ''}[${trigger}:${l.key}]: ${e.message}`;
+            e._target = `${currentTarget?.id || ''}[${trigger}:${l.key}]`
           }
           nextEventHandles[0].handlerName = l.key ? `${prefix}$${l.key}_fail` : '';
           nextEventHandles[0].event.detail = isIfAction ? event.detail : e;
@@ -175,12 +177,12 @@ export function createEventHandlers(
           const nextHandler = nextEventHandles[0];
 
           if (!self[nextHandler.handlerName] && error) {
-            console.error(`Action error:`, error);
+            console.error(`Action error:`, generateErrorDebugMessage(error), error?.stack);
             if (!looseError) {
               if (app.__internal__?.env?.type !== 'production') {
                 app.showModal({
                   title: `事件响应失败`,
-                  content: error.message || error.errMsg || '',
+                  content: generateErrorDebugMessage(error) || error.errMsg || '',
                   showCancel: false,
                 });
               } else {
@@ -231,6 +233,12 @@ export function createEventHandlers(
 
   return evtHandlers;
 }
+
+function generateErrorDebugMessage(error) {
+  return `${error?._target ? `${error?._target}:` : ''}${error?.message || ''}`;
+}
+
+
 export function getDeep(target, key, keySeparator = '.') {
   if (key == null) {
     return target;