@cloud-app-dev/vidc 1.0.32 → 1.0.36

package/es/UserSelect/index.js

@@ -0,0 +1,168 @@
+import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
+import _useHttp2 from "@cloud-app-dev/basic-components/es/useHttp";
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+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, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
+import api from '../Api';
+import OrgUserTree from '../OrgUserTree';
+import { treeHelper } from '@cloud-app-dev/utils';
+import List from '../List';
+import { uniq, intersectionWith, uniqBy, differenceWith } from 'lodash';
+import "./index.css";
+
+function UserSelect(_ref, ref) {
+  var selectUsers = _ref.selectUsers,
+      onChange = _ref.onChange,
+      _ref$className = _ref.className,
+      className = _ref$className === void 0 ? '' : _ref$className;
+
+  var _useState = useState({
+    keyword1: '',
+    keyword2: '',
+    orgId: '',
+    selectUsers: selectUsers,
+    selectIds: selectUsers.map(function (v) {
+      return v.id;
+    })
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
+  var _useHttp = _useHttp2('QueryOrgList', function () {
+    return api.getOrgs();
+  }),
+      _useHttp$data = _useHttp.data,
+      orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
+
+  var treeData = useMemo(function () {
+    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 _ref3 = _slicedToArray(_ref2, 2),
+        _ = _ref3[0],
+        id = _ref3[1];
+
+    return id ? api.getUsers(id) : Promise.resolve();
+  }),
+      _useHttp3$data = _useHttp3.data,
+      userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
+
+  var onUserChecked1 = useCallback(function (ids) {
+    var items = userList.filter(function (v) {
+      return ids.includes(v.id);
+    });
+    var notInList = differenceWith(state.selectUsers, userList, function (a, b) {
+      return a.id === b.id;
+    });
+    var arr = [];
+    items.forEach(function (item) {
+      arr.push(item);
+    });
+    var newUsers = uniqBy([].concat(_toConsumableArray(notInList), arr), 'id');
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        selectUsers: newUsers,
+        selectIds: uniq([].concat(_toConsumableArray(old.selectIds), _toConsumableArray(ids)))
+      });
+    });
+  }, [userList, state.selectUsers]);
+  var onUserChecked2 = useCallback(function (ids) {
+    return setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        selectIds: ids
+      });
+    });
+  }, []);
+  var list1CheckedKeys = useMemo(function () {
+    return intersectionWith(userList, state.selectUsers, function (a, b) {
+      return a.id === b.id;
+    }).map(function (v) {
+      return v.id;
+    });
+  }, [userList, state.selectUsers]);
+  useImperativeHandle(ref, function () {
+    return {
+      userList: state.selectUsers.filter(function (v) {
+        return state.selectIds.includes(v.id);
+      })
+    };
+  }, [state.selectUsers, state.selectIds]);
+
+  _useChangeEffect(function () {
+    return onChange && onChange(state.selectUsers.filter(function (v) {
+      return state.selectIds.includes(v.id);
+    }));
+  }, [state.selectUsers, state.selectIds]);
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "user-select-modal-content ".concat(className)
+  }, /*#__PURE__*/React.createElement(OrgUserTree, {
+    onSelect: function onSelect(ids) {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          orgId: ids[0]
+        });
+      });
+    },
+    activeKey: selectId
+  }), /*#__PURE__*/React.createElement(List, {
+    onChecked: onUserChecked1,
+    list: userList,
+    key: userList.length,
+    checkedKeys: list1CheckedKeys,
+    itemKey: "id",
+    itemNameKey: "realName",
+    className: "user-source-list",
+    title: "\u4EBA\u5458",
+    onKeywordChange: function onKeywordChange(v) {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          keyword1: v
+        });
+      });
+    },
+    keywords: state.keyword1
+  }), /*#__PURE__*/React.createElement(List, {
+    list: state.selectUsers,
+    itemKey: "id",
+    itemNameKey: "realName",
+    checkedKeys: state.selectIds,
+    className: "user-select-list",
+    title: "\u5DF2\u6DFB\u52A0",
+    onKeywordChange: function onKeywordChange(v) {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          keyword2: v
+        });
+      });
+    },
+    keywords: state.keyword2,
+    onChecked: onUserChecked2
+  }));
+}
+
+export default /*#__PURE__*/React.forwardRef(UserSelect);

package/es/WorkerFlow/Form/Condition.js

@@ -5,7 +5,6 @@ import _Button from "antd/lib/button";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import _ContentBox from "@cloud-app-dev/basic-components/es/ContentBox";
 import _useChangeEffect from "@cloud-app-dev/basic-components/es/useChangeEffect";
