@titaui/pc 1.16.17-beta-2 → 1.16.19

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -211,11 +211,7 @@ function KrDatas(props) {
211
211
  } // 修改KR
212
212
 
213
213
 
214
- var changeKr = function changeKr(kr) {
215
- var index = krDatasRef.current.findIndex(function (data) {
216
- return data.uuid == kr.uuid;
217
- });
218
-
214
+ var _changeKr = (0, _react.useCallback)(function (kr, index) {
219
215
  if (krDatasRef.current[index].krWeight !== kr.krWeight) {
220
216
  setIsCustomWeight(true);
221
217
  }
@@ -226,7 +222,7 @@ function KrDatas(props) {
226
222
  setKrDatas(newKrs);
227
223
  krDatasRef.current = newKrs;
228
224
  setInputKrInfo(kr);
229
- }; // 删除KR
225
+ }, [krDatasRef.current]); // 删除KR
230
226
 
231
227
 
232
228
  var deleteKr = function deleteKr(id) {
@@ -296,7 +292,9 @@ function KrDatas(props) {
296
292
  return /*#__PURE__*/_react["default"].createElement(_krItem["default"], {
297
293
  key: kr === null || kr === void 0 ? void 0 : kr.uuid,
298
294
  krData: kr,
299
- changeKr: changeKr,
295
+ changeKr: function changeKr(newKr) {
296
+ return _changeKr(newKr, index);
297
+ },
300
298
  deleteKr: deleteKr,
301
299
  container: container,
302
300
  index: index + 1,
@@ -1,13 +1,15 @@
1
1
  "use strict";
2
2
 
3
+ 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); }
4
+
3
5
  Object.defineProperty(exports, "__esModule", {
4
6
  value: true
5
7
  });
6
8
  exports["default"] = void 0;
7
9
 
8
- var _react = _interopRequireDefault(require("react"));
10
+ var _react = _interopRequireWildcard(require("react"));
9
11
 
10
- var _supersetCharts = _interopRequireDefault(require("../../../superset-charts"));
12
+ var _skynetDynamicComponent = _interopRequireDefault(require("skynet-dynamic-component"));
11
13
 
12
14
  var _utils = require("../dynamic-chart/utils");
13
15
 
@@ -15,11 +17,27 @@ var _dynamicFooter = _interopRequireDefault(require("./dynamic-footer"));
15
17
 
16
18
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
17
19
 
20
+ 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); }
21
+
22
+ 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; }
23
+
18
24
  function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
19
25
 
26
+ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
27
+
28
+ 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."); }
29
+
30
+ 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); }
31
+
32
+ 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; }
33
+
34
+ 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; }
35
+
36
+ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
37
+
20
38
  var prefixCls = "titaui-dynamic-item";
21
39
 
