ls-pro-common 1.0.19 → 1.0.22

package/es/index.d.ts

@@ -8,8 +8,9 @@ import * as utils from './utils';
 /** Hooks */
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
+import usePermission from './hooks/usePermission';
 /** Type */
 import type { ApiResponse, TableToolbar, BaseApiType, MethodType } from './typing';
 import type { DtlLyaoutProps } from './components/DtlLayout';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps };
-export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };
+export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/es/index.js

@@ -9,4 +9,5 @@ import * as utils from './utils';
 
 import useSingle from './hooks/useSingle';
 import useDtl from './hooks/useDtl';
-export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl };
+import usePermission from './hooks/usePermission';
+export { DtlLayout, InputTable, Page404, Loading, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission };

package/es/service/BaseService.d.ts

@@ -11,5 +11,6 @@ declare class BaseService {
     save(data: Record<string, any>): Promise<any>;
     /** 批量删除对象方法，@param data id集合 */
     remove(data: any[]): Promise<any>;
+    audit(data: any[]): Promise<any>;
 }
 export default BaseService;

package/es/service/BaseService.js

@@ -157,9 +157,9 @@ var BaseService = /*#__PURE__*/function () {
                   break;
                 }
 
-                _message.error("加载方法没有配置api");
+                _message.error("删除方法没有配置api");
 
-                return _context3.abrupt("return", Promise.reject("加载方法没有配置api"));
+                return _context3.abrupt("return", Promise.reject("删除方法没有配置api"));
 
               case 4:
                 if (!(this.method.delete === 'post')) {
@@ -194,6 +194,49 @@ var BaseService = /*#__PURE__*/function () {
 
       return remove;
     }()
+  }, {
+    key: "audit",
+    value: function () {
+      var _audit = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(data) {
+        var _this$api4;
+
+        var url;
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                url = (_this$api4 = this.api) === null || _this$api4 === void 0 ? void 0 : _this$api4.audit;
+
+                if (url) {
+                  _context4.next = 4;
+                  break;
+                }
+
+                _message.error("审核方法没有配置api");
+
+                return _context4.abrupt("return", Promise.reject("审核方法没有配置api"));
+
+              case 4:
+                _context4.next = 6;
+                return httpPost(url, data);
+
+              case 6:
+                return _context4.abrupt("return", _context4.sent);
+
+              case 7:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4, this);
+      }));
+
+      function audit(_x4) {
+        return _audit.apply(this, arguments);
+      }
+
+      return audit;
+    }()
   }]);
 
   return BaseService;

package/es/typing.d.ts

@@ -15,6 +15,8 @@ export declare type TableToolbar = {
     remove?: boolean;
     export?: boolean;
     import?: boolean;
+    audit?: boolean;
+    config?: boolean;
     print?: boolean;
 };
 /** 基础模块接口类型 */
@@ -31,6 +33,8 @@ export declare type BaseApiType = {
     import?: string;
     /**导出数据api,如果跟加载数据api一致，可不指定 */
     export?: string;
+    /** 审核接口 */
+    audit?: string;
 };
 /**请求后端接口方法 */
 export declare type MethodType = {

package/es/utils/index.js

@@ -52,7 +52,7 @@ export var setCookie = function setCookie(key, value) {
  */
 
 export var isLogin = function isLogin() {
-  return !!getCookie('inline');
+  return !!getCookie('online');
 };
 /**
  * 设置本地缓存

package/lib/components/DtlLayout.d.ts

@@ -2,18 +2,33 @@ import React from 'react';
 import type { ProFormInstance } from 'ls-pro-form';
 import './common.less';
 export declare type DtlLyaoutProps = Record<string, any> & {
+    /** 返回方法 */
     onExit: (visible?: boolean) => void;
+    /** 保存方法 */
     onSave?: () => void;
+    /** 自定义按钮方法 */
     renderButton?: (defaultBtn: JSX.Element[]) => JSX.Element[];
+    /** 审核方法 */
+    onAudit?: () => void;
+    /** 保存按钮文本 */
     btnSaveText?: string;
+    /** 返回按钮文本 */
     btnExitText?: string;
+    /** 标题 */
     title?: string;
+    /** 主表对象 */
     masterObject?: any;
+    /** 主表主键字段 */
     keyField?: string;
+    /** body类 */
     bodyClass?: string;
+    /** header 类 */
     headerClass?: string;
+    /** body样式 */
     bodyStyle?: React.CSSProperties;
+    /** header样式 */
     headerStyle?: React.CSSProperties;
+    /** 表单ref */
     formRef?: React.MutableRefObject<ProFormInstance | undefined>;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;

package/lib/components/DtlLayout.js

@@ -42,25 +42,36 @@ function DtlLayout(props) {
     if (!masterObject) return '';
     return masterObject[keyField] ? '编辑' : '新增';
   }, [title, masterObject, keyField]);
-  var btns = [/*#__PURE__*/_react.default.createElement(_button.default, {
-    key: "btnSave",
-    onClick: function onClick() {
-      var _formRef$current;
+  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();
-      }
+        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();
-    },
-    icon: /*#__PURE__*/_react.default.createElement(_icons.SaveOutlined, null)
-  }, " ", btnSaveText, " "), /*#__PURE__*/_react.default.createElement(_button.default, {
-    key: "btnBack",
-    onClick: function onClick() {
-      return props.onExit(false);
-    },
-    icon: /*#__PURE__*/_react.default.createElement(_icons.ArrowLeftOutlined, null)
-  }, "  ", btnExitText, " ")];
+        formRef === null || formRef === void 0 ? void 0 : (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.submit();
+      },
+      icon: /*#__PURE__*/_react.default.createElement(_icons.SaveOutlined, null)
+    }, btnSaveText), /*#__PURE__*/_react.default.createElement(_button.default, {
+      key: "btnBack",
+      onClick: function onClick() {
+        return props.onExit(false);
+      },
+      icon: /*#__PURE__*/_react.default.createElement(_icons.ArrowLeftOutlined, null)
+    }, btnExitText)];
+
+    if (props.onAudit) {
+      b.unshift( /*#__PURE__*/_react.default.createElement(_button.default, {
+        key: "btnAudit",
+        icon: /*#__PURE__*/_react.default.createElement(_icons.CheckOutlined, null)
+      }, "\u5BA1\u6838"));
+    }
+
+    return b;
+  }, [props]);
   var buttons = renderButton ? renderButton(btns) : btns;
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "dtl-layout"

