@cloud-app-dev/vidc 1.0.50 → 2.0.0-alpha.10

package/es/InitialConfig/index.js

@@ -1,7 +1,3 @@
-import _Store from "@cloud-app-dev/basic-components/es/Store";
-import _Config from "@cloud-app-dev/basic-components/es/Config";
-import _Dict from "@cloud-app-dev/basic-components/es/Dict";
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -15,12 +11,14 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useEffect } from 'react';
-import { formatAppConfig, querySystemConfig, queryThemeConfig, queryMapConfig, queryMicroApplicationList, querySystemUpdate, queryLogoConfig, queryZenMapConfig, queryZenMap3DConfig } from './utils';
+import Dict from '../Dict';
+import Config from '../Config';
+import { queryBSConfig, queryMicroApplicationList, querySystemUpdate } from './utils';
 
 function InitialConfig(_ref) {
   var children = _ref.children,
-      _ref$mode = _ref.mode,
-      mode = _ref$mode === void 0 ? 'server' : _ref$mode;
+      Spin = _ref.Spin,
+      Update = _ref.Update;
 
   var _useState = useState({
     isInit: false,
@@ -30,58 +28,25 @@ function InitialConfig(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  _Dict.useTypeCodes();
-
+  Dict.useTypeCodes();
   useEffect(function () {
-    Promise.all([querySystemConfig(mode), queryMapConfig(mode), queryThemeConfig(mode), queryMicroApplicationList(mode), queryLogoConfig(), queryZenMapConfig(), queryZenMap3DConfig(), querySystemUpdate()]).then(function (res) {
-      var _themeConfig$style, _themeConfig$style2;
-
-      var _res = _slicedToArray(res, 8),
-          BSConfig = _res[0],
-          LMapConfig = _res[1],
-          themeConfig = _res[2],
-          AppConfig = _res[3],
-          LogConfig = _res[4],
-          ZenMapConfig = _res[5],
-          ZenMap3DConfig = _res[6],
-          SystemConfig = _res[7];
-
-      _Config.registerBSConfig(BSConfig);
-
-      _Config.registerLMapConfig(LMapConfig);
-
-      _Config.registerAppConfig(formatAppConfig(AppConfig));
-
-      _Config.registerThemeConfig(themeConfig);
-
-      _Config.registerLogConfig(LogConfig);
-
-      _Config.registerCustomConfig({
-        ZenMap: ZenMapConfig,
-        ZenMap3D: ZenMap3DConfig
-      });
-
-      _Store.app.updateThemeStyle({
-        menuStyle: (_themeConfig$style = themeConfig.style) === null || _themeConfig$style === void 0 ? void 0 : _themeConfig$style.menuStyle,
-        tabType: !!((_themeConfig$style2 = themeConfig.style) === null || _themeConfig$style2 === void 0 ? void 0 : _themeConfig$style2.tabStyle)
-      });
-
+    Promise.all([queryBSConfig(), queryMicroApplicationList(), querySystemUpdate()]).then(function (_ref2) {
+      var _ref3 = _slicedToArray(_ref2, 3),
+          BSConfig = _ref3[0],
+          AppConfig = _ref3[1],
+          SystemConfig = _ref3[2];
+
+      Config.registerBSConfig(BSConfig);
+      Config.registerAppConfig(AppConfig);
       setState(function () {
         return {
           isUpdate: SystemConfig.isUpdate,
           isInit: true
         };
       });
-    }); // eslint-disable-next-line react-hooks/exhaustive-deps
+    });
   }, []);
-  var isInit = state.isInit,
-      isUpdate = state.isUpdate;
-
-  if (!isInit) {
-    return null;
-  }
-
-  return /*#__PURE__*/React.createElement(React.Fragment, null, children(isUpdate));
+  return /*#__PURE__*/React.createElement(React.Fragment, null, state.isInit ? state.isUpdate ? Update : children : Spin);
 }
 
 export default InitialConfig;

package/es/InitialConfig/utils.d.ts

@@ -0,0 +1,15 @@
+/**
+ *
+ * @description 获取系统配置
+ */
+export declare function queryBSConfig(): Promise<any>;
+/**
+ *
+ * @description 获取所有微应用配置
+ */
+export declare function queryMicroApplicationList(): Promise<any>;
+/**
+ *
+ * @description 获取平台升级状态
+ */
+export declare function querySystemUpdate(): Promise<any>;

package/es/InitialConfig/utils.js

@@ -1,367 +1,79 @@
-import _Service from "@cloud-app-dev/basic-components/es/Service";
-
-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); }); }; }
-
-export function formatAppConfig(appConfig) {
-  var dataMap = {};
-  appConfig.forEach(function (item) {
-    var urls = item.url.split(',');
-    dataMap[item.alias] = {
-      id: item.id,
-      name: item.alias,
-      script: "".concat(urls[0], "?version=").concat(item.version),
-      style: "".concat(urls[1], "?version=").concat(item.version),
-      appTitle: item.name,
-      appType: item.type,
-      version: item.version,
-      status: item.status,
-      describe: item.describe,
-      tag: item.tag,
-      group: item.group
-    };
-  });
-  return dataMap;
-}
-export function querySystemConfig(_x) {
-  return _querySystemConfig.apply(this, arguments);
-}
-
-function _querySystemConfig() {
-  _querySystemConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(mode) {
-    var res1;
+import { __awaiter } from "tslib";
+import Service from '../Service';
+/**
+ *
+ * @description 获取系统配置
+ */
+
+export function queryBSConfig() {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            if (!(mode === 'local')) {
-              _context.next = 2;
-              break;
-            }
-
-            return _context.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/systemConfig.json?".concat(Date.now()),
-              requestId: 'systemConfig'
-            }));
-
-          case 2:
-            _context.next = 4;
-            return _Service.$http({
-              url: '/api/micro/configure/v1/queryConfigureIsDefaultByType/1',
-              requestId: 'systemConfig'
-            }).catch(function () {
-              return false;
+            _context.next = 2;
+            return Service.$http({
+              url: '/api/system/config/web'
             });
 
-          case 4:
-            res1 = _context.sent;
-
-            if (!(res1 && res1.data && res1.data.info)) {
-              _context.next = 7;
-              break;
-            }
-
-            return _context.abrupt("return", res1.data.info);
-
-          case 7:
-            return _context.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/systemConfig.json?".concat(Date.now()),
-              requestId: 'systemConfig'
-            }));
+          case 2:
+            return _context.abrupt("return", _context.sent.data);
 
