ls-pro-common 3.1.4 → 3.1.6

package/dist/common.min.js.LICENSE.txt

@@ -4,6 +4,28 @@
 	http://jedwatson.github.io/classnames
 */
 
+/*!
+  Copyright (c) 2011, Yahoo! Inc. All rights reserved.
+  Code licensed under the BSD License:
+  http://developer.yahoo.com/yui/license.html
+  version: 2.9.0
+  */
+
+/*! *****************************************************************************
+  Copyright (c) Microsoft Corporation. All rights reserved.
+  Licensed under the Apache License, Version 2.0 (the "License"); you may not use
+  this file except in compliance with the License. You may obtain a copy of the
+  License at http://www.apache.org/licenses/LICENSE-2.0
+  
+  THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
+  WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
+  MERCHANTABLITY OR NON-INFRINGEMENT.
+  
+  See the Apache Version 2.0 License for specific language governing permissions
+  and limitations under the License.
+  ***************************************************************************** */
+
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -21,6 +43,15 @@ PERFORMANCE OF THIS SOFTWARE.
 
 /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */
 
+/**
+   * @fileOverview
+   * @name asn1-1.0.js
+   * @author Kenji Urushima kenji.urushima@gmail.com
+   * @version asn1 1.0.13 (2017-Jun-02)
+   * @since jsrsasign 2.1
+   * @license <a href="https://kjur.github.io/jsrsasign/license/">MIT License</a>
+   */
+
 /**
  * @license
  * Lodash <https://lodash.com/>

package/es/components/RecordLog/index.js

@@ -25,8 +25,7 @@ var RecordLog = function RecordLog(props) {
     recordKey = _props$recordKey === void 0 ? '' : _props$recordKey,
     _props$bizNo = props.bizNo,
     bizNo = _props$bizNo === void 0 ? '' : _props$bizNo,
-    _props$param = props.param,
-    param = _props$param === void 0 ? {} : _props$param,
+    param = props.param,
     _props$fieldsMap = props.fieldsMap,
     fieldsMap = _props$fieldsMap === void 0 ? {} : _props$fieldsMap,
     _props$showResourceNa = props.showResourceName,

package/es/hooks/useDtl/index.d.ts

@@ -1,5 +1,6 @@
 import type { ActionType } from 'ls-pro-table';
 import type { ProFormInstance } from 'ls-pro-form';
+import type { ApiResponse } from '../../typing';
 import type { SingleParamType } from '../useSingle';
 export declare type DtlParamType = SingleParamType & {
     /** 重置主表对象方法 */
@@ -40,7 +41,7 @@ declare function useDtl(dtlParam: DtlParamType): {
     onSaveMst: (values: any) => Promise<boolean>;
     onSaveMstDtl: (isDelete?: boolean) => Promise<boolean | undefined>;
     onRemoveMst: () => Promise<boolean | undefined>;
-    onExportDtl: (url: string, param: any) => Promise<boolean>;
+    onExportDtl: (url: string, param: any) => Promise<boolean | ApiResponse>;
     isAudit: () => boolean;
     onAudit: () => Promise<void>;
 };

package/es/hooks/useDtl/index.js

