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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.12-alpha.27",
+  "version": "4.0.12-alpha.28",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -328,7 +328,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     tableSearchForm =  [
       { name: 'qp-skuCode-in', label: 'SKU编码',type:'multipleQueryInput' },
       { name: 'qp-skuName-like', label: 'SKU名称' },
-      { name: 'qp-itemCode-like', label: '外部SPU编码' },
+      { name: 'qp-itemCode-like', label: 'SPU编码' },
       { name: 'qp-eancode-in', label: '商品条码', field: {
         type: 'multipleQueryInput',
         props: {

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

@@ -4,11 +4,10 @@ import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs } from 'antd';
 import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/icons';
 import request from '@/utils/request';
-import { stringify } from 'querystring';
 import _, { escapeRegExp, isNil, values } from "lodash"
 import './index.less';
 import { BusinessSearchSelect, QueryMutipleInput } from '@/index';
-import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource }  from './utils';
+import { handleSourceName, getFormRowInfo, hasMoreQueryFields, defaultVisibleFieldsCount, getRealStr, ColSpan, getTableHeigth, getCurrentSRKs, getRenderSource, convertUrlQueryParams, convertBodyParams, formatSelectedValue }  from './utils';
 import { judgeIsRequestError } from '@/utils/requestUtils';
 import zhankaitiaojian from '../../../assets/zhankaitiaojian-icon.svg';
 import PropertySelector from '@/components/Business/PropertyModal';
@@ -35,6 +34,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   } = props;
   const {
     url,
+    method = 'get',
     otherParams,// 默认参数
     isMap,
     fixedparameter,
@@ -78,7 +78,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   var pattern = /(action|create|edit|view)/
   const isFormPage = pathname.match(pattern)?.length > 0;
 
-  const initPagination = { showQuickJumper: true, showSizeChanger: false, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
+  const initPagination = { showQuickJumper: true, showSizeChanger: true, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
   const tableInitPagination = { ...initPagination, total: 0, current: 1 }
   const disabled = noOperate || selectProps?.disabled || props?.disabled;
   const isHaveDependency = fixedparameter && fieldValToParam && ctx;
@@ -182,7 +182,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }))
 
   // 获取数据源 （type: 1下拉框 2/3弹框  不传值默认为下拉框）
-  const getData = (params = {}, type = 1,callback?: any, bodyParams?: any,) => {
+  const getData = (params = {}, type = 1,callback?: any) => {
     if (!requestConfig) return;
 
     setFetching(true)
@@ -330,114 +330,17 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
       queryParams[selectParamsKey] = searchValue;
     }
 
-    if (requestConfig?.method === 'post') {
-      request
-        .post(
-          `${url}?${stringify(queryParams)}`,
-          bodyParams || null,)
-        .then((result: any) => {
-          setFetching(false)
-          result = result.data;
-          if (judgeIsRequestError(result)) {
-            message.error(result.msg);
-            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') : [];
-
-          if (callback) {
-            callback(source)
-          } else {
-            if (type === 1) {
-              ctx?.form?.setFieldSource(resultSourceKey, source)
-              setSelectDataSource(source, (Number(res?.total || res?.totalCount || source.length)))
-            } else {
-              setTableData(source)
-              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) => { setFetching(false) });
-        return;
+    let getRequest;
+    const methodName = method?.toLocaleLowerCase();
+    if(['post','patch','put'].includes(methodName)) {
+      getRequest = request[methodName](`${url}${convertUrlQueryParams(queryParams)}`,convertBodyParams(queryParams))
+    } else {
+      getRequest = request.get( `${url}${convertUrlQueryParams(queryParams)}`,{headers: { ...extralHeaders }})
     }
 
-    
-    request
-      .get(
-        `${url}?${stringify(queryParams)}`, {
-          headers: { ...extralHeaders }
-        })
-      .then((result: any) => {
+    if (!url || !getRequest) return;
+
+    getRequest.then((result: any) => {
         setFetching(false)
         result = result.data;
         if (judgeIsRequestError(result)) {
@@ -736,17 +639,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const onSearchTable = () => {
     const params = form.getFieldsValue();
-
-    // const isHaveParams = params && Object.keys(params).filter(item => params[item]).length > 0;
     setModalSearched(true);
-    
-    let unique_params = null;
-    if (params['UNIQUE_SPEC']) {
-      unique_params = params['UNIQUE_SPEC']?.propertyList || [];
-    }
-
     setTableFormParams(params);
-    getData({ ...params, pageSize: tableInitPageSize }, 2, null, unique_params);
+    getData({ ...params, pageSize: tableInitPageSize }, 2, null);
   }
 
   const onResetTable = () => {
@@ -956,14 +851,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     return collapsed ? formItem(list?.slice(0,viCount)) : formItem(list)
   }
 
-  // const queryFieldsDom = <SearchItemTable
-  //   ref={searchTableRef}
-  //   setShowSearchFields={setShowSearchFields||[]}
-  //   showSearchFields={showSearchFields||[]}
-  //   datasource={modalTableProps?.tableSearchForm || []}
-  //   bsTableCode={bsTableCode}
-  // />
-
   const renderShowTable =  (tableList, type) => {
     const tableBoxHeighth = getTableHeigth(modalTableProps?.tableSearchForm);
     const oSY = `calc(100vh - ${tableBoxHeighth}px - 82px)`;  // 分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
@@ -976,7 +863,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           columns={tableShowColumns}
           dataSource={tableList}
           {...type=='noPage'?{
-            pagination: initPagination,
+            pagination: { ...initPagination,showSizeChanger: false },
             locale: {
               emptyText: '暂无已选结果',
             }
@@ -1031,7 +918,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
 
   const onDeselect = (...arg) => {
-    const oldSelect = value?.map(s => ({ value: s?.value||s }))||[];
+    const oldSelect = formatSelectedValue(value);
     const deRecord = arg[1];
     const srs = oldSelect.filter((s: any) => s.value != deRecord?.value)
     onSelectClick(srs, items,false)
@@ -1070,12 +957,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
               selectedRowKeys: currentSRKs,
               preserveSelectedRowKeys: true, // 避免搜索之后 没有了选中前的数据 保证sks的正确性
               onChange: (sks, srs) => {
-                // const oldSelect = value?.map(s => ({ value: s?.value||s }))||[];
-                const oldSelect = value?.map(s => ({ 
-                  value: s?.value||s,
-                  key: s?.key||s,
-                  label: s?.label|| '',
-                }))||[];
+                const oldSelect = formatSelectedValue(value);
                 let tmpSelectedRows = oldSelect.concat(srs).filter(item => item != undefined);
                 let realSrs = sks.map(key => tmpSelectedRows.filter(item => item.value == key)[0]).filter(item => item != undefined)
                 onSelectClick(realSrs, dataSource,false)
@@ -1086,11 +968,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 event.stopPropagation();
                 event.nativeEvent.stopImmediatePropagation();
 
-                const oldSelect = value?.map(s => ({ 
-                  value: s?.value||s,
-                  key: s?.key||s,
-                  label: s?.label|| '',
-                }))||[];
+                const oldSelect = formatSelectedValue(value);
                 const newSelect = [JSON.parse(JSON.stringify(record))];
                 const srs = getRealStr(oldSelect,newSelect,record);
                 onSelectClick(srs,dataSource,false)
@@ -1249,7 +1127,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
               suffixIcon: <div className={`search_select_expand_button ${(sDisabled)?'search_select_expand_button_disabled':''}`} onClick={showModal}><SearchOutlined /></div>
             } : {})}
             {...currentSelectProps}
-            getPopupContainer={(triggerNode) => (highestPopContainer && highestPopContainer()) || triggerNode.parentElement || getPopupContainer && getPopupContainer(triggerNode)}
+            getPopupContainer={(triggerNode) => (highestPopContainer && highestPopContainer(triggerNode)) || triggerNode.parentElement}
           >
             {items.map(item => (
               <Option key={item.value} label={item.text}>
@@ -1307,7 +1185,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                         <Button key="reset" onClick={onResetTable}>
                           重置 ctrl+U
                         </Button>
-                        {/* <div>{queryFieldsDom}</div> */}
                         <div style={{position: 'absolute',top: 0,right: 0}}>
                           {hasMoreQueryFields(modalTableProps) && modalTableProps?.isHorizontally
                               ? <img onClick={() => {toggleCollapsed()}} style={{

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

@@ -1,3 +1,6 @@
+import { stringify } from 'querystring';
+import { omit } from "lodash"
+
 export const columnsPerRow = 4; // 每行的列数
 export const ColSpan = 6; // 查询条件 每行col = 24 /columnsPerRow
 export const handleSourceName = (sName: any) => {
@@ -27,11 +30,6 @@ export const hasMoreQueryFields = (modalTableProps: any) => {
   const visibleFieldsCount = getVisibleFieldsCount(modalTableProps);
   return visibleFieldsCount < tableSearchForm?.length;
 }
-
-export const getRealStr = (oldSelect: any,newSelect: any, record: any) => {
-  return oldSelect?.length ? oldSelect.some((o: any) => o.value == record?.value) ? oldSelect.filter((s: any) => s.value != record?.value) : [...oldSelect,...newSelect] : newSelect;
-}
-
 export const getTableHeigth = (list: any) => {
   const totalRows = Math.ceil((list?.length+1) / 4);
   if(totalRows == 1) return 358;  // modal弹窗760 调整为700 适应小屏     
@@ -42,10 +40,19 @@ export const getTableHeigth = (list: any) => {
 
 
 // ------------------------------------------处理数据相关--开始----------------------------------------
+export const formatSelectedValue = (value: any) => {
+  return value?.map((s: any) => ({ 
+    value: s?.value||s,
+    key: s?.key||s?.value||s,
+    label: s?.label|| '',
+  }))||[];
+}
+export const getRealStr = (oldSelect: any,newSelect: any, record: any) => {
+  return oldSelect?.length ? oldSelect.some((o: any) => o.value == record?.value) ? oldSelect.filter((s: any) => s.value != record?.value) : [...oldSelect,...newSelect] : newSelect;
+}
 export const getCurrentSRKs = (selectMode: any,labelInValue:boolean,value: any) => {
   return selectMode ? (labelInValue ? value?.map((s: any)=> (s?.value||s)) : value) : (labelInValue ? value?.value&&[value?.value]||[] : value&&[value]||[])
 }
-
 export const getRenderSource = (currentSRKs: any, items: any) => {
   // 判空处理
   if(!currentSRKs?.length) return items||[];
@@ -71,4 +78,48 @@ export const getRenderSource = (currentSRKs: any, items: any) => {
   ]
 }
 
-// ------------------------------------------处理数据相关--结束----------------------------------------
+// ------------------------------------------处理数据相关--结束----------------------------------------
+
+
+
+// ------------------------------------------查询相关--开始----------------------------------------
+
+//处理单据编号查询 如果是查询单条数据 就是模糊查询 两条以上就是精准查询
+export const convertOrderNo = (params: any) => {
+  //需要处理得编号字段名
+  const arr = [
+    'qp-skuCode-in',
+    'qp-eancode-in',
+  ];
+  for (let i = 0; i < arr.length; i++) {
+    if (params[arr[i]]) {
+      if (!params[arr[i]].includes(',')) {
+        params[arr[i].replace(/(.*)in/, '$1like')] = params[arr[i]];
+        delete params[arr[i]];
+      }
+    }
+  }
+  return params;
+};
+
+export const convertQueryParams = (params: any) => {
+  const result = convertOrderNo(params)
+  return omit(result,['UNIQUE_SPEC']); // 处理sku选择器属性参数
+}
+export const convertUrlQueryParams = (params: any) => {
+  // 非query请求：默认参数拼接URL，设置属性noUrlQueryParams可不拼接
+  return params?.noUrlQueryParams ? '' : `?${stringify(convertQueryParams(params))}`;
+}
+
+export const convertBodyParams = (params: any) => {
+  // 处理sku选择器属性参数
+  let unique_params = null;
+  if (params['UNIQUE_SPEC']) {
+    unique_params = params['UNIQUE_SPEC']?.propertyList || [];
+  }
+
+  // body参数来源：sku选择器固定参数 > 调用所传bodyParams > 默认参数-无
+  return unique_params || params?.bodyParams || null;
+}
+
+// ------------------------------------------查询相关--结束----------------------------------------