@cloudbase/lowcode-builder 1.8.27 → 1.8.29

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

@@ -22,7 +22,6 @@ export declare function generateConfig(data: {
     isPrivateMode?: boolean;
     endpointType?: IBuildContext['endpointType'] | '';
 }, root: string): Promise<void>;
-export declare function normalizePageId(pageId: any): string;
 export declare function writeLowCodeFiles(ctx: IBuildContext, appData: IWeAppData, outDir: string): Promise<void>;
 /**
  * TODO: 与 cals 里的实现进行整合

package/lib/builder/mp/index.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleUsedComponents = exports.writeLowCodeFiles = exports.normalizePageId = exports.generateConfig = exports.generateWxMp = void 0;
+exports.handleUsedComponents = exports.writeLowCodeFiles = exports.generateConfig = exports.generateWxMp = void 0;
 const chalk_1 = __importDefault(require("chalk"));
 const path_1 = __importDefault(require("path"));
 const util_1 = require("util");
@@ -288,20 +288,6 @@ async function generateConfig(data, root) {
     }, templateDir, root);
 }
 exports.generateConfig = generateConfig;
-/**
- * pageId 名称管理器
- * 因为 pageId 命名为非法
- */
-const _MANAGER_PAGE_ID_LIST = [];
-const _MANAGER_PAGE_ID_MAP = {};
-function normalizePageId(pageId) {
-    if (!_MANAGER_PAGE_ID_MAP[pageId]) {
-        _MANAGER_PAGE_ID_MAP[pageId] = `$${_MANAGER_PAGE_ID_LIST.length}`;
-        _MANAGER_PAGE_ID_LIST.push(pageId);
-    }
-    return _MANAGER_PAGE_ID_MAP[pageId];
-}
-exports.normalizePageId = normalizePageId;
 async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
     const wxmlDataPrefix = (0, mp_1.getWxmlDataPrefix)(!ctx.isProduction);
     console.log(`Generating ${em(weapp.rootPath ? 'subApp' : 'app')} to ${appRoot}`);
