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

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/AppRouter/index.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+interface AppRouterProps {
+    basename?: string;
+    children?: React.ReactNode;
+    static?: boolean;
+}
+declare function AppRouter({ children, ...props }: AppRouterProps): JSX.Element;
+export default AppRouter;

package/es/AppRouter/index.js

@@ -0,0 +1,17 @@
+import { __rest } from "tslib";
+import React from 'react';
+import { Router, Routes } from 'react-router-dom';
+import InstanceHistory from '../InstanceHistory';
+
+function AppRouter(_a) {
+  var children = _a.children,
+      props = __rest(_a, ["children"]);
+
+  return /*#__PURE__*/React.createElement(Router, Object.assign({}, props, {
+    navigator: InstanceHistory,
+    navigationType: InstanceHistory.action,
+    location: InstanceHistory.location
+  }), /*#__PURE__*/React.createElement(Routes, null, children));
+}
+
+export default AppRouter;

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,36 +1,66 @@
 import produce from 'immer';
-import { formartThemeConfig } from './utils';
+import { insertThemeStyle } from './utils';
 var Config = {
   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) {
       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 = formartThemeConfig(theme);
+      Object.keys(theme).forEach(function (key) {
+        draft[key] = theme[key];
+      });
     });
   },
   getThemeVarValue: function getThemeVarValue(themeKey) {

package/es/Config/interface.d.ts

@@ -21,14 +21,21 @@ export type FeatureItemType = {
   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 = {
@@ -39,19 +46,19 @@ export type ThemeInfoType = {
   };
 };
 
-export type ConfigKey = 'app' | 'feature' | 'pFeature' | 'bs';
+export type ConfigKey = 'app' | 'feature' | 'featureIds' | 'bs' | 'theme';
 
 export type ConfigJOSN = {
   app: { [key: string]: AppItemType };
-  feature: FeatureItemType[];
-  pFeature: FeatureItemType[];
+  features: FeatureItemType[];
+  featureIds: string[];
   bs: BSConfigType;
   theme: ThemeInfoType;
   registerAppConfig: (conf: AppItemType[]) => void;
-  registerFeatrue: (conf: FeatureItemType[]) => void;
+  registerFeatrueIds: (conf: string[]) => void;
   registerBSConfig: (conf: BSConfigType) => void;
   registerPlatformFeature: (conf: FeatureItemType[]) => void;
   registerThemeConfig: (conf: ThemeInfoType) => void;
-
+  getThemeVarValue: (themeKey: string) => string;
   [key: string]: any;
 };

package/es/Config/utils.d.ts

@@ -1,2 +1,2 @@
 import { ThemeInfoType } from './interface';
-export declare function formartThemeConfig(options: ThemeInfoType): ThemeInfoType;
+export declare function insertThemeStyle(options: ThemeInfoType): void;

package/es/Config/utils.js

@@ -20,7 +20,7 @@ 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>}';
@@ -40,6 +40,4 @@ export function formartThemeConfig(options) {
     isInit = true;
     document.head.appendChild(style);
   }
-
-  return options;
 }

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;