@bit-sun/business-component 2.3.17 → 2.3.19

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

@@ -13,29 +13,29 @@ import {
  //设置queryTable默认列宽
 export const getItemDefaultWidth = (item: any) => {
   let defaultWidth = 200;
-  let lowerCaseKey = (item.key || item.dataIndex).toLowerCase();
+  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:
+    case lowerCaseKey?.indexOf('number') > -1:
+    case lowerCaseKey?.indexOf('quantity') > -1:
+    case lowerCaseKey?.indexOf('amount') > -1:
       defaultWidth = 90;
       break;
-    case (lowerCaseKey.indexOf('no') > -1):
+    case (lowerCaseKey?.indexOf('no') > -1):
       defaultWidth = 200;
       break;
-    case lowerCaseKey.indexOf('code') > -1:
+    case lowerCaseKey?.indexOf('code') > -1:
       defaultWidth = 170;
       break;
-    case lowerCaseKey.indexOf('time') > -1:
+    case lowerCaseKey?.indexOf('time') > -1:
       defaultWidth = 130;
       break;
-    case lowerCaseKey.indexOf('status') > -1:
+    case lowerCaseKey?.indexOf('status') > -1:
       defaultWidth = 100;
       break;
-    case lowerCaseKey.indexOf('user') > -1:
+    case lowerCaseKey?.indexOf('user') > -1:
       defaultWidth = 130;
       break;
     default:
@@ -66,4 +66,4 @@ export const handleTextOverflow = (
       </span>
     </Tooltip>
   );
-};
+};

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,
@@ -403,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);

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');
+}