@bit-sun/business-component 2.3.18 → 2.3.19

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { message as message$1, Popover, Card, Avatar, Tooltip, Image, Menu, Space, Dropdown, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
+import { message as message$1, Image, Popover, Card, Avatar, Tooltip, Menu, Space, Dropdown, Button, Checkbox, Input, Modal, Select, Form, Divider, Spin, Table, TreeSelect, Tag, InputNumber, Typography, Alert, Anchor, Breadcrumb, Drawer as Drawer$1, List, Tree, Row, Col, Tabs, Affix, Cascader, DatePicker, TimePicker, Switch } from 'antd';
 import _, { omit, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import { history, formatMessage, useLocation, Link, useModel, useIntl } from 'umi';
 import isEqual from 'lodash/isEqual';
@@ -2579,7 +2579,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai,
-    fieldComponent = props.fieldComponent;
+    fieldComponent = props.fieldComponent,
+    selectBusinessType = props.selectBusinessType;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -2996,6 +2997,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   useEffect(function () {
     makeUniqueValue();
   }, [resultSourceKey]);
+  useEffect(function () {
+    if (init) {
+      setItems([]);
+      setItemsTotal(0);
+      run('init');
+    }
+  }, [selectBusinessType]);
   var showModal = function showModal() {
     getData({
       pageSize: tableInitPageSize,
@@ -4207,30 +4215,31 @@ var noEmptyArray = function noEmptyArray(arr) {
 };
 //设置queryTable默认列宽
 var getItemDefaultWidth$1 = function getItemDefaultWidth(item) {
+  var _ref;
   var defaultWidth = 200;
-  var lowerCaseKey = (item.key || item.dataIndex).toLowerCase();
+  var lowerCaseKey = (_ref = item.key || item.dataIndex) === null || _ref === void 0 ? void 0 : _ref.toLowerCase();
   switch (true) {
     case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
       defaultWidth = 60;
       break;
-    case lowerCaseKey.indexOf('number') > -1:
-    case lowerCaseKey.indexOf('quantity') > -1:
-    case lowerCaseKey.indexOf('amount') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('number')) > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('quantity')) > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('amount')) > -1:
       defaultWidth = 90;
       break;
-    case lowerCaseKey.indexOf('no') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('no')) > -1:
       defaultWidth = 200;
       break;
-    case lowerCaseKey.indexOf('code') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('code')) > -1:
       defaultWidth = 170;
       break;
-    case lowerCaseKey.indexOf('time') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('time')) > -1:
       defaultWidth = 130;
       break;
-    case lowerCaseKey.indexOf('status') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('status')) > -1:
       defaultWidth = 100;
       break;
-    case lowerCaseKey.indexOf('user') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('user')) > -1:
       defaultWidth = 130;
       break;
   }
@@ -4377,7 +4386,9 @@ var AddSelect = function AddSelect(props) {
     _props$businessType = props.businessType,
     businessType = _props$businessType === void 0 ? 'sku' : _props$businessType,
     _props$isAllowRepeate = props.isAllowRepeatedSelect,
-    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate;
+    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate,
+    _props$noUseItemEanco = props.noUseItemEancode,
+    noUseItemEancode = _props$noUseItemEanco === void 0 ? true : _props$noUseItemEanco;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -5051,8 +5062,10 @@ var AddSelect = function AddSelect(props) {
         pageSize: 5000,
         currentPage: 1
       })]).then(function (x) {
-        formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
-        formatTreeDataSource(x, 1, 3, tableSearchForm);
+        var searchPosition1 = noUseItemEancode ? 3 : 2;
+        var searchPosition2 = noUseItemEancode ? 4 : 3;
+        formatSource(x, 0, searchPosition1, tableSearchForm, ['id', 'name']);
+        formatTreeDataSource(x, 1, searchPosition2, tableSearchForm);
       });
     }
     if (businessType == 'skc') {
@@ -8682,7 +8695,7 @@ var BusinessSearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       needModalTable: needModalTable,
       modalTableProps: modalTableProps
     });
