@titaui/pc 1.11.60 → 1.11.63

package/lib/components/{dynamic/quick-operation/components/create-task/index.js → user-selector/category-selector-panel/subordinate-tree.js}

@@ -9,9 +9,11 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _newTask = _interopRequireDefault(require("../../img/new-task.png"));
+var _chooseTree = _interopRequireDefault(require("../select-tree/choose-tree"));
 
-var _getLocale = require("../../../../../utils/getLocale");
+var _requestApis = require("../request-apis");
+
+var _context = require("../context");
 
 require("./index.css");
 
@@ -21,24 +23,39 @@ 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; }
 
-var prefix = "titaui-pc-create-task";
-var CreateTask = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
-  var onClick = _ref.onClick;
-
-  var handleCreateTaskClick = function handleCreateTaskClick() {
-    onClick && onClick();
+var SubordinateTree = function SubordinateTree(props) {
+  var onSelect = props.onSelect,
+      selected = props.selected,
+      multiple = props.multiple,
+      itemHeight = props.itemHeight,
+      height = props.height;
+
+  var _useContext = (0, _react.useContext)(_context.CommonContext),
+      auth = _useContext.auth,
+      authType = _useContext.authType,
+      isGetRoot = _useContext.isGetRoot;
+
+  var onGetTreeData = function onGetTreeData() {
+    return (0, _requestApis.getSubordinateData)({
+      auth: auth,
+      authType: authType
+    });
   };
 
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: prefix,
-    onClick: handleCreateTaskClick,
-    ref: ref
-  }, /*#__PURE__*/_react["default"].createElement("img", {
-    className: "".concat(prefix, "__img animate__rubberBand"),
-    src: _newTask["default"]
-  }), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__text")
-  }, (0, _getLocale.getLocale)("Feed_Set_Pop_Butt_Newtask")));
-});
-var _default = CreateTask;
+  return /*#__PURE__*/_react["default"].createElement(_context.TreeNodeContext.Provider, {
+    value: {}
+  }, /*#__PURE__*/_react["default"].createElement(_chooseTree["default"], {
+    onSelect: onSelect,
+    selected: selected,
+    multiple: multiple,
+    virtual: true,
+    asyncData: true,
+    height: height,
+    isGetRoot: isGetRoot,
+    itemHeight: itemHeight,
+    getTreeData: onGetTreeData
+  }));
+};
+
+var _default = SubordinateTree;
 exports["default"] = _default;

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getPanesConfig = void 0;
+exports.getPanesConfig = exports["default"] = void 0;
 
 var _getLocale = require("../../utils/getLocale");
 
