@lingxiteam/ebe-utils 0.0.16 → 0.0.17

package/es/index.d.ts

@@ -76,6 +76,7 @@ export declare const fetchData: ({ appId, services, platform, baseUrl, onProgres
         appInfo: Record<string, any>;
         pagePathEnglishMapping: any;
         incrementalConstruction: IncrementalConstruction | undefined;
+        pageTypeMap: any;
     };
     cleanedTree: any;
 }>;

package/es/index.js

@@ -253,14 +253,14 @@ var getIsIncrementalConstruction = function getIsIncrementalConstruction(ic) {
 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, isIncrementalConstruction, attrSpecPage, appPageList, globalDataInfo, busiData, themeCss, frontendHookList, globalDataMap, appInfo, temCompAssetList, compAssetList, _globalDataInfo, dataSourceList, pageIdMapping, lastPageId, data, pages, _yield$services$qryBu, itemLists, _incrementalConstruct, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, _key, _pages$_key$pageConta, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageDSLS, getPlatform, options, cleanedTree;
+    var appId, services, platform, baseUrl, onProgress, needTranslatePagePathToEnglish, incrementalConstruction, isIncrementalConstruction, attrSpecPage, incrementalConstructionPageList, globalDataInfo, busiData, themeCss, frontendHookList, pageTypeMap, globalDataMap, appInfo, appPageList, temCompAssetList, compAssetList, _globalDataInfo, dataSourceList, pageIdMapping, lastPageId, data, needFindDataPages, pages, _yield$services$qryBu, itemLists, _incrementalConstruct, busiPages, getTranslateName, chinese, translateNames, key, _translateNames, pagePathEnglishMapping, pagePathEnglishSet, getName, pagesChinese, pagesTranslateNames, findPageKeyByPageId, _key2, _appPageList$_key2$pa, _pagePathEnglishMappi, _pagesTranslateNames, safeTranslateName, pageKey, pageDSLS, getPlatform, options, cleanedTree;
     return _regeneratorRuntime().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
           appId = _ref4.appId, services = _ref4.services, platform = _ref4.platform, baseUrl = _ref4.baseUrl, onProgress = _ref4.onProgress, needTranslatePagePathToEnglish = _ref4.needTranslatePagePathToEnglish, incrementalConstruction = _ref4.incrementalConstruction;
           isIncrementalConstruction = getIsIncrementalConstruction(incrementalConstruction);
           attrSpecPage = {};
-          appPageList = (_ref6 = (incrementalConstruction === null || incrementalConstruction === void 0 ? void 0 : incrementalConstruction.pageIds) || []) === null || _ref6 === void 0 ? void 0 : _ref6.map(function (i) {
+          incrementalConstructionPageList = (_ref6 = (incrementalConstruction === null || incrementalConstruction === void 0 ? void 0 : incrementalConstruction.pageIds) || []) === null || _ref6 === void 0 ? void 0 : _ref6.map(function (i) {
             return {
               pageId: i
             };
@@ -269,54 +269,64 @@ export var fetchData = /*#__PURE__*/function () {
           busiData = [];
           themeCss = '';
           frontendHookList = [];
+          pageTypeMap = {};
           globalDataMap = {};
-          _context3.next = 11;
+          _context3.next = 12;
           return services.findApplication({
             appId: appId
           });
-        case 11:
+        case 12:
           appInfo = _context3.sent;
           onProgress({
             log: '获取应用信息',
             progress: 1
           });
           if (!(!isIncrementalConstruction || incrementalConstruction !== null && incrementalConstruction !== void 0 && incrementalConstruction.frontendHookChange)) {
-            _context3.next = 17;
+            _context3.next = 18;
             break;
           }
-          _context3.next = 16;
+          _context3.next = 17;
           return services.queryFrontendHookList({
             appId: appId
           });
-        case 16:
-          frontendHookList = _context3.sent;
         case 17:
-          if (isIncrementalConstruction) {
-            _context3.next = 35;
-            break;
-          }
-          _context3.next = 20;
-          return services.qryAttrSpecPage({
-            appId: appId,
-            pageNum: 1,
-            pageSize: 999999
-          });
-        case 20:
-          attrSpecPage = _context3.sent;
+          frontendHookList = _context3.sent;
+        case 18:
           onProgress({
             log: '获取当前应用的全部页面',
             progress: 2
           });
           // 根据 appId 获取当前应用的全部页面
-          _context3.next = 24;
+          _context3.next = 21;
           return services.qryPageInstListByAppId({
             appId: appId,
             terminalType: platform
           });
-        case 24:
+        case 21:
           appPageList = _context3.sent;
-          _context3.prev = 25;
-          _context3.next = 28;
+          appPageList.forEach(function (o) {
+            if (o.pageContainerType === 'Drawer') {
+              var _o$pageContainerType, _pageTypeMap$_o$pageC;
+              (_pageTypeMap$_o$pageC = pageTypeMap[_o$pageContainerType = o.pageContainerType]) !== null && _pageTypeMap$_o$pageC !== void 0 ? _pageTypeMap$_o$pageC : pageTypeMap[_o$pageContainerType] = {};
+              pageTypeMap[o.pageContainerType][o.pageId] = true;
+            }
+            // pageTypeMap[o.pageContainerType] ??= {};
+            // pageTypeMap[o.pageContainerType][o.pageId] = true;
+          });
+          if (isIncrementalConstruction) {
+            _context3.next = 37;
+            break;
+          }
+          _context3.next = 26;
+          return services.qryAttrSpecPage({
+            appId: appId,
+            pageNum: 1,
+            pageSize: 999999
+          });
+        case 26:
+          attrSpecPage = _context3.sent;
+          _context3.prev = 27;
+          _context3.next = 30;
           return Promise.race([new Promise(function (resolve, reject) {
             services.getThemeCss({
               appId: appId,
@@ -329,26 +339,26 @@ export var fetchData = /*#__PURE__*/function () {
               resolve('');
             }, 5000);
           })]);
-        case 28:
+        case 30:
           themeCss = _context3.sent;
           console.log('====获取主题成功');
-          _context3.next = 35;
+          _context3.next = 37;
           break;
-        case 32:
-          _context3.prev = 32;
-          _context3.t0 = _context3["catch"](25);
+        case 34:
+          _context3.prev = 34;
+          _context3.t0 = _context3["catch"](27);
           console.error('====获取主题失败', _context3.t0);
-        case 35:
+        case 37:
           // 根据 appId 获取当前应用的使用的自定义组件
           onProgress({
             log: '获取当前应用的使用的自定义组件',
             progress: 3
           });
-          _context3.next = 38;
+          _context3.next = 40;
           return services.qryPageCompAssetList({
             appId: appId
           });
-        case 38:
+        case 40:
           temCompAssetList = _context3.sent;
           // 兼容下割接数据，数组前面的自定义组件是新的
           compAssetList = temCompAssetList.reduce(function (acc, current) {
@@ -361,7 +371,7 @@ export var fetchData = /*#__PURE__*/function () {
             return acc;
           }, []);
           if (!(!isIncrementalConstruction || incrementalConstruction !== null && incrementalConstruction !== void 0 && incrementalConstruction.globalStoreChange)) {
-            _context3.next = 47;
+            _context3.next = 49;
             break;
           }
           // 根据appId 获取全局数据源
@@ -369,12 +379,12 @@ export var fetchData = /*#__PURE__*/function () {
             log: '获取全局数据源',
             progress: 4
           });
-          _context3.next = 44;
+          _context3.next = 46;
           return services.queryFrontendDatasourcePage({
             appId: appId,
             pageSize: 10000
           });
-        case 44:
+        case 46:
           globalDataInfo = _context3.sent;
           dataSourceList = ((_globalDataInfo = globalDataInfo) === null || _globalDataInfo === void 0 ? void 0 : _globalDataInfo.list) || [];
           dataSourceList.forEach(function (item) {
@@ -387,7 +397,7 @@ export var fetchData = /*#__PURE__*/function () {
             } catch (err) {}
             return null;
           });
-        case 47:
+        case 49:
           pageIdMapping = {};
           lastPageId = ''; // 根据 pageId 获得 dsl
           data = [];
@@ -395,8 +405,9 @@ export var fetchData = /*#__PURE__*/function () {
             log: '获取所有页面dsl',
             progress: 5
           });
-          _context3.next = 53;
-          return Promise.all(appPageList.map(function (i) {
+          needFindDataPages = isIncrementalConstruction ? incrementalConstructionPageList : appPageList;
+          _context3.next = 56;
+          return Promise.all(needFindDataPages.map(function (i) {
             lastPageId = i.pageId;
             pageIdMapping[i.pagePath] = i.pageId;
             return services.findPageInstByVersionId({
@@ -404,11 +415,11 @@ export var fetchData = /*#__PURE__*/function () {
               pageId: i.pageId
             });
           }));
-        case 53:
+        case 56:
           data = _context3.sent;
           pages = getPageDsls(data);
           if (isIncrementalConstruction) {
-            _context3.next = 66;
+            _context3.next = 69;
             break;
           }
           onProgress({
@@ -417,7 +428,7 @@ export var fetchData = /*#__PURE__*/function () {
           });
 
           // 业务组件从被使用才生成改为全部生成
-          _context3.next = 59;
+          _context3.next = 62;
           return services.qryBusiCompPage({
             appIds: [appId],
             appId: appId,
@@ -426,10 +437,10 @@ export var fetchData = /*#__PURE__*/function () {
             pageSize: 999999,
             terminalType: platform
           });
-        case 59:
+        case 62:
           _yield$services$qryBu = _context3.sent;
           itemLists = _yield$services$qryBu.list;
-          _context3.next = 63;
+          _context3.next = 66;
           return Promise.all(itemLists.map(function (i) {
             return services.findBusiCompById({
               busiCompId: i.busiCompId,
@@ -437,12 +448,12 @@ export var fetchData = /*#__PURE__*/function () {
               pageId: lastPageId
             });
           }));
-        case 63:
+        case 66:
           busiData = _context3.sent;
-          _context3.next = 69;
+          _context3.next = 72;
           break;
-        case 66:
-          _context3.next = 68;
+        case 69:
+          _context3.next = 71;
           return Promise.all(((_incrementalConstruct = incrementalConstruction === null || incrementalConstruction === void 0 ? void 0 : incrementalConstruction.busiCompIds) !== null && _incrementalConstruct !== void 0 ? _incrementalConstruct : []).map(function (i) {
             return services.findBusiCompById({
               busiCompId: i,
@@ -450,9 +461,9 @@ export var fetchData = /*#__PURE__*/function () {
               pageId: lastPageId
             });
           }));
-        case 68:
+        case 71:
           busiData = _context3.sent;
-        case 69:
+        case 72:
           // 过滤为空
           busiPages = busiData.filter(Boolean).map(function (i, index) {
             var _i$busiCompVersion;
@@ -525,14 +536,14 @@ export var fetchData = /*#__PURE__*/function () {
           });
           translateNames = {};
           if (!(chinese.length > 0)) {
-            _context3.next = 77;
+            _context3.next = 80;
             break;
           }
-          _context3.next = 76;
+          _context3.next = 79;
           return getTranslateName(appId, chinese, 'UPPER_CAMEL');
-        case 76:
+        case 79:
           translateNames = _context3.sent;
-        case 77:
+        case 80:
           // 翻译业务组件的名字
           for (key = 0; key < busiPages.length; key++) {
             onProgress({
@@ -544,7 +555,7 @@ export var fetchData = /*#__PURE__*/function () {
           }
           pagePathEnglishMapping = {};
           if (!needTranslatePagePathToEnglish) {
-            _context3.next = 89;
+            _context3.next = 93;
             break;
           }
           pagePathEnglishSet = {};
@@ -561,36 +572,45 @@ export var fetchData = /*#__PURE__*/function () {
             }
             return getName("".concat(compName), type, index + 1);
           };
-          pagesChinese = pages === null || pages === void 0 ? void 0 : pages.map(function (item) {
+          pagesChinese = appPageList === null || appPageList === void 0 ? void 0 : appPageList.map(function (item) {
             return getSafeTypeName(item.pageName);
           });
           pagesTranslateNames = {};
           if (!(pagesChinese.length > 0)) {
-            _context3.next = 88;
+            _context3.next = 91;
             break;
           }
-          _context3.next = 87;
+          _context3.next = 90;
           return getTranslateName(appId, pagesChinese, 'UPPER_CAMEL');
-        case 87:
+        case 90:
           pagesTranslateNames = _context3.sent;
-        case 88:
-          // 翻译页面的名字
-          for (_key = 0; _key < pages.length; _key++) {
+        case 91:
+          findPageKeyByPageId = function findPageKeyByPageId(id, arrs) {
+            for (var _key = 0; _key < arrs.length; _key++) {
+              var _arrs$_key;
+              if (((_arrs$_key = arrs[_key]) === null || _arrs$_key === void 0 ? void 0 : _arrs$_key.pageId) == id) {
+                return _key;
+              }
+            }
+            return 0;
+          }; // 翻译页面的名字
+          for (_key2 = 0; _key2 < appPageList.length; _key2++) {
             onProgress({
               log: '翻译页面路径',
-              progress: 7 + _key / pages.length
+              progress: 7 + _key2 / appPageList.length
             });
             // 如果页面路径翻译失败，就不处理路径
             // index 保留不处理
-            if (pages[_key].pagePath !== '/index') {
-              (_pagePathEnglishMappi = pagePathEnglishMapping[_pages$_key$pageConta = pages[_key].pageContainerType]) !== null && _pagePathEnglishMappi !== void 0 ? _pagePathEnglishMappi : pagePathEnglishMapping[_pages$_key$pageConta] = {};
-              safeTranslateName = getName(((_pagesTranslateNames = pagesTranslateNames) === null || _pagesTranslateNames === void 0 ? void 0 : _pagesTranslateNames[getSafeTypeName(pages[_key].pageName)]) || pages[_key].pageName, pages[_key].pageContainerType);
-              pagePathEnglishMapping[pages[_key].pageContainerType][pages[_key].pagePath] = safeTranslateName;
-              pages[_key]._pagePath = pages[_key].pagePath;
-              pages[_key].pagePath = safeTranslateName;
+            if (appPageList[_key2].pagePath !== '/index') {
+              (_pagePathEnglishMappi = pagePathEnglishMapping[_appPageList$_key2$pa = appPageList[_key2].pageContainerType]) !== null && _pagePathEnglishMappi !== void 0 ? _pagePathEnglishMappi : pagePathEnglishMapping[_appPageList$_key2$pa] = {};
+              safeTranslateName = getName(((_pagesTranslateNames = pagesTranslateNames) === null || _pagesTranslateNames === void 0 ? void 0 : _pagesTranslateNames[getSafeTypeName(appPageList[_key2].pageName)]) || appPageList[_key2].pageName, appPageList[_key2].pageContainerType);
+              pagePathEnglishMapping[appPageList[_key2].pageContainerType][appPageList[_key2].pagePath] = safeTranslateName;
+              pageKey = findPageKeyByPageId(appPageList[_key2].pageId, pages);
+              pages[pageKey]._pagePath = pages[pageKey].pagePath;
+              pages[pageKey].pagePath = safeTranslateName;
             }
           }
-        case 89:
+        case 93:
           // 合并页面，生成器那边支持页面类型和业务组件类型
           pageDSLS = [].concat(_toConsumableArray(pages), _toConsumableArray(busiPages));
           getPlatform = function getPlatform(platFormtype) {
@@ -620,7 +640,8 @@ export var fetchData = /*#__PURE__*/function () {
             appInfo: clearAppInfo(appInfo),
             // 英文路径的对应关系
             pagePathEnglishMapping: pagePathEnglishMapping,
-            incrementalConstruction: incrementalConstruction
+            incrementalConstruction: incrementalConstruction,
+            pageTypeMap: pageTypeMap
           };
           onProgress({
             log: '清理无用数据',
@@ -632,11 +653,11 @@ export var fetchData = /*#__PURE__*/function () {
             options: options,
             cleanedTree: cleanedTree
           });
-        case 96:
+        case 100:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[25, 32]]);
+    }, _callee3, null, [[27, 34]]);
   }));
   return function fetchData(_x) {
     return _ref5.apply(this, arguments);

package/lib/public/src/utils/Security/types.ts

@@ -177,5 +177,3 @@ namespace securityType {
     desKey: string;
   };
 }
-
-export default securityType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.0.16",
+  "version": "0.0.17",
   "description": "",
   "keywords": [],
   "author": "",
@@ -17,7 +17,7 @@
     "@babel/parser": "^7.12.12",
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
-    "@lingxiteam/ebe": "0.0.16",
+    "@lingxiteam/ebe": "0.0.17",
     "cac": "^6.7.14",
     "fs-extra": "9.x"
   },