@cloudbase/lowcode-builder 1.5.4 → 1.5.5

package/lib/builder/mp/index.js

@@ -185,11 +185,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployMode, options
                 clientID: (_a = mainAppData.extra) === null || _a === void 0 ? void 0 : _a.clientId,
             },
             'datasources/datasource-profiles.js.tpl': {
-                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasourceProfiles)(
-                /**
-                 * 精简文件生成，新 cloud-sdk 不依赖 profile 了
-                 */
-                []), { EOL: false }),
+                datasourceProfiles: (0, util_3.JsonToStringWithVariableName)([], { EOL: false }),
             },
             'datasources/dataset-profiles.js.tpl': {
                 datasetProfiles: (0, util_3.JsonToStringWithVariableName)((0, lowcode_generator_1.getDatasetProfiles)(mainAppData, weapps), { EOL: true }),
@@ -328,8 +324,11 @@ async function generatePkg(ctx, weapp, appRoot, pageConfigs) {
                 [`api.js|api.js`]: {
                     subLevelPath: rootPath ? `${path_1.default.posix.relative(rootPath, '')}/` : '',
                 },
-                [`index.js|${pageFileName}.js`]: {
+                [`data.js|data.js`]: {
                     widgetProps: (0, util_2.createWidgetProps)(ctx, componentInstances),
+                    stringifyObj: util_1.inspect,
+                },
+                [`index.js|${pageFileName}.js`]: {
                     pageUUID: rootPath ? `${rootPath}/${page.id}` : page.id,
                     pageName: page.id,
                     pageSource: page.data.src || '',

package/lib/builder/util/common.d.ts

@@ -1,7 +1,7 @@
 import { IComponentInputProps, IComponentsInfoMap, IPackageJson } from '../types/common';
 import { IMaterialItem, IWeAppComponentInstance, IWeAppCode } from '@cloudbase/lowcode-generator/lib/weapps-core';
 export { getMetaInfoBySourceKey, isArray, isPlainObject, deepDeal, simpleDeepClone, deepDealSchema, getFileNameByUrl, } from '@cloudbase/lowcode-generator/lib/generator/util/common';
-export declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
+declare type PromiseResult<T> = Promise<[null, T] | [Error, null]>;
 export declare function promiseWrapper<T>(p: Promise<T>): PromiseResult<T>;
 export declare function getCurrentPackageJson(): {
     name: any;

package/lib/builder/util/common.js

@@ -34,10 +34,6 @@ function promiseWrapper(p) {
     });
 }
 exports.promiseWrapper = promiseWrapper;
-// export function isEmpty(i: any): boolean {
-//   if (typeof i === 'string') return !i.trim()
-//   return R.isEmpty(i) || R.isNil(i) || Number.isNaN(i)
-// }
 function getCurrentPackageJson() {
     try {
         const { name, version } = fs_extra_1.default.readJSONSync(path_1.default.resolve(process.cwd(), 'package.json'));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.5.4",
+  "version": "1.5.5",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@cloudbase/cals": "^0.5.17",
-    "@cloudbase/lowcode-generator": "^1.5.3",
+    "@cloudbase/lowcode-generator": "^1.5.4",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -543,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.051bed8f584a31b92c63.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.a81adb6beadedd9fd68f.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/widget.js

@@ -32,6 +32,7 @@ const EXTRA_PROPS_MAP = [
   'off',
   'getConfig',
   '_getInstanceRef',
+  '_instanceRef',
   '_methods',
   '_userWidget',
   /**
@@ -85,7 +86,7 @@ export function createWidgets(widgetProps, dataBinds, ownerMpInst, widgetHolder)
     {},
     failedBinds,
     undefined,
-    widgetHolder
+    widgetHolder,
   );
   retryFailedBinds(failedBinds, true);
   return result;
@@ -105,7 +106,7 @@ function createSubWidgetTree(
   forContext = {},
   failedBinds = [],
   parentWidget = { children: observable([]), _disposers: [] },
-  widgetHolder = {}
+  widgetHolder = {},
 ) {
   const { ownerForWidgetHolder = {}, existingWidgetMap = {} } = ctx;
   /**
@@ -390,10 +391,12 @@ function createWidget(props, nodeId, indexPostfix, parent, ownerMpInst, forConte
   });
 
   // w._disposers = []
-  // w.children = []
+  // w.children = [];
   Object.defineProperty(w, 'children', { value: observable([]) });
   Object.defineProperty(w, '_disposers', { value: observable([]) });
   Object.defineProperty(w, '_eventListeners', { value: new EventEmitter() });
+  Object.defineProperty(w, '_instanceRef', { value: observable({ current: null }) });
+
   if (parent) {
     // w.parent = parent
     Object.defineProperty(w, 'parent', { value: parent });
@@ -415,6 +418,18 @@ function createWidget(props, nodeId, indexPostfix, parent, ownerMpInst, forConte
           },
         });
       }
+      // 默认初始值
+      w._disposers.push(
+        autorun((r) => {
+          const ref = {
+            data: w.data,
+            items: w.items,
+          };
+          untracked(() => {
+            w._instanceRef.current = ref;
+          });
+        }),
+      );
       break;
     }
   }
@@ -649,32 +664,7 @@ function mountBuiltinWigetsAPI(widget, owner) {
     widget.getConfig = () => config;
   }
 
-  switch (widget.widgetType) {
-    case `${REPEATER.MODULE_NAME}:${REPEATER.REPEATER_NAME}`: {
-      const currentRef = observable({ current: {} });
-      widget._getInstanceRef = () => {
-        return currentRef;
-      }; // 默认初始值
-      widget._disposers.push(
-        autorun((r) => {
-          currentRef.current = {
-            data: widget.data,
-            items: (widget.children || []).map((item) => {
-              const descendants = {};
-              Object.keys(item?._descendants || {}).forEach((key) => {
-                descendants[key] = item._descendants[key]._userWidget;
-              });
-              return descendants;
-            })
-          }
-        }),
-      );
-      break;
-    }
-    default: {
-      widget._getInstanceRef = () => null;
-    }
-  }
+  widget._getInstanceRef = () => widget._instanceRef;
 
   /**
    * @deprecated
@@ -715,8 +705,13 @@ class UserWidget {
           return target[prop];
         }
 
-        // 优先 custom
-        if (prop in target.custom) {
+        /**
+         * @important
+         * 优先 custom
+         * 会出现一些 target 时序还不存在的情况
+         * 因此 custom[prop] 先添加进依赖
+         */
+        if (target.custom?.[prop] && prop in target.custom) {
           return target.custom[prop];
         }
 
@@ -791,12 +786,13 @@ class UserWidget {
 
   get custom() {
     const widget = this._widget;
-    const instance = widget._getInstanceRef?.()?.current || {};
     const userCustomMember = untracked(() => {
+      const instanceRef = widget._getInstanceRef?.();
+      const instance = instanceRef?.current || {};
       const { methods = {}, ...restInstance } = instance;
       return new Proxy(
         {
-          ...widget._methods,
+          ...widget?._methods,
           ...restInstance,
           ...methods,
         },
@@ -805,7 +801,12 @@ class UserWidget {
             if (prop in methods) {
               return methods[prop];
             }
-            if (prop !== 'methods' && prop in instance) {
+            /**
+             * 此处要保持从 ref 开始访问
+             * 因为proxy 内部如果直接从 ref.current 开始访问，刚开始是可能遇到的是空值，并且空对象兜底
+             * 那么此处实际上监听的即为兜底的空对象，非 observer 对象
+             */
+            if (prop !== 'methods' && prop in (instanceRef.current || {})) {
               return instance[prop];
             }
             return widget?._methods?.[prop];

package/template/mp/package.json

@@ -5,7 +5,7 @@
 	"dependencies": {<% if(importJSSDK) {%>
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-		"@cloudbase/weda-client": "0.2.55",
+		"@cloudbase/weda-client": "0.2.56",
 		"@cloudbase/weda-cloud-sdk": "1.0.26",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",

package/template/mp/page/data.js

@@ -0,0 +1 @@
+export const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>

package/template/mp/page/index.js

@@ -7,8 +7,8 @@ import { $$<%= pageName %> as handlers } from '../../app/handlers'
 <%= importor.state? `import state from '../../lowcode/${pageName}/state'` : "const state = {}" %>
 <%= importor.computed? `import computed from '../../lowcode/${pageName}/computed'` : "const computed = {}" %>
 import { $page } from './api'
+import { widgetProps } from './data'
 
-const widgetProps = <%= stringifyObj(widgetProps, {depth: null}) %>
 /** widget event listeners **/
 const evtListeners = {<% Object.entries(eventHanlders).map(([handlerName, listeners])=>{%>
   <%= handlerName%>: [