@cloudbase/lowcode-builder 1.0.13 → 1.0.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.0.13",
+  "version": "1.0.16",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -38,8 +38,8 @@
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
   },
   "dependencies": {
-    "@cloudbase/cals": "^0.3.35",
-    "@cloudbase/lowcode-generator": "^1.0.3",
+    "@cloudbase/cals": "^0.3.37",
+    "@cloudbase/lowcode-generator": "^1.0.4",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",
@@ -75,10 +75,10 @@
     "jest": "^26.0.1",
     "ts-loader": "^8.3.0",
     "ts-node": "^10.4.0",
-    "typescript": "^4.4.2",
+    "typescript": "^4.7.4",
     "uglifyjs-webpack-plugin": "^2.2.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.7.3",
     "worker-loader": "^3.0.8"
   }
-}
+}

package/template/html/index.html.ejs

@@ -461,7 +461,7 @@
     ></script>
     <script
       crossorigin
-      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.03b54575136335f76391.bundle.js"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.3a66f83a42344bba1e13.bundle.js"
     ></script>
   </body>
 </html>

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

@@ -1,14 +1,14 @@
 import { observable } from 'mobx'
 import { createMpApp } from '@cloudbase/weda-client';
-import { createComputed } from '<%= subLevelPath %>../common/util'
+import { createComputed, formatEnum, enumOptions } from '<%= subLevelPath %>../common/util'
 import process from '<%= subLevelPath %>../common/process'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
 import { createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
 
 <% if (!isBare) {%>
 import state from '../lowcode/state'
-  import computed from '../lowcode/computed'
-  import common from './common'
+import computed from '../lowcode/computed'
+import common from './common'
 <%} else {%>
 const state = {}
 const computed = {}
@@ -38,11 +38,21 @@ function createGlboalApi() {
     common,
     ...mpApp,
     invoke(params) {
-      return globalAPI.__internal__.activePage.invokeComponentMethod(params)
+      const $page = globalAPI.utils.getCurrentPage();
+      return $page.invokeComponentMethod(params)
     },
     // ... other sdk apis & apis from mp
   } // The global api exposed to lowcode
 
+  globalAPI.__internal__.enumOptions = enumOptions
+  globalAPI.utils.formatEnum = formatEnum
+  /**
+   * @deprecated utils._getConfig
+   */
+  globalAPI.utils._getConfig = () => {
+    return globalAPI.__internal__.getConfig()
+  }
+
   let dataset = createDataset('$global')
   globalAPI.dataset = dataset
   globalAPI.state.dataset = dataset
@@ -51,16 +61,6 @@ function createGlboalApi() {
       globalAPI.utils.set(globalAPI.dataset.state, keyPath, userSetState[keyPath]);
     });
   };