@@ -730,7 +730,7 @@ function useDtl(dtlParam) {
   var onExportDtl = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag6, result, _result$flag7;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag6, _result$flag7, _result$flag8, result, _result$flag9;
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -792,14 +792,14 @@ function useDtl(dtlParam) {
             return httpPost(url, param);
           case 10:
             result = _context9.sent;
-            if (!(result.data && typeof result.data === 'string')) {
+            if (!(result.data && typeof result.data === 'string' && ((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
               _context9.next = 14;
               break;
             }
             downloadFile(result.data);
             return _context9.abrupt("return", true);
           case 14:
-            if (!(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
+            if (!(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retCode) === '0')) {
               _context9.next = 19;
               break;
             }
@@ -807,21 +807,27 @@ function useDtl(dtlParam) {
             // showSuccess(result.flag?.retMsg || '导出成功');
             return _context9.abrupt("return", true);
           case 19:
-            showError(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retMsg) || '导出失败,请联系系统管理员');
+            if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) || '0')) {
+              _context9.next = 23;
+              break;
+            }
+            return _context9.abrupt("return", result);
+          case 23:
+            showError(((_result$flag9 = result.flag) === null || _result$flag9 === void 0 ? void 0 : _result$flag9.retMsg) || '导出失败,请联系系统管理员');
             return _context9.abrupt("return", false);
-          case 21:
-            _context9.next = 27;
+          case 25:
+            _context9.next = 31;
             break;
-          case 23:
-            _context9.prev = 23;
+          case 27:
+            _context9.prev = 27;
             _context9.t0 = _context9["catch"](7);
             showError(_context9.t0.message);
             return _context9.abrupt("return", false);
-          case 27:
+          case 31:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, null, [[7, 23]]);
+      }, _callee9, null, [[7, 27]]);
     }));
     return function onExportDtl(_x6, _x7) {
       return _ref9.apply(this, arguments);
@@ -830,7 +836,7 @@ function useDtl(dtlParam) {
   /** 审核按钮事件 */
   var onAudit = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-      var obj, _result$flag8, result;
+      var obj, _result$flag10, result;
       return _regeneratorRuntime.wrap(function _callee10$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
           case 0:
@@ -900,7 +906,7 @@ function useDtl(dtlParam) {
             }
             return _context10.abrupt("return");
           case 36:
-            if ((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) === '0') {
+            if ((result === null || result === void 0 ? void 0 : (_result$flag10 = result.flag) === null || _result$flag10 === void 0 ? void 0 : _result$flag10.retCode) === '0') {
               showSuccess(result.flag.retMsg || '审核成功');
               Object.assign(masterObject, result.data);
             }

package/es/hooks/useSingle/index.d.ts

@@ -44,7 +44,7 @@ declare function useSingle(inParam: SingleParamType): {
     onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>, isHistory: any) => Promise<any>;
     onAdd: (item: any) => Promise<void>;
     onEdit: (item: any) => Promise<void>;
-    onExport: (url: string, param: any) => Promise<boolean>;
+    onExport: (url: string, param: any) => Promise<boolean | ApiResponse>;
     onAudit: (row: any) => Promise<void>;
     resourceId: any;
     checkRight: (val: number) => boolean;

package/es/hooks/useSingle/index.js

@@ -528,7 +528,7 @@ function useSingle(inParam) {
   var onExport = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, _result$flag5;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, code, _result$flag5;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -590,37 +590,44 @@ function useSingle(inParam) {
             return httpPost(url, param, true, false);
           case 10:
             result = _context7.sent;
-            if (!(result.data && typeof result.data === 'string')) {
-              _context7.next = 14;
+            code = ((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) || '9009'; // 后端直接返回导出文件地址，直接打开相当于是下载
+            if (!(result.data && typeof result.data === 'string' && code === '0')) {
+              _context7.next = 15;
               break;
             }
             downloadFile(result.data);
             return _context7.abrupt("return", true);
-          case 14:
-            if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {
-              _context7.next = 19;
+          case 15:
+            if (!(code === '0')) {
+              _context7.next = 20;
               break;
             }
             // showSuccess(result.flag?.retMsg || '导出成功');
             exportProcess(result);
             return _context7.abrupt("return", true);
-          case 19:
+          case 20:
+            if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes(code)) {
+              _context7.next = 24;
+              break;
+            }
+            return _context7.abrupt("return", result);
+          case 24:
             showError(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出失败,请联系系统管理员');
             return _context7.abrupt("return", false);
-          case 21:
-            _context7.next = 28;
+          case 26:
+            _context7.next = 33;
             break;
-          case 23:
-            _context7.prev = 23;
+          case 28:
+            _context7.prev = 28;
             _context7.t0 = _context7["catch"](7);
             console.log(_context7.t0);
             showError(_context7.t0.message);
             return _context7.abrupt("return", false);
-          case 28:
+          case 33:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[7, 23]]);
+      }, _callee7, null, [[7, 28]]);
     }));
     return function onExport(_x9, _x10) {
       return _ref7.apply(this, arguments);

package/lib/components/RecordLog/index.js

@@ -25,8 +25,7 @@ var RecordLog = function RecordLog(props) {
     recordKey = _props$recordKey === void 0 ? '' : _props$recordKey,
     _props$bizNo = props.bizNo,
     bizNo = _props$bizNo === void 0 ? '' : _props$bizNo,
-    _props$param = props.param,
-    param = _props$param === void 0 ? {} : _props$param,
+    param = props.param,
     _props$fieldsMap = props.fieldsMap,
     fieldsMap = _props$fieldsMap === void 0 ? {} : _props$fieldsMap,
     _props$showResourceNa = props.showResourceName,

package/lib/hooks/useDtl/index.d.ts

@@ -1,5 +1,6 @@
 import type { ActionType } from 'ls-pro-table';
 import type { ProFormInstance } from 'ls-pro-form';
+import type { ApiResponse } from '../../typing';
 import type { SingleParamType } from '../useSingle';
 export declare type DtlParamType = SingleParamType & {
     /** 重置主表对象方法 */
@@ -40,7 +41,7 @@ declare function useDtl(dtlParam: DtlParamType): {
     onSaveMst: (values: any) => Promise<boolean>;
     onSaveMstDtl: (isDelete?: boolean) => Promise<boolean | undefined>;
     onRemoveMst: () => Promise<boolean | undefined>;
-    onExportDtl: (url: string, param: any) => Promise<boolean>;
+    onExportDtl: (url: string, param: any) => Promise<boolean | ApiResponse>;
     isAudit: () => boolean;
     onAudit: () => Promise<void>;
 };

package/lib/hooks/useDtl/index.js

@@ -730,7 +730,7 @@ function useDtl(dtlParam) {
   var onExportDtl = /*#__PURE__*/function () {
     var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag6, result, _result$flag7;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag6, _result$flag7, _result$flag8, result, _result$flag9;
       return _regeneratorRuntime.wrap(function _callee9$(_context9) {
         while (1) switch (_context9.prev = _context9.next) {
           case 0:
@@ -792,14 +792,14 @@ function useDtl(dtlParam) {
             return httpPost(url, param);
           case 10:
             result = _context9.sent;
-            if (!(result.data && typeof result.data === 'string')) {
+            if (!(result.data && typeof result.data === 'string' && ((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
               _context9.next = 14;
               break;
             }
             downloadFile(result.data);
             return _context9.abrupt("return", true);
           case 14:
-            if (!(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retCode) === '0')) {
+            if (!(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retCode) === '0')) {
               _context9.next = 19;
               break;
             }
@@ -807,21 +807,27 @@ function useDtl(dtlParam) {
             // showSuccess(result.flag?.retMsg || '导出成功');
             return _context9.abrupt("return", true);
           case 19:
-            showError(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retMsg) || '导出失败,请联系系统管理员');
+            if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) || '0')) {
+              _context9.next = 23;
+              break;
+            }
+            return _context9.abrupt("return", result);
+          case 23:
+            showError(((_result$flag9 = result.flag) === null || _result$flag9 === void 0 ? void 0 : _result$flag9.retMsg) || '导出失败,请联系系统管理员');
             return _context9.abrupt("return", false);
-          case 21:
-            _context9.next = 27;
+          case 25:
+            _context9.next = 31;
             break;
-          case 23:
-            _context9.prev = 23;
+          case 27:
+            _context9.prev = 27;
             _context9.t0 = _context9["catch"](7);
             showError(_context9.t0.message);
             return _context9.abrupt("return", false);
-          case 27:
+          case 31:
           case "end":
             return _context9.stop();
         }
-      }, _callee9, null, [[7, 23]]);
+      }, _callee9, null, [[7, 27]]);
     }));
     return function onExportDtl(_x6, _x7) {
       return _ref9.apply(this, arguments);
@@ -830,7 +836,7 @@ function useDtl(dtlParam) {
   /** 审核按钮事件 */
   var onAudit = /*#__PURE__*/function () {
     var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
-      var obj, _result$flag8, result;
+      var obj, _result$flag10, result;
       return _regeneratorRuntime.wrap(function _callee10$(_context10) {
         while (1) switch (_context10.prev = _context10.next) {
           case 0:
@@ -900,7 +906,7 @@ function useDtl(dtlParam) {
             }
             return _context10.abrupt("return");
           case 36:
-            if ((result === null || result === void 0 ? void 0 : (_result$flag8 = result.flag) === null || _result$flag8 === void 0 ? void 0 : _result$flag8.retCode) === '0') {
+            if ((result === null || result === void 0 ? void 0 : (_result$flag10 = result.flag) === null || _result$flag10 === void 0 ? void 0 : _result$flag10.retCode) === '0') {
               showSuccess(result.flag.retMsg || '审核成功');
               Object.assign(masterObject, result.data);
             }

package/lib/hooks/useSingle/index.d.ts

@@ -44,7 +44,7 @@ declare function useSingle(inParam: SingleParamType): {
     onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>, isHistory: any) => Promise<any>;
     onAdd: (item: any) => Promise<void>;
     onEdit: (item: any) => Promise<void>;
-    onExport: (url: string, param: any) => Promise<boolean>;
+    onExport: (url: string, param: any) => Promise<boolean | ApiResponse>;
     onAudit: (row: any) => Promise<void>;
     resourceId: any;
     checkRight: (val: number) => boolean;

package/lib/hooks/useSingle/index.js

@@ -528,7 +528,7 @@ function useSingle(inParam) {
   var onExport = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param) {
       var _param$exportColumns;
-      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, _result$flag5;
+      var searchArr, arr, otherArr, whereArr, where, _result$flag4, result, code, _result$flag5;
       return _regeneratorRuntime.wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -590,37 +590,44 @@ function useSingle(inParam) {
             return httpPost(url, param, true, false);
           case 10:
             result = _context7.sent;
-            if (!(result.data && typeof result.data === 'string')) {
-              _context7.next = 14;
+            code = ((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) || '9009'; // 后端直接返回导出文件地址，直接打开相当于是下载
+            if (!(result.data && typeof result.data === 'string' && code === '0')) {
+              _context7.next = 15;
               break;
             }
             downloadFile(result.data);
             return _context7.abrupt("return", true);
-          case 14:
-            if (!(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retCode) === '0')) {
-              _context7.next = 19;
+          case 15:
+            if (!(code === '0')) {
+              _context7.next = 20;
               break;
             }
             // showSuccess(result.flag?.retMsg || '导出成功');
             exportProcess(result);
             return _context7.abrupt("return", true);
-          case 19:
+          case 20:
+            if (!['9101', '9102', '9103', '9013', '9014', '9110'].includes(code)) {
+              _context7.next = 24;
+              break;
+            }
+            return _context7.abrupt("return", result);
+          case 24:
             showError(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出失败,请联系系统管理员');
             return _context7.abrupt("return", false);
-          case 21:
-            _context7.next = 28;
+          case 26:
+            _context7.next = 33;
             break;
-          case 23:
-            _context7.prev = 23;
+          case 28:
+            _context7.prev = 28;
             _context7.t0 = _context7["catch"](7);
             console.log(_context7.t0);
             showError(_context7.t0.message);
             return _context7.abrupt("return", false);
-          case 28:
+          case 33:
           case "end":
             return _context7.stop();
         }
-      }, _callee7, null, [[7, 23]]);
+      }, _callee7, null, [[7, 28]]);
     }));
     return function onExport(_x9, _x10) {
       return _ref7.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.1.4",
+  "version": "3.1.6",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [