@bit-sun/business-component 2.3.10 → 2.3.11-alpha.2

package/src/components/Business/columnSettingTable/utils.tsx

@@ -13,33 +13,35 @@ import {
  //设置queryTable默认列宽
 export const getItemDefaultWidth = (item: any) => {
   let defaultWidth = 200;
-  let lowerCaseKey = (item.key || item.dataIndex).toLowerCase();
-  switch (true) {
-    case item?.title === '操作' || lowerCaseKey === 'operate':
-      defaultWidth = 60;
-      break;
-    case lowerCaseKey.indexOf('number') > -1:
-    case lowerCaseKey.indexOf('quantity') > -1:
-    case lowerCaseKey.indexOf('amount') > -1:
-      defaultWidth = 90;
-      break;
-    case (lowerCaseKey.indexOf('no') > -1):
-      defaultWidth = 200;
-      break;
-    case lowerCaseKey.indexOf('code') > -1:
-      defaultWidth = 170;
-      break;
-    case lowerCaseKey.indexOf('time') > -1:
-      defaultWidth = 130;
-      break;
-    case lowerCaseKey.indexOf('status') > -1:
-      defaultWidth = 100;
-      break;
-    case lowerCaseKey.indexOf('user') > -1:
-      defaultWidth = 130;
-      break;
-    default:
-      break;
+  let lowerCaseKey = (item.key || item.dataIndex)?.toLowerCase();
+  if (lowerCaseKey) {
+    switch (true) {
+      case item?.title === '操作' || lowerCaseKey === 'operate':
+        defaultWidth = 60;
+        break;
+      case lowerCaseKey.indexOf('number') > -1:
+      case lowerCaseKey.indexOf('quantity') > -1:
+      case lowerCaseKey.indexOf('amount') > -1:
+        defaultWidth = 90;
+        break;
+      case (lowerCaseKey.indexOf('no') > -1):
+        defaultWidth = 200;
+        break;
+      case lowerCaseKey.indexOf('code') > -1:
+        defaultWidth = 170;
+        break;
+      case lowerCaseKey.indexOf('time') > -1:
+        defaultWidth = 130;
+        break;
+      case lowerCaseKey.indexOf('status') > -1:
+        defaultWidth = 100;
+        break;
+      case lowerCaseKey.indexOf('user') > -1:
+        defaultWidth = 130;
+        break;
+      default:
+        break;
+    }
   }
   return defaultWidth;
 };
@@ -66,4 +68,4 @@ export const handleTextOverflow = (
       </span>
     </Tooltip>
   );
-};
+};

package/src/components/Business/moreTreeTable/FixedScrollBar.tsx

@@ -44,6 +44,7 @@ const FixedScrollBar = ({viewPort, stickyProps}: any, ref: any) => {
   };
 
   useEffect(() => {
+    onContainerScroll()
     const onscroll = throttle(onContainerScroll, 50)
     container.addEventListener('scroll', onscroll)
     return () => {

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

@@ -127,7 +127,8 @@ const AddSelect = (props: any) => {
     beforeShowModal,
     tableCodeList = [], // 非必填 默认取组件定义code,如需自定义----数组第一位为供选择商品的table的code,第二位为已选择商品的table的code
     businessType = 'sku',
-    isAllowRepeatedSelect = false
+    isAllowRepeatedSelect = false,
+    noUseItemEancode = true
   } = props;
   const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField = 'name', mappingTextShowKeyField, mappingValueField = 'code', mappingTextShowTextField } = requestConfig || {};
   const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
@@ -677,8 +678,10 @@ const AddSelect = (props: any) => {
           currentPage: 1,
         }),
       ]).then((x: any)=>{
-        formatSource(x,0, 2, tableSearchForm,['id','name'])
-        formatTreeDataSource(x,1, 3, tableSearchForm)
+        const searchPosition1 = noUseItemEancode ? 3 : 2;
+        const searchPosition2 = noUseItemEancode ? 4 : 3;
+        formatSource(x,0, searchPosition1, tableSearchForm,['id','name'])
+        formatTreeDataSource(x,1, searchPosition2, tableSearchForm)
       })
     }
     if(businessType == 'skc') {

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

@@ -25,6 +25,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     needModalTable = true,
     getPopupContainer = undefined,
     fieldComponent,
+    selectBusinessType,
   } = props;
   const {
     url,
@@ -39,6 +40,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     mappingTextShowTextField,
     init = true,// 是否初始请求
     extralHeaders = {},// 额外请求头参数
+    specialBracket = false,// 是否使用特殊括弧显示选项 【value】text
   } = requestConfig || {};
   const resultSourceKey = handleSourceName(sourceName || requestConfig?.sourceName || 'supplierCode')
 
