@bit-sun/business-component 2.4.22 → 2.4.24

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

@@ -15,7 +15,7 @@ import {
   SortableElement,
   SortableHandle,
 } from 'react-sortable-hoc';
-import axios from 'axios';
+import request from '@/utils/request';
 import { SearchOutlined } from '@ant-design/icons';
 import { arrayMoveImmutable } from 'array-move';
 import shezhi from '../../../assets/icon-shezhi.svg';
@@ -28,6 +28,7 @@ import fixedRightActive from '../../../assets/fixed-right-active.svg';
 import './index.less';
 import ENUM from '@/utils/enumConfig';
 import { handleRequestUrl, judgeIsRequestSuccess } from '@/utils/requestUtils';
+import {renderToString } from './utils';
 
 const DragHandle = SortableHandle(() => <img width={25} src={drag} />);
 
@@ -60,7 +61,7 @@ class SortableTable extends React.Component {
         }))
       : '';
     return new Promise((resolve: any, reject: any) => {
-      axios({
+      request({
         url: handleRequestUrl('/user','/appConfig/saveUserOrder', appRequestConfig),
         method: 'POST',
         data: {
@@ -75,8 +76,8 @@ class SortableTable extends React.Component {
           message.error('保存表头列自定义失败，请稍后尝试');
           reject('');
         }
-      })
-    })
+      });
+    });
   };
 
   getConfigFromlocalstorage = () => {
@@ -93,57 +94,68 @@ class SortableTable extends React.Component {
   };
 
   patchConfigToLocalstorage = (configvalue) => {
-    const { setShowColumns, datasource = []  } = 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)
-    let currentSetting = configArray.filter(item => item.code === bsTableCode)
+    let config =
+      localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
+    let configArray = JSON.parse(config);
+    let currentSetting = configArray.filter(
+      (item) => item.code === bsTableCode,
+    );
     if (currentSetting.length) {
-      currentSetting[0].detail = JSON.stringify(configvalue)
+      currentSetting[0].detail = JSON.stringify(configvalue);
     } else {
       configArray.push({
-        "code": bsTableCode,
-        "detail": JSON.stringify(configvalue)
-      })
+        code: bsTableCode,
+        detail: JSON.stringify(configvalue),
+      });
     }
 
-    localStorage.setItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION, JSON.stringify(configArray));
+    localStorage.setItem(
+      ENUM.BROWSER_CACHE.COLUMN_CONDITION,
+      JSON.stringify(configArray),
+    );
     this.setState({
       visible: false,
     });
