@cloud-app-dev/vidc 2.0.0-alpha.2 → 2.0.0-alpha.20

package/es/Config/utils.d.ts

@@ -1,16 +1,2 @@
-import { ConfigJOSN } from './interface';
-export declare function formartThemeConfig(options: ConfigJOSN): {
-    [x: string]: any;
-    app: import("./interface").AppItemType[];
-    feature: import("./interface").FeatureItemType[];
-    pFeature: import("./interface").FeatureItemType[];
-    bs: import("./interface").BSConfigType;
-    theme: any;
-    registerAppConfig: (conf: import("./interface").AppItemType) => void;
-    registerFeatrue: (conf: import("./interface").FeatureItemType[]) => void;
-    registerBSConfig: (conf: import("./interface").BSConfigType) => void;
-    registerPlatformFeature: (conf: import("./interface").FeatureItemType[]) => void;
-    registerThemeConfig: (conf: {
-        [key: string]: any;
-    }) => void;
-};
+import { ThemeInfoType } from './interface';
+export declare function insertThemeStyle(options: ThemeInfoType): void;

package/es/Config/utils.js

@@ -20,13 +20,10 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 var style = document.createElement('style');
 var isInit = false;
-export function formartThemeConfig(options) {
+export function insertThemeStyle(options) {
   var _ref;
 
   var tplStr = ':root{<content>}';
-  var data = Object.assign({}, options);
-  data.vars = {};
-  data.style = {};
 
   var attrArr = (_ref = []).concat.apply(_ref, _toConsumableArray(Object.values(options.vars)));
 
@@ -43,12 +40,4 @@ export function formartThemeConfig(options) {
     isInit = true;
     document.head.appendChild(style);
   }
-
-  if (options.style) {
-    Object.keys(options.style).forEach(function (k) {
-      data.style[k] = options.style[k];
-    });
-  }
-
-  return data;
 }

package/es/ConfigContext/index.d.ts

@@ -5,5 +5,18 @@ export interface IConfigContextProps {
      */
     root: HTMLElement;
 }
-declare const ConfigContext: React.Context<IConfigContextProps>;
-export default ConfigContext;
+interface IProviderProps {
+    getContainer: () => HTMLElement;
+    children: React.ReactNode;
+}
+declare function Provider({ getContainer, children }: IProviderProps): JSX.Element;
+declare namespace Provider {
+    var defaultProps: {
+        getContainer: () => HTMLElement;
+    };
+}
+declare const _default: {
+    Context: React.Context<IConfigContextProps>;
+    Provider: typeof Provider;
+};
+export default _default;

package/es/ConfigContext/index.js

@@ -1,3 +1,25 @@
-import React from 'react';
-var ConfigContext = /*#__PURE__*/React.createContext(null);
-export default ConfigContext;
+import React, { useMemo } from 'react';
+var Context = /*#__PURE__*/React.createContext(null);
+
+function Provider(_ref) {
+  var getContainer = _ref.getContainer,
+      children = _ref.children;
+  var root = useMemo(function () {
+    return getContainer();
+  }, [getContainer]);
+  return /*#__PURE__*/React.createElement(Context.Provider, {
+    value: {
+      root: root
+    }
+  }, children);
+}
+
+Provider.defaultProps = {
+  getContainer: function getContainer() {
+    return document.body;
+  }
+};
+export default {
+  Context: Context,
+  Provider: Provider
+};

package/es/DeviceSelect/TreeType.d.ts

@@ -0,0 +1,6 @@
+interface ITreeTypeProps {
+    mode: string;
+    onChange: (mode: string) => void;
+}
+declare function TreeType({ mode, onChange }: ITreeTypeProps): JSX.Element;
+export default TreeType;

package/es/DeviceSelect/TreeType.js

@@ -0,0 +1,36 @@
+import "antd/lib/menu/style";
+import _Menu from "antd/lib/menu";
+import "antd/lib/dropdown/style";
+import _Dropdown from "antd/lib/dropdown";
+import React from 'react';
+import IconFont from '../IconFont';
+
+function TreeType(_ref) {
+  var mode = _ref.mode,
+      onChange = _ref.onChange;
+  return /*#__PURE__*/React.createElement(_Dropdown, {
+    overlay: /*#__PURE__*/React.createElement(_Menu, {
+      onClick: function onClick(info) {
+        return onChange(info.key);
+      }
+    }, /*#__PURE__*/React.createElement(_Menu.Item, {
+      style: {
+        fontSize: 12
+      },
+      key: "Bz"
+    }, "\u8BBE\u5907\u4E1A\u52A1\u6811"), /*#__PURE__*/React.createElement(_Menu.Item, {
+      style: {
+        fontSize: 12
+      },
+      key: "Place"
+    }, "\u884C\u653F\u533A\u5212"))
+  }, /*#__PURE__*/React.createElement("span", null, mode === 'Place' ? '行政区划' : '设备业务树', " ", /*#__PURE__*/React.createElement(IconFont, {
+    style: {
+      position: 'relative',
+      top: 1
+    },
+    type: "icon-S_Arrow_BigDown"
+  })));
+}
+
+export default TreeType;

package/es/DeviceSelect/demo.js

@@ -10,11 +10,11 @@ function App() {
     style: {
       padding: 20,
       width: 1000,
-      height: 500
+      height: 700
     }
   }, /*#__PURE__*/React.createElement("div", {
     style: {
-      height: 400
+      height: 660
     }
   }, /*#__PURE__*/React.createElement(DeviceSelect, null))));
 }

