@bit-sun/business-component 2.2.3 → 2.2.5

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

@@ -8,11 +8,13 @@ import {
   authFn,
   queryParams,
 } from './utils';
-import { Menu, Tooltip, } from 'antd';
+import { Menu, Tooltip, Dropdown } from 'antd';
 import SortableTable from './setting';
+import SearchItemTable from "./SearchItemSetting";
 import { Resizable } from 'react-resizable';
 import quanping from '../../../assets/icon-quanping.svg';
 import scanning from '../../../assets/scanning.svg';
+import shezhi from '../../../assets/icon-shezhi.svg';
 import { debounce } from 'lodash';
 import ExportIcon from '@/components/Functional/ExportFunctions/ExportIcon';
 import ENUM from '@/utils/enumConfig';
@@ -52,8 +54,8 @@ export default (props: any) => {
   const [isFullScreen, setIsFnllScreen]: any = useState(false);
   // @ts-nocheck
   const [value, setValue]: any = useState(props);
-  const [showColumn, setShowColumns] = useState([]);
-
+  const [showColumn, setShowColumns] = useState([]); // 列字段
+  const [showSearchFields, setShowSearchFields] = useState([]); //搜索项字段
   const { isPage = true, pagination, tableCode } = props;
 
   const [height, setHeight]: any = useState('100vh');
@@ -93,8 +95,8 @@ export default (props: any) => {
     return isFull;
   }
 
-  const getConfigFromlocalstorage = () => {
-    let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+  const getConfigFromlocalstorage = (type: string) => {
+    let config = localStorage.getItem(type) || '[]';
     let configArray = JSON.parse(config);
     let configSetting = configArray.filter(
       (item) => item.code === bsTableCode,
@@ -154,7 +156,7 @@ export default (props: any) => {
       columns: [...props.columns],
     });
     const { columns } = props;
-    let columnConfig = getConfigFromlocalstorage();
+    let columnConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.COLUMN_CONDITION);
     let showColumns = columnConfig.length ? columnConfig.map((item) => {
       let inner = columns.filter(
         (inneritem) => {
@@ -188,12 +190,35 @@ export default (props: any) => {
       });
     });
     setShowColumns([...showColumns]);
+
+  }
+
+  const setInitialSearchFieldsInfo = () =>{
+    //获取搜索字段的缓存配置
+    const { fields } = props;
+    let searchFieldsConfig = getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION);
+    let showSearchFields = searchFieldsConfig.length ? searchFieldsConfig.map((item) => {
+      let inner = fields.filter(
+        (inneritem) => {
+          let innerKey = Array.isArray(inneritem.name) ? JSON.stringify(inneritem.name) : inneritem.name;
+          let itemKey = Array.isArray(item.name) ? JSON.stringify(item.name) : item.name;
+          return innerKey && innerKey === itemKey;
+        }
+      )[0];
+
+      return {
+        ...inner,
+        ...item,
+      };
+    }) : fields;
+    setShowSearchFields([...showSearchFields])
   }
 
   //组件初始挂载
   useEffect(() => {
     getTableHeight();
     setInitialTableInfo();
+    setInitialSearchFieldsInfo();
     window.addEventListener('resize', (e) => {
       watchWinResize();
     });
@@ -209,6 +234,14 @@ export default (props: any) => {
     }
   }, [props?.columns])
 
+  useEffect(() => {
+    if (props?.fields && value?.fields) {
+      let newKeys = props.fields.map((d: any) => Array.isArray(d.name) ? JSON.stringify(d.name) : (d.name));
+      let oldKeys = value.fields.map((d: any) => Array.isArray(d.name) ? JSON.stringify(d.name) : (d.name));
+      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialSearchFieldsInfo();
+    }
+  },[props?.fields])
+
   useEffect(() => {
     setInitialTableInfo();
   }, [props?.refreshColumns]);
@@ -335,19 +368,34 @@ export default (props: any) => {
         type: 'text',
         props: {
           children: (
-            <>
-              <Tooltip title="列设置">
-                <span className="ant-dropdown-link">
-                  <SortableTable
-                    ref={sortTableRef}
-                    setShowColumns={setShowColumns}
-                    showColumn={showColumn}
-                    datasource={value?.columns || []}
-                    bsTableCode={bsTableCode}
-                  />
-                </span>
-              </Tooltip>
-            </>
+            <span className="ant-dropdown-link">
+                <Dropdown overlay={ 
+                  <Menu >
+                    <Menu.Item>
+                      <SortableTable
+                        ref={sortTableRef}
+                        setShowColumns={setShowColumns}
+                        showColumn={showColumn}
+                        datasource={value?.columns || []}
+                        bsTableCode={bsTableCode}
+                      />
+                    </Menu.Item>
+                    <Menu.Item>
+                      <SearchItemTable
+                        ref={sortTableRef}
+                        setShowSearchFields={setShowSearchFields}
+                        showSearchFields={showSearchFields}
+                        datasource={value?.fields || []}
+                        bsTableCode={bsTableCode}
+                      />
+                    </Menu.Item>
+                  </Menu> 
+                } placement="bottom" >
+                  <span className="ant-dropdown-link">
+                    <img width={32}  src={shezhi} />
+                  </span>
+                </Dropdown>
+              </span>
           ),
         },
       },
@@ -450,6 +498,7 @@ export default (props: any) => {
     ...handleTimeValue(),
     tableProps: setTableProps(),
     columns: [...showColumn],
+    fields: [...showSearchFields],
     ref: props.forwardedRef || refs,
     isFullScreen,
   };
@@ -474,7 +523,7 @@ export default (props: any) => {
       summary: props.summary,
       statusMapping: props.statusMapping,
     }),
