ls-pro-common 1.0.84 → 1.0.85

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.
@@ -387,6 +387,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
387
387
  arrowPointAtCenter: arrowPointAtCenter
388
388
  }, /*#__PURE__*/React.createElement(MoreOutlined, {
389
389
  onClick: function onClick(e) {
390
+ if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
390
391
  setVisible(true);
391
392
  }
392
393
  })),
@@ -427,6 +428,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
427
428
  arrowPointAtCenter: arrowPointAtCenter
428
429
  }, /*#__PURE__*/React.createElement(MoreOutlined, {
429
430
  onClick: function onClick(e) {
431
+ if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
430
432
  setVisible(true);
431
433
  }
432
434
  })),
@@ -1,44 +1,44 @@
1
1
  body {
2
- --ant-primary-color: #1869ed;
3
- --ant-primary-color-hover: #418efa;
4
- --ant-primary-color-active: #0a4cc7;
5
- --ant-primary-color-outline: rgba(24, 105, 237, 0.2);
6
- --ant-primary-1: #e6f4ff;
7
- --ant-primary-2: #bddfff;
8
- --ant-primary-3: #94c8ff;
9
- --ant-primary-4: #6baeff;
10
- --ant-primary-5: #418efa;
11
- --ant-primary-6: #1869ed;
12
- --ant-primary-7: #0a4cc7;
13
- --ant-primary-color-deprecated-pure: #bed5fa;
14
- --ant-primary-color-deprecated-l-35: #bed5fa;
15
- --ant-primary-color-deprecated-l-20: #77a6f4;
16
- --ant-primary-color-deprecated-t-20: #4687f1;
17
- --ant-primary-color-deprecated-t-50: #8cb4f6;
18
- --ant-primary-color-deprecated-f-12: rgba(24, 105, 237, 0.12);
2
+ --ant-primary-color : #1869ed;
3
+ --ant-primary-color-hover : #418efa;
4
+ --ant-primary-color-active : #0a4cc7;
5
+ --ant-primary-color-outline : rgba(24, 105, 237, 0.2);
6
+ --ant-primary-1 : #e6f4ff;
7
+ --ant-primary-2 : #bddfff;
8
+ --ant-primary-3 : #94c8ff;
9
+ --ant-primary-4 : #6baeff;
10
+ --ant-primary-5 : #418efa;
11
+ --ant-primary-6 : #1869ed;
12
+ --ant-primary-7 : #0a4cc7;
13
+ --ant-primary-color-deprecated-pure : #bed5fa;
14
+ --ant-primary-color-deprecated-l-35 : #bed5fa;
15
+ --ant-primary-color-deprecated-l-20 : #77a6f4;
16
+ --ant-primary-color-deprecated-t-20 : #4687f1;
17
+ --ant-primary-color-deprecated-t-50 : #8cb4f6;
18
+ --ant-primary-color-deprecated-f-12 : rgba(24, 105, 237, 0.12);
19
19
  --ant-primary-color-active-deprecated-f-30: rgba(230, 244, 255, 0.3);
20
20
  --ant-primary-color-active-deprecated-d-02: #dcf0ff;
21
- --ant-success-color: #52c41a;
22
- --ant-success-color-hover: #73d13d;
23
- --ant-success-color-active: #389e0d;
24
- --ant-success-color-outline: rgba(82, 196, 26, 0.2);
25
- --ant-success-color-deprecated-bg: #f6ffed;
26
- --ant-success-color-deprecated-border: #b7eb8f;
27
- --ant-error-color: #ff4d4f;
28
- --ant-error-color-hover: #ff7875;
29
- --ant-error-color-active: #d9363e;
30
- --ant-error-color-outline: rgba(255, 77, 79, 0.2);
31
- --ant-error-color-deprecated-bg: #fff2f0;
32
- --ant-error-color-deprecated-border: #ffccc7;
33
- --ant-warning-color: #faad14;
34
- --ant-warning-color-hover: #ffc53d;
35
- --ant-warning-color-active: #d48806;
36
- --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
37
- --ant-warning-color-deprecated-bg: #fffbe6;
38
- --ant-warning-color-deprecated-border: #ffe58f;
39
- --ant-info-color: #1869ed;
40
- --ant-info-color-deprecated-bg: #e6f4ff;
41
- --ant-info-color-deprecated-border: #94c8ff;
21
+ --ant-success-color : #52c41a;
22
+ --ant-success-color-hover : #73d13d;
23
+ --ant-success-color-active : #389e0d;
24
+ --ant-success-color-outline : rgba(82, 196, 26, 0.2);
25
+ --ant-success-color-deprecated-bg : #f6ffed;
26
+ --ant-success-color-deprecated-border : #b7eb8f;
27
+ --ant-error-color : #ff4d4f;
28
+ --ant-error-color-hover : #ff7875;
29
+ --ant-error-color-active : #d9363e;
30
+ --ant-error-color-outline : rgba(255, 77, 79, 0.2);
31
+ --ant-error-color-deprecated-bg : #fff2f0;
32
+ --ant-error-color-deprecated-border : #ffccc7;
33
+ --ant-warning-color : #faad14;
34
+ --ant-warning-color-hover : #ffc53d;
35
+ --ant-warning-color-active : #d48806;
36
+ --ant-warning-color-outline : rgba(250, 173, 20, 0.2);
37
+ --ant-warning-color-deprecated-bg : #fffbe6;
38
+ --ant-warning-color-deprecated-border : #ffe58f;
39
+ --ant-info-color : #1869ed;
40
+ --ant-info-color-deprecated-bg : #e6f4ff;
41
+ --ant-info-color-deprecated-border : #94c8ff;
42
42
 
43
43
  // --ant-primary-color : #4997E6;
44
44
  // --ant-primary-color-hover : #74b7f2;
@@ -335,4 +335,11 @@ a:hover {
335
335
  .ant-input-clear-icon {
336
336
  visibility: visible;
337
337
  }
338
+ }
339
+
340
+ .ant-modal-confirm-body {
341
+ .ant-modal-confirm-content {
342
+ max-height: 60vh;
343
+ overflow : auto;
344
+ }
338
345
  }
@@ -100,11 +100,8 @@ export declare const showError: (text: string) => void;
100
100
  export declare const showWarn: (text: string) => void;
101
101
  /** @name 显示成功 */
102
102
  export declare const showSuccess: (text: string) => void;
103
- export declare const showAlert: (text: React.ReactDOM, title?: string, type?: 'error' | 'info' | 'success' | 'warn') => {
104
- destroy: () => void;
105
- update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
106
- };
107
- export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => void;
103
+ export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn') => Promise<unknown>;
104
+ export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => Promise<unknown>;
108
105
  export declare const exitAlert: () => void;
109
106
  /** @name 显示确认 */
110
107
  export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;
package/es/utils/index.js CHANGED
@@ -226,8 +226,13 @@ export var clearCache = function clearCache(key) {
226
226
  session ? sessionStorage.clear() : localStorage.clear();
227
227
  }
228
228
  };
