@cqsjjb/jjb-react-admin-component 3.0.6 → 3.0.7

package/SearchForm/index.js

@@ -75,7 +75,7 @@ class searchForm extends React.Component {
       onFinish
     } = this.props;
     const formItemList = this.groupsList();
-    return /*#__PURE__*/React.createElement(Form, {
+    return formItemList.length > 0 ? /*#__PURE__*/React.createElement(Form, {
       ref: form || this.form,
       style: style,
       initialValues: initialValues,
@@ -92,7 +92,7 @@ class searchForm extends React.Component {
       span: 24 / colSize
     }, /*#__PURE__*/React.createElement(Form.Item, {
       noStyle: true
-    }, this.getButtons()))));
+    }, this.getButtons())))) : /*#__PURE__*/React.createElement(React.Fragment, null);
   }
 }
 searchForm.defaultProps = {

package/SearchForm/index.mjs

@@ -33,8 +33,12 @@ class searchForm extends React.Component {
           icon={<UndoOutlined />}
           loading={loading}
           onClick={() => {
-            form?form.current.resetFields():this.form.current.resetFields()
-            onReset(form?form.current.getFieldsValue():this.form.current.getFieldsValue())
+            form
+              ? form.current.resetFields()
+              : this.form.current.resetFields();
+            onReset(form
+              ? form.current.getFieldsValue()
+              : this.form.current.getFieldsValue());
           }}
         >
           重置
@@ -62,24 +66,24 @@ class searchForm extends React.Component {
   }
 
   groupsList () {
-    const arr = []
-    this.props.formLine.forEach(i=>{
+    const arr = [];
+    this.props.formLine.forEach(i => {
       arr.push({
         show: true,
         node: i
-      })
-    })
+      });
+    });
     if (this.props.expand && this.state.isOpen) {
       return arr;
     }
-    if(!this.props.expand && arr.length>3){
+    if (!this.props.expand && arr.length > 3) {
       return arr;
     }
-    arr.forEach((i,index)=> {
-      if(index>2){
-        i.show=false
+    arr.forEach((i, index) => {
+      if (index > 2) {
+        i.show = false;
       }
-    })
+    });
     return arr;
   }
 
@@ -98,31 +102,37 @@ class searchForm extends React.Component {
       onFinish
     } = this.props;
     const formItemList = this.groupsList();
-    return (
-      <Form
-        ref={ form || this.form}
-        style={style}
-        initialValues={initialValues}
-        onFinish={values => onFinish(values)}
-      >
-        <Row gutter={[ 16, 16 ]}>
-          {formItemList.map((item, index) => (
-            <Col
-              style={{display:item.show?'block':'none'}}
-              key={index}
-              span={24 / colSize}
-            >
-              {item.node}
+    return formItemList.length > 0
+      ? (
+        <Form
+          ref={form || this.form}
+          style={style}
+          initialValues={initialValues}
+          onFinish={values => onFinish(values)}
+        >
+          <Row gutter={[ 16, 16 ]}>
+            {formItemList.map((item, index) => (
+              <Col
+                style={{
+                  display: item.show
+                    ? 'block'
+                    : 'none'
+                }}
+                key={index}
+                span={24 / colSize}
+              >
+                {item.node}
+              </Col>
+            ))}
+            <Col span={24 / colSize}>
+              <Form.Item noStyle>
+                {this.getButtons()}
+              </Form.Item>
             </Col>
-          ))}
-          <Col span={24 / colSize}>
-            <Form.Item noStyle>
-              {this.getButtons()}
-            </Form.Item>
-          </Col>
-        </Row>
-      </Form>
-    );
+          </Row>
+        </Form>
+      )
+      : <></>;
   }
 }
 
@@ -133,9 +143,12 @@ searchForm.defaultProps = {
   loading: false,
   formLine: [],
   initialValues: {},
-  onRef: () => {},
-  onReset: () => {},
-  onFinish: () => {},
+  onRef: () => {
+  },
+  onReset: () => {
+  },
+  onFinish: () => {
+  }
 };
 searchForm.propTypes = {
   form: PropTypes.object,
@@ -147,6 +160,6 @@ searchForm.propTypes = {
   initialValues: PropTypes.object,
   onRef: PropTypes.func,
   onReset: PropTypes.func,
-  onFinish: PropTypes.func,
+  onFinish: PropTypes.func
 };
 export default searchForm;

package/package.json

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