@cloud-app-dev/vidc 1.0.42 → 1.0.43

package/.fatherrc.js

@@ -11,5 +11,8 @@ export default {
   extraBabelPlugins: [
     ['import', { libraryName: 'antd', style: true }, 'antd'],
     ['import', { libraryName: '@cloud-app-dev/basic-components', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'basic-components'],
+    ['import', { libraryName: '@cloud-app-dev/utils', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'utils'],
+    ['import', { libraryName: 'ahooks', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'ahooks'],
+    ['import', { libraryName: '@cloud-app-dev/map', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'map-components'],
   ],
 };

package/.umirc.ts

@@ -14,6 +14,9 @@ export default defineConfig({
   extraBabelPlugins: [
     ['import', { libraryName: 'antd', style: true }, 'antd'],
     ['import', { libraryName: '@cloud-app-dev/basic-components', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'basic-components'],
+    ['import', { libraryName: '@cloud-app-dev/utils', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'utils'],
+    ['import', { libraryName: 'ahooks', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'ahooks'],
+    ['import', { libraryName: '@cloud-app-dev/map', style: false, camel2DashComponentName: false, libraryDirectory: 'es' }, 'map-components'],
   ],
   theme: {
     '@ant-prefix': 'cloudapp',

package/es/AppLayout/AppHorizontalMenu/index.js

@@ -1,6 +1,8 @@
 import "antd/lib/popover/style";
 import _Popover from "antd/lib/popover";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
+import _uuid from "@cloud-app-dev/utils/es/uuid";
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -16,7 +18,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useMemo, useCallback, useRef, useEffect } from 'react';
 import { inject, observer } from 'mobx-react';
-import { treeHelper, uuid } from '@cloud-app-dev/utils';
 import { updateFunctionCount } from '../utils';
 import FunctionPreview from '../FunctionPreview';
 import QueueAnim from 'rc-queue-anim';
@@ -35,7 +36,7 @@ function AppHorizontalMenu(_ref) {
     });
   }, [auth.userMenuList]);
   var menuList = useMemo(function () {
-    return renderMenu ? treeHelper.computTreeList(filterMenus, 'code', 'parentCode') : [];
+    return renderMenu ? _treeHelper.computTreeList(filterMenus, 'code', 'parentCode') : [];
   }, [filterMenus, renderMenu]);
 
   var _useState = useState({
@@ -70,7 +71,7 @@ function AppHorizontalMenu(_ref) {
       var menu = auth.userMenuList.find(function (v) {
         return +v.code === +item.code;
       });
-      history.push("".concat(menu.routeUrl).concat(e.ctrlKey || e.metaKey ? "?key=".concat(uuid()) : ''));
+      history.push("".concat(menu.routeUrl).concat(e.ctrlKey || e.metaKey ? "?key=".concat(_uuid()) : ''));
       setTimeout(function () {
         return setState(function (old) {
           return Object.assign(Object.assign({}, old), {

package/es/AppLayout/AppInlineMenu/index.js

@@ -1,6 +1,8 @@
 import "antd/lib/tooltip/style";
 import _Tooltip from "antd/lib/tooltip";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
+import _uuid from "@cloud-app-dev/utils/es/uuid";
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -16,7 +18,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useLayoutEffect, useMemo, useState } from 'react';
 import { inject, observer } from 'mobx-react';
-import { treeHelper, uuid } from '@cloud-app-dev/utils';
 import QueueAnim from 'rc-queue-anim';
 import FunctionPreview from '../FunctionPreview';
 import SubGroup from './SubGroup';
@@ -45,7 +46,7 @@ function AppInlineMenu(_ref) {
     });
   }, [auth.userMenuList]);
   var menuList = useMemo(function () {
-    return treeHelper.computTreeList(filterMenus, 'code', 'parentCode');
+    return _treeHelper.computTreeList(filterMenus, 'code', 'parentCode');
   }, [filterMenus]);
   var popStyle = useMemo(function () {
     return {
@@ -62,7 +63,7 @@ function AppInlineMenu(_ref) {
       var menu = auth.userMenuList.find(function (v) {
         return +v.code === +item.code;
       });
-      history.push("".concat(menu.routeUrl).concat(e.ctrlKey || e.metaKey ? "?key=".concat(uuid()) : ''));
+      history.push("".concat(menu.routeUrl).concat(e.ctrlKey || e.metaKey ? "?key=".concat(_uuid()) : ''));
 
       if (flag) {
         setState(function (old) {

package/es/AppLayout/AppLogo/index.js

@@ -3,6 +3,7 @@ import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import "antd/lib/col/style";
 import _Col from "antd/lib/col";
 import _Service from "@cloud-app-dev/basic-components/es/Service";
+import _cache from "@cloud-app-dev/utils/es/cache";
 import _Config from "@cloud-app-dev/basic-components/es/Config";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -18,7 +19,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useEffect, useMemo } from 'react';
-import { cache } from '@cloud-app-dev/utils';
 import "./index.css";
 export default function AppLogo(_ref) {
   var systemLogo = _ref.systemLogo,
@@ -40,7 +40,7 @@ export default function AppLogo(_ref) {
 
 
   var GatewayState = useMemo(function () {
-    return cache.getCache('GATEWAY_STATE', 'session');
+    return _cache.getCache('GATEWAY_STATE', 'session');
   }, []);
   useEffect(function () {
     var _a; //用户名显示是否加入行政区划

package/es/AppLayout/FunctionPreview/index.js

@@ -2,6 +2,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
 
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _Store from "@cloud-app-dev/basic-components/es/Store";
+import _cache from "@cloud-app-dev/utils/es/cache";
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -26,7 +27,6 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 import { __awaiter } from "tslib";
 import React from 'react';
 import { getFunctionCount, clearFunctionCount, deleteFunctionItemCount } from '../utils';
-import { cache } from '@cloud-app-dev/utils';
 import "./index.css";
 var CACHE_KEY = 'functionCount';
 var _global = window;
@@ -46,7 +46,7 @@ var FunctionPreview = /*#__PURE__*/function (_React$Component) {
 
     _this.getNearList = function () {
       getFunctionCount().then(function (counts) {
-        cache.setUserCache(CACHE_KEY, counts);
+        _cache.setUserCache(CACHE_KEY, counts);
 
         _this.setState({
           nearList: counts.map(function (item) {
@@ -68,7 +68,8 @@ var FunctionPreview = /*#__PURE__*/function (_React$Component) {
                 return clearFunctionCount();
 
               case 2:
-                cache.setUserCache(CACHE_KEY, []);
+                _cache.setUserCache(CACHE_KEY, []);
+
                 this.setState({
                   nearList: []
                 });
@@ -104,7 +105,7 @@ var FunctionPreview = /*#__PURE__*/function (_React$Component) {
       }));
     };
 
-    var counts = cache.getUserCache(CACHE_KEY) || [];
+    var counts = _cache.getUserCache(CACHE_KEY) || [];
     _this.state = {
       nearList: counts.map(function (item) {
         return _Store.auth.getInfoByName(item.id);

package/es/AppLayout/Header/NotifyAlarm.js

@@ -1,5 +1,6 @@
 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); }
 
+import _SocketEmitter from "@cloud-app-dev/utils/es/SocketEmitter";
 import _Store from "@cloud-app-dev/basic-components/es/Store";
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -24,7 +25,6 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 
 /* eslint-disable no-undef */
 import React from 'react';
-import { SocketEmitter } from '@cloud-app-dev/utils';
 
 var NotifyAlarm = /*#__PURE__*/function (_React$Component) {
   _inherits(NotifyAlarm, _React$Component);
@@ -79,17 +79,23 @@ var NotifyAlarm = /*#__PURE__*/function (_React$Component) {
   _createClass(NotifyAlarm, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      SocketEmitter.subscribe('alarm', this.handleAlarm);
-      SocketEmitter.subscribe('vehicleAlarmMessage', this.handleAlarm);
-      SocketEmitter.subscribe('multiMonitorActivityMessage', this.handleAlarm);
+      _SocketEmitter.subscribe('alarm', this.handleAlarm);
+
+      _SocketEmitter.subscribe('vehicleAlarmMessage', this.handleAlarm);
+
+      _SocketEmitter.subscribe('multiMonitorActivityMessage', this.handleAlarm);
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       clearTimeout(this.timer);
-      SocketEmitter.unsubscribe('alarm', this.handleAlarm);
-      SocketEmitter.unsubscribe('withoutCloakMessage', this.handleAlarm);
-      SocketEmitter.unsubscribe('multiMonitorActivityMessage', this.handleAlarm);
+
+      _SocketEmitter.unsubscribe('alarm', this.handleAlarm);
+
+      _SocketEmitter.unsubscribe('withoutCloakMessage', this.handleAlarm);
+
+      _SocketEmitter.unsubscribe('multiMonitorActivityMessage', this.handleAlarm);
+
       this.audioRef = null;
       this.timer = null;
     }

package/es/AppLayout/Header/Tools.js

@@ -4,10 +4,10 @@ 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 _cache from "@cloud-app-dev/utils/es/cache";
 import React, { useCallback, useMemo } from 'react';
 import UserAction from './UserAction';
 import ToolsItem from './ToolsItem';
-import { cache } from '@cloud-app-dev/utils';
 import { inject, observer } from 'mobx-react';
 import NotifyAlarm from './NotifyAlarm';
 
@@ -17,7 +17,7 @@ function AppTools(_ref) {
       isMenuHome = _ref.isMenuHome,
       portalPath = _ref.portalPath;
   var GatewayState = useMemo(function () {
-    return cache.getCache('GATEWAY_STATE', 'session');
+    return _cache.getCache('GATEWAY_STATE', 'session');
   }, []);
   var handleGateway = useCallback(function () {
     history.push(portalPath ? portalPath : !isMenuHome ? '/portalGateway/menuHome' : '/portalGateway/home');

package/es/AppLayout/Header/UserAction.js

@@ -4,6 +4,7 @@ import _Avatar from "antd/lib/avatar";
 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";
+import _cache from "@cloud-app-dev/utils/es/cache";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -19,7 +20,6 @@ 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';
 import ModifyPassword from './ModifyPassword';
 import UserService from '../service'; //用户个人中心下模块
@@ -104,7 +104,7 @@ function UserAction(_ref) {
   }, []); //门户
 
   var GatewayState = useMemo(function () {
-    return cache.getCache('GATEWAY_STATE', 'session');
+    return _cache.getCache('GATEWAY_STATE', 'session');
   }, []);
   var handleGateway = useCallback(function () {
     history.push(portalPath || '/portalGateway/home');

package/es/AppLayout/service/index.js

@@ -1,4 +1,5 @@
 import _Service from "@cloud-app-dev/basic-components/es/Service";
+import _cache from "@cloud-app-dev/utils/es/cache";
 
 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); } }
 
@@ -11,7 +12,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
 import URL from './url';
-import { cache } from '@cloud-app-dev/utils';
 import JSEncrypt from 'jsencrypt';
 var RSA = {
   decrypt: function decrypt(ciphertext, key) {
@@ -26,7 +26,7 @@ var RSA = {
   }
 };
 var defaultHeaders = {
-  Authorization: cache.getCache('token', 'session')
+  Authorization: _cache.getCache('token', 'session')
 };
 
 var MainService = /*#__PURE__*/function () {
@@ -80,7 +80,7 @@ var MainService = /*#__PURE__*/function () {
     key: "getPublicKey",
     value: function getPublicKey() {
       var headers = {
-        Authorization: cache.getCache('token', 'session')
+        Authorization: _cache.getCache('token', 'session')
       };
       return _Service.$http({
         headers: headers,
@@ -107,7 +107,7 @@ var MainService = /*#__PURE__*/function () {
             switch (_context.prev = _context.next) {
               case 0:
                 headers = {
-                  Authorization: cache.getCache('token', 'session')
+                  Authorization: _cache.getCache('token', 'session')
                 };
                 _context.next = 3;
                 return this.getPublicKey();
@@ -160,7 +160,7 @@ var MainService = /*#__PURE__*/function () {
         url: '/api/user/v1/getUserByToken',
         method: 'post',
         headers: {
-          Authorization: cache.getCache('token', 'session')
+          Authorization: _cache.getCache('token', 'session')
         },
         requestId: 'getUserInfo'
       });

package/es/AppLayout/utils.js

@@ -1,7 +1,8 @@
+import _SocketEmitter from "@cloud-app-dev/utils/es/SocketEmitter";
+import _LM_DB from "@cloud-app-dev/utils/es/LM_DB";
 import { __awaiter } from "tslib";
-import { LM_DB, SocketEmitter } from '@cloud-app-dev/utils';
 import { orderBy } from 'lodash';
-var db = new LM_DB('functionCount');
+var db = new _LM_DB('functionCount');
 export function updateFunctionCount(name) {
   return __awaiter(this, void 0, void 0, /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
     var item, expireTime;
@@ -43,7 +44,7 @@ export function updateFunctionCount(name) {
             });
 
           case 11:
-            SocketEmitter.emit('updateFunctionCount', null);
+            _SocketEmitter.emit('updateFunctionCount', null);
 
           case 12:
           case "end":

package/es/DagInitialRequest/utils.js

@@ -1,5 +1,6 @@
 import _Config from "@cloud-app-dev/basic-components/es/Config";
 import _Service from "@cloud-app-dev/basic-components/es/Service";
+import _cache from "@cloud-app-dev/utils/es/cache";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -31,8 +32,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 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); }); }; }
 
-import { cache } from '@cloud-app-dev/utils';
-
 function catchPromise(fn) {
   return new Promise(function (resolve) {
     fn.then(function (res) {
@@ -58,7 +57,7 @@ function _initialization() {
         switch (_context.prev = _context.next) {
           case 0:
             headers = {
-              Authorization: cache.getCache('token', 'session')
+              Authorization: _cache.getCache('token', 'session')
             };
             _context.next = 3;
             return _Service.$http({
@@ -159,7 +158,7 @@ function _initialization() {
 
 export function queryOrganizationsList(options) {
   var headers = {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
   var url = '/api/user/v1/organization/queryChildOrganizationsById';
   return catchPromise(_Service.$http({
@@ -185,7 +184,7 @@ function _queryPlacesList() {
         switch (_context2.prev = _context2.next) {
           case 0:
             headers = {
-              Authorization: cache.getCache('token', 'session')
+              Authorization: _cache.getCache('token', 'session')
             };
             url = '/api/place/v1/getPlacesByHasDevice';
             url2 = '/api/user/v1/organization/queryPlacesByOrganizationId';
@@ -230,7 +229,7 @@ function _queryPlacesList() {
 
 function queryUserDevicesNew(data) {
   var headers = {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
   var url = '/api/device/v1/queryDevices4User';
   return _Service.$http({
@@ -244,7 +243,7 @@ function queryUserDevicesNew(data) {
 
 function queryUserDevicesStatusNew(data) {
   var headers = {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
   var url = '/api/device/v1/queryDeviceStatus4User';
   return _Service.$http({
@@ -258,7 +257,7 @@ function queryUserDevicesStatusNew(data) {
 
 function queryDeviceLocalRecordAbilityList(data) {
   var headers = {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
   var url = '/api/device/v1/queryDeviceLocalRecordAbilityList';
   return _Service.$http({

package/es/InitialRequest/index.js

@@ -1,3 +1,4 @@
+import _logger from "@cloud-app-dev/utils/es/logger";
 import _Store from "@cloud-app-dev/basic-components/es/Store";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -22,7 +23,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useEffect } from 'react';
 import { initialization, queryOrganizationsList, queryPlacesList, queryUserDevice, authFormat, queryUserOrganizationsList } from './utils';
-import { logger } from '@cloud-app-dev/utils';
 var _BASE_DATA_INIT = false;
 
 function InitialRequest(_ref) {
@@ -89,7 +89,7 @@ function InitialRequest(_ref) {
     }).then(function () {
       return setIsInit(true);
     }).catch(function (e) {
-      return logger.error('接口初始化失败！', e);
+      return _logger.error('接口初始化失败！', e);
     }); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   return isInit ? children : Spin ? /*#__PURE__*/React.createElement(Spin, {

package/es/InitialRequest/utils.js

@@ -1,6 +1,7 @@
 import _Store from "@cloud-app-dev/basic-components/es/Store";
 import _Config from "@cloud-app-dev/basic-components/es/Config";
 import _Service from "@cloud-app-dev/basic-components/es/Service";
+import _cache from "@cloud-app-dev/utils/es/cache";
 
 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; }
 
@@ -32,8 +33,6 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 
 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); }); }; }
 
-import { cache } from '@cloud-app-dev/utils';
-
 function catchPromise(fn) {
   return new Promise(function (resolve) {
     fn.then(function (res) {
@@ -59,7 +58,7 @@ function _initialization() {
         switch (_context.prev = _context.next) {
           case 0:
             headers = {
-              Authorization: cache.getCache('token', 'session')
+              Authorization: _cache.getCache('token', 'session')
             };
             _context.next = 3;
             return _Service.$http({
@@ -213,7 +212,7 @@ function _queryOrganizationsList() {
         switch (_context2.prev = _context2.next) {
           case 0:
             headers = {
-              Authorization: cache.getCache('token', 'session')
+              Authorization: _cache.getCache('token', 'session')
             };
             url = '/api/udm-api/DeviceBuzTree/queryList';
             _context2.next = 4;
@@ -258,7 +257,7 @@ function _queryUserOrganizationsList() {
         switch (_context3.prev = _context3.next) {
           case 0:
             headers = {
-              Authorization: cache.getCache('token', 'session')
+              Authorization: _cache.getCache('token', 'session')
             };
             url = '/api/user/v1/organization/queryChildOrganizationsById';
             return _context3.abrupt("return", catchPromise(_Service.$http({
@@ -294,7 +293,7 @@ function _queryPlacesList() {
         switch (_context4.prev = _context4.next) {
           case 0:
             headers = {
-              Authorization: cache.getCache('token', 'session')
+              Authorization: _cache.getCache('token', 'session')
             };
             url = '/api/place/v1/getPlacesByHasDevice';
             url2 = '/api/user/v1/organization/queryPlacesByOrganizationId';
@@ -339,7 +338,7 @@ function _queryPlacesList() {
 
 function queryUserDevicesNew(data) {
   var headers = {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
   var url = '/api/device/v1/queryDevices4User';
   return _Service.$http({
@@ -353,7 +352,7 @@ function queryUserDevicesNew(data) {
 
 function queryUserDevicesStatusNew(data) {
   var headers = {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
   var url = '/api/device/v1/queryDeviceStatus4User';
   return _Service.$http({
@@ -367,7 +366,7 @@ function queryUserDevicesStatusNew(data) {
 
 function queryDeviceLocalRecordAbilityList(data) {
   var headers = {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
   var url = '/api/device/v1/queryDeviceLocalRecordAbilityList';
   return _Service.$http({

package/es/OrgUserTree/index.js

@@ -1,6 +1,7 @@
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _Tree from "@cloud-app-dev/basic-components/es/Tree";
 import _CBox from "@cloud-app-dev/basic-components/es/CBox";
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -27,7 +28,6 @@ import { __rest } from "tslib";
 import React, { useEffect, useMemo, useState } from 'react';
 import api from '../Api';
 import TreeTitle from '../TreeTitle';
-import { treeHelper } from '@cloud-app-dev/utils';
 import { getParentListById } from '../utils';
 import "./index.css";
 
@@ -56,7 +56,7 @@ function OrgUserTree(_a) {
       orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
 
   var treeData = useMemo(function () {
-    return treeHelper.computTreeList(orgList);
+    return _treeHelper.computTreeList(orgList);
   }, [orgList]);
   useEffect(function () {
     var keys = [];

package/es/PlaceTree/index.js

@@ -2,6 +2,7 @@ import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _Tree from "@cloud-app-dev/basic-components/es/Tree";
 import _CBox from "@cloud-app-dev/basic-components/es/CBox";
 import _Store from "@cloud-app-dev/basic-components/es/Store";
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -25,7 +26,6 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __rest } from "tslib";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { treeHelper } from '@cloud-app-dev/utils';
 import TreeTitle from '../TreeTitle';
 import "./index.css";
 
@@ -62,7 +62,7 @@ function PlaceTree(params) {
       setState = _useState2[1];
 
   var treeDatas = useMemo(function () {
-    return treeData || treeHelper.computPlaceTree(_Store.place.placeList);
+    return treeData || _treeHelper.computPlaceTree(_Store.place.placeList);
   }, [treeData]);
   var onExpand = useCallback(function (expandedKeys) {
     return setState({

package/es/TreeMode/index.js

@@ -1,6 +1,7 @@
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _Tree from "@cloud-app-dev/basic-components/es/Tree";
 import _CBox from "@cloud-app-dev/basic-components/es/CBox";
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -27,7 +28,6 @@ import { __rest } from "tslib";
 import React, { useEffect, useMemo, useState } from 'react';
 import api from '../Api';
 import TreeTitle from '../TreeTitle';
-import { treeHelper } from '@cloud-app-dev/utils';
 import { getParentListById, getPlaceCodesWithParent } from '../utils';
 import "./index.css";
 var defaultList = [];
@@ -66,7 +66,7 @@ function TreeMode(_a) {
       list = _useHttp$data === void 0 ? defaultList : _useHttp$data;
 
   var treeData = useMemo(function () {
-    return mode === 'Place' ? treeHelper.computPlaceTree(list) : treeHelper.computTreeList(list);
+    return mode === 'Place' ? _treeHelper.computPlaceTree(list) : _treeHelper.computTreeList(list);
   }, [list, mode]);
   /**
    * @description 实现关键字展开节点

package/es/UserSelect/demo.d.ts

@@ -0,0 +1,2 @@
+declare function App(): JSX.Element;
+export default App;

package/es/UserSelect/demo.js

@@ -0,0 +1,20 @@
+import "antd/lib/config-provider/style";
+import _ConfigProvider from "antd/lib/config-provider";
+import React from 'react';
+import OrgTree from './index';
+
+function App() {
+  return /*#__PURE__*/React.createElement(_ConfigProvider, {
+    prefixCls: "cloudapp"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      padding: 20,
+      width: 1000,
+      height: 600
+    }
+  }, /*#__PURE__*/React.createElement(OrgTree, {
+    selectUsers: []
+  })));
+}
+
+export default App;

package/es/UserSelect/index.js

@@ -1,4 +1,5 @@
 import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -23,8 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
 import api from '../Api';
-import OrgUserTree from '../OrgUserTree';
-import { treeHelper } from '@cloud-app-dev/utils';
+import TreeMode from '../TreeMode';
 import List from '../List';
 import { uniq, intersectionWith, uniqBy, differenceWith } from 'lodash';
 import "./index.css";
@@ -55,7 +55,7 @@ function UserSelect(_ref, ref) {
       orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
 
   var treeData = useMemo(function () {
-    return treeHelper.computTreeList(orgList);
+    return _treeHelper.computTreeList(orgList);
   }, [orgList]);
   var selectId = useMemo(function () {
     return state.orgId ? state.orgId : treeData[0] ? treeData[0].id : undefined;
@@ -120,7 +120,10 @@ function UserSelect(_ref, ref) {
 
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content ".concat(className)
-  }, /*#__PURE__*/React.createElement(OrgUserTree, {
+  }, /*#__PURE__*/React.createElement(TreeMode, {
+    mode: "Org",
+    title: "\u7EC4\u7EC7\u673A\u6784",
+    inputPlaceholder: "\u8BF7\u8F93\u5165\u540D\u79F0",
     onSelect: function onSelect(ids) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -128,7 +131,7 @@ function UserSelect(_ref, ref) {
         });
       });
     },
-    activeKey: selectId
+    selectedKeys: [selectId]
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
     list: userList,

package/es/WorkerFlow/Demo.js

@@ -6,7 +6,8 @@ var form = [{
   label: '处理意见',
   auth: 1,
   name: 'yijian',
-  type: 'string',
+  fromType: 'SINGLE_SELECTION',
+  required: true,
   options: [{
     label: '有效',
     value: 1

package/es/WorkerFlow/Form/Condition.js

@@ -56,6 +56,9 @@ function ConditionForm(_ref) {
   }, [formItem.name, useConditionFields]);
   var addCondition = useCallback(function () {
     var modal = modalRef.current;
+    var allowForm = form.filter(function (v) {
+      return v.fromType === 'SINGLE_SELECTION' && v.required;
+    });
 
     var onOk = function onOk() {
       var _a, _b;
@@ -83,7 +86,7 @@ function ConditionForm(_ref) {
     var options = {
       content: /*#__PURE__*/React.createElement(ModalContent, {
         ref: cRef,
-        form: form,
+        form: allowForm,
         value: state.field
       }),
       width: 340,

package/es/WorkerFlow/Form/FormAuth.js

@@ -104,7 +104,7 @@ function FormAuth(_ref) {
           onClick: function onClick() {
             return onFormAuthChange({
               name: item.name,
-              auth: 3
+              auth: 0
             });
           }
         });

package/es/WorkerFlow/Form/GroupSelectModalContent.js

@@ -1,3 +1,4 @@
+import _treeHelper from "@cloud-app-dev/utils/es/treeHelper";
 import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -23,9 +24,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
 import api from '../../Api';
 import TreeMode from '../../TreeMode';
-import List from '../../List';
 import { uniq, intersectionWith } from 'lodash';
-import { treeHelper } from '@cloud-app-dev/utils';
 import { formatRenderGroup } from './utils';
 import GroupList from './GroupList';
 
@@ -52,7 +51,7 @@ function GroupSelectModalContent(_ref, ref) {
       orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
 
   var treeData = useMemo(function () {
-    return treeHelper.computTreeList(orgList);
+    return _treeHelper.computTreeList(orgList);
   }, [orgList]);
   var selectId = useMemo(function () {
     return state.orgId ? state.orgId : treeData[0] ? treeData[0].id : undefined;
@@ -112,9 +111,26 @@ function GroupSelectModalContent(_ref, ref) {
       })
     };
   }, [state.selectUsers, state.selectIds]);
+  var nodeUserList = useMemo(function () {
+    return formatRenderGroup(groupList.filter(function (v) {
+      return !state.keyword1 || v.postName.includes(state.keyword1);
+    }).map(function (v) {
+      var orgItem = orgList.find(function (v2) {
+        return v2.id === v.orgId;
+      });
+      return {
+        name: v.postName,
+        value: v.id,
+        key: 'groupId',
+        groupName: orgItem === null || orgItem === void 0 ? void 0 : orgItem.organizationName
+      };
+    }));
+  }, [groupList, orgList, state.keyword1]);
   var renderList = useMemo(function () {
-    return formatRenderGroup(state.selectUsers);
-  }, [state.selectUsers]);
+    return formatRenderGroup(state.selectUsers.filter(function (v) {
+      return !state.keyword2 || v.name.includes(state.keyword2);
+    }));
+  }, [state.selectUsers, state.keyword2]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content"
   }, /*#__PURE__*/React.createElement(TreeMode, {
@@ -129,14 +145,9 @@ function GroupSelectModalContent(_ref, ref) {
       });
     },
     selectedKeys: [selectId]
-  }), /*#__PURE__*/React.createElement(List, {
-    onChecked: onUserChecked1,
-    list: groupList,
-    key: groupList.length,
+  }), /*#__PURE__*/React.createElement(GroupList, {
+    list: nodeUserList,
     checkedKeys: list1CheckedKeys,
-    itemKey: "id",
-    itemNameKey: "postName",
-    title: "\u5C97\u4F4D",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -144,7 +155,8 @@ function GroupSelectModalContent(_ref, ref) {
         });
       });
     },
-    keywords: state.keyword1
+    keywords: state.keyword1,
+    onChecked: onUserChecked1
   }), /*#__PURE__*/React.createElement(GroupList, {
     list: renderList,
     checkedKeys: state.selectIds,

package/es/WorkerFlow/Form/Handle.js

@@ -14,7 +14,7 @@ function HandleForm(_ref) {
     return (_a = getParentNodeById(config, item.id)) === null || _a === void 0 ? void 0 : _a.bpmnType;
   }, [config, item.id]);
   var includeUserTypes = useMemo(function () {
-    return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3] : [1, 2, 3];
+    return parentNodeType === 'startEvent' || parentNodeType === 'sequenceFlow' ? [1, 3, 4, 5] : [1, 2, 3, 4, 5];
   }, []);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,

package/es/WorkerFlow/Form/Notifier.js

@@ -8,7 +8,8 @@ function NotifierForm(_ref) {
     userType: item.userType,
     nodeUserList: item.nodeUserList,
     onChange: onChange,
-    includeUserTypes: [1]
+    includeUserTypes: [1],
+    nodeType: 2
   }));
 }
 

package/es/WorkerFlow/Form/UserAndGroupSelect.js

@@ -27,6 +27,7 @@ import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import RefModal from '../../RefModal';
+import { formatRenderGroup } from './utils';
 
 function UserAndGroupSelect(_ref) {
   var _this = this;
@@ -97,6 +98,9 @@ function UserAndGroupSelect(_ref) {
       }
     });
   }, [state.userList, state.type]);
+  var renderList = useMemo(function () {
+    return state.type === 'groupId' ? formatRenderGroup(state.userList) : state.userList;
+  }, [state.userList, state.type]);
   useEffect(function () {
     return onChange(state.userList);
   }, [state.userList]);
@@ -108,6 +112,16 @@ function UserAndGroupSelect(_ref) {
       });
     });
   }, []);
+  var onCloseTag = useCallback(function (id) {
+    var list = state.userList.filter(function (v) {
+      return v.value !== id;
+    });
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        userList: list
+      });
+    });
+  }, [state.userList]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-component user-and-group-select-component"
   }, /*#__PURE__*/React.createElement("div", {
@@ -135,12 +149,37 @@ function UserAndGroupSelect(_ref) {
     className: "placeholder"
   }, "\u4E0D\u80FD\u8D85\u8FC720\u4E2A")), /*#__PURE__*/React.createElement("div", {
     className: "user-list-wrapper"
-  }, state.userList.map(function (v) {
+  }, state.type === 'userId' ? state.userList.map(function (v) {
     return /*#__PURE__*/React.createElement(_Tag, {
       closable: true,
       key: v.value,
-      color: color
+      color: color,
+      onClose: function onClose() {
+        return onCloseTag(v.value);
+      }
     }, v.name);
+  }) : renderList.map(function (v) {
+    return /*#__PURE__*/React.createElement("div", {
+      key: v[0],
+      style: {
+        marginBottom: 12,
+        fontSize: 'var(--fs)'
+      }
+    }, /*#__PURE__*/React.createElement("div", {
+      style: {
+        paddingBottom: 5,
+        fontWeight: 'bold'
+      }
+    }, v[0]), v[1].map(function (item) {
+      return /*#__PURE__*/React.createElement(_Tag, {
+        closable: true,
+        key: item.value,
+        color: color,
+        onClose: function onClose() {
+          return onCloseTag(item.value);
+        }
+      }, item.name);
+    }));
   })), /*#__PURE__*/React.createElement(RefModal, {
     ref: modalRef
   }));

package/es/WorkerFlow/Form/UserSelectModalContent.js

@@ -98,6 +98,16 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
       })
     };
   }, [state.selectUsers, state.selectIds]);
+  var renderList1 = useMemo(function () {
+    return userList.filter(function (v) {
+      return !state.keyword1 || v.realName.includes(state.keyword1);
+    });
+  }, [state.keyword1, userList]);
+  var renderList2 = useMemo(function () {
+    return state.selectUsers.filter(function (v) {
+      return !state.keyword2 || v.name.includes(state.keyword2);
+    });
+  }, [state.keyword2, state.selectUsers]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content"
   }, /*#__PURE__*/React.createElement(TreeMode, {
@@ -121,7 +131,7 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
     mode: "Org"
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
-    list: userList,
+    list: renderList1,
     key: userList.length,
     checkedKeys: list1CheckedKeys,
     itemKey: "id",
@@ -137,7 +147,7 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
     },
     keywords: state.keyword1
   }), /*#__PURE__*/React.createElement(List, {
-    list: state.selectUsers,
+    list: renderList2,
     itemKey: "value",
     itemNameKey: "name",
     checkedKeys: state.selectIds,

package/es/WorkerFlow/Form/UserSet.d.ts

@@ -1,4 +1,4 @@
-import { MutipleUserHandleType, NodeUserType, UserSetType } from '../interface';
+import { MutipleUserHandleType, NodeType, NodeUserType, UserSetType } from '../interface';
 interface IUserSetProps {
     userType?: UserSetType;
     nodeUserList?: NodeUserType[];
@@ -7,6 +7,7 @@ interface IUserSetProps {
     onChange: (data: any) => void;
     includeUserTypes?: UserSetType[];
     chargeLevel?: 1 | 2 | 3;
+    nodeType?: NodeType;
 }
-declare function UserSet({ userType, nodeUserList, usersHandType, onChange, emptyUsers, includeUserTypes, chargeLevel }: IUserSetProps): JSX.Element;
+declare function UserSet({ userType, nodeType, nodeUserList, usersHandType, onChange, emptyUsers, includeUserTypes, chargeLevel }: IUserSetProps): JSX.Element;
 export default UserSet;

package/es/WorkerFlow/Form/UserSet.js

@@ -38,10 +38,11 @@ function UserSet(_ref) {
 
   var _ref$userType = _ref.userType,
       userType = _ref$userType === void 0 ? 1 : _ref$userType,
+      nodeType = _ref.nodeType,
       _ref$nodeUserList = _ref.nodeUserList,
       nodeUserList = _ref$nodeUserList === void 0 ? [] : _ref$nodeUserList,
       _ref$usersHandType = _ref.usersHandType,
-      usersHandType = _ref$usersHandType === void 0 ? 1 : _ref$usersHandType,
+      usersHandType = _ref$usersHandType === void 0 ? 2 : _ref$usersHandType,
       onChange = _ref.onChange,
       emptyUsers = _ref.emptyUsers,
       includeUserTypes = _ref.includeUserTypes,
@@ -114,7 +115,8 @@ function UserSet(_ref) {
     usersHandType: state.usersHandType,
     onChange: function onChange(options) {
       return stateChange(options);
-    }
+    },
+    nodeType: nodeType
   })));
 }
 /**
@@ -127,7 +129,8 @@ function UserSelectType1(_ref2) {
       usersHandType = _ref2.usersHandType,
       _onChange = _ref2.onChange,
       type = _ref2.type,
-      emptyUsers = _ref2.emptyUsers;
+      emptyUsers = _ref2.emptyUsers,
+      nodeType = _ref2.nodeType;
   var userList = useMemo(function () {
     return users.filter(function (v) {
       return v.key === 'userId';
@@ -140,7 +143,7 @@ function UserSelectType1(_ref2) {
     onChange: function onChange(users) {
       return _onChange(_defineProperty({}, type, users));
     }
-  }), /*#__PURE__*/React.createElement(UsersHandleType, {
+  }), nodeType !== 2 && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(UsersHandleType, {
     usersHandType: usersHandType,
     onChange: function onChange(value) {
       return _onChange({
@@ -154,7 +157,7 @@ function UserSelectType1(_ref2) {
         emptyUsers: users
       });
     }
-  }));
+  })));
 }
 /**
  * @desc 自选人员

package/es/WorkerFlow/Form/UsersHandleType.js

@@ -7,7 +7,9 @@ function UsersHandleType(_ref) {
   var usersHandType = _ref.usersHandType,
       _onChange = _ref.onChange;
   var options = useMemo(function () {
-    return Object.values(UserHandleTypeOptions);
+    return Object.values(UserHandleTypeOptions).sort(function (a, b) {
+      return b.value - a.value;
+    });
   }, []);
   return /*#__PURE__*/React.createElement("div", {
     className: "users-handle-type-content"

package/es/WorkerFlow/Nodes/Condition.js

@@ -4,6 +4,7 @@ import AddNode from './Add';
 import Render from './Render';
 import { NodeTypes } from './Constants';
 import WFC from '../OperatorContext';
+import TitleElement from './TitleElement';
 
 function CoverLine(_ref) {
   var _ref$first = _ref.first,
@@ -44,17 +45,13 @@ function BranchNode(_ref2) {
     onClick: sortLeft
   }), /*#__PURE__*/React.createElement("div", {
     className: "title-wrapper"
-  }, /*#__PURE__*/React.createElement("span", {
-    className: "editable-title"
-  }, nodeName), /*#__PURE__*/React.createElement(_IconFont, {
-    className: "worker-flow-node-del",
-    type: "icon-MarkNo",
-    style: {
-      color: '#333',
-      right: 5,
-      top: 5
+  }, /*#__PURE__*/React.createElement(TitleElement, {
+    placeholder: "\u8BF7\u8F93\u5165\u6761\u4EF6\u540D\u79F0",
+    onTitleChange: function onTitleChange(v) {
+      return node.nodeName = v;
     },
-    onClick: delBranch
+    delNode: delBranch,
+    nodeName: node.nodeName
   })), !last && /*#__PURE__*/React.createElement("div", {
     className: "sort-right",
     onClick: sortRight

package/es/WorkerFlow/Nodes/TitleElement.js

@@ -48,7 +48,7 @@ function TitleElement(_ref) {
     onTitleChange && onTitleChange(title);
   }, [title]);
 
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(_IconFont, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, icon && /*#__PURE__*/React.createElement(_IconFont, {
     type: icon,
     style: {
       paddingRight: 4

package/es/WorkerFlow/index.css

@@ -246,10 +246,18 @@
 }
 .worker-flow-design .auto-judge .title-wrapper .editable-title {
   display: inline-block;
-  max-width: 120px;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  margin-right: 10px;
+  height: 20px;
+}
+.worker-flow-design .auto-judge .title-wrapper .editable-title-input {
+  margin-right: 10px;
+  height: 20px;
+}
+.worker-flow-design .auto-judge .title-wrapper .anticon {
+  color: #333;
 }
 .worker-flow-design .auto-judge .content {
   font-size: 14px;
@@ -400,7 +408,9 @@
   top: 30px;
   z-index: 1;
 }
-.auto-judge:hover .editable-title,
+.auto-judge:hover .editable-title {
+  border-bottom: 1px dashed #15bc83;
+}
 .node-wrap-box:hover .editable-title {
   border-bottom: 1px dashed #fff;
 }

package/es/WorkerFlow/interface.d.ts

@@ -15,6 +15,7 @@ export type NodeUserType = {
 export type WorkerFlowFormType = {
   name: string;
   label: string;
+  fromType: 'SINGLE_TEXT' | 'MULTIPLE_TEXT' | 'SINGLE_SELECTION' | 'MULTIPLE_SELECTION' | 'IMAGE';
   type: string;
   value: string;
   auth?: FormAuthType;
@@ -84,7 +85,7 @@ export type SubmitFlowItemType = {
 export type SubmitData = {
   config: WorkerFlowRequest;
   bpmnBlob: Blob;
-  useFormKeys: string[];
+  useFormKeys: ConditionItemType[];
   taskList: SubmitFlowItemType[];
 };
 

package/es/WorkerFlow/utils.d.ts

@@ -1,6 +1,6 @@
-import { NodeItem, SubmitFlowItemType } from './interface';
+import { ConditionItemType, 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[];
+export declare function getUserFormKeys(data: NodeItem): ConditionItemType[];

package/es/WorkerFlow/utils.js

@@ -167,9 +167,8 @@ export function getUserFormKeys(data) {
 
   var fn = function fn(node) {
     if (node.bpmnType == 'sequenceFlow') {
-      arr.push.apply(arr, _toConsumableArray(node.conditionList.map(function (v) {
-        return v.field;
-      })));
+      console.log(node.conditionList);
+      arr.push.apply(arr, _toConsumableArray(node.conditionList));
     }
 
     if (node.conditionNodes) {

package/es/utils.js

@@ -1,7 +1,7 @@
-import { cache } from '@cloud-app-dev/utils';
+import _cache from "@cloud-app-dev/utils/es/cache";
 export var getHeader = function getHeader() {
   return {
-    Authorization: cache.getCache('token', 'session')
+    Authorization: _cache.getCache('token', 'session')
   };
 };
 /**

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",