@cloudbase/framework-plugin-low-code 0.6.30 → 0.6.33

package/lib/builder/config/index.js

@@ -21,12 +21,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sharedMaterialsDir = void 0;
 const path = __importStar(require("path"));
-const os_1 = __importDefault(require("os"));
+const os = __importStar(require("os"));
 __exportStar(require("../../generator/config/index"), exports);
-exports.sharedMaterialsDir = path.join(os_1.default.homedir(), '.weapps-materials');
+exports.sharedMaterialsDir = path.join(os.homedir(), '.weapps-materials');

package/lib/builder/core/copy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../src/builder/core/copy.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAM7D,wBAAsB,OAAO,CAC3B,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,kBAAkB,EACrC,OAAO,EAAE;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,iBAwBpC"}
+{"version":3,"file":"copy.d.ts","sourceRoot":"","sources":["../../../src/builder/core/copy.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAM7D,wBAAsB,OAAO,CAC3B,WAAW,EAAE,MAAM,EACnB,iBAAiB,EAAE,kBAAkB,EACrC,OAAO,EAAE;IAAE,cAAc,EAAE,MAAM,CAAA;CAAE,iBAwBpC"}

package/lib/builder/mp/materials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/materials.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,EAIxB,MAAM,mBAAmB,CAAC;AAa3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU/C,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,UAAU,EAAE,EACpB,GAAG,EAAE,aAAa,iBA+KnB;AAGD,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,oBAAoB,EAAE,EACpC,cAAc,EAAE,aAAa,EAAE,EAC/B,WAAW,CAAC,EAAE,UAAU,cAsCzB;AA6ID,wBAAgB,UAAU,CACxB,GAAG,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,YAAY,CAAC,EACpD,GAAG,EAAE,aAAa,EAClB,WAAW,CAAC,EAAE,WAAW;;;;;;EA8D1B"}
+{"version":3,"file":"materials.d.ts","sourceRoot":"","sources":["../../../src/builder/mp/materials.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,uBAAuB,EAIxB,MAAM,mBAAmB,CAAC;AAa3B,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAU/C,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,UAAU,EAAE,EACpB,GAAG,EAAE,aAAa,iBAkNnB;AAGD,wBAAgB,2BAA2B,CACzC,KAAK,EAAE,UAAU,EACjB,YAAY,EAAE,oBAAoB,EAAE,EACpC,cAAc,EAAE,aAAa,EAAE,EAC/B,WAAW,CAAC,EAAE,UAAU,cAsCzB;AA6ID,wBAAgB,UAAU,CACxB,GAAG,EAAE,QAAQ,CAAC,uBAAuB,CAAC,CAAC,YAAY,CAAC,EACpD,GAAG,EAAE,aAAa,EAClB,WAAW,CAAC,EAAE,WAAW;;;;;;EA8D1B"}

package/lib/builder/mp/materials.js

@@ -85,8 +85,22 @@ function installMaterials(projDir, usedComps, weapps, ctx) {
                 else {
                     usingMaterialMap[targetDir] = true;
                 }
+                const materialsSrcDirPath = path.join(materialsSrcDir, 'src');
+                const compGroupIndexJson = yield fs.readJSON(path.join(materialsSrcDirPath, 'index.json'));
+                const componentsPathMap = compGroupIndexJson.components;
+                const dirsToDelete = [];
+                const componentsJson = Object.keys(componentsPathMap).reduce((acc, compName) => {
+                    if (usedComps[name].has(compName)) {
+                        acc[compName] = componentsPathMap[compName];
+                    }
+                    else {
+                        if (typeof componentsPathMap[compName] === 'string') {
+                            dirsToDelete.push(path.join(targetDir, path.dirname(componentsPathMap[compName])));
+                        }
+                    }
+                    return acc;
+                }, {});
                 if (libUpdated(targetDir, version)) {
-                    const materialsSrcDirPath = path.join(materialsSrcDir, 'src');
                     if (fs.existsSync(materialsSrcDirPath)) {
                         console.log(`Copying material ${materialId} from ${materialsSrcDir}/src to ${targetDir}`);
                         const metaJosnPath = path.join(materialsSrcDir, 'meta.json');
@@ -95,8 +109,7 @@ function installMaterials(projDir, usedComps, weapps, ctx) {
                         }
                         yield fs.copy(materialsSrcDirPath, targetDir, {
                             filter: function (src, dest) {
-                                const path = src.split('/');
-                                return !junk.is(path[path.length - 1]);
+                                return !junk.is(path.basename(src));
                             },
                         });
                     }
@@ -104,12 +117,15 @@ function installMaterials(projDir, usedComps, weapps, ctx) {
                         console.log(`Copying material ${materialId} from ${materialsSrcDir} to ${targetDir}`);
                         yield fs.copy(materialsSrcDir, targetDir, {
                             filter: function (src, dest) {
-                                const path = src.split('/');
-                                return !junk.is(path[path.length - 1]);
+                                return !junk.is(path.basename(src));
                             },
                         });
                     }
                 }
+                yield fs.writeJSON(path.join(targetDir, 'index.json'), Object.assign(Object.assign({}, compGroupIndexJson), { components: componentsJson }), { spaces: 2 });
+                yield Promise.all(dirsToDelete.map((dir) => __awaiter(this, void 0, void 0, function* () {
+                    fs.remove(dir);
+                })));
                 const libMeta = util_4.readComponentLibMata(targetDir);
                 if (!lib.components) {
                     lib.components = Object.keys((libMeta === null || libMeta === void 0 ? void 0 : libMeta.components) || {}).map((name) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/framework-plugin-low-code",
-  "version": "0.6.30",
+  "version": "0.6.33",
   "description": "云开发 Tencent CloudBase Framework Low Code Plugin，将低码配置生成完整项目并一键部署云开发资源。",
   "author": "yhsunshining@gmail.com",
   "homepage": "https://github.com/TencentCloudBase/cloudbase-framework#readme",
@@ -28,7 +28,8 @@
     "dev": "tsc -w",
     "prebuild": "rm -rf ./lib && rm -rf ./tsconfig.tsbuildinfo && npm run template",
     "build": "tsc",
-    "test": "jest"
+    "test": "jest",
+    "link": "node scripts/link-packages.js"
   },
   "bugs": {
     "url": "https://github.com/TencentCloudBase/cloudbase-framework/issues"
@@ -70,6 +71,7 @@
     "xml-js": "^1.6.11"
   },
   "devDependencies": {
+    "@lerna/create-symlink": "^4.0.0",
     "@types/archiver": "^3.1.0",
     "@types/command-exists": "^1.2.0",
     "@types/cross-spawn": "^6.0.2",
@@ -85,4 +87,4 @@
     "jest": "^26.0.1",
     "typescript": "^3.8.3"
   }
-}
+}

package/template/src/handlers/FieldMiddleware/renderer.jsx

@@ -63,7 +63,7 @@ export const CompRenderer = observer(function (props) {
 
   // 组件最终用于执行的事件函数
   const emit = useCallback(
-    (trigger, event, forItems, scopeContext) => {
+    (trigger, eventDetail, forItems, scopeContext) => {
       const listeners = listenerInstances || [];
 
       // 如果是数据容器，则将传过来的data，赋值给容器上下文context
@@ -83,7 +83,7 @@ export const CompRenderer = observer(function (props) {
         });
       }
 
-      event = { detail: event, name: trigger };
+      let event = { detail: eventDetail, name: trigger };
       forItems = {
         ...forItems,
         forIndexes: getForIndexes(forItems, widgetsData),
@@ -105,14 +105,14 @@ export const CompRenderer = observer(function (props) {
 
   // 选区最终用于执行的事件函数
   const emitSB = useCallback(
-    (trigger, event, forItems, scopeContext, fieldData) => {
+    (trigger, eventDetail, forItems, scopeContext, fieldData) => {
       const listeners =
         indexRef?.current !== undefined &&
         typeRef?.current &&
         fieldData?.[typeRef.current]?.[indexRef.current]?.selectableBlock?.[
           'x-props'
         ]?.listenerInstances;
-      event = { detail: event, name: trigger };
+      let event = { detail: eventDetail, name: trigger };
       forItems = {
         ...forItems,
         forIndexes: getForIndexes(forItems, widgetsData),
@@ -164,7 +164,9 @@ export const CompRenderer = observer(function (props) {
   try {
     // 绑定了 for 变量，但计算值错误时，应当空数组兜底
     forList =
-      dataBinds && dataBinds._waFor && (dataBinds._waFor(parentForItems, undefined, context) || []);
+      dataBinds &&
+      dataBinds._waFor &&
+      (dataBinds._waFor(parentForItems, undefined, context) || []);
   } catch (e) {
     // 计算值出错则使用空数组兜底
     forList = [];
@@ -305,7 +307,10 @@ export const CompRenderer = observer(function (props) {
 
   return (
     <Field
-      data={{ ...fieldData, _selectableBlockEvents: _selectableBlockEventsWithItem }}
+      data={{
+        ...fieldData,
+        _selectableBlockEvents: _selectableBlockEventsWithItem,
+      }}
       id={compId}
       {...componentProps}
       emit={emitWithForItems}

package/template/src/handlers/actionHandler/utils.js

@@ -11,31 +11,44 @@ export function getMetaInfoBySourceKey(sourceKey) {
   };
 }
 
-export function emitEvent(trigger, listeners = [], args, scopeContext = {}, context) {
+export function emitEvent(
+  trigger,
+  listeners = [],
+  args,
+  scopeContext = {},
+  context
+) {
   const targetListeners = listeners.filter((l) => l.trigger === trigger);
   targetListeners.forEach(async (listener) => {
     // 当前非捕获Event，再判断冒泡行为
-    if (
-      !args?.customEventData?.detail?.isCapturePhase &&
-      listener.noPropagation
-    ) {
-      args?.customEventData?.detail?.stopPropagation();
+    if (!args?.event?.isCapturePhase && listener.noPropagation) {
+      args?.customEventData?.stopPropagation();
     }
 
     // 判断捕获的执行，只有执行的捕获与配置的捕获一致时。才会执行。
     if (
       (listener?.isCapturePhase || false) ===
-      (args?.customEventData?.detail?.isCapturePhase || false)
+      (args?.customEventData?.isCapturePhase || false)
     ) {
       try {
         const res = await invokeListener(listener, args, scopeContext, context);
         const eventName = `${listener.key}.success`;
         const event = {
-          detail: {
-            value: res,
-            origin: args.event,
-            isCapturePhase: !!args.event?.isCapturePhase,
-          },
+          detail:
+            typeof res === 'object' && res !== null && !Array.isArray(res)
+              ? {
+                  ...res,
+                  /**
+                   * @deprecated 历史bug
+                   * value,origin,isCapturePhase
+                   */
+                  value: res,
+                  origin: args.event,
+                  isCapturePhase: !!args.event?.isCapturePhase,
+                }
+              : res,
+          origin: args.event,
+          isCapturePhase: !!args.event?.isCapturePhase,
           name: eventName,
         };
         emitEvent(
@@ -49,14 +62,22 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}, cont
           scopeContext,
           context
         );
+        if (res) {
+          console.warn(
+            `@deprecated 事件编排中后续事件(${eventName}) event.detail.value.xxx 已废弃，建议使用 event.detail 直接访问前一动作返回值`
+          );
+        }
       } catch (e) {
         const eventName = `${listener.key}.fail`;
+        try {
+          e.value = e;
+          e.origin = args.event;
+          e.isCapturePhase = !!args.event?.isCapturePhase;
+        } catch (e) {}
         const event = {
-          detail: {
-            value: e,
-            origin: args.event,
-            isCapturePhase: !!args.event?.isCapturePhase,
-          },
+          detail: e,
+          origin: args.event,
+          isCapturePhase: !!args.event?.isCapturePhase,
           name: eventName,
         };
         emitEvent(
@@ -70,6 +91,9 @@ export function emitEvent(trigger, listeners = [], args, scopeContext = {}, cont
           scopeContext,
           context
         );
+        console.warn(
+          `@deprecated 事件编排中后续事件(${eventName}) event.detail.value.xxx 已废弃，建议使用 event.detail 直接访问前一动作返回值`
+        );
         // 之前 invoke 内部catch 了错误，不会抛错
         // throw e
       }

package/template/webpack/web.prod.js

@@ -92,22 +92,16 @@ module.exports = function (options) {
             threadMode: true,
             loaders: {
               js: [babelLoader],
-              ts: [
-                babelLoader,
-                typescriptLoader,
-              ],
-            }
-          }
+              ts: [babelLoader, typescriptLoader],
+            },
+          },
         },
       ],
-      threadPool: happyThreadPool
+      threadPool: happyThreadPool,
     }),
     new HappyPack({
       id: TS_LOADER_ID,
-      loaders: [
-        babelLoader,
-        typescriptLoader,
-      ],
+      loaders: [babelLoader, typescriptLoader],
       threadPool: happyThreadPool,
     }),
     new HappyPack({
@@ -125,13 +119,15 @@ module.exports = function (options) {
       filename: '[name].[contenthash].css',
       chunkFilename: '[id].[contenthash].css',
     }),
-    new webpack.DefinePlugin(Object.assign(
-      {
-        'process.env.isMiniprogram': false, // 注入环境变量，用于业务代码判断
-        'process.env.SSR': false,
-      },
-      definePlugin,
-    )),
+    new webpack.DefinePlugin(
+      Object.assign(
+        {
+          'process.env.isMiniprogram': false, // 注入环境变量，用于业务代码判断
+          'process.env.SSR': false,
+        },
+        definePlugin
+      )
+    ),
     new CopyWebpackPlugin({
       patterns: [
         {
@@ -157,6 +153,36 @@ module.exports = function (options) {
       }),
     ]);
   }
+
+  const cssLoaders = [
+    MiniCssExtractPlugin.loader,
+    {
+      loader: 'css-loader',
+      options: {
+        modules: false,
+        importLoaders: 2,
+      },
+    },
+    {
+      loader: 'postcss-loader',
+      options: {
+        postcssOptions: {
+          plugins: [
+            [
+              'postcss-pxtorem',
+              {
+                rootValue: 14,
+                propList: ['*'],
+                // todo
+                selectorBlackList: ['.weui-picker__indicator'],
+              },
+            ],
+          ],
+        },
+      },
+    },
+  ];
+
   return {
     context,
     entry,
@@ -184,7 +210,7 @@ module.exports = function (options) {
       rules: [
         {
           test: /\.vue$/,
-          loader: 'happypack/loader?id=vue'
+          loader: 'happypack/loader?id=vue',
         },
         {
           test: /\.tsx?$/,
@@ -199,32 +225,7 @@ module.exports = function (options) {
         {
           test: /\.(scss|sass)$/,
           use: [
-            MiniCssExtractPlugin.loader,
-            {
-              loader: 'css-loader',
-              options: {
-                modules: false,
-                importLoaders: 2,
-              },
-            },
-            {
-              loader: 'postcss-loader',
-              options: {
-                postcssOptions: {
-                  plugins: [
-                    [
-                      'postcss-pxtorem',
-                      {
-                        rootValue: 14,
-                        propList: ['*'],
-                        // todo
-                        selectorBlackList: ['.weui-picker__indicator'],
-                      },
-                    ],
-                  ],
-                },
-              },
-            },
+            ...cssLoaders,
             {
               loader: 'sass-loader',
               options: {
@@ -234,34 +235,13 @@ module.exports = function (options) {
           ],
         },
         {
-          test: /\.(css|less)$/,
+          test: /\.css$/,
+          use: [...cssLoaders],
+        },
+        {
+          test: /\.less$/,
           use: [
-            MiniCssExtractPlugin.loader,
-            {
-              loader: 'css-loader',
-              options: {
-                modules: false,
-                importLoaders: 2,
-              },
-            },
-            {
-              loader: 'postcss-loader',
-              options: {
-                postcssOptions: {
-                  plugins: [
-                    [
-                      'postcss-pxtorem',
-                      {
-                        rootValue: 14,
-                        propList: ['*'],
-                        // todo
-                        selectorBlackList: ['.weui-picker__indicator'],
-                      },
-                    ],
-                  ],
-                },
-              },
-            },
+            ...cssLoaders,
             {
               loader: 'less-loader',
               options: {
@@ -310,20 +290,20 @@ module.exports = function (options) {
       },
       ...(isDevelopment
         ? {
-          minimize: false,
-          removeAvailableModules: false,
-          removeEmptyChunks: true,
-        }
+            minimize: false,
+            removeAvailableModules: false,
+            removeEmptyChunks: true,
+          }
         : {
-          minimizer: [
-            new TerserPlugin({
-              test: /\.js(\?.*)?$/i,
-              cache: false,
-              parallel: true,
-              sourceMap: false,
-            }),
-          ],
-        }),
+            minimizer: [
+              new TerserPlugin({
+                test: /\.js(\?.*)?$/i,
+                cache: false,
+                parallel: true,
+                sourceMap: false,
+              }),
+            ],
+          }),
     },
   };
 };