22
- var DynamicAIDialy = function DynamicAIDialy(_ref) {
40
+ var DynamicDiscovery = function DynamicDiscovery(_ref) {
23
41
  var data = _ref.data;
24
42
 
25
43
  var chartQuery = _react["default"].useMemo(function () {
@@ -27,9 +45,24 @@ var DynamicAIDialy = function DynamicAIDialy(_ref) {
27
45
  }, [data.biId]);
28
46
 
29
47
  var feedComponent = chartQuery.feedComponent;
48
+
49
+ var _useState = (0, _react.useState)(false),
50
+ _useState2 = _slicedToArray(_useState, 2),
51
+ loading = _useState2[0],
52
+ setLoading = _useState2[1];
53
+
54
+ var ref = (0, _react.useRef)(null);
55
+ (0, _react.useEffect)(function () {
56
+ // @ts-ignore
57
+ (0, _skynetDynamicComponent["default"])('tita-system-feeds').then(function (res) {
58
+ ref.current = res;
59
+ setLoading(true);
60
+ });
61
+ }, []);
62
+ var FeedDiscovery = ref.current;
30
63
  return /*#__PURE__*/_react["default"].createElement("div", {
31
64
  className: prefixCls
32
- }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], _extends({
65
+ }, loading && /*#__PURE__*/_react["default"].createElement(FeedDiscovery, _extends({
33
66
  feedData: data
34
67
  }, chartQuery, {
35
68
  type: feedComponent
@@ -39,6 +72,6 @@ var DynamicAIDialy = function DynamicAIDialy(_ref) {
39
72
  }));
40
73
  };
41
74
 
42
- var _default = /*#__PURE__*/_react["default"].memo(DynamicAIDialy);
75
+ var _default = /*#__PURE__*/_react["default"].memo(DynamicDiscovery);
43
76
 
44
77
  exports["default"] = _default;
@@ -95,7 +95,7 @@ function _default(props) {
95
95
  _useState2 = _slicedToArray(_useState, 1),
96
96
  user = _useState2[0];
97
97
 
98
- var _useState3 = (0, _react.useState)(title),
98
+ var _useState3 = (0, _react.useState)(title || data.mileStoneName),
99
99
  _useState4 = _slicedToArray(_useState3, 2),
100
100
  krName = _useState4[0],
101
101
  setKrName = _useState4[1];
@@ -186,6 +186,7 @@ function _default(props) {
186
186
  });
187
187
  };
188
188
 
189
+ console.log(999, data, krName);
189
190
  return /*#__PURE__*/_react["default"].createElement("div", {
190
191
  className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-parent-node"))
191
192
  }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -23,7 +23,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
23
23
 
24
24
  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; }
25
25
 
26
- // eslint-disable-next-line func-names
27
26
  function _default(props) {
28
27
  var onSelect = props.onSelect,
29
28
  selected = props.selected,
@@ -39,8 +38,7 @@ function _default(props) {
39
38
  auth = _useContext.auth,
40
39
  authType = _useContext.authType,
41
40
  isGetRoot = _useContext.isGetRoot,
42
- disabledDepartSelect = _useContext.disabledDepartSelect,
43
- staffStatus = _useContext.staffStatus;
41
+ disabledDepartSelect = _useContext.disabledDepartSelect;
44
42
 
45
43
  var onGetDepartTreeData = function onGetDepartTreeData() {
46
44
  return (0, _requestApis.getTreeData)(departId, {
@@ -48,8 +46,7 @@ function _default(props) {
48
46
  auth: auth,
49
47
  authType: authType,
50
48
  isGetRoot: isGetRoot,
51
- sourceFrom: sourceFrom,
52
- staffStatus: staffStatus
49
+ sourceFrom: sourceFrom
53
50
  });
54
51
  };
55
52
 
@@ -60,8 +57,7 @@ function _default(props) {
60
57
  authType: authType,
61
58
  isGetRoot: isGetRoot,
62
59
  sourceFrom: sourceFrom,
63
- isLoadNodes: true,
64
- staffStatus: staffStatus
60
+ isLoadNodes: true
65
61
  });
66
62
  };
67
63
 
@@ -21,8 +21,6 @@ var _popup = _interopRequireDefault(require("../../../popup"));
21
21
 
22
22
  var _getLocale = require("../../../../utils/getLocale");
23
23
 
24
- var _enum = require("../../enum");
25
-
26
24
  require("../../index.css");
27
25
 
28
26
  require("./index.css");
@@ -115,9 +113,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
115
113
  adjustY: true
116
114
  },
117
115
  targetOffset: [0, 0]
118
- } : _props$popupAlign,
119
- _props$enableDimissio = props.enableDimissionSwitch,
120
- enableDimissionSwitch = _props$enableDimissio === void 0 ? false : _props$enableDimissio;
116
+ } : _props$popupAlign;
121
117
 
122
118
  var _useState = (0, _react.useState)([]),
123
119
  _useState2 = _slicedToArray(_useState, 2),
@@ -129,20 +125,15 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
129
125
  selectedText = _useState4[0],
130
126
  setSelectedText = _useState4[1];
131
127
 
132
- var _useState5 = (0, _react.useState)(_enum.StaffStatus.OnTheJob),
128
+ var _useState5 = (0, _react.useState)(),
133
129
  _useState6 = _slicedToArray(_useState5, 2),
134
- staffStatus = _useState6[0],
135
- setStaffStatus = _useState6[1];
130
+ jsxDomValues = _useState6[0],
131
+ setJsxDomValues = _useState6[1];
136
132
 
137
- var _useState7 = (0, _react.useState)(),
133
+ var _useState7 = (0, _react.useState)(false),
138
134
  _useState8 = _slicedToArray(_useState7, 2),
139
- jsxDomValues = _useState8[0],
140
- setJsxDomValues = _useState8[1];
141
-
142
- var _useState9 = (0, _react.useState)(false),
143
- _useState10 = _slicedToArray(_useState9, 2),
144
- visible = _useState10[0],
145
- setVisible = _useState10[1];
135
+ visible = _useState8[0],
136
+ setVisible = _useState8[1];
146
137
 
147
138
  var setSelectedByProps = function setSelectedByProps() {
148
139
  var selected = [];
@@ -201,8 +192,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
201
192
  departOnly: departOnly,
202
193
  auth: auth,
203
194
  isGetRoot: isGetRoot,
204
- sourceFrom: sourceFrom,
205
- staffStatus: staffStatus
195
+ sourceFrom: sourceFrom
206
196
  }).then(function (departs) {
207
197
  var rootNode;
208
198
 
@@ -220,7 +210,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
220
210
  getDepartRoot(rootNode);
221
211
  });
