ls-pro-common 1.0.8 → 1.0.9

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

@@ -1,4 +1,5 @@
 import type { ActionType } from 'ls-pro-table';
+import type { exportParam } from 'ls-pro-table/lib/components/Export';
 import type { ProFormInstance } from 'ls-pro-form';
 import type { SingleParamType } from '../useSingle';
 export declare type DtlParamType = SingleParamType & {
@@ -25,5 +26,6 @@ declare function useDtl(dtlParam: DtlParamType): {
     onEditDtl: () => Promise<boolean>;
     onSaveMst: (values: any) => Promise<void>;
     onRemoveMst: () => Promise<boolean | undefined>;
+    onExportDtl: (url: string, param: exportParam) => Promise<boolean>;
 };
 export default useDtl;

package/es/hooks/useDtl/index.js

@@ -9,7 +9,8 @@ var _excluded = ["current", "pageSize"];
 import React from "react";
 import { useState, useRef } from 'react';
 import { PlusOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined } from '@ant-design/icons';
-import { showConfirm, showWarn, showSuccess } from '../../utils';
+import { showConfirm, showWarn, showError, showSuccess } from '../../utils';
+import { httpPost } from '../../http';
 
 function useDtl(dtlParam) {
   var mstService = dtlParam.service,
@@ -576,6 +577,77 @@ function useDtl(dtlParam) {
     };
   }();
 
+  var onExportDtl = /*#__PURE__*/function () {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(url, param) {
+      var _param$exportColumns;
+
+      var _result$flag5, result, _result$flag6, _result$flag7;
+
+      return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+        while (1) {
+          switch (_context8.prev = _context8.next) {
+            case 0:
+              if ((_param$exportColumns = param.exportColumns) === null || _param$exportColumns === void 0 ? void 0 : _param$exportColumns.length) {
+                _context8.next = 3;
+                break;
+              }
+
+              showWarn('请选择要导出的列');
+              return _context8.abrupt("return", false);
+
+            case 3:
+              if (param.findUrl) {
+                _context8.next = 6;
+                break;
+              }
+
+              showWarn('请配置业务接口 bizApi 属性');
+              return _context8.abrupt("return", false);
+
+            case 6:
+              _context8.prev = 6;
+              _context8.next = 9;
+              return httpPost(url, param);
+
+            case 9:
+              result = _context8.sent;
+
+              if (!(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retCode) === '0')) {
+                _context8.next = 15;
+                break;
+              }
+
+              showSuccess(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出成功');
+              return _context8.abrupt("return", true);
+
+            case 15:
+              showError(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retMsg) || '导出失败,请联系系统管理员');
+              return _context8.abrupt("return", false);
+
+            case 17:
+              _context8.next = 24;
+              break;
+
+            case 19:
+              _context8.prev = 19;
+              _context8.t0 = _context8["catch"](6);
+              console.log(_context8.t0);
+              showError(_context8.t0.message);
+              return _context8.abrupt("return", false);
+
+            case 24:
+            case "end":
+              return _context8.stop();
+          }
+        }
+      }, _callee8, null, [[6, 19]]);
+    }));
+
+    return function onExportDtl(_x6, _x7) {
+      return _ref8.apply(this, arguments);
+    };
+  }();
+
   var tableTools = [];
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) {
@@ -646,7 +718,8 @@ function useDtl(dtlParam) {
     onAddDtl: onAddDtl,
     onEditDtl: onEditDtl,
     onSaveMst: onSaveMst,
-    onRemoveMst: onRemoveMst
+    onRemoveMst: onRemoveMst,
+    onExportDtl: onExportDtl
   };
 }
 

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

@@ -1,4 +1,5 @@
 import type { ActionType } from 'ls-pro-table';