-    if(configvalue){
+    if (configvalue) {
       setShowColumns([...sortDataSource]);
-    }else{
+    } else {
       this.setState({
         isDefaultValue: true,
-        dataSource: [...datasource.map((item)=>({
-          ...item,
-          hidden: false
-        }))],
-        sortDataSource: [...datasource.map((item)=>({
-          ...item,
-          hidden: false
-        }))]
+        dataSource: [
+          ...datasource.map((item) => ({
+            ...item,
+            hidden: false,
+          })),
+        ],
+        sortDataSource: [
+          ...datasource.map((item) => ({
+            ...item,
+            hidden: false,
+          })),
+        ],
       });
       setShowColumns([...datasource]);
     }
   };
 
   setInitValue = (isClick = false) => {
-    const { datasource, showColumn }: any =
-      this.props;
+    const { datasource, showColumn }: any = this.props;
     let config = this.getConfigFromlocalstorage();
 
     this.setState({
       isDefaultValue: true,
       dataSource: datasource.map((item) => {
-        let innerItem = config.filter(
-          (inneritem) => {
-            let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : (inneritem.key || inneritem.dataIndex);
-            let  itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : (item.key || item.dataIndex);
-            return innerKey && innerKey === itemKey;
-          }
-        );
+        let innerItem = config.filter((inneritem) => {
+          let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex)
+            ? JSON.stringify(inneritem.key || inneritem.dataIndex)
+            : inneritem.key || inneritem.dataIndex;
+          let itemKey = Array.isArray(item.key || item.dataIndex)
+            ? JSON.stringify(item.key || item.dataIndex)
+            : item.key || item.dataIndex;
+          return innerKey && innerKey === itemKey;
+        });
         return {
           ...item,
           key: item.key || item.dataIndex,
@@ -152,13 +164,15 @@ class SortableTable extends React.Component {
         };
       }),
       defaultValue: datasource.map((item) => {
-        let innerItem = config.filter(
-          (inneritem) => {
-            let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : (inneritem.key || inneritem.dataIndex);
-            let  itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : (item.key || item.dataIndex);
-            return innerKey && innerKey === itemKey;
-          }
-        );
+        let innerItem = config.filter((inneritem) => {
+          let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex)
+            ? JSON.stringify(inneritem.key || inneritem.dataIndex)
+            : inneritem.key || inneritem.dataIndex;
+          let itemKey = Array.isArray(item.key || item.dataIndex)
+            ? JSON.stringify(item.key || item.dataIndex)
+            : item.key || item.dataIndex;
+          return innerKey && innerKey === itemKey;
+        });
         return {
           ...item,
           key: item.key || item.dataIndex,
@@ -166,24 +180,25 @@ class SortableTable extends React.Component {
           hidden: config.length ? !innerItem.length : item.hidden,
         };
       }),
-      sortDataSource: [...showColumn]
+      sortDataSource: [...showColumn],
     });
   };
 
   componentDidMount() {
-    const { datasource, showColumn, bsTableCode }: any =
-      this.props;
+    const { datasource, showColumn, bsTableCode }: any = this.props;
     let config = this.getConfigFromlocalstorage();
 
     this.setState({
       dataSource: datasource.map((item) => {
-        let innerItem = config.filter(
-          (inneritem) => {
-            let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : (inneritem.key || inneritem.dataIndex);
-            let  itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : (item.key || item.dataIndex);
-            return innerKey && innerKey === itemKey;
-          }
-        );
+        let innerItem = config.filter((inneritem) => {
+          let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex)
+            ? JSON.stringify(inneritem.key || inneritem.dataIndex)
+            : inneritem.key || inneritem.dataIndex;
+          let itemKey = Array.isArray(item.key || item.dataIndex)
+            ? JSON.stringify(item.key || item.dataIndex)
+            : item.key || item.dataIndex;
+          return innerKey && innerKey === itemKey;
+        });
         return {
           ...item,
           key: item.key || item.dataIndex,
@@ -192,13 +207,15 @@ class SortableTable extends React.Component {
         };
       }),
       defaultValue: datasource.map((item) => {
-        let innerItem = config.filter(
-          (inneritem) => {
-            let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : (inneritem.key || inneritem.dataIndex);
-            let  itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : (item.key || item.dataIndex);
-            return innerKey && innerKey === itemKey;
-          }
-        );
+        let innerItem = config.filter((inneritem) => {
+          let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex)
+            ? JSON.stringify(inneritem.key || inneritem.dataIndex)
+            : inneritem.key || inneritem.dataIndex;
+          let itemKey = Array.isArray(item.key || item.dataIndex)
+            ? JSON.stringify(item.key || item.dataIndex)
+            : item.key || item.dataIndex;
+          return innerKey && innerKey === itemKey;
+        });
         return {
           ...item,
           key: item.key || item.dataIndex,
@@ -212,15 +229,17 @@ class SortableTable extends React.Component {
           ...item,
           key: item.key || item.dataIndex,
           width:
-            showColumn.filter(
-              (inneritem) => {
-                let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex) ? JSON.stringify(inneritem.key || inneritem.dataIndex) : (inneritem.key || inneritem.dataIndex);
-                let  itemKey = Array.isArray(item.key || item.dataIndex) ? JSON.stringify(item.key || item.dataIndex) : (item.key || item.dataIndex);
-                return innerKey && innerKey === itemKey;
-              }
-            )[0]?.width || item.width,
+            showColumn.filter((inneritem) => {
+              let innerKey = Array.isArray(inneritem.key || inneritem.dataIndex)
+                ? JSON.stringify(inneritem.key || inneritem.dataIndex)
+                : inneritem.key || inneritem.dataIndex;
+              let itemKey = Array.isArray(item.key || item.dataIndex)
+                ? JSON.stringify(item.key || item.dataIndex)
+                : item.key || item.dataIndex;
+              return innerKey && innerKey === itemKey;
+            })[0]?.width || item.width,
         })),
-      bsTableCode
+      bsTableCode,
     });
   }
 
@@ -299,7 +318,11 @@ class SortableTable extends React.Component {
                 });
               }
             }}
-            style={{ display: 'inline-block', width: '24px', textAlign: 'center' }}
+            style={{
+              display: 'inline-block',
+              width: '24px',
+              textAlign: 'center',
+            }}
           >
             <Tooltip
               placement="top"
@@ -382,7 +405,11 @@ class SortableTable extends React.Component {
                 });
               }
             }}
-            style={{ display: 'inline-block', width: '24px', textAlign: 'center' }}
+            style={{
+              display: 'inline-block',
+              width: '24px',
+              textAlign: 'center',
+            }}
           >
             <Tooltip
               placement="top"
