@titaui/pc 1.16.16-beta.1 → 1.16.17-beta-2

package/lib/components/create-okr-modal/kr-items/krDatas.js

@@ -211,7 +211,11 @@ function KrDatas(props) {
   } // 修改KR
 
 
-  var _changeKr = (0, _react.useCallback)(function (kr, index) {
+  var changeKr = function changeKr(kr) {
+    var index = krDatasRef.current.findIndex(function (data) {
+      return data.uuid == kr.uuid;
+    });
+
     if (krDatasRef.current[index].krWeight !== kr.krWeight) {
       setIsCustomWeight(true);
     }
@@ -222,7 +226,7 @@ function KrDatas(props) {
     setKrDatas(newKrs);
     krDatasRef.current = newKrs;
     setInputKrInfo(kr);
-  }, [krDatasRef.current]); // 删除KR
+  }; // 删除KR
 
 
   var deleteKr = function deleteKr(id) {
@@ -292,9 +296,7 @@ function KrDatas(props) {
     return /*#__PURE__*/_react["default"].createElement(_krItem["default"], {
       key: kr === null || kr === void 0 ? void 0 : kr.uuid,
       krData: kr,
-      changeKr: function changeKr(newKr) {
-        return _changeKr(newKr, index);
-      },
+      changeKr: changeKr,
       deleteKr: deleteKr,
       container: container,
       index: index + 1,

package/lib/components/user-selector/category-selector-panel/depart-tree.js

@@ -23,6 +23,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+// eslint-disable-next-line func-names
 function _default(props) {
   var onSelect = props.onSelect,
       selected = props.selected,
@@ -38,7 +39,8 @@ function _default(props) {
       auth = _useContext.auth,
       authType = _useContext.authType,
       isGetRoot = _useContext.isGetRoot,
-      disabledDepartSelect = _useContext.disabledDepartSelect;
+      disabledDepartSelect = _useContext.disabledDepartSelect,
+      staffStatus = _useContext.staffStatus;
 
   var onGetDepartTreeData = function onGetDepartTreeData() {
     return (0, _requestApis.getTreeData)(departId, {
@@ -46,7 +48,8 @@ function _default(props) {
       auth: auth,
       authType: authType,
       isGetRoot: isGetRoot,
-      sourceFrom: sourceFrom
+      sourceFrom: sourceFrom,
+      staffStatus: staffStatus
     });
   };
 
@@ -57,7 +60,8 @@ function _default(props) {
       authType: authType,
       isGetRoot: isGetRoot,
       sourceFrom: sourceFrom,
-      isLoadNodes: true
+      isLoadNodes: true,
+      staffStatus: staffStatus
     });
   };
 

package/lib/components/user-selector/enum.js

@@ -0,0 +1,15 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StaffStatus = void 0;
+// eslint-disable-next-line import/prefer-default-export
+var StaffStatus;
+exports.StaffStatus = StaffStatus;
+
+(function (StaffStatus) {
+  StaffStatus[StaffStatus["All"] = 0] = "All";
+  StaffStatus[StaffStatus["OnTheJob"] = 1] = "OnTheJob";
+  StaffStatus[StaffStatus["Dimission"] = 2] = "Dimission";
+})(StaffStatus || (exports.StaffStatus = StaffStatus = {}));

package/lib/components/user-selector/export-modules/field-tree-selector/index.js

@@ -21,6 +21,8 @@ var _popup = _interopRequireDefault(require("../../../popup"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _enum = require("../../enum");
+
 require("../../index.css");
 
 require("./index.css");
@@ -113,7 +115,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       adjustY: true
     },
     targetOffset: [0, 0]
-  } : _props$popupAlign;
+  } : _props$popupAlign,
+      _props$enableDimissio = props.enableDimissionSwitch,
+      enableDimissionSwitch = _props$enableDimissio === void 0 ? false : _props$enableDimissio;
 
   var _useState = (0, _react.useState)([]),
       _useState2 = _slicedToArray(_useState, 2),
@@ -125,15 +129,20 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       selectedText = _useState4[0],
       setSelectedText = _useState4[1];
 
-  var _useState5 = (0, _react.useState)(),
+  var _useState5 = (0, _react.useState)(_enum.StaffStatus.OnTheJob),
       _useState6 = _slicedToArray(_useState5, 2),
-      jsxDomValues = _useState6[0],
-      setJsxDomValues = _useState6[1];
+      staffStatus = _useState6[0],
+      setStaffStatus = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(false),
+  var _useState7 = (0, _react.useState)(),
       _useState8 = _slicedToArray(_useState7, 2),
-      visible = _useState8[0],
-      setVisible = _useState8[1];
+      jsxDomValues = _useState8[0],
+      setJsxDomValues = _useState8[1];
+
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      visible = _useState10[0],
+      setVisible = _useState10[1];
 
   var setSelectedByProps = function setSelectedByProps() {
     var selected = [];
@@ -192,7 +201,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         departOnly: departOnly,
         auth: auth,
         isGetRoot: isGetRoot,
-        sourceFrom: sourceFrom
+        sourceFrom: sourceFrom,
+        staffStatus: staffStatus
       }).then(function (departs) {
         var rootNode;
 
@@ -210,7 +220,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         getDepartRoot(rootNode);
       });
     }
-  }, []);
+  }, [staffStatus]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       open: function open() {
@@ -297,12 +307,15 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   };
 
   var popup = /*#__PURE__*/_react["default"].createElement(_selectorGenerater["default"], {
-    multiple: multiple,
+    multiple: multiple // key={staffStatus}
+    ,
     onCancel: onCancelHandler,
     onOk: onOkHandler,
     selected: selected,
     onSelect: onOkHandler,
-    showSearchInput: showSearchInput
+    onStaffStatusChange: setStaffStatus,
+    showSearchInput: showSearchInput,
+    staffStatus: staffStatus
   });
 
   if (disabled) return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
