ls-pro-common 1.0.57 → 1.0.60

package/lib/hooks/useSingle/index.js

@@ -46,7 +46,13 @@ var _excluded = ["current", "pageSize"];
 function useSingle(inParam) {
   var _usePermission = (0, _usePermission2.default)(),
       resourceId = _usePermission.resourceId,
-      checkRight = _usePermission.checkRight;
+      checkRight = _usePermission.checkRight,
+      canAdd = _usePermission.canAdd,
+      canEdit = _usePermission.canEdit,
+      canDelete = _usePermission.canDelete,
+      canAudit = _usePermission.canAudit,
+      canImport = _usePermission.canImport,
+      canExport = _usePermission.canExport;
 
   var service = inParam.service,
       toolConfig = inParam.toolConfig,
@@ -603,7 +609,7 @@ function useSingle(inParam) {
 
             case 19:
               result = _context6.sent;
-              result.data = result.rows;
+              result.data = result.rows || [];
               result.success = true;
               return _context6.abrupt("return", result);
 
@@ -650,7 +656,7 @@ function useSingle(inParam) {
             case 6:
               _context7.prev = 6;
               _context7.next = 9;
-              return (0, _http.httpPost)(url, param);
+              return (0, _http.httpPost)(url, param, true, false);
 
             case 9:
               result = _context7.sent;
@@ -733,21 +739,21 @@ function useSingle(inParam) {
   }, [auditStatus, statusField, selectedRows]); // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
 
   var tableTools = (0, _react.useMemo)(function () {
-    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && checkRight(2) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && canAdd ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "add",
       onClick: function onClick() {
         return onAdd(null);
       },
       disabled: btnDisabled('add'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, null)
-    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && checkRight(4) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && canEdit ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
       disabled: btnDisabled('edit'),
       onClick: function onClick() {
         return onEdit(null);
       },
       icon: /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)
-    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && (checkRight(8) || checkRight(32)) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && canDelete ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "remove",
       onClick: function onClick() {
         return onRemove(null);
@@ -755,14 +761,14 @@ function useSingle(inParam) {
       danger: true,
       disabled: btnDisabled('remove'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.DeleteOutlined, null)
-    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.audit) && checkRight(64) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.audit) && canAudit ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "audit",
       onClick: function onClick() {
         return onAudit(null);
       },
       disabled: btnDisabled('audit'),
-      icon: /*#__PURE__*/_react.default.createElement(_icons.CheckOutlined, null)
-    }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(128) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+      icon: /*#__PURE__*/_react.default.createElement(_icons.AuditOutlined, null)
+    }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && canImport ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
       onClick: function onClick() {
         var _tableRef$current2, _tableRef$current2$sh;
@@ -771,7 +777,7 @@ function useSingle(inParam) {
       },
       disabled: btnDisabled('import'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && checkRight(256) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && canExport ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "export",
       onClick: function onClick() {
         var _tableRef$current3, _tableRef$current3$sh;
@@ -781,7 +787,7 @@ function useSingle(inParam) {
       disabled: btnDisabled('export'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ExportOutlined, null)
     }, "\u5BFC\u51FA") : false].filter(function (o) {
-      return o !== false;
+      return Boolean;
     });
   }, [selectedRows]);
   return {

package/lib/utils/index.d.ts

@@ -107,7 +107,7 @@ export declare const reLogin: () => void;
  * @param endSuffix
  * @returns
  */
-export declare const rangeToSearch: (values: any, startField: string, endField: string, endSuffix?: string) => any;
+export declare const rangeToSearch: (values: any, startField: string, endField: string, endSuffix?: string, startSuffex?: string) => any;
 /** @name 状态列表 */
 export declare const statusList: {
     value: number;
@@ -174,3 +174,9 @@ export declare const getLoginName: () => string | undefined;
 export declare const getCompanyId: () => string | undefined;
 /** @name 微前端原生路径 */
 export declare const appPath: (path?: string) => any;
+/**
+ * 深度复制对象
+ * @param obj
+ * @returns
+ */
+export declare const deepClone: (obj: any) => any;

package/lib/utils/index.js

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "dateFormat", {
     return _lsProTable.dateFormat;
   }
 });
-exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = void 0;
+exports.getLoginName = exports.getCookie = exports.getCompanyId = exports.getCache = exports.formatMoney = exports.formatDate = exports.deepClone = void 0;
 Object.defineProperty(exports, "getResourceProps", {
   enumerable: true,
   get: function get() {
@@ -361,8 +361,9 @@ exports.reLogin = reLogin;
 
 var rangeToSearch = function rangeToSearch(values, startField, endField) {
   var endSuffix = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
+  var startSuffex = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '';
   var data = {};
-  Array.isArray(values) && values[0] && (data[startField] = values[0]);
+  Array.isArray(values) && values[0] && (data[startField] = values[0] + startSuffex);
   Array.isArray(values) && values[1] && (data[endField] = values[1] + endSuffix);
   return data;
 };
@@ -605,5 +606,34 @@ var appPath = function appPath() {
 
   return path ? path : './';
 };
+/**
+ * 深度复制对象
+ * @param obj
+ * @returns
+ */
+
+
+exports.appPath = appPath;
+
+var deepClone = function deepClone(obj) {
+  var otype = Object.prototype.toString.call(obj);
+  var target = obj;
+
+  if (otype === '[object Array]') {
+    target = [];
+
+    for (var i = 0; i < obj.length; i++) {
+      target.push(deepClone(obj[i]));
+    }
+  } else if (otype === '[object Object]') {
+    target = {};
+
+    for (var key in obj) {
+      target[key] = deepClone(obj[key]);
+    }
+  }
+
+  return target;
+};
 
-exports.appPath = appPath;
+exports.deepClone = deepClone;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.57",
+  "version": "1.0.60",
   "description": "ls-pro-common",
   "keywords": [
     "antd",  
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.42",
+    "ls-pro-table": "2.62.44",
     "ls-pro-form": "1.52.29",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",