-  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled]);
+  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled, props.selectBusinessType]);
   useImperativeHandle(ref, function () {
     return {
       getRef: function getRef() {
@@ -8704,9 +8717,13 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React.memo(BusinessSearchSelect, funct
   if (props && props.disabled !== nextProps.disabled) {
     return false;
   }
+  if (props && props.selectBusinessType !== nextProps.selectBusinessType) {
+    return false;
+  }
   return true;
 });
 
+// import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 function handleSelectColumn(c, parentProps) {
   var result = c;
   var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
@@ -8718,7 +8735,7 @@ function handleSelectColumn(c, parentProps) {
       return !exceptColumns.includes(i.dataIndex);
     });
   }
-  // 追加
+  // 追加(最好不用这个，当组件不固定时候会有影响)
   if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) {
     additionColumns.forEach(function (i) {
       result.splice(i.position, 0, i.column);
@@ -8731,6 +8748,7 @@ function handleSelectColumn(c, parentProps) {
   return result;
 }
 var AddSkuSelect = function AddSkuSelect(parProps) {
+  var _parProps$requestConf, _parProps$requestConf2;
   var selectProps = {
     mode: 'multiple'
   };
@@ -8738,12 +8756,26 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  var isNoUseItemBarcode = (parProps === null || parProps === void 0 ? void 0 : parProps.noUseItemEancode) !== undefined ? parProps === null || parProps === void 0 ? void 0 : parProps.noUseItemEancode : true; // 默认不加商品条码，兼容老项目
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   var initialSelectColumn = [{
     title: 'SKU编码',
     width: 150,
     dataIndex: 'skuCode'
-  }, {
+  }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+    title: '商品条码',
+    width: 100,
+    ellipsis: {
+      showTitle: false
+    },
+    dataIndex: 'itemEancode',
+    render: function render(text) {
+      return /*#__PURE__*/React.createElement(Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    }
+  }]), [{
     title: 'SKU名称',
     width: 200,
     ellipsis: {
@@ -8819,7 +8851,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       }, text);
     },
     dataIndex: 'propertyNameAndValue'
-  }];
+  }]);
   var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
   var props = {
     buttonText: parProps.buttonText || '新增',
@@ -8830,11 +8862,11 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/sku/pager/v2",
       filter: 'qp-name-like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf = parProps.requestConfig) === null || _parProps$requestConf === void 0 ? void 0 : _parProps$requestConf.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'skuCode'
     }, parProps.requestConfig),
@@ -8846,7 +8878,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'sku',
-    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect),
+    noUseItemEancode: isNoUseItemBarcode
   };
   var modalTableProps = {
     modalTableTitle: '选择商品',
@@ -8856,7 +8889,14 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     }, {
       name: 'qp-skuName-like',
       label: 'SKU名称'
-    }, {
+    }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+      name: 'qp-code-in',
+      label: '商品条码',
+      field: {
+        type: 'multipleQueryInput',
+        props: _objectSpread2({}, ((_parProps$requestConf2 = parProps.requestConfig) === null || _parProps$requestConf2 === void 0 ? void 0 : _parProps$requestConf2.itemEancodeValueRequestConfig) || {})
+      }
+    }]), [{
       name: 'qp-brandId-in',
       type: 'select',
       label: '品牌',
@@ -8901,7 +8941,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           }
         }
       }
-    }],
+    }]),
     tableColumns: [{
       title: 'SKU编码',
       width: 150,
@@ -8935,20 +8975,20 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           height: 20
         }));
       }
-    }, {
-      title: '国际条码',
+    }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+      title: '商品条码',
       width: 100,
       ellipsis: {
         showTitle: false
       },
-      dataIndex: 'barCode',
+      dataIndex: 'itemEancode',
       render: function render(text) {
         return /*#__PURE__*/React.createElement(Tooltip, {
           placement: "topLeft",
           title: text
         }, text);
       }
-    }, {
+    }]), [{
       title: '所属SPU名称',
       width: 100,
       ellipsis: {
@@ -9039,7 +9079,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
         }, text);
       },
       dataIndex: 'brandName'
