@cloudbase/lowcode-builder 1.8.72 → 1.8.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.72",
+  "version": "1.8.74",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -46,7 +46,7 @@
   "dependencies": {
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
-    "@cloudbase/cals": "^1.0.58",
+    "@cloudbase/cals": "^1.0.63",
     "@cloudbase/lowcode-generator": "^1.8.24",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",

package/template/html/index.html.ejs

@@ -454,7 +454,7 @@
     <script type="module" src="/src/index.jsx"></script>
     <% } %> <% if(!isAdminPortal){ %>
     <script src="<%= wedaPrivateConfigEndpoint ? wedaPrivateConfigEndpoint : '' %>/weda-config/weda-private.js"></script>
-    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.4.7-beta.0/cloudbase.full.js?v=1"></script>
+    <script src="<%= cdnEndpoints.cloudbase %>/cloudbase-js-sdk/2.5.36-beta.0/cloudbase.full.js?v=1"></script>
     <% }%>
     <script>
       if (window.cloudbase && window._aegis) {
@@ -543,7 +543,7 @@
       crossorigin
       src="<%=
       cdnEndpoints.cdngo
-      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.a24a8e628a0ab3a0c8b5.bundle.js"
+      %>/lcap/lcap-resource-cdngo/-/0.1.4/_files/static/weda-render/main.6b0be6e6436fb7ead047.bundle.js"
     ></script>
   </body>
 </html>

package/template/mp/common/data-patch.js

@@ -4,7 +4,7 @@ export function getDatapatch(base, pendingData) {
   for (const widgetId in pendingData) {
     const baseWidget = base[widgetId]
     const pendingWidget = pendingData[widgetId]
-    if (!baseWidget) {
+    if (!baseWidget || typeof pendingWidget === 'string') {
       patch[widgetId] = pendingWidget
     } else {
       patchProp(baseWidget, pendingWidget, patch, widgetId)

package/template/mp/common/merge-renderer.js

@@ -5,13 +5,9 @@ import { getDatapatch } from './data-patch'
 
 export default {
   // Attention, must be called at the end of attached or page load to make sure user init take effect
-  initMergeRenderer(widgets) {
+  initMergeRenderer(widgets, dataFactory = {}) {
     this.flushPendingData = throttle(this.flushPendingData.bind(this), 18)
 
-    const dataFactory = {
-      // <%= dataPropNames.pageState %>: () => pageState,
-      // <%= dataPropNames.pageComputed %>: () => pageComputed,
-    }
     for (const id in widgets) {
       const props = widgets[id]
       dataFactory['<%= dataPropNames.widgetProp %>' + id] = () => resolveWidgetData(props, id)

package/template/mp/common/style.js

@@ -5,7 +5,7 @@ import { toDash } from './util'
 export function styleToCss(style) {
   const styleDeclars = [] // ['color: red;', 'background-color: green']
   for (const key in style) {
-    styleDeclars.push(toDash(key) + ':' + style[key] + ';')
+    styleDeclars.push(`${/^--/.test(key) ? key : toDash(key)}:${style[key]};`)
   }
   return styleDeclars.join('')
 }

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

@@ -22,6 +22,7 @@ import { $w as baseAPI } from '../app/weapps-api';
 import { Event } from './event-emitter';
 import { generatePageUrl } from '@cloudbase/weda-client';
 import { mergeDynamic2StaticData, patchWdigetPropsWithEvtListeners } from './util';
+import { styleToCss } from './style';
 
 export const PAGE_ROOT_SYMBOL = Symbol('@@page_route@@')
 
@@ -118,6 +119,7 @@ export function createPage({
 
   const evtHandlers = createEventHandlers(evtListeners);
   const {[PAGE_ROOT_SYMBOL]: pageRootDataBinds, ...componentDataBinds} = dataBinds
+  const staticPageStyle = <%= pageStyle || '{}' %>
 
   return Component({
     _componentType: 'page',
@@ -127,7 +129,7 @@ export function createPage({
       _expiredMessage: '',
       weDaHasLogin: null,
       loginError: null,
-      pageStyle: `<%= pageStyle || '' %>`
+      pageStyle: styleToCss(staticPageStyle)
     },
     lifetimes: {
       attached() {
@@ -158,7 +160,33 @@ 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, {
+          pageStyle: () => {
+            let pageStyle = { ...staticPageStyle }
+            try {
+              if ( pageRootDataBinds.style ) {
+                const { style } = mergeDynamic2StaticData({}, {
+                  style: pageRootDataBinds.style
+                }, {
+                  codeContext: {
+                    /**
+                     * $page 或 $comp 实例
+                     */
+                    instance: $page,
+                  },
+                  $w: $page?.__internal__?.$w,
+                })
+                pageStyle = {
+                  ...pageStyle,
+                  ...style
+                }
+              }
+            } catch(e) {
+              console.warn('页面动态style绑定计算失败：', e)
+            }
+            return styleToCss(pageStyle)
+          }
+        }));
         getExpiredMessage(<%= expirationStartTimesnap %>).then(message => {
           if (message) {
             this.setData({
@@ -197,9 +225,10 @@ export function createPage({
       ...mergeRenderer,
       async beforePageCustomLaunch(query) {
         if (!this._beforePageCustomLaunchPromise) {
-          this._beforePageCustomLaunchPromise = new Promise(async (resolve) => {
+          this._beforePageCustomLaunchPromise = new Promise(async (resolve, reject) => {
             await wxApp.globaldata?._beforePageCustomLaunchPromise;
             const $page = this._getInstance();
+            let weDaHasLogin
             if (query) {
               EXTRA_API.setParams($page.uuid, query);
             }
@@ -207,18 +236,21 @@ export function createPage({
               this.setData({ _isCheckingAtuh: true });
               const auth = await checkAuth(app, app.id, $page);
               if (auth) {
+                weDaHasLogin = true
                 this.setData({
-                  weDaHasLogin: true,
+                  weDaHasLogin,
                 });
                 createStateDataSourceVar($page.uuid, generateParamsParser({ app, $page, $w: $page.__internal__?.$w }));
               } else {
+                weDaHasLogin = false
                 this.setData({
-                  weDaHasLogin: false,
+                  weDaHasLogin,
                 });
               }
             } catch(e) {
+              weDaHasLogin = false
               this.setData({
-                weDaHasLogin: false,
+                weDaHasLogin,
                 loginError: { message: e.message }
               });
             } finally {
@@ -241,7 +273,11 @@ export function createPage({
                   });
               }
             }
-            resolve();
+            if(weDaHasLogin===false) {
+              reject(new Error('permission denied') )
+            }else {
+              resolve()
+            }
           });
         }
         return this._beforePageCustomLaunchPromise;

package/template/mp/component/index.wxss

@@ -1,2 +1,4 @@
 <% importStyles.map(style => {%>
   @import  '<%= style %>';<%})%>
+
+<%= content || '' %>

package/template/mp/package.json

@@ -5,8 +5,8 @@
   "dependencies": {<% if(importJSSDK) {%>
 		"@cloudbase/js-sdk": "2.5.6-beta.1",<% } %>
 		"@cloudbase/oauth": "0.1.1-alpha.5",
-    "@cloudbase/weda-client": "1.0.20",
-    "@cloudbase/weda-cloud-sdk": "1.0.53",
+    "@cloudbase/weda-client": "1.0.22",
+    "@cloudbase/weda-cloud-sdk": "1.0.56",
     "mobx": "^5.15.4",
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",

package/template/mp/page/api.js

@@ -1,14 +1,13 @@
 import { $w as baseAPI } from '<%= subLevelPath %>../../app/weapps-api'
 
-export const $page = {
+export const $page = <%= JSON.stringify( {
   __internal__: {
     active: false,
-    packageName: '<%= packageName %>',
+    packageName,
   },
-  uuid: '<%= uuid %>',
-  label: '<%= label %>',
-
-};
+  uuid,
+  label,
+}, undefined, 2) %>;
 
 export const $w = new Proxy(
   baseAPI,

package/template/package.json

@@ -2,7 +2,8 @@
   "name": "lcap-<%= appId%>",
   "version": "1.0.0",
   "scripts": {
-    "build-web": "webpack --config ./webpack/webpack.web.prod.js"
+    "build-web": "webpack --config ./webpack/webpack.web.prod.js",
+    "dev": "webpack-dev-server --mode development --config ./webpack/web.dev.js --open"
   },
   "dependencies": {
     "@cloudbase/js-sdk": "2.4.0-beta.0",
@@ -52,13 +53,13 @@
     "terser-webpack-plugin": "^3.0.2",
     "mini-css-extract-plugin": "^0.8.0",
     "hard-source-webpack-plugin": "^0.13.1",
-    "html-webpack-plugin": "^3.2.0",
+    "html-webpack-plugin": "^4.5.2",
     "ts-loader": "^8.3.0",
     "typescript": "^4.4.4",
     "vue-loader": "15.9.8",
     "vue-template-compiler": "2.6.14",
-    "webpack": "^4.41.4",
-    "webpack-cli": "^4.2.0",
-    "webpack-dev-server": "^3.11.0"
+    "webpack": "^4.47.0",
+    "webpack-dev-server": "^3.11.3",
+    "webpack-cli": "^3.3.12"
   }
 }

package/template/webpack/web.dev.js

@@ -0,0 +1,21 @@
+const webpack = require('webpack');
+const prodConfig = require('./webpack.web.prod.js');
+
+prodConfig.plugins.forEach((plugin) => {
+  if (plugin instanceof webpack.DefinePlugin) {
+    plugin.definitions['process.env.historyType'] = JSON.stringify('HASH');
+  }
+});
+
+const config = Object.assign({}, prodConfig, {
+  mode: 'development',
+  watch: true,
+  devServer: {
+    compress: true,
+    hot: true,
+    liveReload: true,
+    port: 9001,
+  },
+});
+
+module.exports = config;