222
212
  }
223
- }, [staffStatus]);
213
+ }, []);
224
214
  (0, _react.useImperativeHandle)(ref, function () {
225
215
  return {
226
216
  open: function open() {
@@ -307,15 +297,12 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
307
297
  };
308
298
 
309
299
  var popup = /*#__PURE__*/_react["default"].createElement(_selectorGenerater["default"], {
310
- multiple: multiple // key={staffStatus}
311
- ,
300
+ multiple: multiple,
312
301
  onCancel: onCancelHandler,
313
302
  onOk: onOkHandler,
314
303
  selected: selected,
315
304
  onSelect: onOkHandler,
316
- onStaffStatusChange: setStaffStatus,
317
- showSearchInput: showSearchInput,
318
- staffStatus: staffStatus
305
+ showSearchInput: showSearchInput
319
306
  });
320
307
 
321
308
  if (disabled) return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
@@ -339,9 +326,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
339
326
  disabledDepartSelect: disabledDepartSelect,
340
327
  panes: panes,
341
328
  searchWord: searchWord,
342
- searchedPanes: searchedPanes,
343
- enableDimissionSwitch: enableDimissionSwitch,
344
- staffStatus: staffStatus
329
+ searchedPanes: searchedPanes
345
330
  }
346
331
  }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
347
332
  popup: popup,
@@ -37,17 +37,3 @@
37
37
  border-top: solid 1px #e9ecf0;
38
38
  border-radius: 1px;
39
39
  }
40
-
41
- .perspm-multiple-selector__box-footer__dimission {
42
- flex: 1;
43
- padding-left: 20px;
44
- display: flex;
45
- align-items: center;
46
- }
47
-
48
- .perspm-multiple-selector__box-footer__dimission label {
49
- margin-left: 8px;
50
- font-size: 13px;
51
- line-height: 18px;
52
- color: #6F7886;
53
- }
@@ -11,14 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
- var _getLocale = require("../../../../../utils/getLocale");
15
-
16
- var _context = require("../../../context");
17
-
18
- var _enum = require("../../../enum");
19
-
20
- var _switch = _interopRequireDefault(require("../../../../switch"));
21
-
22
14
  var _actionBtns = _interopRequireDefault(require("../../../action-btns"));
23
15
 
24
16
  var _selectedPanel = _interopRequireDefault(require("../../../selected-panel"));
@@ -55,39 +47,24 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
55
47
 
56
48
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
57
49
 
58
- var preCls = 'perspm-multiple-selector';
50
+ var preCls = "perspm-multiple-selector";
59
51
 
