@cloudbase/lowcode-builder 1.8.94 → 1.8.96

package/package.json

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

package/template/html/index.html.ejs

@@ -456,7 +456,11 @@
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="<%= wedaPrivateConfigEndpoint ? wedaPrivateConfigEndpoint : '' %>/weda-config/weda-private.js"></script>
-    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.5.36-beta.0/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.5.41-beta.0/cloudbase.full.js?v=1"></script>
+    <script
+      crossorigin
+      src="<%= cdnEndpoints.cdngo %>/lcap/lcap-resource-cdngo/-/release/_npm/cloudbase-adapter-privatelink@0.0.1/dist/index.js"
+    ></script>
     <% }%>
     <script>
       if (window.cloudbase && window._aegis) {
@@ -516,7 +520,7 @@
       crossorigin="anonymous"
       src="<%=
         cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.59/dist/h5.browser.js"
+      %>/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.61/dist/h5.browser.js"
     ></script>
     <script
       crossorigin
@@ -545,7 +549,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.399c0d6128e9bf679e96.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.dcb4b774286f577116be.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -4,7 +4,7 @@ import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../c
 import { generateDatasetQuery } from '<%= subLevelPath %>../common/query'
 
 import appGlobal from '<%= subLevelPath %>../app/app-global'
-import { createDataset } from '<%= subLevelPath %>../datasources/index'
+import { createDataset } from '<%= subLevelPath %>../common/cloud-sdk'
 
 import lodashGet from 'lodash.get';
 import config from '<%= subLevelPath %>../common/config';

package/template/mp/app.js

@@ -1,11 +1,13 @@
+// 必须优先初始化数据源
+import '<%= wedaRootRelativePath %>datasources/index';
 <%= importor.lifecycle? `import lifeCycle from '${wedaRootRelativePath}lowcode/lifecycle'` : "const lifeCycle = {}" %>
-import { app, $app } from '<%= wedaRootRelativePath %>app/weapps-api';
 // 引入数据源管理器并进行初始化
+import { app, $app } from '<%= wedaRootRelativePath %>app/weapps-api';
 import {
   EXTRA_API,
   createStateDataSourceVar,
   generateParamsParser,
-} from '<%= wedaRootRelativePath %>datasources/index';
+} from '<%= wedaRootRelativePath %>common/cloud-sdk'
 
 App({
   _query: {},

package/template/mp/common/cloud-sdk.js

@@ -0,0 +1,28 @@
+import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK } from '@cloudbase/weda-client'
+const {
+  setConfig,
+  initTcb,
+  CLOUD_SDK,
+  createDataset,
+  getDatasetProfiles,
+  setDatasetProfiles,
+  createStateDataSourceVar,
+  generateParamsParser,
+  EXTRA_API,
+  DS_SDK,
+  setLocalDatasetState
+} = WEDA_CLOUD_SDK
+
+export {
+  setConfig,
+  initTcb,
+  createDataset,
+  getDatasetProfiles,
+  setDatasetProfiles,
+  createStateDataSourceVar,
+  generateParamsParser,
+  EXTRA_API,
+  CLOUD_SDK,
+  DS_SDK,
+  setLocalDatasetState
+}

package/template/mp/common/data-patch.js

@@ -1,3 +1,4 @@
+import { deepEqual } from "./util"
 
 export function getDatapatch(base, pendingData) {
   const patch = {}
@@ -37,9 +38,23 @@ function patchProp(baseWidget, pendingWidget, patch, prefixes) {
     if (pendingWidget._waIf === false && baseWidget._waIf === false) {
       return
     }
-    const allProps = Object.keys(pendingWidget)
-    // Attention: since setData will copy data deeply, if property is object, it should be treated as different
-    const differentProps = allProps.filter(prop => typeof pendingWidget[prop] === 'object' || pendingWidget[prop] !== baseWidget[prop])
+    const propSet = new Set([...Object.keys(pendingWidget), ...Object.keys(baseWidget)])
+    // 额外剔除公共数据
+    propSet.delete('_parentId');
+    const allProps = Array.from(propSet);
+    // Attention: can not set xxx value to undefined with setData
+    let hasUndefined = false;
+    const differentProps = allProps.filter(prop => {
+      if(pendingWidget[prop] === undefined) {
+        hasUndefined = true;
+      }
+      // container 组件上的属性依赖自身的数据，例如 container.style 依赖 container.data，deepequal 防止死循环
+      if (prop === 'data' && typeof pendingWidget[prop] === 'object' && deepEqual(pendingWidget[prop], baseWidget[prop])) {
+        return false
+      }
+      // Attention: since setData will copy data deeply, if property is object, it should be treated as different
+      return typeof pendingWidget[prop] === 'object' || pendingWidget[prop] !== baseWidget[prop]
+    })
     if (differentProps.length === 1 || differentProps.length <= allProps.length / 3) {
       differentProps.map(patchProp => {
         patch[prefixes + '.' + patchProp] = pendingWidget[patchProp]

package/template/mp/common/util.js

@@ -2,8 +2,8 @@
 'use strict';
 import { generateForContextOfWidget, generateWidgetAPIContext, getWidget } from './widget';
 import { observable, untracked } from 'mobx';
-import { getAccessToken, loginScope } from '../datasources/index';
-import { app } from '../app/weapps-api';
+import { auth } from '@cloudbase/weda-client';
+const { getAccessToken, loginScope } = auth;
 import lodashGet from 'lodash.get';
 import lodashSet from 'lodash.set';
 import { getWedaAPI } from '@cloudbase/weda-client'
@@ -89,6 +89,7 @@ export function createEventHandlers(
   for (const name in evtListeners) {
     const listeners = evtListeners[name];
     evtHandlers[name] = function (event = {}) {
+      const { app } = getWedaAPI();
       const self = this;
       const owner = this._getInstance();
       const target = !!event?.target?.id ? getWidget(owner.widgets, event.target.id) : undefined;
@@ -782,6 +783,7 @@ function replaceStaticResourceAttribute(obj, replacer, paths, index = 0) {
 }
 
 export function processStaticResourceAttribute(data, replacer, property) {
+  const { app } = getWedaAPI();
   const { __internal__ = {} } = app || {};
   const { resolveStaticResourceUrl = (str) => str } = __internal__ || {};
   if (!replacer) {
@@ -895,6 +897,7 @@ export function patchWdigetPropsWithEvtListeners(widgetProps, evtListeners) {
 
 
 export function reportEvent(tag) {
+  const { app } = getWedaAPI()
   try {
     const { envVersion } = app.__internal__?.getConfig?.() || {};
     // console.log('>>>>>>reportevent:', tag);
@@ -906,6 +909,7 @@ export function reportEvent(tag) {
 }
 
 export async function getLoginConfig() {
+  const { app } = getWedaAPI()
   <% if(loginConfigPathname){ %>
   const { staticResourceDomain, loginConfigVersion, id } = app.__internal__?.getConfig() || {};
   if (staticResourceDomain && loginConfigVersion && id) {

package/template/mp/common/watch.js

@@ -1,6 +1,6 @@
 import { autorun, reaction } from 'mobx'
 import { getDeep } from './util'
-import { getDatasetProfiles, setLocalDatasetState } from '../datasources/index'
+import { getDatasetProfiles, setLocalDatasetState } from './cloud-sdk';
 
 /**
  *

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

@@ -5,8 +5,7 @@ import mergeRenderer from './merge-renderer'
 import { runWatchers } from './watch'
 import lodashGet from 'lodash.get';
 import { createInitData, createWidget } from './widget';
-import { commonCompBehavior } from '@cloudbase/weda-client';
-import { $w as baseAPI } from '../app/weapps-api'
+import { commonCompBehavior, getWedaAPI } from '@cloudbase/weda-client';
 
 /**
  * Lowcodes of all components
@@ -54,6 +53,7 @@ export function createComponent(key, behaviors, properties={}, events, handler,
         this._pageActive = true
         this._disposers = []
         this._nativeObserver = false
+        this._nativeMode = <%= !!nativeMode %>
       },
       attached() {
         const $comp = this._getInstance()
@@ -134,7 +134,7 @@ export function createComponent(key, behaviors, properties={}, events, handler,
         if (!this.$WEAPPS_COMP) {
           let widget = this.$node
           if (!widget) {
-            if(this.selectOwnerComponent && !this.selectOwnerComponent?.()) {
+            if ((this.selectOwnerComponent && !this.selectOwnerComponent?.()) || this._nativeMode) {
               const widgetValue = {}
               for (const key in properties) {
                 if (properties[key]?.value !== undefined) {
@@ -163,7 +163,7 @@ export function createComponent(key, behaviors, properties={}, events, handler,
 }
 
 // The component instance for lowcode
-export function create$comp(w) {
+function create$comp(w) {
   const lowcode = compLowcodes[w.widgetType]
   if (!lowcode) {
     return
@@ -196,7 +196,7 @@ export function create$comp(w) {
 
 
   $comp.__internal__.$w = new Proxy(
-    baseAPI,
+    getWedaAPI()?.$w || {},
     {
       get(target, prop) {
         if (prop === '$comp') {

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

@@ -17,9 +17,9 @@ import {
   createStateDataSourceVar,
   generateParamsParser,
   setConfig,
-} from '../datasources/index';
+} from './cloud-sdk';
 import { runWatchers, watchAndSyncDatasetState2Local } from './watch';
-import { $w as baseAPI } from '../app/weapps-api';
+import { getWedaAPI } from '@cloudbase/weda-client';
 import { Event } from './event-emitter';
 import { mergeDynamic2StaticData, patchWdigetPropsWithEvtListeners } from './util';
 import { styleToCss } from './style';
@@ -82,7 +82,8 @@ function extractLifecycles(ctx, lifecycle, appShareMessage, dataBinds, resetShar
 
   // 更新设备信息 窗口信息
   result['onResize'] = (res) => {
-    let device = baseAPI.device;
+    const { $w } = getWedaAPI()
+    let device = $w.device;
     if (!device) {
       return;
     }

package/template/mp/common/widget.js

@@ -181,7 +181,7 @@ function createSubWidgetTree(
           w.id = `${node.id}${indexPostfix}`;
           disposeWidget(existedWidget, true);
         }
-        parentForWidgetArr.push?.(w);
+        parentForWidgetArr[currentIndex || 0] = w;
         setUpWidgetDataBinds(w, dataBinds[node.id], forContext, failedBinds, ownerMpInst._getInstance());
         widgetHolder[node.id] = w;
         if (widgetHolder?.[node._ancestorId]) {
@@ -198,7 +198,7 @@ function createSubWidgetTree(
           widgetHolder[node.id] = existedWidget;
         }
         if (parentForWidgetArr) {
-          parentForWidgetArr.push(widgetHolder[node.id]);
+          parentForWidgetArr[currentIndex || 0] = widgetHolder[node.id];
         }
       }
     },
@@ -324,11 +324,17 @@ function runFor(curForNode, dataBinds, ownerMpInst, forContext, ownerForWidgetHo
               }
             });
           }
-          /**
-           * 重头开始生成
-           * 清空原有 arr 并保持引用不变
-           */
-          arr.splice(0, arr.length);
+          if (!Object.keys(extraWidgetsIndexMap).length && arr.length === Object.keys(existingWidgetIndexMap).length) {
+            /**
+             * 数组完全复用，不需要进行修改
+             */
+          } else {
+            /**
+             * 重头开始生成
+             * 清空原有 arr 并保持引用不变
+             */
+            arr.splice(0, arr.length);
+          }
         },
         undefined,
       );
@@ -345,7 +351,7 @@ function runFor(curForNode, dataBinds, ownerMpInst, forContext, ownerForWidgetHo
         // w.parent = null
       }
 
-      const isInRepeaterChild = parentWidget?.widgetType === `${REPEATER.MODULE_NAME}:${REPEATER.REPEATER_NAME}`;
+      const isInRepeaterChild = isRepeaterWidget(parentWidget, REPEATER.REPEATER_NAME);
       forList.forEach((item, index) => {
         let forContextListAlias;
         let { lists = [], forItems = {} } = forContext;
@@ -410,38 +416,35 @@ export function createWidget(props, nodeId, indexPostfix, parent, ownerMpInst, f
     parent.children.push(w);
   }
 
-  switch (widgetType) {
-    case `${REPEATER.MODULE_NAME}:${REPEATER.REPEATER_NAME}`: {
-      if (!w.items) {
-        Object.defineProperty(w, 'items', {
-          get() {
-            return (w.children || []).map((item) => {
-              const descendants = {};
-              Object.keys(item?._descendants || {}).forEach((key) => {
-                descendants[key] = item._descendants[key]._userWidget;
-              });
-              return descendants;
+  mountBuiltinWigetsAPI(w, ownerMpInst);
+
+  if (isRepeaterWidget(w, REPEATER.REPEATER_NAME)) {
+    if (!w.items) {
+      Object.defineProperty(w, 'items', {
+        get() {
+          return (w.children || []).map((item) => {
+            const descendants = {};
+            Object.keys(item?._descendants || {}).forEach((key) => {
+              descendants[key] = item._descendants[key]._userWidget;
             });
-          },
-        });
-      }
-      // 默认初始值
-      w._disposers.push(
-        autorun((r) => {
-          const ref = {
-            data: w.data,
-            items: w.items,
-          };
-          untracked(() => {
-            w._instanceRef.current = ref;
+            return descendants;
           });
-        }),
-      );
-      break;
+        },
+      });
     }
+    // 默认初始值
+    w._disposers.push(
+      autorun((r) => {
+        const ref = {
+          data: w.data,
+          items: w.items,
+        };
+        untracked(() => {
+          w._instanceRef.current = ref;
+        });
+      }),
+    );
   }
-
-  mountBuiltinWigetsAPI(w, ownerMpInst);
   return w;
 }
 
@@ -557,8 +560,8 @@ function createWidgetDataTree(widgets, dataBinds) {
   function addForCount(node) {
     if (node.parent) {
       node.forCount = node.parent.forCount;
-      const { widgetType } = node.parent.value;
-      if (widgetType === `${REPEATER.MODULE_NAME}:${REPEATER.REPEATER_ITEM_NAME}`) {
+      const { widgetType, getConfig } = node.parent.value;
+      if (isRepeaterWidget({ widgetType, getConfig }, REPEATER.REPEATER_ITEM_NAME)) {
         node._ancestorId = node.parent.id;
       }
       if (node.parent?._ancestorId) {
@@ -857,3 +860,13 @@ export function generateWidgetAPIContext($w = {}, widget, forContext) {
     },
   });
 }
+
+function isRepeaterWidget(
+  w /* : { widgetType: string; getConfig: () => { componentType?: string } } */,
+  repeaterComponentName /* :  string */ /* 'Repeater' | 'RepeaterItem' */,
+) {
+  const { componentType } = w?.getConfig?.() || {};
+  if (componentType === repeaterComponentName || w?.widgetType === `${REPEATER.MODULE_NAME}:${repeaterComponentName}`) {
+    return true;
+  }
+}

package/template/mp/component/index.js

@@ -1,14 +1,15 @@
 import { observable } from 'mobx';
-import { createComponent } from '../../../common/weapp-component'
-import { concatClassList, px2rpx } from '../../../common/style'
-import { app, $app } from '../../../app/weapps-api'
+import { createComponent } from '<%= relativeWedaRoot %>/common/weapp-component'
+import { concatClassList, px2rpx } from '<%= relativeWedaRoot %>/common/style'
+import { getWedaAPI } from '@cloudbase/weda-client'
 <%= importor.lifecycle? "import lifeCycle from './lowcode/lifecycle'" : "const lifeCycle = {}" %>
 <%= importor.state? "import stateFn from './lowcode/state'" : "const stateFn = {}" %>
 <%= importor.computed? "import computedFuncs from './lowcode/computed'" : "const computedFuncs = {}" %>
 <% handlers.forEach(h => {%>
 import _hanlder<%= h %> from './lowcode/handler/<%= h %>' <%}) %>
-import * as constObj from '../libCommonRes/const'
-import * as toolsObj from '../libCommonRes/tools'
+
+const app = new Proxy({}, { get: function(obj, prop){ return getWedaAPI()?.app?.[prop] }});
+const $app = new Proxy({}, { get: function(obj, prop){ return app[prop] }});
 
 const handlers = {<% handlers.forEach(h => {%>
   <%= h %>: _hanlder<%= h %>, <%}) %>
@@ -67,4 +68,4 @@ const dataBinds = {<% Object.entries(dataBinds).map(([id, widgetBinds])=>{%>
 const config = <%= JSON.stringify(config || {})%>
 
 createComponent('<%= key %>', behaviors, properties, events, handlers, dataBinds, evtListeners, widgetProps,
- {}, lifeCycle, stateFn, computedFuncs, config, { const: constObj, tools: toolsObj }, libCode)
+ {}, lifeCycle, stateFn, computedFuncs, config, { const: {}, tools: {} }, libCode)

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

@@ -1,38 +1,10 @@
-import { _WEDA_CLOUD_SDK as WEDA_CLOUD_SDK, auth, getWedaAPI } from '@cloudbase/weda-client'
+import { auth, getWedaAPI } from '@cloudbase/weda-client'
 import { redirectToLogin, findLoginPage, getAuthConfig, checkAnonymous } from '../common/util';
+import { setConfig, initTcb } from '../common/cloud-sdk';
 
-const {
-  setConfig,
-  initTcb,
-  CLOUD_SDK,
-  createDataset,
-  getDatasetProfiles,
-  setDatasetProfiles,
-  createStateDataSourceVar,
-  generateParamsParser,
-  EXTRA_API,
-  DS_SDK,
-  setLocalDatasetState
-} = WEDA_CLOUD_SDK
 const getAccessToken = auth.getAccessToken
 const loginScope = auth.loginScope
 
-export {
-  createDataset,
-  getDatasetProfiles,
-  setDatasetProfiles,
-  createStateDataSourceVar,
-  generateParamsParser,
-  EXTRA_API,
-  CLOUD_SDK,
-  DS_SDK,
-  setConfig,
-  getAccessToken,
-  loginScope,
-  initTcb,
-  setLocalDatasetState
-}
-
 import { default as config, AEGIS_CONFIG } from './config'
 
 setConfig({

package/template/mp/package.json

@@ -3,10 +3,10 @@
   "version": "1.0.8",
   "scripts": {},
   "dependencies": {<% if(importJSSDK) {%>
-		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
+		"@cloudbase/js-sdk": "2.5.41-beta.0",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.29",
-    "@cloudbase/weda-cloud-sdk": "1.0.59",
+    "@cloudbase/weda-client": "1.0.31",
+    "@cloudbase/weda-cloud-sdk": "1.0.61",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

package/template/webpack/web.prod.js

@@ -3,7 +3,7 @@ const webpack = require('webpack');
 const TerserPlugin = require('terser-webpack-plugin');
 const HtmlWebpackPlugin = require('html-webpack-plugin');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
+// const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const { VueLoaderPlugin } = require('vue-loader');
 const themeVars = require('./themeVars');