antd-management-fast-framework 1.12.71 → 1.12.72
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/es/utils/actionAssist.d.ts +5 -1
- package/es/utils/actionAssist.js +172 -91
- package/package.json +2 -2
|
@@ -14,7 +14,7 @@ export function handleItem({ target, dataId, compareDataIdHandler, handler }: an
|
|
|
14
14
|
/**
|
|
15
15
|
* remote assess core
|
|
16
16
|
*/
|
|
17
|
-
export function actionCore({ api, params, apiDataConvert, target, handleData, successCallback, successMessage, successMessageBuilder, showProcessing, textProcessing, }: {
|
|
17
|
+
export function actionCore({ api, params, apiDataConvert, target, handleData, successCallback, successMessage, successMessageBuilder, showProcessing, textProcessing, delay, setProgressingFirst, beforeProcess, completeProcess, }: {
|
|
18
18
|
api: any;
|
|
19
19
|
params: any;
|
|
20
20
|
apiDataConvert?: null | undefined;
|
|
@@ -25,6 +25,10 @@ export function actionCore({ api, params, apiDataConvert, target, handleData, su
|
|
|
25
25
|
successMessageBuilder?: null | undefined;
|
|
26
26
|
showProcessing?: boolean | undefined;
|
|
27
27
|
textProcessing?: string | undefined;
|
|
28
|
+
delay?: number | undefined;
|
|
29
|
+
setProgressingFirst?: boolean | undefined;
|
|
30
|
+
beforeProcess?: null | undefined;
|
|
31
|
+
completeProcess?: null | undefined;
|
|
28
32
|
}): Promise<void>;
|
|
29
33
|
/**
|
|
30
34
|
* confirmActionCore
|
package/es/utils/actionAssist.js
CHANGED
|
@@ -139,21 +139,16 @@ function handleItem(_ref2) {
|
|
|
139
139
|
function actionCore(_x) {
|
|
140
140
|
return _actionCore.apply(this, arguments);
|
|
141
141
|
}
|
|
142
|
-
/**
|
|
143
|
-
* confirmActionCore
|
|
144
|
-
* @param {*} param0
|
|
145
|
-
*/
|
|
146
|
-
|
|
147
142
|
|
|
148
143
|
function _actionCore() {
|
|
149
|
-
_actionCore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(
|
|
150
|
-
var api, params,
|
|
144
|
+
_actionCore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref4) {
|
|
145
|
+
var api, params, _ref4$apiDataConvert, apiDataConvert, target, handleData, successCallback, _ref4$successMessage, successMessage, _ref4$successMessageB, successMessageBuilder, _ref4$showProcessing, showProcessing, _ref4$textProcessing, textProcessing, _ref4$delay, delay, _ref4$setProgressingF, setProgressingFirst, _ref4$beforeProcess, beforeProcess, _ref4$completeProcess, completeProcess, text, dispatch, key;
|
|
151
146
|
|
|
152
147
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
153
148
|
while (1) {
|
|
154
149
|
switch (_context.prev = _context.next) {
|
|
155
150
|
case 0:
|
|
156
|
-
api =
|
|
151
|
+
api = _ref4.api, params = _ref4.params, _ref4$apiDataConvert = _ref4.apiDataConvert, apiDataConvert = _ref4$apiDataConvert === void 0 ? null : _ref4$apiDataConvert, target = _ref4.target, handleData = _ref4.handleData, successCallback = _ref4.successCallback, _ref4$successMessage = _ref4.successMessage, successMessage = _ref4$successMessage === void 0 ? '数据已经操作成功，请进行后续操作。' : _ref4$successMessage, _ref4$successMessageB = _ref4.successMessageBuilder, successMessageBuilder = _ref4$successMessageB === void 0 ? null : _ref4$successMessageB, _ref4$showProcessing = _ref4.showProcessing, showProcessing = _ref4$showProcessing === void 0 ? true : _ref4$showProcessing, _ref4$textProcessing = _ref4.textProcessing, textProcessing = _ref4$textProcessing === void 0 ? '处理中，请稍后' : _ref4$textProcessing, _ref4$delay = _ref4.delay, delay = _ref4$delay === void 0 ? 400 : _ref4$delay, _ref4$setProgressingF = _ref4.setProgressingFirst, setProgressingFirst = _ref4$setProgressingF === void 0 ? true : _ref4$setProgressingF, _ref4$beforeProcess = _ref4.beforeProcess, beforeProcess = _ref4$beforeProcess === void 0 ? null : _ref4$beforeProcess, _ref4$completeProcess = _ref4.completeProcess, completeProcess = _ref4$completeProcess === void 0 ? null : _ref4$completeProcess;
|
|
157
152
|
|
|
158
153
|
if ((handleData || null) == null) {
|
|
159
154
|
text = 'actionCore : handleData not allow null';
|
|
@@ -208,92 +203,80 @@ function _actionCore() {
|
|
|
208
203
|
});
|
|
209
204
|
}
|
|
210
205
|
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
}
|
|
206
|
+
if ((0, _tools.isFunction)(beforeProcess)) {
|
|
207
|
+
beforeProcess();
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
if (setProgressingFirst) {
|
|
214
211
|
target.setState({
|
|
215
|
-
|
|
212
|
+
processing: true
|
|
216
213
|
}, function () {
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
remoteData = _list$data$extra$data.data,
|
|
245
|
-
remoteExtraData = _list$data$extra$data.extra;
|
|
246
|
-
|
|
247
|
-
var messageText = successMessage;
|
|
248
|
-
|
|
249
|
-
if ((0, _tools.isFunction)(successMessageBuilder)) {
|
|
250
|
-
messageText = successMessageBuilder({
|
|
251
|
-
remoteListData: remoteListData || [],
|
|
252
|
-
remoteData: remoteData || null,
|
|
253
|
-
remoteExtraData: remoteExtraData || null,
|
|
254
|
-
remoteOriginal: data
|
|
255
|
-
});
|
|
256
|
-
}
|
|
257
|
-
|
|
258
|
-
if (!(0, _tools.stringIsNullOrWhiteSpace)(messageText)) {
|
|
259
|
-
(0, _tools.notifySuccess)(messageText);
|
|
260
|
-
}
|
|
261
|
-
|
|
262
|
-
if ((0, _tools.isFunction)(successCallback)) {
|
|
263
|
-
successCallback({
|
|
264
|
-
target: target,
|
|
265
|
-
handleData: handleData,
|
|
266
|
-
remoteListData: remoteListData || [],
|
|
267
|
-
remoteData: remoteData || null,
|
|
268
|
-
remoteExtraData: remoteExtraData || null,
|
|
269
|
-
remoteOriginal: data
|
|
270
|
-
});
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
|
|
274
|
-
target.setState({
|
|
275
|
-
processing: false,
|
|
276
|
-
dispatchComplete: true
|
|
277
|
-
});
|
|
278
|
-
}).catch(function (res) {
|
|
279
|
-
(0, _tools.recordObject)(res);
|
|
280
|
-
|
|
281
|
-
if (showProcessing) {
|
|
282
|
-
setTimeout(function () {
|
|
283
|
-
_message2.default.destroy(key);
|
|
284
|
-
}, 200);
|
|
285
|
-
}
|
|
286
|
-
|
|
287
|
-
target.setState({
|
|
288
|
-
processing: false,
|
|
289
|
-
dispatchComplete: true
|
|
214
|
+
target.setState({
|
|
215
|
+
dispatchComplete: false
|
|
216
|
+
}, function () {
|
|
217
|
+
delay <= 0 ? remoteAction({
|
|
218
|
+
dispatch: dispatch,
|
|
219
|
+
api: api,
|
|
220
|
+
params: params,
|
|
221
|
+
apiDataConvert: apiDataConvert,
|
|
222
|
+
successMessage: successMessage,
|
|
223
|
+
successMessageBuilder: successMessageBuilder,
|
|
224
|
+
showProcessing: showProcessing,
|
|
225
|
+
loadingKey: key,
|
|
226
|
+
successCallback: successCallback,
|
|
227
|
+
completeProcess: completeProcess
|
|
228
|
+
}) : setTimeout(function () {
|
|
229
|
+
// 延迟一定时间，优化界面呈现
|
|
230
|
+
remoteAction({
|
|
231
|
+
dispatch: dispatch,
|
|
232
|
+
api: api,
|
|
233
|
+
params: params,
|
|
234
|
+
apiDataConvert: apiDataConvert,
|
|
235
|
+
successMessage: successMessage,
|
|
236
|
+
successMessageBuilder: successMessageBuilder,
|
|
237
|
+
showProcessing: showProcessing,
|
|
238
|
+
loadingKey: key,
|
|
239
|
+
successCallback: successCallback,
|
|
240
|
+
completeProcess: completeProcess
|
|
290
241
|
});
|
|
242
|
+
}, delay);
|
|
243
|
+
});
|
|
244
|
+
});
|
|
245
|
+
} else {
|
|
246
|
+
target.setState({
|
|
247
|
+
processing: true,
|
|
248
|
+
dispatchComplete: false
|
|
249
|
+
}, function () {
|
|
250
|
+
delay <= 0 ? remoteAction({
|
|
251
|
+
dispatch: dispatch,
|
|
252
|
+
api: api,
|
|
253
|
+
params: params,
|
|
254
|
+
apiDataConvert: apiDataConvert,
|
|
255
|
+
successMessage: successMessage,
|
|
256
|
+
successMessageBuilder: successMessageBuilder,
|
|
257
|
+
showProcessing: showProcessing,
|
|
258
|
+
loadingKey: key,
|
|
259
|
+
successCallback: successCallback,
|
|
260
|
+
completeProcess: completeProcess
|
|
261
|
+
}) : setTimeout(function () {
|
|
262
|
+
// 延迟一定时间，优化界面呈现
|
|
263
|
+
remoteAction({
|
|
264
|
+
dispatch: dispatch,
|
|
265
|
+
api: api,
|
|
266
|
+
params: params,
|
|
267
|
+
apiDataConvert: apiDataConvert,
|
|
268
|
+
successMessage: successMessage,
|
|
269
|
+
successMessageBuilder: successMessageBuilder,
|
|
270
|
+
showProcessing: showProcessing,
|
|
271
|
+
loadingKey: key,
|
|
272
|
+
successCallback: successCallback,
|
|
273
|
+
completeProcess: completeProcess
|
|
291
274
|
});
|
|
292
|
-
},
|
|
275
|
+
}, delay);
|
|
293
276
|
});
|
|
294
|
-
}
|
|
277
|
+
}
|
|
295
278
|
|
|
296
|
-
case
|
|
279
|
+
case 15:
|
|
297
280
|
case "end":
|
|
298
281
|
return _context.stop();
|
|
299
282
|
}
|
|
@@ -303,6 +286,104 @@ function _actionCore() {
|
|
|
303
286
|
return _actionCore.apply(this, arguments);
|
|
304
287
|
}
|
|
305
288
|
|
|
289
|
+
function remoteAction(_ref3) {
|
|
290
|
+
var dispatch = _ref3.dispatch,
|
|
291
|
+
api = _ref3.api,
|
|
292
|
+
params = _ref3.params,
|
|
293
|
+
apiDataConvert = _ref3.apiDataConvert,
|
|
294
|
+
successMessage = _ref3.successMessage,
|
|
295
|
+
successMessageBuilder = _ref3.successMessageBuilder,
|
|
296
|
+
_ref3$showProcessing = _ref3.showProcessing,
|
|
297
|
+
showProcessing = _ref3$showProcessing === void 0 ? false : _ref3$showProcessing,
|
|
298
|
+
_ref3$loadingKey = _ref3.loadingKey,
|
|
299
|
+
loadingKey = _ref3$loadingKey === void 0 ? '' : _ref3$loadingKey,
|
|
300
|
+
successCallback = _ref3.successCallback,
|
|
301
|
+
_ref3$completeProcess = _ref3.completeProcess,
|
|
302
|
+
completeProcess = _ref3$completeProcess === void 0 ? null : _ref3$completeProcess;
|
|
303
|
+
(0, _tools.recordDebug)("modal access: ".concat(api));
|
|
304
|
+
dispatch({
|
|
305
|
+
type: api,
|
|
306
|
+
payload: params
|
|
307
|
+
}).then(function () {
|
|
308
|
+
if (showProcessing) {
|
|
309
|
+
setTimeout(function () {
|
|
310
|
+
_message2.default.destroy(loadingKey);
|
|
311
|
+
}, 200);
|
|
312
|
+
}
|
|
313
|
+
|
|
314
|
+
if (!(0, _tools.isFunction)(apiDataConvert)) {
|
|
315
|
+
throw new Error('actionCore params: apiDataConvert must be function');
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
var data = apiDataConvert(target.props);
|
|
319
|
+
var dataSuccess = data.dataSuccess;
|
|
320
|
+
|
|
321
|
+
if (dataSuccess) {
|
|
322
|
+
var _list$data$extra$data = _objectSpread(_objectSpread({}, {
|
|
323
|
+
list: [],
|
|
324
|
+
data: null,
|
|
325
|
+
extra: null
|
|
326
|
+
}), data),
|
|
327
|
+
remoteListData = _list$data$extra$data.list,
|
|
328
|
+
remoteData = _list$data$extra$data.data,
|
|
329
|
+
remoteExtraData = _list$data$extra$data.extra;
|
|
330
|
+
|
|
331
|
+
var messageText = successMessage;
|
|
332
|
+
|
|
333
|
+
if ((0, _tools.isFunction)(successMessageBuilder)) {
|
|
334
|
+
messageText = successMessageBuilder({
|
|
335
|
+
remoteListData: remoteListData || [],
|
|
336
|
+
remoteData: remoteData || null,
|
|
337
|
+
remoteExtraData: remoteExtraData || null,
|
|
338
|
+
remoteOriginal: data
|
|
339
|
+
});
|
|
340
|
+
}
|
|
341
|
+
|
|
342
|
+
if (!(0, _tools.stringIsNullOrWhiteSpace)(messageText)) {
|
|
343
|
+
(0, _tools.notifySuccess)(messageText);
|
|
344
|
+
}
|
|
345
|
+
|
|
346
|
+
if ((0, _tools.isFunction)(successCallback)) {
|
|
347
|
+
successCallback({
|
|
348
|
+
target: target,
|
|
349
|
+
handleData: handleData,
|
|
350
|
+
remoteListData: remoteListData || [],
|
|
351
|
+
remoteData: remoteData || null,
|
|
352
|
+
remoteExtraData: remoteExtraData || null,
|
|
353
|
+
remoteOriginal: data
|
|
354
|
+
});
|
|
355
|
+
}
|
|
356
|
+
}
|
|
357
|
+
|
|
358
|
+
target.setState({
|
|
359
|
+
processing: false,
|
|
360
|
+
dispatchComplete: true
|
|
361
|
+
});
|
|
362
|
+
}).catch(function (res) {
|
|
363
|
+
(0, _tools.recordObject)(res);
|
|
364
|
+
|
|
365
|
+
if (showProcessing) {
|
|
366
|
+
setTimeout(function () {
|
|
367
|
+
_message2.default.destroy(key);
|
|
368
|
+
}, 200);
|
|
369
|
+
}
|
|
370
|
+
|
|
371
|
+
target.setState({
|
|
372
|
+
processing: false,
|
|
373
|
+
dispatchComplete: true
|
|
374
|
+
});
|
|
375
|
+
|
|
376
|
+
if ((0, _tools.isFunction)(completeProcess)) {
|
|
377
|
+
completeProcess();
|
|
378
|
+
}
|
|
379
|
+
});
|
|
380
|
+
}
|
|
381
|
+
/**
|
|
382
|
+
* confirmActionCore
|
|
383
|
+
* @param {*} param0
|
|
384
|
+
*/
|
|
385
|
+
|
|
386
|
+
|
|
306
387
|
function confirmActionCore(_x2) {
|
|
307
388
|
return _confirmActionCore.apply(this, arguments);
|
|
308
389
|
}
|
|
@@ -315,14 +396,14 @@ function confirmActionCore(_x2) {
|
|
|
315
396
|
|
|
316
397
|
|
|
317
398
|
function _confirmActionCore() {
|
|
318
|
-
_confirmActionCore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(
|
|
319
|
-
var title, content,
|
|
399
|
+
_confirmActionCore = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
|
|
400
|
+
var title, content, _ref5$okText, okText, _ref5$okType, okType, _ref5$cancelText, cancelText, target, handleData, successCallback, _ref5$okAction, okAction, _ref5$successMessage, successMessage, _ref5$successMessageB, successMessageBuilder, _ref5$showProcessing, showProcessing, processing;
|
|
320
401
|
|
|
321
402
|
return _regeneratorRuntime().wrap(function _callee2$(_context2) {
|
|
322
403
|
while (1) {
|
|
323
404
|
switch (_context2.prev = _context2.next) {
|
|
324
405
|
case 0:
|
|
325
|
-
title =
|
|
406
|
+
title = _ref5.title, content = _ref5.content, _ref5$okText = _ref5.okText, okText = _ref5$okText === void 0 ? '确定' : _ref5$okText, _ref5$okType = _ref5.okType, okType = _ref5$okType === void 0 ? 'danger' : _ref5$okType, _ref5$cancelText = _ref5.cancelText, cancelText = _ref5$cancelText === void 0 ? '取消' : _ref5$cancelText, target = _ref5.target, handleData = _ref5.handleData, successCallback = _ref5.successCallback, _ref5$okAction = _ref5.okAction, okAction = _ref5$okAction === void 0 ? null : _ref5$okAction, _ref5$successMessage = _ref5.successMessage, successMessage = _ref5$successMessage === void 0 ? '数据已经操作成功，请进行后续操作。' : _ref5$successMessage, _ref5$successMessageB = _ref5.successMessageBuilder, successMessageBuilder = _ref5$successMessageB === void 0 ? null : _ref5$successMessageB, _ref5$showProcessing = _ref5.showProcessing, showProcessing = _ref5$showProcessing === void 0 ? true : _ref5$showProcessing;
|
|
326
407
|
|
|
327
408
|
if ((0, _tools.isFunction)(okAction)) {
|
|
328
409
|
_context2.next = 3;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "antd-management-fast-framework",
|
|
3
|
-
"version": "1.12.
|
|
3
|
+
"version": "1.12.72",
|
|
4
4
|
"description": "antd-management-fast-framework",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"antd-management-fast-framework"
|
|
@@ -221,7 +221,7 @@
|
|
|
221
221
|
"src/framework",
|
|
222
222
|
"src/utils"
|
|
223
223
|
],
|
|
224
|
-
"gitHead": "
|
|
224
|
+
"gitHead": "f1522f45eabeb108cd5fe5860093feea50734fa5",
|
|
225
225
|
"gitHooks": {
|
|
226
226
|
"pre-commit": "lint-staged"
|
|
227
227
|
}
|