@cloud-app-dev/vidc 2.0.0-alpha.3 → 2.0.0-alpha.30

package/.fatherrc.js

@@ -1,10 +1,6 @@
-import nodePolyfills from 'rollup-plugin-node-polyfills';
-
 export default {
   target: 'browser',
   esm: 'babel',
-  extraRollupPlugins: [nodePolyfills()],
-  lessInBabelMode: true, // babel 模式下做 less 编译
   pkgs: [
     // 组件依赖构建顺序， 例如 a组件依赖于b组件，那么需要先编译 b,在编译a,则 这里可以控制组件编译顺序
   ],
@@ -15,4 +11,15 @@ export default {
     ['import', { libraryName: 'ahooks', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'ahooks'],
     ['import', { libraryName: '@cloud-app-dev/map', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'map-components'],
   ],
+  lessInRollupMode: {
+    modifyVars: {
+      '@ant-prefix': 'cloudapp',
+    },
+  },
+  lessInBabelMode: {
+    // babel 模式下做 less 编译
+    modifyVars: {
+      '@ant-prefix': 'cloudapp',
+    },
+  },
 };

package/.umirc.ts

@@ -2,7 +2,7 @@ import { defineConfig } from 'dumi';
 import path from 'path';
 
 const token =
-  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NiIsImV4dCI6MTYzODY4NzgyNzEwNywidWlkIjoiMTAxMDAwMDAwMjQ5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTAzODddLCJ2YWxpZFRpbWUiOm51bGwsIm9wdENlbnRlcklkIjoiMTAwMTAwMDAwMjMzIiwidXNlclR5cGUiOjEwMDcwMiwiaWF0IjoxNjM4NDI4NjI3MTA3fQ.eEvUc9_eGBdUi2QCMDNjOYgTzTKwiLX-7DEQ_O9kjhs';
+  'eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NiIsImV4dCI6MTY0MDQwOTc4NjQ3OCwidWlkIjoiMTAxMDAwMDAwMjQ5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTAzODddLCJ2YWxpZFRpbWUiOm51bGwsIm9wdENlbnRlcklkIjoiMTAwMTAwMDAwMjMzIiwidXNlclR5cGUiOjEwMDcwMiwiaWF0IjoxNjQwMTUwNTg2NDc4fQ.9a8me82dxS_DJ52Ac8eBu1Y2Gigs7mZ6Cm3Rd-tj5Vk';
 
 export default defineConfig({
   title: '云应用-业务组件库',

package/es/Api/index.js

@@ -2,7 +2,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 import { __awaiter } from "tslib";
 import Service from '../Service';
@@ -23,7 +23,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/user/v1/organization/queryChildOrganizationsById',
                   method: 'post',
                   requestId: 'queryChildOrganizationsById',
@@ -60,7 +60,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context2.prev = _context2.next) {
               case 0:
                 _context2.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/user/v1/queryUsers',
                   method: 'post',
                   requestId: 'queryUsers',
@@ -98,7 +98,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context3.prev = _context3.next) {
               case 0:
                 _context3.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: "/api/user/v2/post/queryPostByOrgId/".concat(orgId),
                   method: 'post',
                   requestId: 'queryPostByOrgId',
@@ -128,7 +128,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context4.prev = _context4.next) {
               case 0:
                 _context4.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/udm-api/DeviceBuzTree/queryList',
                   method: 'post',
                   requestId: 'getDeviceBzTree',
@@ -158,7 +158,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context5.prev = _context5.next) {
               case 0:
                 _context5.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/udm-api/customDeviceGroup/queryList',
                   method: 'post',
                   requestId: 'customDeviceGroup',
@@ -188,7 +188,7 @@ var Api = /*#__PURE__*/function () {
             switch (_context6.prev = _context6.next) {
               case 0:
                 _context6.next = 2;
-                return Service.$http({
+                return Service.http({
                   url: '/api/place/v1/getPlacesByHasDevice',
                   method: 'post',
                   requestId: 'getPlacesByHasDevice',

package/es/AppRedirect/index.d.ts

@@ -10,7 +10,7 @@ interface AppRedirectProps {
      * @description 重定向路径
      * @description -
      */
-    to: H.LocationDescriptor<any>;
+    to: H.Location;
 }
 declare function AppRedirect({ path, to }: AppRedirectProps): JSX.Element;
 export default AppRedirect;

package/es/AppRedirect/index.js

@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
-import useHistory from '../useHistory';
+import { useLocation, useNavigate } from 'react-router-dom';
 import "./index.css";
 
 var getKey = function getKey() {
@@ -10,24 +9,20 @@ var getKey = function getKey() {
 function AppRedirect(_ref) {
   var path = _ref.path,
       to = _ref.to;
-  var history = useHistory();
+  var navigate = useNavigate();
   var location = useLocation();
   useEffect(function () {
     if (path === location.pathname) {
       if (typeof to !== 'string') {
-        history.replace(Object.assign(Object.assign({}, to), {
-          search: to.search ? "".concat(to.search, "&key=").concat(getKey()) : "?key=".concat(getKey()),
+        navigate("".concat(to.pathname).concat(to.search ? "".concat(to.search, "&key=").concat(getKey()) : "?key=".concat(getKey())), {
+          replace: true,
           state: Object.assign({}, to.state, {
             isReplace: true
           })
-        }));
+        });
       } else {
-        history.push({
-          pathname: to,
-          search: "?key".concat(getKey()),
-          state: {
-            isReplace: true
-          }
+        navigate("".concat(to, "?key").concat(getKey()), {
+          replace: true
         });
       }
     }

package/es/AppRoute/index.d.ts

@@ -1,14 +1,10 @@
 import React from 'react';
-import { match } from 'react-router-dom';
-import { IAppRouteType, IAppRouteProps } from './interface';
-import * as H from 'history';
-import './index.less';
-declare class AppRoute extends React.Component<IAppRouteProps, IAppRouteType> {
-    private isRender;
+import { IAppRouteProps } from './interface';
+declare class AppRoute extends React.Component<IAppRouteProps, any> {
+    static defaultProps: IAppRouteProps;
     constructor(props: IAppRouteProps);
     shouldComponentUpdate(props: IAppRouteProps): boolean;
     componentWillUnmount(): void;
-    setRouteProps: (newMatch: match<any>, newLocation: H.Location<any>, history: H.History<any>) => void;
     render(): JSX.Element;
 }
 export default AppRoute;

package/es/AppRoute/index.js

@@ -1,16 +1,15 @@
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
-import _logger from "@cloud-app-dev/utils/es/logger";
 import _cache from "@cloud-app-dev/utils/es/cache";
-import _isEqual from "@cloud-app-dev/utils/es/isEqual";
+import _useMount from "ahooks/es/useMount";
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
 function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
@@ -24,12 +23,21 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
+import { __rest } from "tslib";
 import React from 'react';
-import { RenderComponents, RenderRoutes, RenderSingleRoute } from './Render';
-import Rendered from './Rendered';
-import "./index.css";
+import { Route, Routes } from 'react-router-dom';
 var _global = window;
 
+function RenderSingleRoute(_ref) {
+  var onMount = _ref.onMount;
+
+  _useMount(function () {
+    return onMount();
+  });
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+}
+
 var AppRoute = /*#__PURE__*/function (_React$Component) {
   _inherits(AppRoute, _React$Component);
 
@@ -41,23 +49,8 @@ var AppRoute = /*#__PURE__*/function (_React$Component) {
     _classCallCheck(this, AppRoute);
 
     _this = _super.call(this, props);
-
-    _this.setRouteProps = function (newMatch, newLocation, history) {
-      if (!_isEqual(_this.props.match, newMatch)) {
-        _this.setState({
-          match: newMatch,
-          location: newLocation,
-          history: history
-        });
-      }
-    }; //可能存在路由创建但是没有render 导致UI无法渲染
-
-
-    _this.isRender = false;
     _this.state = {
-      match: undefined,
-      location: undefined,
-      history: undefined
+      matchIndex: -1
     };
     return _this;
   }
@@ -65,42 +58,55 @@ var AppRoute = /*#__PURE__*/function (_React$Component) {
   _createClass(AppRoute, [{
     key: "shouldComponentUpdate",
     value: function shouldComponentUpdate(props) {
-      if (!_global._IS_RUN_MICRO_BASIC || !this.isRender || _global._IS_ALLOW_ROUTE_RENDER) {
+      var tabId = _cache.getCache('currentTabKey', 'session');
+
+      if (!_global._IS_RUN_MICRO_BASIC) {
         return true;
-      }
+      } // 页签变化拦截
 
-      return (props.currentId || _cache.getCache('currentTabKey', 'session')) === props.tabId;
+
+      console.debug("App \u66F4\u65B0\u62E6\u622A\uFF0C\u62E6\u622AAppId\uFF1A".concat(props.tabId, "\uFF0C\u53EF\u66F4\u65B0AppId\uFF1A").concat(tabId));
+      return tabId === props.tabId;
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      _logger.debug('路由销毁');
+      console.debug('路由销毁');
     }
   }, {
     key: "render",
     value: function render() {
       var _this2 = this;
 
-      var _this$state = this.state,
-          match = _this$state.match,
-          location = _this$state.location;
-      var isRouteMath = match && location;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, this.props.routes ? /*#__PURE__*/React.createElement(RenderRoutes, Object.assign({}, this.props, {
-        setRouteProps: this.setRouteProps
-      })) : /*#__PURE__*/React.createElement(RenderSingleRoute, Object.assign({}, this.props, {
-        setRouteProps: this.setRouteProps
-      })), isRouteMath && /*#__PURE__*/React.createElement(RenderComponents, {
-        state: this.state,
-        props: this.props
-      }), isRouteMath && /*#__PURE__*/React.createElement(Rendered, {
-        onRendered: function onRendered() {
-          return _this2.isRender = true;
-        }
-      }));
+      var matchIndex = this.state.matchIndex;
+
+      var _a = this.props,
+          _a$routes = _a.routes,
+          routes = _a$routes === void 0 ? [] : _a$routes,
+          props = __rest(_a, ["routes"]);
+
+      var component = matchIndex > -1 ? routes[matchIndex].element : undefined;
+      console.debug('Route Match Index', matchIndex);
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Routes, null, routes.map(function (item, index) {
+        return /*#__PURE__*/React.createElement(Route, {
+          path: item.path,
+          key: item.path,
+          element: /*#__PURE__*/React.createElement(RenderSingleRoute, {
+            onMount: function onMount() {
+              return _this2.setState({
+                matchIndex: index
+              });
+            }
+          })
+        });
+      })), component && /*#__PURE__*/React.cloneElement(component, props));
     }
   }]);
 
   return AppRoute;
 }(React.Component);
 
+AppRoute.defaultProps = {
+  routes: []
+};
 export default AppRoute;

package/es/AppRoute/interface.d.ts

@@ -1,18 +1,8 @@
 import * as H from 'history';
-import { RouteProps, match } from 'react-router-dom';
+import { RouteProps } from 'react-router-dom';
 
-export interface IAppRouteType {
-  match?: match<any>;
-  location?: H.Location | undefined;
-  history?: H.History;
-}
-
-export interface IAppRouteProps extends RouteProps, IAppRouteType {
+export interface IAppRouteProps {
   routes?: RouteProps[];
   tabId?: string;
   currentId?: string;
 }
-
-export interface IRenderRouteProps extends IAppRouteType {
-  setRouteProps: (match: match<any>, location: H.Location, history: H.History) => void;
-}

package/es/Auth/index.js

@@ -7,7 +7,7 @@ function Auth(_ref) {
       children = _ref.children;
   var action = useMemo(function () {
     return !!Config.feature.find(function (v) {
-      return v.id === featureId;
+      return v === featureId;
     });
   }, [featureId]); //获取按钮权限
 

package/es/AutoExit/index.js

@@ -1,5 +1,6 @@
-import React, { useContext } from 'react';
-import useHistory from '../useHistory';
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
+import React, { useContext, useEffect } from 'react';
+import { useNavigate } from 'react-router-dom';
 import AppContext from '../AppContext';
 
 function AutoExit(_ref) {
@@ -8,14 +9,15 @@ function AutoExit(_ref) {
   var _useContext = useContext(AppContext.Context),
       loginStatus = _useContext.loginStatus;
 
-  var history = useHistory();
-
-  if (!loginStatus) {
-    history.replace('/login');
-    return null;
-  }
-
-  return /*#__PURE__*/React.createElement(React.Fragment, null, children);
+  var navigate = useNavigate();
+  useEffect(function () {
+    if (!loginStatus) {
+      _nextTick(function () {
+        return navigate('/login');
+      });
+    }
+  }, [loginStatus, navigate]);
+  return /*#__PURE__*/React.createElement(React.Fragment, null, loginStatus ? children : null);
 }
 
 export default AutoExit;

package/es/{ContentBox → Box}/index.d.ts

@@ -5,10 +5,10 @@ export interface ContentBoxProps {
     contentGrid?: any;
     children?: React.ReactNode;
 }
-declare function ContentBox({ className, contentGrid, children }: ContentBoxProps): JSX.Element;
-declare namespace ContentBox {
+declare function Box({ className, contentGrid, children }: ContentBoxProps): JSX.Element;
+declare namespace Box {
     var TwoColumnBox: typeof import("./TwoColumnBox").default;
     var InfoBox: typeof import("./InfoBox").default;
     var BetweenBox: typeof import("./BetweenBox").default;
 }
-export default ContentBox;
+export default Box;

package/es/{ContentBox → Box}/index.js

@@ -9,7 +9,7 @@ import defaultContentGrid from './deps/content-grid';
 import BetweenBox from './BetweenBox';
 import "./index.css";
 
-function ContentBox(_ref) {
+function Box(_ref) {
   var _ref$className = _ref.className,
       className = _ref$className === void 0 ? '' : _ref$className,
       _ref$contentGrid = _ref.contentGrid,
@@ -22,7 +22,7 @@ function ContentBox(_ref) {
   }, contentGrid), children));
 }
 
-ContentBox.TwoColumnBox = TwoColumnBox;
-ContentBox.InfoBox = InfoBox;
-ContentBox.BetweenBox = BetweenBox;
-export default ContentBox;
+Box.TwoColumnBox = TwoColumnBox;
+Box.InfoBox = InfoBox;
+Box.BetweenBox = BetweenBox;
+export default Box;

package/es/CheckGroupFixed/index.js

@@ -2,6 +2,7 @@ import "antd/lib/badge/style";
 import _Badge from "antd/lib/badge";
 import "antd/lib/checkbox/style";
 import _Checkbox from "antd/lib/checkbox";
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -16,7 +17,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import useChangeEffect from '../useChangeEffect';
 import "./index.css";
 
 function CheckGroupFixed(_ref) {
@@ -72,9 +72,11 @@ function CheckGroupFixed(_ref) {
       boxShadow: ' 0 0 10px rgba(0,0,0,0.1)'
     } : {};
   }, [state.sider, state.w]);
-  useChangeEffect(function () {
+
+  _useUpdateEffect(function () {
     return onChange && onChange(state.selectKeys);
   }, [state.selectKeys]);
+
   useLayoutEffect(function () {
     var dom = domRef.current.querySelector('.check-box-group-layout');
     dom === null || dom === void 0 ? void 0 : dom.setAttribute('style', "grid-template-columns:repeat(auto-fill, minmax(".concat(checboxSize, "px, 1fr));"));

package/es/Config/index.js

@@ -1,34 +1,70 @@
 import produce from 'immer';
+import { insertThemeStyle } from './utils';
 var Config = {
-  app: produce([], function () {}),
+  app: produce({}, function () {}),
   bs: produce({}, function () {}),
-  feature: produce([], function () {}),
-  pFeature: produce([], function () {}),
+  features: produce([], function () {}),
+  featureIds: produce([], function () {}),
   theme: produce({}, function () {}),
-  registerAppConfig: function registerAppConfig(app) {
+  registerAppConfig: function registerAppConfig() {
+    var app = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     Config.app = produce(Config.app, function (draft) {
-      draft = app;
+      app.forEach(function (item) {
+        draft[item.routerPrefix] = item;
+      });
     });
   },
-  registerFeatrue: function registerFeatrue(feature) {
-    Config.feature = produce(Config.feature, function (draft) {
-      draft = feature;
+  registerFeatrueIds: function registerFeatrueIds() {
+    var featureIds = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    Config.featureIds = produce(Config.featureIds, function (draft) {
+      featureIds.forEach(function (id) {
+        var index = draft.findIndex(function (v) {
+          return v === id;
+        });
+
+        if (index === -1) {
+          draft.push(id);
+        } else {
+          draft[index] = id;
+        }
+      });
     });
   },
-  registerBSConfig: function registerBSConfig(bs) {
+  registerBSConfig: function registerBSConfig() {
+    var bs = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     Config.bs = produce(Config.bs, function (draft) {
-      draft = bs;
+      Object.keys(bs).forEach(function (key) {
+        draft[key] = bs[key];
+      });
     });
   },
-  registerPlatformFeature: function registerPlatformFeature(pFeature) {
-    Config.pFeature = produce(Config.pFeature, function (draft) {
-      draft = pFeature;
+  registerPlatformFeature: function registerPlatformFeature() {
+    var features = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    Config.features = produce(Config.features, function (draft) {
+      features.forEach(function (item) {
+        var index = draft.findIndex(function (v) {
+          return v.id === item.id;
+        });
+
+        if (index === -1) {
+          draft.push(item);
+        } else {
+          draft[index] = item;
+        }
+      });
     });
   },
-  registerThemeConfig: function registerThemeConfig(theme) {
+  registerThemeConfig: function registerThemeConfig() {
+    var theme = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    insertThemeStyle(theme);
     Config.theme = produce(Config.theme, function (draft) {
-      draft = theme;
+      Object.keys(theme).forEach(function (key) {
+        draft[key] = theme[key];
+      });
     });
+  },
+  getThemeVarValue: function getThemeVarValue(themeKey) {
+    return getComputedStyle(document.querySelector(':root')).getPropertyValue("--".concat(themeKey));
   }
 };
 

package/es/Config/interface.d.ts

@@ -17,31 +17,48 @@ export type FeatureItemType = {
   type: 1 | 2 | 3; //功能类型1：实际菜单，2：权限，3：虚拟分组
   interfaceCodes: string[];
   icon: string;
-  routerUrl: string;
+  routeUrl: string;
   sort: number;
+  children?: FeatureItemType[];
+  parentId?: string;
+  level?: number;
 };
 
 export type BSConfigType = {
   systemLogo: string;
   systemName: string;
+  parterLogo: string[];
+  loginBG: string;
   icp: string[];
   openSocket: boolean;
   chromeDownloadUrl: string;
+  AppTimeOut: number;
+  shortcut: string;
+  download: { chrome: string; player: string };
+  [key: string]: any;
+};
+
+export type ThemeInfoType = {
+  vars: { [key: string]: string[] };
+  style: {
+    menuType: 'inline' | 'horizontal';
+    hasTab: boolean;
+  };
 };
 
-export type ConfigKey = 'app' | 'feature' | 'pFeature' | 'bs';
+export type ConfigKey = 'app' | 'feature' | 'featureIds' | 'bs' | 'theme';
 
 export type ConfigJOSN = {
-  app: AppItemType[];
-  feature: FeatureItemType[];
-  pFeature: FeatureItemType[];
+  app: { [key: string]: AppItemType };
+  features: FeatureItemType[];
+  featureIds: string[];
   bs: BSConfigType;
-  theme: any;
-  registerAppConfig: (conf: AppItemType) => void;
-  registerFeatrue: (conf: FeatureItemType[]) => void;
+  theme: ThemeInfoType;
+  registerAppConfig: (conf: AppItemType[]) => void;
+  registerFeatrueIds: (conf: string[]) => void;
   registerBSConfig: (conf: BSConfigType) => void;
   registerPlatformFeature: (conf: FeatureItemType[]) => void;
-  registerThemeConfig: (conf: { [key: string]: any }) => void;
-
+  registerThemeConfig: (conf: ThemeInfoType) => void;
+  getThemeVarValue: (themeKey: string) => string;
   [key: string]: any;
 };