@@ -100,7 +102,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const [tableData, setTableData] = useState([]);
   const [tablePagination, setTablePagination] = useState(tableInitPagination)
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
-  const [doubleArr, setDoubleArr] = useState([]); // 存放双数组的数组
+  const [selectedRows, setSelectedRows] = useState([]);
   const [checkedAll, setCheckedAll] = useState(false)
   const [indeterminate, setIndeterminate] = useState(false)
   const [tableFormParams, setTableFormParams] = useState({});
@@ -136,7 +138,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }))
 
   // 获取数据源 （type: 1下拉框 2/3弹框  不传值默认为下拉框）
-  const getData = (params = {}, type = 1) => {
+  const getData = (params = {}, type = 1,callback?: any) => {
     if (!requestConfig) return;
 
     setFetching(true)
@@ -311,7 +313,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 }
                 return {
                   ...item,
-                  text: item[mappingTextField],
+                  text: specialBracket 
+                    ? `【${item[mappingValueField]}】${item[mappingTextField]}` 
+                    : item[mappingTextField],
                   textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
@@ -332,7 +336,9 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 }
                 return {
                   ...item,
-                  text: item[mappingTextField],
+                  text: specialBracket 
+                    ? `【${item[mappingValueField]}】${item[mappingTextField]}` 
+                    : item[mappingTextField],
                   textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
@@ -341,13 +347,17 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
             : [];
         }
         source = Array.isArray(source) ? source : []
-        if (type === 1) {
-          ctx?.form?.setFieldSource(resultSourceKey, source)
-          setItems(source)
-          setItemsTotal(Number(res?.total || res?.totalCount || source.length))
+        if(callback) {
+          callback(source)
         } 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)) })
+          if (type === 1) {
+            ctx?.form?.setFieldSource(resultSourceKey, source)
+            setItems(source)
+            setItemsTotal(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) });
@@ -394,6 +404,14 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     makeUniqueValue();
   }, [resultSourceKey])
 
+  useEffect(() => {
+    if (init) {
+      setItems([]);
+      setItemsTotal(0);
+      run('init')
+    }
+  },[selectBusinessType])
+
   const showModal = () => {
     getData({ pageSize: tableInitPageSize, currentPage: 1 }, 3)
     setIsModalVisible(true);
@@ -401,15 +419,13 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     if (value) {
       if (selectMode) {
         setSelectedRowKeys(labelInValue ? value.map(i => i.key) : value)
+        setSelectedRows(labelInValue ? value.map(i => ({ [mappingValueField]: i.key, value: i.key, text: i.label })) : value.map(i => ({ [mappingValueField]: i, value: i })))
         setPopValue(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })));
         setIndeterminate(!!value.length && value.length < itemsTotal);
         setCheckedAll(itemsTotal && value.length === itemsTotal);
-        // 需清空数据
-        if (!value.length) {
-          setDoubleArr([])
-        }
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value])
+        setSelectedRows(labelInValue ? [{ [mappingValueField]: value.key, value: value.key, text: value.label }] : [{ [mappingValueField]: value, value: value }])
         setPopValue(labelInValue ? [{ value: value.key, text: value.label }] : [{ value: value }]);
       }
     }
@@ -449,7 +465,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     setTableData([]);
     setTablePagination(tableInitPagination);
     setSelectedRowKeys([]);
-    setDoubleArr([]);
+    setSelectedRows([]);
     setCheckedAll(false);
     setIndeterminate(false);
   };
