@bit-sun/business-component 2.2.39 → 2.2.41-alpha.0

package/src/components/Business/BsSulaQueryTable/SearchItemSetting.tsx

@@ -79,7 +79,7 @@ class SearchItemTable extends React.Component {
   };
 
   patchConfigToLocalstorage = (configvalue) => {
-    const { setShowSearchFields } = this.props;
+    const { setShowSearchFields, datasource = [] } = this.props;
     const { sortDataSource, bsTableCode } = this.state;
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION) || '[]'
     let configArray = JSON.parse(config)
@@ -97,7 +97,22 @@ class SearchItemTable extends React.Component {
     this.setState({
       visible: false,
     });
-    setShowSearchFields([...sortDataSource]);
+    if(configvalue){
+      setShowSearchFields([...sortDataSource]);
+    }else{
+      this.setState({
+        isDefaultValue: true,
+        dataSource: [...datasource.map((item)=>({
+          ...item,
+          hidden: false
+        }))],
+        sortDataSource: [...datasource.map((item)=>({
+          ...item,
+          hidden: false
+        }))]
+      });
+      setShowSearchFields([...datasource]);
+    }
   };
 
   setInitValue = (isClick = false) => {
@@ -362,6 +377,10 @@ class SearchItemTable extends React.Component {
     this.setInitValue(true);
   };
 
+  handleResetSetting = () =>{
+    this.patchUserSearchFieldsConfig('');
+  }
+
   onSearch = (e: any) => {
     this.setState({
       searchDataSource: e.target.value,
@@ -396,15 +415,22 @@ class SearchItemTable extends React.Component {
             onOk={this.handleOk}
             onCancel={this.handleCancel}
             footer={[
-              <Button key="back" onClick={this.handleReset}>
-                恢复默认
-              </Button>,
-              <Button key="submit" onClick={this.handleCancel}>
-                取消
-              </Button>,
-              <Button key="submit" type="primary" onClick={this.handleOk}>
-                确认
-              </Button>,
+              <div>
+                <Button key="back" onClick={this.handleReset} style={{marginRight: 0}}>
+                  恢复默认
+                </Button>,
+                <Button key="back" onClick={this.handleResetSetting}>
+                  重置设置
+                </Button>
+              </div>,
+              <div>
+                <Button key="submit" onClick={this.handleCancel} style={{marginRight: 0}}>
+                  取消
+                </Button>,
+                <Button key="submit" type="primary" onClick={this.handleOk}>
+                  确认
+                </Button>
+              </div>,
             ]}
           >
             <div className={'sort_table'}>

package/src/components/Business/BsSulaQueryTable/index.less

@@ -145,7 +145,9 @@
     height: 70px;
     border: 0;
     padding: 20px;
-
+    display: flex;
+    justify-content: space-between;
+    
     .ant-btn {
       width: 80px;
       height: 34px;
@@ -160,9 +162,9 @@
         line-height: 20px;
       }
 
-      &:first-child {
-        margin-right: 524px;
-      }
+      // &:first-child {
+      //   margin-right: 524px;
+      // }
     }
   }
 

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -86,7 +86,7 @@ class SortableTable extends React.Component {
   };
 
   patchConfigToLocalstorage = (configvalue) => {
-    const { setShowColumns } = this.props;
+    const { setShowColumns, datasource = []  } = this.props;
     const { sortDataSource, bsTableCode } = this.state;
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]'
     let configArray = JSON.parse(config)
@@ -104,7 +104,22 @@ class SortableTable extends React.Component {
     this.setState({
       visible: false,
     });
-    setShowColumns([...sortDataSource]);
+    if(configvalue){
+      setShowColumns([...sortDataSource]);
+    }else{
+      this.setState({
+        isDefaultValue: true,
+        dataSource: [...datasource.map((item)=>({
+          ...item,
+          hidden: false
+        }))],
+        sortDataSource: [...datasource.map((item)=>({
+          ...item,
+          hidden: false
+        }))]
+      });
+      setShowColumns([...datasource]);
+    }
   };
 
   setInitValue = (isClick = false) => {
@@ -570,6 +585,10 @@ class SortableTable extends React.Component {
     this.setInitValue(true);
   };
 
+  handleResetSetting = () =>{
+    this.patchUserColumnConfig('');
+  }
+
   onSearch = (e: any) => {
     this.setState({
       searchDataSource: e.target.value,
@@ -606,15 +625,22 @@ class SortableTable extends React.Component {
             onOk={this.handleOk}
             onCancel={this.handleCancel}
             footer={[
-              <Button key="back" onClick={this.handleReset}>
-                恢复默认
-              </Button>,
-              <Button key="submit" onClick={this.handleCancel}>
-                取消
-              </Button>,
-              <Button key="submit" type="primary" onClick={this.handleOk}>
-                确认
-              </Button>,
+              <div>
+                <Button key="back" onClick={this.handleReset} style={{marginRight: 0}}>
+                  恢复默认
+                </Button>,
+                <Button key="back" onClick={this.handleResetSetting}>
+                  重置设置
+                </Button>
+              </div>,
+              <div>
+                <Button key="submit" onClick={this.handleCancel} style={{marginRight: 0}}>
+                  取消
+                </Button>,
+                <Button key="submit" type="primary" onClick={this.handleOk}>
+                  确认
+                </Button>
+              </div>
             ]}
           >
             <div className={'sort_table'}>

package/src/components/Functional/SearchSelect/index.tsx

@@ -614,13 +614,13 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     },
     getCheckboxProps: () => {
       return ({
-        disabled: selectProps?.disabled || props?.disabled || !items.length,
+        disabled: selectProps?.disabled || props?.disabled || (!items.length && !tableData.length),
       })
     },
   };
 
   const onDoubleClickSelect = (e, record) => {
-    if (!selectMode && !(selectProps?.disabled || props?.disabled || !items.length)) {
+    if (!selectMode && !(selectProps?.disabled || props?.disabled || (!items.length && !tableData.length))) {
       const srs = [JSON.parse(JSON.stringify(record))]
       const sks = srs.map((i: any) => i.value)
       onChangeSelectedKeys(sks, srs)