ls-pro-common 1.0.7 → 1.0.10

package/lib/hooks/useSingle/index.js

@@ -29,6 +29,8 @@ var _icons = require("@ant-design/icons");
 
 var _utils = require("../../utils");
 
+var _http = require("../../http");
+
 var _excluded = ["current", "pageSize"];
 
 /**
@@ -191,9 +193,8 @@ function useSingle(inParam) {
     }
 
     (0, _utils.showConfirm)('确认要删除选择的数据?').then( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-      var _result$flag;
+      var ids, _result$flag, result;
 
-      var ids, result;
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
@@ -223,21 +224,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') {
                 (0, _utils.showSuccess)(result.flag.retMsg);
 
@@ -246,12 +248,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]]);
     })));
   };
   /** 新增，更改对应的保存事件 */
@@ -259,34 +269,34 @@ function useSingle(inParam) {
 
   var onSave = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(formData) {
-      var _result$flag2;
+      var data, _result$flag2, result;
 
-      var data, result;
       return _regenerator.default.wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               data = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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;
               }
 
@@ -298,15 +308,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) {
@@ -390,6 +409,77 @@ function useSingle(inParam) {
     };
   }();
 
+  var onExport = /*#__PURE__*/function () {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(url, param) {
+      var _param$exportColumns;
+
+      var _result$flag3, result, _result$flag4, _result$flag5;
+
+      return _regenerator.default.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;
+              }
+
+              (0, _utils.showWarn)('请选择要导出的列');
+              return _context6.abrupt("return", false);
+
+            case 3:
+              if (param.findUrl) {
+                _context6.next = 6;
+                break;
+              }
+
+              (0, _utils.showWarn)('请配置业务接口 bizApi 属性');
+              return _context6.abrupt("return", false);
+
+            case 6:
+              _context6.prev = 6;
+              _context6.next = 9;
+              return (0, _http.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;
+              }
+
+              (0, _utils.showSuccess)(((_result$flag4 = result.flag) === null || _result$flag4 === void 0 ? void 0 : _result$flag4.retMsg) || '导出成功');
+              return _context6.abrupt("return", true);
+
+            case 15:
+              (0, _utils.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);
+              (0, _utils.showError)(_context6.t0.message);
+              return _context6.abrupt("return", false);
+
+            case 24:
+            case "end":
+              return _context6.stop();
+          }
+        }
+      }, _callee6, null, [[6, 19]]);
+    }));
+
+    return function onExport(_x5, _x6) {
+      return _ref6.apply(this, arguments);
+    };
+  }();
+
   var tableTools = [];
 
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) {
@@ -422,6 +512,11 @@ function useSingle(inParam) {
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) {
     tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
+      onClick: function onClick() {
+        var _tableRef$current, _tableRef$current$sho;
+
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current = tableRef.current) === null || _tableRef$current === void 0 ? void 0 : (_tableRef$current$sho = _tableRef$current.showImport) === null || _tableRef$current$sho === void 0 ? void 0 : _tableRef$current$sho.call(_tableRef$current);
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
     }, "\u5BFC\u5165"));
   }
@@ -429,6 +524,11 @@ function useSingle(inParam) {
   if (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) {
     tableTools.push( /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
+      onClick: function onClick() {
+        var _tableRef$current2, _tableRef$current2$sh;
+
+        tableRef === null || tableRef === void 0 ? void 0 : (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$sh = _tableRef$current2.showExport) === null || _tableRef$current2$sh === void 0 ? void 0 : _tableRef$current2$sh.call(_tableRef$current2);
+      },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA"));
   }
@@ -448,7 +548,8 @@ function useSingle(inParam) {
     onSave: onSave,
     onLoad: onLoad,
     onAdd: onAdd,
-    onEdit: onEdit
+    onEdit: onEdit,
+    onExport: onExport
   };
 }
 

package/lib/http/index.js

@@ -42,7 +42,7 @@ request.interceptors.request.use(function (url, options) {
   }
 
   return {
-    url: url,
+    url: (0, _utils.toGatewayUrl)(url),
     options: opts
   };
 });

package/lib/index.d.ts

@@ -1,4 +1,5 @@
 import DtlLayout from './components/DtlLayout';
+import InputTable from './components/InputTable';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -9,4 +10,4 @@ import useDtl from './hooks/useDtl';
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps };
-export { DtlLayout, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };
+export { DtlLayout, InputTable, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };

package/lib/index.js

@@ -19,6 +19,12 @@ Object.defineProperty(exports, "DtlLayout", {
     return _DtlLayout.default;
   }
 });
+Object.defineProperty(exports, "InputTable", {
+  enumerable: true,
+  get: function get() {
+    return _InputTable.default;
+  }
+});
 Object.defineProperty(exports, "fetchOptions", {
   enumerable: true,
   get: function get() {
@@ -77,6 +83,8 @@ exports.utils = void 0;
 
 var _DtlLayout = _interopRequireDefault(require("./components/DtlLayout"));
 
+var _InputTable = _interopRequireDefault(require("./components/InputTable"));
+
 var _BaseService = _interopRequireDefault(require("./service/BaseService"));
 
 var _http = _interopRequireWildcard(require("./http"));

package/lib/utils/index.d.ts

@@ -6,6 +6,13 @@ export declare const getUrlQuery: (name: string, url?: string) => string;
  * @returns
  */
 export declare const setUrlQuery: (url: string, keyvals?: Record<string, any>) => string;
+/**
+ * 给 url 添加网关
+ * @param url 原url，以 / 打头
+ * @param defGateway 默认网关 /petrel
+ * @returns
+ */
+export declare const toGatewayUrl: (url: string, defGateway?: string) => string;
 /**
  * 设置文档title
  * @param {*} title

package/lib/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.yesnoList = exports.treeFind = exports.treeEach = exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = exports.setUrlQuery = exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = exports.getUrlQuery = exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.dateFormat = void 0;
+exports.yesnoList = exports.treeFind = exports.treeEach = exports.toGatewayUrl = exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = exports.setUrlQuery = exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = exports.getUrlQuery = exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.dateFormat = void 0;
 
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
@@ -58,6 +58,22 @@ var setUrlQuery = function setUrlQuery(url) {
 
   return newUrl;
 };
+/**
+ * 给 url 添加网关
+ * @param url 原url，以 / 打头
+ * @param defGateway 默认网关 /petrel
+ * @returns
+ */
+
+
+exports.setUrlQuery = setUrlQuery;
+
+var toGatewayUrl = function toGatewayUrl(url) {
+  var defGateway = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '/petrel';
+  if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
+  var gateway = getUrlQuery('gateway') || location.origin + defGateway;
+  return gateway + url;
+};
 /**
  * 设置文档title
  * @param {*} title
@@ -65,7 +81,7 @@ var setUrlQuery = function setUrlQuery(url) {
  */
 
 
-exports.setUrlQuery = setUrlQuery;
+exports.toGatewayUrl = toGatewayUrl;
 
 var setTitle = function setTitle(title) {
   if (!title) return;
@@ -277,9 +293,9 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.7",
+  "version": "1.0.10",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.13",
-    "ls-pro-form": "1.52.18",
+    "ls-pro-table": "2.62.16",
+    "ls-pro-form": "1.52.20",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",