@titaui/pc 1.11.52-beta.2 → 1.11.52-beta.20

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.searchGroups = exports.searchDuties = exports.search = exports.getTreeData = exports.getGourps = exports.getDuties = void 0;
+exports.searchGroups = exports.searchDuties = exports.search = exports.getTreeData = exports.getSubordinateData = exports.getGourps = exports.getDuties = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -137,10 +137,29 @@ var getTreeData = function getTreeData(id, opts, resolve) {
 
 exports.getTreeData = getTreeData;
 
-var search = function search(_ref3) {
-  var searchKey = _ref3.searchKey,
-      departOnly = _ref3.departOnly,
-      sourceFrom = _ref3.sourceFrom;
+var getSubordinateData = function getSubordinateData(_ref3) {
+  var auth = _ref3.auth,
+      authType = _ref3.authType;
+  var authTypeId;
+  if (auth && !authType) authType = "okr";
+  if (authType == "okr") authTypeId = "62";
+  if (authType == "performance") authTypeId = "31";
+  if (authType == "total") authTypeId = "0";
+  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/org/GetDepartmentSubordinates?objtype=").concat(authTypeId)).then(function (res) {
+    var _res$data$Data$users = res.data.Data.users,
+        users = _res$data$Data$users === void 0 ? [] : _res$data$Data$users;
+    var transUsers = (0, _utils.translateUsersToTreeNode)(users || []); // resolve && resolve([...transUsers]);
+
+    return _toConsumableArray(transUsers);
+  });
+};
+
+exports.getSubordinateData = getSubordinateData;
+
+var search = function search(_ref4) {
+  var searchKey = _ref4.searchKey,
+      departOnly = _ref4.departOnly,
+      sourceFrom = _ref4.sourceFrom;
   var args = [];
   if (departOnly) args.push("isGetUser=false");
   if (sourceFrom) args.push("sourceFrom=".concat(sourceFrom)); // 追加来源，用于企业微信搜索
@@ -153,8 +172,8 @@ var search = function search(_ref3) {
 
 exports.search = search;
 
-var searchGroups = function searchGroups(_ref4) {
-  var searchKey = _ref4.searchKey;
+var searchGroups = function searchGroups(_ref5) {
+  var searchKey = _ref5.searchKey;
   return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/map/group?keyWork=").concat(searchKey)).then(function (searchRes) {
     return searchRes.data;
   });
@@ -170,8 +189,8 @@ var getDuties = function getDuties() {
 
 exports.getDuties = getDuties;
 
-var searchDuties = function searchDuties(_ref5) {
-  var searchKey = _ref5.searchKey;
+var searchDuties = function searchDuties(_ref6) {
+  var searchKey = _ref6.searchKey;
   return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/position/search?status=1&pageNum=1&pageSize=100&filter=").concat(searchKey)).then(function (res) {
     return res.data;
   });

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

@@ -21,6 +21,8 @@ var _empty = _interopRequireDefault(require("../empty"));
 
 var _group = _interopRequireDefault(require("../empty/group"));
 
+var _hooks = require("../../../utils/hooks");
+
 var _context = require("../context");
 
 var _getLocale = require("../../../utils/getLocale");
@@ -85,25 +87,41 @@ function _default(props) {
       group = _useState8[0],
       setGroup = _useState8[1];
 
-  (0, _react.useEffect)(function () {
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      noAuth = _useState10[0],
+      setNoAuth = _useState10[1];
+
+  var searchUser = function searchUser() {
     setLoading(true);
     (0, _requestApis.search)({
       searchKey: searchKey,
       departOnly: departOnly,
       sourceFrom: sourceFrom
     }).then(function (res) {
-      var _res$Data = res.Data,
-          departments = _res$Data.departments,
-          groups = _res$Data.groups,
-          users = _res$Data.users;
+      var Code = res.Code,
+          Data = res.Data;
+      var departments = Data.departments,
+          groups = Data.groups,
+          users = Data.users;
+
+      if (Code === 401) {
+        setNoAuth(true);
+      } else {
+        setNoAuth(false);
+      }
+
       setPerson((0, _utils.translateUsersToTreeNode)(users || []));
       setGroup((0, _utils.translateGroupsToTreeNode)(groups || []));
       setDeparts((0, _utils.translateDepartsToTreeNode)(departments || []));
       setLoading(false);
     });
-  }, [searchKey]); // 计算结果，是否显示空值
+  };
+
+  (0, _hooks.useDebouncedEffect)(function () {
+    searchUser();
+  }, 200, [searchKey]); // 计算结果，是否显示空值
 
-  var showEmpty = false;
   var itemCount = 0;
 
   if (searchedPanes.user && person) {
@@ -120,20 +138,22 @@ function _default(props) {
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "persel-searched"
-  }, loading ? /*#__PURE__*/_react["default"].createElement(_loading["default"], null) : /*#__PURE__*/_react["default"].createElement("div", null, searchedPanes.user && person && person.length ? /*#__PURE__*/_react["default"].createElement(_resultPart["default"], {
-    title: (0, _getLocale.getLocale)("Per_Ma_form_detail_Personnel"),
+  }, loading && /*#__PURE__*/_react["default"].createElement(_loading["default"], null), !loading && /*#__PURE__*/_react["default"].createElement("div", null, searchedPanes.user && person && person.length ? /*#__PURE__*/_react["default"].createElement(_resultPart["default"], {
+    title: (0, _getLocale.getLocale)('Per_Ma_form_detail_Personnel'),
     treeData: person,
     onSelect: onNodeSelect,
     selected: selected
   }) : undefined, searchedPanes.depart && departs && departs.length ? /*#__PURE__*/_react["default"].createElement(_resultPart["default"], {
-    title: (0, _getLocale.getLocale)("Mod_Department"),
+    title: (0, _getLocale.getLocale)('Mod_Department'),
     treeData: departs,
     onSelect: onNodeSelect,
     selected: selected
   }) : undefined, searchedPanes.group && group && group.length ? /*#__PURE__*/_react["default"].createElement(_resultPart["default"], {
-    title: (0, _getLocale.getLocale)("Mod_Groups"),
+    title: (0, _getLocale.getLocale)('Mod_Groups'),
     treeData: group,
     onSelect: onNodeSelect,
     selected: selected
-  }) : undefined, itemCount == 0 && /*#__PURE__*/_react["default"].createElement(_empty["default"], null)));
+  }) : undefined, itemCount == 0 && !noAuth && /*#__PURE__*/_react["default"].createElement(_empty["default"], null), itemCount == 0 && noAuth && /*#__PURE__*/_react["default"].createElement(_empty["default"], {
+    errorTip: (0, _getLocale.getLocale)('Mod_Nopermissiondep')
+  })));
 }

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

@@ -35,30 +35,58 @@ function _default(props) {
     onRemove && onRemove(props);
   };
 
+  var renderAvatar = function renderAvatar() {
+    var _data$avatar, _data$avatar2, _data$avatar3;
+
+    if ((data === null || data === void 0 ? void 0 : (_data$avatar = data.avatar) === null || _data$avatar === void 0 ? void 0 : _data$avatar.hasAvatar) === false) {
+      return /*#__PURE__*/_react["default"].createElement("span", {
+        style: {
+          backgroundColor: data.avatar.color
+        }
+      }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "perspm-person__avatar-text",
+        title: ""
+      }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+        id: data.userId,
+        name: data.name
+      })));
+    } else if (data !== null && data !== void 0 && (_data$avatar2 = data.avatar) !== null && _data$avatar2 !== void 0 && _data$avatar2.original || data !== null && data !== void 0 && (_data$avatar3 = data.avatar) !== null && _data$avatar3 !== void 0 && _data$avatar3.small) {
+      var _data$avatar4, _data$avatar5;
+
+      return /*#__PURE__*/_react["default"].createElement("img", {
+        key: data.userId,
+        src: (data === null || data === void 0 ? void 0 : (_data$avatar4 = data.avatar) === null || _data$avatar4 === void 0 ? void 0 : _data$avatar4.original) || (data === null || data === void 0 ? void 0 : (_data$avatar5 = data.avatar) === null || _data$avatar5 === void 0 ? void 0 : _data$avatar5.small),
+        style: {
+          width: "100%",
+          height: "100%",
+          position: 'relative',
+          top: '-1px'
+        }
+      });
+    } else {
+      var _data$avatar6;
+
+      return /*#__PURE__*/_react["default"].createElement("span", {
+        style: {
+          backgroundColor: data === null || data === void 0 ? void 0 : (_data$avatar6 = data.avatar) === null || _data$avatar6 === void 0 ? void 0 : _data$avatar6.color
+        }
+      }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "perspm-person__avatar-text",
+        title: ""
+      }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+        id: data.userId,
+        name: data.name
+      })));
+    }
+  };
+
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("perspm-person", {
       "perspm-person--small": hideUserInfo
     })
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "perspm-person__avatar"
-  }, data.avatar.small ? /*#__PURE__*/_react["default"].createElement("img", {
-    key: data.userId,
-    src: data.avatar.small,
-    style: {
-      width: "100%",
-      height: "100%"
-    }
-  }) : /*#__PURE__*/_react["default"].createElement("span", {
-    style: {
-      backgroundColor: data.avatar.color
-    }
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "perspm-person__avatar-text",
-    title: ""
-  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
-    id: data.userId,
-    name: data.name
-  })))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, renderAvatar()), /*#__PURE__*/_react["default"].createElement("span", {
     className: "perspm-person__info"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     style: {

package/lib/components/wechat-btn/index.css

@@ -1,7 +1,7 @@
 .titaui-wechat-btn {
+  margin: 0 8px;
   font-size: 18px;
   color: #a4acb9;
-  margin: 0 8px;
   cursor: pointer;
 }
 
@@ -9,6 +9,10 @@
   color: #2879ff;
 }
 
+.titaui-wechat-btn:not(:empty) {
+  margin: 0 8px;
+}
+
 .titaui-wechat-btn__chat {
   color: #2879ff;
 }

package/lib/components-v1/userSelector/components/SingleMode.js

@@ -21,6 +21,8 @@ require("react-perfect-scrollbar/dist/css/styles.css");
 
 var _openData = require("../../../utils/open-data");
 
+var _getLocale = require("../../../utils/getLocale");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -70,7 +72,7 @@ var SingleMode = /*#__PURE__*/function (_PureComponent) {
         if (users[activeIndex]) {
           _this.props.onSelect(users[activeIndex]);
 
-          document.removeEventListener("keydown", _this.handleKeyDown);
+          document.removeEventListener('keydown', _this.handleKeyDown);
         }
       } else if (e.keyCode == 38) {
         var index = activeIndex > 0 ? activeIndex - 1 : (users.length || 1) - 1;
@@ -109,7 +111,7 @@ var SingleMode = /*#__PURE__*/function (_PureComponent) {
     };
 
     _this.getSearchUsers = function () {
-      var url = (0, _openData.isPlatform)("wx") ? (0, _requestV.getApiUrl3)("staff/workwx/serarch?filter=".concat(_this.props.searchTxt)) : (0, _requestV.getApiUrl3)("staff/search?onlyMatchName=".concat(_this.props.onlySearchByName === true, "&filter=").concat(_this.props.searchTxt, "&pageNum=1&pageSize=999"));
+      var url = (0, _openData.isPlatform)('wx') ? (0, _requestV.getApiUrl3)("staff/workwx/serarch?filter=".concat(_this.props.searchTxt)) : (0, _requestV.getApiUrl3)("staff/search?onlyMatchName=".concat(_this.props.onlySearchByName === true, "&filter=").concat(_this.props.searchTxt, "&pageNum=1&pageSize=999"));
       (0, _requestV.taker)(url).then(function (res) {
         if (res.Code == 1) {
           var _users2 = [];
@@ -161,13 +163,13 @@ var SingleMode = /*#__PURE__*/function (_PureComponent) {
       }
 
       if (this.props.useKeyBoard !== false) {
-        document.addEventListener("keydown", this.handleKeyDown);
+        document.addEventListener('keydown', this.handleKeyDown);
       }
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      document.removeEventListener("keydown", this.handleKeyDown);
+      document.removeEventListener('keydown', this.handleKeyDown);
     }
   }, {
     key: "componentDidUpdate",
@@ -192,7 +194,7 @@ var SingleMode = /*#__PURE__*/function (_PureComponent) {
       return /*#__PURE__*/_react["default"].createElement(_style.SingleModeWrapper, null, /*#__PURE__*/_react["default"].createElement(_reactPerfectScrollbar["default"], null, !users.length && !pending ? /*#__PURE__*/_react["default"].createElement(_style.EmptyWrapper, null, /*#__PURE__*/_react["default"].createElement("img", {
         src: require("../assets/emptyImg.png"),
         width: "100px"
-      }), /*#__PURE__*/_react["default"].createElement(_style.ListEmptyText, null, getLocale("Mod_ThereNothing"), "...")) : /*#__PURE__*/_react["default"].createElement(_style.SingleList, null, users.map(function (u, index) {
+      }), /*#__PURE__*/_react["default"].createElement(_style.ListEmptyText, null, (0, _getLocale.getLocale)('Mod_ThereNothing'), "...")) : /*#__PURE__*/_react["default"].createElement(_style.SingleList, null, users.map(function (u, index) {
         return /*#__PURE__*/_react["default"].createElement("div", {
           key: u.Id,
           onMouseOver: function onMouseOver() {

package/lib/pages/home/components/data-list/table/columns/krName.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _openData = require("../../../../../../utils/open-data");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var preCls = "home-page-data-list-columns__krname";
@@ -19,7 +21,7 @@ function KrNameColumn(_ref) {
     className: "".concat(preCls, "__tag")
   }, "KR"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__name")
-  }, name));
+  }, (0, _openData.parseString)(name)));
 }
 
 var _default = KrNameColumn;

package/lib/pages/home/components/data-list/table/columns/okrName.js

@@ -7,6 +7,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _openData = require("../../../../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -25,11 +27,11 @@ function OkrNameColumn(_ref) {
     className: "".concat(preCls, "__tagO")
   }, "O"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__contentO")
-  }, children)), type === "KR" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _openData.parseString)(children))), type === "KR" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "__tagKR")
   }, "KR"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__contentKR")