229
+
230
+ _message.config({
231
+ maxCount: 1
232
+ });
229
233
  /** @name 显示错误 */
230
234
 
235
+
231
236
  export var showError = function showError(text) {
232
237
  _message.error(text);
233
238
  };
@@ -244,32 +249,22 @@ export var showSuccess = function showSuccess(text) {
244
249
  export var showAlert = function showAlert(text) {
245
250
  var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
246
251
  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
247
-
248
- if (type === 'success') {
249
- return _Modal.success({
250
- title: title,
251
- content: text
252
- });
253
- } else if (type === 'error') {
254
- return _Modal.error({
255
- title: title,
256
- content: text
257
- });
258
- } else if (type === 'warn') {
259
- return _Modal.warn({
252
+ return new Promise(function (resolve, reject) {
253
+ _Modal[type]({
254
+ content: text,
260
255
  title: title,
261
- content: text
256
+ onOk: function onOk() {
257
+ resolve(true);
258
+ },
259
+ onCancel: function onCancel() {
260
+ reject(false);
261
+ }
262
262
  });
263
- }
264
-
265
- return _Modal.info({
266
- title: title,
267
- content: text
268
263
  });
269
264
  };
270
265
  export var httpError = function httpError(retMsg, retCode, faultCode, url) {
271
266
  var msg = /*#__PURE__*/React.createElement(React.Fragment, null, "\u9519\u8BEF\u539F\u56E0:", /*#__PURE__*/React.createElement("b", null, retMsg), /*#__PURE__*/React.createElement("br", null), "\u9519\u8BEF\u7801:", /*#__PURE__*/React.createElement("b", null, retCode), /*#__PURE__*/React.createElement("br", null), "\u6545\u969C\u7801:", /*#__PURE__*/React.createElement("b", null, faultCode));
272
- showAlert(msg, '请求接口出错', 'error');
267
+ return showAlert(msg, '请求接口出错', 'error');
273
268
  };
274
269
  export var exitAlert = function exitAlert() {
275
270
  _Modal.destroyAll();
@@ -417,6 +417,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
417
417
  arrowPointAtCenter: arrowPointAtCenter
418
418
  }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, {
419
419
  onClick: function onClick(e) {
420
+ if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
420
421
  setVisible(true);
421
422
  }
422
423
  })),
@@ -457,6 +458,7 @@ var InputTable = /*#__PURE__*/_react.default.forwardRef(function (prop, ref) {
457
458
  arrowPointAtCenter: arrowPointAtCenter
458
459
  }, /*#__PURE__*/_react.default.createElement(_icons.MoreOutlined, {
459
460
  onClick: function onClick(e) {
461
+ if (rest.disabled || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.disabled)) return;
460
462
  setVisible(true);
461
463
  }
462
464
  })),
@@ -1,44 +1,44 @@
1
1
  body {
2
- --ant-primary-color: #1869ed;
3
- --ant-primary-color-hover: #418efa;
4
- --ant-primary-color-active: #0a4cc7;
5
- --ant-primary-color-outline: rgba(24, 105, 237, 0.2);
6
- --ant-primary-1: #e6f4ff;
7
- --ant-primary-2: #bddfff;
8
- --ant-primary-3: #94c8ff;
9
- --ant-primary-4: #6baeff;
10
- --ant-primary-5: #418efa;
11
- --ant-primary-6: #1869ed;
12
- --ant-primary-7: #0a4cc7;
13
- --ant-primary-color-deprecated-pure: #bed5fa;
14
- --ant-primary-color-deprecated-l-35: #bed5fa;
15
- --ant-primary-color-deprecated-l-20: #77a6f4;
16
- --ant-primary-color-deprecated-t-20: #4687f1;
17
- --ant-primary-color-deprecated-t-50: #8cb4f6;
18
- --ant-primary-color-deprecated-f-12: rgba(24, 105, 237, 0.12);
2
+ --ant-primary-color : #1869ed;
3
+ --ant-primary-color-hover : #418efa;
4
+ --ant-primary-color-active : #0a4cc7;
5
+ --ant-primary-color-outline : rgba(24, 105, 237, 0.2);
6
+ --ant-primary-1 : #e6f4ff;
7
+ --ant-primary-2 : #bddfff;
8
+ --ant-primary-3 : #94c8ff;
9
+ --ant-primary-4 : #6baeff;
10
+ --ant-primary-5 : #418efa;
11
+ --ant-primary-6 : #1869ed;
12
+ --ant-primary-7 : #0a4cc7;
13
+ --ant-primary-color-deprecated-pure : #bed5fa;
14
+ --ant-primary-color-deprecated-l-35 : #bed5fa;
15
+ --ant-primary-color-deprecated-l-20 : #77a6f4;
16
+ --ant-primary-color-deprecated-t-20 : #4687f1;
17
+ --ant-primary-color-deprecated-t-50 : #8cb4f6;
18
+ --ant-primary-color-deprecated-f-12 : rgba(24, 105, 237, 0.12);
19
19
  --ant-primary-color-active-deprecated-f-30: rgba(230, 244, 255, 0.3);
20
20
  --ant-primary-color-active-deprecated-d-02: #dcf0ff;
21
- --ant-success-color: #52c41a;
22
- --ant-success-color-hover: #73d13d;
23
- --ant-success-color-active: #389e0d;
24
- --ant-success-color-outline: rgba(82, 196, 26, 0.2);
25
- --ant-success-color-deprecated-bg: #f6ffed;
26
- --ant-success-color-deprecated-border: #b7eb8f;
27
- --ant-error-color: #ff4d4f;
28
- --ant-error-color-hover: #ff7875;
29
- --ant-error-color-active: #d9363e;
30
- --ant-error-color-outline: rgba(255, 77, 79, 0.2);
31
- --ant-error-color-deprecated-bg: #fff2f0;
32
- --ant-error-color-deprecated-border: #ffccc7;
33
- --ant-warning-color: #faad14;
34
- --ant-warning-color-hover: #ffc53d;
35
- --ant-warning-color-active: #d48806;
36
- --ant-warning-color-outline: rgba(250, 173, 20, 0.2);
37
- --ant-warning-color-deprecated-bg: #fffbe6;
38
- --ant-warning-color-deprecated-border: #ffe58f;
39
- --ant-info-color: #1869ed;
40
- --ant-info-color-deprecated-bg: #e6f4ff;
41
- --ant-info-color-deprecated-border: #94c8ff;
21
+ --ant-success-color : #52c41a;
22
+ --ant-success-color-hover : #73d13d;
23
+ --ant-success-color-active : #389e0d;
24
+ --ant-success-color-outline : rgba(82, 196, 26, 0.2);
25
+ --ant-success-color-deprecated-bg : #f6ffed;
26
+ --ant-success-color-deprecated-border : #b7eb8f;
27
+ --ant-error-color : #ff4d4f;
28
+ --ant-error-color-hover : #ff7875;
29
+ --ant-error-color-active : #d9363e;
30
+ --ant-error-color-outline : rgba(255, 77, 79, 0.2);
31
+ --ant-error-color-deprecated-bg : #fff2f0;
32
+ --ant-error-color-deprecated-border : #ffccc7;
33
+ --ant-warning-color : #faad14;
34
+ --ant-warning-color-hover : #ffc53d;
35
+ --ant-warning-color-active : #d48806;
36
+ --ant-warning-color-outline : rgba(250, 173, 20, 0.2);
37
+ --ant-warning-color-deprecated-bg : #fffbe6;
38
+ --ant-warning-color-deprecated-border : #ffe58f;
39
+ --ant-info-color : #1869ed;
40
+ --ant-info-color-deprecated-bg : #e6f4ff;
41
+ --ant-info-color-deprecated-border : #94c8ff;
42
42
 
43
43
  // --ant-primary-color : #4997E6;
44
44
  // --ant-primary-color-hover : #74b7f2;
@@ -335,4 +335,11 @@ a:hover {
335
335
  .ant-input-clear-icon {
336
336
  visibility: visible;
337
337
  }
338
+ }
339
+
340
+ .ant-modal-confirm-body {
341
+ .ant-modal-confirm-content {
342
+ max-height: 60vh;
343
+ overflow : auto;
344
+ }
338
345
  }
@@ -100,11 +100,8 @@ export declare const showError: (text: string) => void;
100
100
  export declare const showWarn: (text: string) => void;
101
101
  /** @name 显示成功 */
102
102
  export declare const showSuccess: (text: string) => void;
103
- export declare const showAlert: (text: React.ReactDOM, title?: string, type?: 'error' | 'info' | 'success' | 'warn') => {
104
- destroy: () => void;
105
- update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
106
- };
107
- export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => void;
103
+ export declare const showAlert: (text: React.ReactDOM | string, title?: string, type?: 'error' | 'info' | 'success' | 'warn') => Promise<unknown>;
104
+ export declare const httpError: (retMsg?: string | undefined, retCode?: string | undefined, faultCode?: string | undefined, url?: string | undefined) => Promise<unknown>;
108
105
  export declare const exitAlert: () => void;
109
106
  /** @name 显示确认 */
110
107
  export declare const showConfirm: (text: string, title?: string) => Promise<unknown>;
@@ -316,11 +316,15 @@ var clearCache = function clearCache(key) {
316
316
  session ? sessionStorage.clear() : localStorage.clear();
317
317
  }
318
318
  };
319
- /** @name 显示错误 */
320
-
321
319
 
322
320
  exports.clearCache = clearCache;
323
321
 
322
+ _message2.default.config({
323
+ maxCount: 1
324
+ });
325
+ /** @name 显示错误 */
326
+
327
+
324
328
  var showError = function showError(text) {
325
329
  _message2.default.error(text);
326
330
  };
@@ -346,27 +350,17 @@ exports.showSuccess = showSuccess;
346
350
  var showAlert = function showAlert(text) {
347
351
  var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
348
352
  var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
349
-
350
- if (type === 'success') {
351
- return _modal.default.success({
352
- title: title,
353
- content: text
354
- });
355
- } else if (type === 'error') {
356
- return _modal.default.error({
357
- title: title,
358
- content: text
359
- });
360
- } else if (type === 'warn') {
361
- return _modal.default.warn({
353
+ return new Promise(function (resolve, reject) {
354
+ _modal.default[type]({
355
+ content: text,
362
356
  title: title,
363
- content: text
357
+ onOk: function onOk() {
358
+ resolve(true);
359
+ },
360
+ onCancel: function onCancel() {
361
+ reject(false);
362
+ }
364
363
  });
365
- }
366
-
367
- return _modal.default.info({
368
- title: title,
369
- content: text
370
364
  });
371
365
  };
372
366
 
@@ -375,7 +369,7 @@ exports.showAlert = showAlert;
375
369
  var httpError = function httpError(retMsg, retCode, faultCode, url) {
376
370
  var msg = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, "\u9519\u8BEF\u539F\u56E0:", /*#__PURE__*/_react.default.createElement("b", null, retMsg), /*#__PURE__*/_react.default.createElement("br", null), "\u9519\u8BEF\u7801:", /*#__PURE__*/_react.default.createElement("b", null, retCode), /*#__PURE__*/_react.default.createElement("br", null), "\u6545\u969C\u7801:", /*#__PURE__*/_react.default.createElement("b", null, faultCode));
377
371
 
378
- showAlert(msg, '请求接口出错', 'error');
372
+ return showAlert(msg, '请求接口出错', 'error');
379
373
  };
380
374
 
381
375
  exports.httpError = httpError;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ls-pro-common",
3
- "version": "1.0.84",
3
+ "version": "1.0.85",
4
4
  "description": "ls-pro-common",
5
5
  "keywords": [
6
6
  "antd",
@@ -27,7 +27,7 @@
27
27
  ],
28
28
  "dependencies": {
29
29
  "@ant-design/icons": "^4.3.0",
30
- "ls-pro-table": "2.62.62",
30
+ "ls-pro-table": "2.62.63",
31
31
  "ls-pro-form": "1.52.34",
32
32
  "ls-pro-descriptions":"^1.10.33",
33
33
  "@babel/runtime": "^7.16.3",