npm - @cloudbase/lowcode-builder - Versions diffs - 1.5.1 → 1.5.3 - Mend

@cloudbase/lowcode-builder 1.5.1 → 1.5.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/lib/builder/h5/generate.d.ts +2 -1
package/lib/builder/h5/generate.js +11 -1
package/lib/builder/h5/webpack.js +1 -0
package/package.json +3 -3
package/template/html/index.html.ejs +70 -2
package/template/mp/common/util.js +8 -2
package/template/mp/common/weapp-page.js +0 -2
package/template/mp/package.json +1 -1

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

@@ -6,8 +6,9 @@ import { BuildType } from '../types/common';
  * 该函数从 @govcloud/generate 取到需要的模版文件
  */
 export declare function generateProjectFiles(buildData: BuildAppProps): Promise<void>;
-export declare function generateHTML({ appId, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }: {
+export declare function generateHTML({ appId, envId, appBuildDir, externalResources, mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }: {
     appId: string;
+    envId: string;
     externalResources: Required<IPlatformApp>['externalResources'];
     appBuildDir: string;
     mode: string;

package/lib/builder/h5/generate.js CHANGED Viewed

@@ -25,7 +25,7 @@ async function generateProjectFiles(buildData) {
     }));
 }
 exports.generateProjectFiles = generateProjectFiles;
-async function generateHTML({ appId, appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }) {
+async function generateHTML({ appId, envId, appBuildDir, externalResources = [], mode, devTool, isBuildApp, buildTypeList, cdnEndpoints, }) {
     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' });
@@ -54,6 +54,16 @@ async function generateHTML({ appId, appBuildDir, externalResources = [], mode,
         isBuildApp,
         isAdminPortal: (0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),
         cdnEndpoints: (0, config_1.generateCdnEndpoints)(cdnEndpoints),
+        /**
+         * @deprecated
+         * 临时先这么添加白名单
+         */
+        enableStaticLoading: [
+            'lowcode-4gzdsu5k66946492',
+            'lowcode-2gay8jgh25c7b1cf',
+            'lowcode-4g9b78bx94404d85',
+            'lowcode-8gmx7bat3135e2de',
+        ].includes(envId) && !(0, common_2.buildAsAdminPortalByBuildType)(buildTypeList),
     }));
 }
 exports.generateHTML = generateHTML;

package/lib/builder/h5/webpack.js CHANGED Viewed

@@ -28,6 +28,7 @@ async function runWebpackCore({ cals, mainAppData, subAppDataList, appBuildDir,
     console.timeEnd('generateMpJsonConfigFile');
     await (0, generate_1.generateHTML)({
         appId: mainAppData.id || appKey,
+        envId: mainAppData.envId || '',
         appBuildDir,
         externalResources: (cals.externalResources || []).concat(assets.map((url) => ({
             type: cals_1.EExternalResourceType.CSSUrl,

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "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.5.16",
-    "@cloudbase/lowcode-generator": "^1.5.1",
+    "@cloudbase/cals": "^0.5.17",
+    "@cloudbase/lowcode-generator": "^1.5.3",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

package/template/html/index.html.ejs CHANGED Viewed

@@ -386,7 +386,75 @@
   </head>
   <body data-weui-theme="light">
-    <div id="root" class="main-wrap"></div>
+    <div id="root" class="main-wrap">
+      <% if(enableStaticLoading){ %>
+      <style type="text/css">
+        .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: 50px;
+        }
+        .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 0.6s infinite linear;
+          animation: spCircRot 0.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);
+          }
+        }
+      </style>
+      <div class="weda-loading-container">
+        <div class="logo">
+          <div class="sp sp-circle"></div>
+        </div>
+        <div class="text">初始化中...</div>
+        <script>
+          const ua = navigator.userAgent.toLowerCase();
+          if (ua.indexOf('wxwork') !== -1 && /[?&]code=/.test(location.search) && /[?&]state=/.test(location.search)) {
+            var el = document.querySelector('#root .weda-loading-container>.text');
+            if (el) {
+              el.innerHTML = '数据加载中...';
+            }
+          }
+        </script>
+      </div>
+      <% }%>
+    </div>
     <% jsApis.forEach(function(jsApi){%>
     <script src="<%=jsApi %>"></script>
     <% })%> <% if(canUseVite){ %>
@@ -475,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.174df5037414faa855d5.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.20c983f574139e8b0039.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/util.js CHANGED Viewed

@@ -66,13 +66,19 @@ export function createEventHandlers(
       const currentTarget = !!event?.currentTarget?.id ? getWidget(owner.widgets, event.currentTarget.id) : undefined;
       event.target = target;
       event.currentTarget = currentTarget;
-      const [prefix = ''] = name.split('$');
+      const [prefix = '', trigger] = name.split('$');
       // The page event handler
       const forContext = (!!currentTarget && generateForContextOfWidget(currentTarget)) || {};
       const { lists = [], forItems = {} } = forContext;
       const dataContext = untracked(() => generateDataContext(currentTarget));
       const $w = untracked(() => generateWidgetAPIContext(owner?.__internal__?.$w, currentTarget, forContext));
+      const currentPageId = app.__internal__?.activePage?.id
       listeners.forEach(async (l) => {
+        if(currentPageId && owner.id && currentPageId !== owner.id) {
+          console.error(`Action error: [${trigger}:${l.key}] 页面生命周期结束，链式调用中断`);
+          return ;
+        }
         let { data = {}, boundData = {} } = l;
         data = { ...data };
         try {
@@ -89,7 +95,7 @@ export function createEventHandlers(
         } catch (e) {
           let eventName = l.key ? `${prefix}$${l.key}_fail` : '';
           if (self[eventName]) {
-            console.error(`事件响应失败`, e);
+            console.error(`Action error: [${trigger}:${l.key}]`, e);
             await self[eventName]({
               ...event,
               detail: e,

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

@@ -147,7 +147,6 @@ export function createPage(
       },
       async onReady() {
         const $page = this._getInstance();
-        console.log("onReady", this, $page)
         this._disposers.push(...runWatchers(index, this));
@@ -172,7 +171,6 @@ export function createPage(
         await this.beforePageCustomLaunch?.(this._query)
-        // 权限检查
         const hook = lifecycle.onShow || lifecycle.onPageShow;
         await hook?.call?.($page);
         this.invokeEventHandler(id, 'show');

package/template/mp/package.json CHANGED Viewed

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