@cloudbase/framework-plugin-low-code 0.6.63 → 0.6.66

package/lib/index.js

@@ -962,6 +962,7 @@ class LowCodePlugin extends framework_core_1.Plugin {
         });
     }
     _postProcessAdminPortal() {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const { appId, buildTypeList, mainAppSerializeData, deployOptions, } = this._resolvedInputs;
             if (common_2.buildAsAdminPortalByBuildType(buildTypeList)) {
@@ -997,6 +998,23 @@ class LowCodePlugin extends framework_core_1.Plugin {
                 catch (e) {
                     this.api.logger.error('门户路由注册失败: ', e);
                 }
+                try {
+                    if (((_b = (_a = this._resolvedInputs) === null || _a === void 0 ? void 0 : _a.deployOptions) === null || _b === void 0 ? void 0 : _b.mode) === types_1.DEPLOY_MODE.UPLOAD) {
+                        yield this.api.cloudbaseManager
+                            .commonService('lowcode', '2021-01-08')
+                            .call({
+                            Action: 'PublishAppCustomUrl',
+                            Param: {
+                                EnvId: this.api.envId,
+                                WeAppId: this._resolvedInputs.appId,
+                            },
+                        });
+                    }
+                    this.api.logger.info('PublishAppCustomUrl成功');
+                }
+                catch (e) {
+                    this.api.logger.error('PublishAppCustomUrl失败: ', e);
+                }
             }
         });
     }

package/lib/weapps-core/utils/file.d.ts

@@ -6,7 +6,7 @@ export declare function originJsonToFileList(appData: IWeAppData): (import("../t
     code: string;
     pageId: string;
 })[];
-export declare function getExtByType(type: CodeType): ".js" | ".json" | ".less";
+export declare function getExtByType(type: CodeType): ".less" | ".js" | ".json";
 export declare function HACK_FIX_LOWCODE_IN(code?: string): string;
 export declare function HACK_FIX_LOWCODE_OUT(code?: string): string;
 //# sourceMappingURL=file.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.6.63",
+  "version": "0.6.66",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",

package/template/html/index.html.ejs

@@ -459,20 +459,10 @@
       src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/0.1.2/_url/ajax/libs/mobx/5.15.7/mobx.umd.js?v=1"
       crossorigin="anonymous"
     ></script>
-    <script>
-      (function () {
-        const _isPrivate = window._isPrivate || false;
-        if (_isPrivate === true) {
-          document.write(
-            `<script crossorigin="anonymous" src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.8-alpha.7/dist/h5.browser.js?v=1"><\/script>`
-          );
-        } else {
-          document.write(
-            `<script crossorigin="anonymous" src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.5/dist/h5.browser.js?v=1"><\/script>`
-          );
-        }
-      })();
-    </script>
+    <script
+      crossorigin="anonymous"
+      src="https://qbase.cdn-go.cn/lcap/lcap-resource-cdngo/-/release/_npm/@cloudbase/weda-cloud-sdk@1.0.5/dist/h5.browser.js?v=1"
+    ></script>
     <script>
       // zxing polifill
       if (!this.globalThis) {

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

@@ -1,5 +1,5 @@
 import { observable } from 'mobx'
-import { createComputed, formatDate, getter, setter } from '<%= subLevelPath %>../common/util'
+import { createComputed, formatDate, getter, setter, formatEnum, enumOptions} from '<%= subLevelPath %>../common/util'
 import process from '<%= subLevelPath %>../common/process'
 import { DS_SDK, CLOUD_SDK, createDataset, EXTRA_API } from '<%= subLevelPath %>../datasources/index'
 import appGlobal from '<%= subLevelPath %>../app/app-global'
@@ -33,6 +33,7 @@ function createGlboalApi() {
       //request: sdk.request,
       //getSessionId: sdk.getSessionId,
     },
+    enumOptions: enumOptions,
     state: observable(state),
     computed: createComputed(computed),
     common,
@@ -51,6 +52,7 @@ function createGlboalApi() {
     },
     utils: {
       formatDate,
+      formatEnum,
       get: getter,
       set: setter,
       _getConfig: function () {

package/template/mp/common/util.js

@@ -3,7 +3,8 @@
 import { findForItemsOfWidget, mpCompToWidget } from './widget'
 import lodashGet from 'lodash.get';
 import lodashSet from 'lodash.set';
-
+import { observable } from 'mobx';
+import { app } from '../app/weapps-api'
 /**
  * Convert abcWordSnd -> abc-word-snd
  */
@@ -549,8 +550,52 @@ class CustomDate {
 
 const dataInstance = new CustomDate();
 export const formatDate = new CustomDate().format.bind(dataInstance);
+
+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 '';
+}
+export async function getGeneralOptions(optionName) {
+  return app.cloud.callWedaApi({
+    action: 'DescribeGeneralOptionsDetailList',
+    data: {
+      PageSize: 1,
+      PageIndex: 1,
+      LikeNameOrTitle: optionName,
+    },
+  });
+}
+
 export const utils = {
   formatDate,
   get: getter,
   set: setter,
+  formatEnum
 };

package/template/src/app/global-api.js

@@ -5,6 +5,7 @@ import store, { subPackageName } from '../store';
 import computed from '../store/computed';
 import common from './common';
 import { formatDate } from '../utils/date';
+import { formatEnum, enumOptions } from '../utils/formatEnum';
 import { getter, setter, _isMobile } from '../utils';
 import actionMap from './material-actions';
 import { scanCodeApi } from '../utils/scan-code-action';
@@ -31,6 +32,7 @@ function createGlboalApi() {
       request: sdk.request,
       getSessionId: sdk.getSessionId,
     },
+    enumOptions: enumOptions,
     state: store,
     computed: createComputed(computed.global),
     common,
@@ -45,6 +47,7 @@ function createGlboalApi() {
     },
     utils: {
       formatDate,
+      formatEnum,
       get: getter,
       set: setter,
       _getConfig: function () {
@@ -52,7 +55,7 @@ function createGlboalApi() {
       },
       getWXContext: function() {
         return Promise.resolve({})
-      }
+      },
     },
 
     // ... other sdk apis & apis from mp

package/template/src/utils/formatEnum.js

@@ -0,0 +1,42 @@
+import { observable } from 'mobx';
+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 '';
+}
+export async function getGeneralOptions(optionName) {
+  return app.cloud.callWedaApi({
+    action: 'DescribeGeneralOptionsDetailList',
+    data: {
+      PageSize: 1,
+      PageIndex: 1,
+      LikeNameOrTitle: optionName,
+    },
+  });
+}