@cloudbase/lowcode-builder 1.0.14 → 1.0.15

package/lib/builder/config/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/h5/copy.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/h5/material.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/lowcode.js

@@ -15,25 +15,21 @@ async function writeCode2file(mod, lowcodeRootDir, opts = {}, themeCode, ctx) {
     if (mod.type !== 'style' && mod.type !== 'theme') {
         if (appDir) {
             // Generate app lowcode
-            const baseDir = path_1.default
-                .relative(path_1.default.dirname(file), appDir)
-                .replace(/\\/g, '/');
+            const baseDir = path_1.default.relative(path_1.default.dirname(file), appDir).replace(/\\/g, '/');
             // 子包混合模式需要添加相对索引到根目录
-            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath
-                ? path_1.default.relative(ctx.rootPath, '') + '/'
-                : '';
+            const relativeRoot = (ctx === null || ctx === void 0 ? void 0 : ctx.isMixMode) && ctx.rootPath ? path_1.default.relative(ctx.rootPath, '') + '/' : '';
             let weappsApiPrefix = [
                 `import { app, process } from '${relativeRoot}${baseDir}/app/weapps-api';`,
                 'const $app = app;',
             ]; // windows compatibility
             if (pageId !== 'global') {
-                weappsApiPrefix.push(`import { $page } from '${relativeRoot}${baseDir}/pages/${pageId}/api.js'`);
+                weappsApiPrefix.push(`import { $page } from '${baseDir}/pages/${pageId}/api'`);
             }
             code = `${weappsApiPrefix.join('\n')}\n${code}`;
         }
         else {
             // Generate component lowcode
-            code = `import process from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/process'\nimport app from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/weapp-sdk'\nconst $app = app;\n${code.replace(/\$comp/g, weapps_core_1.COMPONENT_API_PREFIX)};`;
+            code = `import process from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/process'\nimport app from '${mod.type === 'handler-fn' ? '../' : ''}../../../../common/weapp-sdk';\nconst $app = app;\n${code.replace(/\$comp/g, weapps_core_1.COMPONENT_API_PREFIX)}`;
         }
     }
     else {

package/lib/builder/mp/materials.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/mixMode.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/mp_config.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -104,8 +108,8 @@ function generateMpConfig(weapps, ctx) {
         appConfig.plugins = plugins;
     }
     miniprogramPlugins.forEach((plugin) => {
-        var _a, _b;
-        if (!((_b = (_a = appConfig) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b[plugin.name])) {
+        var _a;
+        if (!((_a = appConfig === null || appConfig === void 0 ? void 0 : appConfig.plugins) === null || _a === void 0 ? void 0 : _a[plugin.name])) {
             (0, lodash_1.set)(appConfig, `plugins.${plugin.name}`, {
                 version: plugin.version,
                 provider: plugin.pluginAppId,

package/lib/builder/mp/plugin.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/mp/wxml.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUsedComponents = exports.getMpEventHanlderName = exports.generateWxml = void 0;
 const chalk_1 = __importDefault(require("chalk"));
+const weapps_core_1 = require("@cloudbase/lowcode-generator/lib/weapps-core");
 const xml_js_1 = require("xml-js");
 const mp_1 = require("@cloudbase/lowcode-generator/lib/generator/config/mp");
 const materials_1 = require("./materials");
@@ -54,7 +55,7 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
     function createXml(widgets, parent = null, parentForNodes = []) {
         var _a, _b, _c, _d, _e, _f;
         const elements = [];
-        for (const id of Object.keys(widgets !== null && widgets !== void 0 ? widgets : {})) {
+        for (const id in widgets) {
             const { xComponent, xProps, properties, xIndex, genericComp } = widgets[id];
             const { data: data0 = {}, listeners = [], directives = {}, staticResourceAttribute = ['src'] } = xProps || {};
             const data = { ...data0 };
@@ -130,8 +131,8 @@ function generateWxml(widgets, docTag, wxmlDataPrefix, ctx, usingComponents, com
                 name: tagName,
                 attributes: {
                     id: idAttr,
-                    bindattached: '__handlerAttached__',
-                    binddetached: '__handlerDetached__',
+                    'bind:attached': '__mnt__',
+                    'bind:detached': '__unmnt__',
                     style: `{{${attrPrefix}.style}}`,
                     [(0, mp_1.getClassAttrName)(tagName)]: `{{${attrPrefix}.className}}`,
                 },
@@ -352,7 +353,7 @@ function getUsedComponents(widgets, usedCmps = {}) {
 exports.getUsedComponents = getUsedComponents;
 function getAttrBind(dVale, widgetBind, isStaticResource) {
     const { type, value } = dVale;
-    const attrVal = widgetBind;
+    const attrVal = type === weapps_core_1.PropBindType.prop ? value : widgetBind;
     return isStaticResource ? `{{wxsUtils._getStaticResourceAttribute(${attrVal})}}` : `{{${attrVal}}}`;
 }
 function getGenericCompTagName(propName) {

package/lib/builder/util/generateFiles.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/util/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/util/mp.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/builder/util/net.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

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

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { ChildProcess } from 'child_process';
 interface IProcessOptions {
     onStdout?: (data: Buffer) => any;

package/lib/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/types.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "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.3.37",
-    "@cloudbase/lowcode-generator": "^1.0.3",
+    "@cloudbase/lowcode-generator": "^1.0.4",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

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,45 @@ 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) {
+  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'