ls-pro-common 1.0.8 → 1.0.11

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) {
@@ -392,18 +411,68 @@ 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 1:
+            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);
+      }, _callee6, null, [[6, 19]]);
     }));
 
     return function onExport(_x5, _x6) {

package/lib/utils/index.d.ts

@@ -1,18 +1,4 @@
-export declare const getUrlQuery: (name: string, url?: string) => string;
-/**
- * 设置url传参
- * @param {*} url
- * @param {*} keyvals
- * @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;
+export { getUrlQuery, setUrlQuery, dateFormat, toGatewayUrl } from 'ls-pro-table/lib/utils';
 /**
  * 设置文档title
  * @param {*} title
@@ -49,13 +35,6 @@ export declare const setCache: (key: string, data: any) => void;
  * @returns 关键字对应的值
  */
 export declare const getCache: any;
-/**
- * 简单日期格式化
- * @param {*} dt 传入时间参数，若不传取当前时间
- * @param {*} showTime 是否返回当前时间,默认返回时间
- * @returns xxxx年-xx月-xx日 [xx时:xx分:xx秒]
- */
-export declare const dateFormat: (dt: Date | undefined | null, showTime?: boolean) => string;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */

package/lib/utils/index.js

@@ -5,7 +5,34 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-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;
+Object.defineProperty(exports, "dateFormat", {
+  enumerable: true,
+  get: function get() {
+    return _utils.dateFormat;
+  }
+});
+exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = void 0;
+Object.defineProperty(exports, "getUrlQuery", {
+  enumerable: true,
+  get: function get() {
+    return _utils.getUrlQuery;
+  }
+});
+exports.setTitle = exports.setCookie = exports.setCache = exports.rangeToSearch = exports.isLogin = exports.getUserName = exports.getUserInfo = void 0;
+Object.defineProperty(exports, "setUrlQuery", {
+  enumerable: true,
+  get: function get() {
+    return _utils.setUrlQuery;
+  }
+});
+exports.statusList = exports.showWarn = exports.showSuccess = exports.showError = exports.showConfirm = void 0;
+Object.defineProperty(exports, "toGatewayUrl", {
+  enumerable: true,
+  get: function get() {
+    return _utils.toGatewayUrl;
+  }
+});
+exports.yesnoList = exports.treeFind = exports.treeEach = void 0;
 
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 
@@ -23,66 +50,13 @@ var _react = _interopRequireDefault(require("react"));
 
 var _icons = require("@ant-design/icons");
 
-var getUrlQuery = function getUrlQuery(name) {
-  var url = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : location.search.substr(1) || '';
-  var reg = new RegExp('(^|[&|?])' + name + '=([^&]*)(&|$)'),
-      r = url.match(reg);
-  if (r != null) return unescape(decodeURI(r[2]));
-  return '';
-};
-/**
- * 设置url传参
- * @param {*} url
- * @param {*} keyvals
- * @returns
- */
-
-
-exports.getUrlQuery = getUrlQuery;
-
-var setUrlQuery = function setUrlQuery(url) {
-  var keyvals = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var newUrl = url;
-
-  for (var name in keyvals) {
-    var reg = new RegExp('(^|)' + name + '=([^&]*)(|$)');
-    var tmp = name + '=' + keyvals[name];
-
-    if (newUrl.match(reg) != null) {
-      // @ts-ignore
-      newUrl = newUrl.replace(eval(reg), tmp);
-    } else {
-      newUrl = newUrl + (newUrl.match('[\?]') ? '&' : '?') + tmp;
-    }
-  }
-
-  return newUrl;
-};
-/**
- * 给 url 添加网关
- * @param url 原url，以 / 打头
- * @param defGateway 默认网关 /petrel
- * @returns
- */
-
-
-exports.setUrlQuery = setUrlQuery;
+var _utils = require("ls-pro-table/lib/utils");
 
-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
  * @returns
  */
-
-
-exports.toGatewayUrl = toGatewayUrl;
-
 var setTitle = function setTitle(title) {
   if (!title) return;
   title = title.length > 10 ? title.substring(0, 10) + '...' : title;
@@ -167,31 +141,10 @@ var getCache = function getCache(key) {
 
   return data;
 };
-/**
- * 简单日期格式化
- * @param {*} dt 传入时间参数，若不传取当前时间
- * @param {*} showTime 是否返回当前时间,默认返回时间
- * @returns xxxx年-xx月-xx日 [xx时:xx分:xx秒]
- */
-
-
-exports.getCache = getCache;
-
-var dateFormat = function dateFormat(dt) {
-  var showTime = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-  var ct = dt ? dt : new Date(Date.now());
-  var str = ct.getFullYear() + '-' + ('' + (ct.getMonth() + 1)).padStart(2, '0') + '-' + ('' + ct.getDate()).padStart(2, '0');
-
-  if (showTime) {
-    str += ' ' + (ct.getHours() + '').padStart(2, '0') + ':' + (ct.getMinutes() + '').padStart(2, '0') + ":" + (ct.getSeconds() + '').padStart(2, '0');
-  }
-
-  return str;
-};
 /** @name 显示错误 */
 
 
-exports.dateFormat = dateFormat;
+exports.getCache = getCache;
 
 var showError = function showError(text) {
   _message2.default.error(text);
@@ -293,9 +246,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.8",
+  "version": "1.0.11",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,8 +28,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.15",
-    "ls-pro-form": "1.52.19",
+    "ls-pro-table": "2.62.17",
+    "ls-pro-form": "1.52.20",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",
     "moment": "^2.27.0",