@@ -326,7 +339,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       disabledDepartSelect: disabledDepartSelect,
       panes: panes,
       searchWord: searchWord,
-      searchedPanes: searchedPanes
+      searchedPanes: searchedPanes,
+      enableDimissionSwitch: enableDimissionSwitch,
+      staffStatus: staffStatus
     }
   }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
     popup: popup,

package/lib/components/user-selector/export-modules/field-tree-selector/multiple-selector/index.css

@@ -37,3 +37,17 @@
   border-top: solid 1px #e9ecf0;
   border-radius: 1px;
 }
+
+.perspm-multiple-selector__box-footer__dimission {
+  flex: 1;
+  padding-left: 20px;
+  display: flex;
+  align-items: center;
+}
+
+.perspm-multiple-selector__box-footer__dimission label {
+  margin-left: 8px;
+  font-size: 13px;
+  line-height: 18px;
+  color: #6F7886;
+}

package/lib/components/user-selector/export-modules/field-tree-selector/multiple-selector/index.js

@@ -11,6 +11,14 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _getLocale = require("../../../../../utils/getLocale");
+
+var _context = require("../../../context");
+
+var _enum = require("../../../enum");
+
+var _switch = _interopRequireDefault(require("../../../../switch"));
+
 var _actionBtns = _interopRequireDefault(require("../../../action-btns"));
 
 var _selectedPanel = _interopRequireDefault(require("../../../selected-panel"));
@@ -47,24 +55,39 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var preCls = "perspm-multiple-selector";
+var preCls = 'perspm-multiple-selector';
 
 function _default(props) {
   var _props$onCancel = props.onCancel,
       onCancel = _props$onCancel === void 0 ? function () {} : _props$onCancel,
       _props$onOk = props.onOk,
-      onOk = _props$onOk === void 0 ? function () {} : _props$onOk;
+      onOk = _props$onOk === void 0 ? function () {} : _props$onOk,
+      _props$onStaffStatusC = props.onStaffStatusChange,
+      onStaffStatusChange = _props$onStaffStatusC === void 0 ? function () {} : _props$onStaffStatusC,
+      staffStatus = props.staffStatus;
+
+  var _useContext = (0, _react.useContext)(_context.CommonContext),
+      enableDimissionSwitch = _useContext.enableDimissionSwitch;
 
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)(staffStatus === _enum.StaffStatus.All),
       _useState2 = _slicedToArray(_useState, 2),
