@cloudbase/lowcode-builder 1.8.9 → 1.8.10

package/lib/builder/config/index.d.ts

@@ -6,12 +6,12 @@ export declare const materialsDirName = "materials";
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20230213.zip";
+export declare const builderTemplateURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20230606.zip";
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230213.zip";
+export declare const miniprogramURL = "https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230606.zip";
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

package/lib/builder/config/index.js

@@ -45,12 +45,12 @@ exports.materialsDirName = 'materials'; // materials diretory of current project
  * src/template的代码，在IDE编辑器插件中构建builder
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20230213.zip';
+exports.builderTemplateURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/template_20230606.zip';
 /**
  * miniprogram的代码，IDE插件后续会提供端功能
  * 存放在大账号：100015939275。访问地址：https://console.cloud.tencent.com/cos/bucket?bucket=comp-public-1303824488&region=ap-shanghai&path=%252Flcap-builder%252F
  */
-exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230213.zip';
+exports.miniprogramURL = 'https://comp-public-1303824488.cos.ap-shanghai.myqcloud.com/lcap-builder/miniprogram_npm_20230606.zip';
 /**
  * miniprogram_npm存放目录。IDE插件builder用到
  */

package/lib/builder/core/index.d.ts

@@ -48,7 +48,7 @@ export declare function buildWedaConfig({ output, domain, isPrivateMode, endpoin
     endpointType?: IBuildWedaApp['endpointType'];
     buildTypeList?: IBuildWedaApp['buildTypeList'];
 }): Promise<void>;
-export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<string | undefined>;
+export declare function buildWedaApp({ cals, subAppCalsList, dependencies, appKey, runtime, ignoreInstall, buildTypeList, mode, devTool, deployOptions, generateMpType, plugins, extraData, resourceAppId, domain, output, isBrowserMpBuilder, cdnEndpoints, isPrivateMode, endpointType, }: IBuildWedaApp, cb?: WebpackBuildCallBack): Promise<any>;
 export declare function cleanComponentDir(): Promise<void>;
 export declare const version: any;
 export { getFiles, fileToZip, strToBuf } from '../util/generateFiles';

package/lib/builder/core/index.js

@@ -12,7 +12,6 @@ const common_1 = require("../types/common");
 const index_1 = require("../mp/index");
 const types_1 = require("../../types");
 const mixMode_1 = require("../mp/mixMode");
-const index_2 = require("../h5/index");
 const common_2 = require("../../utils/common");
 const postProcess_1 = require("../../utils/postProcess");
 const cals_1 = require("@cloudbase/cals");