-    }],
+    }]),
     selectColumn: mTpSelectColumn
   };
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -9047,6 +9087,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
   })));
 };
 var AddSkcSelect = function AddSkcSelect(parProps) {
+  var _parProps$requestConf3;
   var selectProps = {
     mode: 'multiple'
   };
@@ -9124,9 +9165,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/skc/skcSelect",
       filter: 'qp-name-like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-skcStatus-eq': 1
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf3 = parProps.requestConfig) === null || _parProps$requestConf3 === void 0 ? void 0 : _parProps$requestConf3.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'code'
     }, parProps.requestConfig),
@@ -9326,6 +9367,7 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
   })));
 };
 var AddSpuSelect = function AddSpuSelect(parProps) {
+  var _parProps$requestConf4;
   var selectProps = {
     mode: 'multiple'
   };
@@ -9412,11 +9454,11 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/item",
       filter: 'qp-itemCode,name-orGroup,like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1,
         sorter: 'desc-id'
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf4 = parProps.requestConfig) === null || _parProps$requestConf4 === void 0 ? void 0 : _parProps$requestConf4.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'itemCode'
     }, parProps.requestConfig),
@@ -29480,7 +29522,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }
       var parallelTreeData = _this.coverToParallel(ruleTreeData, []) || [];
       var currentTreeItem = (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId) && parallelTreeData.find(function (i) {
-        return i.key === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
+        var _i$key;
+        return ((i === null || i === void 0 ? void 0 : (_i$key = i.key) === null || _i$key === void 0 ? void 0 : _i$key.indexOf('.')) > -1 ? i.id : i.key) === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
       });
       var dataChoiceBusinessType = currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.dataChoiceBusinessType;
       var dataInputBusinessType = currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.dataInputBusinessType;
@@ -29685,10 +29728,11 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }), "\u6DFB\u52A0\u6761\u4EF6"))));
     };
-    _this.handleEditExtraInfoResponse = function (code, val, parentDetail) {
+    _this.handleEditExtraInfoResponse = function (code, val, parentDetail, classDataIndex) {
       var ruleClassData = _this.state.ruleClassData;
       var callBack = _this.props.callBack;
       parentDetail.extraInfo.response[code] = val;
+      ruleClassData[classDataIndex].extraInfo.response[code] = val;
       _this.setState({
         ruleClassData: ruleClassData
       }, function () {
@@ -29696,7 +29740,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       });
     };
     // 场景需要返回值2022.11.15
-    _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, disabled, boxStyle) {
+    _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, boxStyle) {
       var _ruleReturnConfig$rig;
       var isShowResponse = itemDetail.response['enable'];
       var isRightText = ruleReturnConfig === null || ruleReturnConfig === void 0 ? void 0 : (_ruleReturnConfig$rig = ruleReturnConfig.rightText) === null || _ruleReturnConfig$rig === void 0 ? void 0 : _ruleReturnConfig$rig.length;
@@ -29712,7 +29756,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         var value = val;
         if (isObj(code)) {
           Object.keys(code).forEach(function (ite) {
-            _this.handleEditExtraInfoResponse(ite, code[ite], parentDetail);
+            _this.handleEditExtraInfoResponse(ite, code[ite], parentDetail, classDataIndex);
           });
           return;
         }
@@ -29725,7 +29769,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           var _val$PCDCode;
           value = val.value || ((_val$PCDCode = val.PCDCode) === null || _val$PCDCode === void 0 ? void 0 : _val$PCDCode.join('/'));
         }
