@titaui/pc 1.9.59 → 1.9.63

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.
Files changed (11) hide show
  1. package/lib/components/hr-header/index.css +17 -1
  2. package/lib/components/okr-detail/base-info/other-infos/visibility/index.js +78 -48
  3. package/lib/components-v1/userSelector/components/MultiMode/index.js +19 -16
  4. package/lib/pages/group-management/components/openData/index.js +3 -1
  5. package/lib/pages/new-okr-list/index.js +1 -1
  6. package/package.json +4 -2
  7. package/src/components/hr-header/index.scss +16 -1
  8. package/src/components/okr-detail/base-info/other-infos/visibility/index.tsx +45 -25
  9. package/src/components-v1/userSelector/components/MultiMode/index.tsx +33 -18
  10. package/src/pages/group-management/components/openData/index.tsx +2 -2
  11. package/src/pages/new-okr-list/index.tsx +1 -1
package/lib/components/hr-header/index.css CHANGED
@@ -29,10 +29,26 @@
29
29
  align-items: center;
30
30
  justify-content: center;
31
31
  margin: 0 5px;
32
+ position: relative;
32
33
  }
33
34
 
34
35
  .tencent-hr-header__item > a {
35
- color: #fff;
36
+ color: #FFF !important;
37
+ }
38
+
39
+ .tencent-hr-header__item--active::after {
40
+ content: "";
41
+ position: absolute;
42
+ top: 50%;
43
+ left: 50%;
44
+ -webkit-transform: translateX(-50%);
45
+ -ms-transform: translateX(-50%);
46
+ transform: translateX(-50%);
47
+ margin-top: 16px;
48
+ width: 20px;
49
+ height: 3px;
50
+ border-radius: 3px;
51
+ background-color: #fff;
36
52
  }
37
53
 
