@titaui/pc 1.11.52-beta.13 → 1.11.52-beta.16
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/create-okr-modal/fields/o-new-name.js +7 -1
- package/lib/components/create-okr-modal/kr-items/krItem.js +7 -1
- package/lib/components/drop-selector/index.js +1 -2
- package/lib/components/dynamic/dynamic-item/dynamic-align/index.js +2 -2
- package/lib/components/dynamic/dynamic-item/dynamic-relative/index.js +2 -2
- package/lib/components/dynamic/dynamic-item/dynamic-reply/index.js +3 -1
- package/lib/components/dynamic/dynamic-item/dynamic-task/index.js +3 -1
- package/lib/components/edit-kr-wight/EditKrWightModal.js +11 -9
- package/lib/components/nav-top/components/user-message/components/inform/inform-item.js +1 -1
- package/lib/components/okr-detail/components/header/edit-name.js +10 -18
- package/lib/components/okr-detail/components/header/index.js +14 -7
- package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js +78 -42
- package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js +7 -0
- package/lib/components/okr-detail/detail-header/index.js +3 -1
- package/lib/components/okr-detail/okr-list/create-kr-item/index.js +3 -0
- package/lib/components/okr-flow/export-modal/index.js +26 -16
- package/lib/components/okr-share/common-painter/utils.js +2 -2
- package/lib/components/progress/circle-progress/index.css +2 -0
- package/lib/components/task-relation-modal/okr-relation/relation-task-model/index.js +8 -3
- package/lib/components/task-relation-modal/okr-relation/relation-work-model/index.js +4 -2
- package/lib/components/task-relation-modal/okr-relation/tree/task-tree/index.css +3 -3
- package/lib/components/task-relation-modal/okr-relation/tree/task-tree/index.js +8 -2
- package/lib/components/task-tree/task-item-node/index.css +2 -2
- package/lib/components/upload/components/uploadedPreview.js +18 -18
- package/lib/components/upload/index.js +57 -29
- package/lib/components/user-selector/export-modules/field-tree-selector/index.js +14 -15
- package/lib/components/user-selector/searched-panel/index.js +12 -6
- package/lib/pages/new-okr-list/header/index.js +16 -18
- package/lib/utils/auth.js +12 -0
- package/lib/utils/hooks.js +19 -5
- package/lib/utils/tita-okr-cycle.js +24 -0
- package/package.json +2 -2
|
@@ -29,7 +29,7 @@ var _getLocale = require("../../../../utils/getLocale");
|
|
|
29
29
|
|
|
30
30
|
require("./index.css");
|
|
31
31
|
|
|
32
|
-
var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "krId", "okrId", "isRelationOther", "onRelateSuccess", "lastSelected"];
|
|
32
|
+
var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "krId", "okrId", "zIndex", "isRelationOther", "onRelateSuccess", "noScreen", "lastSelected"];
|
|
33
33
|
|
|
34
34
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
35
35
|
|
|
@@ -76,9 +76,13 @@ function OkrRelationTaskModal(props) {
|
|
|
76
76
|
onCancel = _props$onCancel === void 0 ? function () {} : _props$onCancel,
|
|
77
77
|
krId = props.krId,
|
|
78
78
|
okrId = props.okrId,
|
|
79
|
+
_props$zIndex = props.zIndex,
|
|
80
|
+
zIndex = _props$zIndex === void 0 ? 1000 : _props$zIndex,
|
|
79
81
|
_props$isRelationOthe = props.isRelationOther,
|
|
80
82
|
isRelationOther = _props$isRelationOthe === void 0 ? false : _props$isRelationOthe,
|
|
81
83
|
onRelateSuccess = props.onRelateSuccess,
|
|
84
|
+
_props$noScreen = props.noScreen,
|
|
85
|
+
noScreen = _props$noScreen === void 0 ? false : _props$noScreen,
|
|
82
86
|
_props$lastSelected = props.lastSelected,
|
|
83
87
|
lastSelected = _props$lastSelected === void 0 ? [] : _props$lastSelected,
|
|
84
88
|
restProps = _objectWithoutProperties(props, _excluded);
|
|
@@ -220,7 +224,7 @@ function OkrRelationTaskModal(props) {
|
|
|
220
224
|
height: '590px'
|
|
221
225
|
},
|
|
222
226
|
width: 840,
|
|
223
|
-
zIndex:
|
|
227
|
+
zIndex: zIndex,
|
|
224
228
|
noHeadLine: true,
|
|
225
229
|
noFooterLine: true // getContainer={getContainer}
|
|
226
230
|
,
|
|
@@ -246,7 +250,8 @@ function OkrRelationTaskModal(props) {
|
|
|
246
250
|
setSelected: setSelected,
|
|
247
251
|
data: taskData,
|
|
248
252
|
multiple: true,
|
|
249
|
-
pageSize: pageSize
|
|
253
|
+
pageSize: pageSize,
|
|
254
|
+
noScreen: noScreen
|
|
250
255
|
})), !!total && /*#__PURE__*/_react["default"].createElement("div", {
|
|
251
256
|
className: "".concat(preCls, "__content-pagination")
|
|
252
257
|
}, /*#__PURE__*/_react["default"].createElement(_pagination["default"], {
|
|
@@ -21,7 +21,7 @@ var _getLocale = require("../../../../utils/getLocale");
|
|
|
21
21
|
|
|
22
22
|
require("./index.css");
|
|
23
23
|
|
|
24
|
-
var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "onRelateSuccess", "krId", "okrId", "isRelationOther", "lastSelected"];
|
|
24
|
+
var _excluded = ["defaultVisible", "multiple", "onOk", "onCancel", "onRelateSuccess", "krId", "zIndex", "okrId", "isRelationOther", "lastSelected"];
|
|
25
25
|
|
|
26
26
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
27
27
|
|
|
@@ -59,6 +59,8 @@ function OkrRelationWorkModal(props) {
|
|
|
59
59
|
onCancel = _props$onCancel === void 0 ? function () {} : _props$onCancel,
|
|
60
60
|
onRelateSuccess = props.onRelateSuccess,
|
|
61
61
|
krId = props.krId,
|
|
62
|
+
_props$zIndex = props.zIndex,
|
|
63
|
+
zIndex = _props$zIndex === void 0 ? 1000 : _props$zIndex,
|
|
62
64
|
okrId = props.okrId,
|
|
63
65
|
_props$isRelationOthe = props.isRelationOther,
|
|
64
66
|
isRelationOther = _props$isRelationOthe === void 0 ? false : _props$isRelationOthe,
|
|
@@ -111,7 +113,7 @@ function OkrRelationWorkModal(props) {
|
|
|
111
113
|
height: '590px'
|
|
112
114
|
},
|
|
113
115
|
width: 840,
|
|
114
|
-
zIndex:
|
|
116
|
+
zIndex: zIndex,
|
|
115
117
|
noHeadLine: true,
|
|
116
118
|
noFooterLine: true // getContainer={getContainer}
|
|
117
119
|
,
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
display: flex;
|
|
4
4
|
align-items: center;
|
|
5
5
|
justify-content: center;
|
|
6
|
-
color: #
|
|
6
|
+
color: #a4acb9;
|
|
7
7
|
}
|
|
8
8
|
|
|
9
9
|
.okr-relation-tree__header {
|
|
10
10
|
font-size: 12px;
|
|
11
11
|
font-weight: 400;
|
|
12
|
-
color: #
|
|
12
|
+
color: #a4acb9;
|
|
13
13
|
position: relative;
|
|
14
14
|
display: flex;
|
|
15
15
|
align-items: center;
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
.okr-relation-tree__content {
|
|
51
51
|
margin-right: -32px;
|
|
52
52
|
margin-left: -4px;
|
|
53
|
-
height:
|
|
53
|
+
height: 320px;
|
|
54
54
|
font-size: 14px;
|
|
55
55
|
font-weight: 400;
|
|
56
56
|
line-height: 22px;
|
|
@@ -48,7 +48,9 @@ var TaskTree = function TaskTree(_ref) {
|
|
|
48
48
|
setSelected = _ref.setSelected,
|
|
49
49
|
pageSize = _ref.pageSize,
|
|
50
50
|
_ref$isWork = _ref.isWork,
|
|
51
|
-
isWork = _ref$isWork === void 0 ? false : _ref$isWork
|
|
51
|
+
isWork = _ref$isWork === void 0 ? false : _ref$isWork,
|
|
52
|
+
_ref$noScreen = _ref.noScreen,
|
|
53
|
+
noScreen = _ref$noScreen === void 0 ? false : _ref$noScreen;
|
|
52
54
|
var scrollStyle = {
|
|
53
55
|
height: '100%',
|
|
54
56
|
backgroundColor: 'transparent',
|
|
@@ -59,7 +61,11 @@ var TaskTree = function TaskTree(_ref) {
|
|
|
59
61
|
if (isWork) {
|
|
60
62
|
window.open("#work?work_id=".concat(id, "&to_user_id=").concat((0, _helpers.getLoginUserInfo)().Id, "&status=1"));
|
|
61
63
|
} else {
|
|
62
|
-
|
|
64
|
+
if (noScreen) {
|
|
65
|
+
window.open("https://".concat(location.host).concat(location.pathname, "#more/taskinfo?id=").concat(id));
|
|
66
|
+
} else {
|
|
67
|
+
window.Talent.app.vent.trigger('global-pull-screen', id, 'task');
|
|
68
|
+
}
|
|
63
69
|
}
|
|
64
70
|
};
|
|
65
71
|
|
|
@@ -107,7 +107,7 @@
|
|
|
107
107
|
top: 3px;
|
|
108
108
|
color: #89919f;
|
|
109
109
|
cursor: auto;
|
|
110
|
-
width:
|
|
110
|
+
width: 72px;
|
|
111
111
|
margin-left: 20px;
|
|
112
112
|
}
|
|
113
113
|
|
|
@@ -263,7 +263,7 @@
|
|
|
263
263
|
top: 3px;
|
|
264
264
|
color: #89919f;
|
|
265
265
|
cursor: auto;
|
|
266
|
-
width:
|
|
266
|
+
width: 72px;
|
|
267
267
|
margin-left: 20px;
|
|
268
268
|
}
|
|
269
269
|
|
|
@@ -84,7 +84,7 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
84
84
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
85
85
|
className: "tu-icon-canceled action-icon action-icon-delete",
|
|
86
86
|
onMouseDown: function onMouseDown() {
|
|
87
|
-
return onSubmit(index,
|
|
87
|
+
return onSubmit(index, 'cancel');
|
|
88
88
|
}
|
|
89
89
|
})));
|
|
90
90
|
}
|
|
@@ -94,24 +94,24 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
94
94
|
if (smallImageUrl && deleteable) {
|
|
95
95
|
// 是图片且能删除
|
|
96
96
|
return [/*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
97
|
-
content: (0, _getLocale.getLocale)(
|
|
97
|
+
content: (0, _getLocale.getLocale)('Mod_Preview'),
|
|
98
98
|
container: document.body
|
|
99
99
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
100
100
|
className: "upload-file-action-wrapper"
|
|
101
101
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
102
102
|
className: "tu-icon-yulan action-icon",
|
|
103
103
|
onMouseDown: function onMouseDown() {
|
|
104
|
-
return onSubmit(index,
|
|
104
|
+
return onSubmit(index, 'preview');
|
|
105
105
|
}
|
|
106
106
|
}))), /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
107
|
-
content: (0, _getLocale.getLocale)(
|
|
107
|
+
content: (0, _getLocale.getLocale)('Mod_Delete'),
|
|
108
108
|
container: document.body
|
|
109
109
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
110
110
|
className: "upload-file-action-wrapper"
|
|
111
111
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
112
112
|
className: "tu-icon-canceled action-icon delete",
|
|
113
113
|
onMouseDown: function onMouseDown() {
|
|
114
|
-
return onSubmit(index,
|
|
114
|
+
return onSubmit(index, 'delete');
|
|
115
115
|
}
|
|
116
116
|
})))];
|
|
117
117
|
}
|
|
@@ -119,14 +119,14 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
119
119
|
if (!smallImageUrl && deleteable) {
|
|
120
120
|
// 不是图片但能删除
|
|
121
121
|
return /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
122
|
-
content: (0, _getLocale.getLocale)(
|
|
122
|
+
content: (0, _getLocale.getLocale)('Mod_Delete'),
|
|
123
123
|
container: document.body
|
|
124
124
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
125
125
|
className: "upload-file-action-wrapper"
|
|
126
126
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
127
127
|
className: "tu-icon-canceled action-icon delete",
|
|
128
128
|
onMouseDown: function onMouseDown() {
|
|
129
|
-
return onSubmit(index,
|
|
129
|
+
return onSubmit(index, 'delete');
|
|
130
130
|
}
|
|
131
131
|
})));
|
|
132
132
|
}
|
|
@@ -134,14 +134,14 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
134
134
|
if (smallImageUrl && !deleteable) {
|
|
135
135
|
// 是图片不能删除
|
|
136
136
|
return /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
137
|
-
content: (0, _getLocale.getLocale)(
|
|
137
|
+
content: (0, _getLocale.getLocale)('Mod_Preview'),
|
|
138
138
|
container: document.body
|
|
139
139
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
140
140
|
className: "upload-file-action-wrapper"
|
|
141
141
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
142
142
|
className: "tu-icon-magnifier-circle action-icon",
|
|
143
143
|
onMouseDown: function onMouseDown() {
|
|
144
|
-
return onSubmit(index,
|
|
144
|
+
return onSubmit(index, 'preview');
|
|
145
145
|
}
|
|
146
146
|
})));
|
|
147
147
|
} // 不是图片也不能删除
|
|
@@ -152,14 +152,14 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
152
152
|
|
|
153
153
|
if (uploadStatus === 5) {
|
|
154
154
|
return /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
155
|
-
content: (0, _getLocale.getLocale)(
|
|
155
|
+
content: (0, _getLocale.getLocale)('Mod_Delete'),
|
|
156
156
|
container: document.body
|
|
157
157
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
158
158
|
className: "upload-file-action-wrapper"
|
|
159
159
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
160
160
|
className: "tu-icon-canceled action-icon delete",
|
|
161
161
|
onMouseDown: function onMouseDown() {
|
|
162
|
-
return onSubmit(index,
|
|
162
|
+
return onSubmit(index, 'delete');
|
|
163
163
|
}
|
|
164
164
|
})));
|
|
165
165
|
} // 4:上传失败
|
|
@@ -173,17 +173,17 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
173
173
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
174
174
|
className: "tu-icon-gengxin1 action-icon",
|
|
175
175
|
onMouseDown: function onMouseDown() {
|
|
176
|
-
return onSubmit(index,
|
|
176
|
+
return onSubmit(index, 'reupload');
|
|
177
177
|
}
|
|
178
178
|
}))), /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
179
|
-
content: (0, _getLocale.getLocale)(
|
|
179
|
+
content: (0, _getLocale.getLocale)('Mod_Delete'),
|
|
180
180
|
container: document.body
|
|
181
181
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
182
182
|
className: "upload-file-action-wrapper"
|
|
183
183
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
184
184
|
className: "tu-icon-canceled action-icon delete",
|
|
185
185
|
onMouseDown: function onMouseDown() {
|
|
186
|
-
return onSubmit(index,
|
|
186
|
+
return onSubmit(index, 'delete');
|
|
187
187
|
}
|
|
188
188
|
}))));
|
|
189
189
|
};
|
|
@@ -205,21 +205,21 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
|
|
|
205
205
|
uploadResultItem = _this$props.uploadResultItem,
|
|
206
206
|
index = _this$props.index;
|
|
207
207
|
return /*#__PURE__*/_react["default"].createElement(_style.PreviewContent, {
|
|
208
|
-
className: [
|
|
208
|
+
className: ['preview__content document-mouse-event-ignore', className].join(' ')
|
|
209
209
|
}, /*#__PURE__*/_react["default"].createElement(_style.PreviewImageWrapper, null, this.renderPreviewThumbnail()), /*#__PURE__*/_react["default"].createElement(_style.PreviewMessageWrapper, null, /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
210
210
|
content: uploadResultItem.FileName,
|
|
211
211
|
container: document.body
|
|
212
212
|
}, /*#__PURE__*/_react["default"].createElement(_style.PreviewFileTitle, {
|
|
213
213
|
"data-tip": uploadResultItem.FileName,
|
|
214
214
|
key: uploadResultItem.uid
|
|
215
|
-
}, uploadResultItem.FileName,
|
|
215
|
+
}, uploadResultItem.FileName, uploadResultItem.uploadStatus === 2 ? /*#__PURE__*/_react["default"].createElement(_style.UploadProgress, null, /*#__PURE__*/_react["default"].createElement("div", {
|
|
216
216
|
style: {
|
|
217
217
|
width: "".concat(uploadResultItem.percentComplete, "%")
|
|
218
218
|
},
|
|
219
219
|
className: "upload-file--progress"
|
|
220
220
|
})) : /*#__PURE__*/_react["default"].createElement("div", {
|
|
221
|
-
className: uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ?
|
|
222
|
-
}, uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ? (0, _util.getFileSize)(uploadResultItem.FileSize) : uploadResultItem.Msg)))), /*#__PURE__*/_react["default"].createElement(_style.PreviewOptionsWrapper, null, this.dealPreviewOptions(uploadResultItem.uploadStatus, index, uploadResultItem.Deleteable, uploadResultItem.SmallImageUrl),
|
|
221
|
+
className: uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ? 'upload-file-size' : 'upload-file-size upload-file-size--error'
|
|
222
|
+
}, uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ? (0, _util.getFileSize)(uploadResultItem.FileSize) : uploadResultItem.Msg)))), /*#__PURE__*/_react["default"].createElement(_style.PreviewOptionsWrapper, null, this.dealPreviewOptions(uploadResultItem.uploadStatus, index, uploadResultItem.Deleteable, uploadResultItem.SmallImageUrl), ' '));
|
|
223
223
|
}
|
|
224
224
|
}]);
|
|
225
225
|
|
|
@@ -99,7 +99,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
99
99
|
|
|
100
100
|
if (fileInput) {
|
|
101
101
|
// @ts-ignore
|
|
102
|
-
fileInput.value =
|
|
102
|
+
fileInput.value = '';
|
|
103
103
|
}
|
|
104
104
|
};
|
|
105
105
|
|
|
@@ -161,7 +161,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
161
161
|
var uploadStartFile = null;
|
|
162
162
|
var timestamp = new Date().getTime(); // 给每个文件加一个时间戳
|
|
163
163
|
|
|
164
|
-
var uploadFileType = element.name.substring(element.name.lastIndexOf(
|
|
164
|
+
var uploadFileType = element.name.substring(element.name.lastIndexOf('.') + 1);
|
|
165
165
|
uploadStartFile = {
|
|
166
166
|
FileName: element.name,
|
|
167
167
|
FileType: (0, _type._dealAttachmentType)(uploadFileType).FileType,
|
|
@@ -173,17 +173,17 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
173
173
|
// 开始上传
|
|
174
174
|
IsSuccess: false,
|
|
175
175
|
uid: (0, _uuid["default"])(),
|
|
176
|
-
_smallImageUrl:
|
|
177
|
-
_bigImageUrl:
|
|
178
|
-
MediaType:
|
|
176
|
+
_smallImageUrl: '',
|
|
177
|
+
_bigImageUrl: '',
|
|
178
|
+
MediaType: '',
|
|
179
179
|
UserId: 0,
|
|
180
180
|
MaxDocCount: 0,
|
|
181
|
-
DfsPath:
|
|
182
|
-
ClientUrl:
|
|
183
|
-
SmallImageUrl:
|
|
184
|
-
BigImageUrl:
|
|
185
|
-
DownloadUrl:
|
|
186
|
-
Msg:
|
|
181
|
+
DfsPath: '',
|
|
182
|
+
ClientUrl: '',
|
|
183
|
+
SmallImageUrl: '',
|
|
184
|
+
BigImageUrl: '',
|
|
185
|
+
DownloadUrl: '',
|
|
186
|
+
Msg: '',
|
|
187
187
|
AllowUploadAttachmentSize: 50,
|
|
188
188
|
Deleteable: true,
|
|
189
189
|
requestXHR: new XMLHttpRequest() // 在这创建是为了取消用
|
|
@@ -202,7 +202,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
202
202
|
_this._dealUploadStart(uploadStartFiles); // 处理开始上传的文件
|
|
203
203
|
|
|
204
204
|
|
|
205
|
-
formData.append(
|
|
205
|
+
formData.append('file', element);
|
|
206
206
|
var url = action || (0, _requestV.getApiUrl)("Upload/PostFiles?format=json×tamp=".concat(timestamp));
|
|
207
207
|
|
|
208
208
|
_this._dealUploadXHRRequest(formData, url, uploadStartFile);
|
|
@@ -213,7 +213,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
213
213
|
if (uploadStartFile.FileSize > _this.props.fileSizeLimit * 1024 * 1024) {
|
|
214
214
|
setTimeout(function () {
|
|
215
215
|
_this._dealUploadSuccess(_objectSpread(_objectSpread({}, uploadStartFile), {
|
|
216
|
-
Msg:
|
|
216
|
+
Msg: '上传失败,文件过大',
|
|
217
217
|
IsImage: false,
|
|
218
218
|
uploadStatus: 5
|
|
219
219
|
}));
|
|
@@ -221,12 +221,32 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
221
221
|
return;
|
|
222
222
|
}
|
|
223
223
|
|
|
224
|
-
var xhr = uploadStartFile.requestXHR;
|
|
224
|
+
var xhr = uploadStartFile.requestXHR; // xhr.onreadystatechange = () => {
|
|
225
|
+
// if (xhr.readyState == 4 && xhr.status == 200) {
|
|
226
|
+
// const result = { ...JSON.parse(xhr.responseText).Result[0] }; // 上传成功接口返回数据
|
|
227
|
+
// result.percentComplete = 100;
|
|
228
|
+
// result.IsSuccess = !!result.IsSuccess;
|
|
229
|
+
// result.uploadStatus = result.IsSuccess ? 3 : 4; // 3上传成功;4上传失败
|
|
230
|
+
// this._dealUploadSuccess({ ...uploadStartFile, ...result });
|
|
231
|
+
// }
|
|
232
|
+
// };
|
|
233
|
+
// // 进度条部分
|
|
234
|
+
// xhr.upload.onprogress = (evt) => {
|
|
235
|
+
// const uploadSuccessFiles = [...this.state.uploadSuccessFiles];
|
|
236
|
+
// if (evt.lengthComputable) {
|
|
237
|
+
// uploadSuccessFiles.forEach((item: UploadResultObj) => {
|
|
238
|
+
// if (this.isSameFile(item, uploadStartFile)) {
|
|
239
|
+
// item.uploadStatus = 2; // 上传中
|
|
240
|
+
// item.percentComplete = Math.round((evt.loaded * 100) / evt.total);
|
|
241
|
+
// }
|
|
242
|
+
// });
|
|
243
|
+
// this.setState({ uploadSuccessFiles });
|
|
244
|
+
// }
|
|
245
|
+
// };
|
|
225
246
|
|
|
226
247
|
xhr.onreadystatechange = function () {
|
|
227
248
|
if (xhr.readyState == 4 && xhr.status == 200) {
|
|
228
|
-
var result = _objectSpread({}, JSON.parse(xhr.responseText).Result[0]); // 上传成功接口返回数据
|
|
229
|
-
|
|
249
|
+
var result = Object.assign({}, _objectSpread({}, JSON.parse(xhr.responseText).Result[0])); // 上传成功接口返回数据
|
|
230
250
|
|
|
231
251
|
result.percentComplete = 100;
|
|
232
252
|
result.IsSuccess = !!result.IsSuccess;
|
|
@@ -234,11 +254,11 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
234
254
|
|
|
235
255
|
_this._dealUploadSuccess(_objectSpread(_objectSpread({}, uploadStartFile), result));
|
|
236
256
|
}
|
|
237
|
-
};
|
|
257
|
+
}; //进度条部分
|
|
238
258
|
|
|
239
259
|
|
|
240
260
|
xhr.upload.onprogress = function (evt) {
|
|
241
|
-
var uploadSuccessFiles =
|
|
261
|
+
var uploadSuccessFiles = JSON.parse(JSON.stringify(_this.state.uploadSuccessFiles));
|
|
242
262
|
|
|
243
263
|
if (evt.lengthComputable) {
|
|
244
264
|
uploadSuccessFiles.forEach(function (item) {
|
|
@@ -263,7 +283,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
263
283
|
item.uploadStatus = 4; // 上传失败
|
|
264
284
|
|
|
265
285
|
item.percentComplete = Math.round(evt.loaded * 100 / evt.total);
|
|
266
|
-
item.Msg =
|
|
286
|
+
item.Msg = '网络异常,请重新上传';
|
|
267
287
|
}
|
|
268
288
|
});
|
|
269
289
|
|
|
@@ -272,7 +292,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
272
292
|
});
|
|
273
293
|
};
|
|
274
294
|
|
|
275
|
-
xhr.open(
|
|
295
|
+
xhr.open('POST', url, true);
|
|
276
296
|
xhr.send(formData); // 开始上传,发送form数据
|
|
277
297
|
};
|
|
278
298
|
|
|
@@ -331,12 +351,20 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
331
351
|
});
|
|
332
352
|
};
|
|
333
353
|
|
|
354
|
+
_this.isImg = function (fileType) {
|
|
355
|
+
if (/^(jpg|png|gif|jpeg|image|JPG|PNG|GIF|JPEG)$/.test(fileType)) {
|
|
356
|
+
return true;
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
return false;
|
|
360
|
+
};
|
|
361
|
+
|
|
334
362
|
_this.getImgIndex = function (index) {
|
|
335
363
|
var newIndex = 0;
|
|
336
364
|
var uploadSuccessFiles = _this.state.uploadSuccessFiles;
|
|
337
365
|
|
|
338
366
|
for (var i = 0; i < index; i++) {
|
|
339
|
-
if (isImg(uploadSuccessFiles[i].FileType)) {
|
|
367
|
+
if (_this.isImg(uploadSuccessFiles[i].FileType)) {
|
|
340
368
|
newIndex++;
|
|
341
369
|
}
|
|
342
370
|
}
|
|
@@ -349,12 +377,12 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
349
377
|
onSubmit = _this$props2.onSubmit,
|
|
350
378
|
onDelete = _this$props2.onDelete;
|
|
351
379
|
|
|
352
|
-
if (options ===
|
|
380
|
+
if (options === 'cancel') {
|
|
353
381
|
var reUploadFileInfo = _this.state.uploadSuccessFiles[index];
|
|
354
382
|
reUploadFileInfo.requestXHR.abort();
|
|
355
383
|
}
|
|
356
384
|
|
|
357
|
-
if (options ===
|
|
385
|
+
if (options === 'delete' || options === 'cancel') {
|
|
358
386
|
var uploadResultFiles = _toConsumableArray(_this.state.uploadSuccessFiles);
|
|
359
387
|
|
|
360
388
|
var deleteFiles = uploadResultFiles[index];
|
|
@@ -370,11 +398,11 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
370
398
|
_this.setState({
|
|
371
399
|
uploadSuccessFiles: uploadResultFiles
|
|
372
400
|
});
|
|
373
|
-
} else if (options ===
|
|
401
|
+
} else if (options === 'preview') {
|
|
374
402
|
var imgIndex = _this.getImgIndex(index);
|
|
375
403
|
|
|
376
404
|
_this.refs.imgViewerRef.show(imgIndex);
|
|
377
|
-
} else if (options ===
|
|
405
|
+
} else if (options === 'reupload') {
|
|
378
406
|
var _reUploadFileInfo = _this.state.uploadSuccessFiles[index];
|
|
379
407
|
var reUploadFile = _this.state.selectFiles[_reUploadFileInfo.FileName];
|
|
380
408
|
|
|
@@ -465,7 +493,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
465
493
|
className = _this$props3.className,
|
|
466
494
|
style = _this$props3.style,
|
|
467
495
|
_this$props3$attachme = _this$props3.attachmentTipText,
|
|
468
|
-
attachmentTipText = _this$props3$attachme === void 0 ? (0, _getLocale.getLocale)(
|
|
496
|
+
attachmentTipText = _this$props3$attachme === void 0 ? (0, _getLocale.getLocale)('OKR_MyO_KRP_Draganddropu') : _this$props3$attachme;
|
|
469
497
|
var uploadSuccessFiles = this.state.uploadSuccessFiles;
|
|
470
498
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
471
499
|
container: document.body,
|
|
@@ -483,7 +511,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
483
511
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
484
512
|
ref: "uploader-trigger",
|
|
485
513
|
style: {
|
|
486
|
-
cursor:
|
|
514
|
+
cursor: 'pointer'
|
|
487
515
|
}
|
|
488
516
|
}, children), /*#__PURE__*/_react["default"].createElement("input", {
|
|
489
517
|
type: "file",
|
|
@@ -491,7 +519,7 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
|
|
|
491
519
|
className: "upload_file_input",
|
|
492
520
|
multiple: this.props.multiple,
|
|
493
521
|
style: {
|
|
494
|
-
display:
|
|
522
|
+
display: 'none'
|
|
495
523
|
},
|
|
496
524
|
onChange: this.onFileInputChange
|
|
497
525
|
}))), this.renderUploadList(uploadSuccessFiles));
|
|
@@ -507,7 +535,7 @@ Upload.defaultProps = {
|
|
|
507
535
|
fileSizeLimit: 50,
|
|
508
536
|
filesTotal: 50,
|
|
509
537
|
multiple: true,
|
|
510
|
-
attachmentPreviewBox:
|
|
538
|
+
attachmentPreviewBox: 'MBlog__attachmentViewBox'
|
|
511
539
|
};
|
|
512
540
|
var _default = Upload;
|
|
513
541
|
exports["default"] = _default;
|
|
@@ -59,7 +59,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
59
59
|
_props$onSelect = props.onSelect,
|
|
60
60
|
onSelect = _props$onSelect === void 0 ? function () {} : _props$onSelect,
|
|
61
61
|
_props$position = props.position,
|
|
62
|
-
position = _props$position === void 0 ?
|
|
62
|
+
position = _props$position === void 0 ? 'bottomRight' : _props$position,
|
|
63
63
|
_props$selectNodes = props.selectNodes,
|
|
64
64
|
selectNodes = _props$selectNodes === void 0 ? defauleSelectNodes : _props$selectNodes,
|
|
65
65
|
sourceFrom = props.sourceFrom,
|
|
@@ -67,7 +67,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
67
67
|
_props$auth = props.auth,
|
|
68
68
|
auth = _props$auth === void 0 ? false : _props$auth,
|
|
69
69
|
_props$placeholder = props.placeholder,
|
|
70
|
-
placeholder = _props$placeholder === void 0 ? (0, _getLocale.getLocale)(
|
|
70
|
+
placeholder = _props$placeholder === void 0 ? (0, _getLocale.getLocale)('Mod_Pleaseselect') : _props$placeholder,
|
|
71
71
|
authType = props.authType,
|
|
72
72
|
getDepartRoot = props.getDepartRoot,
|
|
73
73
|
_props$destroyPopupOn = props.destroyPopupOnHide,
|
|
@@ -93,7 +93,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
93
93
|
_onPopupVisibleChange = props.onPopupVisibleChange,
|
|
94
94
|
popClass = props.popClass,
|
|
95
95
|
_props$searchWord = props.searchWord,
|
|
96
|
-
searchWord = _props$searchWord === void 0 ?
|
|
96
|
+
searchWord = _props$searchWord === void 0 ? '' : _props$searchWord,
|
|
97
97
|
_props$showSearchInpu = props.showSearchInput,
|
|
98
98
|
showSearchInput = _props$showSearchInpu === void 0 ? true : _props$showSearchInpu,
|
|
99
99
|
getPopupContainer = props.getPopupContainer,
|
|
@@ -112,7 +112,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
112
112
|
selected = _useState2[0],
|
|
113
113
|
setSelected = _useState2[1];
|
|
114
114
|
|
|
115
|
-
var _useState3 = (0, _react.useState)(
|
|
115
|
+
var _useState3 = (0, _react.useState)(''),
|
|
116
116
|
_useState4 = _slicedToArray(_useState3, 2),
|
|
117
117
|
selectedText = _useState4[0],
|
|
118
118
|
setSelectedText = _useState4[1];
|
|
@@ -136,7 +136,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
136
136
|
var users = selectNodes.users;
|
|
137
137
|
(groups || []).forEach(function (data) {
|
|
138
138
|
selected.push({
|
|
139
|
-
nodeType:
|
|
139
|
+
nodeType: 'group',
|
|
140
140
|
id: data.id,
|
|
141
141
|
data: data
|
|
142
142
|
});
|
|
@@ -145,7 +145,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
145
145
|
});
|
|
146
146
|
(departments || []).forEach(function (data) {
|
|
147
147
|
selected.push({
|
|
148
|
-
nodeType:
|
|
148
|
+
nodeType: 'depart',
|
|
149
149
|
id: data.id,
|
|
150
150
|
data: data
|
|
151
151
|
});
|
|
@@ -157,7 +157,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
157
157
|
});
|
|
158
158
|
(users || []).forEach(function (data) {
|
|
159
159
|
selected.push({
|
|
160
|
-
nodeType:
|
|
160
|
+
nodeType: 'person',
|
|
161
161
|
id: "".concat(data.userId),
|
|
162
162
|
data: data
|
|
163
163
|
});
|
|
@@ -167,7 +167,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
167
167
|
name: data.name
|
|
168
168
|
}));
|
|
169
169
|
});
|
|
170
|
-
var text = texts.join(
|
|
170
|
+
var text = texts.join('、'); // if (!text) text = placeholder;
|
|
171
171
|
|
|
172
172
|
setSelectedText(text);
|
|
173
173
|
setJsxDomValues(jsxDomValues);
|
|
@@ -180,7 +180,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
180
180
|
|
|
181
181
|
(0, _react.useEffect)(function () {
|
|
182
182
|
if (getDepartRoot) {
|
|
183
|
-
(0, _requestApis.getTreeData)(
|
|
183
|
+
(0, _requestApis.getTreeData)('-1', {
|
|
184
184
|
departOnly: departOnly,
|
|
185
185
|
auth: auth,
|
|
186
186
|
isGetRoot: isGetRoot,
|
|
@@ -191,7 +191,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
191
191
|
for (var i = 0; i < departs.length; i++) {
|
|
192
192
|
var it = departs[i];
|
|
193
193
|
|
|
194
|
-
if (it.id ==
|
|
194
|
+
if (it.id == '-1') {
|
|
195
195
|
rootNode = it;
|
|
196
196
|
break;
|
|
197
197
|
}
|
|
@@ -215,7 +215,6 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
215
215
|
});
|
|
216
216
|
|
|
217
217
|
var onOkHandler = function onOkHandler(selectNodes, e) {
|
|
218
|
-
debugger;
|
|
219
218
|
setVisible(false);
|
|
220
219
|
setSelected(selectNodes);
|
|
221
220
|
var texts = [];
|
|
@@ -226,7 +225,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
226
225
|
var jsxDomValues = [];
|
|
227
226
|
selectNodes.forEach(function (item) {
|
|
228
227
|
switch (item.nodeType) {
|
|
229
|
-
case
|
|
228
|
+
case 'person':
|
|
230
229
|
users.push(item.data);
|
|
231
230
|
texts.push(item.data.name);
|
|
232
231
|
jsxDomValues.push( /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
|
|
@@ -235,7 +234,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
235
234
|
}));
|
|
236
235
|
break;
|
|
237
236
|
|
|
238
|
-
case
|
|
237
|
+
case 'depart':
|
|
239
238
|
departments.push(item.data);
|
|
240
239
|
texts.push(item.data.name);
|
|
241
240
|
jsxDomValues.push( /*#__PURE__*/_react["default"].createElement(_openData.OpenDepartmentName, {
|
|
@@ -244,7 +243,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
244
243
|
}));
|
|
245
244
|
break;
|
|
246
245
|
|
|
247
|
-
case
|
|
246
|
+
case 'group':
|
|
248
247
|
groups.push(item.data);
|
|
249
248
|
texts.push(item.data.name);
|
|
250
249
|
jsxDomValues.push( /*#__PURE__*/_react["default"].createElement("span", null, item.data.name));
|
|
@@ -269,7 +268,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
269
268
|
onSelect(selectNodes, wechartOpts, e);
|
|
270
269
|
}
|
|
271
270
|
|
|
272
|
-
var text = texts.join(
|
|
271
|
+
var text = texts.join('、'); // if (!text) text = placeholder;
|
|
273
272
|
|
|
274
273
|
setSelectedText(text);
|
|
275
274
|
setJsxDomValues(jsxDomValues);
|