-        _this.handleEditExtraInfoResponse('value', value, parentDetail);
+        _this.handleEditExtraInfoResponse('value', value, parentDetail, classDataIndex);
       };
       return isShowResponse && /*#__PURE__*/React.createElement("div", {
         style: {
@@ -29734,7 +29778,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }, _this.renderFormCompItem(ruleReturnConfig, showValue, handleEdit, {}, boxStyle, disabled), /*#__PURE__*/React.createElement(MinusCircleOutlined, {
         className: 'icon_btn_style',
         onClick: function onClick() {
-          _this.handleEditExtraInfoResponse('enable', false, parentDetail);
+          _this.handleEditExtraInfoResponse('enable', false, parentDetail, classDataIndex);
         },
         style: {
           color: 'gray',
@@ -30343,12 +30387,12 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         type: "link",
         onClick: function onClick() {
           if (isHaveRuleReturnConfig) {
-            _this.handleEditExtraInfoResponse('enable', true, parentDetail);
+            _this.handleEditExtraInfoResponse('enable', true, parentDetail, classDataIndex);
           } else {
             message$1.warn('未配置返回');
           }
         }
-      }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
+      }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
     };
     //添加同一层级条件
     _this.addPeerRule = function (itemDetail) {

package/dist/index.js

@@ -2598,7 +2598,8 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai,
-    fieldComponent = props.fieldComponent;
+    fieldComponent = props.fieldComponent,
+    selectBusinessType = props.selectBusinessType;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -3015,6 +3016,13 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   React.useEffect(function () {
     makeUniqueValue();
   }, [resultSourceKey]);
+  React.useEffect(function () {
+    if (init) {
+      setItems([]);
+      setItemsTotal(0);
+      run('init');
+    }
+  }, [selectBusinessType]);
   var showModal = function showModal() {
     getData({
       pageSize: tableInitPageSize,
@@ -4226,30 +4234,31 @@ var noEmptyArray = function noEmptyArray(arr) {
 };
 //设置queryTable默认列宽
 var getItemDefaultWidth$1 = function getItemDefaultWidth(item) {
+  var _ref;
   var defaultWidth = 200;
-  var lowerCaseKey = (item.key || item.dataIndex).toLowerCase();
+  var lowerCaseKey = (_ref = item.key || item.dataIndex) === null || _ref === void 0 ? void 0 : _ref.toLowerCase();
   switch (true) {
     case (item === null || item === void 0 ? void 0 : item.title) === '操作' || lowerCaseKey === 'operate':
       defaultWidth = 60;
       break;
-    case lowerCaseKey.indexOf('number') > -1:
-    case lowerCaseKey.indexOf('quantity') > -1:
-    case lowerCaseKey.indexOf('amount') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('number')) > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('quantity')) > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('amount')) > -1:
       defaultWidth = 90;
       break;
-    case lowerCaseKey.indexOf('no') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('no')) > -1:
       defaultWidth = 200;
       break;
-    case lowerCaseKey.indexOf('code') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('code')) > -1:
       defaultWidth = 170;
       break;
-    case lowerCaseKey.indexOf('time') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('time')) > -1:
       defaultWidth = 130;
       break;
-    case lowerCaseKey.indexOf('status') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('status')) > -1:
       defaultWidth = 100;
       break;
-    case lowerCaseKey.indexOf('user') > -1:
+    case (lowerCaseKey === null || lowerCaseKey === void 0 ? void 0 : lowerCaseKey.indexOf('user')) > -1:
       defaultWidth = 130;
       break;
   }
@@ -4396,7 +4405,9 @@ var AddSelect = function AddSelect(props) {
     _props$businessType = props.businessType,
     businessType = _props$businessType === void 0 ? 'sku' : _props$businessType,
     _props$isAllowRepeate = props.isAllowRepeatedSelect,
-    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate;
+    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate,
+    _props$noUseItemEanco = props.noUseItemEancode,
+    noUseItemEancode = _props$noUseItemEanco === void 0 ? true : _props$noUseItemEanco;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -5070,8 +5081,10 @@ var AddSelect = function AddSelect(props) {
         pageSize: 5000,
         currentPage: 1
       })]).then(function (x) {
-        formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
-        formatTreeDataSource(x, 1, 3, tableSearchForm);
+        var searchPosition1 = noUseItemEancode ? 3 : 2;
+        var searchPosition2 = noUseItemEancode ? 4 : 3;
+        formatSource(x, 0, searchPosition1, tableSearchForm, ['id', 'name']);
+        formatTreeDataSource(x, 1, searchPosition2, tableSearchForm);
       });
     }
     if (businessType == 'skc') {
@@ -8701,7 +8714,7 @@ var BusinessSearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       needModalTable: needModalTable,
       modalTableProps: modalTableProps
     });