package/es/DeviceSelect/index.css

@@ -1,6 +1,11 @@
 .vidc-device-select-layout {
   height: 100%;
+  display: flex;
 }
-.vidc-device-select-layout > .cloudapp-col {
+.vidc-device-select-layout > div {
   height: 100%;
+  flex: 1;
+}
+.vidc-device-select-layout > div:first-child.bc-type-tree-layout {
+  border-right: none;
 }

package/es/DeviceSelect/index.d.ts

@@ -4,4 +4,9 @@ interface IDeviceSelectProps {
     selectDevices?: DeviceItemType[];
 }
 declare function DeviceSelect({ selectDevices }: IDeviceSelectProps): JSX.Element;
+declare namespace DeviceSelect {
+    var defaultProps: {
+        className: string;
+    };
+}
 export default DeviceSelect;

package/es/DeviceSelect/index.js

@@ -1,12 +1,3 @@
-import "antd/lib/menu/style";
-import _Menu from "antd/lib/menu";
-import "antd/lib/dropdown/style";
-import _Dropdown from "antd/lib/dropdown";
-import "antd/lib/col/style";
-import _Col from "antd/lib/col";
-import "antd/lib/row/style";
-import _Row from "antd/lib/row";
-
 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."); }
@@ -28,11 +19,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import TreeMode from '../TreeMode';
-import DynamicDeviceList from '../DynamicDeviceList';
-import DeviceList from '../DeviceList';
+import TreeMode from '../Tree';
+import DynamicDeviceList from '../List/DynamicDeviceList';
+import DeviceList from '../List/DeviceList';
 import { uniq, uniqBy } from 'lodash';
-import IconFont from '../IconFont';
+import TreeType from './TreeType';
 import "./index.css";
 
 function DeviceSelect(_ref) {
@@ -162,61 +153,39 @@ function DeviceSelect(_ref) {
   var treeSelectedKeys = useMemo(function () {
     return state.mode === 'Bz' ? [state.buzGroupId] : [state.areaCode];
   }, [state.mode, state.buzGroupId, state.areaCode]);
-  return /*#__PURE__*/React.createElement(_Row, {
+  return /*#__PURE__*/React.createElement("div", {
     className: "vidc-device-select-layout"
-  }, /*#__PURE__*/React.createElement(_Col, {
-    span: 7
   }, /*#__PURE__*/React.createElement(TreeMode, {
-    key: state.mode,
     mode: state.mode,
     inputPlaceholder: "\u8BF7\u8F93\u5165\u540D\u79F0",
     onSelect: onSelectTree,
     selectedKeys: treeSelectedKeys,
-    title: /*#__PURE__*/React.createElement(_Dropdown, {
-      overlay: /*#__PURE__*/React.createElement(_Menu, {
-        onClick: function onClick(info) {
-          return setState(function (old) {
-            return Object.assign(Object.assign({}, old), {
-              mode: info.key
-            });
+    title: /*#__PURE__*/React.createElement(TreeType, {
+      mode: state.mode,
+      onChange: function onChange(mode) {
+        return setState(function (old) {
+          return Object.assign(Object.assign({}, old), {
+            mode: mode
           });
-        }
-      }, /*#__PURE__*/React.createElement(_Menu.Item, {
-        style: {
-          fontSize: 12
-        },
-        key: "Bz"
-      }, "\u8BBE\u5907\u4E1A\u52A1\u6811"), /*#__PURE__*/React.createElement(_Menu.Item, {
-        style: {
-          fontSize: 12
-        },
-        key: "Place"
-      }, "\u884C\u653F\u533A\u5212"))
-    }, /*#__PURE__*/React.createElement("span", null, state.mode === 'Place' ? '行政区划' : '设备业务树', " ", /*#__PURE__*/React.createElement(IconFont, {
-      style: {
-        position: 'relative',
-        top: 1
-      },
-      type: "icon-S_Arrow_BigDown"
-    })))
-  })), /*#__PURE__*/React.createElement(_Col, {
-    span: 8
-  }, /*#__PURE__*/React.createElement(DynamicDeviceList, {
+        });
+      }
+    })
+  }), /*#__PURE__*/React.createElement(DynamicDeviceList, {
     title: "\u8BBE\u5907\u5217\u8868",
     onChecked: onCheked1,
+    key: state.mode,
     checkedKeys: state.tempSelectIds,
     params: listParams
-  })), /*#__PURE__*/React.createElement(_Col, {
-    span: 1
-  }), /*#__PURE__*/React.createElement(_Col, {
-    span: 8
-  }, /*#__PURE__*/React.createElement(DeviceList, {
+  }), /*#__PURE__*/React.createElement(DeviceList, {
     itemKey: "cid",
     deviceList: state.selectDevices || [],
     onChecked: onCheked2,
     checkedKeys: state.selectIds,
     title: "\u5DF2\u9009\u8BBE\u5907\u5217\u8868"
-  })));
+  }));
 }
 
+DeviceSelect.defaultProps = {
+  className: ''
+};
 export default DeviceSelect;

package/es/Dict/desc.js

@@ -1,12 +1,12 @@
-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); }
 
 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); }
 