@@ -454,11 +481,10 @@ class SortableTable extends React.Component {
     //   this.patchUserColumnConfig('');
     //   return;
     // }
-    return this.patchUserColumnConfig(sortDataSource);
+    this.patchUserColumnConfig(sortDataSource);
   };
 
   handleCancel = (e: React.MouseEvent<HTMLElement>) => {
-    console.log(e);
     this.setState({
       visible: false,
     });
@@ -538,23 +564,25 @@ class SortableTable extends React.Component {
     return <SortableItem index={index} {...restProps} />;
   };
 
+
+
   onChange = (e: CheckboxChangeEvent, title) => {
     const { sortDataSource, dataSource } = this.state;
+
     if (!e.target.checked) {
       this.setState({
         sortDataSource: sortDataSource.filter((item) => {
-          return item.title !== title;
+          return renderToString(item.title) !== renderToString(title);
         }),
         isDefaultValue: false,
         dataSource: [
           ...dataSource.map((item) => {
-            if (item.title === title) {
+            if (renderToString(item.title) === renderToString(title)) {
               return {
                 ...item,
                 hidden: true,
               };
             }
-
             return item;
           }),
         ],
@@ -566,7 +594,7 @@ class SortableTable extends React.Component {
       let newSortData = [
         ...sortDataSource,
         ...dataSource
-          .filter((item) => item.title === title)
+          .filter((item) => renderToString(item.title) === renderToString(title))
           .map((source) => {
             return {
               ...source,
@@ -588,7 +616,7 @@ class SortableTable extends React.Component {
         isDefaultValue: false,
         dataSource: [
           ...dataSource.map((item) => {
-            if (item.title === title) {
+            if (renderToString(item.title) === renderToString(title)) {
               return {
                 ...item,
                 hidden: false,
@@ -606,9 +634,9 @@ class SortableTable extends React.Component {
     this.setInitValue(true);
   };
 
-  handleResetSetting = () =>{
+  handleResetSetting = () => {
     this.patchUserColumnConfig('');
-  }
+  };
 
   onSearch = (e: any) => {
     this.setState({
@@ -622,6 +650,7 @@ class SortableTable extends React.Component {
     });
   };
 
+
   render() {
     const { onlyModal } = this.props;
     const {
@@ -633,7 +662,8 @@ class SortableTable extends React.Component {
     } = this.state;
 
     let seatchDataSource = dataSource.filter(
-      (item) => item?.title?.indexOf(searchDataSource || '') > -1,
+      (item) =>
+        renderToString(item?.title)?.indexOf?.(searchDataSource || '') > -1,
     );
 
     return (
@@ -648,21 +678,29 @@ class SortableTable extends React.Component {
             onCancel={this.handleCancel}
             footer={[
               <div>
-                <Button key="back" onClick={this.handleReset} style={{marginRight: 0}}>
+                <Button
+                  key="back"
+                  onClick={this.handleReset}
+                  style={{ marginRight: 0 }}
+                >
                   恢复默认
-                </Button>,
+                </Button>
                 <Button key="back" onClick={this.handleResetSetting}>
                   重置设置
                 </Button>
               </div>,
               <div>
-                <Button key="submit" onClick={this.handleCancel} style={{marginRight: 0}}>
+                <Button
+                  key="submit"
+                  onClick={this.handleCancel}
+                  style={{ marginRight: 0 }}
+                >
                   取消
-                </Button>,
+                </Button>
                 <Button key="submit" type="primary" onClick={this.handleOk}>
                   确认
                 </Button>
-              </div>
+              </div>,
             ]}
           >
             <div className={'sort_table'}>
@@ -745,9 +783,9 @@ class SortableTable extends React.Component {
                       : dataSource
                           .filter(
                             (item) =>
-                              item?.title?.indexOf('人') === -1 &&
-                              item?.title?.indexOf('日期') === -1,
-                          )
+                              {const title = renderToString(item.title)
+                              return (title?.indexOf?.('人') === -1 &&
+                                title?.indexOf?.('日期') === -1)})
                           .map((item) => {
                             return (
                               <Checkbox
@@ -779,8 +817,8 @@ class SortableTable extends React.Component {
                         {[...dataSource]
                           .filter(
                             (item) =>
-                              item?.title?.indexOf('人') > -1 ||
-                              item?.title?.indexOf('日期') > -1,
+                              item?.title?.indexOf?.('人') > -1 ||
+                              item?.title?.indexOf?.('日期') > -1,
                           )
                           .map((item) => {
                             return (
@@ -822,7 +860,7 @@ class SortableTable extends React.Component {
                     dataSource={
                       onSearchSort
                         ? sortDataSource.filter(
-                            (item) => item?.title?.indexOf(onSearchSort) > -1,
+                            (item) => renderToString(item?.title)?.indexOf(onSearchSort) > -1,
                           )
                         : sortDataSource
                     }

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

@@ -27,8 +27,9 @@ import {
 import './utils.less';
 import { request } from 'bssula';
 import ENUM from '@/utils/enumConfig';
+// import ReactDOMServer from 'react-dom/server';
 import noImg from '../../../assets/list-no-img.svg';
-
+import qs from 'qs';
 export const handleStatusBadge = (text: any, color: any) => {
   return (
     <Badge
@@ -315,9 +316,7 @@ export const userInfoCard = (props: any) => {
             {props.department || 'XXXXX'}
           </span>
         </p>
-        <p className={'card_detailInfo'}>
-          职位: {props.position || 'XXXXX'}
-        </p>
+        <p className={'card_detailInfo'}>职位: {props.position || 'XXXXX'}</p>
       </div>
     </Card>
   );
@@ -572,35 +571,36 @@ export const renderFixed2 = (text: any) => text;
 //设置queryTable默认列宽
 export const getItemDefaultWidth = (item: any) => {
   let defaultWidth = 200;
+  if (Array.isArray(item.key) || Array.isArray(item.dataIndex))
+    return defaultWidth;
   let lowerCaseKey = (item.key || item.dataIndex)?.toLowerCase();
-  if (lowerCaseKey) {
-    switch (true) {
-      case item?.title === '操作' || lowerCaseKey === 'operate':
-        defaultWidth = 60;
-        break;
-      case lowerCaseKey.indexOf('number') > -1:
-      case lowerCaseKey.indexOf('quantity') > -1:
-      case lowerCaseKey.indexOf('amount') > -1:
-        defaultWidth = 90;
-        break;
-      case (lowerCaseKey.indexOf('no') > -1):
-        defaultWidth = 200;
-        break;
-      case lowerCaseKey.indexOf('code') > -1:
-        defaultWidth = 170;
-        break;
-      case lowerCaseKey.indexOf('time') > -1:
-        defaultWidth = 130;
-        break;
-      case lowerCaseKey.indexOf('status') > -1:
-        defaultWidth = 100;
-        break;
-      case lowerCaseKey.indexOf('user') > -1:
-        defaultWidth = 130;
-        break;
-      default:
-        break;
-    }
+  if (!lowerCaseKey) return defaultWidth;
+  switch (true) {
+    case item?.title === '操作' || lowerCaseKey === 'operate':
+      defaultWidth = 60;
+      break;
+    case lowerCaseKey.indexOf('number') > -1:
+    case lowerCaseKey.indexOf('quantity') > -1:
+    case lowerCaseKey.indexOf('amount') > -1:
+      defaultWidth = 90;
+      break;
+    case lowerCaseKey.indexOf('no') > -1:
+      defaultWidth = 200;
+      break;
+    case lowerCaseKey.indexOf('code') > -1:
+      defaultWidth = 170;
+      break;
+    case lowerCaseKey.indexOf('time') > -1:
+      defaultWidth = 130;
+      break;
+    case lowerCaseKey.indexOf('status') > -1:
+      defaultWidth = 100;
+      break;
+    case lowerCaseKey.indexOf('user') > -1:
+      defaultWidth = 130;
+      break;
+    default:
+      break;
   }
   return defaultWidth;
 };
@@ -651,6 +651,16 @@ export function queryParams(params: any, flag?: any) {
           }
         });
         delete params[key];
+      } else if (element && key.indexOf('*multiInput') >= 0) {
+        let name = '',
+          value = element['value'];
+        if (value.indexOf(',') >= 0) {
+          name = `qp-${element['name']}-in`;
+        } else {
+          name = `qp-${element['name']}-like`;
+        }
+        params[name] = value;
+        delete params[key];
       } else if (element && key.indexOf('*') >= 0) {
         const dataParams = key.split('*');
         dataParams.forEach((value, index) => {
@@ -681,10 +691,23 @@ export function queryParams(params: any, flag?: any) {
  * @returns boolean
  */
 export const authFn = (code?: any) => {
+  if (!code) {
+    return true;
+  }
   const authButton = localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES)
-    ? JSON.parse(localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) as string)
+    ? JSON.parse(
+        localStorage.getItem(ENUM.BROWSER_CACHE.MAIN_AUTH_CODES) as string,
+      )
     : [];
   return authButton.findIndex((d: any) => d === code) !== -1;
 };
 
-
+// 可以将普通字符串 或者tsx 转换成字符串
+export const renderToString = (
+  render: ReactElement<any, string | JSXElementConstructor<any>> | string,
+) => {
+  return render;
+  // return typeof render === 'string'
+  //   ? render
+  //   : ReactDOMServer.renderToString(render);
+};