Merge branch 'master' of http://47.103.50.109:8091/heartrainy/sage-front-framework

src/components/Common/Button/index.jsx

@@ -13,7 +13,7 @@ const SageButton = (props) => {
   }
 
   return (
-    <Button {...componentProps} className={`sage-button-${componentProps.type}`} />
+    <Button {...componentProps} className={`sage-button-${componentProps.type} ${componentProps.className ? componentProps.className : ''}`} />
   )
 }
 

src/components/Common/Form/index.jsx

@@ -113,6 +113,7 @@ const SageForm = (props, ref) => {
   useImperativeHandle(ref, () => ({
     submit: () => form.submit(),
     validateFields: (nameList) => form.validateFields(nameList),
+    getFieldValue: (name) => form.getFieldValue(name),
     getFieldsValue: (nameList) => form.getFieldsValue(nameList),
     setFieldsValue: (values) => form.setFieldsValue(values),
     resetFields: (fields) => form.resetFields(fields)
@@ -122,7 +123,7 @@ const SageForm = (props, ref) => {
   formNode = formFields.map((item, index) => {
 
     const { isShow = true } = item
-    if (!isShow) return null
+    // if (!isShow) return null
 
     const FormComponent = FormComponentType[item.type]
 
@@ -240,7 +241,7 @@ const SageForm = (props, ref) => {
     }
 
     return (
-      <Col key={`col_key_${item.name}`} span={item.span || (24 / colNum)}>
+      <Col className={!isShow ? 'sage-hidden' : ''} key={`col_key_${item.name}`} span={item.span || (24 / colNum)}>
         <Form.Item
           {...formItemProps}
         >

src/components/Common/TableTool/components/ColumnSetting/style.less

-.sage-pro-table {
-  .ant-popover-inner-content {
-    padding: 0;
-  }
-}
-
-
 .sage-table-column-setting-title {
   display: flex;
   align-items: center;
@@ -22,6 +15,6 @@
     display: flex;
     align-items: center;
     width: 100%;
-    padding: 4px 16px;
+    padding: 4px 16px 4px 0;
   }
 }