@lingxiteam/ebe-utils 0.0.33 → 0.0.35

package/es/index.d.ts

@@ -7,7 +7,7 @@ export declare const removeObjectByRules: (data: any, rules: IRulesType, paths?:
 export declare const treeForEach: (tree: any, callback: (item: any, root: boolean) => void, options?: {
     children: string;
 }) => void;
-export declare const getPageDsls: (resultObjects: any[]) => any[];
+export declare const getPageDsls: (resultObjects: any[], hasPageRulesPages: 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;
@@ -39,6 +39,8 @@ interface CodeServices {
     }) => Promise<any>;
     queryAppFileResourcePage: (data: any) => Promise<any>;
     downloadFileByFileCode: (data: any) => Promise<any>;
+    selectToolBoxPage: (data: any) => Promise<any>;
+    batchQryPageRulesByPageIds: (data: any) => Promise<any>;
 }
 export declare const getSafeTypeName: (name: any) => any;
 interface CodeOptions {
@@ -85,6 +87,8 @@ export declare const fetchData: ({ appId, services, platform, baseUrl, onProgres
         pageTypeMap: any;
         appFileResource: any;
         hasExtendsApp: boolean | undefined;
+        toolBox: any;
+        pageRules: unknown;
     };
     cleanedTree: any;
 }>;

package/es/index.js

@@ -145,11 +145,14 @@ export var treeForEach = function treeForEach(tree, callback) {
   var list = tree[options.children];
   loop(list);
 };
-export var getPageDsls = function getPageDsls(resultObjects) {
+export var getPageDsls = function getPageDsls(resultObjects, hasPageRulesPages) {
   return resultObjects.filter(Boolean).map(function (i) {
     try {
       var pageData = JSON.parse(i.attrMappingJson);
       pageData.pageId = i === null || i === void 0 ? void 0 : i.pageId;
+      if (checkHasPageRules(pageData)) {
+        hasPageRulesPages.push(i === null || i === void 0 ? void 0 : i.pageId);
+      }
       return pageData;
     } catch (error) {
       console.error(error, '该页面信息出错', i);
@@ -248,10 +251,20 @@ export var init = /*#__PURE__*/function () {
 var getIsIncrementalConstruction = function getIsIncrementalConstruction(ic) {
   return !!ic && ((ic === null || ic === void 0 ? void 0 : ic.busiCompIds) && ic.busiCompIds.length > 0 || (ic === null || ic === void 0 ? void 0 : ic.pageIds) && ic.pageIds.length > 0 || (ic === null || ic === void 0 ? void 0 : ic.frontendHookChange) || (ic === null || ic === void 0 ? void 0 : ic.globalStoreChange));
 };
+var checkHasPageRules = function checkHasPageRules(pageDsl) {
+  if (!(pageDsl !== null && pageDsl !== void 0 && pageDsl.dataSource)) return false;
+  for (var key = 0; key <= pageDsl.dataSource.length; key++) {
+    var _pageDsl$dataSource$k;
+    if (((_pageDsl$dataSource$k = pageDsl.dataSource[key]) === null || _pageDsl$dataSource$k === void 0 ? void 0 : _pageDsl$dataSource$k.source) === 'object') {
+      return true;
+    }
+  }
+  return false;
+};
 export var fetchData = /*#__PURE__*/function () {
   var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref4) {
     var _ref6, _attrSpecPage;
-    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, incrementalConstruction, hasAppFileResource, hasExtendsApp, isIncrementalConstruction, attrSpecPage, incrementalConstructionPageList, globalDataInfo, busiData, themeCss, frontendHookList, pageTypeMap, globalDataMap, appInfo, appPageList, temCompAssetList, compAssetList, _globalDataInfo, dataSourceList, pageIdMapping, lastPageId, data, needFindDataPages, requestQueue, requests, pages, _yield$services$qryBu, itemLists, BusiCompRequest, _incrementalConstruct, itemHash, _itemLists, alllBusiComp, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, translateName, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, findPageKeyByPageId, _key2, _appPageList$_key2$pa, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageKey, pageDSLS, getPlatform, appFileResource, _services$queryAppFil, _yield$services$query, list, appFileResourceList, options, cleanedTree;
+    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, incrementalConstruction, hasAppFileResource, hasExtendsApp, isIncrementalConstruction, attrSpecPage, incrementalConstructionPageList, globalDataInfo, busiData, themeCss, frontendHookList, pageTypeMap, hasPageRulesPages, globalDataMap, appInfo, appPageList, temCompAssetList, compAssetList, _globalDataInfo, dataSourceList, pageIdMapping, lastPageId, data, needFindDataPages, requestQueue, requests, pages, _yield$services$qryBu, itemLists, BusiCompRequest, _incrementalConstruct, itemHash, _itemLists, alllBusiComp, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, translateName, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, findPageKeyByPageId, _key2, _appPageList$_key2$pa, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageKey, pageDSLS, getPlatform, appFileResource, _services$queryAppFil, _yield$services$query, list, appFileResourceList, _yield$services$selec, toolBoxList, toolBox, pageRules, options, cleanedTree;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -267,40 +280,41 @@ export var fetchData = /*#__PURE__*/function () {
           busiData = [];
           themeCss = '';
           frontendHookList = [];
-          pageTypeMap = {};
+          pageTypeMap = {}; // 记录需要请求页面 rules 的页面
+          hasPageRulesPages = [];
           globalDataMap = {};
-          _context3.next = 12;
+          _context3.next = 13;
           return services.findApplication({
             appId: appId
           });
-        case 12:
+        case 13:
           appInfo = _context3.sent;
           onProgress({
             log: '获取应用信息',
             progress: 1
           });
           if (!(!isIncrementalConstruction || incrementalConstruction !== null && incrementalConstruction !== void 0 && incrementalConstruction.frontendHookChange)) {
-            _context3.next = 18;
+            _context3.next = 19;
             break;
           }
-          _context3.next = 17;
+          _context3.next = 18;
           return services.queryFrontendHookList({
             appId: appId
           });
-        case 17:
-          frontendHookList = _context3.sent;
         case 18:
+          frontendHookList = _context3.sent;
+        case 19:
           onProgress({
             log: '获取当前应用的全部页面',
             progress: 2
           });
           // 根据 appId 获取当前应用的全部页面
-          _context3.next = 21;
+          _context3.next = 22;
           return services.qryPageInstListByAppId({
             appId: appId,
             terminalType: platform
           });
-        case 21:
+        case 22:
           appPageList = _context3.sent;
           appPageList.forEach(function (o) {
             if (o.pageContainerType === 'Drawer') {
@@ -312,24 +326,24 @@ export var fetchData = /*#__PURE__*/function () {
             // pageTypeMap[o.pageContainerType][o.pageId] = true;
           });
           if (isIncrementalConstruction) {
-            _context3.next = 27;
+            _context3.next = 28;
             break;
           }
-          _context3.next = 26;
+          _context3.next = 27;
           return services.qryAttrSpecPage({
             appId: appId,
             pageNum: 1,
             pageSize: 999999
           });
-        case 26:
-          attrSpecPage = _context3.sent;
         case 27:
+          attrSpecPage = _context3.sent;
+        case 28:
           if (!(!isIncrementalConstruction || incrementalConstruction !== null && incrementalConstruction !== void 0 && incrementalConstruction.themeCssChange)) {
-            _context3.next = 38;
+            _context3.next = 39;
             break;
           }
-          _context3.prev = 28;
-          _context3.next = 31;
+          _context3.prev = 29;
+          _context3.next = 32;
           return Promise.race([new Promise(function (resolve, reject) {
             services.getThemeCss({
               appId: appId,
@@ -342,26 +356,26 @@ export var fetchData = /*#__PURE__*/function () {
               resolve('');
             }, 5000);
           })]);
-        case 31:
+        case 32:
           themeCss = _context3.sent;
           console.log('====获取主题成功');
-          _context3.next = 38;
+          _context3.next = 39;
           break;
-        case 35:
-          _context3.prev = 35;
-          _context3.t0 = _context3["catch"](28);
+        case 36:
+          _context3.prev = 36;
+          _context3.t0 = _context3["catch"](29);
           console.error('====获取主题失败', _context3.t0);
-        case 38:
+        case 39:
           // 根据 appId 获取当前应用的使用的自定义组件
           onProgress({
             log: '获取当前应用的使用的自定义组件',
             progress: 3
           });
-          _context3.next = 41;
+          _context3.next = 42;
           return services.qryPageCompAssetList({
             appId: appId
           });
-        case 41:
+        case 42:
           temCompAssetList = _context3.sent;
           // 兼容下割接数据，数组前面的自定义组件是新的
           compAssetList = temCompAssetList.reduce(function (acc, current) {
@@ -374,7 +388,7 @@ export var fetchData = /*#__PURE__*/function () {
             return acc;
           }, []);
           if (!(!isIncrementalConstruction || incrementalConstruction !== null && incrementalConstruction !== void 0 && incrementalConstruction.globalStoreChange)) {
-            _context3.next = 50;
+            _context3.next = 51;
             break;
           }
           // 根据appId 获取全局数据源
@@ -382,12 +396,12 @@ export var fetchData = /*#__PURE__*/function () {
             log: '获取全局数据源',
             progress: 4
           });
-          _context3.next = 47;
+          _context3.next = 48;
           return services.queryFrontendDatasourcePage({
             appId: appId,
             pageSize: 10000
           });
-        case 47:
+        case 48:
           globalDataInfo = _context3.sent;
           dataSourceList = ((_globalDataInfo = globalDataInfo) === null || _globalDataInfo === void 0 ? void 0 : _globalDataInfo.list) || [];
           dataSourceList.forEach(function (item) {
@@ -400,7 +414,7 @@ export var fetchData = /*#__PURE__*/function () {
             } catch (err) {}
             return null;
           });
-        case 50:
+        case 51:
           pageIdMapping = {};
           lastPageId = ''; // 根据 pageId 获得 dsl
           data = [];
@@ -422,15 +436,15 @@ export var fetchData = /*#__PURE__*/function () {
               }).then(resolve).catch(reject);
             });
           });
-          _context3.next = 59;
+          _context3.next = 60;
           return Promise.all(requests);
-        case 59:
+        case 60:
           data = _context3.sent;
           // 先清空
           requests = null;
-          pages = getPageDsls(data);
+          pages = getPageDsls(data, hasPageRulesPages);
           if (isIncrementalConstruction) {
-            _context3.next = 75;
+            _context3.next = 76;
             break;
           }
           onProgress({
@@ -439,7 +453,7 @@ export var fetchData = /*#__PURE__*/function () {
           });
 
           // 业务组件从被使用才生成改为全部生成
-          _context3.next = 66;
+          _context3.next = 67;
           return services.qryBusiCompPage({
             appIds: [appId],
             appId: appId,
@@ -448,7 +462,7 @@ export var fetchData = /*#__PURE__*/function () {
             pageSize: 999999,
             terminalType: platform
           });
-        case 66:
+        case 67:
           _yield$services$qryBu = _context3.sent;
           itemLists = _yield$services$qryBu.list;
           BusiCompRequest = itemLists.map(function (i) {
@@ -462,15 +476,15 @@ export var fetchData = /*#__PURE__*/function () {
               }).then(resolve).catch(reject);
             });
           });
-          _context3.next = 71;
+          _context3.next = 72;
           return Promise.all(BusiCompRequest);
-        case 71:
+        case 72:
           busiData = _context3.sent;
           // 先清空
           BusiCompRequest = null;
-          _context3.next = 82;
+          _context3.next = 83;
           break;
-        case 75:
+        case 76:
           // busiCompId 过滤重复
           itemHash = {}; // 找到所有页面使用到的 业务组件
           findAllItem(pages, function (item) {
@@ -478,7 +492,7 @@ export var fetchData = /*#__PURE__*/function () {
           }, itemHash);
           _itemLists = Object.keys(itemHash); // 请求所有业务组件的 dsl
           alllBusiComp = ((_incrementalConstruct = incrementalConstruction === null || incrementalConstruction === void 0 ? void 0 : incrementalConstruction.busiCompIds) !== null && _incrementalConstruct !== void 0 ? _incrementalConstruct : []).concat(_itemLists);
-          _context3.next = 81;
+          _context3.next = 82;
           return Promise.all(alllBusiComp.map(function (i) {
             return services.findBusiCompById({
               busiCompId: i,
@@ -486,9 +500,9 @@ export var fetchData = /*#__PURE__*/function () {
               pageId: lastPageId
             });
           }));
-        case 81:
-          busiData = _context3.sent;
         case 82:
+          busiData = _context3.sent;
+        case 83:
           // 过滤为空
           busiPages = busiData.filter(Boolean).map(function (i, index) {
             var _i$busiCompVersion;
@@ -561,14 +575,14 @@ export var fetchData = /*#__PURE__*/function () {
           });
           translateNames = {};
           if (!(chinese.length > 0)) {
-            _context3.next = 90;
+            _context3.next = 91;
             break;
           }
-          _context3.next = 89;
+          _context3.next = 90;
           return getTranslateName(appId, chinese, 'UPPER_CAMEL');
-        case 89:
-          translateNames = _context3.sent;
         case 90:
+          translateNames = _context3.sent;
+        case 91:
           // 翻译业务组件的名字
           for (key = 0; key < busiPages.length; key++) {
             onProgress({
@@ -583,7 +597,7 @@ export var fetchData = /*#__PURE__*/function () {
           }
           pagePathEnglishMapping = {};
           if (!needTranslatePagePathToEnglish) {
-            _context3.next = 103;
+            _context3.next = 104;
             break;
           }
           pagePathEnglishSet = {};
@@ -605,14 +619,14 @@ export var fetchData = /*#__PURE__*/function () {
           });
           pagesTranslateNames = {};
           if (!(pagesChinese.length > 0)) {
-            _context3.next = 101;
+            _context3.next = 102;
             break;
           }
-          _context3.next = 100;
+          _context3.next = 101;
           return getTranslateName(appId, pagesChinese, 'UPPER_CAMEL');
-        case 100:
-          pagesTranslateNames = _context3.sent;
         case 101:
+          pagesTranslateNames = _context3.sent;
+        case 102:
           findPageKeyByPageId = function findPageKeyByPageId(id, arrs) {
             for (var _key = 0; _key < arrs.length; _key++) {
               var _arrs$_key;
@@ -638,7 +652,7 @@ export var fetchData = /*#__PURE__*/function () {
               pages[pageKey].pagePath = safeTranslateName;
             }
           }
-        case 103:
+        case 104:
           // 合并页面，生成器那边支持页面类型和业务组件类型
           pageDSLS = [].concat(_toConsumableArray(pages), _toConsumableArray(busiPages));
           getPlatform = function getPlatform(platFormtype) {
@@ -653,10 +667,10 @@ export var fetchData = /*#__PURE__*/function () {
           }; // { '31232133':{fileName:'xxx',data:base64 }}
           appFileResource = {}; // 如果开启下载静态资源
           if (!hasAppFileResource) {
-            _context3.next = 115;
+            _context3.next = 116;
             break;
           }
-          _context3.next = 109;
+          _context3.next = 110;
           return services === null || services === void 0 || (_services$queryAppFil = services.queryAppFileResourcePage) === null || _services$queryAppFil === void 0 ? void 0 : _services$queryAppFil.call(services, {
             appId: appId,
             orderType: 'DESC',
@@ -664,10 +678,10 @@ export var fetchData = /*#__PURE__*/function () {
             pageSize: 999999,
             sharedObjFilter: 'F'
           });
-        case 109:
+        case 110:
           _yield$services$query = _context3.sent;
           list = _yield$services$query.list;
-          _context3.next = 113;
+          _context3.next = 114;
           return Promise.all((list || []).map(function (item) {
             return new Promise(function (resolve, reject) {
               requestQueue.sendRequest(function () {
@@ -690,12 +704,41 @@ export var fetchData = /*#__PURE__*/function () {
               }).catch(reject);
             });
           }));
-        case 113:
+        case 114:
           appFileResourceList = _context3.sent;
           appFileResourceList.filter(Boolean).forEach(function (i) {
             appFileResource[i.fileCode] = i;
           });
-        case 115:
+        case 116:
+          _context3.next = 118;
+          return services.selectToolBoxPage({
+            appId: appId,
+            qryType: 'F',
+            toolScan: 'front_function'
+          });
+        case 118:
+          _yield$services$selec = _context3.sent;
+          toolBoxList = _yield$services$selec.list;
+          toolBox = (toolBoxList || []).map(function (i) {
+            var toolScriptJson = JSON.parse((i === null || i === void 0 ? void 0 : i.toolScriptJson) || '{}');
+            var toolScript = toolScriptJson === null || toolScriptJson === void 0 ? void 0 : toolScriptJson.script;
+            return "export ".concat(toolScript.replace(/function\s+(\w+)\s*\(/, "function ".concat(i === null || i === void 0 ? void 0 : i.toolCode, "(")));
+          }).join('\n'); //TODO: 新接口，有些环境还没部署，等都部署了，可以去掉这个兜底
+          _context3.next = 123;
+          return Promise.race([new Promise(function (resolve, reject) {
+            services.batchQryPageRulesByPageIds({
+              appId: appId,
+              pageIds: hasPageRulesPages.join(',')
+            }).then(function (res) {
+              resolve(res);
+            });
+          }), new Promise(function (resolve, reject) {
+            setTimeout(function () {
+              resolve({});
+            }, 5000);
+          })]);
+        case 123:
+          pageRules = _context3.sent;
           options = {
             platform: getPlatform(platform),
             appId: appId,
@@ -716,7 +759,9 @@ export var fetchData = /*#__PURE__*/function () {
             incrementalConstruction: incrementalConstruction,
             pageTypeMap: pageTypeMap,
             appFileResource: appFileResource,
-            hasExtendsApp: hasExtendsApp
+            hasExtendsApp: hasExtendsApp,
+            toolBox: toolBox,
+            pageRules: pageRules
           };
           onProgress({
             log: '清理无用数据',
@@ -728,11 +773,11 @@ export var fetchData = /*#__PURE__*/function () {
             options: options,
             cleanedTree: cleanedTree
           });
-        case 120:
+        case 129:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[28, 35]]);
+    }, _callee3, null, [[29, 36]]);
   }));
   return function fetchData(_x) {
     return _ref5.apply(this, arguments);

package/lib/h5public/src/components/factory/src/Icon/IconED/index.less

@@ -0,0 +1,43 @@
+.cust-icon-ed {
+  width: 16px;
+  height: 16px;
+  font-size: 16px;
+  svg {
+    width: 1em;
+    height: 1em;
+  }
+}
+.cust-icon-theme {
+  fill: var(--adm-color-primary);
+  color: var(--adm-color-primary);
+}
+
+.cust-icon-ed-xxs {
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
+}
+
+.cust-icon-ed-xs {
+  width: 16px;
+  height: 16px;
+  font-size: 16px;
+}
+
+.cust-icon-ed-sm {
+  width: 20px;
+  height: 20px;
+  font-size: 20px;
+}
+
+.cust-icon-ed-md {
+  width: 24px;
+  height: 24px;
+  font-size: 24px;
+}
+
+.cust-icon-ed-lg {
+  width: 36px;
+  height: 36px;
+  font-size: 36px;
+}