-  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled]);
+  }, [props === null || props === void 0 ? void 0 : props.value, props.disabled, props.selectBusinessType]);
   React.useImperativeHandle(ref, function () {
     return {
       getRef: function getRef() {
@@ -8723,9 +8736,13 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React__default['default'].memo(Busines
   if (props && props.disabled !== nextProps.disabled) {
     return false;
   }
+  if (props && props.selectBusinessType !== nextProps.selectBusinessType) {
+    return false;
+  }
   return true;
 });
 
+// import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 function handleSelectColumn(c, parentProps) {
   var result = c;
   var exceptColumns = (parentProps === null || parentProps === void 0 ? void 0 : parentProps.exceptColumns) || [];
@@ -8737,7 +8754,7 @@ function handleSelectColumn(c, parentProps) {
       return !exceptColumns.includes(i.dataIndex);
     });
   }
-  // 追加
+  // 追加(最好不用这个，当组件不固定时候会有影响)
   if (additionColumns === null || additionColumns === void 0 ? void 0 : additionColumns.length) {
     additionColumns.forEach(function (i) {
       result.splice(i.position, 0, i.column);
@@ -8750,6 +8767,7 @@ function handleSelectColumn(c, parentProps) {
   return result;
 }
 var AddSkuSelect = function AddSkuSelect(parProps) {
+  var _parProps$requestConf, _parProps$requestConf2;
   var selectProps = {
     mode: 'multiple'
   };
@@ -8757,12 +8775,26 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     _useState2 = _slicedToArray(_useState, 2),
     value = _useState2[0],
     setValue = _useState2[1];
+  var isNoUseItemBarcode = (parProps === null || parProps === void 0 ? void 0 : parProps.noUseItemEancode) !== undefined ? parProps === null || parProps === void 0 ? void 0 : parProps.noUseItemEancode : true; // 默认不加商品条码，兼容老项目
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   var initialSelectColumn = [{
     title: 'SKU编码',
     width: 150,
     dataIndex: 'skuCode'
-  }, {
+  }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+    title: '商品条码',
+    width: 100,
+    ellipsis: {
+      showTitle: false
+    },
+    dataIndex: 'itemEancode',
+    render: function render(text) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    }
+  }]), [{
     title: 'SKU名称',
     width: 200,
     ellipsis: {
@@ -8838,7 +8870,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       }, text);
     },
     dataIndex: 'propertyNameAndValue'
-  }];
+  }]);
   var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
   var props = {
     buttonText: parProps.buttonText || '新增',
@@ -8849,11 +8881,11 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/sku/pager/v2",
       filter: 'qp-name-like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf = parProps.requestConfig) === null || _parProps$requestConf === void 0 ? void 0 : _parProps$requestConf.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'skuCode'
     }, parProps.requestConfig),
@@ -8865,7 +8897,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'sku',
-    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect)
+    isAllowRepeatedSelect: !!(parProps === null || parProps === void 0 ? void 0 : parProps.isAllowRepeatedSelect),
+    noUseItemEancode: isNoUseItemBarcode
   };
   var modalTableProps = {
     modalTableTitle: '选择商品',
@@ -8875,7 +8908,14 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     }, {
       name: 'qp-skuName-like',
       label: 'SKU名称'
-    }, {
+    }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+      name: 'qp-code-in',
+      label: '商品条码',
+      field: {
+        type: 'multipleQueryInput',
+        props: _objectSpread2({}, ((_parProps$requestConf2 = parProps.requestConfig) === null || _parProps$requestConf2 === void 0 ? void 0 : _parProps$requestConf2.itemEancodeValueRequestConfig) || {})
+      }
+    }]), [{
       name: 'qp-brandId-in',
       type: 'select',
       label: '品牌',
@@ -8920,7 +8960,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           }
         }
       }
-    }],
+    }]),
     tableColumns: [{
       title: 'SKU编码',
       width: 150,
@@ -8954,20 +8994,20 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
           height: 20
         }));
       }
-    }, {
-      title: '国际条码',
+    }].concat(_toConsumableArray(isNoUseItemBarcode ? [] : [{
+      title: '商品条码',
       width: 100,
       ellipsis: {
         showTitle: false
       },
-      dataIndex: 'barCode',
+      dataIndex: 'itemEancode',
       render: function render(text) {
         return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
           placement: "topLeft",
           title: text
         }, text);
       }
-    }, {
+    }]), [{
       title: '所属SPU名称',
       width: 100,
       ellipsis: {
@@ -9058,7 +9098,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
         }, text);
       },
       dataIndex: 'brandName'