38
54
  .tencent-hr-header__item img {
package/lib/components/okr-detail/base-info/other-infos/visibility/index.js CHANGED
@@ -39,24 +39,29 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
39
39
 
40
40
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
41
41
 
42
- var visibilityList = [{
43
- value: 1,
44
- label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
45
- }, {
46
- value: 2,
47
- label: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem")
48
- }, {
49
- value: 3,
50
- label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Directrep")
51
- }, {
52
- value: 4,
53
- label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
54
- }];
55
- var visibilityMapText = {
56
- 1: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public"),
57
- 2: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem"),
58
- 3: (0, _getLocale.getLocale)("OKR_MyO_Pop_Directrep"),
59
- 4: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
42
+ var getVisibilityList = function getVisibilityList() {
43
+ return [{
44
+ value: 1,
45
+ label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public")
46
+ }, {
47
+ value: 2,
48
+ label: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem")
49
+ }, {
50
+ value: 3,
51
+ label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Directrep")
52
+ }, {
53
+ value: 4,
54
+ label: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
55
+ }];
56
+ };
57
+
58
+ var getVisibilityMapText = function getVisibilityMapText() {
59
+ return {
60
+ 1: (0, _getLocale.getLocale)("OKR_MyO_Pop_Public"),
61
+ 2: (0, _getLocale.getLocale)("OKR_MyO_From_Associatedmem"),
62
+ 3: (0, _getLocale.getLocale)("OKR_MyO_Pop_Directrep"),
63
+ 4: (0, _getLocale.getLocale)("OKR_MyO_Pop_Specified")
64
+ };
60
65
  };
61
66
 
62
67
  var Visibility = function Visibility(_ref) {
@@ -80,55 +85,77 @@ var Visibility = function Visibility(_ref) {
80
85
  users = selectNodes.users;
81
86
 
82
87
  if (departments.length === 0 && groups.length === 0 && users.length === 0) {
83
- setVisibilityState(oldSelect.current); // @ts-ignore
88
+ setVisibilityState(oldSelect.current);
89
+
90
+ if (selectorRef.current) {
91
+ // @ts-ignore
92
+ selectorRef.current.close();
93
+ }
84
94
 
85
- selectorRef.current && selectorRef.current.close();
86
95
  return;
87
96
  }
88
97
 
89
- onChangeVisiableLimit && onChangeVisiableLimit(4, selectNodes); // @ts-ignore
98
+ if (onChangeVisiableLimit) {
99
+ onChangeVisiableLimit(4, selectNodes);
100
+ }
90
101
 
91
- selectorRef.current && selectorRef.current.close();
102
+ if (selectorRef.current) {
103
+ // @ts-ignore
104
+ selectorRef.current.close();
105
+ }
92
106
  }, [onChangeVisiableLimit]);
93
107
  var handleChangeVisibility = (0, _react.useCallback)(function (data) {
94
108
  setVisibilityState(data.value);
95
109
 
96
110
  if (data.value === 4) {
97
- // @ts-ignore
98
- selectorRef.current && selectorRef.current.open();
111
+ if (selectorRef.current) {
112
+ // @ts-ignore
113
+ selectorRef.current.open();
114
+ }
99
115
  } else {
100
116
  oldSelect.current = data.value;
101
- onChangeVisiableLimit && onChangeVisiableLimit(data.value);
117
+
118
+ if (onChangeVisiableLimit) {
119
+ onChangeVisiableLimit(data.value);
120
+ }
102
121
  }
103
122
  }, [onChangeVisiableLimit]);
104
123
  var renderText = (0, _react.useMemo)(function () {
105
124
  var result = [];
106
125
 
107
126
  if (visiableLimit) {
108
- visiableLimit.users && visiableLimit.users.length > 0 && visiableLimit.users.forEach(function (item, index) {
109
- if (index !== 0) {
110
- result.push("、");
111
- }
112
-
113
- result.push( /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
114
- name: item.name,
115
- id: item.userId
116
- }));
117
- });
118
- visiableLimit.departments && visiableLimit.departments.length > 0 ? visiableLimit.departments.forEach(function (item, index) {
119
- result.push(index === 0 && result.length === 0 ? "" : "、");
120
- result.push( /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
121
- name: item.name,
122
- id: item.id
123
- }));
124
- }) : "";
125
- visiableLimit.groups && visiableLimit.groups.length > 0 ? visiableLimit.groups.forEach(function (item, index) {
126
- result.push(index === 0 && result.length === 0 ? "" : "、");
127
- result.push(item.name);
128
- }) : "";
127
+ if (visiableLimit.users && visiableLimit.users.length > 0) {
128
+ visiableLimit.users.forEach(function (item, index) {
129
+ if (index !== 0) {
130
+ result.push("、");
131
+ }
132
+
133
+ result.push( /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
134
+ name: item.name,
135
+ id: item.userId
136
+ }));
137
+ });
138
+ }
139
+
140
+ if (visiableLimit.departments && visiableLimit.departments.length > 0) {
141
+ visiableLimit.departments.forEach(function (item, index) {
142
+ result.push(index === 0 && result.length === 0 ? "" : "、");
143
+ result.push( /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
144
+ name: item.name,
145
+ id: item.id
146
+ }));
147
+ });
148
+ }
149
+
150
+ if (visiableLimit.groups && visiableLimit.groups.length > 0) {
151
+ visiableLimit.groups.forEach(function (item, index) {
152
+ result.push(index === 0 && result.length === 0 ? "" : "、");
153
+ result.push(item.name);
154
+ });
155
+ }
129
156
  }
130
157
 
131
- return result.length > 0 ? result : visibilityMapText[visibilityState];
158
+ return result.length > 0 ? result : getVisibilityMapText()[visibilityState];
132
159
  }, [visiableLimit, visibilityState]);
133
160
  (0, _react.useEffect)(function () {
134
161
  setVisibilityState(visibility);
@@ -158,7 +185,7 @@ var Visibility = function Visibility(_ref) {
158
185
  textClass: "base-info-other-infos__visibility-select-text",
159
186
  forceRenderText: visibility === 4,
160
187
  initText: renderText,
161
- items: visibilityList,
188
+ items: getVisibilityList(),
162
189
  initValue: visibilityState,
163
190
  onChangeSelect: handleChangeVisibility
164
191
  }), canEdit ? /*#__PURE__*/_react["default"].createElement(_index["default"], {
@@ -172,5 +199,8 @@ var Visibility = function Visibility(_ref) {
172
199
  }) : null);
173
200
  };