-  /**
-  * 内部通用的设置状态变量值的方法
-  *  varPath 结构为 $global.<变量名> 即全局变量
-  *                $page.<变量名>  即当前页面变量
-  *                <pageId>.<变量名> 指定页面 pageId 的变量 (应当避免修改非当前页面的变量值)
-  */
-  globalAPI._setStateVal = (config) => {
-    // @ts-ignore
-    EXTRA_API.setState(config.varPath, config.val);
-  };
 
   const subPackageName = '<%= subPackageName %>'
   if (subPackageName) {

package/template/mp/common/util.js

@@ -1,7 +1,6 @@
 'use strict';
 import { findForItemsOfWidget, getWidget } from './widget'
-import lodashGet from 'lodash.get';
-import lodashSet from 'lodash.set';
+import { observable } from 'mobx';
 import { getAccessToken } from '../datasources/index'
 
 /**
@@ -353,3 +352,46 @@ export function redirectToLogin(currentPage) {
     });
   }
 }
+
+let loading = {};
+export let enumOptions = observable({});
+export function formatEnum(path, optionname) {
+  // 判断是单选还是多选
+  let isSingle = Array.isArray(path);
+  // 获取到options
+  let parseOptions = getEnumOptions(optionname);
+  if (parseOptions === '') {
+    return !isSingle ? path : path.join(',');
+  }
+  let multiTmp = [];
+  let value = !isSingle
+    ? JSON.parse(parseOptions)?.find((item) => item?.key === path)?.value
+    : JSON.parse(parseOptions)
+      ?.filter((item) => path.some((pathValue) => item?.key === pathValue))
+      .map((item) => multiTmp.push(item?.value));
+  // 对多选或者单选有不同处理
+  return !isSingle ? value : multiTmp?.join(',');
+}
+function getEnumOptions(optionName) {
+  if (enumOptions[optionName]) {
+    return enumOptions[optionName];
+  }
+  if (!loading[optionName]) {
+    loading[optionName] = true;
+    getGeneralOptions(optionName).then((data) => {
+      enumOptions[optionName] = data?.Items[0]?.Config;
+    });
+  }
+  return '';
+}
+async function getGeneralOptions(optionName) {
+  const { app } = getApp();
+  return app.cloud.callWedaApi({
+    action: 'DescribeGeneralOptionsDetailList',
+    data: {
+      PageSize: 1,
+      PageIndex: 1,
+      LikeNameOrTitle: optionName,
+    },
+  });
+}

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

@@ -63,11 +63,11 @@ export function createComponent(key, behaviors, properties, events, handler, dat
 
         try {
           lifeCycle.onAttached && lifeCycle.onAttached.call($comp)
-          this.__handlerAttached__ = (e) => {
+          this.__mnt__ = (e) => {
             const widget = lodashGet(widgets, e.target.id);
             widget._methods = e.detail.methods;
           }
-          this.__handlerDetached__ = (e) => {
+          this.__unmnt__ = (e) => {
             const widget = lodashGet(widgets, e.target.id);
             delete widget._methods;
           }

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

@@ -44,15 +44,17 @@ export function createPage(
       if (res?.from === 'button' && res?.target?.dataset?.weda_share_info) {
         return res?.target?.dataset?.weda_share_info;
       }
-      else if (pageAttributes?.appShareMessage) {
-        let {pageId, params, imageUrl, title} = pageAttributes.appShareMessage;
-        pageId = pageId ? pageId.replace(/^(\.)?\//,'') : pageId;
-        let realPath = `/pages/${pageId}/index` + (params ? '?'+params.map(pair => pair.key + '=' + pair.value).join('&'):'');
-        return {
-            path:realPath,
+      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,
             title
-        };
+          };
+        }
       }
       try {
         return lifecycle?.['onShareAppMessage']?.() || {};
@@ -71,7 +73,7 @@ export function createPage(
       attached() {
         const $page = this.getWeAppInst()
         this._pageActive = true;
-        this.__handlerAttached__ = (e) => {
+        this.__mnt__ = (e) => {
           if (!$page.componentMethods) {
             $page.componentMethods = {};
           }
@@ -81,7 +83,7 @@ export function createPage(
           }
           $page.componentMethods[id][index] = e.detail.methods;
         };
-        this.__handlerDetached__ = (e) => {
+        this.__unmnt__ = (e) => {
           const [id, index = 0] = e.target.id.split('-');
           if ($page.componentMethods) {
             const components = $page.componentMethods[id];

package/template/mp/page/api.js

@@ -1 +1 @@
-export const $page = {};
+export const $page = {}

package/template/mp/page/index.js

@@ -3,7 +3,6 @@ import { createPage } from '<%= subLevelPath %>../../common/weapp-page'
 import { concatClassList, px2rpx } from '<%= subLevelPath %>../../common/style'
 import { app } from '<%= subLevelPath %>../../app/weapps-api'
 import { <%= pageName %> as handlers } from '../../app/handlers'
-// import index from '../../lowcode/<%= pageName %>/index'
 import lifecyle from '../../lowcode/<%= pageName %>/lifecycle'
 import state from '../../lowcode/<%= pageName %>/state'
 import computed from '../../lowcode/<%= pageName %>/computed'