package/es/Dict/utils.js

@@ -4,7 +4,7 @@ export function queryByTypeCode(typeCode) {
   var headers = {
     Authorization: _cache.getCache('token', 'session')
   };
-  return Service.$http({
+  return Service.http({
     url: "/api/dictionary/v1/queryByTypeCode/".concat(typeCode),
     method: 'get',
     requestId: 'queryByTypeCode',
@@ -18,7 +18,7 @@ export function queryByTypeCodes() {
   var headers = {
     Authorization: _cache.getCache('token', 'session')
   };
-  return Service.$http({
+  return Service.http({
     url: "/api/dictionary/v1/queryDictionaryListByCondition",
     method: 'post',
     requestId: 'queryByTypeCode',
@@ -30,7 +30,7 @@ export function queryByTypeCodes() {
   });
 }
 export function queryTypeCodes() {
-  return Service.$http({
+  return Service.http({
     url: "/micro-apps/micro-dep-librarys/config/typeCodes.json",
     method: 'get',
     requestId: 'queryTypeCodes'

package/es/IconFont/index.d.ts

@@ -1,5 +1,4 @@
 import React from 'react';
-import './index.less';
 interface IconFontProps extends React.HTMLAttributes<HTMLSpanElement> {
     type?: string;
     className?: string;

package/es/IconFont/index.js

@@ -1,20 +1,9 @@
-import _SocketEmitter from "@cloud-app-dev/utils/es/SocketEmitter";
 import { __rest } from "tslib";
 import React from 'react';
-import "./index.css";
 var global = window;
 
-function registerIconFont(scriptUrl) {
-  if (!global._ICON_IS_INIT_) {
-    global._ICON_SCRIPT_URL = scriptUrl;
-    global._ICON_IS_INIT_ = true;
-    loadScript(scriptUrl).then(function () {
-      _SocketEmitter.emit('update-iconfont', null);
-    }).catch(function (e) {
-      console.error(e);
-      global._ICON_IS_INIT_ = false;
-    });
-  }
+if (!global._ICON_SCRIPT_URL) {
+  global._ICON_SCRIPT_URL = {};
 }
 
 function loadScript(url) {
@@ -31,6 +20,16 @@ function loadScript(url) {
   });
 }
 
+function registerIconFont(scriptUrl) {
+  if (!global._ICON_SCRIPT_URL[scriptUrl]) {
+    global._ICON_SCRIPT_URL[scriptUrl] = true;
+    loadScript(scriptUrl).catch(function (e) {
+      global._ICON_SCRIPT_URL[scriptUrl] = false;
+      console.error(e);
+    });
+  }
+}
+
 function IconFont(_a) {
   var type = _a.type,
       _a$className = _a.className,

package/es/InitialConfig/index.js

@@ -13,7 +13,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useState, useEffect } from 'react';
 import Dict from '../Dict';
 import Config from '../Config';
-import { querySystemConfig, queryMicroApplicationList, querySystemUpdate } from './utils';
+import { queryBSConfig, queryMicroApplicationList, querySystemUpdate } from './utils';
 
 function InitialConfig(_ref) {
   var children = _ref.children,
@@ -30,7 +30,7 @@ function InitialConfig(_ref) {
 
   Dict.useTypeCodes();
   useEffect(function () {
-    Promise.all([querySystemConfig(), queryMicroApplicationList(), querySystemUpdate()]).then(function (_ref2) {
+    Promise.all([queryBSConfig(), queryMicroApplicationList(), querySystemUpdate()]).then(function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 3),
           BSConfig = _ref3[0],
           AppConfig = _ref3[1],

package/es/InitialConfig/utils.d.ts

@@ -2,7 +2,7 @@
  *
  * @description 获取系统配置
  */
-export declare function querySystemConfig(): Promise<any>;
+export declare function queryBSConfig(): Promise<any>;
 /**
  *
  * @description 获取所有微应用配置

package/es/InitialConfig/utils.js

@@ -5,38 +5,21 @@ import Service from '../Service';
  * @description 获取系统配置
  */
 
-export function querySystemConfig() {
+export function queryBSConfig() {
   return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    var res1;
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return Service.$http({
-              url: '/api/micro/configure/v1/queryConfigureIsDefaultByType/1',
-              requestId: 'systemConfig'
-            }).catch(function () {
-              return false;
+            return Service.http({
+              url: '/api/system/config/web'
             });
 
           case 2:
-            res1 = _context.sent;
+            return _context.abrupt("return", _context.sent.data);
 
-            if (!(res1 && res1.data && res1.data.info)) {
-              _context.next = 5;
-              break;
-            }
-
-            return _context.abrupt("return", res1.data.info);
-
-          case 5:
-            return _context.abrupt("return", Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/systemConfig.json?".concat(Date.now()),
-              requestId: 'systemConfig'
-            }));
-
-          case 6:
+          case 3:
           case "end":
             return _context.stop();
         }
@@ -51,22 +34,19 @@ export function querySystemConfig() {
 
 export function queryMicroApplicationList() {
   return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-    var res;
     return regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return Service.$http({
-              url: "/api/micro/microApplication/v1/queryMicroApplicationList",
-              requestId: 'appConfig'
+            return Service.http({
+              url: "/api/app/list"
             });
 
           case 2:
-            res = _context2.sent;
-            return _context2.abrupt("return", res.data);
+            return _context2.abrupt("return", _context2.sent.data);
 
-          case 4:
+          case 3:
           case "end":
             return _context2.stop();
         }
@@ -85,11 +65,8 @@ export function querySystemUpdate() {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            return _context3.abrupt("return", Service.$http({
-              url: "/micro-apps/micro-dep-librarys/config/systemUpdate.json?".concat(Date.now()),
-              requestId: 'querySystemUpdate'
-            }).catch(function () {
-              return {};
+            return _context3.abrupt("return", Service.http({
+              url: "/api/system/config/updateStatus?".concat(Date.now())
             }));
 
           case 1:

package/es/InitialRequest/index.d.ts

@@ -3,5 +3,5 @@ interface IInitialRequestProps {
     children: React.ReactNode;
     Spin?: React.ReactNode;
 }
-declare function InitialRequest({ children, Spin }: IInitialRequestProps): React.ReactNode;
+declare function InitialRequest({ children, Spin }: IInitialRequestProps): JSX.Element;
 export default InitialRequest;

package/es/InitialRequest/index.js

@@ -1,3 +1,5 @@
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
+
 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."); }
@@ -11,7 +13,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter } from "tslib";
-import { useState, useEffect, useContext } from 'react';
+import React, { useState, useEffect, useContext } from 'react';
 import { initialization } from './utils';
 import AppContext from '../AppContext';
 import Config from '../Config';
@@ -40,7 +42,7 @@ function InitialRequest(_ref) {
 
     var init = function init() {
       return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-        var _yield$initialization, userPrivileges, centerPrivileges, centerInfo, userInfo;
+        var _yield$initialization, userFeatures, operationInfo, systemFeatures, userInfo, themeConfig;
 
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
@@ -51,18 +53,24 @@ function InitialRequest(_ref) {
 
               case 2:
                 _yield$initialization = _context.sent;
-                userPrivileges = _yield$initialization.userPrivileges;
-                centerPrivileges = _yield$initialization.centerPrivileges;
-                centerInfo = _yield$initialization.centerInfo;
+                userFeatures = _yield$initialization.userFeatures;
+                operationInfo = _yield$initialization.operationInfo;
+                systemFeatures = _yield$initialization.systemFeatures;
                 userInfo = _yield$initialization.userInfo;
+                themeConfig = _yield$initialization.themeConfig;
                 updateUser(userInfo);
-                updateOperation(centerInfo);
-                Config.registerFeatrue(userPrivileges);
-                Config.registerPlatformFeature(centerPrivileges);
-                setIsInit(true);
+                updateOperation(operationInfo);
+                Config.registerFeatrueIds(userFeatures);
+                Config.registerPlatformFeature(systemFeatures);
+                Config.registerThemeConfig(themeConfig);
+
+                _nextTick(function () {
+                  return setIsInit(true);
+                });
+
                 _BASE_DATA_INIT = true;
 
-              case 13:
+              case 15:
               case "end":
                 return _context.stop();
             }
@@ -77,7 +85,7 @@ function InitialRequest(_ref) {
       console.error('接口初始化失败！', e);
     }
   }, []);
-  return isInit ? children : Spin ? Spin : null;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, isInit ? children : Spin ? Spin : null);
 }
 
 export default InitialRequest;

package/es/InitialRequest/utils.d.ts

@@ -1,8 +1,9 @@
 import { UserInfoType, OperationInfoType } from '../AppContext/interface';
-import { FeatureItemType } from '../Config/interface';
+import { FeatureItemType, ThemeInfoType } from '../Config/interface';
 export declare function initialization(): Promise<{
     userInfo: UserInfoType;
-    userPrivileges: FeatureItemType[];
-    centerPrivileges: FeatureItemType[];
-    centerInfo: OperationInfoType;
+    userFeatures: string[];
+    systemFeatures: FeatureItemType[];
+    operationInfo: OperationInfoType;
+    themeConfig: ThemeInfoType;
 }>;