-    }],
+    }]),
     selectColumn: mTpSelectColumn
   };
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
@@ -9066,6 +9106,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
   })));
 };
 var AddSkcSelect = function AddSkcSelect(parProps) {
+  var _parProps$requestConf3;
   var selectProps = {
     mode: 'multiple'
   };
@@ -9143,9 +9184,9 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/skc/skcSelect",
       filter: 'qp-name-like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-skcStatus-eq': 1
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf3 = parProps.requestConfig) === null || _parProps$requestConf3 === void 0 ? void 0 : _parProps$requestConf3.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'code'
     }, parProps.requestConfig),
@@ -9345,6 +9386,7 @@ var AddSkcSelect = function AddSkcSelect(parProps) {
   })));
 };
 var AddSpuSelect = function AddSpuSelect(parProps) {
+  var _parProps$requestConf4;
   var selectProps = {
     mode: 'multiple'
   };
@@ -9431,11 +9473,11 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     requestConfig: _objectSpread2({
       url: "/items/item",
       filter: 'qp-itemCode,name-orGroup,like',
-      otherParams: {
+      otherParams: _objectSpread2({
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1,
         sorter: 'desc-id'
-      },
+      }, (parProps === null || parProps === void 0 ? void 0 : (_parProps$requestConf4 = parProps.requestConfig) === null || _parProps$requestConf4 === void 0 ? void 0 : _parProps$requestConf4.addOtherParams) || {}),
       mappingTextField: 'name',
       mappingValueField: 'itemCode'
     }, parProps.requestConfig),
@@ -29499,7 +29541,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }
       var parallelTreeData = _this.coverToParallel(ruleTreeData, []) || [];
       var currentTreeItem = (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId) && parallelTreeData.find(function (i) {
-        return i.key === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
+        var _i$key;
+        return ((i === null || i === void 0 ? void 0 : (_i$key = i.key) === null || _i$key === void 0 ? void 0 : _i$key.indexOf('.')) > -1 ? i.id : i.key) === (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.elementId);
       });
       var dataChoiceBusinessType = currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.dataChoiceBusinessType;
       var dataInputBusinessType = currentTreeItem === null || currentTreeItem === void 0 ? void 0 : currentTreeItem.dataInputBusinessType;
@@ -29704,10 +29747,11 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }), "\u6DFB\u52A0\u6761\u4EF6"))));
     };
