@lingxiteam/ebe-utils 0.0.10 → 0.0.12

package/README.md

@@ -65,6 +65,12 @@ const Page = () => {
         queryFrontendHookList,
         findApplication,
       },
+      // 为 true 时，会自动翻译页面名称作为路由 path
+      needTranslatePagePathToEnglish: true,
+      // 默认为 true，会自动发起浏览器下载 zip 文件
+      autoDownloadOnBower: true,
+      // 默认为 true，忽略静态文件生成，通过 ebe setup 命令下载静态文件
+      useEbeSetup: true,
     });
   };
   return <></>;

package/es/index.d.ts

@@ -8,7 +8,6 @@ export declare const treeForEach: (tree: any, callback: (item: any, root: boolea
     children: string;
 }) => void;
 export declare const getPageDsls: (resultObjects: any[]) => any[];
-export declare function findAllItem<T = any>(target: T[], callback: (item: T, index: number, list: T[]) => boolean, itemHash: any): void;
 export declare function findItem<T = any>(target: T[], callback: (item: T, index: number, list: T[]) => boolean): T | null;
 export declare const cleanTree: (tree: any, fields: any) => any;
 export declare const clearLXPagesDSL: (pages: any[]) => any[];
@@ -29,6 +28,14 @@ interface CodeServices {
         chinese: string[];
         rule: string;
     }) => Promise<any>;
+    qryBusiCompPage: (params: {
+        appId: string;
+        appIds?: string[];
+        statusCd?: string;
+        pageNum?: number;
+        pageSize?: number;
+        terminalType?: string;
+    }) => Promise<any>;
 }
 export declare const getSafeTypeName: (name: any) => any;
 interface CodeOptions {
@@ -41,6 +48,8 @@ interface CodeOptions {
         progress: number;
     }) => void;
     needTranslatePagePathToEnglish?: boolean;
+    autoDownloadOnBower?: boolean;
+    useEbeSetup?: boolean;
 }
 export declare const setWorkerJsUrl: (url: string) => void;
 export declare const init: () => Promise<void>;
@@ -49,7 +58,6 @@ export declare const fetchData: ({ appId, services, platform, baseUrl, onProgres
         platform: string;
         appId: string;
         pageIdMapping: any;
-        busiCompMapping: any;
         compAssetList: any;
         baseUrl: string;
         appConfig: {
@@ -63,10 +71,7 @@ export declare const fetchData: ({ appId, services, platform, baseUrl, onProgres
     };
     cleanedTree: any;
 }>;
-export declare const codeCreate: ({ appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, }: CodeOptions) => Promise<{
-    success: boolean;
-    msg?: undefined;
-} | {
+export declare const codeCreate: ({ appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, autoDownloadOnBower, useEbeSetup, }: CodeOptions) => Promise<import("@lingxiteam/ebe/types/core").IPublisherResponse<string | import("../../types/core/publisher/zip").ZipBuffer> | {
     msg: unknown;
     success: boolean;
 }>;

package/es/index.js

@@ -179,25 +179,28 @@ export var getPageDsls = function getPageDsls(resultObjects) {
     }
   }).filter(Boolean);
 };
-export function findAllItem(target, callback, itemHash) {
-  var list = target;
-  // Makes sures is always has an positive integer as length.
-  // eslint-disable-next-line
-  var length = list.length >>> 0;
-  // eslint-disable-next-line
-  var thisArg = arguments[1];
-  for (var i = 0; i < length;) {
-    var element = list[i];
-    if (callback.call(thisArg, element, i, list)) {
-      var _element$props$busiCo, _element$props;
-      itemHash[(_element$props$busiCo = element === null || element === void 0 || (_element$props = element.props) === null || _element$props === void 0 ? void 0 : _element$props.busiCompId) !== null && _element$props$busiCo !== void 0 ? _element$props$busiCo : ''] = 1;
-    }
-    i += 1;
-    if (element !== null && element !== void 0 && element.components) {
-      findAllItem(element === null || element === void 0 ? void 0 : element.components, callback, itemHash);
-    }
-  }
-}
+// export function findAllItem<T = any>(
+//   target: T[],
+//   callback: (item: T, index: number, list: T[]) => boolean,
+//   itemHash: any,
+// ) {
+//   const list = target;
+//   // Makes sures is always has an positive integer as length.
+//   // eslint-disable-next-line
+//   const length = list.length >>> 0;
+//   // eslint-disable-next-line
+//   const thisArg = arguments[1];
+//   for (let i = 0; i < length; ) {
+//     const element = list[i] as any;
+//     if (callback.call(thisArg, element, i, list)) {
+//       itemHash[element?.props?.busiCompId ?? ''] = 1;
+//     }
+//     i += 1;
+//     if (element?.components) {
+//       findAllItem(element?.components, callback, itemHash);
+//     }
+//   }
+// }
 export function findItem(target, callback) {
   var list = target;
   // Makes sures is always has an positive integer as length.
@@ -269,7 +272,7 @@ export var init = /*#__PURE__*/function () {
 }();
 export var fetchData = /*#__PURE__*/function () {
   var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
-    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, appInfo, attrSpecPage, resultObject, frontendHookList, themeCss, temCompAssetList, compAssetList, globalDataInfo, dataSourceList, globalDataMap, pageIdMapping, appPageList, lastPageId, data, pages, itemHash, itemLists, busiData, busiCompMapping, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, _translateNames2, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, _key, _pages$_key$pageConta, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageDSLS, getPlatform, options, cleanedTree;
+    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, appInfo, attrSpecPage, resultObject, frontendHookList, themeCss, temCompAssetList, compAssetList, globalDataInfo, dataSourceList, globalDataMap, pageIdMapping, appPageList, lastPageId, data, pages, _yield$services$qryBu, itemLists, busiData, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, _key, _pages$_key$pageConta, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageDSLS, getPlatform, options, cleanedTree;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -328,7 +331,7 @@ export var fetchData = /*#__PURE__*/function () {
           })]);
         case 19:
           themeCss = _context3.sent;