@@ -510,25 +526,32 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     getData({ ...tableFormParams, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
   }
 
+  const onCheckAllData = (pSize) => {
+    getData({ ...tableFormParams, pageSize: pSize, currentPage: 1 }, 2,(source) => {
+      const currentItemsData = JSON.parse(JSON.stringify(source))
+      setSelectedRowKeys(currentItemsData.map(i => i.value))
+      setPopValue(currentItemsData);
+      setSelectedRows(currentItemsData)
+    })
+  }
   const onChangeCheckAll = (e) => {
     if (e.target.checked) {
       // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
       // 如果超过100条 就默认查出所有数据
-      const currentItemsData = JSON.parse(JSON.stringify(items))
-      const totalPage = Math.ceil(itemsTotal / tablePagination?.pageSize)
-      for (let i = 0; i <= totalPage - 1; i++) {
-        doubleArr[i] = currentItemsData.slice(tablePagination?.pageSize * i, tablePagination?.pageSize * (i + 1))
-      }
-      setDoubleArr(doubleArr)
-      setSelectedRowKeys(currentItemsData.map(i => i.value))
-      setPopValue(currentItemsData);
       if (items.length < itemsTotal) {
-        // TODO 请求接口获取所有数据
+        const totalPage = Math.ceil(itemsTotal / tablePagination?.pageSize);
+        const allPageSize = totalPage * tablePagination?.pageSize;
+        onCheckAllData(allPageSize)
+      } else {
+        const currentItemsData = JSON.parse(JSON.stringify(items))
+        setSelectedRowKeys(currentItemsData.map(i => i.value))
+        setPopValue(currentItemsData);
+        setSelectedRows(currentItemsData)
       }
     } else {
       setSelectedRowKeys([])
       setPopValue([]);
-      setDoubleArr([])
+      setSelectedRows([])
     }
     setIndeterminate(false);
     setCheckedAll(e.target.checked);
@@ -538,13 +561,13 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     const {
       filterTxt, text,
     } = props
-    const heightLightTxt = (txt, heightTxt) => {
+    const heightLightTxt = (text, heightTxt) => {
       if (heightTxt === '') {
-        return txt
+        return text
       }
       // 前面filterOption 不区分大小写，这里用i
       const regexp = new RegExp(heightTxt, 'gi')
-      return txt.replace(regexp, `<span style="color:red">${heightTxt}</span>`)
+      return text.replace(regexp, `<span style="color:red">${heightTxt}</span>`)
     }
     return (
       <Tooltip title={text}>
@@ -575,37 +598,19 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   };
 
   const onChangeSelectedKeys = (selectKeys, selectRows) => {
-    const nowPage = tablePagination?.current;
-
-    let filterRows = []; // 存放拼接后的一维数组的变量
-    let sksResult = [];
+    let sksResult = selectRows.map((i) => i.value);
 
-    if (selectMode) {
-      // 处理多选分页累计选中
-      // 勾选生成二维数组
-      doubleArr[nowPage ? nowPage - 1 : 0] = selectRows
-      // console.log(doubleArr)
-      setDoubleArr(doubleArr)
-      // 这块扁平化成为一位数组
-      filterRows = mapRows(doubleArr);
-      // console.log(filterRows)
-
-      sksResult = filterRows.map((i) => i.value)
-    } else {
-      // 处理单选
-      filterRows = selectRows;
-      sksResult = selectRows.map((i) => i.value)
-      // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
-      if(!modalTableProps?.modalRadioNeedFooter) {
-        handleSelectOver(filterRows)
-        handleCancel();
-      }
+    // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
+    if(!selectMode && !modalTableProps?.modalRadioNeedFooter) {
+      handleSelectOver(selectRows)
+      handleCancel();
     }
 
     setSelectedRowKeys(sksResult)
-    setPopValue(filterRows);
-    setIndeterminate(!!filterRows.length && filterRows.length < tablePagination?.total);
-    setCheckedAll(filterRows.length === tablePagination?.total);
+    setSelectedRows(selectRows)
+    setPopValue(selectRows);
+    setIndeterminate(!!selectRows.length && selectRows.length < tablePagination?.total);
+    setCheckedAll(selectRows.length === tablePagination?.total);
   }
 
   // 生成唯一值
@@ -618,8 +623,13 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const rowSelection = {
     type: selectMode ? 'checkbox' : 'radio',
     selectedRowKeys,
+    preserveSelectedRowKeys: true,
     onChange: (sks, srs) => {
-      onChangeSelectedKeys(sks, srs)
+      // 处理翻页后，之前存储的selectedRows变为undefined
+      // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
+      let tmpSelectedRows = selectedRows.concat(srs).filter(item => item != undefined);
+      let totalSelectedRows = sks.map(key => tmpSelectedRows.filter(item => item[mappingValueField] == key)[0]).filter(item => item != undefined)
+      onChangeSelectedKeys(sks, totalSelectedRows)
     },
     getCheckboxProps: () => {
       return ({
@@ -725,6 +735,14 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     )
   }
 
+  const handleSelectOptionsShowValue = (specialBracket: boolean, item: object) => {
+    let showText = Array.isArray(item.textShowText) &&
+      item.textShowText.join('    ') || item.textShowText;
+    return specialBracket 
+      ? `【${item.textShowKey}】${showText}`
+      : `${item.textShowKey}       ${showText}`
+  };
+
   return (
     <div className={'search_select'}>
       {fieldComponent ?
@@ -774,7 +792,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           >
             {items.map(item => (
               <Option key={item.value} label={item.text}>
-                {LightHeightOption({ text: `${item.textShowKey}       ${Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText}`, filterTxt: searchValue })}
+                {LightHeightOption({ 
+                  text: handleSelectOptionsShowValue(specialBracket, item), 
+                  filterTxt: searchValue 
+                })}
               </Option>
             ))}
           </Select>

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

@@ -19,7 +19,8 @@ const TreeSearchSelect = (props: any) => {
     showSearch = true,
     maxTagCount = 1,
     multiple = false,
-    isChoose = false,
+    isChoose = false, // 默认父节点不可选；传true则不限制
+    rootDisabled = false, // 默认根节点可选
     mode,
     getPopupContainer,
     labelInValue = false,
@@ -41,7 +42,8 @@ const TreeSearchSelect = (props: any) => {
   } = remoteSource;
 
   const mapSearchTree = (treeDataItem: any) => {
-    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+    const haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0; // 盘算是否为父节点
+    const isRoot = treeDataItem?.id == '0'; // 判断是否为根节点
     return {
       title: treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
@@ -49,16 +51,19 @@ const TreeSearchSelect = (props: any) => {
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
-      disabled: isDisabled(haveChildren),
+      disabled: isDisabled(haveChildren,isRoot),
       children: haveChildren ? treeDataItem.children.map((i: any) => mapSearchTree(i)) : [],
     };
   };
 
-  const isDisabled = (children: any) => {
+  const isDisabled = (isParent: boolean,isRoot: boolean) => {
     if (isChoose) {
+      if(rootDisabled && isRoot){
+        return rootDisabled
+      }
       return false;
     }
-    return children;
+    return isParent;
   }
 
   /* 实时查询   但是目前用的直接是完整数据源, 所以没有使用 */
@@ -97,9 +102,40 @@ const TreeSearchSelect = (props: any) => {
       return formatResult
     }
   }
+  const parallelData = (data: any,result: any) => {
+    data.forEach((i: any) => {
+      result.push(i);
+      if (i.children) {
+        parallelData(i.children, result);
+      }
+    });
+    return result;
+  }
+  const getSelectItem = (tData: any,selectValue: any) => {
+    const handleList = tData||[];
+    let result = [];
+    if(labelInValue) {
+      result = multiple||treeCheckable ? (selectValue?.map((i: any) => {
+        if(handleList.some((s: any) => s.key == i.value)){
+          return handleList.find((s: any) => s.key == i.value)
+        }
+      }) || []) : (handleList?.find((s: any) => s.key == selectValue?.value)||{})
+    } else {
+      const cValue = _.get(selectValue?.[0], 'value', selectValue);
+      result = multiple||treeCheckable ? (selectValue?.map((i: any) => {
+        if(handleList.some((s: any) => s.key == i)){
+          return handleList.find((s: any) => s.key == i)
+        }
+      }) || []) : (handleList?.find((s: any) => s.key == cValue)||{})
+    }
+    return result;
+  }
   const handleChange = (data: any, dataName: any) => {
     const handleData = formatData(data);
-    onChange(handleData,data);
+    // 获取选中树节点当条数据，并返回给调用业务
+    const parallelTreeData = parallelData(treeData,[])
+    const currentItem = getSelectItem(parallelTreeData,data)
+    onChange(handleData,data,currentItem,parallelTreeData);
     onChangeName && onChangeName(dataName);
     getTreeData && getTreeData(treeData); // 把树节点暴露出去
     ctx?.form?.setFieldValue(ctx.name, handleData);

package/src/components/Solution/RuleComponent/index.js

@@ -630,7 +630,7 @@ class RuleObjectComponent extends Component {
     const parallelTreeData = this.coverToParallel(ruleTreeData, []) || [];
     const currentTreeItem =
       itemDetail?.elementId &&
-      parallelTreeData.find((i) => i.key === itemDetail?.elementId);
+      parallelTreeData.find((i) => (i?.key?.indexOf('.') > -1 ? i.id : i.key) === itemDetail?.elementId);
     const dataChoiceBusinessType = currentTreeItem?.dataChoiceBusinessType;
     const dataInputBusinessType = currentTreeItem?.dataInputBusinessType;
     return (
@@ -896,10 +896,12 @@ class RuleObjectComponent extends Component {
     );
   };
 
-  handleEditExtraInfoResponse = (code, val, parentDetail) => {
+  handleEditExtraInfoResponse = (code, val, parentDetail,classDataIndex) => {
     const { ruleClassData } = this.state;
     const { callBack } = this.props;
     parentDetail.extraInfo.response[code] = val;
+    ruleClassData[classDataIndex].extraInfo.response[code] = val;
+
     this.setState(
       {
         ruleClassData,
@@ -914,6 +916,7 @@ class RuleObjectComponent extends Component {
     itemDetail,
     parentDetail,
     ruleReturnConfig,
+    classDataIndex,
     disabled,
     boxStyle,
   ) => {
@@ -932,7 +935,7 @@ class RuleObjectComponent extends Component {
       let value = val;
       if (isObj(code)) {
         Object.keys(code).forEach((ite) => {
-          this.handleEditExtraInfoResponse(ite, code[ite], parentDetail);
+          this.handleEditExtraInfoResponse(ite, code[ite], parentDetail,classDataIndex);
         });
         return;
       }
@@ -942,7 +945,7 @@ class RuleObjectComponent extends Component {
       if (isObj(val)) {
         value = val.value || val.PCDCode?.join('/');
       }
-      this.handleEditExtraInfoResponse('value', value, parentDetail);
+      this.handleEditExtraInfoResponse('value', value, parentDetail,classDataIndex);
     };
 
     return (
@@ -959,7 +962,7 @@ class RuleObjectComponent extends Component {
           <MinusCircleOutlined
             className={'icon_btn_style'}
             onClick={() => {
-              this.handleEditExtraInfoResponse('enable', false, parentDetail);
+              this.handleEditExtraInfoResponse('enable', false, parentDetail,classDataIndex);
             }}
             style={{
               color: 'gray',
@@ -1755,7 +1758,7 @@ class RuleObjectComponent extends Component {
             type="link"
             onClick={() => {
               if (isHaveRuleReturnConfig) {
-                this.handleEditExtraInfoResponse('enable', true, parentDetail);
+                this.handleEditExtraInfoResponse('enable', true, parentDetail,classDataIndex);
               } else {
                 message.warn('未配置返回');
               }
@@ -1769,6 +1772,7 @@ class RuleObjectComponent extends Component {
             itemDetail,
             parentDetail,
             ruleReturnConfig,
+            classDataIndex,
             disabled,
             RuleActionItemStyle,
           )) ||

package/src/utils/LocalstorageUtils.ts

@@ -88,3 +88,8 @@ export function handleUserPhone() {
   const enStr = str && str.slice(0, 3) + '****' + str.slice(str.length - 4);
   return enStr;
 }
+
+// 获取当前所选组织
+export function getCurrentTargetBgId() {
+  return localStorage.getItem('target_bg_id');
+}