package/lib/components/InputTable.d.ts

@@ -12,6 +12,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     textField?: string;
     textName?: string;
     tableConfig?: any;
+    labelWidth?: number;
     onSelectChange?: (item: any) => void;
 };
 declare function InputTable(prop: InputTableProps): JSX.Element;

package/lib/components/InputTable.js

@@ -43,7 +43,7 @@ var _icons = require("@ant-design/icons");
 
 var _http = require("../http");
 
-var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "textField", "onSelectChange"],
+var _excluded = ["columns", "url", "textName", "name", "tableConfig", "tableHeight", "tableWidth", "readonly", "multiple", "valueField", "labelWidth", "textField", "onSelectChange"],
     _excluded2 = ["current", "pageSize"];
 
 function InputTable(prop) {
@@ -81,6 +81,8 @@ function InputTable(prop) {
       readonly = _prop$readonly === void 0 ? true : _prop$readonly,
       multiple = prop.multiple,
       valueField = prop.valueField,
+      _prop$labelWidth = prop.labelWidth,
+      labelWidth = _prop$labelWidth === void 0 ? 70 : _prop$labelWidth,
       textField = prop.textField,
       onSelectChange = prop.onSelectChange,
       rest = (0, _objectWithoutProperties2.default)(prop, _excluded);
@@ -145,7 +147,7 @@ function InputTable(prop) {
     manualRequest: false,
     actionRef: tableRef,
     search: {
-      labelWidth: 70
+      labelWidth: labelWidth
     },
     options: {
       density: false,
@@ -155,7 +157,8 @@ function InputTable(prop) {
     form: {
       submitter: {
         resetButtonProps: false
-      }
+      },
+      btnInline: true
     },
     height: 'full',
     rowSelection: {

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

@@ -15,17 +15,19 @@ declare function useDtl(dtlParam: DtlParamType): {
     selectedRows: any;
     showEdit: boolean;
     editItem: any;
-    tableTools: JSX.Element[];
+    tableTools: (boolean | JSX.Element)[];
     setSelectedRows: import("react").Dispatch<any>;
     setShowEdit: import("react").Dispatch<import("react").SetStateAction<boolean>>;
     setEditItem: import("react").Dispatch<any>;
-    onRemoveDtl: () => void;
+    onRemoveDtl: (rows?: any) => void;
     onSaveDtl: (formData: any) => Promise<boolean>;
     onLoadDtl: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
-    onAddDtl: () => Promise<boolean>;
-    onEditDtl: () => Promise<boolean>;
+    onAddDtl: (item?: any) => Promise<boolean>;
+    onEditDtl: (item?: any) => Promise<boolean>;
     onSaveMst: (values: any) => Promise<boolean>;
     onRemoveMst: () => Promise<boolean | undefined>;
     onExportDtl: (url: string, param: exportParam) => Promise<boolean>;
+    isAudit: () => boolean;
+    onAudit: () => Promise<void>;
 };
 export default useDtl;