-import _useModal from "@cloud-app-dev/basic-components/es/useModal";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -20,6 +19,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import RefModal from '../../RefModal';
 
 function ConditionForm(_ref) {
   var form = _ref.form,
@@ -46,9 +46,7 @@ function ConditionForm(_ref) {
     return formItem ? formItem.options : [];
   }, [formItem]);
   var cRef = useRef(null);
-
-  var modal = _useModal();
-
+  var modalRef = useRef(null);
   var disabledValues = useMemo(function () {
     return useConditionFields.filter(function (v) {
       return v.field === formItem.name;
@@ -57,6 +55,8 @@ function ConditionForm(_ref) {
     });
   }, [formItem.name, useConditionFields]);
   var addCondition = useCallback(function () {
+    var modal = modalRef.current;
+
     var onOk = function onOk() {
       var _a, _b;
 
@@ -178,7 +178,9 @@ function ConditionForm(_ref) {
       },
       disabled: disabledValues.includes(item.value)
     }, item.label);
-  }))));
+  }))), /*#__PURE__*/React.createElement(RefModal, {
+    ref: modalRef
+  }));
 }
 
 var ModalContent = /*#__PURE__*/React.forwardRef(function ModalContent(_ref2, ref) {

package/es/WorkerFlow/Form/EmptyUserSet.js

@@ -5,7 +5,6 @@ import "antd/lib/button/style";
 import _Button from "antd/lib/button";
 import "antd/lib/message/style";
 import _message from "antd/lib/message";
-import _useModal from "@cloud-app-dev/basic-components/es/useModal";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -24,6 +23,7 @@ import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react'
 import _ from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
+import RefModal from '../../RefModal';
 
 function EmptyUserSet(_ref) {
   var _this = this;
@@ -39,8 +39,7 @@ function EmptyUserSet(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var modal = _useModal();
-
+  var modalRef = useRef(null);
   var cRef = useRef(null);
   var color = useMemo(function () {
     var c = getComputedStyle(document.querySelector(':root')).getPropertyValue('--primary');
@@ -50,6 +49,7 @@ function EmptyUserSet(_ref) {
     return chroma(col).alpha(0.5).hex('rgba');
   }, []);
   var userModify = useCallback(function () {
+    var modal = modalRef.current;
     modal.open({
       title: '添加人员',
       content: /*#__PURE__*/React.createElement(UserSelectModalContent, {
@@ -126,7 +126,9 @@ function EmptyUserSet(_ref) {
         return onCloseTag(v.value);
       }
     }, v.name);
-  })));
+  })), /*#__PURE__*/React.createElement(RefModal, {
+    ref: modalRef
+  }));
 }
 
 export default EmptyUserSet;

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

@@ -6,5 +6,5 @@ interface IGroupListProps {
     keywords?: string;
     onChecked: (ids: string[]) => void;
 }
-declare function GroupList({ list, onKeywordChange, onChecked }: IGroupListProps): JSX.Element;
+declare function GroupList({ list, onKeywordChange, onChecked, checkedKeys }: IGroupListProps): JSX.Element;
 export default GroupList;

package/es/WorkerFlow/Form/GroupList.js

