@bit-sun/business-component 1.2.3 → 2.0.0

package/src/components/Business/SearchSelect/index.md

@@ -47,17 +47,19 @@ export default () => {
     //   mappingTextField: 'name',
     //   mappingValueField: 'code',
     // },   // 非必传，业务字段已根据业务默认默认
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' }, // 非必传，下拉框和tableForm下拉框接口前缀，默认为bop的接口
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' }, // 非必传，下拉框和tableForm下拉框接口前缀，默认为bop的接口
     selectProps, // 非必传
     onChange: (value: any) => {
       console.log(value)
       setValue(value)
     },
     selectBusinessType: 'supplier',
+    disabled: true,
   };
   
   const props2 = {
-    prefixUrl: { selectPrefix: '/channel/api', formSelectFix: '/channel/api' },
+    ...props,
+    // prefixUrl: { selectPrefix: '/channel-manage/', formSelectFix: '/channel-manage/' },
     selectBusinessType: 'supplier2',
   }
   
@@ -133,7 +135,7 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'skuCode',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'skuCommodity',
   };
@@ -290,7 +292,7 @@ export default () => {
       console.log(value)
       setValue(value)
     },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'spuCommodity',
   };
@@ -323,7 +325,7 @@ export default () => {
 ## 仓库选择器(物理仓) Select-Warehouse-001
 
 ```tsx
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Tabs } from 'antd';
 import {BusinessSearchSelect} from '../../../index.ts';
 
@@ -343,21 +345,30 @@ export default () => {
   const [ tabKey, setTabKey ] = useState('single')
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
   
+  useEffect(() => {
+    if(tabKey === 'multiple') {
+      setValue(['1540295745870573570', '1540173160826613762'])
+    }
+  },[tabKey])
+  
   const props = {
     value,
     onChange: (value: any) => {
       console.log(value)
       setValue(value)
     },
-    // requestConfig: {
-    //   mappingValueField: 'physicalWarehouseCode',
-    //   sourceName: 'physicalWarehouseCode',
-    // },
+    requestConfig: {
+      // mappingValueField: 'physicalWarehouseCode',
+      // sourceName: 'physicalWarehouseCode',
+      filterInit: 'qp-id-in'
+    },
     // modalTableProps: {
     //   modalTableTitle: '选择物理仓-更改title测试',
+    //   needModalTable: false
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
+    // labelInValue: true,
     selectBusinessType: 'physicalWarehouse',
   };
 
@@ -424,7 +435,7 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'warehouseIds',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'realWarehouse',
   };
@@ -492,7 +503,7 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'warehouseIds',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'virtualWarehouse',
   };
@@ -560,7 +571,7 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'warehouseIds',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'channelWarehouse',
   };
@@ -629,13 +640,14 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'customerCode',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'customer',
   };
 
   const props2 = {
-    prefixUrl: { selectPrefix: '/channel/api', formSelectFix: '/channel/api' },
+    ...props,
+    // prefixUrl: { selectPrefix: '/channel-manage/', formSelectFix: '/channel-manage/' },
     selectBusinessType: 'customer2',
   }
 
@@ -713,11 +725,17 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'code',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'shopFile',
   };
 
+  const props2 = {
+    ...props,
+    // prefixUrl: { selectPrefix: '/channel-manage/', formSelectFix: '/channel-manage/' },
+    selectBusinessType: 'shopFile2',
+  }
+
   const onTabChange = (key) => {
     setTabKey(key)
     setValue(key === 'single' ? null: [])
@@ -728,12 +746,22 @@ export default () => {
       <Tabs onChange={onTabChange} activeKey={tabKey}>
         <TabPane tab='单选' key='single'>
           {tabKey === 'single' && (
-            <BusinessSearchSelect {...props} />
+            <>
+              <span>版本1:支持英伦项目...</span>
+              <BusinessSearchSelect {...props} />
+              <span>版本2:支持麦克英孚项目...</span>
+              <BusinessSearchSelect {...props2} />
+            </>
           )}
         </TabPane>
         <TabPane tab='多选' key='multiple'>
           {tabKey === 'multiple' && (
-            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+            <>
+              <span>版本1:支持英伦项目...</span>
+              <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
+              <span>版本2:支持麦克英孚项目...</span>
+              <BusinessSearchSelect {...props2} selectProps={selectPropsMultiple} />
+            </>
           )}
         </TabPane>
       </Tabs>
@@ -782,7 +810,7 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'accountingCode',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'accountingSubject',
   };
@@ -851,28 +879,30 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'inventoryOrgCode',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'inventoryOrg',
   };
 
+  const props2 = {
+    ...props,
+    selectBusinessType: 'inventoryOrg2',
+  }
+
   const onTabChange = (key) => {
     setTabKey(key)
     setValue(key === 'single' ? null: [])
   }
   
   return (
+    
     <div>
       <Tabs onChange={onTabChange} activeKey={tabKey}>
         <TabPane tab='单选' key='single'>
-          {tabKey === 'single' && (
-            <BusinessSearchSelect {...props} />
-          )}
+          {tabKey === 'single' && <BusinessSearchSelect {...props} />}
         </TabPane>
         <TabPane tab='多选' key='multiple'>
-          {tabKey === 'multiple' && (
-            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />
-          )}
+          {tabKey === 'multiple' && <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />}
         </TabPane>
       </Tabs>
     </div>
@@ -921,7 +951,7 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'companyCode',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'corporationCompany',
   };
@@ -990,14 +1020,14 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'code',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'employee',
   };
   
   const props2 = {
     ...props,
-    prefixUrl: { selectPrefix: '/user/api', formSelectFix: '/user/api' },
+    // prefixUrl: { selectPrefix: '/user/api', formSelectFix: '/user/api' },
     selectBusinessType: 'employee2',
   }
 
@@ -1075,7 +1105,7 @@ export default () => {
     //   }, // 默认参数
     //   sourceName: 'deliveryModeCode',
     // },
-    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
+    // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
     selectBusinessType: 'deliveryMode',
   };

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

@@ -7,13 +7,14 @@
  */
 import React, { useMemo } from 'react';
 import { commonFun } from './BusinessUtils';
+import { handleDefaultPrefixUrl } from './utils';
 import SearchSelect from '@/components/Functional/SearchSelect';
 
 const MemoSearchSelect = React.memo(SearchSelect)
 
 const  BusinessSearchSelect = (props: any) => {
   const businessType = props?.selectBusinessType || 'supplier';
-  const prefixUrl = props?.prefixUrl || { selectPrefix: '/bop/api', formSelectFix: '/bop/api' };
+  const prefixUrl = props?.prefixUrl || { selectPrefix: handleDefaultPrefixUrl(businessType), formSelectFix: handleDefaultPrefixUrl(businessType) };
 
   const { requestConfig, modalTableProps, needModalTable } = commonFun(businessType, prefixUrl,props?.requestConfig || {}, props?.modalTableProps || {});
   const currentProps = useMemo(() => {

package/src/components/Business/SearchSelect/utils.ts

@@ -59,7 +59,7 @@ const loadSelectSource = (url: string, params?: any) => {
       .get(`${url}?${stringify(params)}`)
       .then((result: any) => {
         result = result.data;
-        if ((result.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
+        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
           message.error(result.msg);
           return;
         }
@@ -71,4 +71,29 @@ const loadSelectSource = (url: string, params?: any) => {
   })
 };
 
-export { getDictionarySource, getDictionaryTextByValue, loadSelectSource }
+const handleDefaultPrefixUrl = (type: string) => {
+  let result;
+  switch (type){
+    case 'supplier2': case 'customer2': case 'shopFile2':
+      result =  '/channel-manage';
+      break;
+    case 'skuCommodity': case 'skuPropertyValue': case 'spuCommodity':
+      result =  '/items';
+      break;
+    case 'physicalWarehouse': case 'realWarehouse': case 'virtualWarehouse': case 'channelWarehouse':
+      result =  '/stock';
+      break;
+    case 'inventoryOrg2': case 'purchaseOrg': case 'salesOrg': case 'employee2':
+      result =  '/user';
+      break;
+    case 'deliveryMode':
+      result =  '/basic';
+      break;
+    default:
+      result = '/bop/api';
+      break
+  }
+  return result;
+};
+
+export { getDictionarySource, getDictionaryTextByValue, loadSelectSource, handleDefaultPrefixUrl }

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

@@ -7,7 +7,7 @@ import axios from 'axios';
 import { stringify } from 'querystring';
 import _ from "loadsh"
 import './index.less';
-import { BusinessSearchSelect } from '@/index';
+import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
 
 const { Option } = Select;
 
@@ -33,6 +33,7 @@ const SearchSelect = (props: any) => {
   const tableInitPageSize = 10 // 弹框默认分页 条数
   const currentPage = 1
   const selectParamsKey = requestConfig?.filter || 'qp-codeAndName-like'
+  const selectParamsInitKey = requestConfig?.filterInit || selectParamsKey
   const currentSelectProps = {
     ...selectProps,
     // 以下属性不可更改----设计配置项
@@ -57,7 +58,7 @@ const SearchSelect = (props: any) => {
       // 优化搜索参数 支持传多个
       let searchParams = {};
       if(typeof selectParamsKey === 'string') {
-        searchParams = { [selectParamsKey]: v ? initVal : searchValue }
+        searchParams = v ? { [selectParamsInitKey]: initVal } : { [selectParamsKey]: searchValue }
       }
       if(Array.isArray(selectParamsKey)) {
         selectParamsKey.forEach((i: any) => {
@@ -205,7 +206,7 @@ const SearchSelect = (props: any) => {
       .then((result: any) => {
         setFetching(false)
         result = result.data;
-        if (result.status !== '0') {
+        if ((result?.status && result.status !== '0') || (result?.code && result.code !== '000000')) {
           message.error(result.msg);
           return;
         }
@@ -310,7 +311,6 @@ const SearchSelect = (props: any) => {
   useEffect(() => {
     if(value) {
       setPopValue(value);
-      onChange(value);
     }
   }, [value]);
 
@@ -356,7 +356,7 @@ const SearchSelect = (props: any) => {
 
   const formaData = (value) => {
     if(labelInValue) {
-      const formatResult = value.map((i: any) => ({ key: i.code, label: i.name, value: i.code }))
+      const formatResult = value.map((i: any) => ({ key: i[mappingValueField], label: i[mappingTextField], value: i[mappingValueField] }))
       onChange(selectMode ? formatResult : formatResult[0])
     } else {
       const formatResult = selectMode ? value.map((i: any) => i.value) : _.get(value[0], 'value')
@@ -511,6 +511,9 @@ const SearchSelect = (props: any) => {
     onChange: (sks, srs) => {
       onChangeSelectedKeys(sks, srs)
     },
+    getCheckboxProps: () => ({
+      disabled: selectProps?.disabled || props?.disabled,
+    }),
   };
 
   const onDoubleClickSelect = (e, record) => {
@@ -546,7 +549,7 @@ const SearchSelect = (props: any) => {
           )
         }
 
-        if(i?.type === 'businessSearchSelect') {
+        if(i?.type === 'businessSearchSelect' || i?.field?.type === 'businessSearchSelect') {
           return (
             <div>
               <Form.Item name={i.name} label={i.label} key={i.name}>
@@ -556,6 +559,20 @@ const SearchSelect = (props: any) => {
           )
         }
 
+        if (i?.type === 'multipleQueryInput' || i?.field?.type === 'multipleQueryInput') {
+          return (
+            <div>
+              <Form.Item name={i.name} label={i.label} key={i.name}>
+                <QueryMutipleInput onValueChange={(value) => {
+                  form.setFieldsValue({
+                    [i.name]: value
+                  })
+                }} />
+              </Form.Item>
+            </div>
+          );
+        }
+
         // 默认type是input
         return (
           <Form.Item name={i.name} label={i.label} key={i.name}>
@@ -702,7 +719,7 @@ const SearchSelect = (props: any) => {
                     };
                   }}
                 />
-                {selectMode ? <div className={'select_list_selectAll'}><Checkbox indeterminate={indeterminate} checked={checkedAll} onChange={onChangeCheckAll} /> 全选所有页面</div> : ''}
+                {selectMode ? <div className={'select_list_selectAll'}><Checkbox indeterminate={indeterminate} checked={checkedAll} onChange={onChangeCheckAll} disabled={selectProps?.disabled || props?.disabled} /> 全选所有页面</div> : ''}
               </div>
             </div>
           </div>

package/src/index.ts

@@ -12,6 +12,7 @@ import axios from 'axios';
 const resposne = JSON.parse(localStorage.getItem('userInfo') || '{}');
 
 axios.defaults.headers.common['sso-sessionid'] = resposne?.sessionId || '';
+axios.defaults.headers.common['x-tenant-id'] = resposne?.tenantId || '1';
 
 export { default as DataValidation } from './components/Functional/DataValidation';
 export { default as DataImport } from './components/Functional/DataImport';