@lingxiteam/ebe-utils 0.2.9 → 0.2.10

package/es/index.js

@@ -227,7 +227,7 @@ export var clearLXPagesDSL = function clearLXPagesDSL(pages) {
   });
 };
 export var getSafeTypeName = function getSafeTypeName(name) {
-  return name.replaceAll(' ', '').replaceAll('/', '').replaceAll('-', '').replaceAll('(', '').replaceAll('，', '').replaceAll(',', '').replaceAll(')', '');
+  return name.replaceAll(' ', '').replaceAll('/', '').replaceAll('-', '').replaceAll('(', '').replaceAll('，', '').replaceAll("'", '').replaceAll(',', '').replaceAll(')', '');
 };
 var workerJsUrl = '';
 export var setWorkerJsUrl = function setWorkerJsUrl(url) {
@@ -268,8 +268,8 @@ var checkHasPageRules = function checkHasPageRules(pageDsl) {
 };
 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, 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;
+    var _ref6, _appInfo$initialAppId, _attrSpecPage;
+    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, _yield$services$query2, 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:
@@ -331,24 +331,31 @@ export var fetchData = /*#__PURE__*/function () {
             // pageTypeMap[o.pageContainerType][o.pageId] = true;
           });
           if (isIncrementalConstruction) {
-            _context3.next = 28;
+            _context3.next = 34;
             break;
           }
-          _context3.next = 27;
+          _context3.prev = 25;
+          _context3.next = 28;
           return services.qryAttrSpecPage({
             appId: appId,
             pageNum: 1,
             pageSize: 999999
           });
-        case 27:
-          attrSpecPage = _context3.sent;
         case 28:
+          attrSpecPage = _context3.sent;
+          _context3.next = 34;
+          break;
+        case 31:
+          _context3.prev = 31;
+          _context3.t0 = _context3["catch"](25);
+          attrSpecPage = {};
+        case 34:
           if (!(!isIncrementalConstruction || incrementalConstruction !== null && incrementalConstruction !== void 0 && incrementalConstruction.themeCssChange)) {
-            _context3.next = 39;
+            _context3.next = 45;
             break;
           }
-          _context3.prev = 29;
-          _context3.next = 32;
+          _context3.prev = 35;
+          _context3.next = 38;
           return Promise.race([new Promise(function (resolve, reject) {
             services.getThemeCss({
               appId: appId,
@@ -361,26 +368,26 @@ export var fetchData = /*#__PURE__*/function () {
               resolve('');
             }, 5000);
           })]);
-        case 32:
+        case 38:
           themeCss = _context3.sent;
           console.log('====获取主题成功');
-          _context3.next = 39;
+          _context3.next = 45;
           break;
-        case 36:
-          _context3.prev = 36;
-          _context3.t0 = _context3["catch"](29);
-          console.error('====获取主题失败', _context3.t0);
-        case 39:
+        case 42:
+          _context3.prev = 42;
+          _context3.t1 = _context3["catch"](35);
+          console.error('====获取主题失败', _context3.t1);
+        case 45:
           // 根据 appId 获取当前应用的使用的自定义组件
           onProgress({
             log: '获取当前应用的使用的自定义组件',
             progress: 3
           });
-          _context3.next = 42;
+          _context3.next = 48;
           return services.qryPageCompAssetList({
             appId: appId
           });
-        case 42:
+        case 48:
           temCompAssetList = _context3.sent;
           // 兼容下割接数据，数组前面的自定义组件是新的
           compAssetList = temCompAssetList.reduce(function (acc, current) {
@@ -393,7 +400,7 @@ export var fetchData = /*#__PURE__*/function () {
             return acc;
           }, []);
           if (!(!isIncrementalConstruction || incrementalConstruction !== null && incrementalConstruction !== void 0 && incrementalConstruction.globalStoreChange)) {
-            _context3.next = 51;
+            _context3.next = 57;
             break;
           }
           // 根据appId 获取全局数据源
@@ -401,12 +408,12 @@ export var fetchData = /*#__PURE__*/function () {
             log: '获取全局数据源',
             progress: 4
           });
-          _context3.next = 48;
+          _context3.next = 54;
           return services.queryFrontendDatasourcePage({
             appId: appId,
             pageSize: 10000
           });
-        case 48:
+        case 54:
           globalDataInfo = _context3.sent;
           dataSourceList = ((_globalDataInfo = globalDataInfo) === null || _globalDataInfo === void 0 ? void 0 : _globalDataInfo.list) || [];
           dataSourceList.forEach(function (item) {
@@ -421,7 +428,7 @@ export var fetchData = /*#__PURE__*/function () {
             }
             return null;
           });
-        case 51:
+        case 57:
           pageIdMapping = {};
           lastPageId = ''; // 根据 pageId 获得 dsl
           data = [];
@@ -444,21 +451,23 @@ export var fetchData = /*#__PURE__*/function () {
                   pageId: i.pageId
                 });
               }).then(function (data) {
-                // @ts-ignore
-                pageIdMapping[data.pagePath] = data.pageId;
+                if (data) {
+                  // @ts-ignore
+                  pageIdMapping[data.pagePath] = data.pageId;
+                }
                 resolve(data);
               }).catch(reject);
             });
           });