@@ -11,6 +11,8 @@ var _departTree = _interopRequireDefault(require("./category-selector-panel/depa
 
 var _groupTree = _interopRequireDefault(require("./category-selector-panel/group-tree"));
 
+var _subordinateTree = _interopRequireDefault(require("./category-selector-panel/subordinate-tree"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var getPanesConfig = function getPanesConfig() {
@@ -22,8 +24,14 @@ var getPanesConfig = function getPanesConfig() {
     group: {
       label: (0, _getLocale.getLocale)("Mod_Groups"),
       Component: _groupTree["default"]
+    },
+    subordinate: {
+      label: (0, _getLocale.getLocale)("OKR_MyO_Butt_Subordinate"),
+      Component: _subordinateTree["default"]
     }
   };
 };
 
-exports.getPanesConfig = getPanesConfig;
+exports.getPanesConfig = getPanesConfig;
+var _default = getPanesConfig;
+exports["default"] = _default;

package/lib/components/user-selector/empty/index.css

@@ -12,6 +12,11 @@
   background: url(../images/empty-131.png) transparent no-repeat 50% 50%;
 }
 
+.persel-empty > span.empty-special {
+  background-image: url("../images/no-auth.png");
+  background-size: contain;
+}
+
 .add-group {
   display: inline-block;
   color: #2879ff;

package/lib/components/user-selector/empty/index.js

@@ -7,13 +7,17 @@ exports["default"] = _default;
 
 var _react = _interopRequireDefault(require("react"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _getLocale = require("../../../utils/getLocale");
 
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _default() {
+function _default(_ref) {
+  var _ref$errorTip = _ref.errorTip,
+      errorTip = _ref$errorTip === void 0 ? "" : _ref$errorTip;
   return /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       textAlign: "center"
@@ -21,8 +25,10 @@ function _default() {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "persel-empty"
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "icon"
+    className: (0, _classnames["default"])("icon", {
+      "empty-special": !!errorTip
+    })
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "empty-tip"
-  }, (0, _getLocale.getLocale)("OKR_MyO_Thnothinghere")));
+  }, errorTip || (0, _getLocale.getLocale)("OKR_MyO_Thnothinghere")));
 }

package/lib/components/user-selector/export-modules/depart-search-selector/index.js

@@ -19,6 +19,8 @@ var _resultPart = _interopRequireDefault(require("./result-part"));
 
 var _chooseTree = _interopRequireDefault(require("../../select-tree/choose-tree"));
 
+var _empty = _interopRequireDefault(require("../../empty"));
+
 var _selectorInput = _interopRequireDefault(require("../../../selector-input"));
 
 var _layout = require("../../layout");
@@ -29,6 +31,8 @@ var _utils = require("../../utils");
 
 var _requestApis = require("../../request-apis");
 
+var _getLocale = require("../../../../utils/getLocale");
+
 require("rc-tabs/assets/index.css");
 
 require("./index.css");
@@ -102,12 +106,17 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       users = _useState10[0],
       setUsers = _useState10[1];
 
-  var _useState11 = (0, _react.useState)(function () {
+  var _useState11 = (0, _react.useState)(false),
+      _useState12 = _slicedToArray(_useState11, 2),
+      noAuth = _useState12[0],
+      setNoAuth = _useState12[1];
+
+  var _useState13 = (0, _react.useState)(function () {
     if (!auth) return [];
     return ["-1"];
   }),
-      _useState12 = _slicedToArray(_useState11, 1),
-      defaultExpandedKeys = _useState12[0];
+      _useState14 = _slicedToArray(_useState13, 1),
+      defaultExpandedKeys = _useState14[0];
 
   (0, _react.useImperativeHandle)(ref, function () {
     return {
@@ -120,12 +129,12 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     };
   });
 
-  var _useState13 = (0, _react.useState)(function () {
+  var _useState15 = (0, _react.useState)(function () {
     if (props.selected) return props.selected;
   }),
-      _useState14 = _slicedToArray(_useState13, 2),
-      selected = _useState14[0],
-      setSelected = _useState14[1]; // 获取数据的API
+      _useState16 = _slicedToArray(_useState15, 2),
+      selected = _useState16[0],
+      setSelected = _useState16[1]; // 获取数据的API
 
 
   var searchTreeData = function searchTreeData() {
@@ -134,9 +143,17 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       departOnly: true,
       sourceFrom: sourceFrom
     }).then(function (res) {
-      var _res$Data = res.Data,
-          departments = _res$Data.departments,
-          users = _res$Data.users;
+      var Code = res.Code,
+          Data = res.Data;
+
+      if (Code === 401) {
+        setNoAuth(true);
+      } else {
+        setNoAuth(false);
+      }
+
+      var departments = Data.departments,
+          users = Data.users;
 
       if (searchDepart) {
         setDeparts((0, _utils.translateDepartsToTreeNode)(departments || []));
@@ -197,18 +214,29 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         onGetTreeDataDone(departs);
       });
     }
-  }, []); // 选人组件内容
+  }, []);
+
+  var getResult = function getResult() {
+    if (noAuth) {
+      return /*#__PURE__*/_react["default"].createElement(_empty["default"], {
+        errorTip: (0, _getLocale.getLocale)("Mod_Nopermissiondep")
+      });
+    }
+
+    return /*#__PURE__*/_react["default"].createElement(_resultPart["default"], {
+      treeData: searchDepart ? departs : searchUser ? users : [],
+      onSelect: onSelectHandler,
+      departOnly: true,
+      height: height - 44
+    });
+  }; // 选人组件内容
+
 
   var popup = /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("persel-box", "perspm-depart-search-selector")
   }, /*#__PURE__*/_react["default"].createElement(_layout.SinglePersonalLayout, null, /*#__PURE__*/_react["default"].createElement(_selectorInput["default"], {
     onChange: onSearchChangeHandler
-  }), searchKey ? loading ? /*#__PURE__*/_react["default"].createElement(_loading["default"], null) : /*#__PURE__*/_react["default"].createElement(_resultPart["default"], {
-    treeData: searchDepart ? departs : searchUser ? users : [],
-    onSelect: onSelectHandler,
-    departOnly: true,
-    height: height - 44
-  }) : /*#__PURE__*/_react["default"].createElement(_context.TreeNodeContext.Provider, {
+  }), searchKey ? loading ? /*#__PURE__*/_react["default"].createElement(_loading["default"], null) : getResult() : /*#__PURE__*/_react["default"].createElement(_context.TreeNodeContext.Provider, {
     value: {}
   }, /*#__PURE__*/_react["default"].createElement(_chooseTree["default"], {
     onSelect: onSelectHandler,

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

@@ -81,7 +81,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _props$panes = props.panes,
       panes = _props$panes === void 0 ? {
     depart: true,
-    group: true
+    group: true,
+    subordinate: true
   } : _props$panes,
       _props$searchedPanes = props.searchedPanes,
       searchedPanes = _props$searchedPanes === void 0 ? {
@@ -214,6 +215,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   });
 
   var onOkHandler = function onOkHandler(selectNodes, e) {
+    debugger;
     setVisible(false);
     setSelected(selectNodes);
     var texts = [];

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

@@ -85,6 +85,11 @@ function _default(props) {
       group = _useState8[0],
       setGroup = _useState8[1];
 
+  var _useState9 = (0, _react.useState)(false),
+      _useState10 = _slicedToArray(_useState9, 2),
+      noAuth = _useState10[0],
+      setNoAuth = _useState10[1];
+
   (0, _react.useEffect)(function () {
     setLoading(true);
     (0, _requestApis.search)({
@@ -92,10 +97,18 @@ function _default(props) {
       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 || []));
@@ -103,7 +116,6 @@ function _default(props) {
     });
   }, [searchKey]); // 计算结果，是否显示空值
 
-  var showEmpty = false;
   var itemCount = 0;
 
   if (searchedPanes.user && person) {
@@ -120,7 +132,7 @@ 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"], {
+  }, 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,
@@ -135,5 +147,7 @@ function _default(props) {
     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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.60",
+  "version": "1.11.63",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -144,7 +144,7 @@
     "react-transition-group": "4.4.2",
     "resize-observer-polyfill": "1.5.1",
     "slick-carousel": "1.8.1",
-    "tita-ui": "1.2.52",
+    "tita-ui": "1.2.56",
     "url-parse": "1.5.1",
     "uuid": "3.1.0",
     "viewerjs": "1.10.1",

package/lib/components/dynamic/advertise/components/next-btn/index.css

@@ -1,27 +0,0 @@
-.titaui-dynamic-advertise-next-btn {
-  width: 24px;
-  height: 24px;
-  background: rgba(0, 0, 0, 0.4);
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  position: absolute;
-  top: 50%;
-  transform: translateY(-50%);
-  z-index: 1;
-  right: 16px;
-  opacity: 1;
-  transition: all 0.3s linear;
-}
-
-.titaui-dynamic-advertise-next-btn__icon {
-  font-size: 16px;
-  transform: rotate(180deg);
-  color: #ffffff;
-}
-
-.titaui-dynamic-advertise-next-btn--hidden {
-  opacity: 0;
-}

package/lib/components/dynamic/advertise/components/next-btn/index.js

@@ -1,32 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-require("./index.css");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-var prefix = "titaui-dynamic-advertise-next-btn";
-
-var NextBtn = function NextBtn(_ref) {
-  var onClick = _ref.onClick,
-      isShow = _ref.isShow;
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(prefix, _defineProperty({}, "".concat(prefix, "--hidden"), !isShow)),
-    onClick: onClick
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-left", "".concat(prefix, "__icon"))
-  }));
-};
-
-var _default = NextBtn;
-exports["default"] = _default;

package/lib/components/dynamic/advertise/components/pre-btn/index.css

@@ -1,26 +0,0 @@
-.titaui-dynamic-advertise-pre-btn {
-  width: 24px;
-  height: 24px;
-  background: rgba(0, 0, 0, 0.4);
-  border-radius: 50%;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  cursor: pointer;
-  position: absolute;
-  top: 50%;
-  left: 16px;
-  transform: translateY(-50%);
-  z-index: 1;
-  opacity: 1;
-  transition: all 0.3s linear;
-}
-
-.titaui-dynamic-advertise-pre-btn__icon {
-  font-size: 16px;
-  color: #ffffff;
-}
-
-.titaui-dynamic-advertise-pre-btn--hidden {
-  opacity: 0;
-}

package/lib/components/dynamic/advertise/components/pre-btn/index.js

@@ -1,32 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var _react = _interopRequireDefault(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
-
-require("./index.css");
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-var prefix = "titaui-dynamic-advertise-pre-btn";
-
-var PreBtn = function PreBtn(_ref) {
-  var onClick = _ref.onClick,
-      isShow = _ref.isShow;
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(prefix, _defineProperty({}, "".concat(prefix, "--hidden"), !isShow)),
-    onClick: onClick
-  }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("tu-icon-left", "".concat(prefix, "__icon"))
-  }));
-};
-
-var _default = PreBtn;
-exports["default"] = _default;

package/lib/components/dynamic/advertise/index.css

@@ -1,21 +0,0 @@
-.tutaui-dynamic-advertise {
-  width: 278px;
-  border-radius: 12px;
-  position: relative;
-}
-
-.tutaui-dynamic-advertise--not-empty {
-  box-shadow: 0px 2px 12px 0px rgba(127, 145, 180, 0.2);
-  margin-top: 10px;
-  height: 136px;
-}
-
-.tutaui-dynamic-advertise *:focus {
-  outline: none !important;
-}
-
-.tutaui-dynamic-advertise__img {
-  border-radius: 12px;
-  width: 278px;
-  height: 136px;
-}