@bit-sun/business-component 4.0.12-alpha.28 → 4.0.12-alpha.29

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

@@ -6,8 +6,8 @@ import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/ico
 import request from '@/utils/request';
 import _, { escapeRegExp, isNil, values } from "lodash"
 import './index.less';
-import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
-import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource, convertUrlQueryParams, convertBodyParams, formatSelectedValue }  from './utils';
+import { BusinessSearchSelect, QueryMutipleInput, QueryMutipleSearchSelect } from '@/index';
+import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource, handleParams, convertUrlQueryParams, convertBodyParams, formatSelectedValue, convertResData, makeUniqueValue, handleSelectOptionsShowValue, LightHeightOption, maxTagPlaceholder }  from './utils';
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import zhankaitiaojian from '../../../assets/zhankaitiaojian-icon.svg';
 import PropertySelector from '@/components/Business/PropertyModal';
@@ -219,105 +219,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     }
 
     // 数组对象处理,对带有特殊标记的name进行处理
-    for (const key in params) {
-      if (Object.prototype.hasOwnProperty.call(params, key)) {
-        const element = params[key];
-        if (element && key.indexOf('*number*') >= 0) {
-          const dataParams = key.split('*number*');
-          dataParams.forEach((value, index) => {
-            params[value] = element[index];
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*address*') >= 0) {
-          const dataParams = key.split('*address*');
-          dataParams.forEach((value, index) => {
-            params[value] = element.PCDCode[index];
-          });
-          delete params[key];
-        } else if (element && key.indexOf('*costType*') >= 0) {
-          const dataParams = key.split('*costType*');
-          // eslint-disable-next-line prefer-destructuring
-          params[dataParams[0]] = element[1];
-          delete params[key];
-        } else if (element && key.indexOf('*fullDate*') >= 0) {
-          const dataParams = key.split('*fullDate*');
-          dataParams.forEach((value, index) => {
-            if (index === 0) {
-              params[value] = moment(element[index])
-                .millisecond(0)
-                .second(0)
-                .minute(0)
-                .hour(0)
-                .format('YYYY-MM-DD HH:mm:ss');
-            } else {
-              params[value] = moment(element[index])
-                .millisecond(59)
-                .second(59)
-                .minute(59)
-                .hour(23)
-                .format('YYYY-MM-DD HH:mm:ss');
-            }
-          });
-          delete params[key];
-        } else if (typeof element === 'boolean' && key.indexOf('*checkBox*') >= 0) {
-          const dataParams = key.split('*checkBox*');
-          if (element) {
-            params[dataParams[0]] = 0
-          }
-          delete params[key];
-        } else if (element && key.indexOf('*cascader*') >= 0) {
-          const dataParams = key.split('*cascader*');
-          params[dataParams[0]] = element[element.length - 1]
-          delete params[key];
-        } else if (element && key.indexOf('*date*') >= 0) {
-          const dataParams = key.split('*date*')
-          dataParams.forEach((value, index) => {
-            if (index === 0) {
-              params[value] = moment(element[index])
-                .format('YYYY-MM-DD');
-            } else {
-              params[value] = moment(element[index])
-                .format('YYYY-MM-DD');
-            }
-          });
-          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) => {
-            params[value] = element[index].format('YYYY-MM-DD HH:mm:ss');
-          });
-          delete params[key];
-        } else if (element && key.indexOf('_selectNumberRange') >= 0) { // key = xxxxx_selectNumberRange   qp-xxxxx-gt
-          const dataParams = key.split('_selectNumberRange')[0]
-          if (params[key][0] === 'range') {
-            if (params[key][1][0]) {
-              params[`qp-${dataParams}-ge`] = params[key][1][0]
-            }
-            if (params[key][1][1]) {
-              params[`qp-${dataParams}-le`] = params[key][1][1]
-            }
-          } else {
-            params[`qp-${dataParams}-${params[key][0]}`] = params[key][1]
-          }
-          delete params[key]
-        } else if (Array.isArray(element)) {
-          params[key] = element.join(',');
-        } else if (element == null || element === undefined || String(element).trim() === '') {
-          delete params[key]
-        }
-      }
-    }
+    handleParams(params)
 
     const queryParams = {
       pageSize,
@@ -348,77 +250,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           return;
         }
         const res = result.data;
