@titaui/pc 1.12.75-beta.1 → 1.12.75-beta.2
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.
- package/lib/components/dialog-upload/index.css +12 -0
- package/lib/components/dialog-upload/index.js +9 -4
- package/lib/components/dynamic/dynamic-item/components/okr-progress/index.js +10 -4
- package/lib/components/dynamic/dynamic-item/components/schedule/index.css +2 -0
- package/lib/components/dynamic/dynamic-item/components/summary-header/index.css +22 -0
- package/lib/components/dynamic/dynamic-item/components/summary-header/index.js +6 -10
- package/lib/components/dynamic/dynamic-item/components/table-row-okr/index.css +3 -4
- package/lib/components/dynamic/dynamic-item/components/table-row-okr/index.js +1 -6
- package/lib/components/dynamic/dynamic-item/components/task-progress/index.js +10 -4
- package/lib/components/dynamic/dynamic-item/components/task-progress/render-row.js +1 -1
- package/lib/components/import-modal/tree/okr-tree/index.css +1 -1
- package/lib/components/import-modal/tree/task-work-tree/index.css +1 -1
- package/lib/components/menus/export-modules/summary-menus/depart-menus/index.js +4 -4
- package/lib/components/menus/export-modules/summary-menus/index.js +1 -1
- package/lib/components/menus/export-modules/summary-menus/menus.js +1 -1
- package/lib/components/menus/export-modules/summary-menus/summary-front-menus.js +8 -1
- package/lib/components/new-confidence/index.css +1 -2
- package/lib/components/new-confidence/index.js +4 -2
- package/lib/components/task-relation-modal/okr-relation/relation-task-model/search-form.js +5 -23
- package/lib/components/task-relation-modal/okr-relation/request-api.js +1 -5
- package/lib/components/task-relation-modal/search/principal.js +1 -21
- package/lib/components/user-selector/export-modules/single-selector/index.js +2 -8
- package/package.json +1 -1
|
@@ -5,6 +5,18 @@
|
|
|
5
5
|
overflow: auto;
|
|
6
6
|
}
|
|
7
7
|
|
|
8
|
+
.titaui-dialog-upload__empty {
|
|
9
|
+
max-height: 442px;
|
|
10
|
+
min-height: 82px;
|
|
11
|
+
padding: 0 32px;
|
|
12
|
+
display: flex;
|
|
13
|
+
justify-content: center;
|
|
14
|
+
align-items: center;
|
|
15
|
+
line-height: 22px;
|
|
16
|
+
font-size: 14px;
|
|
17
|
+
color: #89919F;
|
|
18
|
+
}
|
|
19
|
+
|
|
8
20
|
.titaui-dialog-upload__preview {
|
|
9
21
|
margin: 10px 0;
|
|
10
22
|
}
|
|
@@ -72,7 +72,8 @@ var uploadUrl = (0, _helpers.getApiUrl)("Upload/PostFiles?format=json×tamp=
|
|
|
72
72
|
var Footer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
73
73
|
var onUpload = _ref.onUpload,
|
|
74
74
|
onCancel = _ref.onCancel,
|
|
75
|
-
onOk = _ref.onOk
|
|
75
|
+
onOk = _ref.onOk,
|
|
76
|
+
files = _ref.files;
|
|
76
77
|
var uploader = (0, _react.useRef)();
|
|
77
78
|
(0, _react.useImperativeHandle)(ref, function () {
|
|
78
79
|
return {
|
|
@@ -129,7 +130,8 @@ var Footer = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
|
|
|
129
130
|
}, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_button["default"].Rect, {
|
|
130
131
|
type: "primary",
|
|
131
132
|
size: "big",
|
|
132
|
-
onClick: onOk
|
|
133
|
+
onClick: onOk,
|
|
134
|
+
disabled: (files === null || files === void 0 ? void 0 : files.length) === 0
|
|
133
135
|
}, (0, _getLocale.getLocale)('Mod_Determiness')));
|
|
134
136
|
});
|
|
135
137
|
|
|
@@ -267,6 +269,7 @@ function UploadDialog(_ref2) {
|
|
|
267
269
|
setFiles([]);
|
|
268
270
|
setVisible(false);
|
|
269
271
|
},
|
|
272
|
+
files: files,
|
|
270
273
|
onOk: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
271
274
|
var isUploading, uploadfiles;
|
|
272
275
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
@@ -316,7 +319,7 @@ function UploadDialog(_ref2) {
|
|
|
316
319
|
setFiles([]);
|
|
317
320
|
setVisible(false);
|
|
318
321
|
}
|
|
319
|
-
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
322
|
+
}, (files === null || files === void 0 ? void 0 : files.length) !== 0 ? /*#__PURE__*/_react["default"].createElement("div", {
|
|
320
323
|
className: preCls + '__content'
|
|
321
324
|
}, files.map(function (f, index) {
|
|
322
325
|
return /*#__PURE__*/_react["default"].createElement(_uploadedPreview["default"], {
|
|
@@ -325,7 +328,9 @@ function UploadDialog(_ref2) {
|
|
|
325
328
|
onSubmit: handleSubmit,
|
|
326
329
|
className: preCls + '__preview'
|
|
327
330
|
});
|
|
328
|
-
}))
|
|
331
|
+
})) : /*#__PURE__*/_react["default"].createElement("div", {
|
|
332
|
+
className: preCls + '__empty'
|
|
333
|
+
}, (0, _getLocale.getLocale)('Rep_Tab_Mys_Noattachment'))));
|
|
329
334
|
}
|
|
330
335
|
|
|
331
336
|
var _default = UploadDialog;
|
|
@@ -161,13 +161,19 @@ var OkrProgress = function OkrProgress(_ref) {
|
|
|
161
161
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
162
162
|
className: prefix
|
|
163
163
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
164
|
-
className: "".concat(prefix, "__title")
|
|
165
|
-
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
166
|
-
className: (0, _classnames["default"])("".concat(prefix, "__title-arrow"), _defineProperty({}, "".concat(prefix, "__title-arrow--show"), !tableVisible)),
|
|
164
|
+
className: "".concat(prefix, "__title"),
|
|
167
165
|
onClick: handleClickToHideTable
|
|
166
|
+
}, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
|
|
167
|
+
overlay: tableVisible ? (0, _getLocale.getLocale)('Mod_Fold') : (0, _getLocale.getLocale)('Mod_Unfold'),
|
|
168
|
+
placement: "top",
|
|
169
|
+
align: {
|
|
170
|
+
offset: [0, 5]
|
|
171
|
+
}
|
|
172
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
173
|
+
className: (0, _classnames["default"])("".concat(prefix, "__title-arrow"), _defineProperty({}, "".concat(prefix, "__title-arrow--show"), !tableVisible))
|
|
168
174
|
}, /*#__PURE__*/_react["default"].createElement("i", {
|
|
169
175
|
className: (0, _classnames["default"])('tu-icon-caret-down', "".concat(prefix, "__title-arrow-icon"), _defineProperty({}, "".concat(prefix, "__title-arrow-icon--rotate"), !tableVisible))
|
|
170
|
-
})), renderTitle), /*#__PURE__*/_react["default"].createElement("div", {
|
|
176
|
+
}))), renderTitle), /*#__PURE__*/_react["default"].createElement("div", {
|
|
171
177
|
className: (0, _classnames["default"])("".concat(prefix, "__table"), _defineProperty({}, "".concat(prefix, "__table--hide"), !tableVisible))
|
|
172
178
|
}, renderTable));
|
|
173
179
|
};
|
|
@@ -156,6 +156,28 @@
|
|
|
156
156
|
box-sizing: border-box;
|
|
157
157
|
}
|
|
158
158
|
|
|
159
|
+
.titaui-dynamic-new-summary-header__edit {
|
|
160
|
+
opacity: 0;
|
|
161
|
+
transition: all 0.2s;
|
|
162
|
+
display: inline-flex;
|
|
163
|
+
align-items: center;
|
|
164
|
+
justify-content: center;
|
|
165
|
+
height: 28px;
|
|
166
|
+
background: rgba(40, 121, 255, 0.1);
|
|
167
|
+
border-radius: 18px;
|
|
168
|
+
font-size: 12px;
|
|
169
|
+
color: #2879FF;
|
|
170
|
+
line-height: 18px;
|
|
171
|
+
padding: 5px 16px;
|
|
172
|
+
margin-right: 12px;
|
|
173
|
+
box-sizing: border-box;
|
|
174
|
+
cursor: pointer;
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
.titaui-dynamic-new-summary-header__edit-icon {
|
|
178
|
+
margin-right: 4px;
|
|
179
|
+
}
|
|
180
|
+
|
|
159
181
|
.titaui-dynamic-new-summary__operate .drawer-content-wrapper {
|
|
160
182
|
width: 372px !important;
|
|
161
183
|
}
|
|
@@ -355,7 +355,12 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
|
|
|
355
355
|
src: _evalute["default"],
|
|
356
356
|
className: "".concat(prefix, "__evalute-img"),
|
|
357
357
|
alt: "\u8BC4\u4EF7"
|
|
358
|
-
}), (0, _getLocale.getLocale)('Per_MyRe_button_Toevaluate')), /*#__PURE__*/_react["default"].createElement("div", {
|
|
358
|
+
}), (0, _getLocale.getLocale)('Per_MyRe_button_Toevaluate')), showEdit && data.isEdit && /*#__PURE__*/_react["default"].createElement("div", {
|
|
359
|
+
className: "".concat(prefix, "__edit"),
|
|
360
|
+
onClick: handleClickEdit
|
|
361
|
+
}, /*#__PURE__*/_react["default"].createElement("i", {
|
|
362
|
+
className: (0, _classnames["default"])('tu-icon-bianji3', "".concat(prefix, "__edit-icon"))
|
|
363
|
+
}), "\u7F16\u8F91"), /*#__PURE__*/_react["default"].createElement("div", {
|
|
359
364
|
className: "".concat(prefix, "__more-operate")
|
|
360
365
|
}, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
|
|
361
366
|
popupPlacement: "bottomRight",
|
|
@@ -372,15 +377,6 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
|
|
|
372
377
|
onClick: handleShowDropSelector
|
|
373
378
|
})
|
|
374
379
|
}, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
|
|
375
|
-
condition: showEdit && data.isEdit
|
|
376
|
-
}, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
|
|
377
|
-
name: "edit",
|
|
378
|
-
onClick: handleClickEdit
|
|
379
|
-
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
380
|
-
className: "".concat(prefix, "__more-operate-selection")
|
|
381
|
-
}, /*#__PURE__*/_react["default"].createElement("i", {
|
|
382
|
-
className: (0, _classnames["default"])('tu-icon-bianji3', "".concat(prefix, "__more-operate-selection-icon"))
|
|
383
|
-
}), (0, _getLocale.getLocale)('Mod_Editor')))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
|
|
384
380
|
condition: showDelete && data.isEdit
|
|
385
381
|
}, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
|
|
386
382
|
name: "delete",
|
|
@@ -24,16 +24,13 @@
|
|
|
24
24
|
margin-left: 24px;
|
|
25
25
|
overflow: hidden;
|
|
26
26
|
display: flex;
|
|
27
|
-
word-break: keep-all;
|
|
28
|
-
white-space: nowrap;
|
|
29
|
-
align-items: center;
|
|
30
27
|
}
|
|
31
28
|
|
|
32
29
|
.titaui-dynamic-summary-table-row-okr__kr-order {
|
|
33
30
|
font-size: 12px;
|
|
34
31
|
color: #2879ff;
|
|
35
32
|
line-height: 16px;
|
|
36
|
-
margin-top:
|
|
33
|
+
margin-top: 4px;
|
|
37
34
|
}
|
|
38
35
|
|
|
39
36
|
.titaui-dynamic-summary-table-row-okr__kr-text {
|
|
@@ -42,6 +39,8 @@
|
|
|
42
39
|
margin-left: 4px;
|
|
43
40
|
flex: 1;
|
|
44
41
|
overflow: hidden;
|
|
42
|
+
max-height: 180px;
|
|
43
|
+
overflow-y: scroll;
|
|
45
44
|
}
|
|
46
45
|
|
|
47
46
|
.titaui-dynamic-summary-table-row-okr__kr-text:hover {
|
|
@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
|
|
|
9
9
|
|
|
10
10
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
11
11
|
|
|
12
|
-
var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
|
|
13
|
-
|
|
14
12
|
var _drawerManager = _interopRequireDefault(require("../../../../drawer-manager"));
|
|
15
13
|
|
|
16
14
|
var _openData = require("../../../../../utils/open-data");
|
|
@@ -57,10 +55,7 @@ var TableRowOKR = function TableRowOKR(_ref) {
|
|
|
57
55
|
className: (0, _classnames["default"])("".concat(prefix, "__kr-order"))
|
|
58
56
|
}, "KR", order), /*#__PURE__*/_react["default"].createElement("span", {
|
|
59
57
|
className: (0, _classnames["default"])("".concat(prefix, "__kr-text"))
|
|
60
|
-
},
|
|
61
|
-
isPercent: true,
|
|
62
|
-
text: (0, _openData.parseString)(text)
|
|
63
|
-
}))));
|
|
58
|
+
}, (0, _openData.parseString)(text))));
|
|
64
59
|
};
|
|
65
60
|
|
|
66
61
|
var _default = TableRowOKR;
|
|
@@ -161,13 +161,19 @@ var TaskProgress = function TaskProgress(_ref) {
|
|
|
161
161
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
162
162
|
className: prefix
|
|
163
163
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
164
|
-
className: "".concat(prefix, "__title")
|
|
165
|
-
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
166
|
-
className: (0, _classnames["default"])("".concat(prefix, "__title-arrow"), _defineProperty({}, "".concat(prefix, "__title-arrow--show"), !tableVisible)),
|
|
164
|
+
className: "".concat(prefix, "__title"),
|
|
167
165
|
onClick: handleClickToHideTable
|
|
166
|
+
}, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
|
|
167
|
+
overlay: tableVisible ? (0, _getLocale.getLocale)('Mod_Fold') : (0, _getLocale.getLocale)('Mod_Unfold'),
|
|
168
|
+
placement: "top",
|
|
169
|
+
align: {
|
|
170
|
+
offset: [0, 5]
|
|
171
|
+
}
|
|
172
|
+
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
173
|
+
className: (0, _classnames["default"])("".concat(prefix, "__title-arrow"), _defineProperty({}, "".concat(prefix, "__title-arrow--show"), !tableVisible))
|
|
168
174
|
}, /*#__PURE__*/_react["default"].createElement("i", {
|
|
169
175
|
className: (0, _classnames["default"])('tu-icon-caret-down', "".concat(prefix, "__title-arrow-icon"), _defineProperty({}, "".concat(prefix, "__title-arrow-icon--rotate"), !tableVisible))
|
|
170
|
-
})), renderTitle), statusStatistic.done + statusStatistic.doing + statusStatistic.overDue > 0 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
176
|
+
}))), renderTitle), statusStatistic.done + statusStatistic.doing + statusStatistic.overDue > 0 && /*#__PURE__*/_react["default"].createElement("div", {
|
|
171
177
|
className: (0, _classnames["default"])("".concat(prefix, "__statistic"), _defineProperty({}, "".concat(prefix, "__statistic--hide"), !tableVisible))
|
|
172
178
|
}, statusStatistic.done > 0 && /*#__PURE__*/_react["default"].createElement("span", {
|
|
173
179
|
onClick: handleFilterDone,
|
|
@@ -23,7 +23,7 @@ require("./index.css");
|
|
|
23
23
|
|
|
24
24
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
25
25
|
|
|
26
|
-
var prefix = "titaui-dynamic-
|
|
26
|
+
var prefix = "titaui-dynamic-task-progress";
|
|
27
27
|
|
|
28
28
|
var RenderRow = function RenderRow(_ref) {
|
|
29
29
|
var item = _ref.item;
|
|
@@ -100,7 +100,7 @@ var _default = function _default() {
|
|
|
100
100
|
var showCompanyAll = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager();
|
|
101
101
|
(0, _react.useEffect)(function () {
|
|
102
102
|
if (showCompanyAll) {
|
|
103
|
-
window.location.href = '#/summary/
|
|
103
|
+
window.location.href = '#/summary/depart?departmentName=公司全部&departmentId=0';
|
|
104
104
|
|
|
105
105
|
var allDepartmentText = window.getLocale && window.getLocale(_i18n.locale.menu_alldeparment) || _i18n.locale.menu_alldeparment;
|
|
106
106
|
|
|
@@ -140,11 +140,11 @@ var _default = function _default() {
|
|
|
140
140
|
};
|
|
141
141
|
|
|
142
142
|
if (rawTreeData.length > 1) {
|
|
143
|
-
location.href = "#/summary/
|
|
143
|
+
location.href = "#/summary/depart?departmentName=".concat(res.Data.departments[0].name, "&departmentId=-1");
|
|
144
144
|
rawTreeData.unshift(rootNode);
|
|
145
145
|
setSelectedMenuKeys([-1]);
|
|
146
146
|
} else {
|
|
147
|
-
location.href = "#/summary/
|
|
147
|
+
location.href = "#/summary/depart?departmentName=".concat(res.Data.departments[0].name, "&departmentId=").concat(res.Data.departments[0].id);
|
|
148
148
|
setSelectedMenuKeys([rawTreeData[0].id]);
|
|
149
149
|
}
|
|
150
150
|
|
|
@@ -193,7 +193,7 @@ var _default = function _default() {
|
|
|
193
193
|
if (nodeType == _index.USER_NODE) {
|
|
194
194
|
location.href = "#/summary/manage?toUserId=".concat(data.userId);
|
|
195
195
|
} else if (nodeType == _index.DEPART_NODE) {
|
|
196
|
-
location.href = "#/summary/
|
|
196
|
+
location.href = "#/summary/depart?departmentName=".concat(data.name, "&departmentId=").concat(data.id);
|
|
197
197
|
}
|
|
198
198
|
|
|
199
199
|
setSelectedMenuKeys(selectedKyes);
|
|
@@ -74,7 +74,7 @@ function SummaryMenus(props) {
|
|
|
74
74
|
});
|
|
75
75
|
|
|
76
76
|
var onUserSelectHandler = function onUserSelectHandler(user) {
|
|
77
|
-
location.href = "#/summary/manage?toUserId=".concat(user.id
|
|
77
|
+
location.href = "#/summary/manage?toUserId=".concat(user.id);
|
|
78
78
|
};
|
|
79
79
|
|
|
80
80
|
var flipGoNext = function flipGoNext(opt) {
|
|
@@ -37,7 +37,7 @@ var PAGE_SUMMARY_SHARE = "share";
|
|
|
37
37
|
exports.PAGE_SUMMARY_SHARE = PAGE_SUMMARY_SHARE;
|
|
38
38
|
var PAGE_SUMMARY_DEPART = "depart";
|
|
39
39
|
exports.PAGE_SUMMARY_DEPART = PAGE_SUMMARY_DEPART;
|
|
40
|
-
var PAGE_SUMMARY_ROLE = "
|
|
40
|
+
var PAGE_SUMMARY_ROLE = "roles";
|
|
41
41
|
exports.PAGE_SUMMARY_ROLE = PAGE_SUMMARY_ROLE;
|
|
42
42
|
var PAGE_SUMMARY_CHART = "chart";
|
|
43
43
|
exports.PAGE_SUMMARY_CHART = PAGE_SUMMARY_CHART;
|
|
@@ -121,7 +121,14 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
121
121
|
|
|
122
122
|
onSelect(node); // 处理菜单选中
|
|
123
123
|
|
|
124
|
-
if (!selectedKyes.length)
|
|
124
|
+
if (!selectedKyes.length) {
|
|
125
|
+
return;
|
|
126
|
+
} else if (selectedKyes[0] === 'roles') {
|
|
127
|
+
// 为了点总结管理规定的时候不高亮这个菜单,这个菜单新页面打开的
|
|
128
|
+
return;
|
|
129
|
+
} else {
|
|
130
|
+
setSelectedMenuKeys(selectedKyes);
|
|
131
|
+
}
|
|
125
132
|
}; // 获取下属数据列表
|
|
126
133
|
|
|
127
134
|
|
|
@@ -11,6 +11,8 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
11
11
|
|
|
12
12
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
13
13
|
|
|
14
|
+
var _scrollbar = _interopRequireDefault(require("../scrollbar"));
|
|
15
|
+
|
|
14
16
|
var _popup = _interopRequireDefault(require("../popup"));
|
|
15
17
|
|
|
16
18
|
var _constant = require("./constant");
|
|
@@ -77,7 +79,7 @@ var NewConfidence = function NewConfidence(_ref) {
|
|
|
77
79
|
if (!editable) return null;
|
|
78
80
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
79
81
|
className: "".concat(prefix, "__pop-content")
|
|
80
|
-
}, _constant.ConfidencePointArr.map(function (point) {
|
|
82
|
+
}, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], null, _constant.ConfidencePointArr.map(function (point) {
|
|
81
83
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
82
84
|
onClick: function onClick() {
|
|
83
85
|
handleChangeConfidence(point);
|
|
@@ -90,7 +92,7 @@ var NewConfidence = function NewConfidence(_ref) {
|
|
|
90
92
|
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
91
93
|
className: "".concat(prefix, "__pop-content-item-text")
|
|
92
94
|
}, point, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('Per_Set_Form_Quantifier_Points'))));
|
|
93
|
-
}));
|
|
95
|
+
})));
|
|
94
96
|
}, [editable]);
|
|
95
97
|
return /*#__PURE__*/_react["default"].createElement(_popup["default"], {
|
|
96
98
|
popup: renderPopContent,
|
|
@@ -21,8 +21,6 @@ var _taskStatusSelect = _interopRequireDefault(require("../../search/task-status
|
|
|
21
21
|
|
|
22
22
|
var _taskRelation = _interopRequireDefault(require("../../search/task-relation"));
|
|
23
23
|
|
|
24
|
-
var _principal = _interopRequireDefault(require("../../search/principal"));
|
|
25
|
-
|
|
26
24
|
var _formatTime = require("../../../../utils/format-time");
|
|
27
25
|
|
|
28
26
|
var _getLocale = require("../../../../utils/getLocale");
|
|
@@ -78,27 +76,19 @@ function SearchForm(props) {
|
|
|
78
76
|
keyWords = _useState6[0],
|
|
79
77
|
setKeyWords = _useState6[1];
|
|
80
78
|
|
|
81
|
-
var _useState7 = (0, _react.useState)(
|
|
79
|
+
var _useState7 = (0, _react.useState)(0),
|
|
82
80
|
_useState8 = _slicedToArray(_useState7, 2),
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
var _useState9 = (0, _react.useState)(0),
|
|
87
|
-
_useState10 = _slicedToArray(_useState9, 2),
|
|
88
|
-
relation = _useState10[0],
|
|
89
|
-
setRelation = _useState10[1];
|
|
81
|
+
relation = _useState8[0],
|
|
82
|
+
setRelation = _useState8[1];
|
|
90
83
|
|
|
91
84
|
var dilagRef = (0, _react.useRef)(document.createElement('div'));
|
|
92
85
|
(0, _react.useEffect)(function () {
|
|
93
86
|
onChange(_objectSpread({
|
|
94
87
|
status: status,
|
|
95
88
|
keyWords: keyWords,
|
|
96
|
-
relation: relation
|
|
97
|
-
userIds: users.reduce(function (res, cur, index) {
|
|
98
|
-
return "".concat(res).concat(index == 0 ? '' : ',').concat(cur.userId);
|
|
99
|
-
}, '')
|
|
89
|
+
relation: relation
|
|
100
90
|
}, cycle));
|
|
101
|
-
}, [status, keyWords, cycle, relation
|
|
91
|
+
}, [status, keyWords, cycle, relation]);
|
|
102
92
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
103
93
|
ref: dilagRef
|
|
104
94
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -123,14 +113,6 @@ function SearchForm(props) {
|
|
|
123
113
|
initValue: status
|
|
124
114
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
125
115
|
className: "rel-okr-tree__search-item"
|
|
126
|
-
}, /*#__PURE__*/_react["default"].createElement(_principal["default"], {
|
|
127
|
-
multiple: false,
|
|
128
|
-
onChange: setUsers,
|
|
129
|
-
position: "bottomLeft",
|
|
130
|
-
isInitSelf: true,
|
|
131
|
-
setRelation: setRelation
|
|
132
|
-
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
133
|
-
className: "rel-okr-tree__search-item"
|
|
134
116
|
}, /*#__PURE__*/_react["default"].createElement(_taskRelation["default"], {
|
|
135
117
|
onChange: setRelation,
|
|
136
118
|
initValue: relation
|
|
@@ -23,7 +23,6 @@ var dealMessage = function dealMessage(res) {
|
|
|
23
23
|
var id = (0, _helpers.getLoginUserInfo)().Id;
|
|
24
24
|
|
|
25
25
|
var planTableTask = function planTableTask(params, pageNum, pageSize) {
|
|
26
|
-
console.log(params.userIds);
|
|
27
26
|
var url = "task/search";
|
|
28
27
|
var _params$startDate = params.startDate,
|
|
29
28
|
startDate = _params$startDate === void 0 ? '' : _params$startDate,
|
|
@@ -34,9 +33,7 @@ var planTableTask = function planTableTask(params, pageNum, pageSize) {
|
|
|
34
33
|
_params$status = params.status,
|
|
35
34
|
status = _params$status === void 0 ? 10 : _params$status,
|
|
36
35
|
_params$relation = params.relation,
|
|
37
|
-
relation = _params$relation === void 0 ? 0 : _params$relation
|
|
38
|
-
_params$userIds = params.userIds,
|
|
39
|
-
userIds = _params$userIds === void 0 ? id : _params$userIds;
|
|
36
|
+
relation = _params$relation === void 0 ? 0 : _params$relation;
|
|
40
37
|
|
|
41
38
|
if (status == 10) {
|
|
42
39
|
status = '0,1,2,3,4,6';
|
|
@@ -49,7 +46,6 @@ var planTableTask = function planTableTask(params, pageNum, pageSize) {
|
|
|
49
46
|
return (0, _request.rpost)('v2')(url, {
|
|
50
47
|
type: 'personal',
|
|
51
48
|
to_user_id: id,
|
|
52
|
-
userIds: userIds,
|
|
53
49
|
StartDate: startDate,
|
|
54
50
|
EndDate: endDate,
|
|
55
51
|
startNum: pageNum,
|
|
@@ -17,12 +17,8 @@ var _openData = require("../../../utils/open-data");
|
|
|
17
17
|
|
|
18
18
|
var _getLocale = require("../../../utils/getLocale");
|
|
19
19
|
|
|
20
|
-
var _helpers = require("../../../utils/helpers");
|
|
21
|
-
|
|
22
20
|
require("./search-dropdown/index.css");
|
|
23
21
|
|
|
24
|
-
var _loginUser$UserAvatar;
|
|
25
|
-
|
|
26
22
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
27
23
|
|
|
28
24
|
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); }
|
|
@@ -41,16 +37,6 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
|
41
37
|
|
|
42
38
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
43
39
|
|
|
44
|
-
var loginUser = (0, _helpers.getLoginUserInfo)();
|
|
45
|
-
var user = {
|
|
46
|
-
userId: loginUser.Id,
|
|
47
|
-
name: loginUser.Name,
|
|
48
|
-
avatar: {
|
|
49
|
-
original: loginUser === null || loginUser === void 0 ? void 0 : (_loginUser$UserAvatar = loginUser.UserAvatar) === null || _loginUser$UserAvatar === void 0 ? void 0 : _loginUser$UserAvatar.Original,
|
|
50
|
-
color: '#bc97eb'
|
|
51
|
-
}
|
|
52
|
-
};
|
|
53
|
-
|
|
54
40
|
function Principal(props) {
|
|
55
41
|
var onChange = props.onChange,
|
|
56
42
|
_props$initValue = props.initValue,
|
|
@@ -59,9 +45,7 @@ function Principal(props) {
|
|
|
59
45
|
_props$position = props.position,
|
|
60
46
|
position = _props$position === void 0 ? 'bottom' : _props$position,
|
|
61
47
|
_props$multiple = props.multiple,
|
|
62
|
-
multiple = _props$multiple === void 0 ? true : _props$multiple
|
|
63
|
-
_props$isInitSelf = props.isInitSelf,
|
|
64
|
-
isInitSelf = _props$isInitSelf === void 0 ? false : _props$isInitSelf;
|
|
48
|
+
multiple = _props$multiple === void 0 ? true : _props$multiple;
|
|
65
49
|
|
|
66
50
|
var _useState = (0, _react.useState)(initValue),
|
|
67
51
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -95,10 +79,6 @@ function Principal(props) {
|
|
|
95
79
|
|
|
96
80
|
(0, _react.useEffect)(function () {
|
|
97
81
|
setIsInit(true);
|
|
98
|
-
|
|
99
|
-
if (isInitSelf) {
|
|
100
|
-
setUsers([user]);
|
|
101
|
-
}
|
|
102
82
|
}, []);
|
|
103
83
|
(0, _react.useEffect)(function () {
|
|
104
84
|
setRelation(0);
|
|
@@ -60,20 +60,14 @@ function _default(props) {
|
|
|
60
60
|
defaultExpandedKeys = _useState2[0];
|
|
61
61
|
|
|
62
62
|
var _useState3 = (0, _react.useState)(function () {
|
|
63
|
-
if (props.
|
|
64
|
-
return props.initSelected;
|
|
65
|
-
} else if (props.selected) {
|
|
66
|
-
return props.selected;
|
|
67
|
-
}
|
|
63
|
+
if (props.selected) return props.selected;
|
|
68
64
|
}),
|
|
69
65
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
70
66
|
selected = _useState4[0],
|
|
71
67
|
setSelected = _useState4[1];
|
|
72
68
|
|
|
73
69
|
(0, _react.useEffect)(function () {
|
|
74
|
-
|
|
75
|
-
setSelected(props.selected);
|
|
76
|
-
}
|
|
70
|
+
setSelected(props.selected);
|
|
77
71
|
}, [props.selected]);
|
|
78
72
|
|
|
79
73
|
var onSelectHandler = function onSelectHandler(keys, node) {
|