@cloudbase/lowcode-builder 1.8.23 → 1.8.24-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/lowcode-builder",
-  "version": "1.8.23",
+  "version": "1.8.24-alpha.0",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -31,7 +31,8 @@
     "build": "tsc",
     "test": "jest",
     "test:build": "ts-node ./__tests__/build.ts",
-    "dev:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/web.config.js",
+    "dev:web:serve": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack-dev-server --config ./webpack/web.config.js",
+    "dev:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=development webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js",
     "build:web": "rm -rf dist && node ./webpack/scripts/web.pre.js && cross-env NODE_ENV=production webpack --config ./webpack/web.config.js && node ./webpack/scripts/web.post.js",
     "build:template": "./scripts/buildTemplate.sh"
   },
@@ -41,8 +42,8 @@
   "dependencies": {
     "@babel/core": "7.12.3",
     "@babel/preset-env": "7.12.1",
-    "@cloudbase/cals": "^1.0.15",
-    "@cloudbase/lowcode-generator": "^1.8.9",
+    "@cloudbase/cals": "1.0.17",
+    "@cloudbase/lowcode-generator": "1.8.9",
     "axios": "^0.21.0",
     "browserfs": "^1.4.3",
     "browserify-zlib": "^0.2.0",

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

@@ -22,7 +22,7 @@ const mainAppKey = '__weappsMainApp'
    */
   const list = []
   Object.entries(boundData).map(([prop, bindMeta])=>{
-    const str = `'${prop}': ($app, lists, forItems, event, $context, $w) => {${bindMeta.imports} return(
+    const str = `'${prop}': ($app, lists, forItems, event, $context, $w, params) => {${bindMeta.imports} return(
       ${bindMeta.expression === '' ? 'undefined': bindMeta.expression}
     )}`
     list.push(str)

package/template/mp/common/query.js

@@ -3,23 +3,23 @@ import { createEventHandlers, getMpEventHandlerName, mergeDynamic2StaticData } f
 import { Event } from './event-emitter';
 
 export class Query {
-  _schema = {}
-  #schema
+  _schema = {};
+  #schema;
   #context = {};
   #disposes = [];
   #dataBinds = {};
   #triggered = false;
   #paramsRef = observable({ current: null });
   #currentRequestKey = null;
-  #observableValue = observable({ data: null, error: null });
+  #observableValue = observable({ data: null, error: null, isFetching: false });
   #eventHandlerMap = {};
   #action = () => {};
   constructor({ schema, context, options = {} }) {
     const { looseError = false } = options;
     this.#schema = schema;
     this._schema = {
-      trigger: schema.trigger
-    }
+      trigger: schema.trigger,
+    };
     this.#context = context;
     if (this.#schema?.trigger === 'auto') {
       this.#disposes.push(
@@ -136,13 +136,17 @@ export class Query {
   get error() {
     return this.#observableValue.error;
   }
+  get isFetching() {
+    return this.#observableValue.isFetching;
+  }
   async trigger(additionalScope, options = {}) {
     this.#triggered = true;
-    return this.#innerTrigger(this.#resolveParams(), additionalScope, options);
+    return this.#innerTrigger(this.#resolveParams(additionalScope), options);
   }
   reset() {
     this.#observableValue.data = null;
     this.#observableValue.error = null;
+    this.#observableValue.isFetching = false;
   }
   destroy() {
     this.#disposes.forEach((dispose) => dispose());
@@ -156,12 +160,14 @@ export class Query {
     return this.#schema;
   }
 
-  async #innerTrigger(data, additionalScope, options = {}) {
+  async #innerTrigger(data, options = {}) {
     this.#currentRequestKey = Date.now();
     const key = this.#currentRequestKey;
     try {
+      this.#observableValue.isFetching = true;
       const res = await this.#action(data);
       if (key === this.#currentRequestKey) {
+        this.#observableValue.isFetching = false;
         this.#observableValue.data = res;
         this.#observableValue.error = null;
         this.#emit(`success`, res);
@@ -169,6 +175,7 @@ export class Query {
       return res;
     } catch (e) {
       if (key === this.#currentRequestKey) {
+        this.#observableValue.isFetching = false;
         this.#observableValue.data = null;
         this.#observableValue.error = e;
         this.#emit(`fail`, e);
@@ -185,7 +192,7 @@ export class Query {
     }, 300);
   }
 
-  #resolveParams() {
+  #resolveParams(additionalScope = {}) {
     /**
      * 这里万一其中某个字段计算失败
      * 好像会阻塞其他字段的计算
@@ -199,7 +206,7 @@ export class Query {
         instance: this.#context.$page,
       },
       $w: this.#context.$w,
-      // may be additional scope
+      paramsContext: additionalScope,
     });
   }
   async #emit(eventName, data) {
@@ -212,6 +219,14 @@ export class Query {
       }),
     );
   }
+
+  toJSON() {
+    const KEYS = ['id', 'label', 'description', 'data', 'error', 'isFetching', 'trigger', 'reset'];
+    return KEYS.reduce((obj, key) => {
+      obj[key] = this[key];
+      return obj;
+    }, {});
+  }
 }
 export function generateDatasetQuery(schema, context, options) {
   const result = {};

package/template/mp/common/util.js

@@ -9,7 +9,6 @@ export { generateEventFlows } from './flow';
 import lodashGet from 'lodash.get';
 import lodashSet from 'lodash.set';
 
-
 /**
  * Convert abcWordSnd -> abc-word-snd
  */
@@ -162,7 +161,7 @@ export function createEventHandlers(
           }
         } catch (e) {
           if (e.message) {
-            e._target = `${currentTarget?.id || ''}[${trigger}:${l.key}]`
+            e._target = `${currentTarget?.id || ''}[${trigger}:${l.key}]`;
           }
           nextEventHandles[0].handlerName = l.key ? `${prefix}$${l.key}_fail` : '';
           nextEventHandles[0].event.detail = isIfAction ? event.detail : e;
@@ -238,7 +237,6 @@ function generateErrorDebugMessage(error) {
   return `${error?._target ? `${error?._target}:` : ''}${error?.message || ''}`;
 }
 
-
 export function getDeep(target, key, keySeparator = '.') {
   if (key == null) {
     return target;
@@ -634,9 +632,10 @@ export function mergeDynamic2StaticData(
       event?: Event;
     };
     dataContext?: Record<string,any>;
+    paramsContext?: Record<string,any>;
   }*/,
 ) {
-  const { forContext = {}, codeContext = {}, dataContext = {}, $w } = context;
+  const { forContext = {}, codeContext = {}, dataContext = {}, $w, paramsContext = {} } = context;
   const { lists = [], forItems = {} } = forContext;
 
   const resolvedData = {
@@ -655,6 +654,7 @@ export function mergeDynamic2StaticData(
         codeContext.event,
         dataContext,
         $w,
+        paramsContext,
       ),
     );
   }

package/template/mp/page/index.js

@@ -12,7 +12,7 @@ import { widgetProps } from './data'
 <% function printBoundData(boundData={}) {
   const list = []
   Object.entries(boundData).map(([prop, bindMeta])=>{
-    const str = `'${prop}': ($page, lists, forItems, event, $context, $w) => {${bindMeta.imports} return(
+    const str = `'${prop}': ($page, lists, forItems, event, $context, $w, params) => {${bindMeta.imports} return(
       ${bindMeta.expression === '' ? 'undefined': bindMeta.expression}
     )}`
     list.push(str)

package/lib/utils/transform.d.ts

@@ -1,3 +0,0 @@
-export declare function BabelTransform(code: any, options?: {
-    IIFE?: boolean;
-}): any;

package/lib/utils/transform.js

@@ -1,52 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BabelTransform = void 0;
-/* eslint-disable no-new-func */
-const core_1 = require("@babel/core");
-function BabelTransform(code, options = {}) {
-    var _a;
-    const { IIFE = false } = options;
-    try {
-        const simpleWrapped = `(\n${code || 'undefined'}\n)`;
-        const { code: expression } = (0, core_1.transformSync)(IIFE ? `(()=>${simpleWrapped})()` : simpleWrapped, {
-            cwd: __dirname,
-            sourceType: 'script',
-            comments: false,
-            // minified: true,
-            presets: [
-                [
-                    '@babel/preset-env',
-                    {
-                        targets: {
-                            /**
-                             * 支持 proxy 的版本
-                             * 低于这个版本完全无法支持
-                             */
-                            // browsers: ['chrome >= 49', 'iOS >= 10', 'safari >= 10'],
-                            /**
-                             * 一个相对较高的版本，包涵解构赋值，这样不用注入太多 polifill
-                             * 但是不包涵 options chain
-                             * 基本上是 es2019
-                             */
-                            browsers: ['chrome >= 67', 'iOS >= 12', 'safari >= 12'],
-                        },
-                        include: [
-                            // es2015
-                            '@babel/plugin-transform-arrow-functions',
-                        ],
-                    },
-                ],
-            ],
-        }) || {};
-        const res = ((_a = expression === null || expression === void 0 ? void 0 : expression.replace) === null || _a === void 0 ? void 0 : _a.call(expression, /;$/, '')) || code;
-        if (expression) {
-            new Function(`return (\n${res}\n)`);
-        }
-        return res;
-    }
-    catch (e) {
-        console.error(`transform [${code}] fail:`, e === null || e === void 0 ? void 0 : e.message);
-        return code;
-    }
-}
-exports.BabelTransform = BabelTransform;