-        let source = [];
-        if (isMap) {
-          source = Object.keys(res).map((d, i) => {
-            return {
-              text: Object.values(res)[i],
-              value: d,
-            };
-          });
-        } else {
-          const keys = res.list ? 'list' : 'items';
-          source = res
-            ? res[keys]
-              ? res[keys].map((item: any, index: number) => {
-                let textShowText = item[mappingTextField]
-                if (mappingTextShowTextField) {
-                  textShowText = []
-                  if (Array.isArray(mappingTextShowTextField)) {
-                    mappingTextShowTextField.forEach((r: any) => {
-                      textShowText.push(item[r])
-                    })
-                  } else {
-                    textShowText = item[mappingTextShowTextField]
-                  }
-                }
-                if(!item?.children?.length) {delete item?.children};
-                return {
-                  ...item,
-                  text: specialBracket
-                    ? `【${item[mappingValueField]}】${item[mappingTextField]}`
-                    : item[mappingTextField],
-                  textShowText,
-                  textShowKey: item[mappingTextShowKeyField || mappingValueField],
-                  value: item[mappingValueField],
-                  keyIndex: type != 1 ? ((queryParams?.currentPage - 1) * queryParams?.pageSize + index + 1) : (index+1),
-                };
-              })
-              : Array.isArray(res) &&
-              res?.map((item: Record<string, any>, index: number) => {
-                let textShowText = item[mappingTextField]
-                if (mappingTextShowTextField) {
-                  textShowText = []
-                  if (Array.isArray(mappingTextShowTextField)) {
-                    mappingTextShowTextField.forEach((r: any) => {
-                      textShowText.push(item[r])
-                    })
-                  } else {
-                    textShowText = item[mappingTextShowTextField]
-                  }
-                }
-                if(!item?.children?.length) {delete item?.children};
-                return {
-                  ...item,
-                  text: specialBracket
-                    ? `【${item[mappingValueField]}】${item[mappingTextField]}`
-                    : item[mappingTextField],
-                  textShowText,
-                  textShowKey: item[mappingTextShowKeyField || mappingValueField],
-                  value: item[mappingValueField],
-                  keyIndex: type != 1 ? ((queryParams?.currentPage - 1) * queryParams?.pageSize + index + 1) : (index+1),
-                };
-              })
-            : [];
-        }
-        // 补充搜索项--选中的数据添加到数据源中去
-        const currentSRKs = getCurrentSRKs(selectMode,labelInValue,value)
-        if(type === 1 && currentSRKs?.length && currentSRKs?.some(s=> !source?.find(r=> r.value==s))) {
-          const selectedOption = items.filter(option => currentSRKs?.includes(option.value))||[];
-          source = (source||[]).concat(selectedOption)
-        }
-        // 数据源 不可以有重复key
-        source = Array.isArray(source) ? _.uniqBy(source, 'value') : [];
+        const source: any = convertResData(requestConfig, res, { selectMode, labelInValue, value, type, items, queryParams });
         
         if(callback) {
           callback(source)
@@ -488,7 +320,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }, [value]);
 
   useEffect(() => {
-    makeUniqueValue();
+    setUniqueValue(makeUniqueValue());
   }, [resultSourceKey])
 
   useEffect(() => {
@@ -657,30 +489,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const handleTableChange = (pagination) => {
     getData({ ...tableFormParams, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
   }
-  const LightHeightOption = (props) => {
-    const {
-      filterTxt, text,
-    } = props
-    const heightLightTxt = (text, heightTxt) => {
-      if (heightTxt === '') {
-        return text
-      }
-      const searchString = escapeRegExp(heightTxt);
-      // 前面filterOption 不区分大小写，这里用i
-      const regexp = new RegExp(searchString, 'gi')
-      return text.replace(regexp, `<span style="color:red">${heightTxt}</span>`)
-    }
-    return (
-      <Tooltip title={text}>
-        <div ref={(nodeElement) => {
-          if (nodeElement) {
-            nodeElement.innerHTML = heightLightTxt(text, filterTxt)
-          }
-        }}
-        />
-      </Tooltip>
-    )
-  }
 
   // 扁平化二维数组的方法
   const mapRows = params => {
@@ -714,13 +522,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     setCheckedAll(selectRows.length === tablePagination?.total);
   }
 
-  // 生成唯一值
-  const makeUniqueValue = () => {
-    const generateUnitKey = (((1 + Math.random()) * 0x10000) | 0).toString(16);
-    setUniqueValue(generateUnitKey);
-    return generateUnitKey;
-  }
-
   const rowSelection = {
     type: selectMode ? 'checkbox' : 'radio',
     selectedRowKeys,
@@ -831,6 +632,18 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             </Col>
           );
         }
+        if (i?.field?.type === 'multipleQuerySearchSelect') {
+          return (
+            <Col span={ColSpan} key={i.name}>
+              <Form.Item name={i.name} label={i.label} key={i.name}>
+                <QueryMutipleSearchSelect {...i.field.props}  onValueChange={(value) => {
+                  form.setFieldsValue({
+                    [i.name]: value
+                  })}} />
+              </Form.Item>
+            </Col>
+          );
+        }
 
         // 默认type是input
         return (
@@ -998,57 +811,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     );
   }
 
-  const maxTagPlaceholder = (selectedValues) => {
-    const onClose = (e: any, item: any) => {
-      e.preventDefault();
-      const newValue = labelInValue ? JSON.parse(JSON.stringify(value)).filter((i: any) => i.value !== item.value) : JSON.parse(JSON.stringify(value)).filter((i: any) => i !== item.value)
-      onChange(newValue);
-    }
-    return (
-      <Tooltip 
-        overlayClassName='searchSelectMaxTagToolTip'
-        destroyTooltipOnHide 
-        placement="topRight" 
-        autoAdjustOverflow={false} 
-        title={(
-          <div 
-            style={{ margin: '6px 8px 0px' }}
-            onMouseEnter={() => {
-              setIsMaxTagsOpen(true)
-            }}
-            onMouseLeave={() => {
-              setIsMaxTagsOpen(false)
-            }}
-          >
-            {selectedValues.map((i: any) => (
-              <Tag
-                closable={true}
-                onClose={(e) => onClose(e, i)}
-                style={{ margin: '0px 3px 3px 0px', background: '#f5f5f5', height: '24px', border: '1px solid #f0f0f0' }}
-              >
-                {i.label}
-              </Tag>
-            ))}
-          </div>
-        )}
-      >
-        {`+ ${selectedValues?.length}`}
-      </Tooltip>
-    )
-  }
-
-  const handleSelectOptionsShowValue = (specialBracket: boolean, noNeedSplit: boolean, item: object) => {
-    let showText = Array.isArray(item.textShowText) &&
-      item.textShowText.join('    ') || item.textShowText;
-    if (noNeedSplit) {
-      return item.text;
-    } else {
-      return specialBracket
-        ? `【${item.textShowKey || ''}】${showText}`
-        : `${item.textShowKey || ''}       ${showText}`
-    }
-  };
-
   const getShowLabelTextStr = (kongValue): string => {
     if (selectMode) {
       return Array.isArray(value) && value?.map(item => item.label || item.text || '')?.join(',') || kongValue;
@@ -1121,7 +883,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             onPopupScroll={SelectScroll}
             style={{ width: 'calc(100%)' }}
             placeholder="请选择"
-            maxTagPlaceholder={maxTagPlaceholder}
+            maxTagPlaceholder={(v)=> maxTagPlaceholder(v,{ selectProps:{labelInValue}, onChange, value, setIsMaxTagsOpen })}
             onSearch={(v) => onSearchChange(v)}
             {...(needModalTable ? {
               suffixIcon: <div className={`search_select_expand_button ${(sDisabled)?'search_select_expand_button_disabled':''}`} onClick={showModal}><SearchOutlined /></div>