-    [value, checkedList, showColumn, props.statusMapping],
+    [value, checkedList, showColumn, props.statusMapping, showSearchFields],
   );
   return <MemoQueryTable {...memoConfig} />;
 };

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

@@ -793,7 +793,7 @@ class SortableTable extends React.Component {
             </div>
           </Modal>
         )}
-        <img width={32} onClick={this.showModal} src={shezhi} />
+        <div onClick={this.showModal} style={{fontSize:14}}>列设置</div>
       </div>
     );
   }

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

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { TreeSelect, Tooltip, Tag } from 'antd';
 import axios from 'axios';
 import { stringify } from 'querystring';
+import _ from "lodash"
 
 const TreeSearchSelect = (props: any) => {
   const [treeData, setTreeData] = useState([]);
@@ -85,11 +86,21 @@ const TreeSearchSelect = (props: any) => {
     });
   };
 
+  const formatData = (value: any) => {
+    if (labelInValue) {
+      const formatResult = multiple ? value.map((i: any) => ({...i, key: i.value})) : { ...value, key: value?.value };
+      return formatResult
+    } else {
+      const formatResult = multiple ? value.map((i: any) => (i?.value || i)) : (_.get(value[0], 'value') || value)
+      return formatResult
+    }
+  }
   const handleChange = (data: any, dataName: any) => {
-    onChange(data);
+    const handleData = formatData(data);
+    onChange(handleData,data);
     onChangeName && onChangeName(dataName);
     getTreeData && getTreeData(treeData); // 把树节点暴露出去
-    ctx?.form?.setFieldValue(ctx.name, data);
+    ctx?.form?.setFieldValue(ctx.name, handleData);
   };
 
   useEffect(() => {

package/src/utils/enumConfig.ts

@@ -7,5 +7,6 @@ export default {
     USER_INFO: 'userInfo', //用户信息
     DICT_CODES: 'dicData', //数据字典数据
     CHILD_APP_BACK: 'child_app_back', //标记子应用goback事件
+    SEARCH_FIELDS_CONDITION: 'searchFieldsCondition', //表格搜索项信息缓存
   }
 }