@@ -6,7 +6,8 @@ import TreeTitle from '../../TreeTitle';
 function GroupList(_ref) {
   var list = _ref.list,
       onKeywordChange = _ref.onKeywordChange,
-      onChecked = _ref.onChecked;
+      onChecked = _ref.onChecked,
+      checkedKeys = _ref.checkedKeys;
   return /*#__PURE__*/React.createElement("div", {
     className: "lm-c-check-list-wrapper vidc-list-component post-group-list"
   }, /*#__PURE__*/React.createElement(TreeTitle, {
@@ -17,6 +18,7 @@ function GroupList(_ref) {
   }), /*#__PURE__*/React.createElement("div", {
     className: "lm-c-base-list-layout"
   }, /*#__PURE__*/React.createElement(_Checkbox.Group, {
+    value: checkedKeys,
     onChange: function onChange(v) {
       return onChecked(v);
     }

package/es/WorkerFlow/Form/GroupSelect.js

@@ -5,7 +5,6 @@ import "antd/lib/button/style";
 import _Button from "antd/lib/button";
 import "antd/lib/message/style";
 import _message from "antd/lib/message";
-import _useModal from "@cloud-app-dev/basic-components/es/useModal";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -25,6 +24,7 @@ import _ from 'lodash';
 import chroma from 'chroma-js';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import { formatRenderGroup } from './utils';
+import RefModal from '../../RefModal';
 
 function GroupSelect(_ref) {
   var _this = this;
@@ -40,8 +40,7 @@ function GroupSelect(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var modal = _useModal();
-
+  var modalRef = useRef(null);
   var cRef = useRef(null);
   var color = useMemo(function () {
     var c = getComputedStyle(document.querySelector(':root')).getPropertyValue('--primary');
@@ -51,6 +50,7 @@ function GroupSelect(_ref) {
     return chroma(col).alpha(0.5).hex('rgba');
   }, []);
   var userModify = useCallback(function () {
+    var modal = modalRef.current;
     modal.open({
       title: '添加人员',
       content: /*#__PURE__*/React.createElement(GroupSelectModalContent, {
@@ -141,7 +141,9 @@ function GroupSelect(_ref) {
         }
       }, item.name);
     }));
-  })));
+  })), /*#__PURE__*/React.createElement(RefModal, {
+    ref: modalRef
+  }));
 }
 
 export default GroupSelect;

package/es/WorkerFlow/Form/GroupSelectModalContent.js

@@ -21,8 +21,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useMemo, useState, useImperativeHandle } from 'react';
-import api from '../api';
-import OrgTree from '../../OrgTree';
+import api from '../../Api';
+import TreeMode from '../../TreeMode';
 import List from '../../List';
 import { uniq, intersectionWith } from 'lodash';
 import { treeHelper } from '@cloud-app-dev/utils';
@@ -66,10 +66,10 @@ function GroupSelectModalContent(_ref, ref) {
     return id ? api.getPosts(id) : Promise.resolve();
   }),
       _useHttp3$data = _useHttp3.data,