-          console.log('====获取主题成功', themeCss);
+          console.log('====获取主题成功');
           _context3.next = 26;
           break;
         case 23:
@@ -401,33 +404,43 @@ export var fetchData = /*#__PURE__*/function () {
           }));
         case 45:
           data = _context3.sent;
-          pages = getPageDsls(data); // busiCompId 过滤重复
-          itemHash = {}; // 找到所有页面使用到的 业务组件
-          findAllItem(pages, function (item) {
-            return item.compName === 'BOFramer';
-          }, itemHash);
-          itemLists = Object.keys(itemHash); // 请求所有业务组件的 dsl
+          pages = getPageDsls(data);
           onProgress({
             log: '获取所有业务组件dsl',
             progress: 6
           });
-          _context3.next = 53;
+
+          // 业务组件从被使用才生成改为全部生成
+          _context3.next = 50;
+          return services.qryBusiCompPage({
+            appIds: [appId],
+            appId: appId,
+            statusCd: '00A',
+            pageNum: 1,
+            pageSize: 999999,
+            terminalType: platform
+          });
+        case 50:
+          _yield$services$qryBu = _context3.sent;
+          itemLists = _yield$services$qryBu.list;
+          _context3.next = 54;
           return Promise.all(itemLists.map(function (i) {
             return services.findBusiCompById({
-              busiCompId: i,
+              busiCompId: i.busiCompId,
               appId: appId,
               pageId: lastPageId
             });
           }));
-        case 53:
+        case 54:
           busiData = _context3.sent;