-      selected = _useState2[0],
-      setSelected = _useState2[1]; // 外部可以修改选中的节点
+      switchChecked = _useState2[0],
+      setSwitchChecked = _useState2[1];
+
+  var _useState3 = (0, _react.useState)([]),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selected = _useState4[0],
+      setSelected = _useState4[1]; // 外部可以修改选中的节点
 
 
   (0, _react.useEffect)(function () {
     setSelected(props.selected);
   }, [props.selected]);
 
+  var getStaffStatus = function getStaffStatus(showDimissionPerson) {
+    return enableDimissionSwitch && showDimissionPerson ? _enum.StaffStatus.All : _enum.StaffStatus.OnTheJob;
+  };
+
   var onTreeNodeSelectHander = function onTreeNodeSelectHander(_, info) {
     var nodeIsSelected = !!(selected || []).filter(function (it) {
       return it.id == info.node.id;
@@ -76,12 +99,17 @@ function _default(props) {
     setSelected([].concat(_toConsumableArray(selected || []), [info.node]));
   };
 
+  var onSwitchChange = function onSwitchChange(checked) {
+    setSwitchChecked(checked);
+    onStaffStatusChange(getStaffStatus(checked));
+  };
+
   var onOkHandler = function onOkHandler(e) {
-    onOk(selected, e);
+    return onOk(selected, e);
   };
 
   var wrapperClickHandler = function wrapperClickHandler(e) {
-    e.stopPropagation();
+    return e.stopPropagation();
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -95,7 +123,8 @@ function _default(props) {
     className: (0, _classnames["default"])("".concat(preCls, "__box-inner-left"))
   }, /*#__PURE__*/_react["default"].createElement(_singleSelector["default"], {
     onSelectPure: onTreeNodeSelectHander,
-    showSearchInput: true
+    showSearchInput: true,
+    staffStatus: getStaffStatus(switchChecked)
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__box-inner-right"))
   }, /*#__PURE__*/_react["default"].createElement(_selectedPanel["default"], {
@@ -103,7 +132,15 @@ function _default(props) {
     setSelected: setSelected
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__box-footer"))
-  }, /*#__PURE__*/_react["default"].createElement(_actionBtns["default"], {
+  }, enableDimissionSwitch && /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__box-footer__dimission"))
+  }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
+    checked: switchChecked,
+    id: "".concat(preCls, "__dimission-switch"),
+    onChange: onSwitchChange
+  }), /*#__PURE__*/_react["default"].createElement("label", {
+    htmlFor: "".concat(preCls, "__dimission-switch")
+  }, (0, _getLocale.getLocale)('Per_Ass_New_but_disdis'))), /*#__PURE__*/_react["default"].createElement(_actionBtns["default"], {
     onCancel: onCancel,
     onOk: onOkHandler
   }))));

package/lib/components/user-selector/export-modules/field-tree-selector/single-selector/index.js

@@ -49,7 +49,8 @@ function _default(props) {
   var onSelect = props.onSelect,
       onSelectPure = props.onSelectPure,
       _props$showSearchInpu = props.showSearchInput,
-      showSearchInput = _props$showSearchInpu === void 0 ? true : _props$showSearchInpu;
+      showSearchInput = _props$showSearchInpu === void 0 ? true : _props$showSearchInpu,
+      staffStatus = props.staffStatus;
 
   var _useContext = (0, _react.useContext)(_context.CommonContext),
       _useContext$searchWor = _useContext.searchWord,
@@ -96,8 +97,9 @@ function _default(props) {
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-content"), _defineProperty({}, (0, _classnames["default"])("".concat(_precls["default"], "__inner-content--nosearch")), !showSearchInput))
   }, searchKey ? /*#__PURE__*/_react["default"].createElement(_searchedPanel["default"], {
+    onNodeSelect: onTreeNodeClichHandler,
     searchKey: searchKey,
-    onNodeSelect: onTreeNodeClichHandler
+    staffStatus: staffStatus
   }) : /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       height: "100%"

package/lib/components/user-selector/request-apis.js

@@ -9,7 +9,7 @@ var _axios = _interopRequireDefault(require("axios"));
 
 var _utils = require("./utils");
 
-var _openData = require("../../utils/open-data");
+var _enum = require("./enum");
 
 var _BSGlobal, _BSGlobal$tenantInfo, _BSGlobal2, _BSGlobal2$loginUserI;
 
@@ -46,7 +46,9 @@ var getDepartments = function getDepartments(_ref) {
       auth = _ref$auth === void 0 ? false : _ref$auth,
       authType = _ref.authType,
       isGetRoot = _ref.isGetRoot,
-      isLoadNodes = _ref.isLoadNodes;
+      isLoadNodes = _ref.isLoadNodes,
+      _ref$staffStatus = _ref.staffStatus,
+      staffStatus = _ref$staffStatus === void 0 ? _enum.StaffStatus.OnTheJob : _ref$staffStatus;
   // 根据权限类型使用不同的objtype
   var authTypeId;
   if (auth && !authType) authType = 'okr';
@@ -61,7 +63,7 @@ var getDepartments = function getDepartments(_ref) {
   var prevPath = "".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/department/sub"); // 请求参数
 
   var urlParams = "departmentId=".concat(nodeId, "&isGetUser=").concat(isGetUser).concat(isGetRootNode ? '&isRoot=true' : '');
-  return _axios["default"].get(auth ? "".concat(prevPath, "/depsAndUsersByPrivilege?").concat(urlParams, "&objtype=").concat(authTypeId) : "".concat(prevPath, "/depsAndUsers?").concat(urlParams)).then(function (departs) {
+  return _axios["default"].get(auth ? "".concat(prevPath, "/depsAndUsersByPrivilege?").concat(urlParams, "&objtype=").concat(authTypeId, "&staffStatus=").concat(staffStatus) : "".concat(prevPath, "/depsAndUsers?").concat(urlParams, "&staffStatus=").concat(staffStatus)).then(function (departs) {
     if (isGetRootNode) {
       // 第一次获取根节点
       // 无权时，获取的节点列表中存在 -1 的节点，用 -1 的节点作为根节点
@@ -120,7 +122,8 @@ var getTreeData = function getTreeData(id, opts, resolve) {
       _opts$isLoadNodes = opts.isLoadNodes,
       isLoadNodes = _opts$isLoadNodes === void 0 ? false : _opts$isLoadNodes,
       isGetRoot = opts.isGetRoot,
-      authType = opts.authType;
+      authType = opts.authType,
+      staffStatus = opts.staffStatus;
   return getDepartments({
     nodeId: id,
     isGetUser: !departOnly,
@@ -128,7 +131,8 @@ var getTreeData = function getTreeData(id, opts, resolve) {
     auth: auth,
     isGetRoot: isGetRoot,
     authType: authType,
-    isLoadNodes: isLoadNodes
+    isLoadNodes: isLoadNodes,
+    staffStatus: staffStatus
   }).then(function (res) {
     var _res$Data = res.Data,
         _res$Data$departments = _res$Data.departments,
@@ -176,7 +180,9 @@ var search = function search(_ref4) {
       _ref4$auth = _ref4.auth,
       auth = _ref4$auth === void 0 ? false : _ref4$auth,
       _ref4$isVerify = _ref4.isVerify,
-      isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify;
+      isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify,
+      _ref4$staffStatus = _ref4.staffStatus,
+      staffStatus = _ref4$staffStatus === void 0 ? _enum.StaffStatus.OnTheJob : _ref4$staffStatus;
   var isGetUser = true;
   var isGetDep = true;
   var isGetGroup = false;
@@ -203,7 +209,7 @@ var search = function search(_ref4) {
     isGetGroup = false;
   }
 
-  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&isGetUser=").concat(isGetUser, "&isGetDep=").concat(isGetDep, "&isGetGroup=").concat(isGetGroup)).then(function (searchRes) {
+  return _axios["default"].get("".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/search/searchAll?keyWord=").concat(searchKey, "&isVerify=").concat(isVerify, "&isGetUser=").concat(isGetUser, "&isGetDep=").concat(isGetDep, "&isGetGroup=").concat(isGetGroup, "&staffStatus=").concat(staffStatus)).then(function (searchRes) {
     return searchRes.data;
   });
 };

package/lib/components/user-selector/searched-panel/index.js

@@ -50,7 +50,9 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _default(props) {
   var searchKey = props.searchKey,
       onNodeSelect = props.onNodeSelect,
-      selected = props.selected;
+      selected = props.selected,
+      _props$staffStatus = props.staffStatus,
+      staffStatus = _props$staffStatus === void 0 ? 1 : _props$staffStatus;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -103,7 +105,8 @@ function _default(props) {
       searchUserOnly: searchUserOnly,
       auth: auth,
       panes: panes,
-      isVerify: isVerify
+      isVerify: isVerify,
+      staffStatus: staffStatus
     }).then(function (res) {
       var Code = res.Code,
           Data = res.Data;
@@ -126,7 +129,7 @@ function _default(props) {
 
   (0, _hooks.useDebouncedEffect)(function () {
     searchUser();
-  }, 200, [searchKey]); // 计算结果，是否显示空值
+  }, 200, [searchKey, staffStatus]); // 计算结果，是否显示空值
 
   var itemCount = 0;
 

package/lib/components/user-selector/select-tree/choose-tree/index.js

@@ -92,7 +92,8 @@ function _default(props) {
       setRawTreeData = _useState6[1];
 
   var _useContext = (0, _react.useContext)(_context.CommonContext),
-      disabledDepartSelect = _useContext.disabledDepartSelect;
+      disabledDepartSelect = _useContext.disabledDepartSelect,
+      staffStatus = _useContext.staffStatus;
 
   (0, _react.useEffect)(function () {
     if (!asyncData) {
@@ -106,7 +107,7 @@ function _default(props) {
       setTreeData((0, _utils.toTree)(rawTreeData));
       setLoading(false);
     });
-  }, []);
+  }, [staffStatus]);
 
   var onBeforeSelect = function onBeforeSelect(node) {
     if (disabledDepartSelect && node.nodeType == "depart") return false;
@@ -193,6 +194,7 @@ function _default(props) {
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "perspm-tree"
   }, /*#__PURE__*/_react["default"].createElement(_tree["default"], _extends({}, restProps, {
+    key: staffStatus,
     multiple: multiple,
     selectNodeHighlight: false,
     defaultExpandedKeys: getDefaultExpandedKeys(),

package/lib/components/user-selector/select-tree/tree-nodes/tree-person-node/index.css

@@ -44,6 +44,7 @@
   margin-right: 4px;
   border-radius: 50%;
   overflow: hidden;
+  position: relative;
 }
 
 .perspm-person__avatar-text {
@@ -53,6 +54,12 @@
   vertical-align: top;
 }
 
+.perspm-person__avatar-dimission {
+  background-color: rgba(20, 28, 40, 0.5);
+  position: absolute;
+  left: 0;
+}
+
 .perspm-person__avatar > span {
   display: inline-block;
   width: 100%;

package/lib/components/user-selector/select-tree/tree-nodes/tree-person-node/index.js

@@ -13,8 +13,12 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _context = require("../../../context");
 
+var _getLocale = require("../../../../../utils/getLocale");
+
 var _openData = require("../../../../../utils/open-data");
 
+var _platform = require("../../../../../utils/platform");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -86,7 +90,9 @@ function _default(props) {
     })
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "perspm-person__avatar"
-  }, renderAvatar()), /*#__PURE__*/_react["default"].createElement("span", {
+  }, renderAvatar(), (data === null || data === void 0 ? void 0 : data.jobState) === 0 && /*#__PURE__*/_react["default"].createElement("span", {
+    className: "perspm-person__avatar-dimission"
+  }, (0, _platform.isOfficialSite)() ? '离职' : '禁用')), /*#__PURE__*/_react["default"].createElement("span", {
     className: "perspm-person__info"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     style: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.16.16-beta.1",
+  "version": "1.16.17-beta-2",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",