-          _context3.next = 60;
+          _context3.next = 66;
           return Promise.all(requests);
-        case 60:
+        case 66:
           data = _context3.sent;
           // 先清空
           requests = null;
           pages = getPageDsls(data, hasPageRulesPages);
           if (isIncrementalConstruction) {
-            _context3.next = 76;
+            _context3.next = 82;
             break;
           }
           onProgress({
@@ -467,7 +476,7 @@ export var fetchData = /*#__PURE__*/function () {
           });
 
           // 业务组件从被使用才生成改为全部生成
-          _context3.next = 67;
+          _context3.next = 73;
           return services.qryBusiCompPage({
             appIds: [appId],
             appId: appId,
@@ -476,7 +485,7 @@ export var fetchData = /*#__PURE__*/function () {
             pageSize: 999999,
             terminalType: platform
           });
-        case 67:
+        case 73:
           _yield$services$qryBu = _context3.sent;
           itemLists = _yield$services$qryBu.list;
           BusiCompRequest = itemLists.map(function (i) {
@@ -490,15 +499,15 @@ export var fetchData = /*#__PURE__*/function () {
               }).then(resolve).catch(reject);
             });
           });
-          _context3.next = 72;
+          _context3.next = 78;
           return Promise.all(BusiCompRequest);
-        case 72:
+        case 78:
           busiData = _context3.sent;
           // 先清空
           BusiCompRequest = null;
-          _context3.next = 83;
+          _context3.next = 89;
           break;
