@cloudbase/lowcode-builder 1.3.15 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.3.15",
+  "version": "1.4.1",
   "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.12",
-    "@cloudbase/lowcode-generator": "^1.3.6",
+    "@cloudbase/lowcode-generator": "^1.4.0",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -19,7 +19,7 @@
     <% cssStyles.forEach(function(styleUrl){%>
     <link type="text/css" rel="stylesheet" href="<%=styleUrl %>" />
     <% })%> <% if(cdnEndpoints.aegis){ %>
-    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis/aegis-sdk/latest/aegis.min.js?v=1"></script>
+    <script crossorigin="anonymous" src="<%= cdnEndpoints.aegis %>/aegis-sdk/latest/aegis.min.js"></script>
     <script>
       <% if(!isAdminPortal){ %>
       const _aegis = new Aegis({
@@ -475,7 +475,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.2b07a569d23a6eba7136.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.efbaa5f34f9a013bf4b1.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -4,6 +4,7 @@ import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../c
 import appGlobal from '<%= subLevelPath %>../app/app-global'
 import { createDataset } from '<%= subLevelPath %>../datasources/index'
 import lodashGet from 'lodash.get';
+import config from '<%= subLevelPath %>../common/config';
 
 
 <%= importor.state? `import state from '../lowcode/state'` : "const state = {}" %>
@@ -25,11 +26,14 @@ export const $w = new Proxy(
 
 function createGlboalApi() {
   const mpApp = createMpApp({
-    appConfig: <%= appConfig %>
+    appConfig: {
+      staticResourceDomain: config.domain,
+      ...(<%= appConfig %>)
+    }
   });
   const globalAPI = Object.assign(mpApp, {
     id: '<%= appId %>',
-    domain: '<%= domain %>',
+    domain: config.domain,
     pages: {},
     session: {
       //configure: sdk.configure,

package/template/mp/common/config.js

@@ -0,0 +1,9 @@
+/**
+ * require to be commonjs
+ */
+module.exports = {
+  isPrivate: <%=isPrivateMode%>,
+  domain: '<%=domain%>',
+  endpointType: '<%=endpointType%>',
+  tcbApiOrigin: '<%= endpointType === `tcb-api` && isPrivateMode && domain ? `https://${domain}` : `` %>'
+}

package/template/mp/common/config.wxs

@@ -0,0 +1,3 @@
+module.exports = {
+  domain: '<%=domain%>',
+};

package/template/mp/common/util.js

@@ -33,11 +33,13 @@ export function generateDataContext(widget) {
   while (widget?._scope) {
     const current = widget;
     // 此处采用代理的方式，是为了可以获取到最新的 _scope.dataContext 防止 dataContext 引用被重新赋值
-    Object.defineProperty(dataContext, current._scope.id, {
-      get() {
-        return current._scope.dataContext;
-      },
-    });
+    if(current?._scope?.id){
+      Object.defineProperty(dataContext, current._scope.id, {
+        get() {
+          return current?._scope?.dataContext;
+        },
+      });
+    }
     widget = widget.parent;
   }
   return dataContext;

package/template/mp/common/utils.wxs

@@ -1,6 +1,8 @@
+var config = require('./config.wxs')
+
 function getStaticResourceAttribute(staticUrl) {
   if (staticUrl && staticUrl[0] == '/') {
-    var domain = '<%=domain%>'
+    var domain = config.domain
     return 'https://' + domain + staticUrl;
   }
   return staticUrl

package/template/mp/common/widget.js

@@ -790,14 +790,28 @@ class UserWidget {
   }
 
   get custom() {
-    const { methods = {}, ...restInstance } = this._widget._getInstanceRef?.()?.current || {};
-
-    const userCustomMember = {
-      ...this._widget._methods,
-      ...restInstance,
-      ...methods,
-    };
-
+    const instance = this._widget._getInstanceRef?.()?.current || {};
+    const userCustomMember = untracked(() => {
+      const { methods = {}, ...restInstance } = instance;
+      return new Proxy(
+        {
+          ...this._widget._methods,
+          ...restInstance,
+          ...methods,
+        },
+        {
+          get(_, prop) {
+            if (prop in methods) {
+              return methods[prop];
+            }
+            if (prop !== 'methods' && prop in instance) {
+              return instance[prop];
+            }
+            return this._widget._methods?.[prop];
+          },
+        },
+      );
+    });
     return userCustomMember;
   }
 }

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

@@ -1,5 +1,6 @@
 import datasetProfiles from './dataset-profiles'
 const dataSourceProfiles = require('./datasource-profiles.js')
+import config from '../common/config'
 
 /**
  * 数据源基本配置
@@ -25,14 +26,14 @@ export default {
   /**
    * 确定调用链路
    */
-  endpointType: '<%= endpointType %>',
+  endpointType: config.endpointType,
   /**
    * 调用链路为 tcb-api 时有效
    * 私有化需要设置
    */
-  tcbApiOrigin: '<%= tcbApiOrigin %>',
+  tcbApiOrigin: config.tcbApiOrigin,
   /**
    * 是否是处于私有化版本
    */
-  isPrivate: <%= isPrivateMode %>
+  isPrivate: config.isPrivate
 }

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.47",
+		"@cloudbase/weda-client": "0.2.45",
 		"@cloudbase/weda-cloud-sdk": "1.0.26",
 		"mobx": "^5.15.4",
 		"lodash.get": "^4.4.2",