@cloud-app-dev/vidc 1.0.40 → 1.0.44

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 = [];
@@ -125,4 +125,8 @@ function OrgUserTree(_a) {
   })));
 }
 
+OrgUserTree.defaultProps = {
+  className: '',
+  treeNodeProps: {}
+};
 export default OrgUserTree;

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";
 
@@ -48,7 +48,8 @@ function PlaceTree(params) {
       inputPlaceholder = _b.inputPlaceholder,
       renderHeader = _b.renderHeader,
       keyword = _b.keyword,
-      treeNodeProps = _b.treeNodeProps,
+      _b$treeNodeProps = _b.treeNodeProps,
+      treeNodeProps = _b$treeNodeProps === void 0 ? {} : _b$treeNodeProps,
       renderSuffix = _b.renderSuffix,
       showCount = _b.showCount,
       props = __rest(_b, ["title", "inputPlaceholder", "renderHeader", "keyword", "treeNodeProps", "renderSuffix", "showCount"]);
@@ -61,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.d.ts

@@ -16,6 +16,7 @@ declare namespace TreeMode {
     var defaultProps: {
         mode: string;
         className: string;
+        treeNodeProps: {};
     };
 }
 export default TreeMode;

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 实现关键字展开节点
@@ -193,6 +193,7 @@ function TreeMode(_a) {
 
 TreeMode.defaultProps = {
   mode: 'Bz',
-  className: ''
+  className: '',
+  treeNodeProps: {}
 };
 export default TreeMode;

package/es/TreeTitle/index.css

@@ -18,6 +18,7 @@
   height: 28px;
   position: relative;
   top: -1px;
+  max-width: 200px;
 }
 .lm-c-tree-title-part .input-keword input {
   font-size: var(--fs-small);

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.d.ts

@@ -5,6 +5,10 @@ interface IUserSelectProps {
     selectUsers: UserInfo[];
     onChange?: (users: UserInfo[]) => void;
     className?: string;
+    /**
+     * @description  getUser其他参数
+     */
+    userParams?: any;
 }
 declare const _default: React.ForwardRefExoticComponent<IUserSelectProps & React.RefAttributes<any>>;
 export default _default;

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";
@@ -33,7 +33,8 @@ function UserSelect(_ref, ref) {
   var selectUsers = _ref.selectUsers,
       onChange = _ref.onChange,
       _ref$className = _ref.className,
-      className = _ref$className === void 0 ? '' : _ref$className;
+      className = _ref$className === void 0 ? '' : _ref$className,
+      userParams = _ref.userParams;
 
   var _useState = useState({
     keyword1: '',
@@ -55,18 +56,18 @@ 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;
   }, [treeData, state.orgId]);
 
-  var _useHttp3 = _useHttp2(['QueryUserList', selectId], function (_ref2) {
+  var _useHttp3 = _useHttp2(['QueryUserList', selectId, userParams], function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
         _ = _ref3[0],
         id = _ref3[1];
 
-    return id ? api.getUsers(id) : Promise.resolve();
+    return id ? api.getUsers(id, userParams) : Promise.resolve();
   }),
       _useHttp3$data = _useHttp3.data,
       userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
@@ -118,9 +119,22 @@ function UserSelect(_ref, ref) {
     }));
   }, [state.selectUsers, state.selectIds]);
 
+  var renderList1 = useMemo(function () {
+    return userList.filter(function (v) {
+      return !state.keyword1 || v.realName.includes(state.keyword1);
+    });
+  }, [userList, state.keyword1]);
+  var renderList2 = useMemo(function () {
+    return state.selectUsers.filter(function (v) {
+      return !state.keyword2 || v.realName.includes(state.keyword2);
+    });
+  }, [state.selectUsers, state.keyword2]);
   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,16 +142,16 @@ function UserSelect(_ref, ref) {
         });
       });
     },
-    activeKey: selectId
+    selectedKeys: [selectId]
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
-    list: userList,
+    list: renderList1,
     key: userList.length,
     checkedKeys: list1CheckedKeys,
     itemKey: "id",
     itemNameKey: "realName",
     className: "user-source-list",
