ls-pro-common 3.0.50 → 3.0.52

package/es/components/DtlLayout.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { ProFormInstance } from 'ls-pro-form';
+import { ButtonProps } from 'antd';
 import './common.less';
 export declare type DtlLyaoutProps = Record<string, any> & {
     /** 返回方法 */
@@ -39,6 +40,9 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     /** 审核状态值 */
     auditStatus?: number;
     isView?: boolean;
+    saveBtnProps?: ButtonProps;
+    backBtnProps?: ButtonProps;
+    auditBtnProps?: ButtonProps;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;
 export default DtlLayout;

package/es/components/DtlLayout.js

@@ -2,6 +2,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
+import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { SaveOutlined, AuditOutlined } from '@ant-design/icons';
@@ -52,18 +53,18 @@ function DtlLayout(props) {
     return isAudit();
   };
   var btns = useMemo(function () {
-    var back = /*#__PURE__*/React.createElement(_Button, {
+    var back = /*#__PURE__*/React.createElement(_Button, _extends({
       key: "btnBack",
       onClick: function onClick() {
         return props.onExit(false);
       },
       className: "ant-btn-gray",
       icon: /*#__PURE__*/React.createElement(IconBack, null)
-    }, btnExitText);
+    }, props.backBtnProps), btnExitText);
     var btnList = [back];
     // 有新增或更改权限且未审核，开放出保存按钮
     if (btnSaveText && (checkRight(2) || checkRight(4)) && !isAudit() && !isView) {
-      btnList.unshift( /*#__PURE__*/React.createElement(_Button, {
+      btnList.unshift( /*#__PURE__*/React.createElement(_Button, _extends({
         key: "btnSave",
         onClick: function onClick() {
           var _formRef$current;
@@ -74,11 +75,11 @@ function DtlLayout(props) {
         },
         disabled: btnDisabled('btnSave'),
         icon: /*#__PURE__*/React.createElement(SaveOutlined, null)
-      }, btnSaveText));
+      }, props.saveBtnProps), btnSaveText));
     }
     // 转入onAudit方法且有审核权限，数据未审核，开放出审核按钮
     if (btnAuditText && props.onAudit && checkRight(64) && !isAudit() && !isView) {
-      btnList.unshift( /*#__PURE__*/React.createElement(_Button, {
+      btnList.unshift( /*#__PURE__*/React.createElement(_Button, _extends({
         key: "btnAudit",
         disabled: btnDisabled('btnAudit'),
         onClick: function onClick() {
@@ -86,7 +87,7 @@ function DtlLayout(props) {
           props.onAudit();
         },
         icon: /*#__PURE__*/React.createElement(AuditOutlined, null)
-      }, btnAuditText));
+      }, props.auditBtnProps), btnAuditText));
     }
     // 如果用户直接返回空，还是需要把返回按钮加上。
     if (props.renderButton) {

package/es/components/InputTable.js

@@ -334,6 +334,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
         var _formRef$current15, _formRef$current15$se;
         formRef === null || formRef === void 0 ? void 0 : (_formRef$current15 = formRef.current) === null || _formRef$current15 === void 0 ? void 0 : (_formRef$current15$se = _formRef$current15.setFieldsValue) === null || _formRef$current15$se === void 0 ? void 0 : _formRef$current15$se.call(_formRef$current15, _objectSpread({}, formValue));
       }
+      if (onSelectChange) {
+        try {
+          onSelectChange(null, formRef);
+        } catch (e) {}
+      }
     }
   };
   useEffect(function () {

package/es/components/antd-custom.less

@@ -404,4 +404,53 @@
 
 .ant-table td.ant-table-cell {
   color: #5b5b5b
+}
+
+.ant-pro-form-query-filter.ant-form-vertical {
+  .ant-form-item-label {
+    padding: 0;
+  }
+}
+
+.ant-pro-form-query-filter {
+  .ant-input-number-input {
+    height: 28px;
+  }
+
+  .ant-input-group.ant-input-group-compact>*:first-child {
+    border-radius: 0 !important;
+    border-top-left-radius: 4px !important;
+    border-bottom-left-radius: 4px !important;
+  }
+
+  .ant-input-group.ant-input-group-compact>*:last-child {
+    border-radius: 0 !important;
+    border-top-left-radius: 4px !important;
+    border-bottom-left-radius: 4px !important;
+  }
+
+}
+
+.ant-input-number-group>.ant-input-number:not(:first-child):not(:last-child) {
+  border-radius: 0 !important;
+}
+
+.ant-pro-table {
+
+  .ant-table:not(.ant-table-has-fix-right),
+  .ant-table.ant-table-empty {
+    .ant-table-container {
+      .ant-table-body {
+        overflow: auto !important;
+      }
+    }
+  }
+
+  .ant-table.ant-table-has-fix-right:not(.ant-table-empty) {
+    .ant-table-container {
+      .ant-table-body {
+        overflow: scroll !important;
+      }
+    }
+  }
 }

package/es/hooks/useDtl/index.js

@@ -124,16 +124,21 @@ function useDtl(dtlParam) {
             return _context.abrupt("return", false);
           case 23:
             if (!((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0')) {
-              _context.next = 28;
+              _context.next = 29;
               break;
             }
             showSuccess(result.flag.retMsg || '操作成功');
-            Object.assign(masterObject, result.data);
+            if (result.data) {
+              Object.assign(masterObject, result.data);
+            }
+            if (!masterObject.id && result.id) {
+              masterObject.id = result.id;
+            }
             setEditItem({});
             return _context.abrupt("return", true);
-          case 28:
-            return _context.abrupt("return", false);
           case 29:
+            return _context.abrupt("return", false);
+          case 30:
           case "end":
             return _context.stop();
         }
@@ -302,7 +307,7 @@ function useDtl(dtlParam) {
             return _context3.abrupt("return", false);
           case 13:
             if (!ids) {
-              ids = [masterObject[mstKeyField]];
+              ids = [masterObject.id || masterObject[mstKeyField]]; //优先取id为主键，除非表中无id
             }
             _context3.next = 16;
             return mstService.remove(ids);

package/lib/components/DtlLayout.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import type { ProFormInstance } from 'ls-pro-form';
+import { ButtonProps } from 'antd';
 import './common.less';
 export declare type DtlLyaoutProps = Record<string, any> & {
     /** 返回方法 */
@@ -39,6 +40,9 @@ export declare type DtlLyaoutProps = Record<string, any> & {
     /** 审核状态值 */
     auditStatus?: number;
     isView?: boolean;
+    saveBtnProps?: ButtonProps;
+    backBtnProps?: ButtonProps;
+    auditBtnProps?: ButtonProps;
 };
 declare function DtlLayout(props: DtlLyaoutProps): JSX.Element;
 export default DtlLayout;

package/lib/components/DtlLayout.js

@@ -2,6 +2,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
+import _extends from "@babel/runtime/helpers/esm/extends";
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { SaveOutlined, AuditOutlined } from '@ant-design/icons';
@@ -52,18 +53,18 @@ function DtlLayout(props) {
     return isAudit();
   };
   var btns = useMemo(function () {
-    var back = /*#__PURE__*/React.createElement(_Button, {
+    var back = /*#__PURE__*/React.createElement(_Button, _extends({
       key: "btnBack",
       onClick: function onClick() {
         return props.onExit(false);
       },
       className: "ant-btn-gray",
       icon: /*#__PURE__*/React.createElement(IconBack, null)
-    }, btnExitText);
+    }, props.backBtnProps), btnExitText);
     var btnList = [back];
     // 有新增或更改权限且未审核，开放出保存按钮
     if (btnSaveText && (checkRight(2) || checkRight(4)) && !isAudit() && !isView) {
-      btnList.unshift( /*#__PURE__*/React.createElement(_Button, {
+      btnList.unshift( /*#__PURE__*/React.createElement(_Button, _extends({
         key: "btnSave",
         onClick: function onClick() {
           var _formRef$current;
@@ -74,11 +75,11 @@ function DtlLayout(props) {
         },
         disabled: btnDisabled('btnSave'),
         icon: /*#__PURE__*/React.createElement(SaveOutlined, null)
-      }, btnSaveText));
+      }, props.saveBtnProps), btnSaveText));
     }
     // 转入onAudit方法且有审核权限，数据未审核，开放出审核按钮
     if (btnAuditText && props.onAudit && checkRight(64) && !isAudit() && !isView) {
-      btnList.unshift( /*#__PURE__*/React.createElement(_Button, {
+      btnList.unshift( /*#__PURE__*/React.createElement(_Button, _extends({
         key: "btnAudit",
         disabled: btnDisabled('btnAudit'),
         onClick: function onClick() {
@@ -86,7 +87,7 @@ function DtlLayout(props) {
           props.onAudit();
         },
         icon: /*#__PURE__*/React.createElement(AuditOutlined, null)
-      }, btnAuditText));
+      }, props.auditBtnProps), btnAuditText));
     }
     // 如果用户直接返回空，还是需要把返回按钮加上。
     if (props.renderButton) {

package/lib/components/InputTable.js

@@ -334,6 +334,11 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
         var _formRef$current15, _formRef$current15$se;
         formRef === null || formRef === void 0 ? void 0 : (_formRef$current15 = formRef.current) === null || _formRef$current15 === void 0 ? void 0 : (_formRef$current15$se = _formRef$current15.setFieldsValue) === null || _formRef$current15$se === void 0 ? void 0 : _formRef$current15$se.call(_formRef$current15, _objectSpread({}, formValue));
       }
+      if (onSelectChange) {
+        try {
+          onSelectChange(null, formRef);
+        } catch (e) {}
+      }
     }
   };
   useEffect(function () {

package/lib/components/antd-custom.less

@@ -404,4 +404,53 @@
 
 .ant-table td.ant-table-cell {
   color: #5b5b5b
+}
+
+.ant-pro-form-query-filter.ant-form-vertical {
+  .ant-form-item-label {
+    padding: 0;
+  }
+}
+
+.ant-pro-form-query-filter {
+  .ant-input-number-input {
+    height: 28px;
+  }
+
+  .ant-input-group.ant-input-group-compact>*:first-child {
+    border-radius: 0 !important;
+    border-top-left-radius: 4px !important;
+    border-bottom-left-radius: 4px !important;
+  }
+
+  .ant-input-group.ant-input-group-compact>*:last-child {
+    border-radius: 0 !important;
+    border-top-left-radius: 4px !important;
+    border-bottom-left-radius: 4px !important;
+  }
+
+}
+
+.ant-input-number-group>.ant-input-number:not(:first-child):not(:last-child) {
+  border-radius: 0 !important;
+}
+
+.ant-pro-table {
+
+  .ant-table:not(.ant-table-has-fix-right),
+  .ant-table.ant-table-empty {
+    .ant-table-container {
+      .ant-table-body {
+        overflow: auto !important;
+      }
+    }
+  }
+
+  .ant-table.ant-table-has-fix-right:not(.ant-table-empty) {
+    .ant-table-container {
+      .ant-table-body {
+        overflow: scroll !important;
+      }
+    }
+  }
 }

package/lib/hooks/useDtl/index.js

@@ -124,16 +124,21 @@ function useDtl(dtlParam) {
             return _context.abrupt("return", false);
           case 23:
             if (!((result === null || result === void 0 ? void 0 : (_result$flag = result.flag) === null || _result$flag === void 0 ? void 0 : _result$flag.retCode) === '0')) {
-              _context.next = 28;
+              _context.next = 29;
               break;
             }
             showSuccess(result.flag.retMsg || '操作成功');
-            Object.assign(masterObject, result.data);
+            if (result.data) {
+              Object.assign(masterObject, result.data);
+            }
+            if (!masterObject.id && result.id) {
+              masterObject.id = result.id;
+            }
             setEditItem({});
             return _context.abrupt("return", true);
-          case 28:
-            return _context.abrupt("return", false);
           case 29:
+            return _context.abrupt("return", false);
+          case 30:
           case "end":
             return _context.stop();
         }
@@ -302,7 +307,7 @@ function useDtl(dtlParam) {
             return _context3.abrupt("return", false);
           case 13:
             if (!ids) {
-              ids = [masterObject[mstKeyField]];
+              ids = [masterObject.id || masterObject[mstKeyField]]; //优先取id为主键，除非表中无id
             }
             _context3.next = 16;
             return mstService.remove(ids);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.50",
+  "version": "3.0.52",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [
@@ -21,8 +21,8 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "^3.0.34",
-    "ls-pro-form": "^3.0.12",
+    "ls-pro-table": "^3.0.36",
+    "ls-pro-form": "^3.0.14",
     "ls-pro-field": "^3.0.6",
     "ls-pro-descriptions": "^3.0.1",
     "ls-pro-card": "^3.0.3",