@cloud-app-dev/vidc 2.0.0-alpha.13 → 2.0.0-alpha.17

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.js

@@ -1,6 +1,5 @@
 import React, { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
-import useNavigate from '../useNavigate';
+import { useLocation, useNavigate } from 'react-router-dom';
 import "./index.css";
 
 var getKey = function getKey() {

package/es/AppRoute/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { IAppRouteProps } from './interface';
-declare class AppRoute extends React.PureComponent<IAppRouteProps, any> {
-    private isRender;
+declare class AppRoute extends React.Component<IAppRouteProps, any> {
+    static defaultProps: IAppRouteProps;
     constructor(props: IAppRouteProps);
     shouldComponentUpdate(props: IAppRouteProps): boolean;
     componentWillUnmount(): void;

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 _cache from "@cloud-app-dev/utils/es/cache";
-import _useUnmount from "ahooks/es/useUnmount";
 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,27 +23,23 @@ 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 { Route } from 'react-router-dom';
+import { Route, Routes } from 'react-router-dom';
 var _global = window;
 
 function RenderSingleRoute(_ref) {
-  var onMount = _ref.onMount,
-      onUnmount = _ref.onUnmount;
+  var onMount = _ref.onMount;
 
   _useMount(function () {
     return onMount();
   });
 
-  _useUnmount(function () {
-    return onUnmount();
-  });
-
   return /*#__PURE__*/React.createElement(React.Fragment, null);
 }
 
-var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
-  _inherits(AppRoute, _React$PureComponent);
+var AppRoute = /*#__PURE__*/function (_React$Component) {
+  _inherits(AppRoute, _React$Component);
 
   var _super = _createSuper(AppRoute);
 
@@ -53,11 +48,9 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
 
     _classCallCheck(this, AppRoute);
 
-    _this = _super.call(this, props); //可能存在路由创建但是没有render 导致UI无法渲染
-
-    _this.isRender = false;
+    _this = _super.call(this, props);
     _this.state = {
-      isMatch: false
+      matchIndex: -1
     };
     return _this;
   }
@@ -65,11 +58,14 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
   _createClass(AppRoute, [{
     key: "shouldComponentUpdate",
     value: function shouldComponentUpdate(props) {
-      if (!_global._IS_RUN_MICRO_BASIC || !this.isRender || _global._IS_ALLOW_ROUTE_RENDER) {
-        return true;
+      var tabId = props.currentId || _cache.getCache('currentTabKey', 'session');
+
+      if (_global._IS_RUN_MICRO_BASIC && tabId !== props.tabId) {
+        // 页签变化拦截
+        return false;
       }
 
-      return (props.currentId || _cache.getCache('currentTabKey', 'session')) === props.tabId;
+      return true;
     }
   }, {
     key: "componentWillUnmount",
@@ -81,35 +77,34 @@ var AppRoute = /*#__PURE__*/function (_React$PureComponent) {
     value: function render() {
       var _this2 = this;
 
-      var _this$props = this.props,
-          element = _this$props.element,
-          path = _this$props.path;
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Route, {
-        path: path,
-        element: /*#__PURE__*/React.createElement(RenderSingleRoute, {
-          onMount: function onMount() {
-            return _this2.setState({
-              isMatch: true
-            });
-          },
-          onUnmount: function onUnmount() {
-            return _this2.setState({
-              isMatch: false
-            });
-          }
-        })
-      }), this.state.isMatch && element, /*#__PURE__*/React.createElement(RenderSingleRoute, {
-        onMount: function onMount() {
-          return _this2.isRender = true;
-        },
-        onUnmount: function onUnmount() {
-          return _this2.isRender = false;
-        }
-      }));
+      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;
+      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.PureComponent);
+}(React.Component);
 
+AppRoute.defaultProps = {
+  routes: []
+};
 export default AppRoute;

package/es/AppRoute/interface.d.ts

@@ -1,7 +1,7 @@
 import * as H from 'history';
 import { RouteProps } from 'react-router-dom';
 
-export interface IAppRouteProps extends RouteProps, IAppRouteType {
+export interface IAppRouteProps {
   routes?: RouteProps[];
   tabId?: string;
   currentId?: string;

package/es/AutoExit/index.js

@@ -1,6 +1,6 @@
 import _nextTick from "@cloud-app-dev/utils/es/nextTick";
 import React, { useContext, useEffect } from 'react';
-import useNavigate from '../useNavigate';
+import { useNavigate } from 'react-router-dom';
 import AppContext from '../AppContext';
 
 function AutoExit(_ref) {

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/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/InitialConfig/utils.js

@@ -12,7 +12,7 @@ export function queryBSConfig() {
         switch (_context.prev = _context.next) {
           case 0:
             _context.next = 2;
-            return Service.$http({
+            return Service.http({
               url: '/api/system/config/web'
             });
 
@@ -39,7 +39,7 @@ export function queryMicroApplicationList() {
         switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
-            return Service.$http({
+            return Service.http({
               url: "/api/app/list"
             });
 
@@ -65,7 +65,7 @@ export function querySystemUpdate() {
       while (1) {
         switch (_context3.prev = _context3.next) {
           case 0:
-            return _context3.abrupt("return", Service.$http({
+            return _context3.abrupt("return", Service.http({
               url: "/api/system/config/updateStatus?".concat(Date.now())
             }));
 

package/es/InitialRequest/utils.js

@@ -28,7 +28,7 @@ export function initialization() {
               Authorization: _cache.getCache('token', 'session')
             };
             _context.next = 3;
-            return Service.$http({
+            return Service.http({
               url: '/api/user/v1/getUserByToken',
               method: 'post',
               headers: headers
@@ -44,28 +44,28 @@ export function initialization() {
             systemFeatureUrl = "/api/system/".concat(systemId, "/list");
             themeConfigUrl = '/api/system/config/type';
             _context.next = 13;
-            return Promise.all([Service.$http({
+            return Promise.all([Service.http({
               url: centerUrl,
               headers: headers,
               data: {
                 id: systemId
               },
               method: 'post'
-            }), Service.$http({
+            }), Service.http({
               url: userPrivilegesUrl,
               headers: headers,
               data: {
                 id: userId
               },
               method: 'post'
-            }), Service.$http({
+            }), Service.http({
               url: systemFeatureUrl,
               headers: headers,
               data: {
                 id: systemId
               },
               method: 'get'
-            }), Service.$http({
+            }), Service.http({
               url: themeConfigUrl,
               headers: headers,
               data: {

package/es/InstanceHistory/index.d.ts

@@ -0,0 +1,3 @@
+import type { History } from 'history';
+declare const InstanceHistory: History<unknown>;
+export default InstanceHistory;

package/es/InstanceHistory/index.js

@@ -0,0 +1,9 @@
+import { createBrowserHistory } from 'history';
+var _global = window;
+
+if (!_global._BSIC_HISTORY_) {
+  _global._BSIC_HISTORY_ = createBrowserHistory();
+}
+
+var InstanceHistory = _global._BSIC_HISTORY_;
+export default InstanceHistory;

package/es/List/DynamicDeviceList/utils.js

@@ -3,7 +3,7 @@ import Service from '../../Service';
 import { getHeader } from '../../utils';
 export function queryDeviceList() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return Service.$http({
+  return Service.http({
     method: 'post',
     url: '/api/udm-api/device/queryList',
     requestId: 'queryDeviceList',

package/es/LoaderApp/index.js

@@ -42,18 +42,29 @@ function LoaderApp(_ref) {
     var config = getMicroConfig(appConfig, appProps, domRef.current);
 
     if (!config) {
-      console.debug('微应用不存在', 'config ->', appConfig, 'appProps ->', appProps);
+      console.error('微应用不存在', 'config ->', appConfig, 'appProps ->', appProps);
+      return undefined;
+    }
+
+    if (!domRef.current || !styleRef.current) {
+      console.error('LoaderApp组件未正常初始化！', 'config ->', appConfig, 'appProps ->', appProps);
       return undefined;
     }
 
     var props = Object.assign(Object.assign({}, appProps), {
       container: domRef.current
     });
+    var routerPrefix = config.routerPrefix;
+
+    var _appConfig$resource = _slicedToArray(appConfig.resource, 2),
+        script = _appConfig$resource[0],
+        style = _appConfig$resource[1];
+
     var options = {
-      script: appConfig.resource[0],
-      style: appConfig.resource[1],
-      name: config.name,
-      prefix: ".".concat(appConfig.name, "-").concat(id),
+      script: script,
+      style: style,
+      name: routerPrefix,
+      prefix: ".".concat(routerPrefix, "-").concat(id),
       styleNode: styleRef.current
     };
     LoaderModule(options).then(function (mod) {
@@ -108,7 +119,6 @@ function LoaderApp(_ref) {
       var props = Object.assign(Object.assign({}, appProps), {
         container: domRef.current
       });
-      console.debug('执行更新！', appProps);
       loadedAppRef.current.update && loadedAppRef.current.update(props);
     }
   }, [appProps.currentId, appProps.tabId, appProps.updateTime]);

package/es/LoaderApp/utils.d.ts

@@ -1,6 +1,7 @@
 import { AppItemType } from '../Config/interface';
 export declare const getMicroConfig: (appConfig: AppItemType, appProps: any, container: HTMLDivElement) => {
-    name: string;
+    title: string;
+    routerPrefix: string;
     container: HTMLDivElement;
     props: any;
     entry: {

package/es/LoaderApp/utils.js

@@ -3,14 +3,16 @@ export var getMicroConfig = function getMicroConfig() {
   var appProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var container = arguments.length > 2 ? arguments[2] : undefined;
   var routerPrefix = appConfig.routerPrefix,
-      resource = appConfig.resource;
+      resource = appConfig.resource,
+      name = appConfig.name;
   var microAppEntry = {
     scripts: [resource[0]],
     styles: [resource[1]],
     html: "<div id=\"".concat(routerPrefix, "\" style=\"height:100%\"></div>")
   };
   return {
-    name: routerPrefix,
+    title: name,
+    routerPrefix: routerPrefix,
     container: container,
     props: appProps,
     entry: microAppEntry

package/es/Picture/component/MoveContent/index.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/RefDrawer/index.js

@@ -15,7 +15,7 @@ import Drawer from '../Drawer';
 import ConfigContext from '../ConfigContext';
 
 function RefDrawer(_, ref) {
-  var context = useContext(ConfigContext);
+  var context = useContext(ConfigContext.Context);
   var root = useMemo(function () {
     return (context === null || context === void 0 ? void 0 : context.root) || document.body;
   }, [context === null || context === void 0 ? void 0 : context.root]);

package/es/RefModal/index.js

@@ -15,7 +15,7 @@ import Modal from '../Modal';
 import ConfigContext from '../ConfigContext';
 
 function RefModal(_, ref) {
-  var context = useContext(ConfigContext);
+  var context = useContext(ConfigContext.Context);
   var root = useMemo(function () {
     return (context === null || context === void 0 ? void 0 : context.root) || document.body;
   }, [context === null || context === void 0 ? void 0 : context.root]);

package/es/Service/http.d.ts

@@ -1,4 +1,6 @@
-import { RsponseType, XHRResponse } from './interface';
-export declare function $http(options: RsponseType): import("fetch-like-axios").AxiosPromise<any>;
-export declare const $httpMultiPartInstance: import("fetch-like-axios").AxiosInstance;
-export declare const $httpXMLInstance: ({ url, method, data, headers, cancelHttp, isAsync }: XHRResponse) => Promise<unknown>;
+import { AxiosInstance } from 'fetch-like-axios';
+import type { RsponseType, XHRResponse } from './interface';
+declare function http({ cancelHttp, ...newOptions }: RsponseType): Promise<any>;
+declare const httpMultiPartInstance: AxiosInstance;
+declare function httpXMLInstance({ url, method, data, headers, cancelHttp, isAsync }: XHRResponse): Promise<any>;
+export { http as default, http, httpMultiPartInstance, httpXMLInstance };

package/es/Service/http.js

@@ -1,7 +1,7 @@
 import { __rest } from "tslib";
-import fetchAxios from 'fetch-like-axios';
+import Axios from 'fetch-like-axios';
 import * as Middleware from './middleware';
-var CancelToken = fetchAxios.CancelToken;
+var CancelToken = Axios.CancelToken;
 var config = {
   baseURL: '/',
   timeout: 60 * 1000,
@@ -11,7 +11,7 @@ var config = {
     'Content-Type': 'application/json; charset=utf-8'
   }
 };
-var httpInstance = fetchAxios.create(config);
+var httpInstance = Axios.create(config);
 /**
  * 请求之前拦截动作
  */
@@ -49,36 +49,38 @@ httpInstance.interceptors.response.use(function (response) {
 
   return Promise.reject(error.response);
 });
-export function $http(options) {
+
+function http(_a) {
+  var cancelHttp = _a.cancelHttp,
+      newOptions = __rest(_a, ["cancelHttp"]);
+
   var cancel;
   var cancelToken = new CancelToken(function (c) {
     cancel = c;
 
-    if (options.cancelHttp) {
-      options.cancelHttp(cancel);
+    if (cancelHttp) {
+      cancelHttp(cancel);
     }
   });
-
-  var cancelHttp = options.cancelHttp,
-      newOptions = __rest(options, ["cancelHttp"]);
-
   return httpInstance(Object.assign(Object.assign({}, newOptions), {
     cancelToken: cancelToken
   }));
 }
-export var $httpMultiPartInstance = fetchAxios.create({
+
+var httpMultiPartInstance = Axios.create({
   xhrMode: 'fetch',
   timeout: 10 * 60 * 1000,
   headers: {
     'Content-Type': 'multipart/form-data'
   }
 });
-$httpMultiPartInstance.interceptors.response.use(function (response) {
+httpMultiPartInstance.interceptors.response.use(function (response) {
   return Promise.resolve(response.data);
 }, function (error) {
   return Promise.reject(error);
 });
-export var $httpXMLInstance = function xhrRequest(_ref) {
+
+function httpXMLInstance(_ref) {
   var url = _ref.url,
       _ref$method = _ref.method,
       method = _ref$method === void 0 ? 'GET' : _ref$method,
@@ -126,4 +128,6 @@ export var $httpXMLInstance = function xhrRequest(_ref) {
 
     xhr.send(data ? JSON.stringify(data) : null);
   });
-};
+}
+
+export { http as default, http, httpMultiPartInstance, httpXMLInstance };

package/es/Service/index.d.ts

@@ -1,3 +1,3 @@
-import { IServiceInterface } from './interface';
-declare let proxy: IServiceInterface;
-export default proxy;
+import type { IServiceInterface } from './interface';
+declare const Service: IServiceInterface;
+export default Service;

package/es/Service/index.js

@@ -1,14 +1,10 @@
-import { $http, $httpMultiPartInstance, $httpXMLInstance } from './http';
+import { http, httpMultiPartInstance, httpXMLInstance } from './http';
 import { registerResponseMiddleware, registerResponseErrorMiddleware } from './middleware';
-import produce from 'immer';
-import * as logger from './logger';
-var ServiceInterface = {
-  $http: $http,
-  $httpXMLInstance: $httpXMLInstance,
-  $httpMultiPartInstance: $httpMultiPartInstance,
+var Service = {
+  http: http,
+  httpXMLInstance: httpXMLInstance,
+  httpMultiPartInstance: httpMultiPartInstance,
   registerResponseMiddleware: registerResponseMiddleware,
-  registerResponseErrorMiddleware: registerResponseErrorMiddleware,
-  logger: logger
+  registerResponseErrorMiddleware: registerResponseErrorMiddleware
 };
-var proxy = produce(ServiceInterface, function () {});
-export default proxy;
+export default Service;

package/es/Service/interface.d.ts

@@ -1,8 +1,4 @@
-import { AxiosRequestConfig } from 'fetch-like-axios';
-
-export type loggerType = {
-  save(options: { description: string; module: string | number; function: string | number }, token?: string): Promise<any>;
-};
+import type { AxiosInstance, AxiosRequestConfig } from 'fetch-like-axios';
 
 export type RsponseType = AxiosRequestConfig & { requestId?: string; cancelHttp?: (cancel: Function) => void; loggerIndex?: number };
 
@@ -19,10 +15,9 @@ export type XHRResponse = {
 export type MiddleWareType = (config: any) => any;
 
 export type IServiceInterface = {
-  $http(options: RsponseType): Promise<any>;
-  $httpXMLInstance(options: XHRResponse): Promise<any>;
-  $httpMultiPartInstance(options: AxiosRequestConfig): Promise<any>;
+  http(options: RsponseType): Promise<any>;
+  httpXMLInstance(options: XHRResponse): Promise<any>;
+  httpMultiPartInstance: AxiosInstance;
   registerResponseMiddleware(fn: MiddleWareType): void;
   registerResponseErrorMiddleware(fn: MiddleWareType): void;
-  logger: loggerType;
 };

package/es/Service/middleware.d.ts

@@ -1,4 +1,4 @@
-import { MiddleWareType } from './interface';
+import type { MiddleWareType } from './interface';
 export declare const responseMiddleware: Array<any>;
 export declare const responseErrorMiddleware: Array<any>;
 export declare function registerResponseMiddleware(fn: MiddleWareType): void;

package/es/WorkerFlow/Form/LevelGroupSelect.js

@@ -99,7 +99,7 @@ function LevelGroupSelect(_ref) {
       users: state.userList,
       chargeLevel: state.chargeLevel
     });
-  }, [state.userList, state.chargeLevel]);
+  }, [state.userList, state.chargeLevel, onChange]);
   var renderList = useMemo(function () {
     return formatRenderGroup(state.userList);
   }, [state.userList]);

package/es/WorkerFlow/index.js

@@ -1,4 +1,5 @@
 import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+import _useCreation from "ahooks/es/useCreation";
 import "antd/lib/modal/style";
 import _Modal from "antd/lib/modal";
 
@@ -23,7 +24,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 React, { useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useImperativeHandle, useRef, useState } from 'react';
 import { OptionTypes, NodeTemplates, NodeTypes, createVNodeApprover } from './Nodes/Constants';
 import { downloadBpmnFile, exportBpmnFile as _exportBpmnFile } from './XML';
 import { createId, getEndEventId } from './XML/utils';
@@ -260,15 +261,18 @@ function WorkerFlow(_ref, ref) {
     }
   }
 
-  var endId = useMemo(function () {
+  var endId = _useCreation(function () {
     return getEndEventId(config);
   }, []);
-  var id = useMemo(function () {
+
+  var id = _useCreation(function () {
     return (_data === null || _data === void 0 ? void 0 : _data.id) || createId('Process_001');
   }, []);
-  var name = useMemo(function () {
+
+  var name = _useCreation(function () {
     return (_data === null || _data === void 0 ? void 0 : _data.name) || "\u5DE5\u4F5C\u6D41_".concat(id);
   }, [id]);
+
   var getConfig = useCallback(function () {
     var newConfig = filterNoticeNode(config);
 
@@ -286,7 +290,7 @@ function WorkerFlow(_ref, ref) {
       taskList: taskList,
       useFormKeys: useFormKeys
     };
-  }, [config]);
+  }, [config, id, name]);
   /**
    * @description onChange传递数据
    */
@@ -303,7 +307,7 @@ function WorkerFlow(_ref, ref) {
     return {
       getConfig: getConfig
     };
-  }, [config]);
+  }, [getConfig]);
   return /*#__PURE__*/React.createElement(WFC.Provider, {
     value: {
       config: config,

package/es/index.d.ts

@@ -20,6 +20,7 @@ export { default as ImageView } from './ImageView';
 export { default as InitialConfig } from './InitialConfig';
 export { default as InitialRequest } from './InitialRequest';
 export { default as Input } from './Input';
+export { default as InstanceHistory } from './InstanceHistory';
 export { default as LabelValue } from './LabelValue';
 export { default as List } from './List';
 export { default as LoaderApp } from './LoaderApp';
@@ -35,8 +36,8 @@ export { default as ThemeAntd } from './ThemeAntd';
 export { default as Title } from './Title';
 export { default as Tree } from './Tree';
 export { default as useDrawer } from './useDrawer';
+export { default as useHistory } from './useHistory';
 export { default as useHttp } from './useHttp';
 export { default as useModal } from './useModal';
-export { default as useNavigate } from './useNavigate';
 export { default as UserSelect } from './UserSelect';
 export { default as WorkerFlow } from './WorkerFlow';

package/es/index.js

@@ -20,6 +20,7 @@ export { default as ImageView } from './ImageView';
 export { default as InitialConfig } from './InitialConfig';
 export { default as InitialRequest } from './InitialRequest';
 export { default as Input } from './Input';
+export { default as InstanceHistory } from './InstanceHistory';
 export { default as LabelValue } from './LabelValue';
 export { default as List } from './List';
 export { default as LoaderApp } from './LoaderApp';
@@ -35,8 +36,8 @@ export { default as ThemeAntd } from './ThemeAntd';
 export { default as Title } from './Title';
 export { default as Tree } from './Tree';
 export { default as useDrawer } from './useDrawer';
+export { default as useHistory } from './useHistory';
 export { default as useHttp } from './useHttp';
 export { default as useModal } from './useModal';
-export { default as useNavigate } from './useNavigate';
 export { default as UserSelect } from './UserSelect';
 export { default as WorkerFlow } from './WorkerFlow';

package/es/useDrawer/index.js

@@ -20,7 +20,7 @@ import CC from '../ConfigContext';
 
 function useDrawer() {
   var prefixCls = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'cloudapp';
-  var context = useContext(CC);
+  var context = useContext(CC.Context);
   var root = useMemo(function () {
     return (context === null || context === void 0 ? void 0 : context.root) || document.body;
   }, [context === null || context === void 0 ? void 0 : context.root]);

package/es/useHistory/index.d.ts

@@ -0,0 +1,3 @@
+import type { History } from 'history';
+declare function useHistory(): History<unknown>;
+export default useHistory;

package/es/useHistory/index.js

@@ -0,0 +1,11 @@
+import { useMemo } from 'react';
+import InstanceHistory from '../InstanceHistory';
+
+function useHistory() {
+  var history = useMemo(function () {
+    return InstanceHistory;
+  }, []);
+  return history;
+}
+
+export default useHistory;

package/es/useHttp/index.js

@@ -10,7 +10,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-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 { useCallback, useEffect, useMemo, useState } from 'react';
 var cacheMemory = {};

package/es/useModal/index.js

@@ -20,7 +20,7 @@ import CC from '../ConfigContext';
 
 function useModal() {
   var prefixCls = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'cloudapp';
-  var context = useContext(CC);
+  var context = useContext(CC.Context);
   var root = useMemo(function () {
     return (context === null || context === void 0 ? void 0 : context.root) || document.body;
   }, [context === null || context === void 0 ? void 0 : context.root]);

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "2.0.0-alpha.13",
+  "version": "2.0.0-alpha.17",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,10 +39,11 @@
     "rc-queue-anim": "^2.0.0"
   },
   "devDependencies": {
-    "@cloud-app-dev/utils": "^3.0.2",
+    "@cloud-app-dev/utils": "^3.0.3",
     "@types/add-dom-event-listener": "^1.1.0",
     "@types/chroma-js": "^2.1.3",
     "@types/lodash-es": "^4.17.5",
+    "@types/node": "^17.0.5",
     "@umijs/test": "^3.0.5",
     "antd": "^4.17.0",
     "babel-plugin-import": "^1.13.3",
@@ -50,12 +51,13 @@
     "father-build": "^1.19.8",
     "gh-pages": "^3.0.0",
     "lint-staged": "^10.0.7",
-    "mobx-react": "^7.2.0",
     "prettier": "^2.2.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-router-dom": "^6.2.1",
     "rollup-plugin-node-polyfills": "^0.2.1",
+    "tslib": "^2.3.1",
+    "typescript": "^4.5.4",
     "yorkie": "^2.0.0"
   },
   "repository": {

package/tsconfig.json

@@ -3,7 +3,7 @@
   "compilerOptions": {
     "target": "es6",
     "module": "esnext",
-    "lib": ["es2018", "dom"],
+    "lib": ["es2018", "dom", "es2019"],
     "rootDir": "./",
     "outDir": "es",
     "moduleResolution": "node",

package/es/Service/logger.d.ts

@@ -1,3 +0,0 @@
-export declare function save(data: {
-    [key: string]: any;
-}, token?: string): import("fetch-like-axios").AxiosPromise<any>;

package/es/Service/logger.js

@@ -1,13 +0,0 @@
-import _cache from "@cloud-app-dev/utils/es/cache";
-import { $http } from './http';
-export function save(data, token) {
-  return $http({
-    method: 'post',
-    url: "/api/log/v1/addLog",
-    data: data,
-    requestId: 'addLog',
-    headers: {
-      Authorization: token || _cache.getCache('token', 'session')
-    }
-  });
-}

package/es/Service/utils.d.ts

@@ -1,3 +0,0 @@
-export declare function formartDesc(desc: string, data: {
-    [key: string]: any;
-}): string;

package/es/Service/utils.js

@@ -1,11 +0,0 @@
-export function formartDesc(desc, data) {
-  try {
-    Object.keys(data).forEach(function (key) {
-      desc = desc.replace("<".concat(key, ">"), data[key]);
-    });
-  } catch (e) {
-    console.warn('日志描述转换异常！', e);
-  }
-
-  return desc;
-}

package/es/useNavigate/index.d.ts

@@ -1,4 +0,0 @@
-import { NavigateFunction } from 'react-router-dom';
-import './index.less';
-declare function useNavigate(): NavigateFunction;
-export default useNavigate;

package/es/useNavigate/index.js

@@ -1,14 +0,0 @@
-import { useMemo } from 'react';
-import { useNavigate as useNativeNavigate } from 'react-router-dom';
-import "./index.css";
-var _global = window;
-
-function useNavigate() {
-  var naticeNavigate = useNativeNavigate();
-  var navigate = useMemo(function () {
-    return _global.BasicNavigate || naticeNavigate;
-  }, [naticeNavigate]);
-  return navigate;
-}
-
-export default useNavigate;