@cloudbase/lowcode-builder 1.8.18 → 1.8.19

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();
 
-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 {};
+      }
+    };
+  }
+
+  // 更新设备信息 窗口信息
+  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: app?.__internal__?.resolveStaticResourceUrl?.(imageUrl) || 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, $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);
@@ -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;
@@ -255,8 +264,8 @@ export function createPage({
         $page.handler = Object.keys(handlers).reduce((result, key) => {
           try {
             result[key] = handlers[key].bind($page);
-          } catch(e) {
-            console.error('添加页面handler失败', e)
+          } catch (e) {
+            console.error('添加页面handler失败', e);
           }
           return result;
         }, {});
@@ -266,7 +275,7 @@ export function createPage({
           $w: $page.__internal__.$w,
           $app: app,
           $page,
-        })
+        });
         $page.dataset = dataset;
         $page.state.dataset = dataset;
         $page.setState = (userSetState) => {
@@ -276,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.5",
-    "@cloudbase/weda-cloud-sdk": "1.0.40",
+    "@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}`
-}