-          case 8:
+          case 3:
           case "end":
             return _context.stop();
         }
       }
     }, _callee);
   }));
-  return _querySystemConfig.apply(this, arguments);
 }
+/**
+ *
+ * @description 获取所有微应用配置
+ */
 
-export function queryThemeConfig(_x2) {
-  return _queryThemeConfig.apply(this, arguments);
-}
-
-function _queryThemeConfig() {
-  _queryThemeConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(mode) {
-    var res1;
+export function queryMicroApplicationList() {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            if (!(mode === 'local')) {
-              _context2.next = 2;
-              break;
-            }
-
-            return _context2.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/themeConfig.json?".concat(Date.now()),
-              requestId: 'themeConfig'
-            }));
-
-          case 2:
-            _context2.next = 4;
-            return _Service.$http({
-              url: '/api/micro/configure/v1/queryConfigureIsDefaultByType/2',
-              requestId: 'themeConfig'
-            }).catch(function () {
-              return false;
+            _context2.next = 2;
+            return Service.$http({
+              url: "/api/app/list"
             });
 
-          case 4:
-            res1 = _context2.sent;
-
-            if (!(res1 && res1.data && res1.data.info)) {
-              _context2.next = 7;
-              break;
-            }
-
-            return _context2.abrupt("return", res1.data.info);
-
-          case 7:
-            return _context2.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/themeConfig.json?".concat(Date.now()),
-              requestId: 'themeConfig'
-            }));
+          case 2:
+            return _context2.abrupt("return", _context2.sent.data);
 