@@ -349,7 +335,7 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                     stringifyObj: util_1.inspect,
                 },
                 [`index.js|${pageFileName}.js`]: {
-                    pageNameVar: normalizePageId(page.id),
+                    pageNameVar: (0, lowcode_generator_1.normalizePageId)(page.id),
                     pageName: page.id,
                     pageSource: page.data.src || '',
                     eventHandlers: (0, util_2.createEventHandlers)(ctx, componentInstances, 'this', page),
@@ -419,7 +405,7 @@ async function generateFramework(ctx, appData, outDir, options) {
         (0, weapps_core_1.loopDealWithFn)(appData.pageInstanceList || [], (p) => {
             allCodeModules.push({
                 id: p.id,
-                pageNameVar: normalizePageId(p.id),
+                pageNameVar: (0, lowcode_generator_1.normalizePageId)(p.id),
                 lowCodes: p.lowCodes || [],
             });
         });

package/lib/builder/mp/util.js

@@ -271,6 +271,10 @@ function getListenersHandlers(listeners = [], id, componentApi) {
                         handler = `function({data}){ return $w[data.id]?.[data.method](data.data)}`;
                         break;
                     }
+                    case `${weapps_core_1.ActionType.Platform}:invoke`: {
+                        handler = `function({data, $w}){ return $app.invoke({...data, component: $w[data?.component]?._widget});}`;
+                        break;
+                    }
                     default: {
                         handler = `function({data}){ return $app.${(_c = l.handler) === null || _c === void 0 ? void 0 : _c.name}(data)}`;
                         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.27",
+  "version": "1.8.29",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -41,8 +41,8 @@
   "dependencies": {
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
-    "@cloudbase/cals": "^1.0.17",
-    "@cloudbase/lowcode-generator": "^1.8.10",
+    "@cloudbase/cals": "^1.0.20",
+    "@cloudbase/lowcode-generator": "^1.8.11",
     "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.43/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.45/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.badd82789c12ea6c7007.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.70be648bc34aeb4c9760.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/app/weapps-api.js

@@ -111,8 +111,9 @@ function createGlboalApi() {
 
   let dataset = createDataset('$global')
   dataset.query = generateDatasetQuery({<% Object.entries(appQuery).map(([id, item])=>{%>
-    <%= id %>: { <% const { dataBinds, eventHandlers, ...rest } = item %>
+    <%= id %>: { <% const { dataBinds, eventHandlers, handler, ...rest } = item %>
       ...(<%= stringifyObj(rest, {depth: null}) %>),
+      handler: <%= handler %>,
       dataBinds: {<%= printBoundData(dataBinds) %>},
       eventHandlers: {<% printEventHandler(eventHandlers) %>}
     },<%}) %>

package/template/mp/app.js

@@ -1,25 +1,31 @@
 <%= importor.lifecycle? "import lifeCycle from './lowcode/lifecycle'" : "const lifeCycle = {}" %>
-import { app, $app } from './app/weapps-api'
+import { app, $app } from './app/weapps-api';
 // 引入数据源管理器并进行初始化
-import { setConfig, getAccessToken, EXTRA_API, createStateDataSourceVar, generateParamsParser } from './datasources/index'
-import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './common/util'
+import {
+  setConfig,
+  getAccessToken,
+  EXTRA_API,
+  createStateDataSourceVar,
+  generateParamsParser,
+} from './datasources/index';
+import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from './common/util';
 
 // 防止报类型不匹配warning
 const originWarn = console.warn;
 const warningSkipRegexp = /(type-uncompatible)|(slot "[\w-]*?" is not found)/;
 console.warn = (...args) => {
-    // 只看第一条
-    const shouldSkip = args.length > 0 && args[0][0] === '[' && args[0][1] === 'C' && warningSkipRegexp.test(args[0]);
-    if(!shouldSkip) {
-      originWarn(...args);
-    }
-}
+  // 只看第一条
+  const shouldSkip = args.length > 0 && args[0][0] === '[' && args[0][1] === 'C' && warningSkipRegexp.test(args[0]);
+  if (!shouldSkip) {
+    originWarn(...args);
+  }
+};
 
 // 设置数据源请求的 loading 及 toast 处理
 setConfig({
   beforeDSRequest: (cfg) => {
-    if (!cfg.options || !cfg.options.showLoading) return
-    app.showLoading()
+    if (!cfg.options || !cfg.options.showLoading) return;
+    app.showLoading();
   },
   beforeCallFunction: async (params) => {
     try {
@@ -46,7 +52,7 @@ setConfig({
         params.data.accessToken = accessToken;
       }
     } catch (e) {
-      if (app?.cloud?.currentUser?.userType === "externalUser" && e?.error === 'unauthenticated') {
+      if (app?.cloud?.currentUser?.userType === 'externalUser' && e?.error === 'unauthenticated') {
         app.showToast({
           title: '登录态失效',
           icon: 'error',
@@ -57,25 +63,45 @@ setConfig({
     return params;
   },
   afterDSRequest: (cfg, error, result) => {
-    if (!cfg.options) return
-    if (cfg.options.showLoading) app.hideLoading()
-    if (!cfg.options.showToast) return
-    const isSuccess = !error && result && !result.code
-    app.showToast({ icon: isSuccess ? 'success' : 'error' })
+    if (!cfg.options) return;
+    if (cfg.options.showLoading) app.hideLoading();
+    if (!cfg.options.showToast) return;
+    const isSuccess = !error && result && !result.code;
+    app.showToast({ icon: isSuccess ? 'success' : 'error' });
   },
   async afterCallFunction(params, error, res) {
-    if (params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' && ['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code)) {
+    const oauthError =
+      error?.message?.includes?.('PERMISSION_DENIED') ||
+      error?.code === 'unauthenticated' ||
+      error?.error === 'unauthenticated' ||
+      error?.code === 'invalid_grant' ||
+      error?.error === 'invalid_grant' ||
+      error?.code === 'INVALID_ACCESS_TOKEN' ||
+      (error?.code === 'OPERATION_FAIL' && /^\[INVALID_ACCESS_TOKEN\]/.test(error?.message || ''));
+
+    if (
+      params?.data?.params?.action != 'DescribeRuntimeResourceStrategy' &&
+        (['InnerError.AuthFailure', 'InvalidAccessToken'].includes(res?.result?.code) ||
+      oauthError)
+    ) {
       const loginPage = findLoginPage();
       if (loginPage) {
         const authConfig = await getAuthConfig();
-        if (authConfig.RejectStrategy == 'to_login') {
+        if (authConfig.RejectStrategy === 'to_login') {
           if (['InnerError.AuthFailure'].includes(res?.result?.code)) {
             const isAnonymous = await checkAnonymous();
             if (!isAnonymous) return;
             // 匿名用户越权去登录
           }
           redirectToLogin();
-        } else if (authConfig.RejectStrategy == 'show_warning') {
+        } else if (authConfig.RejectStrategy === 'show_warning') {
+          if (oauthError) {
+            const isAnonymous = await checkAnonymous();
+            if (!isAnonymous) {
+              redirectToLogin(generateLoginUrl);
+              return;
+            }
+          }
           app.showToast({
             title: '接口无访问权限',
             icon: 'error',
@@ -83,27 +109,27 @@ setConfig({
         }
       }
     }
-  }
-})
+  },
+});
 
 App({
   _query: {},
   globaldata: {
-    _beforeCustomLaunchPromise: null
+    _beforeCustomLaunchPromise: null,
   },
   async beforeCustomLaunch(query) {
-    if(!this.globaldata?._beforeCustomLaunchPromise){
-      if(!this.globaldata) {
-        this.globaldata = {}
+    if (!this.globaldata?._beforeCustomLaunchPromise) {
+      if (!this.globaldata) {
+        this.globaldata = {};
       }
-      this.globaldata._beforeCustomLaunchPromise = new Promise(async (resolve)=>{
+      this.globaldata._beforeCustomLaunchPromise = new Promise(async (resolve) => {
         try {
-          EXTRA_API.setParams('$global', query || {})
+          EXTRA_API.setParams('$global', query || {});
           await createStateDataSourceVar('$global', generateParamsParser({ app, $page: {}, $w: app.__internal__?.$w }));
         } catch (e) {
           throw e;
         } finally {
-          for (const queryId in app.dataset?.query||{}) {
+          for (const queryId in app.dataset?.query || {}) {
             if (app.dataset.query[queryId]?._schema?.trigger === 'auto') {
               try {
                 app.dataset?.query?.[queryId]?.trigger?.();
@@ -112,44 +138,44 @@ App({
               }
             }
           }
-          resolve()
+          resolve();
         }
-      })
+      });
     }
-    return this.globaldata._beforeCustomLaunchPromise
+    return this.globaldata._beforeCustomLaunchPromise;
   },
   async onLaunch(options) {
-    this.app = app
-    const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch
-    let { query = {} } = options
-    this._query = query
+    this.app = app;
+    const onLaunch = lifeCycle.onLaunch || lifeCycle.onAppLaunch;
+    let { query = {} } = options;
+    this._query = query;
 
-    await this.beforeCustomLaunch(query)
-    onLaunch && onLaunch.call(this, options)
+    await this.beforeCustomLaunch(query);
+    onLaunch && onLaunch.call(this, options);
     // 初始私有全局数据
     this.$$global = {
-      homePageId: '<%= appConfig.homePageId %>'
-    }
+      homePageId: '<%= appConfig.homePageId %>',
+    };
   },
   async onShow(options) {
-    await this.beforeCustomLaunch(this._query)
-    const fn = lifeCycle.onShow || lifeCycle.onAppShow
-    fn && fn.call(this, options)
+    await this.beforeCustomLaunch(this._query);
+    const fn = lifeCycle.onShow || lifeCycle.onAppShow;
+    fn && fn.call(this, options);
   },
   onHide() {
-    const fn = lifeCycle.onHide || lifeCycle.onAppHide
-    fn && fn.call(this)
+    const fn = lifeCycle.onHide || lifeCycle.onAppHide;
+    fn && fn.call(this);
   },
   onError(msg) {
-    const fn = lifeCycle.onError || lifeCycle.onAppError
-    fn && fn.call(this, msg)
+    const fn = lifeCycle.onError || lifeCycle.onAppError;
+    fn && fn.call(this, msg);
   },
   onPageNotFound() {
-    const fn = lifeCycle.onPageNotFound || lifeCycle.onAppPageNotFound
-    fn && fn.call(this)
+    const fn = lifeCycle.onPageNotFound || lifeCycle.onAppPageNotFound;
+    fn && fn.call(this);
   },
   onUnhandledRejection() {
-    const fn = lifeCycle.onUnhandledRejection || lifeCycle.onAppUnhandledRejection
-    fn && fn.call(this)
+    const fn = lifeCycle.onUnhandledRejection || lifeCycle.onAppUnhandledRejection;
+    fn && fn.call(this);
   },
-})
+});

package/template/mp/common/merge-renderer.js

@@ -30,6 +30,7 @@ export default {
   // setData merging
   pendingData: null,
   _settingData: false,  // flag to prevent multiple setData at the same time
+  _flushId: null,
   flushPendingData() {
     if (!this.pendingData || this._settingData) { return }
     const patch = getDatapatch(this.data, this.pendingData)
@@ -41,6 +42,17 @@ export default {
     }
     this._settingData = true
     const lastUpdateTime = Date.now()
+    this._flushId = lastUpdateTime;
+    /**
+     * 兜底逻辑，当长时间 setData 没有返回时
+     * 直接抛弃，扭转 pending 状态
+     */
+    setTimeout(()=>{
+      if(this._flushId === lastUpdateTime && this._settingData) {
+        this._settingData = false;
+        this.flushPendingData()
+      }
+    }, 100)
     this.setData(patch, () => {<% if(debug) {%>
       const elapsedTime = Date.now() - lastUpdateTime;
       if(elapsedTime > 16) {

package/template/mp/common/util.js

@@ -136,7 +136,7 @@ export function createEventHandlers(
             },
             dataContext,
           });
-          let res = await l.handler.call(owner, { event, data: resolvedData });
+          let res = await l.handler.call(owner, { event, data: resolvedData, $w });
           nextEventHandles[0].handlerName =
             prefix && l.key ? `${prefix}$${l.key}${!isIfAction || res ? '_success' : '_fail'}` : '';
           nextEventHandles[0].event.detail = isIfAction ? event.detail : res;

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

@@ -283,21 +283,30 @@ export function createPage({
             app.utils.set($page.dataset.state, keyPath, userSetState[keyPath]);
           });
         };
+        $page.setParams = (params) => {
+          Object.keys(params).forEach((keyPath) => {
+            app.utils.set($page.dataset?.params, keyPath, params[keyPath]);
+          });
+        }
 
         const { widgets, rootWidget } = createWidgets(widgetProps, dataBinds, this, $page.widgets);
         $page.widgets = widgets;
         $page._rootWidget = rootWidget;
 
         $page.invokeComponentMethod = ({ component, method, params }) => {
-          const components = $page.widgets[component];
           let componentInstance = undefined;
-          if (Array.isArray(components)) {
-            if (components.length > 1) {
-              throw new Error(`调用方法失败：id为${component}的组件拥有多个实例`);
+          if (typeof component === 'string') {
+            const components = $page.widgets[component];
+            if (Array.isArray(components)) {
+              if (components.length > 1) {
+                throw new Error(`调用方法失败：id为${component}的组件拥有多个实例`);
+              }
+              componentInstance = components[0];
+            } else {
+              componentInstance = components;
             }
-            componentInstance = components[0];
           } else {
-            componentInstance = components;
+            componentInstance = component
           }
 
           const currentInstanceRef = componentInstance?._getInstanceRef()?.current || {};

package/template/mp/package.json

@@ -7,7 +7,7 @@
     } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
     "@cloudbase/weda-client": "1.0.6",
-    "@cloudbase/weda-cloud-sdk": "1.0.43",
+    "@cloudbase/weda-cloud-sdk": "1.0.45",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",