@cqsjjb/jjb-react-admin-component 3.3.2 → 3.3.3

package/PageLayout/index.less

@@ -22,7 +22,7 @@
   .@{com-prefix-cls}-layout-container-tools {
     margin-top: 0;
     margin-bottom: 0;
-    padding: 0 20px 16px 20px;
+    padding: 0 20px 0 20px;
   }
 
   .@{com-prefix-cls}-layout-container-content {

package/SearchForm/index.d.ts

@@ -11,8 +11,6 @@ export interface SearchFormProps {
   expand?: boolean;
   // 内部默认展开状态，仅在 expand 未传入时生效 默认-false
   defaultExpand?: boolean;
-  // 列数 默认-3
-  colSize?: number;
   // 查询 loading 状态 默认-false
   loading?: boolean;
   // 表单行节点数组 默认-[]

package/SearchForm/index.js

@@ -9,7 +9,6 @@ const SearchForm = ({
   // 受控
   defaultExpand = false,
   // 内部默认展开
-  colSize = 3,
   loading = false,
   formLine = [],
   initialValues = {},
@@ -83,7 +82,7 @@ const SearchForm = ({
       formInstance.resetFields();
       onReset(formInstance.getFieldsValue());
     }
-  }, "\u91CD\u7F6E"), formLine.length / colSize > 1 && /*#__PURE__*/React.createElement(Button, {
+  }, "\u91CD\u7F6E"), formLine.length > 2 && /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(DoubleRightOutlined, {
       style: {
         transform: isOpen ? 'rotate(-90deg)' : 'rotate(90deg)'
@@ -118,10 +117,10 @@ const SearchForm = ({
       show: true,
       node
     }));
-    if (isOpen || arr.length <= 3) {
+    if (isOpen || arr.length <= 2) {
       return arr;
     }
-    return arr.map((item, index) => index > 2 ? {
+    return arr.map((item, index) => index > 1 ? {
       ...item,
       show: false
     } : item);
@@ -140,14 +139,21 @@ const SearchForm = ({
     gutter: [16, 16]
   }, formItemList.map((item, index) => /*#__PURE__*/React.createElement(Col, {
     key: index,
-    span: 24 / colSize,
+    span: 8,
     style: {
       display: item.show ? 'block' : 'none'
     }
   }, item.node)), /*#__PURE__*/React.createElement(Col, {
-    span: 24 / colSize
+    span: 8,
+    style: {
+      display: 'flex',
+      alignItems: 'flex-start'
+    }
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    noStyle: true
+    noStyle: true,
+    style: {
+      marginBottom: 0
+    }
   }, getButtons()))));
 };
 export default SearchForm;

package/Table/index.js

@@ -92,7 +92,6 @@ export default function TablePro(props) {
       y: scrollY || 0
     } : undefined,
     className: `${antPrefix}-gbs-pro-table`,
-    size: "default",
     options: options
   }, restProps, {
     columns: restProps.columns

package/Table/index.less

@@ -6,7 +6,7 @@
       &-body {
         .@{com-prefix-cls}-pro-table-list-toolbar {
           &-container {
-            padding-top: 0;
+            padding-block: 0;
           }
         }
       }

package/TableAction/index.js

@@ -1,12 +1,10 @@
 import React from 'react';
 import { tools } from '@cqsjjb/jjb-common-lib';
-import { MoreOutlined } from '@ant-design/icons';
 import { Dropdown, Space } from 'antd';
 export default function TableAction({
   maximum = 3,
   children,
   space,
-  icon: Icon = MoreOutlined,
   placement = 'bottomRight',
   // 下拉菜单位置，默认 bottomRight
   trigger = ['hover'] // 下拉触发方式，默认 hover
@@ -26,5 +24,5 @@ export default function TableAction({
     },
     placement: placement,
     trigger: trigger
-  }, /*#__PURE__*/React.createElement("a", null, /*#__PURE__*/React.createElement(Icon, null))));
+  }, /*#__PURE__*/React.createElement("a", null, "\u66F4\u591A")));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cqsjjb/jjb-react-admin-component",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "description": "jjb-react-admin-组件库@new",
   "main": "index.js",
   "author": "jjb-front-team",