-          busiCompMapping = {}; // 过滤为空
+          // 过滤为空
           busiPages = busiData.filter(Boolean).map(function (i, index) {
             var _i$busiCompVersion;
             // 业务组件为空，返回一个 fallback
             var busiData = JSON.parse((i === null || i === void 0 || (_i$busiCompVersion = i.busiCompVersion) === null || _i$busiCompVersion === void 0 ? void 0 : _i$busiCompVersion.sourceCodeJson) || '{"id":"100101","pageContainerType":"BusiComp","pageName":"错误组件","pagePath":"","objType":"app","busiCompCode":"Custom","callbacks":["onChange"],"compState":"","events":[],"actions":[],"pageDynamicFlag":true,"setEvents":[{"dataName":"event","dataId":"798407","path":[],"value":"useEffect","params":[],"children":[]}],"layout":"BaseLayout","searchParams":[{"name":"业务主键","code":"bizId"},{"name":"业务场景","code":"sceneCode"},{"name":"业务数据","code":"bizData"}],"catalogItemId":"-1","platformType":"LowCode","editorVersion":"3.6.1.04251034","createdEditorVersion":"0.2.1130.05051011","busiCompObjectRelDTOList":[],"platform":"pc","appId":"1064722784465846272","components":[{"id":"Icon_2609852","label":"图标","compName":"Icon","type":"Icon","compType":1,"compLib":"@/components","props":{"name":"图标","mode":"normal","rotate":0,"basicStatus":1,"icon":{"theme":"outlined","type":"smile","isIconFont":false},"popoverSetting":{"page":{"pagePath":"/ceshiqipao2781","pageId":"1049616591121936384","pageName":"测试气泡1206","options":[{"name":"业务主键","code":"bizId"},{"name":"业务场景","code":"sceneCode"},{"name":"业务数据","code":"bizData"}],"tipType":"1","trigger":"click"}}},"style":{},"isContainer":false,"isBusiObjContainer":false,"cmdgroup":["basic"],"platform":"pc","icon":"Icon","description":"","image":"","groupsName":"通用","isInlineBlock":true,"setEvents":[],"isLabelDropBoxChild":false,"components":[],"path":["965041"]}],"path":[]}');
+            // 业务组件原始 dsl 里面没有 busiCompId
             busiData.busiCompId = i === null || i === void 0 ? void 0 : i.busiCompId;
-            busiCompMapping[itemLists[index]] = busiData.id;
+            busiData.id = i === null || i === void 0 ? void 0 : i.busiCompId;
             return busiData;
           });
           /**
@@ -507,8 +520,7 @@ export var fetchData = /*#__PURE__*/function () {
               progress: 6 + key / busiPages.length
             });
             busiPages[key]._pageName = busiPages[key].pageName;
