@bit-sun/business-component 2.4.24 → 2.4.26-beta01

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

@@ -3,7 +3,7 @@ import React, { useState, useEffect } from 'react';
 import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, Select, InputNumber, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag } from 'antd';
 import { SearchOutlined, CopyOutlined, CloseCircleOutlined } from '@ant-design/icons';
-import request from '@/utils/request';
+import axios from 'axios';
 import { stringify } from 'querystring';
 import _ from "lodash"
 import './index.less';
@@ -18,19 +18,9 @@ import { getItemDefaultWidth, noEmptyArray } from '@/components/Business/columnS
 import { getEmployeeId } from '@/utils/LocalstorageUtils';
 import { getSelectDataList, loadSelectSource, formatFormSourceList } from './helps';
 
-interface SearchFormItem {
-  name: string;
-  label: string;
-  filterFormItem?: FormItemProps;
-  initialSource?: any[];
-  field: any;
-  type?: string;
-  [formItemProps: string]: any;
-}
-
 const checkSpuMatchCode = (data: any) => {
   return new Promise((resolve, reject) => {
-      request.post(`/stock/rwFrontRecordSkcDetail/checkSpuMatchCode`,data)
+      axios.post(`/stock/rwFrontRecordSkcDetail/checkSpuMatchCode`,data)
         .then((result: any) => {
           result = result.data;
           if (judgeIsRequestError(result)) {
@@ -40,7 +30,7 @@ const checkSpuMatchCode = (data: any) => {
           }
           resolve(result);
         })
-        .catch((err: any) => {
+        .catch((err) => {
           reject(err);
         });
     })
@@ -85,14 +75,13 @@ const AddSelect = (props: any) => {
     needModalTable = true,
     getPopupContainer = undefined,
     onSaveCallback,
-    onCancelCallback,
     buttonText = '添加',
     buttonProps = {},
     beforeShowModal,
     tableCodeList = [], // 非必填 默认取组件定义code,如需自定义----数组第一位为供选择商品的table的code,第二位为已选择商品的table的code
     businessType = 'sku',
     isAllowRepeatedSelect = false,
-    clearTitle
+
   } = props;
   const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField = 'name', mappingTextShowKeyField, mappingValueField = 'code', mappingTextShowTextField } = requestConfig || {};
   const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
@@ -145,7 +134,7 @@ const AddSelect = (props: any) => {
   );
 
   const [form] = Form.useForm();
-  const [tableSearchForm, setTableSearchForm] = useState<Array<SearchFormItem>>(modalTableProps?.tableSearchForm)
+  const [tableSearchForm, setTableSearchForm] = useState(modalTableProps?.tableSearchForm)
   const [caretLeftFlag, setCaretLeftFlag] = useState(true);
   const [tableData, setTableData] = useState([]);
   const [tablePagination, setTablePagination] = useState({ total: 0, size: "small", current: 1, pageSize: tableInitPageSize })
@@ -164,7 +153,6 @@ const AddSelect = (props: any) => {
   const codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   const codeSelected = tableCodeList[1] || initTableCode[businessType][1];
 
-  // FIXME: 特殊业务逻辑
   const checkSelectChange = async (bType: string, tList: any, recordKey: string, recordItem: any, selectItem: any, changeValue: string) => {
     if(bType == 'skc' && tList.some((i: any) => i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue)) {
       message.warning('相同skc配码不可设置相同哦')
@@ -198,7 +186,6 @@ const AddSelect = (props: any) => {
   }
   const setBusinessDefaultValue = (list: any, recordList: any) => {
     let result = list;
-    // FIXME: 特殊业务逻辑
     if(businessType == 'spu' && (recordList?.some((i: any) => i?.colorValues?.length == 1) || recordList?.some((i: any) => i?.defaultMatchingCode))) {
       result = list.map((i: any) => {
         recordList.forEach((record: any) => {
@@ -233,7 +220,6 @@ const AddSelect = (props: any) => {
             if(record.needFocus === true && currentIndex === 0) {
 
             }
-            // FIXME: 特殊业务逻辑
             let precisionObj=businessType == 'skc'?{
               precision: 0
             }:{};
@@ -492,17 +478,7 @@ const AddSelect = (props: 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) => {
@@ -537,19 +513,8 @@ const AddSelect = (props: any) => {
       ...fixedParam,
       ...params,
     }
-    //todo 为了满足单个使用like查询，多个含，的使用in查询
-    if(!queryParams.unConvert){
-      Object.keys(queryParams).forEach(key =>{
-        if(String(queryParams[key]).includes(',')){
-          if(key.includes('like')){
-            queryParams[key.replace('like','in')]=queryParams[key];
-            delete queryParams[key];
-          }
-        }
-      })
-    }
-    request
-      .get(`${url}${url.includes("?")?"&":"?"}${stringify(queryParams)}`)
+    axios
+      .get(`${url}?${stringify(queryParams)}`)
       .then((result: any) => {
         setFetching(false)
         result = result.data;
@@ -625,7 +590,7 @@ const AddSelect = (props: any) => {
           setTablePagination({ ...tablePagination, total: Number(res?.total || res?.totalCount || source.length), pageSize: Number(res?.size || res?.pageSize || (params?.pageSize || pageSize)), current: Number(res?.page || res?.currentPage || (params?.currentPage || currentPage)) })
         }
       })
-      .catch((err: any) => { setFetching(false) });
+      .catch((err) => { setFetching(false) });
   }
 
   const SelectScroll = e => {
@@ -777,7 +742,6 @@ const AddSelect = (props: any) => {
     setTableFormParams({});
     setIsModalVisible(false);
     setTableData([])
-    onCancelCallback && onCancelCallback();
     // if (selectMode) {
     //   run();
     // }
@@ -794,24 +758,18 @@ const AddSelect = (props: any) => {
   }
 
   const onSearchTable = () => {
-    form.validateFields()
-    .then(() => {
-      const params = form.getFieldsValue();
-      setTableFormParams(params);
-      getData({ ...params, pageSize: tableInitPageSize }, 2)
-    })
+    const params = form.getFieldsValue();
+    setTableFormParams(params);
+    getData({ ...params, pageSize: tableInitPageSize }, 2)
+    // if (selectMode) {
+    //   getData(params)
+    // }
   }
 
   const onResetTable = () => {
     form.resetFields();
     setTableFormParams({});
-    form.validateFields()
-    .then(() => {
-      getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
-    })
-    .catch(() => {
-      setTableData([]);
-    })
+    getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
   }
 
   const handleTableChange = (pagination) => {
@@ -888,18 +846,14 @@ const AddSelect = (props: any) => {
 
   const themeColor = { color: '#005CFF' }
 
-  const formItem = (list: Array<SearchFormItem>) => {
+  const formItem = (list) => {
     if (isModalVisible && list?.length) {
-      return list.map((i: SearchFormItem, index) => {
-        const {name, label, field, type='', filterFormItem, initialSource=[], ...restProps} = i;
-
-        if (type === 'custom_filter_form_item') return filterFormItem;
-
-        if (type === 'select' || field?.type === 'select') {
+      return list.map((i: any, index) => {
+        if (i?.type === 'select' || i?.field?.type === 'select') {
           return (
-            <Form.Item name={name} label={label} key={name} {...restProps}>
-              <Select style={{ width: '100%' }} placeholder='请选择' {...field?.props}>
-                {initialSource.length && initialSource.map((m: any) => (
+            <Form.Item name={i.name} label={i.label} key={i.name}>
+              <Select style={{ width: '100%' }} placeholder='请选择' {...i?.field?.props}>
+                {i?.initialSource?.length && i?.initialSource.map((m: any) => (
                   <Option value={m.value} key={m.value}>{m.text}</Option>
                 ))}
               </Select>
@@ -907,31 +861,31 @@ const AddSelect = (props: any) => {
           )
         }
 
-        if (type === 'treeSelect' || field?.type === 'treeSelect') {
+        if (i?.type === 'treeSelect' || i?.field?.type === 'treeSelect') {
           return (
-            <Form.Item name={name} label={label} key={name} {...restProps}>
-              <TreeSelect style={{ width: '100%' }} placeholder='请选择' {...field?.props}></TreeSelect>
+            <Form.Item name={i.name} label={i.label} key={i.name}>
+              <TreeSelect style={{ width: '100%' }} placeholder='请选择' {...i?.field?.props}></TreeSelect>
             </Form.Item>
           )
         }
 
-        if (type === 'BusinessSearchSelect' || field?.type === 'BusinessSearchSelect') {
+        if (i?.type === 'BusinessSearchSelect' || i?.field?.type === 'BusinessSearchSelect') {
           return (
             <div>
-              <Form.Item name={name} label={label} key={name} {...restProps}>
-                <BusinessSearchSelect {...field?.props} />
+              <Form.Item name={i.name} label={i.label} key={i.name}>
+                <BusinessSearchSelect {...i.field.props} />
               </Form.Item>
             </div>
           )
         }
 
-        if (type === 'multipleQueryInput' || field?.type === 'multipleQueryInput') {
+        if (i?.type === 'multipleQueryInput' || i?.field?.type === 'multipleQueryInput') {
           return (
             <div>
-              <Form.Item name={name} label={label} key={name} {...restProps}>
+              <Form.Item name={i.name} label={i.label} key={i.name}>
                 <QueryMutipleInput onValueChange={(value) => {
                   form.setFieldsValue({
-                    [name]: value
+                    [i.name]: value
                   })
                 }} />
               </Form.Item>
@@ -941,12 +895,12 @@ const AddSelect = (props: any) => {
 
         // 默认type是input
         return (
-          <Form.Item name={name} label={label} key={name} {...restProps}>
+          <Form.Item name={i.name} label={i.label} key={i.name}>
             <Input id={index === 0 ? "first-query" : 'index'} style={{ width: '100%' }} onKeyDown={(e) => {
               if (e.keyCode === 13) {
                 onSearchTable()
               }
-            }} placeholder='请输入' allowClear maxLength={100}  {...field?.props} />
+            }} placeholder='请输入' allowClear maxLength={100}  {...i?.field?.props} />
           </Form.Item>
         )
       })
@@ -1183,7 +1137,7 @@ const AddSelect = (props: any) => {
                       settingImgAttribute={{ width: 20, style: { marginTop: -2 } }}
                     />
                   </span>
-                  <div style={{ marginRight: 8 }}><span onClick={deleteSelectRows} style={{ ...themeColor, cursor: 'pointer' }}>{clearTitle??'清空所选商品'}</span></div>
+                  <div style={{ marginRight: 8 }}><span onClick={deleteSelectRows} style={{ ...themeColor, cursor: 'pointer' }}>清空所选商品</span></div>
                 </div>
               </div>
               <Table