174
201
 
202
+ Visibility.defaultProps = {
203
+ canEdit: false
204
+ };
175
205
  var _default = Visibility;
176
206
  exports["default"] = _default;
package/lib/components-v1/userSelector/components/MultiMode/index.js CHANGED
@@ -69,10 +69,18 @@ var MutiMode = /*#__PURE__*/function (_PureComponent) {
69
69
  args[_key] = arguments[_key];
70
70
  }
71
71
 
72
- return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.handleSelectUser = function (users) {
72
+ return _possibleConstructorReturn(_this, (_temp = _this = _super.call.apply(_super, [this].concat(args)), _this.handleDepartment = function (d) {
73
73
  var _this$props = _this.props,
74
- selectedUser = _this$props.selectedUser,
75
- onSelectUser = _this$props.onSelectUser;
74
+ selectedDept = _this$props.selectedDept,
75
+ onSelectDept = _this$props.onSelectDept;
76
+ if (selectedDept.findIndex(function (sd) {
77
+ return sd.Id === d.Id;
78
+ }) !== -1) return;
79
+ onSelectDept(d);
80
+ }, _this.handleSelectUser = function (users) {
81
+ var _this$props2 = _this.props,
82
+ selectedUser = _this$props2.selectedUser,
83
+ onSelectUser = _this$props2.onSelectUser;
76
84
  var m = {};
77
85
  selectedUser.forEach(function (user) {
78
86
  return m[user.Id] = true;
@@ -82,22 +90,16 @@ var MutiMode = /*#__PURE__*/function (_PureComponent) {
82
90
  });
83
91
  if (!filterdUsers.length) return;
84
92
  onSelectUser(filterdUsers);
85
- }, _this.handleDepartment = function (d) {
86
- var _this$props2 = _this.props,
87
- selectedDept = _this$props2.selectedDept,
88
- onSelectDept = _this$props2.onSelectDept;
89
- if (selectedDept.findIndex(function (sd) {
90
- return sd.Id == d.Id;
91
- }) != -1) return;
92
- onSelectDept(d);
93
93
  }, _temp));
94
94
  }
95
95
 
96
96
  _createClass(MutiMode, [{
97
97
  key: "componentDidUpdate",
98
98
  value: function componentDidUpdate(prevProps) {
99
- if (prevProps.searchTxt != this.props.searchTxt) {
100
- if (this.props.searchTxt) {
99
+ var searchTxt = this.props.searchTxt;
100
+
101
+ if (prevProps.searchTxt !== searchTxt) {
102
+ if (searchTxt) {
101
103
  this.tab.changeTab("common");
102
104
  }
103
105
  }
@@ -114,14 +116,15 @@ var MutiMode = /*#__PURE__*/function (_PureComponent) {
114
116
  onDeleteDept = _this$props3.onDeleteDept,
115
117
  onClear = _this$props3.onClear,
116
118
  deptSelectable = _this$props3.deptSelectable,
117
- rootSelectable = _this$props3.rootSelectable;
119
+ rootSelectable = _this$props3.rootSelectable,
120
+ searchTxt = _this$props3.searchTxt;
118
121
  var deptIsSelected = selectedDept.length > 0;
119
122
  var userIsSelected = selectedUser.length > 0;
120
123
  var tabOptions = [{
121
124
  title: (0, _getLocale.getLocale)("OKR_MyO_Butt_Commonlyused"),
122
125
  name: "common",
123
126
  component: /*#__PURE__*/_react["default"].createElement(_CommonList["default"], {
124
- searchTxt: this.props.searchTxt,
127
+ searchTxt: searchTxt,
125
128
  onSelect: function onSelect(u) {
126
129
  return _this2.handleSelectUser(u);
127
130
  }
@@ -155,7 +158,7 @@ var MutiMode = /*#__PURE__*/function (_PureComponent) {
155
158
  ref: function ref(r) {
156
159
  return _this2.tab = r;
157
160
  }
158
- })), /*#__PURE__*/_react["default"].createElement(_style.MutiModeRight, null, /*#__PURE__*/_react["default"].createElement(_style.SelectedHeader, null, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("Mod_Selecperson"), selectedUser.length + (0, _getLocale.getLocale)("Mod_Number"), deptIsSelected && ",\u7EC4".concat(selectedDept.length, "\u4E2A")), /*#__PURE__*/_react["default"].createElement(_style.ClearBtn, {
161
+ })), /*#__PURE__*/_react["default"].createElement(_style.MutiModeRight, null, /*#__PURE__*/_react["default"].createElement(_style.SelectedHeader, null, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)("Mod_Selecperson"), selectedUser.length + (0, _getLocale.getLocale)("Mod_Number"), deptIsSelected && ",".concat((0, _getLocale.getLocale)("Mod_departments").replace("XX", "".concat(selectedDept.length)))), /*#__PURE__*/_react["default"].createElement(_style.ClearBtn, {
159
162
  active: deptIsSelected || userIsSelected,
160
163
  onMouseDown: function onMouseDown() {
161
164
  return onClear();
package/lib/pages/group-management/components/openData/index.js CHANGED
@@ -126,8 +126,10 @@ function openData() {
126
126
 
127
127
  var ref = (0, _react.useRef)(null);
128
128
  (0, _react.useEffect)(function () {
129
+ var _ref;
130
+
129
131
  // @ts-ignore
130
- window.WWOpenData && window.WWOpenData.bind(ref.current);
132
+ (_ref = window.WWOpenData || window.top.WWOpenData) === null || _ref === void 0 ? void 0 : _ref.bind(ref.current);
131
133
  });
132
134
  return /*#__PURE__*/_react["default"].createElement("div", {
133
135
  style: {
package/lib/pages/new-okr-list/index.js CHANGED
@@ -337,7 +337,7 @@ var NewOkrList = function NewOkrList(props) {
337
337
  pageSize: pageSize,
338
338
  current: pageNum,
339
339
  size: "sm"
340
- }))), okrs.length = 0 && /*#__PURE__*/_react["default"].createElement(Empty, {
340
+ }))), okrs.length === 0 && /*#__PURE__*/_react["default"].createElement(Empty, {
341
341
  openCreate: function openCreate() {
342
342
  return openCreateModal();
343
343
  },
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.9.59",
3
+ "version": "1.9.63",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "src/index.js",
@@ -61,6 +61,7 @@
61
61
  "gulp-replace": "^1.0.0",
62
62
  "gulp-sass": "^4.1.0",
63
63
  "gulp-sourcemaps": "^2.6.5",
64
+ "husky": "^7.0.4",
64
65
  "lint-staged": "^12.2.0",
65
66
  "pretty-quick": "^3.1.3",
66
67
  "sass-resources-loader": "^2.2.1",
@@ -115,6 +116,7 @@
115
116
  "react-cropper": "^2.1.8",
116
117
  "react-custom-scrollbars": "^4.2.1",
117
118
  "react-grid-layout": "^1.2.5",
119
+ "react-perfect-scrollbar": "^1.5.8",
118
120
  "react-sizeme": "^3.0.1",
119
121
  "react-slick": "^0.28.1",
120
122
  "react-spring": "^9.2.4",
@@ -128,7 +130,7 @@
128
130
  "wordcloud": "^1.2.2"
129
131
  },
130
132
  "lint-staged": {
131
- "src/**/*.{js,ts,tsx,jsx}": [
133
+ "src/**/*.{js,ts,tsx,jsx,css,scss}": [
132
134
  "pretty-quick --staged",
133
135
  "eslint --fix"
134
136
  ]
package/src/components/hr-header/index.scss CHANGED
@@ -25,8 +25,23 @@
25
25
  align-items: center;
26
26
  justify-content: center;
27
27
  margin: 0 5px;
28
+ position: relative;
28
29
  & > a {
29
- color: #fff;
30
+ color: #FFF!important;
31
+ }
32
+ &--active::after{
33
+ content: "";
34
+ position: absolute;
35
+ top: 50%;
36
+ left: 50%;
37
+ -webkit-transform: translateX(-50%);
38
+ -ms-transform: translateX(-50%);
39
+ transform: translateX(-50%);
40
+ margin-top: 16px;
41
+ width: 20px;
42
+ height: 3px;
43
+ border-radius: 3px;
44
+ background-color: #fff;
30
45
  }
31
46
  img {
32
47
  width: 12px;
package/src/components/okr-detail/base-info/other-infos/visibility/index.tsx CHANGED
@@ -8,19 +8,19 @@ import Tooltip from "../../../../tooltip";
8
8
  import { OpenDepartmentName, OpenUserName } from "../../../../../utils/open-data";
9
9
  import { getLocale } from "../../../../../utils/getLocale";
10
10
 
11
- const visibilityList = [
11
+ const getVisibilityList = () => [
12
12
  { value: 1, label: getLocale("OKR_MyO_Pop_Public") },
13
13
  { value: 2, label: getLocale("OKR_MyO_From_Associatedmem") },
14
14
  { value: 3, label: getLocale("OKR_MyO_Pop_Directrep") },
15
15
  { value: 4, label: getLocale("OKR_MyO_Pop_Specified") },
16
16
  ];
17
17
 
18
- const visibilityMapText = {
18
+ const getVisibilityMapText = () => ({
19
19
  1: getLocale("OKR_MyO_Pop_Public"),
20
20
  2: getLocale("OKR_MyO_From_Associatedmem"),
21
21
  3: getLocale("OKR_MyO_Pop_Directrep"),
22
22
  4: getLocale("OKR_MyO_Pop_Specified"),
23
- };
23
+ });
24
24
 
25
25
  interface IVisibilityProps {
26
26
  visibility: any;
@@ -41,43 +41,59 @@ const Visibility: FC<IVisibilityProps> = ({
41
41
  const { departments, groups, users } = selectNodes;
42
42
  if (departments.length === 0 && groups.length === 0 && users.length === 0) {
43
43
  setVisibilityState(oldSelect.current);
44
- // @ts-ignore
45
- selectorRef.current && selectorRef.current.close();
44
+ if (selectorRef.current) {
45
+ // @ts-ignore
46
+ selectorRef.current.close();
47
+ }
46
48
  return;
47
49
  }
48
- onChangeVisiableLimit && onChangeVisiableLimit(4, selectNodes);
49
- // @ts-ignore
50
- selectorRef.current && selectorRef.current.close();
50
+ if (onChangeVisiableLimit) {
51
+ onChangeVisiableLimit(4, selectNodes);
52
+ }
53
+ if (selectorRef.current) {
54
+ // @ts-ignore
55
+ selectorRef.current.close();
56
+ }
51
57
  }, [onChangeVisiableLimit]);
52
58
 
53
59
  const handleChangeVisibility = useCallback((data) => {
54
60
  setVisibilityState(data.value);
55
61
  if (data.value === 4) {
56
- // @ts-ignore
57
- selectorRef.current && selectorRef.current.open();
62
+ if (selectorRef.current) {
63
+ // @ts-ignore
64
+ selectorRef.current.open();
65
+ }
58
66
  } else {
59
67
  oldSelect.current = data.value;
60
- onChangeVisiableLimit && onChangeVisiableLimit(data.value);
68
+ if (onChangeVisiableLimit) {
69
+ onChangeVisiableLimit(data.value);
70
+ }
61
71
  }
62
72
  }, [onChangeVisiableLimit]);
63
73
 
64
74
  const renderText = useMemo(() => {
65
75
  const result = [];
66
76
  if (visiableLimit) {
67
- visiableLimit.users && visiableLimit.users.length > 0 && visiableLimit.users.forEach((item, index) => {
68
- if (index !== 0) { result.push("、"); }
69
- result.push(<OpenUserName name={item.name} id={item.userId} />);
70
- });
71
- visiableLimit.departments && visiableLimit.departments.length > 0 ? visiableLimit.departments.forEach((item, index) => {
72
- result.push(index === 0 && result.length === 0 ? "" : "、");
73
- result.push(<OpenDepartmentName name={item.name} id={item.id} />);
74
- }) : "";
75
- visiableLimit.groups && visiableLimit.groups.length > 0 ? visiableLimit.groups.forEach((item, index) => {
76
- result.push(index === 0 && result.length === 0 ? "" : "、");
77
- result.push(item.name);
78
- }) : "";
77
+ if (visiableLimit.users && visiableLimit.users.length > 0) {
78
+ visiableLimit.users.forEach((item, index) => {
79
+ if (index !== 0) { result.push("、"); }
80
+ result.push(<OpenUserName name={item.name} id={item.userId} />);
81
+ });
82
+ }
83
+ if (visiableLimit.departments && visiableLimit.departments.length > 0) {
84
+ visiableLimit.departments.forEach((item, index) => {
85
+ result.push(index === 0 && result.length === 0 ? "" : "、");
86
+ result.push(<OpenDepartmentName name={item.name} id={item.id} />);
87
+ });
88
+ }
89
+ if (visiableLimit.groups && visiableLimit.groups.length > 0) {
90
+ visiableLimit.groups.forEach((item, index) => {
91
+ result.push(index === 0 && result.length === 0 ? "" : "、");
92
+ result.push(item.name);
93
+ });
94
+ }
79
95
  }
80
- return result.length > 0 ? result : visibilityMapText[visibilityState];
96
+ return result.length > 0 ? result : getVisibilityMapText()[visibilityState];
81
97
  }, [visiableLimit, visibilityState]);
82
98
 
83
99
  useEffect(() => {
@@ -112,7 +128,7 @@ const Visibility: FC<IVisibilityProps> = ({
112
128
  textClass="base-info-other-infos__visibility-select-text"
113
129
  forceRenderText={visibility === 4}
114
130
  initText={renderText as any}
115
- items={visibilityList}
131
+ items={getVisibilityList()}
116
132
  initValue={visibilityState}
117
133
  onChangeSelect={handleChangeVisibility}
118
134
  />
@@ -131,4 +147,8 @@ const Visibility: FC<IVisibilityProps> = ({
131
147
  );
132
148
  };
133
149
 
150
+ Visibility.defaultProps = {
151
+ canEdit: false,
152
+ };
153
+
134
154
  export default Visibility;
package/src/components-v1/userSelector/components/MultiMode/index.tsx CHANGED
@@ -29,6 +29,21 @@ interface Props {
29
29
  export default class MutiMode extends PureComponent<Props> {
30
30
  tab: any;
31
31
 
32
+ componentDidUpdate(prevProps: Props) {
33
+ const { searchTxt } = this.props;
34
+ if (prevProps.searchTxt !== searchTxt) {
35
+ if (searchTxt) {
36
+ this.tab.changeTab("common");
37
+ }
38
+ }
39
+ }
40
+
41
+ handleDepartment = (d: Dept) => {
42
+ const { selectedDept, onSelectDept } = this.props;
43
+ if (selectedDept.findIndex((sd) => sd.Id === d.Id) !== -1) return;
44
+ onSelectDept(d);
45
+ };
46
+
32
47
  handleSelectUser = (users: User[]) => {
33
48
  const { selectedUser, onSelectUser } = this.props;
34
49
  const m = {};
@@ -38,23 +53,16 @@ export default class MutiMode extends PureComponent<Props> {
38
53
  onSelectUser(filterdUsers);
39
54
  };
40
55
 
41
- handleDepartment = (d: Dept) => {
42
- const { selectedDept, onSelectDept } = this.props;
43
- if (selectedDept.findIndex((sd) => sd.Id == d.Id) != -1) return;
44
- onSelectDept(d);
45
- };
46
-
47
- componentDidUpdate(prevProps: Props) {
48
- if (prevProps.searchTxt != this.props.searchTxt) {
49
- if (this.props.searchTxt) {
50
- this.tab.changeTab("common");
51
- }
52
- }
53
- }
54
-
55
56
  render() {
56
57
  const {
57
- selectedUser, selectedDept, onDeleteUser, onDeleteDept, onClear, deptSelectable, rootSelectable,
58
+ selectedUser,
59
+ selectedDept,
60
+ onDeleteUser,
61
+ onDeleteDept,
62
+ onClear,
63
+ deptSelectable,
64
+ rootSelectable,
65
+ searchTxt,
58
66
  } = this.props;
59
67
  const deptIsSelected = selectedDept.length > 0;
60
68
  const userIsSelected = selectedUser.length > 0;
@@ -62,7 +70,10 @@ export default class MutiMode extends PureComponent<Props> {
62
70
  {
63
71
  title: getLocale("OKR_MyO_Butt_Commonlyused"),
64
72
  name: "common",
65
- component: <CommonList searchTxt={this.props.searchTxt} onSelect={(u: User[]) => this.handleSelectUser(u)} />,
73
+ component: <CommonList
74
+ searchTxt={searchTxt}
75
+ onSelect={(u: User[]) => this.handleSelectUser(u)}
76
+ />,
66
77
  },
67
78
  {
68
79
  title: getLocale("OKR_MyO_Butt_Subordinate"),
@@ -74,7 +85,11 @@ export default class MutiMode extends PureComponent<Props> {
74
85
  tabOptions.push({
75
86
  title: getLocale("Mod_Department"),
76
87
  name: "department",
77
- component: <DepartmentList rootSelectable={rootSelectable} onSelectUser={(u: User[]) => this.handleSelectUser(u)} onSelectDept={deptSelectable ? (d: Dept) => this.handleDepartment(d) : undefined} />,
88
+ component: <DepartmentList
89
+ rootSelectable={rootSelectable}
90
+ onSelectUser={(u: User[]) => this.handleSelectUser(u)}
91
+ onSelectDept={deptSelectable ? (d: Dept) => this.handleDepartment(d) : undefined}
92
+ />,
78
93
  });
79
94
  // }
80
95
  return (
@@ -87,7 +102,7 @@ export default class MutiMode extends PureComponent<Props> {
87
102
  <span>
88
103
  {getLocale("Mod_Selecperson")}
89
104
  {selectedUser.length + getLocale("Mod_Number")}
90
- {deptIsSelected && `,组${selectedDept.length}个`}
105
+ {deptIsSelected && `,${getLocale("Mod_departments").replace("XX", `${selectedDept.length}`)}`}
91
106
  </span>
92
107
  <ClearBtn active={deptIsSelected || userIsSelected} onMouseDown={() => onClear()}>
93
108
  {getLocale("OKR_MyO_Pop_Clearselected")}
package/src/pages/group-management/components/openData/index.tsx CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: lianghaosen
3
3
  * @Date: 2019-12-27 14:05:14
4
4
  * @Last Modified by: lianghaosen
5
- * @Last Modified time: 2021-01-05 19:51:29
5
+ * @Last Modified time: 2022-01-20 15:31:07
6
6
  */
7
7
  import { useRef, useEffect } from "react";
8
8
  import React from "react";
@@ -89,7 +89,7 @@ function openData(): (p: {
89
89
  const ref = useRef(null);
90
90
  useEffect(() => {
91
91
  // @ts-ignore
92
- window.WWOpenData && window.WWOpenData.bind(ref.current);
92
+ (window.WWOpenData || window.top.WWOpenData)?.bind(ref.current);
93
93
  });
94
94
 
95
95
  return (
package/src/pages/new-okr-list/index.tsx CHANGED
@@ -245,7 +245,7 @@ const NewOkrList: FC<any> = (props: {
245
245
  </div>
246
246
  </>
247
247
  )}
248
- {okrs.length = 0 && (
248
+ {okrs.length === 0 && (
249
249
  <Empty
250
250
  openCreate={() => openCreateModal()}
251
251
  toUserId={toUserId || getUserInfo().Id}