-          case 8:
+          case 3:
           case "end":
             return _context2.stop();
         }
       }
     }, _callee2);
   }));
-  return _queryThemeConfig.apply(this, arguments);
 }
+/**
+ *
+ * @description 获取平台升级状态
+ */
 
-export function queryMapConfig(_x3) {
-  return _queryMapConfig.apply(this, arguments);
-}
-
-function _queryMapConfig() {
-  _queryMapConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(mode) {
-    var res1;
+export function querySystemUpdate() {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
     return regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            if (!(mode === 'local')) {
-              _context3.next = 2;
-              break;
-            }
-
-            return _context3.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/map.json?".concat(Date.now()),
-              requestId: 'mapConfig'
+            return _context3.abrupt("return", Service.$http({
+              url: "/api/system/config/updateStatus?".concat(Date.now())
             }));
 
-          case 2:
-            _context3.next = 4;
-            return _Service.$http({
-              url: '/api/micro/configure/v1/queryConfigureIsDefaultByType/3',
-              requestId: 'mapConfig'
-            }).catch(function () {
-              return false;
-            });
-
-          case 4:
-            res1 = _context3.sent;
-
-            if (!(res1 && res1.data && res1.data.info)) {
-              _context3.next = 7;
-              break;
-            }
-
-            return _context3.abrupt("return", res1.data.info);
-
-          case 7:
-            return _context3.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/map.json?".concat(Date.now()),
-              requestId: 'mapConfig'
-            }));
-
-          case 8:
+          case 1:
           case "end":
             return _context3.stop();
         }
       }
     }, _callee3);
   }));
-  return _queryMapConfig.apply(this, arguments);
-}
-
-export function queryMicroApplicationList(_x4) {
-  return _queryMicroApplicationList.apply(this, arguments);
-}
-
-function _queryMicroApplicationList() {
-  _queryMicroApplicationList = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(mode) {
-    var res;
-    return regeneratorRuntime.wrap(function _callee4$(_context4) {
-      while (1) {
-        switch (_context4.prev = _context4.next) {
-          case 0:
-            if (!(mode === 'local')) {
-              _context4.next = 2;
-              break;
-            }
-
-            return _context4.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/appConfig.json?".concat(Date.now()),
-              requestId: 'appConfig'
-            }));
-
-          case 2:
-            _context4.next = 4;
-            return _Service.$http({
-              url: "/api/micro/microApplication/v1/queryMicroApplicationList",
-              requestId: 'appConfig'
-            });
-
-          case 4:
-            res = _context4.sent;
-            return _context4.abrupt("return", res.data);
-
-          case 6:
-          case "end":
-            return _context4.stop();
-        }
-      }
-    }, _callee4);
-  }));
-  return _queryMicroApplicationList.apply(this, arguments);
-}
-
-export function queryLogoConfig() {
-  return _queryLogoConfig.apply(this, arguments);
-}
-
-function _queryLogoConfig() {
-  _queryLogoConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
-    return regeneratorRuntime.wrap(function _callee5$(_context5) {
-      while (1) {
-        switch (_context5.prev = _context5.next) {
-          case 0:
-            return _context5.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/logConfig.json",
-              requestId: 'queryLogoConfig'
-            }).catch(function () {
-              return {};
-            }));
-
-          case 1:
-          case "end":
-            return _context5.stop();
-        }
-      }
-    }, _callee5);
-  }));
-  return _queryLogoConfig.apply(this, arguments);
-}
-
-export function queryZenMapConfig() {
-  return _queryZenMapConfig.apply(this, arguments);
-}
-
-function _queryZenMapConfig() {
-  _queryZenMapConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
-    var res1;
-    return regeneratorRuntime.wrap(function _callee6$(_context6) {
-      while (1) {
-        switch (_context6.prev = _context6.next) {
-          case 0:
-            _context6.next = 2;
-            return _Service.$http({
-              url: '/api/micro/configure/v1/queryConfigureIsDefaultByType/4',
-              requestId: 'mapConfig'
-            }).catch(function () {
-              return false;
-            });
-
-          case 2:
-            res1 = _context6.sent;
-
-            if (!(res1 && res1.data && res1.data.info)) {
-              _context6.next = 5;
-              break;
-            }
-
-            return _context6.abrupt("return", res1.data.info);
-
-          case 5:
-          case "end":
-            return _context6.stop();
-        }
-      }
-    }, _callee6);
-  }));
-  return _queryZenMapConfig.apply(this, arguments);
-}
-
-export function queryZenMap3DConfig() {
-  return _queryZenMap3DConfig.apply(this, arguments);
-}
-
-function _queryZenMap3DConfig() {
-  _queryZenMap3DConfig = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
-    var res1;
-    return regeneratorRuntime.wrap(function _callee7$(_context7) {
-      while (1) {
-        switch (_context7.prev = _context7.next) {
-          case 0:
-            _context7.next = 2;
-            return _Service.$http({
-              url: '/api/micro/configure/v1/queryConfigureIsDefaultByType/5',
-              requestId: 'mapConfig'
-            }).catch(function () {
-              return false;
-            });
-
-          case 2:
-            res1 = _context7.sent;
-
-            if (!(res1 && res1.data && res1.data.info)) {
-              _context7.next = 5;
-              break;
-            }
-
-            return _context7.abrupt("return", res1.data.info);
-
-          case 5:
-          case "end":
-            return _context7.stop();
-        }
-      }
-    }, _callee7);
-  }));
-  return _queryZenMap3DConfig.apply(this, arguments);
-}
-
-export function querySystemUpdate() {
-  return _querySystemUpdate.apply(this, arguments);
-}
-
-function _querySystemUpdate() {
-  _querySystemUpdate = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
-    return regeneratorRuntime.wrap(function _callee8$(_context8) {
-      while (1) {
-        switch (_context8.prev = _context8.next) {
-          case 0:
-            return _context8.abrupt("return", _Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/systemUpdate.json",
-              requestId: 'querySystemUpdate'
-            }).catch(function () {
-              return {};
-            }));
-
-          case 1:
-          case "end":
-            return _context8.stop();
-        }
-      }
-    }, _callee8);
-  }));
-  return _querySystemUpdate.apply(this, arguments);
 }