-  }, children)));
+  }, (0, _openData.parseString)(children))));
 }
 
 var _default = OkrNameColumn;

package/lib/pages/new-okr-list/header/index.js

@@ -37,8 +37,6 @@ var _requestApi = require("../request-api");
 
 var _getLocale = require("../../../utils/getLocale");
 
-var _tools = require("../../../utils/tools");
-
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -126,45 +124,45 @@ function Header(props, ref) {
     var rootNode = {
       rootId: 0,
       // @ts-ignore
-      rootName: window.BSGlobal.tenantInfo.Name || ""
+      rootName: window.BSGlobal.tenantInfo.Name || ''
     };
     var level2Selected = {
       id: 0,
       // @ts-ignore
-      name: window.BSGlobal.tenantInfo.Name || ""
+      name: window.BSGlobal.tenantInfo.Name || ''
     };
-    var searchType = "company";
+    var searchType = 'company';
 
     if (departmentId && departmentId !== -1) {
       rootNode.rootId = departmentId;
-      rootNode.rootName = departmentName || "";
-      searchType = "depart";
+      rootNode.rootName = departmentName || '';
+      searchType = 'depart';
       level2Selected.id = departmentId;
-      level2Selected.name = departmentName || "";
+      level2Selected.name = departmentName || '';
     }
 
     if (toUserId) {
       rootNode.rootId = toUserId;
-      rootNode.rootName = userInfo.name || "";
-      searchType = "user";
+      rootNode.rootName = userInfo.name || '';
+      searchType = 'user';
       level2Selected.id = toUserId;
-      level2Selected.name = userInfo.name || "";
+      level2Selected.name = userInfo.name || '';
     }
 
     if (parseInt(relation, 10) === 1) {
       rootNode.rootId = (0, _bsGlobal.getUserInfo)().Id;
-      rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || "";
-      searchType = "user";
+      rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || '';
+      searchType = 'user';
       level2Selected.id = (0, _bsGlobal.getUserInfo)().Id;
-      level2Selected.name = (0, _bsGlobal.getUserInfo)().Name || "";
+      level2Selected.name = (0, _bsGlobal.getUserInfo)().Name || '';
     }
 
     var urlQuery = ["searchType=".concat(searchType), "period=".concat(JSON.stringify({
       cycleType: cycleType,
       annualNum: annualNum,
       yqmNum: yqmNum
-    })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join("&");
-    var origin = window.location.href.split("#")[0];
+    })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join('&');
+    var origin = window.location.href.split('#')[0];
     window.location.href = "".concat(origin, "/#okr/map?").concat(urlQuery);
   };
 
