@cloudbase/lowcode-builder 1.8.17 → 1.8.19

package/template/mp/common/query.js

@@ -3,25 +3,32 @@ import { createEventHandlers, getMpEventHandlerName, mergeDynamic2StaticData } f
 import { Event } from './event-emitter';
 
 export class Query {
+  _schema = {}
+  #schema
+  #context = {};
+  #disposes = [];
+  #dataBinds = {};
+  #triggered = false;
+  #paramsRef = observable({ current: null });
+  #currentRequestKey = null;
+  #observableValue = observable({ data: null, error: null });
+  #eventHandlerMap = {};
+  #action = () => {};
   constructor({ schema, context, options = {} }) {
-    this._disposes = [];
-    this._dataBinds = {};
-    this._triggered = false;
-    this._paramsRef = observable({ current: null });
-    this._currentRequestKey = null;
-    this._observableValue = observable({ data: null, error: null });
-    this._eventHandlerMap = {};
     const { looseError = false } = options;
-    this._schema = schema;
-    this._context = context;
-    if (this._schema?.trigger === 'auto') {
-      this._disposes.push(
+    this.#schema = schema;
+    this._schema = {
+      trigger: schema.trigger
+    }
+    this.#context = context;
+    if (this.#schema?.trigger === 'auto') {
+      this.#disposes.push(
         autorun(
           (r) => {
             try {
-              const data = this._resolveParams();
-              if (this._triggered) {
-                this._debounceTrigger(data);
+              const data = this.#resolveParams();
+              if (this.#triggered) {
+                this.#debounceTrigger(data);
               }
             } catch (e) {
               console.error(e);
@@ -31,18 +38,18 @@ export class Query {
         ),
       );
     }
-    this._paramsRef.current = this._schema.data;
-    this._dataBinds = Object.entries(this._schema.dataBinds || {}).reduce((map, [prop, fn]) => {
+    this.#paramsRef.current = this.#schema.data;
+    this.#dataBinds = Object.entries(this.#schema.dataBinds || {}).reduce((map, [prop, fn]) => {
       if (!/[\s+\-*/!&|%]*?SERVER\./.test(prop)) {
         map[prop] = fn;
       }
       return map;
     }, {});
 
-    const { $w } = this._context;
+    const { $w } = this.#context;
 
-    this._action =
-      this._schema.type === 'sql'
+    this.#action =
+      this.#schema.type === 'sql'
         ? async function (data) {
             const Data = await $w.cloud.callWedaApi({
               action: 'RunPluginQuery',
@@ -96,9 +103,9 @@ export class Query {
               total: Total || ExecuteResultList.length,
             };
           }
-        : this._schema.handler;
-    this._eventHandlerMap = Object.entries(
-      createEventHandlers(this._schema.eventHandlers || {}, {
+        : this.#schema.handler;
+    this.#eventHandlerMap = Object.entries(
+      createEventHandlers(this.#schema.eventHandlers || {}, {
         looseError: looseError,
         isComposite: false,
       }),
@@ -109,84 +116,94 @@ export class Query {
         return map;
       },
       {
-        _getInstance: () => this._context.$page || this._context.$app,
+        _getInstance: () => this.#context.$page || this.#context.$app,
       },
     );
     return this;
   }
   get id() {
-    return this._schema?.id || '';
+    return this.#schema?.id || '';
   }
   get label() {
-    return this._schema?.label || '';
+    return this.#schema?.label || '';
   }
   get description() {
-    return this._schema?.description || '';
+    return this.#schema?.description || '';
   }
   get data() {
-    return this._observableValue.data;
+    return this.#observableValue.data;
   }
   get error() {
-    return this._observableValue.error;
+    return this.#observableValue.error;
   }
   async trigger(additionalScope, options = {}) {
-    this._triggered = true;
-    return this._innerTrigger(this._resolveParams(), additionalScope, options);
+    this.#triggered = true;
+    return this.#innerTrigger(this.#resolveParams(), additionalScope, options);
   }
   reset() {
-    this._observableValue.data = null;
-    this._observableValue.error = null;
+    this.#observableValue.data = null;
+    this.#observableValue.error = null;
+  }
+  destroy() {
+    this.#disposes.forEach((dispose) => dispose());
+  }
+
+  /**
+   * 用于调试
+   */
+  _toSchema() {
+    console.warn('调试使用，结构可能发生更改，请不要用于生产环境');
+    return this.#schema;
   }
-  async _innerTrigger(data, additionalScope, options = {}) {
-    this._currentRequestKey = Date.now();
-    const key = this._currentRequestKey;
+
+  async #innerTrigger(data, additionalScope, options = {}) {
+    this.#currentRequestKey = Date.now();
+    const key = this.#currentRequestKey;
     try {
-      const res = await this._action(data);
-      if (key === this._currentRequestKey) {
-        this._observableValue.data = res;
-        this._observableValue.error = null;
-        this._emit(`success`, res);
+      const res = await this.#action(data);
+      if (key === this.#currentRequestKey) {
+        this.#observableValue.data = res;
+        this.#observableValue.error = null;
+        this.#emit(`success`, res);
       }
       return res;
     } catch (e) {
-      if (key === this._currentRequestKey) {
-        this._observableValue.data = null;
-        this._observableValue.error = e;
-        this._emit(`fail`, e);
+      if (key === this.#currentRequestKey) {
+        this.#observableValue.data = null;
+        this.#observableValue.error = e;
+        this.#emit(`fail`, e);
       }
       throw e;
     }
   }
-  _debounceTrigger(...args) {
+  #debounceTrigger(...args) {
     if (this._timer) {
       clearTimeout(this._timer);
     }
     this._timer = setTimeout(() => {
-      this._innerTrigger(...args);
+      this.#innerTrigger(...args);
     }, 300);
   }
-  destroy() {
-    this._disposes.forEach((dispose) => dispose());
-  }
-  _resolveParams() {
+
+  #resolveParams() {
     /**
      * 这里万一其中某个字段计算失败
      * 好像会阻塞其他字段的计算
      * 从而导致 autorun 没有添加依赖
      */
-    return mergeDynamic2StaticData(toJS(this._paramsRef.current), this._dataBinds, {
+    return mergeDynamic2StaticData(toJS(this.#paramsRef.current), this.#dataBinds, {
       codeContext: {
         /**
          * $page 或 $comp 实例
          */
-        instance: this._context.$page,
+        instance: this.#context.$page,
       },
-      $w: this._context.$w,
+      $w: this.#context.$w,
       // may be additional scope
     });
   }
-  async _emit(eventName, data) {
-    return this._eventHandlerMap[getMpEventHandlerName(this.id, eventName)]?.(
+  async #emit(eventName, data) {
+    return this.#eventHandlerMap[getMpEventHandlerName(this.id, eventName)]?.(
       new Event({
         type: eventName,
         detail: data,

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;

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

@@ -1,6 +1,13 @@
 import { observable } from 'mobx';
-import { createComputed, createEventHandlers, checkAuth, getMpEventHandlerName, generateDatasetQuery, generateEventFlows } from './util';
-import { createWidgets, createInitData, disposeWidget, ID_SEPARATOR, getWidget } from './widget';
+import {
+  createComputed,
+  createEventHandlers,
+  checkAuth,
+  getMpEventHandlerName,
+  generateDatasetQuery,
+  generateEventFlows,
+} from './util';
+import { createWidgets, createInitData, disposeWidget, getWidget } from './widget';
 import mergeRenderer from './merge-renderer';
 import {
   createDataset,
@@ -10,10 +17,62 @@ import {
   setConfig,
 } from '../datasources/index';
 import { runWatchers } from './watch';
-import { $w as baseAPI } from '../app/weapps-api'
-import { Event } from './event-emitter'
+import { $w as baseAPI } from '../app/weapps-api';
+import { Event } from './event-emitter';
+import { generatePageUrl } from '@cloudbase/weda-client';
+
+const wxApp = getApp();
+
+function extractLifecycles(ctx, lifecycle, appShareMessage, resetShare = true) {
+  const result = {};
+  Object.keys(lifecycle).map((name) => {
+    result[name] = function () {
+      return lifecycle[name].apply(this._getInstance(), arguments);
+    };
+  });
+
+  if (resetShare) {
+    result['onShareAppMessage'] = (res) => {
+      if (res?.from === 'button' && res?.target?.dataset?.weda_share_info) {
+        return res?.target?.dataset?.weda_share_info;
+      } else if (res?.from === 'menu' && appShareMessage?.enable) {
+        let { pageId, params, imageUrl, title, packageName } = appShareMessage || {};
+        return {
+          path: generatePageUrl({
+            pageId,
+            packageName,
+            params,
+          }),
+          imageUrl: ctx.app?.__internal__?.resolveStaticResourceUrl?.(imageUrl) || imageUrl,
+          title,
+        };
+      }
+      try {
+        return lifecycle?.['onShareAppMessage']?.() || {};
+      } catch (error) {
+        console.log(error);
+        return {};
+      }
+    };
+  }
 
-const wxApp = getApp()
+  // 更新设备信息 窗口信息
+  result['onResize'] = (res) => {
+    let device = baseAPI.device;
+    if (!device) {
+      return;
+    }
+    const width = res?.size?.windowWidth;
+    const height = res?.size?.windowHeight;
+    if (width !== device?.viewport?.width || height !== device?.viewport?.height) {
+      device.viewport = {
+        width,
+        height,
+      };
+    }
+  };
+  return result;
+}
 
 export function createPage({
   app,
@@ -30,70 +89,20 @@ export function createPage({
   eventFlows = [],
   pageContext = {},
   pageAttributes = {},
+  resetShare = true,
 }) {
   const evtHandlers = createEventHandlers(evtListeners);
 
-  function extractLifecycles() {
-    const result = {};
-    Object.keys(lifecycle).map((name) => {
-      result[name] = function () {
-        return lifecycle[name].apply(this._getInstance(), arguments);
-      };
-    });
-
-    result['onShareAppMessage'] = (res) => {
-      if (res?.from === 'button' && res?.target?.dataset?.weda_share_info) {
-        return res?.target?.dataset?.weda_share_info;
-      } else if (res?.from === 'menu' && pageAttributes?.appShareMessage) {
-        let { enable, pageId, params, imageUrl, title } = pageAttributes.appShareMessage;
-        if (enable) {
-          pageId = pageId ? pageId.replace(/^(\.)?\//, '') : pageId;
-          let realPath =
-            `/pages/${pageId}/index` +
-            (params ? '?' + params.map((pair) => pair.key + '=' + pair.value).join('&') : '');
-          return {
-            path: realPath,
-            imageUrl,
-            title,
-          };
-        }
-      }
-      try {
-        return lifecycle?.['onShareAppMessage']?.() || {};
-      } catch (error) {
-        console.log(error);
-        return {};
-      }
-    };
-
-    // 更新设备信息 窗口信息
-    result['onResize'] = (res) => {
-      let device = baseAPI.device;
-      if (!device) {
-        return
-      }
-      const width = res?.size?.windowWidth;
-      const height = res?.size?.windowHeight;
-      if (width !== device?.viewport?.width || height !== device?.viewport?.height) {
-        device.viewport = {
-          width,
-          height
-        };
-      }
-    };
-    return result;
-  }
-
   return Component({
     _componentType: 'page',
     data: {
       ...createInitData(widgetProps, dataBinds),
       _isCheckingAtuh: false,
-      weDaHasLogin: false
+      weDaHasLogin: false,
     },
     lifetimes: {
       attached() {
-        this._disposers = []
+        this._disposers = [];
         const $page = this._getInstance();
         this._pageActive = true;
         /**
@@ -125,8 +134,8 @@ export function createPage({
     },
     pageLifetimes: {
       // 组件所在页面的生命周期函数，定义下给运营平台上报用
-      show: function () { },
-      hide: function () { },
+      show: function () {},
+      hide: function () {},
     },
     methods: {
       _pageActive: true,
@@ -135,28 +144,28 @@ export function createPage({
       _disposers: [],
 
       /** page lifecycles **/
-      ...extractLifecycles(),
+      ...extractLifecycles({ app }, lifecycle, pageAttributes?.appShareMessage, resetShare),
       ...evtHandlers,
       ...mergeRenderer,
       async beforePageCustomLaunch(query) {
         if (!this._beforePageCustomLaunchPromise) {
           this._beforePageCustomLaunchPromise = new Promise(async (resolve) => {
-            await wxApp.globaldata?._beforePageCustomLaunchPromise
+            await wxApp.globaldata?._beforePageCustomLaunchPromise;
             const $page = this._getInstance();
             if (query) {
               EXTRA_API.setParams($page.uuid, query);
             }
             try {
-              this.setData({ _isCheckingAtuh: true })
+              this.setData({ _isCheckingAtuh: true });
               const auth = await checkAuth(app, app.id, $page);
-              if(auth) {
+              if (auth) {
                 this.setData({
                   weDaHasLogin: true,
                 });
-                createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+                createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page, $w: $page.__internal__?.$w }));
               }
             } finally {
-              this.setData({ _isCheckingAtuh: false })
+              this.setData({ _isCheckingAtuh: false });
             }
 
             // eslint-disable-next-line no-restricted-syntax
@@ -164,16 +173,16 @@ export function createPage({
               if ($page.dataset.query[queryId]?._schema?.trigger === 'auto') {
                 try {
                   $page.dataset.query[queryId].trigger();
-                  this._disposers.push(() => $page.dataset.query[queryId].destroy())
+                  this._disposers.push(() => $page.dataset.query[queryId].destroy());
                 } catch (e) {
                   console.error(`query ${queryId} 初始化失败：`, e);
                 }
               }
             }
-            resolve()
-          })
+            resolve();
+          });
         }
-        return this._beforePageCustomLaunchPromise
+        return this._beforePageCustomLaunchPromise;
       },
       async onLoad(options) {
         const $page = this._getInstance();
@@ -184,7 +193,7 @@ export function createPage({
 
         this._query = decodePageQuery(options || {});
 
-        await this.beforePageCustomLaunch?.(this._query)
+        await this.beforePageCustomLaunch?.(this._query);
 
         const hook = lifecycle.onLoad || lifecycle.onPageLoad;
         await hook?.call?.($page, this._query);
@@ -198,7 +207,7 @@ export function createPage({
         const hook = lifecycle.onReady || lifecycle.onPageReady;
         await hook?.call?.($page);
 
-        this._invokeEventHandler(id, 'ready');
+        this._invokeEventHandler('ready');
       },
       onUnload() {
         const $page = this._getInstance();
@@ -215,7 +224,7 @@ export function createPage({
         $page.__internal__.active = this._pageActive;
         app.__internal__.activePage = $page;
 
-        await this.beforePageCustomLaunch?.(this._query)
+        await this.beforePageCustomLaunch?.(this._query);
 
         const hook = lifecycle.onShow || lifecycle.onPageShow;
         await hook?.call?.($page);
@@ -235,9 +244,9 @@ export function createPage({
         const keyName = getMpEventHandlerName(id, triggerName);
         const event = new Event({
           type: triggerName,
-          detail: params
-        })
-        return this[keyName]?.call?.(this, event)
+          detail: params,
+        });
+        return this[keyName]?.call?.(this, event);
       },
       _getInstance() {
         let $page = this.$WEAPPS_PAGE;
@@ -253,7 +262,11 @@ export function createPage({
         $page = pageContext;
         this.$WEAPPS_PAGE = $page;
         $page.handler = Object.keys(handlers).reduce((result, key) => {
-          result[key] = handlers[key].bind($page);
+          try {
+            result[key] = handlers[key].bind($page);
+          } catch (e) {
+            console.error('添加页面handler失败', e);
+          }
           return result;
         }, {});
         $page.computed = createComputed(computed, $page);
@@ -262,7 +275,7 @@ export function createPage({
           $w: $page.__internal__.$w,
           $app: app,
           $page,
-        })
+        });
         $page.dataset = dataset;
         $page.state.dataset = dataset;
         $page.setState = (userSetState) => {
@@ -272,7 +285,7 @@ export function createPage({
         };
 
         const { widgets, rootWidget } = createWidgets(widgetProps, dataBinds, this, $page.widgets);
-        $page.widgets = widgets
+        $page.widgets = widgets;
         $page._rootWidget = rootWidget;
 
         $page.invokeComponentMethod = ({ component, method, params }) => {

package/template/mp/package.json

@@ -6,8 +6,8 @@
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<%
     } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.4",
-    "@cloudbase/weda-cloud-sdk": "1.0.37",
+    "@cloudbase/weda-client": "1.0.6",
+    "@cloudbase/weda-cloud-sdk": "1.0.42",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

package/template/mp/page/index.js

@@ -86,5 +86,6 @@ createPage({
   handlers,
   query,
   eventFlows,
-  pageAttributes: <%= pageAttributes? stringifyObj(pageAttributes, {depth: null}):'{}' %>
+  pageAttributes: <%= pageAttributes? stringifyObj(pageAttributes, {depth: null}):'{}' %>,
+  resetShare: <%= resetShare %>
 })

package/template/mp/common/url.js

@@ -1,21 +0,0 @@
-// 处理url链接，加入params参数
-export function urlJoinParams(url, params) {
-  if (!url || !params || typeof params !== 'object') {
-    return url
-  }
-  const separate = url.indexOf('?') === -1 ? '?' : '&'
-  const tempStr = Object.keys(params)
-    .map(key => {
-      let value = params[key]
-      if (typeof value === 'object') {
-        value = JSON.stringify(value)
-      }
-      if (value != undefined) {
-        return `${key}=${encodeURIComponent(value)}`
-      }
-      return ''
-    })
-    .filter(value => value)
-    .join('&')
-  return `${url}${separate}${tempStr}`
-}