60
52
  function _default(props) {
61
53
  var _props$onCancel = props.onCancel,
62
54
  onCancel = _props$onCancel === void 0 ? function () {} : _props$onCancel,
63
55
  _props$onOk = props.onOk,
64
- onOk = _props$onOk === void 0 ? function () {} : _props$onOk,
65
- _props$onStaffStatusC = props.onStaffStatusChange,
66
- onStaffStatusChange = _props$onStaffStatusC === void 0 ? function () {} : _props$onStaffStatusC,
67
- staffStatus = props.staffStatus;
68
-
69
- var _useContext = (0, _react.useContext)(_context.CommonContext),
70
- enableDimissionSwitch = _useContext.enableDimissionSwitch;
56
+ onOk = _props$onOk === void 0 ? function () {} : _props$onOk;
71
57
 
72
- var _useState = (0, _react.useState)(staffStatus === _enum.StaffStatus.All),
58
+ var _useState = (0, _react.useState)([]),
73
59
  _useState2 = _slicedToArray(_useState, 2),
74
- switchChecked = _useState2[0],
75
- setSwitchChecked = _useState2[1];
76
-
77
- var _useState3 = (0, _react.useState)([]),
78
- _useState4 = _slicedToArray(_useState3, 2),
79
- selected = _useState4[0],
80
- setSelected = _useState4[1]; // 外部可以修改选中的节点
60
+ selected = _useState2[0],
61
+ setSelected = _useState2[1]; // 外部可以修改选中的节点
81
62
 
82
63
 
83
64
  (0, _react.useEffect)(function () {
84
65
  setSelected(props.selected);
85
66
  }, [props.selected]);
86
67
 
87
- var getStaffStatus = function getStaffStatus(showDimissionPerson) {
88
- return enableDimissionSwitch && showDimissionPerson ? _enum.StaffStatus.All : _enum.StaffStatus.OnTheJob;
89
- };
90
-
91
68
  var onTreeNodeSelectHander = function onTreeNodeSelectHander(_, info) {
92
69
  var nodeIsSelected = !!(selected || []).filter(function (it) {
93
70
  return it.id == info.node.id;
@@ -99,17 +76,12 @@ function _default(props) {
99
76
  setSelected([].concat(_toConsumableArray(selected || []), [info.node]));
100
77
  };
101
78
 
102
- var onSwitchChange = function onSwitchChange(checked) {
103
- setSwitchChecked(checked);
104
- onStaffStatusChange(getStaffStatus(checked));
105
- };
106
-
107
79
  var onOkHandler = function onOkHandler(e) {
108
- return onOk(selected, e);
80
+ onOk(selected, e);
109
81
  };
110
82
 
111
83
  var wrapperClickHandler = function wrapperClickHandler(e) {
112
- return e.stopPropagation();
84
+ e.stopPropagation();
113
85
  };
114
86
 
115
87
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -123,8 +95,7 @@ function _default(props) {
123
95
  className: (0, _classnames["default"])("".concat(preCls, "__box-inner-left"))
124
96
  }, /*#__PURE__*/_react["default"].createElement(_singleSelector["default"], {
125
97
  onSelectPure: onTreeNodeSelectHander,
126
- showSearchInput: true,
127
- staffStatus: getStaffStatus(switchChecked)
98
+ showSearchInput: true
128
99
  })), /*#__PURE__*/_react["default"].createElement("div", {
129
100
  className: (0, _classnames["default"])("".concat(preCls, "__box-inner-right"))
130
101
  }, /*#__PURE__*/_react["default"].createElement(_selectedPanel["default"], {
@@ -132,15 +103,7 @@ function _default(props) {
132
103
  setSelected: setSelected
133
104
  }))), /*#__PURE__*/_react["default"].createElement("div", {
134
105
  className: (0, _classnames["default"])("".concat(preCls, "__box-footer"))
135
- }, enableDimissionSwitch && /*#__PURE__*/_react["default"].createElement("div", {
136
- className: (0, _classnames["default"])("".concat(preCls, "__box-footer__dimission"))
137
- }, /*#__PURE__*/_react["default"].createElement(_switch["default"], {
138
- checked: switchChecked,
139
- id: "".concat(preCls, "__dimission-switch"),
140
- onChange: onSwitchChange
141
- }), /*#__PURE__*/_react["default"].createElement("label", {
142
- htmlFor: "".concat(preCls, "__dimission-switch")
143
- }, (0, _getLocale.getLocale)('Per_Ass_New_but_disdis'))), /*#__PURE__*/_react["default"].createElement(_actionBtns["default"], {
106
+ }, /*#__PURE__*/_react["default"].createElement(_actionBtns["default"], {
144
107
  onCancel: onCancel,
145
108
  onOk: onOkHandler
146
109
  }))));
@@ -49,8 +49,7 @@ function _default(props) {
49
49
  var onSelect = props.onSelect,
50
50
  onSelectPure = props.onSelectPure,
51
51
  _props$showSearchInpu = props.showSearchInput,
52
- showSearchInput = _props$showSearchInpu === void 0 ? true : _props$showSearchInpu,
53
- staffStatus = props.staffStatus;
52
+ showSearchInput = _props$showSearchInpu === void 0 ? true : _props$showSearchInpu;
54
53
 
55
54
  var _useContext = (0, _react.useContext)(_context.CommonContext),
56
55
  _useContext$searchWor = _useContext.searchWord,
@@ -97,9 +96,8 @@ function _default(props) {
97
96
  })), /*#__PURE__*/_react["default"].createElement("div", {
98
97
  className: (0, _classnames["default"])("".concat(_precls["default"], "__inner-content"), _defineProperty({}, (0, _classnames["default"])("".concat(_precls["default"], "__inner-content--nosearch")), !showSearchInput))
99
98
  }, searchKey ? /*#__PURE__*/_react["default"].createElement(_searchedPanel["default"], {
100
- onNodeSelect: onTreeNodeClichHandler,
101
99
  searchKey: searchKey,
102
- staffStatus: staffStatus
100
+ onNodeSelect: onTreeNodeClichHandler
103
101
  }) : /*#__PURE__*/_react["default"].createElement("div", {
104
102
  style: {
105
103
  height: "100%"
@@ -9,7 +9,7 @@ var _axios = _interopRequireDefault(require("axios"));
9
9
 
10
10
  var _utils = require("./utils");
11
11
 
12
- var _enum = require("./enum");
12
+ var _openData = require("../../utils/open-data");
13
13
 
14
14
  var _BSGlobal, _BSGlobal$tenantInfo, _BSGlobal2, _BSGlobal2$loginUserI;
15
15
 
@@ -46,9 +46,7 @@ var getDepartments = function getDepartments(_ref) {
46
46
  auth = _ref$auth === void 0 ? false : _ref$auth,
47
47
  authType = _ref.authType,
48
48
  isGetRoot = _ref.isGetRoot,
49
- isLoadNodes = _ref.isLoadNodes,
50
- _ref$staffStatus = _ref.staffStatus,
51
- staffStatus = _ref$staffStatus === void 0 ? _enum.StaffStatus.OnTheJob : _ref$staffStatus;
49
+ isLoadNodes = _ref.isLoadNodes;
52
50
  // 根据权限类型使用不同的objtype
53
51
  var authTypeId;
54
52
  if (auth && !authType) authType = 'okr';
@@ -63,7 +61,7 @@ var getDepartments = function getDepartments(_ref) {
63
61
  var prevPath = "".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/department/sub"); // 请求参数
64
62
 
65
63
  var urlParams = "departmentId=".concat(nodeId, "&isGetUser=").concat(isGetUser).concat(isGetRootNode ? '&isRoot=true' : '');
66
- 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) {
64
+ return _axios["default"].get(auth ? "".concat(prevPath, "/depsAndUsersByPrivilege?").concat(urlParams, "&objtype=").concat(authTypeId) : "".concat(prevPath, "/depsAndUsers?").concat(urlParams)).then(function (departs) {
67
65
  if (isGetRootNode) {
68
66
  // 第一次获取根节点
69
67
  // 无权时,获取的节点列表中存在 -1 的节点,用 -1 的节点作为根节点
@@ -122,8 +120,7 @@ var getTreeData = function getTreeData(id, opts, resolve) {
122
120
  _opts$isLoadNodes = opts.isLoadNodes,
123
121
  isLoadNodes = _opts$isLoadNodes === void 0 ? false : _opts$isLoadNodes,
124
122
  isGetRoot = opts.isGetRoot,
125
- authType = opts.authType,
126
- staffStatus = opts.staffStatus;
123
+ authType = opts.authType;
127
124
  return getDepartments({
128
125
  nodeId: id,
129
126
  isGetUser: !departOnly,
@@ -131,8 +128,7 @@ var getTreeData = function getTreeData(id, opts, resolve) {
131
128
  auth: auth,
132
129
  isGetRoot: isGetRoot,
133
130
  authType: authType,
134
- isLoadNodes: isLoadNodes,
135
- staffStatus: staffStatus
131
+ isLoadNodes: isLoadNodes
136
132
  }).then(function (res) {
137
133
  var _res$Data = res.Data,
138
134
  _res$Data$departments = _res$Data.departments,
@@ -180,9 +176,7 @@ var search = function search(_ref4) {
180
176
  _ref4$auth = _ref4.auth,
181
177
  auth = _ref4$auth === void 0 ? false : _ref4$auth,
182
178
  _ref4$isVerify = _ref4.isVerify,
183
- isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify,
184
- _ref4$staffStatus = _ref4.staffStatus,
185
- staffStatus = _ref4$staffStatus === void 0 ? _enum.StaffStatus.OnTheJob : _ref4$staffStatus;
179
+ isVerify = _ref4$isVerify === void 0 ? false : _ref4$isVerify;
186
180
  var isGetUser = true;
187
181
  var isGetDep = true;
188
182
  var isGetGroup = false;
@@ -209,7 +203,7 @@ var search = function search(_ref4) {
209
203
  isGetGroup = false;
210
204
  }
211
205
 
212
- 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) {
206
+ 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) {
213
207
  return searchRes.data;
214
208
  });
215
209
  };
@@ -50,9 +50,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
50
50
  function _default(props) {
51
51
  var searchKey = props.searchKey,
52
52
  onNodeSelect = props.onNodeSelect,
53
- selected = props.selected,
54
- _props$staffStatus = props.staffStatus,
55
- staffStatus = _props$staffStatus === void 0 ? 1 : _props$staffStatus;
53
+ selected = props.selected;
56
54
 
57
55
  var _useState = (0, _react.useState)(false),
58
56
  _useState2 = _slicedToArray(_useState, 2),
@@ -105,8 +103,7 @@ function _default(props) {
105
103
  searchUserOnly: searchUserOnly,
106
104
  auth: auth,
107
105
  panes: panes,
108
- isVerify: isVerify,
109
- staffStatus: staffStatus
106
+ isVerify: isVerify
110
107
  }).then(function (res) {
111
108
  var Code = res.Code,
112
109
  Data = res.Data;
@@ -129,7 +126,7 @@ function _default(props) {
129
126
 
130
127
  (0, _hooks.useDebouncedEffect)(function () {
131
128
  searchUser();
132
- }, 200, [searchKey, staffStatus]); // 计算结果,是否显示空值
129
+ }, 200, [searchKey]); // 计算结果,是否显示空值
133
130
 
134
131
  var itemCount = 0;
135
132
 
@@ -92,8 +92,7 @@ function _default(props) {
92
92
  setRawTreeData = _useState6[1];
93
93
 
94
94
  var _useContext = (0, _react.useContext)(_context.CommonContext),
95
- disabledDepartSelect = _useContext.disabledDepartSelect,
96
- staffStatus = _useContext.staffStatus;
95
+ disabledDepartSelect = _useContext.disabledDepartSelect;
97
96
 
98
97
  (0, _react.useEffect)(function () {
99
98
  if (!asyncData) {
@@ -107,7 +106,7 @@ function _default(props) {
107
106
  setTreeData((0, _utils.toTree)(rawTreeData));
108
107
  setLoading(false);
109
108
  });
110
- }, [staffStatus]);
109
+ }, []);
111
110
 
112
111
  var onBeforeSelect = function onBeforeSelect(node) {
113
112
  if (disabledDepartSelect && node.nodeType == "depart") return false;
@@ -194,7 +193,6 @@ function _default(props) {
194
193
  return /*#__PURE__*/_react["default"].createElement("div", {
195
194
  className: "perspm-tree"
196
195
  }, /*#__PURE__*/_react["default"].createElement(_tree["default"], _extends({}, restProps, {
197
- key: staffStatus,
198
196
  multiple: multiple,
199
197
  selectNodeHighlight: false,
200
198
  defaultExpandedKeys: getDefaultExpandedKeys(),
@@ -44,7 +44,6 @@
44
44
  margin-right: 4px;
45
45
  border-radius: 50%;
46
46
  overflow: hidden;
47
- position: relative;
48
47
  }
49
48
 
50
49
  .perspm-person__avatar-text {
@@ -54,12 +53,6 @@
54
53
  vertical-align: top;
55
54
  }
56
55
 
57
- .perspm-person__avatar-dimission {
58
- background-color: rgba(20, 28, 40, 0.5);
59
- position: absolute;
60
- left: 0;
61
- }
62
-
63
56
  .perspm-person__avatar > span {
64
57
  display: inline-block;
65
58
  width: 100%;
@@ -13,12 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
13
13
 
14
14
  var _context = require("../../../context");
15
15
 
16
- var _getLocale = require("../../../../../utils/getLocale");
17
-
18
16
  var _openData = require("../../../../../utils/open-data");
19
17
 
20
- var _platform = require("../../../../../utils/platform");
21
-
22
18
  require("./index.css");
23
19
 
24
20
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -90,9 +86,7 @@ function _default(props) {
90
86
  })
91
87
  }, /*#__PURE__*/_react["default"].createElement("span", {
92
88
  className: "perspm-person__avatar"
93
- }, renderAvatar(), (data === null || data === void 0 ? void 0 : data.jobState) === 0 && /*#__PURE__*/_react["default"].createElement("span", {
94
- className: "perspm-person__avatar-dimission"
95
- }, (0, _platform.isOfficialSite)() ? '离职' : '禁用')), /*#__PURE__*/_react["default"].createElement("span", {
89
+ }, renderAvatar()), /*#__PURE__*/_react["default"].createElement("span", {
96
90
  className: "perspm-person__info"
97
91
  }, /*#__PURE__*/_react["default"].createElement("span", {
98
92
  style: {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.16.17-beta-2",
3
+ "version": "1.16.19",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",
@@ -157,6 +157,7 @@
157
157
  "react-spring": "9.2.4",
158
158
  "react-transition-group": "4.4.2",
159
159
  "resize-observer-polyfill": "1.5.1",
160
+ "skynet-dynamic-component": "^1.0.2",
160
161
  "slick-carousel": "1.8.1",
161
162
  "sortablejs": "^1.12.0",
162
163
  "tita-ui": "1.2.56",
@@ -1,15 +0,0 @@
1
- "use strict";
2
-
3
- Object.defineProperty(exports, "__esModule", {
4
- value: true
5
- });
6
- exports.StaffStatus = void 0;
7
- // eslint-disable-next-line import/prefer-default-export
8
- var StaffStatus;
9
- exports.StaffStatus = StaffStatus;
10
-
11
- (function (StaffStatus) {
12
- StaffStatus[StaffStatus["All"] = 0] = "All";
13
- StaffStatus[StaffStatus["OnTheJob"] = 1] = "OnTheJob";
14
- StaffStatus[StaffStatus["Dimission"] = 2] = "Dimission";
15
- })(StaffStatus || (exports.StaffStatus = StaffStatus = {}));