-        case 76:
+        case 82:
           // busiCompId 过滤重复
           itemHash = {}; // 找到所有页面使用到的 业务组件
           findAllItem(pages, function (item) {
@@ -506,7 +515,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 = 82;
+          _context3.next = 88;
           return Promise.all(alllBusiComp.map(function (i) {
             return services.findBusiCompById({
               busiCompId: i,
@@ -514,9 +523,9 @@ export var fetchData = /*#__PURE__*/function () {
               pageId: lastPageId
             });
           }));
-        case 82:
+        case 88:
           busiData = _context3.sent;
-        case 83:
+        case 89:
           // 过滤为空
           busiPages = busiData.filter(Boolean).map(function (i, index) {
             var _i$busiCompVersion;
@@ -590,14 +599,14 @@ export var fetchData = /*#__PURE__*/function () {
           });
           translateNames = {};
           if (!(chinese.length > 0)) {
-            _context3.next = 91;
+            _context3.next = 97;
             break;
           }
-          _context3.next = 90;
+          _context3.next = 96;
           return getTranslateName(appId, chinese, 'UPPER_CAMEL');
-        case 90:
+        case 96:
           translateNames = _context3.sent;
-        case 91:
+        case 97:
           // 翻译业务组件的名字
           for (key = 0; key < busiPages.length;) {
             onProgress({
@@ -607,13 +616,13 @@ export var fetchData = /*#__PURE__*/function () {
             translateName = (_translateNames = translateNames) === null || _translateNames === void 0 ? void 0 : _translateNames[getSafeTypeName(busiPages[key].pageName)]; // 翻译可能失败
             if (translateName) {
               busiPages[key]._pageName = busiPages[key].pageName;
-              busiPages[key].pageName = translateName;
+              busiPages[key].pageName = getSafeTypeName(translateName);
             }
             key += 1;
           }
           pagePathEnglishMapping = {};
           if (!needTranslatePagePathToEnglish) {
-            _context3.next = 104;
+            _context3.next = 110;
             break;
           }
           pagePathEnglishSet = {};
@@ -635,14 +644,14 @@ export var fetchData = /*#__PURE__*/function () {
           });
           pagesTranslateNames = {};
           if (!(pagesChinese.length > 0)) {
-            _context3.next = 102;
+            _context3.next = 108;
             break;
           }
-          _context3.next = 101;
+          _context3.next = 107;
           return getTranslateName(appId, pagesChinese, 'UPPER_CAMEL');
-        case 101:
+        case 107:
           pagesTranslateNames = _context3.sent;
-        case 102:
+        case 108:
           findPageKeyByPageId = function findPageKeyByPageId(id, arrs) {
             for (var _key = 0; _key < arrs.length;) {
               var _arrs$_key;
@@ -662,7 +671,7 @@ export var fetchData = /*#__PURE__*/function () {
             // index 保留不处理
             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);
+              safeTranslateName = getName(getSafeTypeName(((_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;
@@ -670,7 +679,7 @@ export var fetchData = /*#__PURE__*/function () {
             }
             _key2 += 1;
           }
-        case 104:
+        case 110:
           // 合并页面，生成器那边支持页面类型和业务组件类型
           pageDSLS = [].concat(_toConsumableArray(pages), _toConsumableArray(busiPages));
           getPlatform = function getPlatform(platFormtype) {
@@ -685,10 +694,10 @@ export var fetchData = /*#__PURE__*/function () {
           }; // { '31232133':{fileName:'xxx',data:base64 }}
           appFileResource = {}; // 如果开启下载静态资源
           if (!hasAppFileResource) {
-            _context3.next = 116;
+            _context3.next = 123;
             break;
           }
-          _context3.next = 110;
+          _context3.next = 116;
           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',
@@ -696,10 +705,11 @@ export var fetchData = /*#__PURE__*/function () {
             pageSize: 999999,
             sharedObjFilter: 'F'
           });
-        case 110:
+        case 116:
           _yield$services$query = _context3.sent;
-          list = _yield$services$query.list;
-          _context3.next = 114;
+          _yield$services$query2 = _yield$services$query.list;
+          list = _yield$services$query2 === void 0 ? [] : _yield$services$query2;
+          _context3.next = 121;
           return Promise.all((list || []).map(function (item) {
             return new Promise(function (resolve, reject) {
               requestQueue.sendRequest(function () {
@@ -722,19 +732,19 @@ export var fetchData = /*#__PURE__*/function () {
               }).catch(reject);
             });
           }));
-        case 114:
+        case 121:
           appFileResourceList = _context3.sent;
           appFileResourceList.filter(Boolean).forEach(function (i) {
             appFileResource[i.fileCode] = i;
           });
-        case 116:
-          _context3.next = 118;
+        case 123:
+          _context3.next = 125;
           return services.selectToolBoxPage({
             appId: appId,
             qryType: 'F',
             toolScan: 'front_function'
           });
-        case 118:
+        case 125:
           _yield$services$selec = _context3.sent;
           toolBoxList = _yield$services$selec.list;
           toolBox = (toolBoxList || []).map(function (i) {
@@ -742,7 +752,7 @@ export var fetchData = /*#__PURE__*/function () {
             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;
+          _context3.next = 130;
           return Promise.race([new Promise(function (resolve, reject) {
             services.batchQryPageRulesByPageIds({
               appId: appId,
@@ -755,11 +765,11 @@ export var fetchData = /*#__PURE__*/function () {
               resolve({});
             }, 5000);
           })]);
-        case 123:
+        case 130:
           pageRules = _context3.sent;
           options = {
             platform: getPlatform(platform),
-            appId: appInfo.initialAppId,
+            appId: (_appInfo$initialAppId = appInfo === null || appInfo === void 0 ? void 0 : appInfo.initialAppId) !== null && _appInfo$initialAppId !== void 0 ? _appInfo$initialAppId : appId,
             pageIdMapping: pageIdMapping,
             compAssetList: compAssetList || [],
             baseUrl: baseUrl,
@@ -791,11 +801,11 @@ export var fetchData = /*#__PURE__*/function () {
             options: options,
             cleanedTree: cleanedTree
           });
-        case 129:
+        case 136:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[29, 36]]);
+    }, _callee3, null, [[25, 31], [35, 42]]);
   }));
   return function fetchData(_x) {
     return _ref5.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.2.9",
+  "version": "0.2.10",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.2.9"
+    "@lingxiteam/ebe": "0.2.10"
   },
   "publishConfig": {
     "access": "public"