@cloud-app-dev/vidc 1.0.36 → 1.0.40

package/es/AppLayout/Header/ModifyPassword/index.js

@@ -1,7 +1,7 @@
-import _Drawer from "@cloud-app-dev/basic-components/es/Drawer";
-import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
 import "antd/lib/input/style";
 import _Input from "antd/lib/input";
+import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
+import _Drawer from "@cloud-app-dev/basic-components/es/Drawer";
 import "antd/lib/message/style";
 import _message from "antd/lib/message";
 import _Store from "@cloud-app-dev/basic-components/es/Store";
@@ -21,11 +21,14 @@ 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 } from 'react';
 import AppService from '../../service';
 var FormItem = _Form.Item;
 
 function ModifyPassword(_ref) {
+  var _this = this;
+
   var visible = _ref.visible,
       _onClose = _ref.onClose;
 
@@ -35,42 +38,73 @@ function ModifyPassword(_ref) {
 
   var onOk = useCallback(function () {
     form.validateFields().then(function (values) {
-      _Service.logger.save({
-        description: "\u3010".concat(_Store.app.userInfo.loginName, "\u3011\u4FEE\u6539\u5BC6\u7801"),
-        module: 120300,
-        function: 120301
-      });
-
-      AppService.changePassword({
-        id: _Store.app.userInfo.id,
-        oldPassword: values.oldPassword,
-        newPassword: values.newPassword
-      }).then(function (res) {
-        if ((res === null || res === void 0 ? void 0 : res.code) !== 0) return _message.warn((res === null || res === void 0 ? void 0 : res.message) || '请求失败');
-
-        _message.success('密码修改成功!');
-
-        AppService.loginOut().finally(function (_) {
-          _onClose && _onClose();
-          setTimeout(function () {
-            sessionStorage.clear();
-            window.location.replace('/login');
-          }, 100);
-        });
-      }).catch(function (err) {
-        var msg;
-        console.log(err);
-
-        try {
-          var _err$data;
-
-          msg = err === null || err === void 0 ? void 0 : (_err$data = err.data) === null || _err$data === void 0 ? void 0 : _err$data.message;
-        } catch (e) {
-          msg = '密码修改失败！';
-        }
-
-        _message.error(msg);
-      });
+      return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var _a, res, msg;
+
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _Service.logger.save({
+                  description: "\u3010".concat(_Store.app.userInfo.loginName, "\u3011\u4FEE\u6539\u5BC6\u7801"),
+                  module: 120300,
+                  function: 120301
+                });
+
+                _context.prev = 1;
+                _context.next = 4;
+                return AppService.changePassword({
+                  id: _Store.app.userInfo.id,
+                  oldPassword: values.oldPassword,
+                  newPassword: values.newPassword
+                });
+
+              case 4:
+                res = _context.sent;
+
+                if (!((res === null || res === void 0 ? void 0 : res.code) !== 0)) {
+                  _context.next = 7;
+                  break;
+                }
+
+                return _context.abrupt("return", _message.warn((res === null || res === void 0 ? void 0 : res.message) || '请求失败'));
+
+              case 7:
+                _message.success('密码修改成功!');
+
+                _context.next = 10;
+                return AppService.loginOut();
+
+              case 10:
+                _onClose();
+
+                setTimeout(function () {
+                  sessionStorage.clear();
+                  window.location.replace('/login');
+                }, 100);
+                _context.next = 19;
+                break;
+
+              case 14:
+                _context.prev = 14;
+                _context.t0 = _context["catch"](1);
+                console.log(_context.t0);
+
+                try {
+                  msg = (_a = _context.t0 === null || _context.t0 === void 0 ? void 0 : _context.t0.data) === null || _a === void 0 ? void 0 : _a.message;
+                } catch (e) {
+                  msg = '密码修改失败！';
+                }
+
+                _message.error(msg);
+
+              case 19:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee, null, [[1, 14]]);
+      }));
     });
   }, [form, _onClose]);
   return /*#__PURE__*/React.createElement(_Drawer, {

package/es/AppLayout/Header/ModifyUserAvatar/index.d.ts

@@ -0,0 +1,10 @@
+import { AppStoreInterface } from '@cloud-app-dev/basic-components/es/Store/app';
+import './index.less';
+interface IModifyUserAvatarProps {
+    visible?: boolean;
+    onClose?: () => void;
+    app?: AppStoreInterface;
+}
+declare function ModifyUserAvatar({ visible, onClose, app }: IModifyUserAvatarProps): JSX.Element;
+declare const _default: typeof ModifyUserAvatar & import("mobx-react").IWrappedComponent<IModifyUserAvatarProps>;
+export default _default;

package/es/AppLayout/Header/ModifyUserAvatar/index.js

@@ -1,18 +1,12 @@
-import _Drawer from "@cloud-app-dev/basic-components/es/Drawer";
-import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
-import _CBox from "@cloud-app-dev/basic-components/es/CBox";
 import _ImageView from "@cloud-app-dev/basic-components/es/ImageView";
+import _CBox from "@cloud-app-dev/basic-components/es/CBox";
+import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
+import _Drawer from "@cloud-app-dev/basic-components/es/Drawer";
 import "antd/lib/message/style";
 import _message from "antd/lib/message";
 import _Service from "@cloud-app-dev/basic-components/es/Service";
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 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."); }
@@ -53,7 +47,7 @@ function ModifyUserAvatar(_ref) {
       id: app.userInfo.id,
       userAvatarUrl: userAvatarUrl
     }).then(function () {
-      app.updateUserInfo(_objectSpread(_objectSpread({}, app.userInfo), {}, {
+      app.updateUserInfo(Object.assign(Object.assign({}, app.userInfo), {
         userAvatarUrl: userAvatarUrl
       }));
       onClose();

package/es/AppLayout/Header/NotifyAlarm.js

@@ -61,8 +61,7 @@ var NotifyAlarm = /*#__PURE__*/function (_React$Component) {
         } catch (error) {}
       }
 
-      if (args.messageType === 'multiMonitorActivityMessage' && (+args.isAccept === 1 || +args.isAccept === 2)) return false;
-      console.info('告警消息args====', args); // 重点人员布控 响铃设置判断
+      if (args.messageType === 'multiMonitorActivityMessage' && (+args.isAccept === 1 || +args.isAccept === 2)) return false; // 重点人员布控 响铃设置判断
 
       if (args.alarmType * 1 === 1 && Array.apply(null, args === null || args === void 0 ? void 0 : (_args$data = args.data) === null || _args$data === void 0 ? void 0 : _args$data.ignoreSoundAlarmUser).includes(1 * _Store.app.userInfo.id)) return false;
       clearTimeout(_this.timer);

package/es/AppLayout/Header/Tools.d.ts

@@ -0,0 +1,11 @@
+import * as H from 'history';
+import { AppStoreInterface } from '@cloud-app-dev/basic-components/es/Store/app';
+interface IAppToolsProps {
+    history: H.History;
+    app?: AppStoreInterface & any;
+    isMenuHome?: boolean;
+    portalPath?: string;
+}
+declare function AppTools({ history, app, isMenuHome, portalPath }: IAppToolsProps): JSX.Element;
+declare const _default: typeof AppTools & import("mobx-react").IWrappedComponent<IAppToolsProps>;
+export default _default;

package/es/AppLayout/Header/Tools.js

@@ -1,9 +1,9 @@
 import "antd/lib/avatar/style";
 import _Avatar from "antd/lib/avatar";
 import _FullScreen from "@cloud-app-dev/basic-components/es/FullScreen";
+import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import "antd/lib/popover/style";
 import _Popover from "antd/lib/popover";
-import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import React, { useCallback, useMemo } from 'react';
 import UserAction from './UserAction';
 import ToolsItem from './ToolsItem';
@@ -79,8 +79,7 @@ function AppTools(_ref) {
       fontSize: 'var(--fs)'
     }
   }, app.userInfo.realName || app.userInfo.loginName), /*#__PURE__*/React.createElement(_IconFont, {
-    type: "icon-S_Arrow_SmallDown",
-    theme: "outlined"
+    type: "icon-S_Arrow_SmallDown"
   }))));
 }
 