@@ -223,7 +221,7 @@ function Header(props, ref) {
     className: "".concat(_precls.precls, "__header-item"),
     onClick: gotoOkrMap
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Alignment"),
+    overlay: (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls.precls, "__header-icon")
@@ -235,7 +233,7 @@ function Header(props, ref) {
     userInfo: userInfo
   }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
     onSearch: onSearch
-  }), Number(cycleType) !== -1 && (Number(relation) === 1 || Object.keys((0, _tools.getQueryString)()).length === 0) && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
+  }), Number(cycleType) !== -1 && Number(relation) !== 2 && Number(relation) !== 3 && departmentId === undefined && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
     toUserId: toUserId,
     userInfo: userInfo,
     relation: relationShip,

package/lib/utils/auth.js

@@ -49,6 +49,18 @@ var BaseAuth = /*#__PURE__*/function () {
     value: function isManager() {
       // console.log('ismanager', this.loginUserInfor.IsOkrManager)
       return this.loginUserInfor.IsOkrManager;
+    } // 助理或者说动态管理员
+
+  }, {
+    key: "isAssistant",
+    value: function isAssistant() {
+      return this.loginUserInfor.Role === 1;
+    } // 项目管理员
+
+  }, {
+    key: "isWorkManager",
+    value: function isWorkManager() {
+      return this.loginUserInfor.IsWorkManager;
     }
   }, {
     key: "isDepartmentLeader",

package/lib/utils/hooks.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = useQuery;
 exports.parseUrl = parseUrl;
+exports.useDebouncedEffect = useDebouncedEffect;
 
 var _react = require("react");
 
@@ -23,15 +24,15 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function parseUrl(fragmentStr) {
   var queryObject = {};
   if (!fragmentStr) return queryObject;
-  var markIndex = fragmentStr.indexOf("?"); // contain query string in fragments
+  var markIndex = fragmentStr.indexOf('?'); // contain query string in fragments
 
   if (markIndex > -1) {
     // build query object
     var queryString = fragmentStr.slice(markIndex + 1);
-    var queryArray = queryString.split("&");
+    var queryArray = queryString.split('&');
 
     for (var i = 0; i < queryArray.length; i += 1) {
-      var queryPair = queryArray[i].split("=");
+      var queryPair = queryArray[i].split('=');
       queryObject[queryPair[0]] = decodeURIComponent(queryPair[1]);
     }
   }
@@ -63,10 +64,23 @@ function useQuery(name) {
     }
   }, []);
   (0, _react.useEffect)(function () {
-    window.addEventListener("hashchange", hashChangeHandler);
+    window.addEventListener('hashchange', hashChangeHandler);
     return function () {
-      window.removeEventListener("hashchange", hashChangeHandler);
+      window.removeEventListener('hashchange', hashChangeHandler);
     };
   }, []);
   return state;
+}
+
+function useDebouncedEffect(fn, ms, deps) {
+  (0, _react.useEffect)(function () {
+    var clean = null;
+    var timer = setTimeout(function () {
+      clean = fn();
+    }, ms);
+    return function () {
+      clearTimeout(timer);
+      if (clean) clean();
+    };
+  }, deps);
 }