@cloudbase/lowcode-builder 1.8.99 → 1.8.101

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.99",
+  "version": "1.8.101",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -47,8 +47,8 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.79",
-    "@cloudbase/lowcode-generator": "^1.8.29",
+    "@cloudbase/cals": "^1.0.81",
+    "@cloudbase/lowcode-generator": "^1.8.30",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -549,7 +549,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.acef94ce4b0574004da6.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.3699f460d2b6314f711e.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -6,6 +6,7 @@ import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../c
 import { generateDatasetQuery } from '<%= subLevelPath %>../common/query'
 
 import appGlobal from '<%= subLevelPath %>../app/app-global'
+import { default as cloudConfig } from '<%= subLevelPath %>../datasources/config'
 import { createDataset } from '<%= subLevelPath %>../common/cloud-sdk'
 
 import lodashGet from 'lodash.get';
@@ -87,6 +88,7 @@ function createGlboalApi() {
   const mpApp = createMpApp({
     appConfig: {
       staticResourceDomain: config.domain,
+      privatelink: cloudConfig.privatelink,
       ...(<%= appConfig %>)
     },
   });

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

@@ -19,7 +19,7 @@ import {
   setConfig,
 } from './cloud-sdk';
 import { runWatchers, watchAndSyncDatasetState2Local } from './watch';
-import { getWedaAPI } from '@cloudbase/weda-client';
+import { getWedaAPI, urlJoinParams } from '@cloudbase/weda-client';
 import { Event } from './event-emitter';
 import { mergeDynamic2StaticData, patchWdigetPropsWithEvtListeners } from './util';
 import { styleToCss } from './style';
@@ -28,7 +28,32 @@ export const PAGE_ROOT_SYMBOL = Symbol('@@page_route@@')
 
 const wxApp = getApp();
 
-function extractLifecycles(ctx, lifecycle, appShareMessage, dataBinds, resetShare = true) {
+function resolveParticialPageData(ctx, key, data = {}, dataBinds = {}) {
+  const reg = new RegExp(`^${key}`)
+  let merge = { [key]: data[key] }
+  const pickedDataBinds = {}
+  for (const key in dataBinds) {
+    if (reg.test(key)) {
+      pickedDataBinds[key] = dataBinds[key]
+    }
+  }
+  try {
+    merge = mergeDynamic2StaticData(merge, pickedDataBinds, {
+      codeContext: {
+        /**
+         * $page 或 $comp 实例
+         */
+        instance: ctx.app?.__internal__?.activePage,
+      },
+      $w: ctx.app?.__internal__?.activePage?.__internal__?.$w,
+    })
+  } catch (e) {
+    console.warn('分享设置绑定计算错误：', e)
+  }
+  return merge
+}
+
+function extractLifecycles(ctx, lifecycle, appShareMessage, shareTimeline, dataBinds, resetShare = true) {
   const result = {};
   Object.keys(lifecycle).map((name) => {
     result[name] = function () {
@@ -41,20 +66,7 @@ function extractLifecycles(ctx, lifecycle, appShareMessage, dataBinds, resetShar
       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 mergedData = { appShareMessage }
-        try {
-          mergedData = mergeDynamic2StaticData({ appShareMessage }, dataBinds, {
-            codeContext: {
-              /**
-               * $page 或 $comp 实例
-               */
-              instance: ctx.app?.__internal__?.activePage,
-            },
-            $w: ctx.app?.__internal__?.activePage?.__internal__?.$w,
-          })
-        } catch(e) {
-          console.warn('分享设置绑定计算错误：', e)
-        }
+        let mergedData = resolveParticialPageData(ctx, 'appShareMessage', { appShareMessage }, dataBinds);
 
         let { pageId, params, imageUrl, title, packageName } = mergedData.appShareMessage || {};
         const url = ctx.app?.__internal__?.generatePageUrl({
@@ -80,6 +92,32 @@ function extractLifecycles(ctx, lifecycle, appShareMessage, dataBinds, resetShar
     };
   }
 
+  if (shareTimeline?.enable || lifecycle?.['onShareTimeline']) {
+    result['onShareTimeline'] = () => {
+      if (shareTimeline?.enable) {
+        let mergedData = resolveParticialPageData(ctx, 'shareTimeline', { shareTimeline }, dataBinds);
+
+        let { params, imageUrl, title } = mergedData.shareTimeline || {};
+        const query = urlJoinParams('/fake', Array.isArray(params) ? params.reduce((map, { key, value }) => {
+          map[key] = value
+          return map
+        }, {}) : params).replace(/^\/fake\?/, '')
+
+        return {
+          query,
+          imageUrl: ctx.app?.__internal__?.resolveStaticResourceUrl?.(imageUrl) || imageUrl,
+          title,
+        };
+      }
+      try {
+        return lifecycle?.['onShareTimeline']?.() || {};
+      } catch (error) {
+        console.log(error);
+        return {};
+      }
+    };
+  }
+
   // 更新设备信息 窗口信息
   result['onResize'] = (res) => {
     const { $w } = getWedaAPI()
@@ -143,11 +181,13 @@ export function createPage({
       attached() {
         this._disposers = [];
         const $page = this._getInstance();
-        const instance = $page.__internal__.mpInstance?.()
+        const instance = $page.__internal__.mpInstance?.(true)
         if( instance !== this ){
           const currentMpInstance = this
-          $page.__internal__.mpInstance = () => {
-            console.warn('debug 获取当前 mp page 实例，禁止在生产环境使用');
+          $page.__internal__.mpInstance = (disableLog) => {
+            if (!disableLog) {
+              console.warn('debug 获取当前 mp page 实例，禁止在生产环境使用');
+            }
             return currentMpInstance
           }
         }
@@ -205,7 +245,7 @@ export function createPage({
       },
       detached() {
         const $page = this._getInstance();
-        const instance = $page.__internal__.mpInstance?.()
+        const instance = $page.__internal__.mpInstance?.(true)
         if( instance === this ){
           $page.__internal__.mpInstance = () => null
         }
@@ -228,7 +268,7 @@ export function createPage({
       _disposers: [],
 
       /** page lifecycles **/
-      ...extractLifecycles({ app }, lifecycle, pageAttributes?.appShareMessage, pageRootDataBinds, resetShare),
+      ...extractLifecycles({ app }, lifecycle, pageAttributes?.appShareMessage, pageAttributes?.shareTimeline, pageRootDataBinds, resetShare),
       ...evtHandlers,
       ...mergeRenderer,
       async beforePageCustomLaunch(query) {

package/template/mp/datasources/config.js.tpl

@@ -35,7 +35,13 @@ const CLOUD_CONFIG =  {
   /**
    * 是否是处于私有化版本
    */
-  isPrivate: config.isPrivate
+  isPrivate: config.isPrivate,
+  privatelink: <%= privatelink || 'undefined' %>,
+  getPrivatelinkAdapter: async function() {
+    return require.async('../packages/$wd_system/index.js').then(({ tcbPrivatelinkAdapter }) => {
+      return tcbPrivatelinkAdapter
+    })
+  }
 }
 
 export default CLOUD_CONFIG

package/template/mp/package.json

@@ -6,7 +6,7 @@
 		"@cloudbase/js-sdk": "2.5.42-beta.0",<%
     } %>
 		"@cloudbase/oauth": "0.1.1-alpha.6",
-    "@cloudbase/weda-client": "1.0.32",
+    "@cloudbase/weda-client": "1.0.33",
     "@cloudbase/weda-cloud-sdk": "1.0.61",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",

package/template/mp/packages/$wd_system/index.js.tpl

@@ -7,5 +7,6 @@
     })
   }
 }<% } %>
+<% if(privatelink){ %>import { tcbPrivatelinkAdapter } from './privatelink/index';<%} else {%>const tcbPrivatelinkAdapter = undefined<% } %>
 
-export { Aegis }
+export { Aegis, tcbPrivatelinkAdapter }

package/template/mp/packages/$wd_system/package.json

@@ -2,7 +2,11 @@
   "name": "wd-system-sub-package",
   "version": "0.0.1",
   "scripts": {},
-  "dependencies": {<% if(cdnEndpoints.aegis){ %>
-    "aegis-mp-sdk": "~1.38.1"<% } %>
-  }
+  "dependencies": <%= JSON.stringify({
+    ...(cdnEndpoints.aegis && { "aegis-mp-sdk": "~1.38.1" }),
+    ...(privatelink && {
+      "polyfill-crypto.getrandomvalues": "^1.0.0",
+      "cloudbase-adapter-privatelink": "0.0.1"
+    }),
+  }, undefined, 2) %>
 }