package/es/AppLayout/Header/ToolsItem.d.ts

@@ -0,0 +1 @@
+export default function ToolsItem({ className, children, ...props }: any): JSX.Element;

package/es/AppLayout/Header/ToolsItem.js

@@ -1,19 +1,12 @@
-var _excluded = ["className", "children"];
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
+import { __rest } from "tslib";
 import React from 'react';
-export default function ToolsItem(_ref) {
-  var _ref$className = _ref.className,
-      className = _ref$className === void 0 ? '' : _ref$className,
-      children = _ref.children,
-      props = _objectWithoutProperties(_ref, _excluded);
+export default function ToolsItem(_a) {
+  var _a$className = _a.className,
+      className = _a$className === void 0 ? '' : _a$className,
+      children = _a.children,
+      props = __rest(_a, ["className", "children"]);
 
-  return /*#__PURE__*/React.createElement("div", _extends({
+  return /*#__PURE__*/React.createElement("div", Object.assign({
     className: "user-item ".concat(className)
   }, props), children);
 }

package/es/AppLayout/Header/UserAction.d.ts

@@ -0,0 +1,10 @@
+import { AppStoreInterface } from '@cloud-app-dev/basic-components/es/Store/app';
+import * as H from 'history';
+interface IUserActionProps {
+    app?: AppStoreInterface & any;
+    history: H.History;
+    isMenuHome?: boolean;
+    portalPath?: string;
+}
+declare function UserAction({ app, history, isMenuHome, portalPath }: IUserActionProps): JSX.Element;
+export default UserAction;

package/es/AppLayout/Header/UserAction.js

@@ -1,20 +1,10 @@
 import _IconSpan from "@cloud-app-dev/basic-components/es/IconSpan";
 import "antd/lib/avatar/style";
 import _Avatar from "antd/lib/avatar";
-import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
 import _AuthComponent from "@cloud-app-dev/basic-components/es/AuthComponent";
+import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 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."); }
@@ -27,6 +17,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, useReducer, useMemo } from 'react';
 import { cache } from '@cloud-app-dev/utils';
 import ModifyUserAvatar from './ModifyUserAvatar';
@@ -74,6 +65,8 @@ var pageInfos = [{
 }];
 
 function UserAction(_ref) {
+  var _this = this;
+
   var app = _ref.app,
       history = _ref.history,
       isMenuHome = _ref.isMenuHome,
@@ -81,7 +74,7 @@ function UserAction(_ref) {
   var userInfo = app.userInfo;
 
   var _useReducer = useReducer(function (state, action) {
-    return _objectSpread(_objectSpread({}, state), action);
+    return Object.assign(Object.assign({}, state), action);
   }, {
     avatar: false,
     password: false
@@ -90,23 +83,25 @@ function UserAction(_ref) {
       visibleMuster = _useReducer2[0],
       setVisibleMuster = _useReducer2[1];
 
-  var signOut = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            UserService.loginOut().finally(function (_) {
-              sessionStorage.clear();
-              window.location.replace('/login');
-            });
-
-          case 1:
-          case "end":
-            return _context.stop();
+  var signOut = useCallback(function () {
+    return __awaiter(_this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+      return regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              UserService.loginOut().finally(function () {
+                sessionStorage.clear();
+                window.location.replace('/login');
+              });
+
+            case 1:
+            case "end":
+              return _context.stop();
+          }
         }
-      }
-    }, _callee);
-  })), []); //门户
+      }, _callee);
+    }));
+  }, []); //门户
 
   var GatewayState = useMemo(function () {
     return cache.getCache('GATEWAY_STATE', 'session');
@@ -167,7 +162,7 @@ function UserAction(_ref) {
   }, userInfo.realName || userInfo.loginName), /*#__PURE__*/React.createElement("div", {
     className: "btn-content"
   }, /*#__PURE__*/React.createElement(_IconSpan, {
-    mode: "inline",
+    mode: "vertical",
     onClick: function onClick() {
       return setVisibleMuster({
         avatar: true
@@ -176,7 +171,7 @@ function UserAction(_ref) {
     icon: "icon-S_Edit_Avatar",
     label: "\u4FEE\u6539\u5934\u50CF"
   }), /*#__PURE__*/React.createElement(_IconSpan, {
-    mode: "inline",
+    mode: "vertical",
     onClick: function onClick() {
       return setVisibleMuster({
         password: true
@@ -187,7 +182,7 @@ function UserAction(_ref) {
   }), !isMenuHome && /*#__PURE__*/React.createElement(_AuthComponent, {
     actionName: "assistantManager"
   }, /*#__PURE__*/React.createElement(_IconSpan, {
-    mode: "inline",
+    mode: "vertical",
     onClick: function onClick() {
       history.push({
         pathname: '/personSkillwar/main'
@@ -196,7 +191,7 @@ function UserAction(_ref) {
     icon: "icon-Type2",
     label: "\u5E94\u7528\u52A9\u624B"
   })), GatewayState && /*#__PURE__*/React.createElement(_IconSpan, {
-    mode: "inline",
+    mode: "vertical",
     className: "fl",
     onClick: handleGateway,
     icon: "icon-House",
@@ -204,8 +199,7 @@ function UserAction(_ref) {
   })))), !isMenuHome && PageView, /*#__PURE__*/React.createElement("div", {
     className: "login-out"
   }, /*#__PURE__*/React.createElement(_IconSpan, {
-    type: "antd",
-    mode: "inline",
+    mode: "vertical",
     className: "login-out",
     onClick: signOut,
     icon: "icon-S_Place_over",

package/es/AppLayout/Header/index.d.ts

@@ -0,0 +1,9 @@
+import './index.less';
+interface IHeaderProps {
+    renderMenu?: boolean;
+    isMenuHome?: boolean;
+    portalPath?: string;
+    menuType?: string;
+}
+declare function Header({ renderMenu, isMenuHome, portalPath, menuType }: IHeaderProps): JSX.Element;
+export default Header;

package/es/AppLayout/Header/index.js

@@ -1,39 +1,27 @@
 import _Config from "@cloud-app-dev/basic-components/es/Config";
+import _Store from "@cloud-app-dev/basic-components/es/Store";
 import _useHistory from "@cloud-app-dev/basic-components/es/useHistory";
-import React, { useCallback } from 'react';
-import { uuid } from '@cloud-app-dev/utils';
+import React from 'react';
 import AppHeader from '../AppHeader';
-import { inject, observer } from 'mobx-react';
 import ListenceRoute from './ListenceRoute';
 import AppTools from './Tools';
 import "./index.css";
 
 function Header(_ref) {
-  var app = _ref.app,
-      auth = _ref.auth,
-      renderMenu = _ref.renderMenu,
+  var renderMenu = _ref.renderMenu,
       isMenuHome = _ref.isMenuHome,
-      portalPath = _ref.portalPath;
+      portalPath = _ref.portalPath,
+      menuType = _ref.menuType;
 
   var history = _useHistory();
 
-  var onSelectItem = useCallback(function (e) {
-    var menu = auth.userMenuList.find(function (v) {
-      return isNaN(+v.code) || isNaN(+e.key) ? v.code === e.key : +v.code === +e.key;
-    });
-
-    if (menu && menu.routeUrl) {
-      history.push("".concat(menu.routeUrl).concat(e.domEvent.ctrlKey || e.domEvent.metaKey ? "?key=".concat(uuid()) : ''));
-    }
-  }, [history, auth.userMenuList]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AppHeader, {
-    userInfo: app.userInfo,
-    systemLogo: app.appInfo.systemLogoUrl || app.systemConfig.systemLogo || _Config.BSConfig.systemLogo,
-    systemName: app.systemConfig.systemName,
-    menuType: app.themeStyle.menuType,
+    userInfo: _Store.app.userInfo,
+    systemLogo: _Store.app.appInfo.systemLogoUrl || _Store.app.systemConfig.systemLogo || _Config.BSConfig.systemLogo,
+    systemName: _Store.app.systemConfig.systemName,
+    menuType: menuType,
     history: history,
     renderMenu: renderMenu,
-    menuSelect: onSelectItem,
     isMenuHome: isMenuHome,
     appTools: /*#__PURE__*/React.createElement(AppTools, {
       history: history,
@@ -45,4 +33,4 @@ function Header(_ref) {
   }));
 }
 
-export default inject('app', 'auth')(observer(Header));
+export default Header;

package/es/AppLayout/index.d.ts

@@ -1,14 +1,12 @@
-import * as React from 'react';
-
-interface AppLayoutProps {
-  content?: React.ReactNode;
-  children?: React.ReactNode;
-  menuType: string;
-  isMenuHome?: boolean;
-  renderMenu: boolean;
-  portalPath?: string;
+import React from 'react';
+import './index.less';
+interface IAppLayoutProps {
+    content?: React.ReactNode;
+    children?: React.ReactNode;
+    menuType?: string;
+    isMenuHome?: boolean;
+    renderMenu?: boolean;
+    portalPath?: string;
 }
-
-declare const AppLayout: React.FunctionComponent<AppLayoutProps>;
-
+declare function AppLayout({ content, children, menuType, isMenuHome, renderMenu, portalPath }: IAppLayoutProps): JSX.Element;
 export default AppLayout;

package/es/AppLayout/index.js

@@ -28,7 +28,8 @@ function AppLayout(_ref) {
   }, /*#__PURE__*/React.createElement(Header, {
     isMenuHome: isMenuHome,
     renderMenu: renderMenu,
-    portalPath: portalPath
+    portalPath: portalPath,
+    menuType: menuType
   })), /*#__PURE__*/React.createElement(_Layout.Content, {
     className: "app-layout-content"
   }, children || content)));

package/es/TreeMode/index.js

@@ -68,6 +68,10 @@ function TreeMode(_a) {
   var treeData = useMemo(function () {
     return mode === 'Place' ? treeHelper.computPlaceTree(list) : treeHelper.computTreeList(list);
   }, [list, mode]);
+  /**
+   * @description 实现关键字展开节点
+   */
+
   useEffect(function () {
     var _a, _b;
 
@@ -137,6 +141,10 @@ function TreeMode(_a) {
   var treeName = useMemo(function () {
     return mode === 'Place' ? 'areaName' : mode === 'Org' ? 'organizationName' : 'groupName';
   }, [mode]);
+  /**
+   * @description 触发默认选中节点事件
+   */
+
   useEffect(function () {
     var id = treeData[0] ? treeData[0][treeKey] : undefined;
 

package/es/WorkerFlow/Form/UserSet.js

@@ -73,6 +73,9 @@ function UserSet(_ref) {
       return cloneDeep(Object.assign(Object.assign({}, old), options));
     });
   }, []);
+  var users = useMemo(function () {
+    return state[state.type];
+  }, [state]);
   var data = useMemo(function () {
     return {
       userType: state.type,
@@ -106,7 +109,7 @@ function UserSet(_ref) {
   })), /*#__PURE__*/React.createElement(Content, {
     type: state.type,
     emptyUsers: state.emptyUsers,
-    users: state[state.type],
+    users: users,
     chargeLevel: state.chargeLevel,
     usersHandType: state.usersHandType,
     onChange: function onChange(options) {
@@ -205,7 +208,7 @@ function UserSelectType3(_ref4) {
       emptyUsers = _ref4.emptyUsers;
   var userList = useMemo(function () {
     return users.filter(function (v) {
-      return v.key === 'userId';
+      return v.key === 'groupId';
     });
   }, [users]);
   return /*#__PURE__*/React.createElement("div", {

package/es/WorkerFlow/index.js

@@ -1,5 +1,6 @@
 import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
-import _Modal from "@cloud-app-dev/basic-components/es/Modal";
+import "antd/lib/modal/style";
+import _Modal from "antd/lib/modal";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -61,6 +62,11 @@ function WorkerFlow(_ref, ref) {
 
   var drawerRef = useRef(null);
 
+  var _Modal$useModal = _Modal.useModal(),
+      _Modal$useModal2 = _slicedToArray(_Modal$useModal, 2),
+      modal = _Modal$useModal2[0],
+      contextHolder = _Modal$useModal2[1];
+
   var updateNode = function updateNode() {
     return setConfig(Object.assign({}, config));
   }; // 链表操作: 几种行为， 添加行为，删除行为，点击行为     pRef.childNode -> node.childNode -> 后继
@@ -117,8 +123,9 @@ function WorkerFlow(_ref, ref) {
       return;
     }
 
+    var title = "\u662F\u5426\u5220\u9664\u8282\u70B9\"".concat(type === NodeTypes.BRANCH ? node.conditionNodes[index].nodeName : node.nodeName, "\"\uFF1F");
     var options = {
-      title: "\u662F\u5426\u5220\u9664\u8282\u70B9\"".concat(type === NodeTypes.BRANCH ? node.conditionNodes[index].nodeName : node.nodeName, "\"\uFF1F"),
+      title: title,
       okText: '确定',
       cancelText: '取消'
     };
@@ -153,7 +160,7 @@ function WorkerFlow(_ref, ref) {
       }));
     };
 
-    _Modal.confirm(Object.assign(Object.assign({}, options), {
+    modal.confirm(Object.assign(Object.assign({}, options), {
       onOk: onOk
     }));
   } // 获取节点
@@ -182,7 +189,7 @@ function WorkerFlow(_ref, ref) {
         node.form = data.form || [];
         node.userType = data.userType;
         node.usersHandType = data.usersHandType;
-        node.owner = data.nodeUserList.map(function (v) {
+        node.owner = data.userType === 4 ? '直属主管' : data.nodeUserList.map(function (v) {
           return v.name;
         }).join('，');
         node.emptyUserList = data.emptyUserList;
@@ -279,7 +286,7 @@ function WorkerFlow(_ref, ref) {
   }), /*#__PURE__*/React.createElement(EndNode, {
     nodeName: "\u6D41\u7A0B\u7ED3\u675F",
     id: endId
-  })))), /*#__PURE__*/React.createElement(RefDrawer, {
+  }))), contextHolder), /*#__PURE__*/React.createElement(RefDrawer, {
     ref: drawerRef
   }));
 }

package/es/WorkerFlow/utils.d.ts

@@ -1,4 +1,6 @@
 import { NodeItem, SubmitFlowItemType } from './interface';
 export declare function getJAVATaskData(data: NodeItem): SubmitFlowItemType[];
+export declare function getNextTaskId(node: NodeItem): string | undefined;
+export declare function getNextNode(node: NodeItem): NodeItem | undefined;
 export declare function filterNoticeNode(data: NodeItem): NodeItem;
 export declare function getUserFormKeys(data: NodeItem): string[];