@cloudbase/lowcode-builder 1.4.5 → 1.5.1

package/lib/builder/core/index.js

@@ -17,6 +17,7 @@ const common_2 = require("../../utils/common");
 const postProcess_1 = require("../../utils/postProcess");
 const cals_1 = require("@cloudbase/cals");
 const net_1 = require("../util/net");
+const config_1 = require("../config");
 const pkg = require('../../../package.json');
 async function buildWedaConfig({ output, domain = undefined, isPrivateMode = undefined, endpointType = undefined, buildTypeList = [common_1.BuildType.WEB], }) {
     if ((0, common_1.buildAsWebByBuildType)(buildTypeList)) {
@@ -86,24 +87,52 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     console.log('生成路径', appBuildDir);
     try {
         const startTime = Date.now();
+        function processRepeaterDisplay(cals) {
+            cals.items = (cals.items || []).map((page) => {
+                return JSON.parse(JSON.stringify(page, (key, value) => {
+                    if (value === null || value === void 0 ? void 0 : value.component) {
+                        const component = value;
+                        if ((value === null || value === void 0 ? void 0 : value.component) &&
+                            `${component.module}:${component.component}` === `${config_1.REPEATER.MODULE_NAME}:${config_1.REPEATER.REPEATER_NAME}`) {
+                            // 给 Repeater 组件加一层虚拟项组件，在虚拟项组件上挂 for 循环
+                            const { items = [] } = component;
+                            component.items = items.map((item) => {
+                                if (component.directives[':display'] !== undefined && component.directives[':display'] !== 'true') {
+                                    if (!item.directives) {
+                                        item.directives = {};
+                                    }
+                                    const current = item.directives[':display'] || 'true';
+                                    item.directives[':display'] = `(\n${component.directives[':display']}\n) && (\n${current}\n)`;
+                                }
+                                return item;
+                            });
+                        }
+                    }
+                    return value;
+                }));
+            });
+            return cals;
+        }
         if (buildTypeList.includes(common_1.BuildType.MP)) {
-            const mainAppSerializeData = (0, common_2.processCals2WeappsData)(cals, dependencies);
-            const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(item, dependencies))) || [];
+            const mainAppSerializeData = (0, common_2.processCals2WeappsData)(processRepeaterDisplay(cals), dependencies);
+            const subAppSerializeDataList = (subAppCalsList === null || subAppCalsList === void 0 ? void 0 : subAppCalsList.map((item) => (0, common_2.processCals2WeappsData)(processRepeaterDisplay(item), dependencies))) || [];
             const apps = [mainAppSerializeData, ...subAppSerializeDataList];
             if (isBrowserMpBuilder) {
                 // 尽早下载物料
                 await (0, net_1.downloadBrowserMaterial)(output === null || output === void 0 ? void 0 : output.path);
             }
+            const { enablePageRoot } = (0, cals_1.parseVersion)(cals === null || cals === void 0 ? void 0 : cals.schemaVersion, dependencies);
             const mpBuildContext = {
                 ...buildContext,
                 projDir: (output === null || output === void 0 ? void 0 : output.path) || path_1.default.join(appBuildDir, 'mp'),
                 mainAppData: mainAppSerializeData,
                 processCssUnit: ([cals, ...subAppCalsList].find((cals) => {
-                    const FEATURE_MAP = (0, cals_1.parseVersion)(cals.schemaVersion);
+                    const FEATURE_MAP = (0, cals_1.parseVersion)(cals.schemaVersion, dependencies);
                     return !FEATURE_MAP.defaultDynamicCssUnit;
                 })
                     ? 'px'
                     : 'rpx'),
+                enablePageRoot,
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,

package/lib/builder/h5/index.js

@@ -44,6 +44,7 @@ const common_2 = require("../../utils/common");
 const config_1 = require("../config");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const junk = __importStar(require("../util/junk"));
+const url_1 = require("url");
 async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildTypeList = [common_1.BuildType.WEB], subAppCalsList, mode, devTool, runtime = types_1.RUNTIME.NONE, deployMode = types_1.DEPLOY_MODE.PREVIEW, ignoreInstall = false, cdnEndpoints, }) {
     var _a, _b, _c;
     const { projDir: buildDir, domain, materialLibs: dependencies, appId: appKey, isPrivateMode } = buildContext;
@@ -165,8 +166,18 @@ async function buildH5App({ buildContext, i18nConfig, extraData, cals, buildType
             .readdirSync(path_1.default.resolve(h5BuildDir, webpack_2.OUTPUT_DIR))
             .filter((file) => junk.not(file) && file !== MAINIFAST_FILENAME)
             .map((file) => {
-            return path_1.default.posix.join(publicPath, file);
-        });
+            if (/LICENSE\.txt$/.test(file) || /\.map$/.test(file)) {
+                return '';
+            }
+            try {
+                const url = new url_1.URL(publicPath);
+                return `${url.origin}${path_1.default.posix.join(url.pathname, file)}`;
+            }
+            catch (e) {
+                return path_1.default.posix.join(publicPath, file);
+            }
+        })
+            .filter((item) => !!item);
         // 普通 web 模式，且非hash模式，根据页面生成多份入口
         if (!((_c = cals.extra) === null || _c === void 0 ? void 0 : _c.historyType) || cals.extra.historyType === types_1.HISTORY_TYPE.BROWSER) {
             preHeatUrls.push(path_1.default.posix.join(basename));

package/lib/builder/mp/BuildContext.d.ts

@@ -26,4 +26,9 @@ export interface IBuildContext {
      * 云开发sdk请求，js-sdk or wx.cloud
      */
     endpointType?: 'tcb-api' | 'wechat-service';
+    /**
+     * 是否在页面层面添加节点
+     * 并设置 #page-root-id
+     */
+    enablePageRoot?: boolean;
 }

package/lib/builder/mp/util.js

@@ -276,9 +276,21 @@ function createDataBinds(ctx, widgets) {
         const { directives = {} } = xProps;
         setDataBind(dataBinds[id], '_waFor', directives.waFor);
         setDataBind(dataBinds[id], '_waIf', directives.waIf);
+        if (directives.waDisplay) {
+            let { type, value } = directives.waDisplay;
+            if (!type || type === 'static') {
+                type = weapps_core_1.PropBindType.expression;
+                value = `${JSON.stringify(value)}`;
+            }
+            setDataBind(dataBinds[id], '_waDisplay', {
+                ...directives.waDisplay,
+                type,
+                value,
+            });
+        }
         setDataBind(dataBinds[id], 'classList', xProps.classListBind);
         setDataBind(dataBinds[id], 'style', xProps.styleBind);
-        const { classList, style } = dataBinds[id];
+        const { classList, style, _waDisplay } = dataBinds[id];
         if (classList) {
             dataBinds[id].classList = {
                 ...classList,
@@ -286,12 +298,21 @@ function createDataBinds(ctx, widgets) {
             };
         }
         if (style) {
-            const styleExpression = `{...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n)}`;
+            const styleExpression = _waDisplay
+                ? `{...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n), display: (()=>{${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.imports}\n return (\n${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.expression}\n)})() ? undefined: 'none' }`
+                : `{...widgetProps.${id}.style, ...(\n${style === null || style === void 0 ? void 0 : style.expression}\n)}`;
             dataBinds[id].style = {
                 ...style,
                 expression: processCssUnit === 'rpx' ? `px2rpx(${styleExpression})` : styleExpression,
             };
         }
+        else if (_waDisplay) {
+            const styleExpression = `{...widgetProps.${id}.style,  display: (\n${_waDisplay === null || _waDisplay === void 0 ? void 0 : _waDisplay.expression}\n)? undefined: 'none' }`;
+            dataBinds[id].style = {
+                ..._waDisplay,
+                expression: processCssUnit === 'rpx' ? `px2rpx(${styleExpression})` : styleExpression,
+            };
+        }
         if (Object.keys(dataBinds[id]).length === 0) {
             delete dataBinds[id];
         }

package/lib/builder/mp/wxml.js

@@ -32,17 +32,36 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
         ].concat(createXml(widgets)),
     };
     if (ctx.isPage) {
+        const { enablePageRoot } = ctx;
         const originElements = xmlJson.elements;
         // 登录校验: 向其最外层包裹一层block
         xmlJson.elements = [
             {
                 type: 'element',
-                name: 'block',
+                name: enablePageRoot ? 'view' : 'block',
                 attributes: {
+                    id: 'wd-page-root',
                     ['wx:if']: '{{weDaHasLogin}}',
                     ['data-weui-theme']: 'light',
                 },
-                elements: originElements,
+                elements: [
+                    ...originElements,
+                    /**
+                     * 可能需要依赖添加逻辑节点的方式
+                     * 来触发 page 的 ready
+                     * 目的是为了让 page 的 ready 在组件的 ready 之后
+                     */
+                    // {
+                    //   type: 'element',
+                    //   name: 'readyPlaceHoler',
+                    //   attributes: {
+                    //     ['bind:ready']: '_onReady',
+                    //   },
+                    //   elements: originElements,
+                    //   _order: Infinity,
+                    //   _parent: null,
+                    // },
+                ],
                 _order: -1,
                 _parent: null,
             },
@@ -164,6 +183,13 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
             if ((_d = directives.waIf) === null || _d === void 0 ? void 0 : _d.value) {
                 node.attributes['wx:if'] = getAttrBind(directives.waIf, `${attrPrefix}._waIf`);
             }
+            /**
+             * 对于 hidden 的支持依赖组件透传对应的属性
+             * 为了兼容，采用 style merge 的方式
+             */
+            // if (directives.waDisplay?.value !== undefined && directives.waDisplay?.value !== true) {
+            //   node.attributes['hidden'] = getAttrBind(directives.waDisplay, `${attrPrefix}._waDisplay`, false, true);
+            // }
             if ((_e = directives.waFor) === null || _e === void 0 ? void 0 : _e.value) {
                 node.attributes['wx:for'] = getAttrBind(directives.waFor, `${wxmlDataPrefix.widgetProp}${id}${parentForNodes
                     .map((forNodeId) => `[${wxmlDataPrefix.forIndex}${forNodeId}]`)
@@ -368,10 +394,12 @@ function getUsedComponents(widgets, usedCmps = {}) {
     return usedCmps;
 }
 exports.getUsedComponents = getUsedComponents;
-function getAttrBind(dVale, widgetBind, isStaticResource) {
+function getAttrBind(dVale, widgetBind, isStaticResource, neg) {
     const { type, value } = dVale;
     const attrVal = type === weapps_core_1.PropBindType.prop ? value : widgetBind;
-    return isStaticResource ? `{{wxsUtils._getStaticResourceAttribute(${attrVal})}}` : `{{${attrVal}}}`;
+    return isStaticResource
+        ? `{{${neg ? '!' : ''}wxsUtils._getStaticResourceAttribute(${attrVal})}}`
+        : `{{${neg ? `!(${attrVal})` : `${attrVal}`}}}`;
 }
 function getGenericCompTagName(propName) {
     return `g--${propName}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.4.5",
+  "version": "1.5.1",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.5.14",
-    "@cloudbase/lowcode-generator": "^1.4.0",
+    "@cloudbase/cals": "^0.5.16",
+    "@cloudbase/lowcode-generator": "^1.5.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -475,7 +475,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.39b933e356640041bb42.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.174df5037414faa855d5.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app.js

@@ -83,20 +83,43 @@ setConfig({
 })
 
 App({
-  onLaunch(options) {
+  _query: {},
+  globaldata: {
+    _beforeCustomLaunchPromise: null
+  },
+  async beforeCustomLaunch(query) {
+    if(!this.globaldata?._beforeCustomLaunchPromise){
+      if(!this.globaldata) {
+        this.globaldata = {}
+      }
+      this.globaldata._beforeCustomLaunchPromise = new Promise(async (resolve)=>{
+        try {
+          EXTRA_API.setParams('$global', query || {})
+          await createStateDataSourceVar('$global', generateParamsParser({ app, $page: {} }));
+        } catch (e) {
+          throw e;
+        } finally {
+          resolve()
+        }
+      })
+    }
+    return this.globaldata._beforeCustomLaunchPromise
+  },
+  async onLaunch(options) {
     this.app = app
     const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
     let { query = {} } = options
-    EXTRA_API.setParams('$global', query)
-    createStateDataSourceVar('$global', generateParamsParser({ app }))
+    this._query = query
 
+    await this.beforeCustomLaunch(query)
     onLaunch && onLaunch.call(this, options)
     // 初始私有全局数据
     this.$$global = {
       homePageId: '<%= appConfig.homePageId %>'
     }
   },
-  onShow(options) {
+  async onShow(options) {
+    await this.beforeCustomLaunch(this._query)
     const fn = lifeCycle.onShow || lifeCycle.onAppShow
     fn && fn.call(this, options)
   },

package/template/mp/common/weapp-page.js

@@ -12,6 +12,8 @@ import {
 import { runWatchers } from './watch';
 import { getMpEventHandlerName } from './util';
 
+const wxApp = getApp()
+
 export function createPage(
   id,
   uuid,
@@ -103,32 +105,54 @@ export function createPage(
     },
     methods: {
       _pageActive: true,
+      _beforePageCustomLaunchPromise: null,
+      _query: {},
+
       /** page lifecycles **/
       ...extractLifecycles(),
       ...evtHandlers,
       ...mergeRenderer,
-      onLoad(options) {
+      async beforePageCustomLaunch(query) {
+        if(!this._beforePageCustomLaunchPromise){
+          this._beforePageCustomLaunchPromise = new Promise(async (resolve)=>{
+            await wxApp.globaldata?._beforePageCustomLaunchPromise
+            const $page = this._getInstance();
+            if(query){
+              EXTRA_API.setParams($page.uuid, query);
+            }
+            if(await checkAuth(app, app.id, $page)){
+              this.setData({
+                weDaHasLogin: true,
+              });
+              createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+              resolve()
+            }
+          })
+        }
+        return this._beforePageCustomLaunchPromise
+      },
+      async onLoad(options) {
         const $page = this._getInstance();
         setConfig({ currentPageId: $page.uuid });
         app.__internal__.activePage = $page;
         this._pageActive = true;
 
-        let query = decodePageQuery(options || {});
-        EXTRA_API.setParams($page.uuid, query);
-        createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+        this._query = decodePageQuery(options || {});
 
-        const hook = lifecycle.onLoad || lifecycle.onPageLoad;
-        hook?.call?.($page, query);
+        await this.beforePageCustomLaunch?.(this._query)
 
-        this.invokeEventHandler(id, 'load', { detail: { query } });
+        const hook = lifecycle.onLoad || lifecycle.onPageLoad;
+        await hook?.call?.($page, this._query);
+        this.invokeEventHandler(id, 'load', { detail: { query: this._query } });
       },
-      onReady() {
+      async onReady() {
         const $page = this._getInstance();
+        console.log("onReady", this, $page)
 
         this._disposers.push(...runWatchers(index, this));
 
         const hook = lifecycle.onReady || lifecycle.onPageReady;
-        hook?.call?.($page);
+        await hook?.call?.($page);
 
         this.invokeEventHandler(id, 'ready');
       },
@@ -146,15 +170,12 @@ export function createPage(
         app.__internal__.activePage = $page;
         this._pageActive = true;
 
+        await this.beforePageCustomLaunch?.(this._query)
+
         // 权限检查
-        if (await checkAuth(app, app.id, $page)) {
-          this.setData({
-            weDaHasLogin: true,
-          });
-          const hook = lifecycle.onShow || lifecycle.onPageShow;
-          hook?.call?.($page);
-          this.invokeEventHandler(id, 'show');
-        }
+        const hook = lifecycle.onShow || lifecycle.onPageShow;
+        await hook?.call?.($page);
+        this.invokeEventHandler(id, 'show');
       },
       onHide() {
         const $page = this._getInstance();

package/template/mp/package.json

@@ -5,7 +5,7 @@
 	"dependencies": {<% if(importJSSDK) {%>
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-		"@cloudbase/weda-client": "0.2.47",
+		"@cloudbase/weda-client": "0.2.51",
 		"@cloudbase/weda-cloud-sdk": "1.0.26",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",