+import type { exportParam } from 'ls-pro-table/lib/components/Export';
 import type { ProFormInstance } from 'ls-pro-form';
 import type { ApiResponse, TableToolbar } from '../../typing';
 export declare type SingleParamType = {
@@ -36,6 +37,6 @@ declare function useSingle(inParam: SingleParamType): {
     onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
     onAdd: () => Promise<void>;
     onEdit: () => Promise<void>;
-    onExport: (url: string, param: any) => Promise<boolean>;
+    onExport: (url: string, param: exportParam) => Promise<boolean>;
 };
 export default useSingle;

package/es/hooks/useSingle/index.js

@@ -9,7 +9,8 @@ var _excluded = ["current", "pageSize"];
 import React from "react";
 import { useState, useRef } from 'react';
 import { PlusOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined } from '@ant-design/icons';
-import { showConfirm, showWarn, showSuccess } from '../../utils';
+import { showConfirm, showWarn, showSuccess, showError } from '../../utils';
+import { httpPost } from '../../http';
 /**
  * 单表基本增删改查 hooks
  * @param service 单表服务
@@ -171,9 +172,8 @@ function useSingle(inParam) {
     }
 
     showConfirm('确认要删除选择的数据?').then( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var _result$flag;
+      var ids, _result$flag, result;
 
-      var ids, result;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
@@ -203,21 +203,22 @@ function useSingle(inParam) {
                 });
               }
 
-              _context3.next = 9;
+              _context3.prev = 7;
+              _context3.next = 10;
               return service.remove(ids);
 
-            case 9:
+            case 10:
               result = _context3.sent;
 
               if (!afterRemove) {
-                _context3.next = 13;
+                _context3.next = 14;
                 break;
               }
 
               afterRemove(result, selectedRows);
               return _context3.abrupt("return");
 
-            case 13:
+            case 14:
               if ((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0') {
                 showSuccess(result.flag.retMsg);
 
@@ -226,12 +227,20 @@ function useSingle(inParam) {
                 }
               }
 
-            case 14:
+              _context3.next = 20;
+              break;
+
+            case 17:
+              _context3.prev = 17;
+              _context3.t0 = _context3["catch"](7);
+              console.log(_context3.t0);
+
+            case 20:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3);
+      }, _callee3, null, [[7, 17]]);
     })));
   };
   /** 新增，更改对应的保存事件 */
@@ -239,34 +248,34 @@ function useSingle(inParam) {
 
   var onSave = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(formData) {
-      var _result$flag2;
+      var data, _result$flag2, result;
 
-      var data, result;
       return _regeneratorRuntime.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               data = _objectSpread(_objectSpread({}, editItem), formData);
-              _context4.next = 3;
+              _context4.prev = 1;
+              _context4.next = 4;
               return service.save(data);
 
-            case 3:
+            case 4:
               result = _context4.sent;
 
               if (!afterSave) {
-                _context4.next = 8;
+                _context4.next = 9;
                 break;
               }
 
-              _context4.next = 7;
+              _context4.next = 8;
               return afterSave(result, data);
 
-            case 7:
+            case 8:
               return _context4.abrupt("return", _context4.sent);
 
-            case 8:
+            case 9:
               if (!((result === null || result === void 0 ? void 0 : (_result$flag2 = result.flag) === null || _result$flag2 === void 0 ? void 0 : _result$flag2.retCode) === '0')) {
-                _context4.next = 12;
+                _context4.next = 13;
                 break;
               }
 
@@ -278,15 +287,24 @@ function useSingle(inParam) {
 
               return _context4.abrupt("return", true);
 
-            case 12:
+            case 13:
+              _context4.next = 18;
+              break;
+
+            case 15:
+              _context4.prev = 15;
+              _context4.t0 = _context4["catch"](1);
+              console.log(_context4.t0);
+
+            case 18:
               return _context4.abrupt("return", false);
 
-            case 13:
+            case 19:
             case "end":
               return _context4.stop();
           }
         }
-      }, _callee4);
+      }, _callee4, null, [[1, 15]]);
     }));
 
     return function onSave(_x) {
@@ -372,18 +390,68 @@ function useSingle(inParam) {
 
   var onExport = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(url, param) {
+      var _param$exportColumns;
+
+      var _result$flag3, result, _result$flag4, _result$flag5;
+
       return _regeneratorRuntime.wrap(function _callee6$(_context6) {
         while (1) {
           switch (_context6.prev = _context6.next) {
             case 0:
+              if ((_param$exportColumns = param.exportColumns) === null || _param$exportColumns === void 0 ? void 0 : _param$exportColumns.length) {
+                _context6.next = 3;
+                break;
+              }
+
+              showWarn('请选择要导出的列');
+              return _context6.abrupt("return", false);
+
+            case 3:
+              if (param.findUrl) {
+                _context6.next = 6;
+                break;
+              }
+
+              showWarn('请配置业务接口 bizApi 属性');
+              return _context6.abrupt("return", false);
+
+            case 6:
+              _context6.prev = 6;
+              _context6.next = 9;
+              return httpPost(url, param);
+
+            case 9:
+              result = _context6.sent;
+
+              if (!(((_result$flag3 = result.flag) === null || _result$flag3 === void 0 ? void 0 : _result$flag3.retCode) === '0')) {
+                _context6.next = 15;
+                break;
+              }
+
+              showSuccess(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retMsg) || '导出成功');
               return _context6.abrupt("return", true);
 
-            case 1:
+            case 15:
+              showError(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retMsg) || '导出失败,请联系系统管理员');
+              return _context6.abrupt("return", false);
+
+            case 17:
+              _context6.next = 24;
+              break;
+
+            case 19:
+              _context6.prev = 19;
+              _context6.t0 = _context6["catch"](6);
+              console.log(_context6.t0);
+              showError(_context6.t0.message);
+              return _context6.abrupt("return", false);
+
+            case 24:
             case "end":
               return _context6.stop();
           }
         }
-      }, _callee6);
+      }, _callee6, null, [[6, 19]]);
     }));
 
     return function onExport(_x5, _x6) {

package/es/http/index.js

@@ -2,7 +2,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, showError } from '../utils'; //默认超时时间为1分钟
+import { getCache, getUrlQuery, showError, toGatewayUrl } from '../utils'; //默认超时时间为1分钟
 
 var request = extend({
   timeout: 60000
@@ -23,7 +23,7 @@ request.interceptors.request.use(function (url, options) {
   }
 
   return {
-    url: url,
+    url: toGatewayUrl(url, ''),
     options: opts
   };
 });

package/es/utils/index.js

@@ -229,9 +229,9 @@ export var treeEach = function treeEach(list, fn) {
   list.forEach(function (item, index) {
     fn(item, index, list); // @ts-ignore
 
-    if (Array.isArray(list[children]) && list[children].length) {
+    if (Array.isArray(item[children]) && item[children].length) {
       // @ts-ignore
-      treeEach(list[children], fn, children);
+      treeEach(item[children], fn, children);
     }
   });
 };

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

@@ -1,4 +1,5 @@
 import type { ActionType } from 'ls-pro-table';
+import type { exportParam } from 'ls-pro-table/lib/components/Export';
 import type { ProFormInstance } from 'ls-pro-form';
 import type { SingleParamType } from '../useSingle';
 export declare type DtlParamType = SingleParamType & {
@@ -25,5 +26,6 @@ declare function useDtl(dtlParam: DtlParamType): {
     onEditDtl: () => Promise<boolean>;
     onSaveMst: (values: any) => Promise<void>;
     onRemoveMst: () => Promise<boolean | undefined>;
+    onExportDtl: (url: string, param: exportParam) => Promise<boolean>;
 };
 export default useDtl;

package/lib/hooks/useDtl/index.js

@@ -29,6 +29,8 @@ var _icons = require("@ant-design/icons");
 
 var _utils = require("../../utils");
 
+var _http = require("../../http");
+
 var _excluded = ["current", "pageSize"];
 
 function useDtl(dtlParam) {
@@ -596,6 +598,77 @@ function useDtl(dtlParam) {
     };
   }();
 
+  var onExportDtl = /*#__PURE__*/function () {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8(url, param) {
+      var _param$exportColumns;
+
+      var _result$flag5, result, _result$flag6, _result$flag7;
+
+      return _regenerator.default.wrap(function _callee8$(_context8) {
+        while (1) {
+          switch (_context8.prev = _context8.next) {
+            case 0:
+              if ((_param$exportColumns = param.exportColumns) === null || _param$exportColumns === void 0 ? void 0 : _param$exportColumns.length) {
+                _context8.next = 3;
+                break;
+              }
+
+              (0, _utils.showWarn)('请选择要导出的列');
+              return _context8.abrupt("return", false);
+
+            case 3:
+              if (param.findUrl) {
+                _context8.next = 6;
+                break;
+              }
+
+              (0, _utils.showWarn)('请配置业务接口 bizApi 属性');
+              return _context8.abrupt("return", false);
+
+            case 6:
+              _context8.prev = 6;
+              _context8.next = 9;
+              return (0, _http.httpPost)(url, param);
+
+            case 9:
+              result = _context8.sent;
+
+              if (!(((_result$flag5 = result.flag) === null || _result$flag5 === void 0 ? void 0 : _result$flag5.retCode) === '0')) {
+                _context8.next = 15;
+                break;
+              }
+
+              (0, _utils.showSuccess)(((_result$flag6 = result.flag) === null || _result$flag6 === void 0 ? void 0 : _result$flag6.retMsg) || '导出成功');
+              return _context8.abrupt("return", true);
+
+            case 15:
+              (0, _utils.showError)(((_result$flag7 = result.flag) === null || _result$flag7 === void 0 ? void 0 : _result$flag7.retMsg) || '导出失败,请联系系统管理员');
+              return _context8.abrupt("return", false);
+
+            case 17:
+              _context8.next = 24;
+              break;
+
+            case 19:
+              _context8.prev = 19;
+              _context8.t0 = _context8["catch"](6);
+              console.log(_context8.t0);
+              (0, _utils.showError)(_context8.t0.message);
+              return _context8.abrupt("return", false);
+
+            case 24:
+            case "end":
+              return _context8.stop();
+          }
+        }
+      }, _callee8, null, [[6, 19]]);
+    }));
+
+    return function onExportDtl(_x6, _x7) {
+      return _ref8.apply(this, arguments);
+    };
+  }();
+
   var tableTools = [];
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) {
@@ -666,7 +739,8 @@ function useDtl(dtlParam) {
     onAddDtl: onAddDtl,
     onEditDtl: onEditDtl,
     onSaveMst: onSaveMst,
-    onRemoveMst: onRemoveMst
+    onRemoveMst: onRemoveMst,
+    onExportDtl: onExportDtl
   };
 }
 

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

@@ -1,4 +1,5 @@
 import type { ActionType } from 'ls-pro-table';
+import type { exportParam } from 'ls-pro-table/lib/components/Export';
 import type { ProFormInstance } from 'ls-pro-form';
 import type { ApiResponse, TableToolbar } from '../../typing';
 export declare type SingleParamType = {
@@ -36,6 +37,6 @@ declare function useSingle(inParam: SingleParamType): {
     onLoad: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
     onAdd: () => Promise<void>;
     onEdit: () => Promise<void>;
-    onExport: (url: string, param: any) => Promise<boolean>;
+    onExport: (url: string, param: exportParam) => Promise<boolean>;
 };
 export default useSingle;