@bit-sun/business-component 1.2.1 → 2.0.0

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,8 +12,10 @@ 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';
 export { default as QueryMutipleInput } from './components/Functional/QueryMutipleInput';
 export { default as SearchSelect } from './components/Functional/SearchSelect';
 export { default as BusinessSearchSelect } from './components/Business/SearchSelect';