ls-pro-common 1.0.59 → 1.0.61

package/es/components/DtlLayout.d.ts

@@ -32,6 +32,10 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     headerStyle?: React.CSSProperties;
     /** 表单ref */
     formRef?: React.MutableRefObject<ProFormInstance | undefined>;
+    /**状态字段 */
+    statusField?: string;
+    /** 审核状态值 */
+    auditStatus?: number;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;
 export default DtlLayout;

package/es/components/DtlLayout.js

@@ -2,12 +2,12 @@ import "antd/es/button/style";
 import _Button from "antd/es/button";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
-import { ArrowLeftOutlined, SaveOutlined, CheckOutlined } from '@ant-design/icons';
+import { ArrowLeftOutlined, SaveOutlined, AuditOutlined } from '@ant-design/icons';
 import './common.less';
+import usePermission from '../hooks/usePermission';
 
 function DtlLayout(props) {
-  var renderButton = props.renderButton,
-      title = props.title,
+  var title = props.title,
       _props$keyField = props.keyField,
       keyField = _props$keyField === void 0 ? 'id' : _props$keyField,
       masterObject = props.masterObject,
@@ -21,49 +21,78 @@ function DtlLayout(props) {
       btnSaveText = _props$btnSaveText === void 0 ? '保存' : _props$btnSaveText,
       _props$btnExitText = props.btnExitText,
       btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
-      btnStatus = props.btnStatus;
+      btnStatus = props.btnStatus,
+      statusField = props.statusField,
+      auditStatus = props.auditStatus;
+
+  var _usePermission = usePermission(),
+      checkRight = _usePermission.checkRight;
+
   var dtlTitle = useMemo(function () {
     if (title) return title;
     if (!masterObject) return '';
     return masterObject[keyField] ? '编辑' : '新增';
   }, [title, masterObject, keyField]);
-  var btns = useMemo(function () {
-    var b = [/*#__PURE__*/React.createElement(_Button, {
-      key: "btnSave",
-      onClick: function onClick() {
-        var _formRef$current;
 
-        if (props.onSave) {
-          return props.onSave();
-        }
+  var isAudit = function isAudit() {
+    if (masterObject && statusField && auditStatus) {
+      return Number(masterObject[statusField] || 0) >= auditStatus;
+    }
 
-        formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
-      },
-      disabled: btnStatus ? btnStatus('btnSave') || false : false,
-      icon: /*#__PURE__*/React.createElement(SaveOutlined, null)
-    }, btnSaveText), /*#__PURE__*/React.createElement(_Button, {
+    return false;
+  };
+
+  var btnDisabled = function btnDisabled(btnKey) {
+    // 优先处理自定义的状态
+    if (btnStatus && typeof btnStatus(btnKey) === 'boolean') {
+      return btnStatus(btnKey) || false;
+    }
+
+    return isAudit();
+  };
+
+  var btns = useMemo(function () {
+    var b = [/*#__PURE__*/React.createElement(_Button, {
       key: "btnBack",
       onClick: function onClick() {
         return props.onExit(false);
       },
       icon: /*#__PURE__*/React.createElement(ArrowLeftOutlined, null)
-    }, btnExitText)];
+    }, btnExitText)]; // 有新增或更改权限且未审核，开放出保存按钮
+
+    if ((checkRight(2) || checkRight(4)) && !isAudit()) {
+      b.unshift( /*#__PURE__*/React.createElement(_Button, {
+        key: "btnSave",
+        onClick: function onClick() {
+          var _formRef$current;
+
+          if (props.onSave) {
+            return props.onSave();
+          }
+
+          formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
+        },
+        disabled: btnDisabled('btnSave'),
+        icon: /*#__PURE__*/React.createElement(SaveOutlined, null)
+      }, btnSaveText));
+    } // 转入onAudit方法且有审核权限，数据未审核，开放出审核按钮
+
 
-    if (props.onAudit) {
+    if (props.onAudit && checkRight(64) && !isAudit()) {
       b.unshift( /*#__PURE__*/React.createElement(_Button, {
         key: "btnAudit",
-        disabled: btnStatus ? btnStatus('btnAudit') || false : false,
+        disabled: btnDisabled('btnAudit'),
         onClick: function onClick() {
           if (!props.onAudit) return;
           props.onAudit();
         },
-        icon: /*#__PURE__*/React.createElement(CheckOutlined, null)
+        icon: /*#__PURE__*/React.createElement(AuditOutlined, null)
       }, "\u5BA1\u6838"));
     }
 
+    if (props.renderButton) return props.renderButton(b);
     return b;
   }, [props]);
-  var buttons = renderButton ? renderButton(btns) : btns;
   return /*#__PURE__*/React.createElement("div", {
     className: "dtl-layout"
   }, /*#__PURE__*/React.createElement("div", {
@@ -73,7 +102,7 @@ function DtlLayout(props) {
     className: "dtl-title"
   }, dtlTitle), /*#__PURE__*/React.createElement("div", {
     className: "dtl-btns"
-  }, buttons)), /*#__PURE__*/React.createElement("div", {
+  }, btns)), /*#__PURE__*/React.createElement("div", {
     className: classNames('dtl-body', bodyClass),
     style: bodyStyle
   }, children));

package/es/hooks/useDtl/index.js

@@ -11,6 +11,7 @@ import { useState, useRef, useCallback, useMemo } from 'react';
 import { PlusCircleOutlined, EditOutlined, DeleteOutlined, ImportOutlined, ExportOutlined } from '@ant-design/icons';
 import { showConfirm, showWarn, showError, showSuccess } from '../../utils';
 import { httpPost } from '../../http';
+import usePermission from '../usePermission';
 
 function useDtl(dtlParam) {
   var mstService = dtlParam.service,
@@ -33,8 +34,16 @@ function useDtl(dtlParam) {
       btnStatus = dtlParam.btnStatus,
       beforeAudit = dtlParam.beforeAudit,
       afterAudit = dtlParam.afterAudit;
+
+  var _usePermission = usePermission(),
+      canAdd = _usePermission.canAdd,
+      canEdit = _usePermission.canEdit,
+      canDelete = _usePermission.canDelete,
+      canImport = _usePermission.canImport,
+      canExport = _usePermission.canExport;
   /** @name 选中行数据 */
 
+
   var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
       selectedRows = _useState2[0],
@@ -962,21 +971,21 @@ function useDtl(dtlParam) {
   };
 
   var tableTools = useMemo(function () {
-    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && !isAudit() ? /*#__PURE__*/React.createElement(_Button, {
+    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && !isAudit() && canAdd ? /*#__PURE__*/React.createElement(_Button, {
       key: "add",
       onClick: function onClick() {
         return onAddDtl();
       },
       disabled: btnDisabled('add'),
       icon: /*#__PURE__*/React.createElement(PlusCircleOutlined, null)
-    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() && (canAdd || canEdit) ? /*#__PURE__*/React.createElement(_Button, {
       key: "edit",
       disabled: btnDisabled('edit'),
       onClick: function onClick() {
         return onEditDtl();
       },
       icon: /*#__PURE__*/React.createElement(EditOutlined, null)
-    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && !isAudit() ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && !isAudit() && (canAdd || canEdit || canDelete) ? /*#__PURE__*/React.createElement(_Button, {
       key: "remove",
       onClick: function onClick() {
         return onRemoveDtl();
@@ -984,14 +993,14 @@ function useDtl(dtlParam) {
       danger: true,
       disabled: btnDisabled('remove'),
       icon: /*#__PURE__*/React.createElement(DeleteOutlined, null)
-    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && !isAudit() && (canAdd || canEdit || canImport) ? /*#__PURE__*/React.createElement(_Button, {
       key: "import",
       onClick: function onClick() {
         onImport();
       },
       disabled: btnDisabled('import'),
       icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && canExport ? /*#__PURE__*/React.createElement(_Button, {
       key: "export",
       onClick: function onClick() {
         onExport();
@@ -1001,7 +1010,7 @@ function useDtl(dtlParam) {
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;
     });
-  }, [selectedRows]);
+  }, [selectedRows, auditStatus, statusField, masterObject]);
   return {
     formRef: formRef,
     tableRef: tableRef,

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

@@ -3,5 +3,12 @@ declare function usePermission(): {
     permissionVal: number;
     resRightVal: number;
     checkRight: (val: number) => boolean;
+    canAdd: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    canAudit: boolean;
+    canImport: boolean;
+    canExport: boolean;
+    canPrint: boolean;
 };
 export default usePermission;

package/es/hooks/usePermission/index.js

@@ -4,7 +4,7 @@ import { getUrlQuery, getResourceProps, getCache } from '../../utils';
 function usePermission() {
   /** @name 资源ID */
   var resourceId = useMemo(function () {
-    return getUrlQuery('resCode') || getResourceProps('resourceId');
+    return getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   }, []);
   /** @name 用户权限 */
 
@@ -30,7 +30,14 @@ function usePermission() {
     resourceId: resourceId,
     permissionVal: permissionVal,
     resRightVal: resRightVal,
-    checkRight: checkRight
+    checkRight: checkRight,
+    canAdd: checkRight(2),
+    canEdit: checkRight(4),
+    canDelete: checkRight(8) || checkRight(32),
+    canAudit: checkRight(64),
+    canImport: checkRight(128),
+    canExport: checkRight(256),
+    canPrint: checkRight(512)
   };
 }
 

package/es/hooks/useSingle/index.js

@@ -24,7 +24,13 @@ import usePermission from '../usePermission';
 function useSingle(inParam) {
   var _usePermission = usePermission(),
       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,
@@ -712,21 +718,21 @@ function useSingle(inParam) {
   }, [auditStatus, statusField, selectedRows]); // 处理内置 table 按钮,新增，编辑，删除，审核，导入，导出
 
   var tableTools = useMemo(function () {
-    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && checkRight(2) ? /*#__PURE__*/React.createElement(_Button, {
+    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && canAdd ? /*#__PURE__*/React.createElement(_Button, {
       key: "add",
       onClick: function onClick() {
         return onAdd(null);
       },
       disabled: btnDisabled('add'),
       icon: /*#__PURE__*/React.createElement(PlusCircleOutlined, null)
-    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && checkRight(4) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && canEdit ? /*#__PURE__*/React.createElement(_Button, {
       key: "edit",
       disabled: btnDisabled('edit'),
       onClick: function onClick() {
         return onEdit(null);
       },
       icon: /*#__PURE__*/React.createElement(EditOutlined, null)
-    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && (checkRight(8) || checkRight(32)) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && canDelete ? /*#__PURE__*/React.createElement(_Button, {
       key: "remove",
       onClick: function onClick() {
         return onRemove(null);
@@ -734,14 +740,14 @@ function useSingle(inParam) {
       danger: true,
       disabled: btnDisabled('remove'),
       icon: /*#__PURE__*/React.createElement(DeleteOutlined, null)
-    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.audit) && checkRight(64) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.audit) && canAudit ? /*#__PURE__*/React.createElement(_Button, {
       key: "audit",
       onClick: function onClick() {
         return onAudit(null);
       },
       disabled: btnDisabled('audit'),
       icon: /*#__PURE__*/React.createElement(AuditOutlined, null)
-    }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && checkRight(128) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u5BA1\u6838") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && canImport ? /*#__PURE__*/React.createElement(_Button, {
       key: "import",
       onClick: function onClick() {
         var _tableRef$current2, _tableRef$current2$sh;
@@ -750,7 +756,7 @@ function useSingle(inParam) {
       },
       disabled: btnDisabled('import'),
       icon: /*#__PURE__*/React.createElement(ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && checkRight(256) ? /*#__PURE__*/React.createElement(_Button, {
+    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) && canExport ? /*#__PURE__*/React.createElement(_Button, {
       key: "export",
       onClick: function onClick() {
         var _tableRef$current3, _tableRef$current3$sh;

package/es/http/index.js

@@ -14,7 +14,7 @@ request.interceptors.request.use(function (url, options) {
 
   var opts = _objectSpread({}, options);
 
-  if (token) {
+  if (token && url.indexOf('noToken=1') === -1) {
     Object.assign(opts, {
       headers: {
         token: token
@@ -22,6 +22,7 @@ request.interceptors.request.use(function (url, options) {
     });
   }
 
+  url = url.replace('noToken=1', '').replace('&&', '&').replace('?&', '?');
   var param = {
     resCode: getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
     _t1: Date.now()

package/es/utils/index.d.ts

@@ -66,7 +66,7 @@ export declare const getCookie: (name: string) => string | null;
  * @param {*} value  Cookie 值
  * @param { Number } day 有效天数 默认1天,
  */
-export declare const setCookie: (key: string, value: string | number, day?: number) => void;
+export declare const setCookie: (key: string, value: string | number, day?: number, sameSite?: boolean) => void;
 /**
  * 判断是否登录
  * @returns
@@ -86,6 +86,12 @@ export declare const setCache: (key: string, data: any, session?: boolean) => vo
  * @returns 关键字对应的值
  */
 export declare const getCache: (key: string, session?: boolean) => string | null;
+/**
+ *
+ * @param key 关键字，不传清除所有
+ * @param session 是否session storage , 默认 localStorage
+ */
+export declare const clearCache: (key?: string | undefined, session?: boolean) => void;
 /** @name 显示错误 */
 export declare const showError: (text: string) => void;
 /** @name 显示警示 */

package/es/utils/index.js

@@ -145,12 +145,22 @@ export var getCookie = function getCookie(name) {
 
 export var setCookie = function setCookie(key, value) {
   var day = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var sameSite = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
   if (day !== 0) {
     var d = new Date(Date.now() + day * 24 * 60 * 60 * 1000);
-    document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/");
+
+    if (sameSite) {
+      document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/;sameSite=None;secure=true");
+    } else {
+      document.cookie = "".concat(key, "=").concat(value, ";expires=").concat(d.toUTCString(), ";path=/");
+    }
   } else {
-    document.cookie = key + "=" + value + ";path=/";
+    if (sameSite) {
+      document.cookie = key + "=" + value + ";path=/;sameSite=None;secure=true";
+    } else {
+      document.cookie = key + "=" + value + ";path=/";
+    }
   }
 };
 /**
@@ -194,6 +204,21 @@ export var getCache = function getCache(key) {
 
   return data;
 };
+/**
+ *
+ * @param key 关键字，不传清除所有
+ * @param session 是否session storage , 默认 localStorage
+ */
+
+export var clearCache = function clearCache(key) {
+  var session = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+  if (key) {
+    session ? sessionStorage.removeItem(key) : localStorage.removeItem(key);
+  } else {
+    session ? sessionStorage.clear() : localStorage.clear();
+  }
+};
 /** @name 显示错误 */
 
 export var showError = function showError(text) {
@@ -245,7 +270,7 @@ export var reLogin = function reLogin() {
     maskClosable: false,
     afterClose: function afterClose() {
       timeout = false;
-      location.href = '/login?redirect=' + encodeURI(location.href);
+      location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURI(location.href);
     }
   });
 };

package/lib/components/DtlLayout.d.ts

@@ -32,6 +32,10 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     headerStyle?: React.CSSProperties;
     /** 表单ref */
     formRef?: React.MutableRefObject<ProFormInstance | undefined>;
+    /**状态字段 */
+    statusField?: string;
+    /** 审核状态值 */
+    auditStatus?: number;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;
 export default DtlLayout;

package/lib/components/DtlLayout.js

@@ -21,9 +21,10 @@ var _icons = require("@ant-design/icons");
 
 require("./common.less");
 
+var _usePermission2 = _interopRequireDefault(require("../hooks/usePermission"));
+
 function DtlLayout(props) {
-  var renderButton = props.renderButton,
-      title = props.title,
+  var title = props.title,
       _props$keyField = props.keyField,
       keyField = _props$keyField === void 0 ? 'id' : _props$keyField,
       masterObject = props.masterObject,
@@ -37,49 +38,78 @@ function DtlLayout(props) {
       btnSaveText = _props$btnSaveText === void 0 ? '保存' : _props$btnSaveText,
       _props$btnExitText = props.btnExitText,
       btnExitText = _props$btnExitText === void 0 ? '返回' : _props$btnExitText,
-      btnStatus = props.btnStatus;
+      btnStatus = props.btnStatus,
+      statusField = props.statusField,
+      auditStatus = props.auditStatus;
+
+  var _usePermission = (0, _usePermission2.default)(),
+      checkRight = _usePermission.checkRight;
+
   var dtlTitle = (0, _react.useMemo)(function () {
     if (title) return title;
     if (!masterObject) return '';
     return masterObject[keyField] ? '编辑' : '新增';
   }, [title, masterObject, keyField]);
-  var btns = (0, _react.useMemo)(function () {
-    var b = [/*#__PURE__*/_react.default.createElement(_button.default, {
-      key: "btnSave",
-      onClick: function onClick() {
-        var _formRef$current;
 
-        if (props.onSave) {
-          return props.onSave();
-        }
+  var isAudit = function isAudit() {
+    if (masterObject && statusField && auditStatus) {
+      return Number(masterObject[statusField] || 0) >= auditStatus;
+    }
 
-        formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
-      },
-      disabled: btnStatus ? btnStatus('btnSave') || false : false,
-      icon: /*#__PURE__*/_react.default.createElement(_icons.SaveOutlined, null)
-    }, btnSaveText), /*#__PURE__*/_react.default.createElement(_button.default, {
+    return false;
+  };
+
+  var btnDisabled = function btnDisabled(btnKey) {
+    // 优先处理自定义的状态
+    if (btnStatus && typeof btnStatus(btnKey) === 'boolean') {
+      return btnStatus(btnKey) || false;
+    }
+
+    return isAudit();
+  };
+
+  var btns = (0, _react.useMemo)(function () {
+    var b = [/*#__PURE__*/_react.default.createElement(_button.default, {
       key: "btnBack",
       onClick: function onClick() {
         return props.onExit(false);
       },
       icon: /*#__PURE__*/_react.default.createElement(_icons.ArrowLeftOutlined, null)
-    }, btnExitText)];
+    }, btnExitText)]; // 有新增或更改权限且未审核，开放出保存按钮
+
+    if ((checkRight(2) || checkRight(4)) && !isAudit()) {
+      b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
+        key: "btnSave",
+        onClick: function onClick() {
+          var _formRef$current;
+
+          if (props.onSave) {
+            return props.onSave();
+          }
+
+          formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
+        },
+        disabled: btnDisabled('btnSave'),
+        icon: /*#__PURE__*/_react.default.createElement(_icons.SaveOutlined, null)
+      }, btnSaveText));
+    } // 转入onAudit方法且有审核权限，数据未审核，开放出审核按钮
+
 
-    if (props.onAudit) {
+    if (props.onAudit && checkRight(64) && !isAudit()) {
       b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
         key: "btnAudit",
-        disabled: btnStatus ? btnStatus('btnAudit') || false : false,
+        disabled: btnDisabled('btnAudit'),
         onClick: function onClick() {
           if (!props.onAudit) return;
           props.onAudit();
         },
-        icon: /*#__PURE__*/_react.default.createElement(_icons.CheckOutlined, null)
+        icon: /*#__PURE__*/_react.default.createElement(_icons.AuditOutlined, null)
       }, "\u5BA1\u6838"));
     }
 
+    if (props.renderButton) return props.renderButton(b);
     return b;
   }, [props]);
-  var buttons = renderButton ? renderButton(btns) : btns;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "dtl-layout"
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -89,7 +119,7 @@ function DtlLayout(props) {
     className: "dtl-title"
   }, dtlTitle), /*#__PURE__*/_react.default.createElement("div", {
     className: "dtl-btns"
-  }, buttons)), /*#__PURE__*/_react.default.createElement("div", {
+  }, btns)), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _classnames.default)('dtl-body', bodyClass),
     style: bodyStyle
   }, children));

package/lib/hooks/useDtl/index.js

@@ -31,6 +31,8 @@ var _utils = require("../../utils");
 
 var _http = require("../../http");
 
+var _usePermission2 = _interopRequireDefault(require("../usePermission"));
+
 var _excluded = ["current", "pageSize"];
 
 function useDtl(dtlParam) {
@@ -54,8 +56,16 @@ function useDtl(dtlParam) {
       btnStatus = dtlParam.btnStatus,
       beforeAudit = dtlParam.beforeAudit,
       afterAudit = dtlParam.afterAudit;
+
+  var _usePermission = (0, _usePermission2.default)(),
+      canAdd = _usePermission.canAdd,
+      canEdit = _usePermission.canEdit,
+      canDelete = _usePermission.canDelete,
+      canImport = _usePermission.canImport,
+      canExport = _usePermission.canExport;
   /** @name 选中行数据 */
 
+
   var _useState = (0, _react.useState)([]),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
       selectedRows = _useState2[0],
@@ -983,21 +993,21 @@ function useDtl(dtlParam) {
   };
 
   var tableTools = (0, _react.useMemo)(function () {
-    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    return [(toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.add) && !isAudit() && canAdd ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "add",
       onClick: function onClick() {
         return onAddDtl();
       },
       disabled: btnDisabled('add'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.PlusCircleOutlined, null)
-    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u65B0\u589E") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.edit) && !isAudit() && (canAdd || canEdit) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "edit",
       disabled: btnDisabled('edit'),
       onClick: function onClick() {
         return onEditDtl();
       },
       icon: /*#__PURE__*/_react.default.createElement(_icons.EditOutlined, null)
-    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && !isAudit() ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u7F16\u8F91") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.remove) && !isAudit() && (canAdd || canEdit || canDelete) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "remove",
       onClick: function onClick() {
         return onRemoveDtl();
@@ -1005,14 +1015,14 @@ function useDtl(dtlParam) {
       danger: true,
       disabled: btnDisabled('remove'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.DeleteOutlined, null)
-    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) ? /*#__PURE__*/_react.default.createElement(_button.default, {
+    }, "\u5220\u9664") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.import) && !isAudit() && (canAdd || canEdit || canImport) ? /*#__PURE__*/_react.default.createElement(_button.default, {
       key: "import",
       onClick: function onClick() {
         onImport();
       },
       disabled: btnDisabled('import'),
       icon: /*#__PURE__*/_react.default.createElement(_icons.ImportOutlined, null)
-    }, "\u5BFC\u5165") : false, (toolConfig === null || toolConfig === void 0 ? void 0 : toolConfig.export) ? /*#__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() {
         onExport();
@@ -1022,7 +1032,7 @@ function useDtl(dtlParam) {
     }, "\u5BFC\u51FA") : false].filter(function (o) {
       return o !== false;
     });
-  }, [selectedRows]);
+  }, [selectedRows, auditStatus, statusField, masterObject]);
   return {
     formRef: formRef,
     tableRef: tableRef,

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

@@ -3,5 +3,12 @@ declare function usePermission(): {
     permissionVal: number;
     resRightVal: number;
     checkRight: (val: number) => boolean;
+    canAdd: boolean;
+    canEdit: boolean;
+    canDelete: boolean;
+    canAudit: boolean;
+    canImport: boolean;
+    canExport: boolean;
+    canPrint: boolean;
 };
 export default usePermission;

package/lib/hooks/usePermission/index.js

@@ -12,7 +12,7 @@ var _utils = require("../../utils");
 function usePermission() {
   /** @name 资源ID */
   var resourceId = (0, _react.useMemo)(function () {
-    return (0, _utils.getUrlQuery)('resCode') || (0, _utils.getResourceProps)('resourceId');
+    return (0, _utils.getUrlQuery)('resCode') || (0, _utils.getUrlQuery)('resourceId') || (0, _utils.getResourceProps)('resourceId');
   }, []);
   /** @name 用户权限 */
 
@@ -38,7 +38,14 @@ function usePermission() {
     resourceId: resourceId,
     permissionVal: permissionVal,
     resRightVal: resRightVal,
-    checkRight: checkRight
+    checkRight: checkRight,
+    canAdd: checkRight(2),
+    canEdit: checkRight(4),
+    canDelete: checkRight(8) || checkRight(32),
+    canAudit: checkRight(64),
+    canImport: checkRight(128),
+    canExport: checkRight(256),
+    canPrint: checkRight(512)
   };
 }