-            console.log('====翻译成功', ((_translateNames = translateNames) === null || _translateNames === void 0 ? void 0 : _translateNames[getSafeTypeName(busiPages[key].pageName)]) || busiPages[key].pageName);
-            busiPages[key].pageName = ((_translateNames2 = translateNames) === null || _translateNames2 === void 0 ? void 0 : _translateNames2[getSafeTypeName(busiPages[key].pageName)]) || busiPages[key].pageName;
+            busiPages[key].pageName = ((_translateNames = translateNames) === null || _translateNames === void 0 ? void 0 : _translateNames[getSafeTypeName(busiPages[key].pageName)]) || busiPages[key].pageName;
           }
           pagePathEnglishMapping = {};
           if (!needTranslatePagePathToEnglish) {
@@ -575,7 +587,6 @@ export var fetchData = /*#__PURE__*/function () {
             platform: getPlatform(platform),
             appId: appId,
             pageIdMapping: pageIdMapping,
-            busiCompMapping: busiCompMapping,
             compAssetList: compAssetList || [],
             baseUrl: baseUrl,
             appConfig: {
@@ -612,11 +623,11 @@ export var fetchData = /*#__PURE__*/function () {
 }();
 export var codeCreate = /*#__PURE__*/function () {
   var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(_ref7) {
-    var appId, services, platform, baseUrl, _onProgress, _ref7$needTranslatePa, needTranslatePagePathToEnglish, _yield$fetchData, cleanedTree, options, result;
+    var appId, services, platform, baseUrl, _onProgress, _ref7$needTranslatePa, needTranslatePagePathToEnglish, _ref7$autoDownloadOnB, autoDownloadOnBower, _ref7$useEbeSetup, useEbeSetup, _yield$fetchData, cleanedTree, options, result, zipRes;
     return _regeneratorRuntime().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          appId = _ref7.appId, services = _ref7.services, platform = _ref7.platform, baseUrl = _ref7.baseUrl, _onProgress = _ref7.onProgress, _ref7$needTranslatePa = _ref7.needTranslatePagePathToEnglish, needTranslatePagePathToEnglish = _ref7$needTranslatePa === void 0 ? false : _ref7$needTranslatePa;
+          appId = _ref7.appId, services = _ref7.services, platform = _ref7.platform, baseUrl = _ref7.baseUrl, _onProgress = _ref7.onProgress, _ref7$needTranslatePa = _ref7.needTranslatePagePathToEnglish, needTranslatePagePathToEnglish = _ref7$needTranslatePa === void 0 ? false : _ref7$needTranslatePa, _ref7$autoDownloadOnB = _ref7.autoDownloadOnBower, autoDownloadOnBower = _ref7$autoDownloadOnB === void 0 ? true : _ref7$autoDownloadOnB, _ref7$useEbeSetup = _ref7.useEbeSetup, useEbeSetup = _ref7$useEbeSetup === void 0 ? true : _ref7$useEbeSetup;
           _context4.prev = 1;
           _context4.next = 4;
           return fetchData({
@@ -631,13 +642,12 @@ export var codeCreate = /*#__PURE__*/function () {
           _yield$fetchData = _context4.sent;
           cleanedTree = _yield$fetchData.cleanedTree;
           options = _yield$fetchData.options;
-          console.log(cleanedTree);
-          console.log(options);
-          _context4.next = 11;
+          _context4.next = 9;
           return generateCode({
             solution: 'alita',
             // 出码方案
             options: options,
+            useEbeSetup: useEbeSetup,
             schema: cleanedTree,
             // 编排搭建出来的 schema
             onProgress: function onProgress(log) {
@@ -663,30 +673,31 @@ export var codeCreate = /*#__PURE__*/function () {
             },
             workerJsUrl: workerJsUrl
           });
-        case 11:
+        case 9:
           result = _context4.sent;
-          console.log(result);
-          // 出码结果(默认是递归结构描述的，可以传 flattenResult: true 以生成扁平结构的结果)
-          publishers.zip().publish({
+          _context4.next = 12;
+          return publishers.zip().publish({
             project: result,
             // 上一步生成的 project
-            projectSlug: appId // 项目标识
+            projectSlug: appId,
+            // 项目标识
+            autoDownloadOnBower: autoDownloadOnBower
           });
-          return _context4.abrupt("return", {
-            success: true
-          });
-        case 17:
-          _context4.prev = 17;
+        case 12:
+          zipRes = _context4.sent;
+          return _context4.abrupt("return", zipRes);
+        case 16:
+          _context4.prev = 16;
           _context4.t0 = _context4["catch"](1);
           return _context4.abrupt("return", {
             msg: _context4.t0,
             success: false
           });
-        case 20:
+        case 19:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[1, 17]]);
+    }, _callee4, null, [[1, 16]]);
   }));
   return function codeCreate(_x5) {
     return _ref8.apply(this, arguments);

package/es/node/babel/getAllImportFiles.d.ts

@@ -1 +1 @@
-export declare const getAllImportFiles: (target: string, allImportFiles?: any) => any;
+export declare const getAllImportFiles: (cwd: string, target: string, allImportFiles?: any) => any;

package/es/node/babel/getAllImportFiles.js

@@ -3,8 +3,8 @@ import { existsSync, readFileSync } from 'fs';
 import { dirname, resolve } from 'path';
 import { getRealPath, isJsFile, isLessFile } from "./getRealPath";
 import { parse } from "./parse";
-export var getAllImportFiles = function getAllImportFiles(target) {
-  var allImportFiles = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+export var getAllImportFiles = function getAllImportFiles(cwd, target) {
+  var allImportFiles = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (!existsSync(target)) {
     return allImportFiles;
   }
@@ -22,12 +22,12 @@ export var getAllImportFiles = function getAllImportFiles(target) {
       // @/ 是别名到 ${cwd}/src
       var nextPath = resolve(dirname(target), importName);
       if (isAlias) {
-        nextPath = importName.replace('@/', "".concat(process.cwd(), "/src/"));
+        nextPath = importName.replace('@/', "".concat(cwd, "/src/"));
       }
       var nextTarget = getRealPath(nextPath);
       if (!allImportFiles[nextTarget]) {
         allImportFiles[nextTarget] = true;
-        getAllImportFiles(nextTarget, allImportFiles);
+        getAllImportFiles(cwd, nextTarget, allImportFiles);
       }
     }
   };

package/es/node/move.d.ts

@@ -1,5 +1,6 @@
 export interface MoveConfig {
     target: string;
     outDir: string;
+    cwd?: string;
 }
 export declare function move(moveConfig: MoveConfig): Promise<any>;

package/es/node/move.js

@@ -2,10 +2,10 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-import { existsSync, mkdirpSync, readFileSync, writeFileSync } from 'fs-extra';
+import { existsSync, mkdirpSync, readFileSync, readJSONSync, writeFileSync, writeJSONSync } from 'fs-extra';
 import { dirname, isAbsolute, join, relative } from 'path';
 import { getAllImportFiles } from "./babel/getAllImportFiles";
-var copyFileSyncAlias = function copyFileSyncAlias(from, to) {
+var copyFileSyncAlias = function copyFileSyncAlias(cwd, from, to) {
   var _context$match;
   // copyFileSync(file, absTarget);
   var context = readFileSync(from, 'utf-8');
@@ -13,7 +13,7 @@ var copyFileSyncAlias = function copyFileSyncAlias(from, to) {
     return match.slice(8, -1);
   })) || [];
   importList.forEach(function (source) {
-    var absolute = join(process.cwd(), 'src', source);
+    var absolute = join(cwd, 'src', source);
     var filePath = relative(dirname(from), absolute);
     context = context.replace("@/".concat(source), filePath);
   });
@@ -24,20 +24,19 @@ export function move(_x) {
 }
 function _move() {
   _move = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(moveConfig) {
-    var target, outDir, cwd, resolvedTarget, allImportFiles, keys, count;
+    var target, outDir, _moveConfig$cwd, cwd, resolvedTarget, allImportFiles, keys, count, pkg, context;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          target = moveConfig.target, outDir = moveConfig.outDir;
-          cwd = process.cwd();
+          target = moveConfig.target, outDir = moveConfig.outDir, _moveConfig$cwd = moveConfig.cwd, cwd = _moveConfig$cwd === void 0 ? process.cwd() : _moveConfig$cwd;
           resolvedTarget = isAbsolute(target) ? target : join(cwd, target);
           if (existsSync(resolvedTarget)) {
-            _context.next = 5;
+            _context.next = 4;
             break;
           }
-          throw new Error("\u6307\u5B9A\u7684\u6587\u4EF6\u4E0D\u5B58\u5728: ".concat(resolvedTarget));
-        case 5:
-          allImportFiles = getAllImportFiles(resolvedTarget); // 拷贝入口文件
+          throw new Error("\u6307\u5B9A\u7684\u5165\u53E3\u6587\u4EF6\u4E0D\u5B58\u5728: ".concat(resolvedTarget));
+        case 4:
+          allImportFiles = getAllImportFiles(cwd, resolvedTarget); // 拷贝入口文件
           allImportFiles[resolvedTarget] = true;
           keys = Object.keys(allImportFiles);
           count = keys.length;
@@ -48,13 +47,22 @@ function _move() {
               return;
             }
             var filePath = relative(cwd, file);
-            var absTarget = join(cwd, outDir, filePath);
+            var absTarget = isAbsolute(outDir) ? join(outDir, filePath) : join(cwd, outDir, filePath);
             // console.log(`[COPY] 拷贝 ${absTarget}`);
             mkdirpSync(dirname(absTarget));
-            copyFileSyncAlias(file, absTarget);
+            copyFileSyncAlias(cwd, file, absTarget);
           });
           console.log("[COPY] \u5171\u62F7\u8D1D\u6587\u4EF6\u6570 ".concat(count));
-        case 11:
+          pkg = join(cwd, 'package.json');
+          if (existsSync(pkg)) {
+            // package 存在，则写一个记录
+            context = readJSONSync(pkg, 'utf-8');
+            writeJSONSync(join(outDir, 'package.json'), {
+              name: context.name,
+              version: context.version
+            }, 'utf-8');
+          }
+        case 12:
         case "end":
           return _context.stop();
       }

package/lib/h5public/src/components/factory/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@lingxiteam/factory",
+  "version": "3.7.1"
+}

package/lib/h5public/src/components/factory/src/BlockSelect/index.tsx

@@ -9,6 +9,7 @@ import React, {
   useState,
 } from 'react';
 import MySwipe, { SwipeActionProps } from '../DynamicList/MySwipe';
+import Icon from '../Icon';
 import { useDeepCompareEffect } from '../utils/ahooks';
 import useStyle from '../View/useStyle';
 import ActionView from './components/ActionView';
@@ -518,10 +519,17 @@ const BlockSelect = LingxiForwardRef<any, MyBlockSelectProps>((props, ref) => {
           isEdit={false}
           swipeAction={swipeAction}
           getEngineApis={getEngineApis}
-          $$componentItem={$$componentItem}
           rowData={item}
           index={i}
           swipActionClick={swipActionClick}
+          renderIcon={(p) => (
+            <Icon
+              {...p}
+              $$componentItem={$$componentItem}
+              getEngineApis={getEngineApis}
+              className=""
+            />
+          )}
         >
           <MemoLoopItem {...renderProps} />
         </MySwipe>

package/lib/h5public/src/components/factory/src/DynamicDataContainer/index.tsx

@@ -1,5 +1,9 @@
 import Form, { type FormInstance } from '@lingxiteam/dform';
-import { DynamicDataType, LingxiForwardRef } from '@lingxiteam/types';
+import {
+  DynamicDataFieldItem,
+  DynamicDataType,
+  LingxiForwardRef,
+} from '@lingxiteam/types';
 import { SpinLoading } from 'antd-mobile-5';
 import {
   CSSProperties,
@@ -36,6 +40,7 @@ export interface DynamicDataContainerProps {
   dynamicCode: string;
   visible?: boolean;
   scene?: 'edit' | 'readonly';
+  boxSpace?: string;
 }
 
 const DynamicDataContainer = LingxiForwardRef<any, DynamicDataContainerProps>(
@@ -49,6 +54,7 @@ const DynamicDataContainer = LingxiForwardRef<any, DynamicDataContainerProps>(
       name,
       onValuesChange,
       dynamicCode,
+      boxSpace,
     } = props || {};
     const engineApis = getEngineApis?.() || {};
     const [loading, setLoading] = useState<boolean>(false);
@@ -88,10 +94,23 @@ const DynamicDataContainer = LingxiForwardRef<any, DynamicDataContainerProps>(
           });
           if (res) {
             if (res && typeof dynamicData2DSL === 'function') {
-              const dataHelper = dynamicData2DSL(res as DynamicDataType[], {
-                uid: $$componentItem.uid,
-                name,
-              });
+              const dataHelper = dynamicData2DSL(
+                res as DynamicDataType[],
+                { uid: $$componentItem.uid, name },
+                (
+                  DSLCore,
+                  dynamicData: DynamicDataType | DynamicDataFieldItem,
+                ) => {
+                  if ('dataId' in dynamicData) {
+                    const node = DSLCore?.query?.(`Card_${dynamicData.dataId}`);
+                    if (node && boxSpace) {
+                      node?.setStyle?.({
+                        margin: `0 0 ${boxSpace} 0`,
+                      });
+                    }
+                  }
+                },
+              );
               setPageData(dataHelper.pageDSL);
               dynamicHelperRef.current = dataHelper;
             }

package/lib/h5public/src/components/factory/src/DynamicList/MySwipe/index.tsx

@@ -67,7 +67,7 @@ const CustomButton: React.FC<MySwipeProps> = (props) => {
           ...icon,
           svgContent,
           name: value,
-        });
+        }) ?? <></>;
       }
       if (!isEdit) {
         viewDisabled = false;

package/lib/h5public/src/hooks/usePageForm.ts

@@ -1,16 +1,54 @@
+import { Context } from '@/utils/Context/context';
+import {
+  formCodeSubmit,
+  getComponentsByCompId,
+  getFieldsValueByCode,
+  getFormsByBoframerId,
+  getFormValueByBOFramerId,
+  getFormValueByFormId,
+  validateFields,
+} from '@/utils/formUtils';
+import { useContext } from 'react';
+
 const usePageForm = (refs: Record<string, any>) => {
+  const { refs: renderRefs } = useContext(Context);
+
+  /**
+   * 重置表单值
+   * @param compId
+   */
+  const resetForm = (compId: string) => {
+    if (!refs[compId]) return;
+    const compName = refs[compId].compName;
+    if (compName === 'BOFramer') {
+      const forms = getFormsByBoframerId({
+        refs,
+        renderRefs,
+        compId,
+      });
+
+      forms.forEach((form) => {
+        form?.resetFields?.();
+      });
+    } else {
+      const forms = getComponentsByCompId({ compId, refs });
+      // 支持循环容器中的表单重置
+      (Array.isArray(forms) ? forms : [forms]).forEach((form) =>
+        form?.resetFields(),
+      );
+    }
+  };
+
   /**
    * 获取当前表单值
    */
   const getFormValue = async (compId: string): Promise<any> => {
+    if (!refs[compId]) return Promise.reject(new Error(`表单${compId}不存在`));
     return new Promise((resolve, reject) => {
-      // 为了兼容动态渲染引擎，表单不存在 就返回空对象
-      if (!refs[compId]) return resolve({});
-
       // 表单的情况 可能是循环容器
       if (refs[compId].compName === 'DForm') {
         if (refs[compId]?.getFieldsValue) {
-          refs[compId].getFieldsValue(resolve, reject);
+          return refs[compId].getFieldsValue(resolve, reject);
         }
       }
 
@@ -18,8 +56,74 @@ const usePageForm = (refs: Record<string, any>) => {
     });
   };
 
+  /**
+   * 验证并取值
+   * @param compId
+   */
+  const validateForm = async (compId: string): Promise<any> => {
+    if (!refs[compId]) return Promise.reject(new Error(`表单不存在`));
+    const { compName } = refs[compId];
+    if (!['BOFramer', 'DForm'].includes(compName))
+      return Promise.reject(new Error(`表单校验并取值不支持 ${compName} 组件`));
+
+    if (compName === 'DForm') {
+      return getFormValueByFormId({ refs, compId });
+    }
+
+    // 业务组件
+    return getFormValueByBOFramerId({ refs, renderRefs, compId });
+  };
+
+  /**
+   * 设置表单值
+   * @param compId 组件id
+   * @param formValues 表单值
+   */
+  const setFormValues = (
+    compId: string,
+    formValues: Record<string, any> = {},
+  ) => {
+    if (!refs[compId]) return;
+    const compName = refs[compId].compName;
+
+    if (compName === 'BOFramer') {
+      const forms = getFormsByBoframerId({
+        refs,
+        renderRefs,
+        compId,
+      });
+
+      forms.forEach((form) => {
+        form?.setFieldsValue(formValues);
+      });
+    } else {
+      refs[compId]?.setFieldsValue?.(formValues);
+    }
+  };
+
+  /**
+   * 校验并获取所有表单值
+   * 获取页面下的所有表单，包含当前页面下的表单、页面容器下的表单、业务组件下的表单。
+   * 不包含所有弹窗类组件的表单数据
+   */
+  const validateAllForm = () =>
+    validateFields({ refs, renderRefs }, formCodeSubmit);
+
+  /**
+   * 获取所有表单值 但不校验
+   * 获取页面下的所有表单，包含当前页面下的表单、页面容器下的表单、业务组件下的表单。
+   * 不包含所有弹窗类组件的表单数据
+   */
+  const getAllFormValues = () =>
+    validateFields({ refs, renderRefs }, getFieldsValueByCode);
+
   return {
     getFormValue,
+    validateForm,
+    validateAllForm,
+    getAllFormValues,
+    resetForm,
+    setFormValues,
   };
 };