@lingxiteam/ebe-utils 0.0.2 → 0.0.4

package/es/index.d.ts

@@ -49,7 +49,7 @@ export declare const fetchData: ({ appId, services, platform, baseUrl, onProgres
             frontendHookList: any;
         };
         attrSpecPage: any;
-        themeCss: string;
+        themeCss: any;
         models: Record<string, any>;
         appInfo: Record<string, any>;
     };

package/es/index.js

@@ -311,31 +311,38 @@ export var fetchData = /*#__PURE__*/function () {
           themeCss = '';
           _context2.prev = 16;
           _context2.next = 19;
-          return Promise.race([services.getThemeCss({
-            appId: appId,
-            terminalType: platform
-          }), new Promise(function (resolve) {
-            return setTimeout(resolve, 3000);
+          return Promise.race([new Promise(function (resolve, reject) {
+            services.getThemeCss({
+              appId: appId,
+              terminalType: platform
+            }).then(function (res) {
+              resolve(res);
+            });
+          }), new Promise(function (resolve, reject) {
+            setTimeout(function () {
+              resolve('');
+            }, 3000);
           })]);
         case 19:
           themeCss = _context2.sent;
-          _context2.next = 25;
+          console.log('====获取主题成功', themeCss);
+          _context2.next = 26;
           break;
-        case 22:
-          _context2.prev = 22;
+        case 23:
+          _context2.prev = 23;
           _context2.t0 = _context2["catch"](16);
           console.error('====获取主题失败', _context2.t0);
-        case 25:
+        case 26:
           // 根据 appId 获取当前应用的使用的自定义组件
           onProgress({
             log: '获取当前应用的使用的自定义组件',
             progress: 3
           });
-          _context2.next = 28;
+          _context2.next = 29;
           return services.qryPageCompAssetList({
             appId: appId
           });
-        case 28:
+        case 29:
           temCompAssetList = _context2.sent;
           // 兼容下割接数据，数组前面的自定义组件是新的
           compAssetList = temCompAssetList.reduce(function (acc, current) {
@@ -351,12 +358,12 @@ export var fetchData = /*#__PURE__*/function () {
             log: '获取全局数据源',
             progress: 4
           });
-          _context2.next = 33;
+          _context2.next = 34;
           return services.queryFrontendDatasourcePage({
             appId: appId,
             pageSize: 10000
           });
-        case 33:
+        case 34:
           globalDataInfo = _context2.sent;
           dataSourceList = (globalDataInfo === null || globalDataInfo === void 0 ? void 0 : globalDataInfo.list) || [];
           globalDataMap = {};
@@ -381,7 +388,7 @@ export var fetchData = /*#__PURE__*/function () {
             log: '获取所有页面dsl',
             progress: 5
           });
-          _context2.next = 44;
+          _context2.next = 45;
           return Promise.all(appPageList.map(function (i) {
             lastPageId = i.pageId;
             return services.findPageInstByVersionId({
@@ -389,7 +396,7 @@ export var fetchData = /*#__PURE__*/function () {
               pageId: i.pageId
             });
           }));
-        case 44:
+        case 45:
           data = _context2.sent;
           pages = getPageDsls(data); // busiCompId 过滤重复
           itemHash = {}; // 找到所有页面使用到的 业务组件
@@ -401,7 +408,7 @@ export var fetchData = /*#__PURE__*/function () {
             log: '获取所有业务组件dsl',
             progress: 6
           });
-          _context2.next = 52;
+          _context2.next = 53;
           return Promise.all(itemLists.map(function (i) {
             return services.findBusiCompById({
               busiCompId: i,
@@ -409,7 +416,7 @@ export var fetchData = /*#__PURE__*/function () {
               pageId: lastPageId
             });
           }));
-        case 52:
+        case 53:
           busiData = _context2.sent;
           busiCompMapping = {};
           busiPages = busiData.map(function (i, index) {
@@ -447,11 +454,11 @@ export var fetchData = /*#__PURE__*/function () {
             options: options,
             cleanedTree: cleanedTree
           });
-        case 61:
+        case 62:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[16, 22]]);
+    }, _callee2, null, [[16, 23]]);
   }));
   return function fetchData(_x) {
     return _ref5.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "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.2",
+    "@lingxiteam/ebe": "0.0.4",
     "cac": "^6.7.14",
     "fs-extra": "9.x"
   },