-    _this.handleEditExtraInfoResponse = function (code, val, parentDetail) {
+    _this.handleEditExtraInfoResponse = function (code, val, parentDetail, classDataIndex) {
       var ruleClassData = _this.state.ruleClassData;
       var callBack = _this.props.callBack;
       parentDetail.extraInfo.response[code] = val;
+      ruleClassData[classDataIndex].extraInfo.response[code] = val;
       _this.setState({
         ruleClassData: ruleClassData
       }, function () {
@@ -29715,7 +29759,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       });
     };
     // 场景需要返回值2022.11.15
-    _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, disabled, boxStyle) {
+    _this.renderResItem = function (itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, boxStyle) {
       var _ruleReturnConfig$rig;
       var isShowResponse = itemDetail.response['enable'];
       var isRightText = ruleReturnConfig === null || ruleReturnConfig === void 0 ? void 0 : (_ruleReturnConfig$rig = ruleReturnConfig.rightText) === null || _ruleReturnConfig$rig === void 0 ? void 0 : _ruleReturnConfig$rig.length;
@@ -29731,7 +29775,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         var value = val;
         if (isObj(code)) {
           Object.keys(code).forEach(function (ite) {
-            _this.handleEditExtraInfoResponse(ite, code[ite], parentDetail);
+            _this.handleEditExtraInfoResponse(ite, code[ite], parentDetail, classDataIndex);
           });
           return;
         }
@@ -29744,7 +29788,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           var _val$PCDCode;
           value = val.value || ((_val$PCDCode = val.PCDCode) === null || _val$PCDCode === void 0 ? void 0 : _val$PCDCode.join('/'));
         }
-        _this.handleEditExtraInfoResponse('value', value, parentDetail);
+        _this.handleEditExtraInfoResponse('value', value, parentDetail, classDataIndex);
       };
       return isShowResponse && /*#__PURE__*/React__default['default'].createElement("div", {
         style: {
@@ -29753,7 +29797,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       }, _this.renderFormCompItem(ruleReturnConfig, showValue, handleEdit, {}, boxStyle, disabled), /*#__PURE__*/React__default['default'].createElement(icons.MinusCircleOutlined, {
         className: 'icon_btn_style',
         onClick: function onClick() {
-          _this.handleEditExtraInfoResponse('enable', false, parentDetail);
+          _this.handleEditExtraInfoResponse('enable', false, parentDetail, classDataIndex);
         },
         style: {
           color: 'gray',
@@ -30362,12 +30406,12 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         type: "link",
         onClick: function onClick() {
           if (isHaveRuleReturnConfig) {
-            _this.handleEditExtraInfoResponse('enable', true, parentDetail);
+            _this.handleEditExtraInfoResponse('enable', true, parentDetail, classDataIndex);
           } else {
             antd.message.warn('未配置返回');
           }
         }
-      }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
+      }, "\u65B0\u589E\u8FD4\u56DE\u503C")), isHaveRuleReturnConfig && _this.renderResItem(itemDetail, parentDetail, ruleReturnConfig, classDataIndex, disabled, RuleActionItemStyle) || null, isHaveRuleTypeData && _this.renderActionList(itemDetail, parentDetail, handleRuleTypeData, selectRuleActionData, classDataIndex, disabled, RuleActionItemStyle) || null);
     };
     //添加同一层级条件
     _this.addPeerRule = function (itemDetail) {

package/dist/utils/LocalstorageUtils.d.ts

@@ -14,3 +14,4 @@ export declare function getUserId(): any;
 export declare function getAccountID(): any;
 export declare function getUserName(): any;
 export declare function handleUserPhone(): any;
+export declare function getCurrentTargetBgId(): string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/AddSelectBusiness/index.md

@@ -45,6 +45,7 @@ export default () => {
     //     },
     //   },
     // ],
+    noUseItemEancode: false,
     beforeShowModal: () => {
       return Promise.resolve(true);
       // return Promise.reject('校验有误');

package/src/components/Business/AddSelectBusiness/index.tsx

@@ -11,6 +11,7 @@ import axios from 'axios';
 import { AddSelect } from '../../../index';
 import { tableColumnsImage } from '@/components/Business/BsSulaQueryTable/utils';
 import { getSkuImg } from '@/utils/TableUtils';
+// import { getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 
 function handleSelectColumn(c: any, parentProps: any) {
   let result = c;
@@ -21,7 +22,7 @@ function handleSelectColumn(c: any, parentProps: any) {
   if(exceptColumns?.length) {
     result = result.filter((i: any) => !exceptColumns.includes(i.dataIndex))
   }
-  // 追加
+  // 追加(最好不用这个，当组件不固定时候会有影响)
   if(additionColumns?.length) {
     additionColumns.forEach((i: any) => {
       result.splice(i.position,0,i.column)
@@ -39,6 +40,7 @@ export const AddSkuSelect = (parProps: any) => {
     mode: 'multiple',
   }
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
+  const isNoUseItemBarcode = parProps?.noUseItemEancode !== undefined ? parProps?.noUseItemEancode : true; // 默认不加商品条码，兼容老项目
   //注⚠️：自定义过表头的请记得传tableCodeList参数
   const initialSelectColumn = [
     {
@@ -46,6 +48,21 @@ export const AddSkuSelect = (parProps: any) => {
       width: 150,
       dataIndex: 'skuCode',
     },
+    ...(isNoUseItemBarcode ? [] : [
+      {
+        title: '商品条码',
+        width: 100,
+        ellipsis: {
+          showTitle: false,
+        },
+        dataIndex: 'itemEancode',
+        render: (text: any) => (
+          <Tooltip placement="topLeft" title={text}>
+            {text}
+          </Tooltip>
+        ),
+      }
+    ]),
     {
       title: 'SKU名称',
       width: 200,
@@ -137,6 +154,8 @@ export const AddSkuSelect = (parProps: any) => {
         'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         'qp-status-eq': 1,
+        // 'useOrgSign': getCurrentTargetBgId(), // 根据品牌、账号授权的组织+商品授权使用组织做权限过滤  这个交给业务使用的地方去做,传addOtherParams:{useOrgSign:单据中所选组织}
+        ...(parProps?.requestConfig?.addOtherParams || {}), // 允许在默认参数基础上，追加/覆盖已有 参数
       }, // 默认参数
       mappingTextField: 'name',
       mappingValueField: 'skuCode',
@@ -151,6 +170,7 @@ export const AddSkuSelect = (parProps: any) => {
     onSaveCallback: parProps.onSaveCallback,
     businessType: 'sku',
     isAllowRepeatedSelect: !!parProps?.isAllowRepeatedSelect,
+    noUseItemEancode: isNoUseItemBarcode
   };
   const modalTableProps = {
     modalTableTitle: '选择商品',
@@ -159,6 +179,14 @@ export const AddSkuSelect = (parProps: any) => {
         name: 'qp-skuCode-like', label: 'SKU编码'
       },
       { name: 'qp-skuName-like', label: 'SKU名称' },
+      ...(isNoUseItemBarcode ? []: [
+          { name: 'qp-code-in', label: '商品条码', field: {
+            type: 'multipleQueryInput',
+            props: {
+              ...(parProps.requestConfig?.itemEancodeValueRequestConfig || {}),
+            },
+          }}
+      ]),
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
         type: 'select',
         props: {
@@ -224,19 +252,21 @@ export const AddSkuSelect = (parProps: any) => {
           </Tooltip>
         ),
       },
-      {
-        title: '国际条码',
-        width: 100,
-        ellipsis: {
-          showTitle: false,
-        },
-        dataIndex: 'barCode',
-        render: (text: any) => (
-          <Tooltip placement="topLeft" title={text}>
-            {text}
-          </Tooltip>
-        ),
-      },
+      ...(isNoUseItemBarcode ? []: [
+        {
+          title: '商品条码',
+          width: 100,
+          ellipsis: {
+            showTitle: false,
+          },
+          dataIndex: 'itemEancode',
+          render: (text: any) => (
+            <Tooltip placement="topLeft" title={text}>
+              {text}
+            </Tooltip>
+          ),
+        }
+      ]),
       {
         title: '所属SPU名称',
         width: 100,
@@ -419,7 +449,10 @@ export const AddSkcSelect = (parProps: any) => {
     requestConfig: {
       url: `/items/skc/skcSelect`,
       filter: 'qp-name-like', // 过滤参数 支持'qp-name-like'和['qp-name-like', 'qp-code-like']两种结构
-      otherParams: { 'qp-skcStatus-eq': 1, }, // 默认参数
+      otherParams: {
+        'qp-skcStatus-eq': 1,
+        ...(parProps?.requestConfig?.addOtherParams || {}), // 允许在默认参数基础上，追加/覆盖已有 参数
+      }, // 默认参数
       mappingTextField: 'name',
       mappingValueField: 'code',
       ...parProps.requestConfig
@@ -693,7 +726,8 @@ export const AddSpuSelect = (parProps: any) => {
       otherParams: {
         'qp-approveStatus-eq': 1, // 审核状态(0.待审批;1.审批通过;2.驳回;3.审批未通过)
         'qp-status-eq': 1,
-        sorter: 'desc-id'
+        sorter: 'desc-id',
+        ...(parProps?.requestConfig?.addOtherParams || {}), // 允许在默认参数基础上，追加/覆盖已有 参数
       }, // 默认参数
       mappingTextField: 'name',
       mappingValueField: 'itemCode',

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

@@ -25,7 +25,7 @@ const BusinessSearchSelect = forwardRef((props: any, ref: any) => {
       needModalTable,
       modalTableProps
     }
-  }, [props?.value, props.disabled]);
+  }, [props?.value, props.disabled, props.selectBusinessType]);
 
   useImperativeHandle(ref, () => ({
     getRef: () => innerRef,
@@ -48,5 +48,8 @@ export default React.memo(BusinessSearchSelect, (props, nextProps) => {
   if (props && props.disabled !== nextProps.disabled) {
     return false
   }
+  if (props && props.selectBusinessType !== nextProps.selectBusinessType) {
+    return false
+  }
   return true
-});
+});

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