package/es/InitialRequest/index.d.ts

@@ -1,13 +1,7 @@
-import * as React from 'react';
-
-export interface InitialRequestProps {
-  children: React.ReactNode;
-  Spin?: React.ReactNode;
-  mode?: 'replace' | 'ext';
-  customInitialization?: Promise<any>;
-  isGetResourse?: boolean;
+import React from 'react';
+interface IInitialRequestProps {
+    children: React.ReactNode;
+    Spin?: React.ReactNode;
 }
-
-declare const InitialRequest: React.StatelessComponent<InitialRequestProps>;
-
+declare function InitialRequest({ children, Spin }: IInitialRequestProps): JSX.Element;
 export default InitialRequest;

package/es/InitialRequest/index.js

@@ -1,13 +1,4 @@
-import _logger from "@cloud-app-dev/utils/es/logger";
-import _Store from "@cloud-app-dev/basic-components/es/Store";
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -21,14 +12,23 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useState, useEffect } from 'react';
-import { initialization, queryOrganizationsList, queryPlacesList, queryUserDevice, authFormat, queryUserOrganizationsList } from './utils';
+import { __awaiter } from "tslib";
+import React, { useState, useEffect, useContext } from 'react';
+import { initialization } from './utils';
+import AppContext from '../AppContext';
+import Config from '../Config';
 var _BASE_DATA_INIT = false;
 
 function InitialRequest(_ref) {
+  var _this = this;
+
   var children = _ref.children,
       Spin = _ref.Spin;
 
+  var _useContext = useContext(AppContext.Context),
+      updateUser = _useContext.updateUser,
+      updateOperation = _useContext.updateOperation;
+
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
       isInit = _useState2[0],
@@ -40,61 +40,52 @@ function InitialRequest(_ref) {
       return;
     }
 
-    initialization().then(function (res) {
-      var _themeConfigInfo$styl, _themeConfigInfo$styl2;
-
-      var userPrivileges = res.userPrivileges,
-          allPrivileges = res.allPrivileges,
-          centerPrivileges = res.centerPrivileges,
-          centerInfo = res.centerInfo,
-          systemInfo = res.systemInfo,
-          userInfo = res.userInfo,
-          themeConfigInfo = res.themeConfigInfo;
-      var userRoles = (userPrivileges.data || []).map(function (item) {
-        return item.functionCodes;
-      }).flat();
-
-      _Store.app.updateUserInfo(userInfo);
-
-      _Store.app.updateAppInfo(centerInfo.data);
-
-      _Store.app.updateSystemConfig(systemInfo.data);
-
-      var userAuth = [].concat(authFormat(userRoles, centerPrivileges.data, userInfo.userType, allPrivileges.data));
-      var globalAuth = [].concat(authFormat([], allPrivileges.data, userInfo.userType));
-
-      _Store.auth.initAuthData([].concat(_toConsumableArray(userAuth), _toConsumableArray(globalAuth)));
-
-      queryUserOrganizationsList().then(function (res) {
-        return _Store.orgUser.initSetOrgData(res.data || []);
-      });
-      queryOrganizationsList().then(function (res) {
-        return _Store.org.initSetOrgData((res === null || res === void 0 ? void 0 : res.data) || []);
-      });
-      queryPlacesList().then(function (res) {
-        var _Store$place;
-
-        return (_Store$place = _Store.place).initSetPlaceData.apply(_Store$place, _toConsumableArray(res));
-      });
-      queryUserDevice().then(function (devices) {
-        return _Store.device.initSetDevices(devices);
-      });
-
-      _Store.app.updateThemeStyle({
-        menuStyle: (themeConfigInfo === null || themeConfigInfo === void 0 ? void 0 : (_themeConfigInfo$styl = themeConfigInfo.style) === null || _themeConfigInfo$styl === void 0 ? void 0 : _themeConfigInfo$styl.menuStyle) || 'horizontal',
-        tabType: themeConfigInfo === null || themeConfigInfo === void 0 ? void 0 : (_themeConfigInfo$styl2 = themeConfigInfo.style) === null || _themeConfigInfo$styl2 === void 0 ? void 0 : _themeConfigInfo$styl2.tabStyle
-      });
-
-      _BASE_DATA_INIT = true;
-    }).then(function () {
-      return setIsInit(true);
-    }).catch(function (e) {
-      return _logger.error('接口初始化失败！', e);
-    }); // eslint-disable-next-line react-hooks/exhaustive-deps
+    var init = function init() {
+      return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var _yield$initialization, userFeatures, operationInfo, systemFeatures, userInfo, themeConfig;
+
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return initialization();
+
+              case 2:
+                _yield$initialization = _context.sent;
+                userFeatures = _yield$initialization.userFeatures;
+                operationInfo = _yield$initialization.operationInfo;
+                systemFeatures = _yield$initialization.systemFeatures;
+                userInfo = _yield$initialization.userInfo;
+                themeConfig = _yield$initialization.themeConfig;
+                updateUser(userInfo);
+                updateOperation(operationInfo);
+                Config.registerFeatrueIds(userFeatures);
+                Config.registerPlatformFeature(systemFeatures);
+                Config.registerThemeConfig(themeConfig);
+
+                _nextTick(function () {
+                  return setIsInit(true);
+                });
+
+                _BASE_DATA_INIT = true;
+
+              case 15:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }));
+    };
+
+    try {
+      init();
+    } catch (e) {
+      console.error('接口初始化失败！', e);
+    }
   }, []);
-  return isInit ? children : Spin ? /*#__PURE__*/React.createElement(Spin, {
-    spinning: true
-  }) : null;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, isInit ? children : Spin ? Spin : null);
 }
 
 export default InitialRequest;