-      userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
+      groupList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
 
   var onUserChecked1 = useCallback(function (ids) {
-    var items = userList.filter(function (v) {
+    var items = groupList.filter(function (v) {
       return ids.includes(v.id);
     });
     var arr = [];
@@ -90,7 +90,7 @@ function GroupSelectModalContent(_ref, ref) {
         selectIds: uniq([].concat(_toConsumableArray(old.selectIds), _toConsumableArray(ids)))
       });
     });
-  }, [userList, orgList]);
+  }, [groupList, orgList]);
   var onUserChecked2 = useCallback(function (ids) {
     return setState(function (old) {
       return Object.assign(Object.assign({}, old), {
@@ -99,12 +99,12 @@ function GroupSelectModalContent(_ref, ref) {
     });
   }, []);
   var list1CheckedKeys = useMemo(function () {
-    return intersectionWith(userList, state.selectUsers, function (a, b) {
+    return intersectionWith(groupList, state.selectUsers, function (a, b) {
       return a.id === b.value;
     }).map(function (v) {
       return v.id;
     });
-  }, [userList, state.selectUsers]);
+  }, [groupList, state.selectUsers]);
   useImperativeHandle(ref, function () {
     return {
       userList: state.selectUsers.filter(function (v) {
@@ -117,8 +117,9 @@ function GroupSelectModalContent(_ref, ref) {
   }, [state.selectUsers]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content"
-  }, /*#__PURE__*/React.createElement(OrgTree, {
+  }, /*#__PURE__*/React.createElement(TreeMode, {
     treeData: treeData,
+    mode: "Org",
     title: "\u7EC4\u7EC7\u673A\u6784",
     onSelect: function onSelect(ids) {
       return setState(function (old) {
@@ -127,11 +128,11 @@ function GroupSelectModalContent(_ref, ref) {
         });
       });
     },
-    activeKey: selectId
+    selectedKeys: [selectId]
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
-    list: userList,
-    key: userList.length,
+    list: groupList,
+    key: groupList.length,
     checkedKeys: list1CheckedKeys,
     itemKey: "id",
     itemNameKey: "postName",

package/es/WorkerFlow/Form/LevelGroupSelect.js

@@ -7,7 +7,6 @@ import _Button from "antd/lib/button";
 import _IconFont from "@cloud-app-dev/basic-components/es/IconFont";
 import "antd/lib/message/style";
 import _message from "antd/lib/message";
-import _useModal from "@cloud-app-dev/basic-components/es/useModal";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -27,6 +26,7 @@ import _ from 'lodash';
 import chroma from 'chroma-js';
 import GroupSelectModalContent from './GroupSelectModalContent';
 import { formatRenderGroup } from './utils';
+import RefModal from '../../RefModal';
 
 function LevelGroupSelect(_ref) {
   var _this = this;
@@ -44,8 +44,7 @@ function LevelGroupSelect(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var modal = _useModal();
-
+  var modalRef = useRef(null);
   var cRef = useRef(null);
   var color = useMemo(function () {
     var c = getComputedStyle(document.querySelector(':root')).getPropertyValue('--primary');
@@ -55,6 +54,7 @@ function LevelGroupSelect(_ref) {
     return chroma(col).alpha(0.5).hex('rgba');
   }, []);
   var userModify = useCallback(function () {
+    var modal = modalRef.current;
     modal.open({
       title: '添加人员',
       content: /*#__PURE__*/React.createElement(GroupSelectModalContent, {
@@ -175,7 +175,9 @@ function LevelGroupSelect(_ref) {
     value: 2
   }, "\u7B2C\u4E8C\u7EA7\u4E3B\u7BA1"), /*#__PURE__*/React.createElement(_Select.Option, {
     value: 3
-  }, "\u7B2C\u4E09\u7EA7\u4E3B\u7BA1"))));
+  }, "\u7B2C\u4E09\u7EA7\u4E3B\u7BA1"))), /*#__PURE__*/React.createElement(RefModal, {
+    ref: modalRef
+  }));
 }
 
 export default LevelGroupSelect;

package/es/WorkerFlow/Form/Notifier.js

@@ -7,7 +7,8 @@ function NotifierForm(_ref) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(UserSet, {
     userType: item.userType,
     nodeUserList: item.nodeUserList,
-    onChange: onChange
+    onChange: onChange,
+    includeUserTypes: [1]
   }));
 }
 

package/es/WorkerFlow/Form/UserAndGroupSelect.js

@@ -7,7 +7,6 @@ import "antd/lib/select/style";
 import _Select from "antd/lib/select";
 import "antd/lib/message/style";
 import _message from "antd/lib/message";
-import _useModal from "@cloud-app-dev/basic-components/es/useModal";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -27,6 +26,7 @@ import _ from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
 import GroupSelectModalContent from './GroupSelectModalContent';
+import RefModal from '../../RefModal';
 
 function UserAndGroupSelect(_ref) {
   var _this = this;
@@ -47,8 +47,7 @@ function UserAndGroupSelect(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var modal = _useModal();
-
+  var modalRef = useRef(null);
   var cRef = useRef(null);
   var color = useMemo(function () {
     var c = getComputedStyle(document.querySelector(':root')).getPropertyValue('--primary');
@@ -58,6 +57,7 @@ function UserAndGroupSelect(_ref) {
     return chroma(col).alpha(0.5).hex('rgba');
   }, []);
   var userModify = useCallback(function () {
+    var modal = modalRef.current;
     var Content = state.type === 'userId' ? UserSelectModalContent : GroupSelectModalContent;
     modal.open({
       title: '添加人员',
@@ -141,7 +141,9 @@ function UserAndGroupSelect(_ref) {
       key: v.value,
       color: color
     }, v.name);
-  })));
+  })), /*#__PURE__*/React.createElement(RefModal, {
+    ref: modalRef
+  }));
 }
 
 export default UserAndGroupSelect;

package/es/WorkerFlow/Form/UserSelect.js

@@ -5,7 +5,6 @@ import "antd/lib/button/style";
 import _Button from "antd/lib/button";
 import "antd/lib/message/style";
 import _message from "antd/lib/message";
-import _useModal from "@cloud-app-dev/basic-components/es/useModal";
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -24,6 +23,7 @@ import React, { useCallback, useMemo, useRef, useState, useEffect } from 'react'
 import _ from 'lodash';
 import chroma from 'chroma-js';
 import UserSelectModalContent from './UserSelectModalContent';
+import RefModal from '../../RefModal';
 
 function UserSelect(_ref) {
   var _this = this;
@@ -39,8 +39,7 @@ function UserSelect(_ref) {
       state = _useState2[0],
       setState = _useState2[1];
 
-  var modal = _useModal();
-
+  var modalRef = useRef(null);
   var cRef = useRef(null);
   var color = useMemo(function () {
     var c = getComputedStyle(document.querySelector(':root')).getPropertyValue('--primary');
@@ -50,6 +49,7 @@ function UserSelect(_ref) {
     return chroma(col).alpha(0.5).hex('rgba');
   }, []);
   var userModify = useCallback(function () {
+    var modal = modalRef.current;
     modal.open({
       title: '添加人员',
       content: /*#__PURE__*/React.createElement(UserSelectModalContent, {
@@ -124,7 +124,9 @@ function UserSelect(_ref) {
         return onCloseTag(v.value);
       }
     }, v.name);
-  })));
+  })), /*#__PURE__*/React.createElement(RefModal, {
+    ref: modalRef
+  }));
 }
 
 export default UserSelect;

package/es/WorkerFlow/Form/UserSelectModalContent.js

@@ -21,11 +21,10 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useCallback, useMemo, useState, forwardRef, useImperativeHandle } from 'react';
-import api from '../api';
-import OrgTree from '../../OrgTree';
-import { treeHelper } from '@cloud-app-dev/utils';
+import api from '../../Api';
+import TreeMode from '../../TreeMode';
 import List from '../../List';