-    title: "\u4EBA\u5458",
+    title: "\u4EBA\u5458\u5217\u8868",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -147,12 +161,12 @@ function UserSelect(_ref, ref) {
     },
     keywords: state.keyword1
   }), /*#__PURE__*/React.createElement(List, {
-    list: state.selectUsers,
+    list: renderList2,
     itemKey: "id",
     itemNameKey: "realName",
     checkedKeys: state.selectIds,
     className: "user-select-list",
-    title: "\u5DF2\u6DFB\u52A0",
+    title: "\u5DF2\u9009\u62E9\u4EBA\u5458",
     onKeywordChange: function onKeywordChange(v) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {

package/es/WorkerFlow/Demo.js

@@ -1,27 +1,13 @@
-import "antd/lib/drawer/style";
-import _Drawer from "antd/lib/drawer";
 import "antd/lib/config-provider/style";
 import _ConfigProvider from "antd/lib/config-provider";
-
-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."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-import React, { useState } from 'react';
+import React from 'react';
 import WorkerFlow from './index';
 var form = [{
   label: '处理意见',
   auth: 1,
   name: 'yijian',
-  type: 'string',
+  fromType: 'SINGLE_SELECTION',
+  required: true,
   options: [{
     label: '有效',
     value: 1
@@ -51,31 +37,16 @@ var form = [{
 }];
 
 var App = function App() {
-  var _useState = useState({
-    visible: false
-  }),
-      _useState2 = _slicedToArray(_useState, 2),
-      state = _useState2[0],
-      setState = _useState2[1];
-
   return /*#__PURE__*/React.createElement(_ConfigProvider, {
     prefixCls: "cloudapp"
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       height: 800
     }
-  }, /*#__PURE__*/React.createElement("button", {
-    onClick: function onClick(old) {
-      return setState({
-        visible: true
-      });
-    }
-  }, "111"), /*#__PURE__*/React.createElement(WorkerFlow, {
+  }, /*#__PURE__*/React.createElement(WorkerFlow, {
     form: form,
     onChange: console.log,
     hasTools: true
-  }), /*#__PURE__*/React.createElement(_Drawer, {
-    visible: state.visible
   })));
 };
 

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

@@ -1,8 +1,9 @@
 import { NodeItem, WorkerFlowFormType } from '../interface';
 interface IApproverFormProps {
     form: WorkerFlowFormType[];
-    item?: NodeItem;
+    item: NodeItem;
     onChange: (data: any) => void;
+    config: NodeItem;
 }
-declare function ApproverForm({ form, item, onChange }: IApproverFormProps): JSX.Element;
+declare function ApproverForm({ form, item, onChange, config }: IApproverFormProps): JSX.Element;
 export default ApproverForm;

package/es/WorkerFlow/Form/Approver.js

@@ -1,18 +1,29 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import UserSet from './UserSet';
 import FormAuth from './FormAuth';
+import { getParentNodeById } from '../XML/utils';
 
 function ApproverForm(_ref) {
   var form = _ref.form,
       item = _ref.item,
-      onChange = _ref.onChange;
+      onChange = _ref.onChange,
+      config = _ref.config;
+  var parentNodeType = useMemo(function () {
+    var _a;
+
+    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, 4, 5] : [1, 2, 3, 4, 5];
+  }, []);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,
     userType: item.userType,
     emptyUsers: item.emptyUserList,
     nodeUserList: item.nodeUserList,
     usersHandType: item.usersHandType,
-    onChange: onChange
+    onChange: onChange,
+    includeUserTypes: includeUserTypes
   }), /*#__PURE__*/React.createElement(FormAuth, {
     form: form,
     onChange: onChange

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.d.ts

@@ -1,8 +1,9 @@
 import { NodeItem, WorkerFlowFormType } from '../interface';
 interface IHandleFormProps {
     form: WorkerFlowFormType[];
-    item?: NodeItem;
+    item: NodeItem;
     onChange: (data: any) => void;
+    config: NodeItem;
 }
-declare function HandleForm({ form, item, onChange }: IHandleFormProps): JSX.Element;
+declare function HandleForm({ form, item, onChange, config }: IHandleFormProps): JSX.Element;
 export default HandleForm;

package/es/WorkerFlow/Form/Handle.js

@@ -1,18 +1,28 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import UserSet from './UserSet';
 import FormAuth from './FormAuth';
+import { getParentNodeById } from '../XML/utils';
 
 function HandleForm(_ref) {
   var form = _ref.form,
       item = _ref.item,
-      onChange = _ref.onChange;
+      onChange = _ref.onChange,
+      config = _ref.config;
+  var parentNodeType = useMemo(function () {
+    var _a;
+
+    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, 4, 5] : [1, 2, 3, 4, 5];
+  }, []);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     chargeLevel: item.chargeLevel,
     userType: item.userType,
     nodeUserList: item.nodeUserList,
     emptyUsers: item.emptyUserList,
     onChange: onChange,
-    includeUserTypes: [1, 2, 3],
+    includeUserTypes: includeUserTypes,
     usersHandType: item.usersHandType
   }), /*#__PURE__*/React.createElement(FormAuth, {
     form: form,

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;