@@ -62,7 +61,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
     isComposite: false,
     compProps: {},
 }, resourceAppId = undefined, domain = '', output, isBrowserMpBuilder = false, cdnEndpoints, isPrivateMode = false, endpointType = undefined, }, cb) {
-    var _a, _b;
+    var _a, _b, _c;
     if (!cals) {
         console.error('无效的应用配置');
         return;
@@ -138,6 +137,7 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
                     ? 'px'
                     : 'rpx'),
                 enablePageRoot,
+                enableLoading: (_c = cals === null || cals === void 0 ? void 0 : cals.extra) === null || _c === void 0 ? void 0 : _c.enableLoading,
             };
             const result = await (0, index_1.generateWxMp)({
                 weapps: apps,
@@ -185,24 +185,28 @@ async function buildWedaApp({ cals, subAppCalsList = [], dependencies = [], appK
             return outDir;
         }
         else {
-            const h5BuildDir = await (0, index_2.buildH5App)({
-                buildContext: { ...buildContext, isMixMode: false },
-                cals,
-                subAppCalsList,
-                extraData,
-                buildTypeList,
-                mode,
-                devTool,
-                runtime,
-                deployOptions,
-                ignoreInstall,
-                cdnEndpoints,
-            });
-            await (cb === null || cb === void 0 ? void 0 : cb(null, {
-                outDir: h5BuildDir,
-                timeElapsed: Date.now() - startTime,
-            }));
-            return h5BuildDir;
+            // web worker build 构建时注入, H5构建目前不支持web worker，web worker build时过滤掉
+            if (!process.env.IS_WEB_WORKER) {
+                const { buildH5App } = require('../h5/index');
+                const h5BuildDir = await buildH5App({
+                    buildContext: { ...buildContext, isMixMode: false },
+                    cals,
+                    subAppCalsList,
+                    extraData,
+                    buildTypeList,
+                    mode,
+                    devTool,
+                    runtime,
+                    deployOptions,
+                    ignoreInstall,
+                    cdnEndpoints,
+                });
+                await (cb === null || cb === void 0 ? void 0 : cb(null, {
+                    outDir: h5BuildDir,
+                    timeElapsed: Date.now() - startTime,
+                }));
+                return h5BuildDir;
+            }
         }
     }
     catch (err) {

package/lib/builder/h5/generate.d.ts

@@ -6,7 +6,12 @@ import { BuildType } from '../types/common';
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
 export declare function generateProjectFiles(buildData: BuildAppProps): Promise<void>;
-export declare function generateHTML({ appId, envId, description, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }: {
+export declare function generateHTML({ appId, envId, description, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
+/**
+ * 由于存量兜底逻辑存在
+ * 默认值为 undefined 否则应为 false
+ */
+enableLoading, }: {
     appId: string;
     envId: string;
     description?: string;
@@ -17,6 +22,7 @@ export declare function generateHTML({ appId, envId, description, appBuildDir, e
     isBuildApp: boolean;
     buildTypeList: BuildType[];
     cdnEndpoints?: ICDN_ENDPOINTS_COFIG;
+    enableLoading?: boolean;
 }): Promise<void>;
 export declare function handleAssets({ appBuildDir, buildTypeList, assets, }: {
     appBuildDir: string;

package/lib/builder/h5/generate.js

@@ -25,7 +25,12 @@ async function generateProjectFiles(buildData) {
     }));
 }
 exports.generateProjectFiles = generateProjectFiles;
-async function generateHTML({ appId, envId, description = '', appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }) {
+async function generateHTML({ appId, envId, description = '', appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, 
+/**
+ * 由于存量兜底逻辑存在
+ * 默认值为 undefined 否则应为 false
+ */
+enableLoading = undefined, }) {
     const templatePath = path_1.default.join(config_1.appTemplateDir, 'html', 'index.html.ejs');
     const dstFilePath = path_1.default.join(appBuildDir, 'index.html');
     const packageTpl = await fs_extra_1.default.readFile(templatePath, { encoding: 'utf8' });
@@ -56,14 +61,17 @@ async function generateHTML({ appId, envId, description = '', appBuildDir, exter
         cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
         /**
          * @deprecated
-         * 临时先这么添加白名单
+         * 此次临时保留白名单兜底逻辑
+         * 当应用数据补充完成后可以祛除
          */
-        enableStaticLoading: [
-            'lowcode-4gzdsu5k66946492',
-            'lowcode-2gay8jgh25c7b1cf',
-            'lowcode-4g9b78bx94404d85',
-            'lowcode-8gmx7bat3135e2de',
-        ].includes(envId) && !(0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),
+        enableLoading: !(0, common_2.buildAsAdminPortalByBuildType)(buildTypeList) && enableLoading === undefined
+            ? [
+                'lowcode-4gzdsu5k66946492',
+                'lowcode-2gay8jgh25c7b1cf',
+                'lowcode-4g9b78bx94404d85',
+                'lowcode-8gmx7bat3135e2de',
+            ].includes(envId)
+            : enableLoading,
     }));
 }
 exports.generateHTML = generateHTML;

package/lib/builder/h5/webpack.js

@@ -6,6 +6,7 @@ const webpack_1 = require("../service/webpack");
 const generate_1 = require("./generate");
 const cals_1 = require("@cloudbase/cals");
 async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir, publicPath, mode = common_1.WebpackModeType.NONE, appKey, buildTypeList = [common_1.BuildType.WEB], mpConfig, assets = [], devTool = 'vite', generateMpType = common_1.GenerateMpType.APP, cdnEndpoints, }) {
+    var _a;
     console.time('runWebpackCore');
     console.time('webpackGenerate');
     const allAppDataList = subAppDataList.concat(mainAppData);
@@ -29,7 +30,8 @@ async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir,
     await (0, generate_1.generateHTML)({
         appId: mainAppData.id || appKey,
         envId: mainAppData.envId || '',
-        description: cals.description || '',
+        description: cals.description /* || cals.label */ || '',
+        enableLoading: (_a = cals.extra) === null || _a === void 0 ? void 0 : _a.enableLoading,
         appBuildDir,
         externalResources: (cals.externalResources || []).concat(assets.map((url) => ({
             type: cals_1.EExternalResourceType.CSSUrl,

package/lib/builder/mp/BuildContext.d.ts

@@ -31,6 +31,10 @@ export interface IBuildContext {
      * 并设置 #page-root-id
      */
     enablePageRoot?: boolean;
+    /**
+     * 是否使用默认加载
+     */
+    enableLoading?: boolean;
     /**
      * 应用版本
      */

package/lib/builder/mp/index.js

@@ -125,6 +125,7 @@ async function generateWxMp({ buildContext, weapps, plugins, deployOptions, opti
             },
             'common/query.ts': {},
             'common/flow.ts': {},
+            'common/loading': {},
             /**
              * 调试用
              */

package/lib/builder/mp/materials.js

@@ -238,6 +238,7 @@ async function generateCompositeComponent(ctx, compositedComp, compLibCommonReso
     const compositeCtx = {
         ...ctx,
         isPage: false,
+        enableLoading: false,
     };
     const { materialName } = compositedComp;
     const outDir = path.join(compositeCtx.projDir, compositeCtx.rootPath || '', // 混合模式下，可能会有 rootPath

package/lib/builder/mp/wxml.js

@@ -66,6 +66,16 @@ function generateWxml(ctx, widgets, docTag, wxmlDataPrefix, usingComponents, com
                 _parent: null,
             },
         ];
+        if (ctx.enableLoading) {
+            usingComponents['wd-loading'] = '/common/loading/index';
+            xmlJson.elements.push({
+                type: 'element',
+                name: 'wd-loading',
+                attributes: {
+                    ['wx:if']: '{{_isCheckingAtuh}}',
+                },
+            });
+        }
     }
     function createXml(widgets, parent = null, parentForNodes = []) {
         var _a, _b, _c, _d, _e, _f;

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

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 import { OutputType } from 'jszip';
 export declare const generatedFileContents: {};
-export default function generateFiles(appFileData: any, srcDir: string, dstDir: string): Promise<string[]>;
+export default function generateFiles(appFileData: any, srcDir: string, dstDir: string): Promise<void>;
 export declare function writeFile(outFile: string, content: string): Promise<boolean>;
 export declare function removeFile(file: string): void;
 /**

package/lib/builder/util/generateFiles.js

@@ -42,16 +42,21 @@ async function generateFiles(appFileData, srcDir, dstDir) {
         const fileNameList = file.split('|');
         const srcFileName = fileNameList[0];
         const outFileName = fileNameList[1] || fileNameList[0];
-        const tplStr = await fs_extra_1.default.readFile(path_1.default.join(srcDir, srcFileName), {
-            encoding: 'utf8',
-        });
-        let generatedCode = (0, lodash_1.template)(tplStr, { interpolate: /<%=([\s\S]+?)%>/ })(appFileData[file]);
-        const outFile = path_1.default.resolve(dstDir, outFileName.replace(/\.tpl$/, ''));
-        if (await writeFile(outFile, generatedCode)) {
-            filesGenerated.push(outFileName);
+        const srcePath = path_1.default.join(srcDir, srcFileName);
+        if (fs_extra_1.default.lstatSync(srcePath).isDirectory()) {
+            (0, exports.copyRecursiveSync)(srcePath, path_1.default.join(dstDir, outFileName));
+        }
+        else {
+            const tplStr = await fs_extra_1.default.readFile(path_1.default.join(srcDir, srcFileName), {
+                encoding: 'utf8',
+            });
+            let generatedCode = (0, lodash_1.template)(tplStr, { interpolate: /<%=([\s\S]+?)%>/ })(appFileData[file]);
+            const outFile = path_1.default.resolve(dstDir, outFileName.replace(/\.tpl$/, ''));
+            if (await writeFile(outFile, generatedCode)) {
+                filesGenerated.push(outFileName);
+            }
         }
     }
-    return filesGenerated;
 }
 exports.default = generateFiles;
 async function writeFile(outFile, content) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.9",
+  "version": "1.8.10",
   "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": "^1.0.9-alpha.0",
-    "@cloudbase/lowcode-generator": "^1.8.0",
+    "@cloudbase/cals": "^1.0.9",
+    "@cloudbase/lowcode-generator": "^1.8.1",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs

@@ -9,7 +9,9 @@
       content="width=device-width,initial-scale=1.0,user-scalable=no<% if(!isBuildApp) {%>,viewport-fit=cover<%}%>"
     />
     <meta name="format-detection" content="telephone=no" />
-    <!-- <meta name="description" content="<%= desc %>" /> -->
+    <% if(desc){ %>
+    <meta name="description" content="<%= desc %>" />
+    <% } %>
     <link
       rel="stylesheet"
       href="<%=
@@ -389,7 +391,7 @@
 
   <body data-weui-theme="light">
     <div id="root" class="main-wrap">
-      <% if(enableStaticLoading){ %>
+      <% if(enableLoading){ %>
       <style type="text/css">
         .weda-loading-container {
           position: fixed;
@@ -549,7 +551,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.babe263dcf07a0b2f76e.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.3df3008899037155a92c.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/loading/index.js

@@ -0,0 +1,30 @@
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    message: String
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    message: '',
+    visible: false
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+
+  },
+  lifetimes: {
+    attached() {
+      setTimeout(() => {
+        this.setData({ visible: true, message: '登录鉴权中...' })
+      }, 100)
+    },
+  },
+})

package/template/mp/common/loading/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

package/template/mp/common/loading/index.wxml

@@ -0,0 +1,8 @@
+<view id="loading" class="weda-loading-container" wx:if="{{visible}}">
+  <view class="logo">
+    <view class="sp sp-circle"></view>
+  </view>
+  <view class="text" id="message">
+    {{message}}
+  </view>
+</view>

package/template/mp/common/loading/index.wxss

@@ -0,0 +1,44 @@
+.weda-loading-container {
+  position: fixed;
+  left:0;
+  top:0;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  height:100%;
+  padding: 0 20px;
+}
+.weda-loading-container .logo {
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  text-align: center;
+  margin-bottom: 50rpx;
+}
+
+.weda-loading-container .text {
+  font-size: 14px;
+}
+
+.weda-loading-container .sp{
+  width: 48px;
+  height:48px;
+}
+
+.weda-loading-container .sp-circle {
+  border: 6px rgba(0,82,217,0.25) solid;
+  border-top: 6px rgba(0,82,217,1) solid;
+  border-radius: 50%;
+  -webkit-animation: spCircRot .6s infinite linear;
+  animation: spCircRot .6s infinite linear;
+}
+@-webkit-keyframes spCircRot {
+  from { -webkit-transform: rotate(0deg); }
+  to { -webkit-transform: rotate(359deg); }
+}
+@keyframes spCircRot {
+  from { transform: rotate(0deg); }
+  to { transform: rotate(359deg); }
+}

package/template/mp/common/util.js

@@ -157,6 +157,9 @@ export function createEventHandlers(
             }
           }
         } catch (e) {
+          if (e.message) {
+            e.message = `${currentTarget?.id || ''}[${trigger}:${l.key}]: ${e.message}`;
+          }
           nextEventHandles[0].handlerName = l.key ? `${prefix}$${l.key}_fail` : '';
           nextEventHandles[0].event.detail = isIfAction ? event.detail : e;
           error = e;
@@ -170,12 +173,20 @@ export function createEventHandlers(
           const nextHandler = nextEventHandles[0];
 
           if (!self[nextHandler.handlerName] && error) {
-            console.error(`Action error: [${trigger}:${l.key}]`, error);
+            console.error(`Action error:`, error);
             if (!looseError) {
-              app.showToast({
-                icon: 'error',
-                title: `事件响应失败`,
-              });
+              if (app.__internal__?.env?.type !== 'production') {
+                app.showModal({
+                  title: `事件响应失败`,
+                  content: error.message || '',
+                  showCancel: false,
+                });
+              } else {
+                app.showToast({
+                  icon: 'error',
+                  title: `事件响应失败`,
+                });
+              }
             }
             throw error;
           } else {
@@ -213,7 +224,6 @@ export function createEventHandlers(
           return res.length ? res[0] : event.detail;
         });
       }
-
     };
   }
 
@@ -456,7 +466,6 @@ export function formatErrorMsg(e) {
  * 检查页面权限
  **/
 export async function checkAuth(app, appId, $page) {
-  return true;
   const loginPage = findLoginPage(app);
   if (loginPage?.id === $page.id) {
     return true;
@@ -521,7 +530,7 @@ export function redirectToLogin(currentPage) {
       pageId: loginPage.id,
       params: {
         sourcePageId: currentPage.id,
-        sourcePageParams: currentPage.params,
+        sourcePageParams: currentPage.params || currentPage.dataset?.params,
       },
     });
   } else {

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

@@ -86,7 +86,11 @@ export function createPage({
 
   return Component({
     _componentType: 'page',
-    data: createInitData(widgetProps, dataBinds),
+    data: {
+      ...createInitData(widgetProps, dataBinds),
+      _isCheckingAtuh: false,
+      weDaHasLogin: false
+    },
     lifetimes: {
       attached() {
         this._disposers = []
@@ -108,7 +112,7 @@ export function createPage({
           const widget = getWidget($page.widgets, e.target.id);
           widget._methods = {};
         };
-        this._disposers.push( ...this.initMergeRenderer($page.widgets));
+        this._disposers.push(...this.initMergeRenderer($page.widgets));
       },
       detached() {
         const $page = this._getInstance();
@@ -142,18 +146,25 @@ export function createPage({
             if (query) {
               EXTRA_API.setParams($page.uuid, query);
             }
-            if (await checkAuth(app, app.id, $page)) {
-              this.setData({
-                weDaHasLogin: true,
-              });
-              createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+            try {
+              this.setData({ _isCheckingAtuh: true })
+              const auth = await checkAuth(app, app.id, $page);
+              if(auth) {
+                this.setData({
+                  weDaHasLogin: true,
+                });
+                createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page }));
+              }
+            } finally {
+              this.setData({ _isCheckingAtuh: false })
             }
+
             // eslint-disable-next-line no-restricted-syntax
-            for (const queryId in $page.dataset?.query||{}) {
+            for (const queryId in $page.dataset?.query || {}) {
               if ($page.dataset.query[queryId]?._schema?.trigger === 'auto') {
                 try {
                   $page.dataset.query[queryId].trigger();
-                  this._disposers.push(()=> $page.dataset.query[queryId].destroy())
+                  this._disposers.push(() => $page.dataset.query[queryId].destroy())
                 } catch (e) {
                   console.error(`query ${queryId} 初始化失败：`, e);
                 }