-import { uniq, intersectionWith } from 'lodash';
+import { uniq, intersectionWith, uniqBy, differenceWith } from 'lodash';
 var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalContent(_ref, ref) {
   var selectUsers = _ref.selectUsers;
 
@@ -34,6 +33,9 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
     keyword2: '',
     orgId: '',
     selectUsers: selectUsers,
+    list1CheckedKeys: selectUsers.map(function (v) {
+      return v.value;
+    }),
     selectIds: selectUsers.map(function (v) {
       return v.value;
     })
@@ -42,33 +44,23 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
       state = _useState2[0],
       setState = _useState2[1];
 
-  var _useHttp = _useHttp2('QueryOrgList', function () {
-    return api.getOrgs();
-  }),
-      _useHttp$data = _useHttp.data,
-      orgList = _useHttp$data === void 0 ? [] : _useHttp$data;
-
-  var treeData = useMemo(function () {
-    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 _useHttp = _useHttp2(['QueryUserList', state.orgId], function (_ref2) {
     var _ref3 = _slicedToArray(_ref2, 2),
         _ = _ref3[0],
         id = _ref3[1];
 
     return id ? api.getUsers(id) : Promise.resolve();
   }),
-      _useHttp3$data = _useHttp3.data,
-      userList = _useHttp3$data === void 0 ? [] : _useHttp3$data;
+      _useHttp$data = _useHttp.data,
+      userList = _useHttp$data === void 0 ? [] : _useHttp$data;
 
   var onUserChecked1 = useCallback(function (ids) {
     var items = userList.filter(function (v) {
       return ids.includes(v.id);
     });
+    var notInList = differenceWith(state.selectUsers, userList, function (a, b) {
+      return a.value === b.id;
+    });
     var arr = [];
     items.forEach(function (item) {
       arr.push({
@@ -79,11 +71,12 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
     });
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
-        selectUsers: arr,
+        selectUsers: uniqBy([].concat(_toConsumableArray(notInList), arr), 'value'),
+        list1CheckedKeys: ids,
         selectIds: uniq([].concat(_toConsumableArray(old.selectIds), _toConsumableArray(ids)))
       });
     });
-  }, [userList]);
+  }, [userList, state.selectUsers]);
   var onUserChecked2 = useCallback(function (ids) {
     return setState(function (old) {
       return Object.assign(Object.assign({}, old), {
@@ -107,9 +100,16 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
   }, [state.selectUsers, state.selectIds]);
   return /*#__PURE__*/React.createElement("div", {
     className: "user-select-modal-content"
-  }, /*#__PURE__*/React.createElement(OrgTree, {
-    treeData: treeData,
+  }, /*#__PURE__*/React.createElement(TreeMode, {
     title: "\u7EC4\u7EC7\u673A\u6784",
+    onDefailtSelect: function onDefailtSelect(orgId) {
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          orgId: orgId
+        });
+      });
+    },
+    inputPlaceholder: "\u8BF7\u8F93\u5165\u540D\u79F0",
     onSelect: function onSelect(ids) {
       return setState(function (old) {
         return Object.assign(Object.assign({}, old), {
@@ -117,7 +117,8 @@ var UserSelectModalContent = /*#__PURE__*/forwardRef(function UserSelectModalCon
         });
       });
     },
-    activeKey: selectId
+    selectedKeys: [state.orgId],
+    mode: "Org"
   }), /*#__PURE__*/React.createElement(List, {
     onChecked: onUserChecked1,
     list: userList,

package/es/WorkerFlow/index.css

@@ -695,7 +695,7 @@
 .user-select-modal-content > div {
   flex: 1;
 }
-.user-select-modal-content .lm-organization-tree {
+.user-select-modal-content .bc-org-user-tree-layout {
   border-right: none;
 }
 .user-select-modal-content .user-source-list {