@titaui/pc 1.12.0-beta.2 → 1.12.0-beta.3

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

@@ -39,7 +39,12 @@ function _default(props) {
       multiple = props.multiple;
 
   var _useContext = (0, _react.useContext)(_context.CommonContext),
-      panes = _useContext.panes;
+      panes = _useContext.panes,
+      departOnly = _useContext.departOnly;
+
+  if (departOnly) {
+    panes.subordinate = false;
+  }
 
   var _useState = (0, _react.useState)(function () {
     var panelCount = 0;

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

@@ -0,0 +1,61 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _chooseTree = _interopRequireDefault(require("../select-tree/choose-tree"));
+
+var _requestApis = require("../request-apis");
+
+var _context = require("../context");
+
+require("./index.css");
+
+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); }
+
+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 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(_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/export-modules/depart-search-selector/index.js

@@ -143,7 +143,6 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       departOnly: true,
       sourceFrom: sourceFrom
     }).then(function (res) {
-      debugger;
       var Code = res.Code,
           Data = res.Data;
 
@@ -218,8 +217,6 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, []);
 
   var getResult = function getResult() {
-    debugger;
-
     if (noAuth) {
       return /*#__PURE__*/_react["default"].createElement(_empty["default"], {
         errorTip: (0, _getLocale.getLocale)("Mod_Nopermissiondep")

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,11 +97,18 @@ function _default(props) {
       departOnly: departOnly,
       sourceFrom: sourceFrom
     }).then(function (res) {
-      debugger;
-      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 || []));
@@ -104,7 +116,6 @@ function _default(props) {
     });
   }, [searchKey]); // 计算结果，是否显示空值
 
-  var showEmpty = false;
   var itemCount = 0;
 
   if (searchedPanes.user && person) {
@@ -121,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,
@@ -136,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.12.0-beta.2",
+  "version": "1.12.0-beta.3",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",