@bit-sun/business-component 4.2.1-alpha.3-aiwei → 4.2.1-alpha.5-aiwei

package/dist/index.esm.js

@@ -5514,6 +5514,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState44 = _slicedToArray(_useState43, 2),
     modalSearched = _useState44[0],
     setModalSearched = _useState44[1];
+  var _useState45 = useState(undefined),
+    _useState46 = _slicedToArray(_useState45, 2),
+    overScrollY = _useState46[0],
+    setOverScrollY = _useState46[1];
+  var topFormRef = useRef(null);
+  var bottomWrapRef = useRef(null);
   var setSelectDataSource = function setSelectDataSource(list, total) {
     setItems(list);
     setItemsTotal(total);
@@ -5749,6 +5755,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setSearchValue('');
     setModalSearched(false);
     setIsModalVisible(true);
+    setTimeout(function () {
+      return computeScrollY();
+    }, 0);
     // 回显
     if (value) {
       if (selectMode) {
@@ -5865,6 +5874,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var handleCancel = function handleCancel() {
     clearModalTable();
     setIsModalVisible(false);
+    setOverScrollY(undefined);
   };
   var refreshItems = function refreshItems() {
     // 查看是否存在关联值 如果有关联值 就查询 没有就不能查询
@@ -5902,6 +5912,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var toggleCollapsed = function toggleCollapsed() {
     setCollapsed(!collapsed);
+    setTimeout(function () {
+      return computeScrollY();
+    }, 0);
   };
   var handleTableChange = function handleTableChange(pagination) {
     getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
@@ -6181,12 +6194,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var renderShowTable = function renderShowTable(tableList, type) {
     var tableBoxHeighth = getTableHeigth(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm);
-    var x = (tableList === null || tableList === void 0 ? void 0 : tableList.length) ? 82 : 28; // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
-    var oSY = "calc(100vh - ".concat(tableBoxHeighth, "px - ").concat(x, "px)");
+    var x = (tableList === null || tableList === void 0 ? void 0 : tableList.length) ? 82 : 28;
+    var oSY = overScrollY || "calc(100vh - ".concat(tableBoxHeighth, "px - ").concat(x, "px)");
     var mTB = "calc(50vh - ".concat(tableBoxHeighth / 2, "px - ").concat(x / 2, "px - 40px)");
     return /*#__PURE__*/React$1.createElement("div", {
       style: {
-        height: "calc(100vh - ".concat(tableBoxHeighth, "px)")
+        height: 'auto'
       }
     }, /*#__PURE__*/React$1.createElement(Table, _objectSpread2(_objectSpread2({
       bordered: true,
@@ -6465,7 +6478,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }, (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalProps) || {}), /*#__PURE__*/React$1.createElement("div", {
     className: 'search_select_wrapper'
   }, /*#__PURE__*/React$1.createElement("div", {
-    className: 'search_select_wrapper_topForm'
+    className: 'search_select_wrapper_topForm',
+    ref: topFormRef
   }, /*#__PURE__*/React$1.createElement("div", {
     className: 'select_list_columns'
   }, /*#__PURE__*/React$1.createElement(Form, {
@@ -6502,7 +6516,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     },
     src: zhankaitiaojian
   }) : /*#__PURE__*/React$1.createElement(React$1.Fragment, null)))))))), /*#__PURE__*/React$1.createElement("div", {
-    className: 'search_select_wrapper_bottomTable'
+    className: 'search_select_wrapper_bottomTable',
+    ref: bottomWrapRef
   }, /*#__PURE__*/React$1.createElement("div", {
     className: selectMode ? 'search_select_wrapper_bottomTable_wrapLeft2' : 'search_select_wrapper_bottomTable_wrapLeft1'
   }, /*#__PURE__*/React$1.createElement(Tabs, {
@@ -6518,6 +6533,32 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }, "\u6E05\u7A7A\u5DF2\u9009")
   })) : null)))));
 });
+var computeScrollY = function computeScrollY() {
+  try {
+    var _topFormRef$current, _bottomWrapRef$curren;
+    var bodyEl = document.querySelector('.search_select_modal_wrapper .ant-modal-body');
+    var bodyH = (bodyEl === null || bodyEl === void 0 ? void 0 : bodyEl.clientHeight) || 0;
+    var topH = ((_topFormRef$current = topFormRef.current) === null || _topFormRef$current === void 0 ? void 0 : _topFormRef$current.clientHeight) || 0;
+    var navEl = (_bottomWrapRef$curren = bottomWrapRef.current) === null || _bottomWrapRef$curren === void 0 ? void 0 : _bottomWrapRef$curren.querySelector('.ant-tabs-nav');
+    var navH = (navEl === null || navEl === void 0 ? void 0 : navEl.offsetHeight) || 0;
+    var extra = 30; // paddings/margins buffer
+    var tableH = Math.max(160, bodyH - topH - navH - extra);
+    setOverScrollY(tableH);
+  } catch (e) {
+    // ignore
+  }
+};
+useEffect(function () {
+  if (!isModalVisible) return;
+  computeScrollY();
+  var onResize = function onResize() {
+    return computeScrollY();
+  };
+  window.addEventListener('resize', onResize);
+  return function () {
+    window.removeEventListener('resize', onResize);
+  };
+}, [isModalVisible, collapsed, tableData, tablePagination]);
 
 var css_248z$8 = ".add_select_show {\n  display: flex;\n}\n.add_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.add_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.add_select_header {\n  border-bottom: 1px solid #D9D9D9;\n  height: 24px;\n  height: 40px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 40px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n}\n.add_select_header > span {\n  margin-left: 20px;\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 40px;\n}\n.add_select_header > span > span {\n  color: #ff0000;\n}\n.add_select_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_quick_header {\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n}\n.add_select_quick_header_title {\n  display: flex;\n  justify-content: space-between;\n}\n.add_select_quick_header > span {\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 20px;\n}\n.add_select_quick_header > span > span {\n  color: #ff0000;\n}\n.add_select_quick_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_wrapper {\n  position: relative;\n  display: flex;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n  margin: 5px 10px;\n}\n.add_select_wrapper .ant-table-pagination.ant-pagination {\n  margin: 5px;\n  padding-right: 5px;\n}\n.add_select_wrapper .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.add_select_wrapper .ant-form-item-label {\n  padding: 0PX;\n  line-height: 23px !important;\n}\n.add_select_wrapper .ant-form-item-label > label {\n  font-size: 12px;\n}\n.add_select_wrapper .ant-table-thead th {\n  height: 20px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper .row-class {\n  height: 24px;\n}\n.add_select_wrapper .row-class td {\n  font-size: 12px !important;\n  height: 24px !important;\n  padding: 0px 8px !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-table-body {\n  height: 240px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.add_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_left {\n  flex-basis: 298px;\n  width: 298px;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-right: 10px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.add_select_wrapper_right {\n  width: 872px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 10px;\n}\n.add_select_wrapper_right,\n.add_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.add_select_wrapper .select_list_columns {\n  height: 272px;\n  overflow-y: auto;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.add_select_wrapper .select_list_columns_formItems {\n  padding: 7px 10px;\n}\n.add_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px;\n  justify-content: flex-end;\n}\n.add_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.add_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 5px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.add_select_wrapper_select {\n  margin-top: 4px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n  margin: 5px 10px;\n}\n.add_select_wrapper_select .ant-table-pagination.ant-pagination {\n  margin: 9px;\n  padding-right: 5px;\n}\n.add_select_wrapper_select .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper_select .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper_select .ant-table-thead th {\n  height: 23px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 23px !important;\n}\n.add_select_wrapper_select .ant-modal-close-x {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class td {\n  font-size: 12px !important;\n  height: 30px !important;\n  padding: 4px 8px !important;\n}\n.add_select_wrapper_select .ant-table-body {\n  height: 200px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper_select .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_select .ant-input-number-input,\n.add_select_wrapper_select .ant-input {\n  height: auto;\n  height: 22px;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select-selection-search-input {\n  height: auto;\n  height: 22px !important;\n  padding: 0px 10px;\n  font-size: 12px;\n}\n.add_select_wrapper_select .ant-select .ant-select-arrow {\n  top: 13px;\n}\n.add_select_wrapper_select .ant-select-selector {\n  position: relative;\n  top: 1px;\n  height: 23px  !important;\n  line-height: 23px  !important;\n}\n.add_select_wrapper_select .ant-select-selector .ant-select-selection-item,\n.add_select_wrapper_select .ant-select-selector ant-select-selection-search {\n  height: 23px !important;\n  line-height: 23px !important;\n  font-size: 12px;\n}\n.add_select_wrapper_select .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 3px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper_select_quick {\n  margin: 0;\n}\n.react-resizable {\n  position: relative;\n  background-clip: padding-box;\n}\n.react-resizable-handle {\n  position: absolute;\n  width: 10px;\n  height: 100%;\n  bottom: 0;\n  right: -5px;\n  cursor: col-resize;\n  z-index: 1;\n}\n";
 styleInject(css_248z$8);
@@ -11342,14 +11383,25 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+      var _x$, _x$$data$, _x$$data$$channelInfo;
+      debugger;
+      // 战区限制一级数据
+      var newData1 = [];
+      (_x$ = x[0]) === null || _x$ === void 0 ? void 0 : (_x$$data$ = _x$.data[0]) === null || _x$$data$ === void 0 ? void 0 : (_x$$data$$channelInfo = _x$$data$.channelInfoSon) === null || _x$$data$$channelInfo === void 0 ? void 0 : _x$$data$$channelInfo.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[0].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
       var areaDisabledJude = function areaDisabledJude(data) {
         return data['parent'] === '0';
       }; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
-      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+      formatTreeDataSource(x, 0, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     tableSearchForm = [{
       name: 'realWarehouseName*multiInput',
@@ -11467,7 +11519,7 @@ function commonFun(type, prefixUrl, parentProps) {
         },
         width: 100
       }, {
-        title: '所属销售渠道',
+        title: '战区',
         dataIndex: 'channelName',
         defaultSort: 4,
         width: 100
@@ -11550,7 +11602,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-channelCode-in',
       type: 'treeSelect',
-      label: '销售渠道',
+      label: '战区',
       field: {
         type: 'treeSelect',
         props: {
@@ -11586,7 +11638,16 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
     }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
+      var _x$2, _x$2$data$, _x$2$data$$channelInf;
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
+      var newData1 = [];
+      (_x$2 = x[1]) === null || _x$2 === void 0 ? void 0 : (_x$2$data$ = _x$2.data[0]) === null || _x$2$data$ === void 0 ? void 0 : (_x$2$data$$channelInf = _x$2$data$.channelInfoSon) === null || _x$2$data$$channelInf === void 0 ? void 0 : _x$2$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
@@ -12389,6 +12450,15 @@ function commonFun(type, prefixUrl, parentProps) {
       currentPage: 1,
       'ctl-withAuth': true
     }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
+      var _x$3, _x$3$data$, _x$3$data$$channelInf;
+      var newData1 = [];
+      (_x$3 = x[1]) === null || _x$3 === void 0 ? void 0 : (_x$3$data$ = _x$3.data[0]) === null || _x$3$data$ === void 0 ? void 0 : (_x$3$data$$channelInf = _x$3$data$.channelInfoSon) === null || _x$3$data$$channelInf === void 0 ? void 0 : _x$3$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断

package/dist/index.js

@@ -4825,7 +4825,7 @@ function ToCDB$1(selectStr) {
   return tmp;
 }
 
-var css_248z$6 = ".search_select .ant-select-selector {\n  height: 24px;\n  overflow: hidden;\n}\n.search_select .ant-select-selector .ant-select-selection-overflow {\n  height: 40px;\n  flex-wrap: nowrap;\n  overflow-x: auto;\n}\n.search_select .ant-select-selector .ant-select-selection-overflow-item {\n  align-self: auto;\n}\n.search_select_show {\n  display: flex;\n}\n.search_select_show .ant-select-dropdown {\n  top: 24px !important;\n  width: calc(141%) !important;\n}\n.search_select_show .ant-select-clear {\n  right: 33px;\n}\n.search_select_show .ant-select-multiple.ant-select-show-arrow .ant-select-selector,\n.search_select_show .ant-select-multiple.ant-select-allow-clear .ant-select-selector {\n  padding-right: 28px;\n}\n.search_select_show.search_select_show_list .ant-select-dropdown {\n  top: 24px !important;\n  width: calc(100% + 110px) !important;\n}\n.search_select_expand_button {\n  position: relative;\n  right: -11px;\n  width: 30px;\n  border-left: 1px solid #d9d9d9;\n  height: 24px;\n  cursor: pointer;\n  font-size: 14px;\n  font-weight: bolder;\n}\n.search_select_expand_button span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_expand_button:hover {\n  background-color: #005cff;\n  color: #fff;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n}\n.search_select_expand_button_disabled:hover {\n  background-color: transparent;\n  color: rgba(0, 0, 0, 0.25);\n  cursor: not-allowed;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {\n  font-family: MiSans-Regular;\n  font-weight: 400;\n  font-size: 12px;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table tbody > tr > td {\n  color: #333333;\n}\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column,\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column {\n  visibility: hidden;\n  padding: 0;\n  margin: 0;\n  width: 0;\n  height: 0;\n  min-width: 0;\n  min-height: 0;\n  border: none;\n}\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column .ant-radio-wrapper,\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column .ant-radio-wrapper {\n  display: none;\n}\n.search_select_modal_wrapper .ant-modal {\n  top: 60px;\n}\n.search_select_modal_wrapper .ant-modal-header {\n  padding: 6px 0px 6px 16px;\n}\n.search_select_modal_wrapper .ant-modal-header .ant-modal-title {\n  height: 20px;\n  color: #000000;\n  line-height: 20px;\n}\n.search_select_modal_wrapper .ant-modal-close-x {\n  width: 32px;\n  height: 32px;\n  line-height: 32px;\n}\n.search_select_modal_wrapper .ant-modal-body {\n  padding: 0px;\n  background: #F3F3F3;\n  height: calc(100vh - 235px);\n  overflow: hidden;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn.ant-btn-default {\n  color: #005cff;\n  border-color: #005cff;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary,\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {\n  background: #005cff;\n  border-color: #005cff;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {\n  opacity: 0.5;\n  color: #fff;\n}\n.search_select_wrapper {\n  position: relative;\n  font-size: 14px;\n}\n.search_select_wrapper_topForm .select_list_columns {\n  width: 100%;\n  padding: 10px 6px 2px 16px;\n  background-color: #fff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form {\n  padding: 0;\n  display: flex;\n  align-items: flex-start;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item,\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-col .ant-space {\n  font-size: 12px !important;\n  margin-right: 0px !important;\n  margin-bottom: 8px !important;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row.ant-form-item-row {\n  background-color: #fafafa;\n  border: 0.8px solid #D9D9D9;\n  border-radius: 2px;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row {\n  width: 100%;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label {\n  width: 110px;\n  order: 1;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label label {\n  width: 100%;\n  text-align: left;\n  padding: 0 10px;\n  color: #333333;\n  font-size: 12px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control {\n  order: 2;\n  width: 100px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper {\n  border: 0;\n  font-size: 12px;\n  background-color: #fafafa;\n  padding: 0 11px;\n  height: 24px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-select-selector {\n  border: 0 !important;\n  background-color: #fafafa !important;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .query_input .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-btn-primary {\n  background: #005cff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form > .ant-row > .ant-col {\n  order: 2;\n  padding-right: 10px;\n}\n.search_select_wrapper_topForm .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper_bottomTable {\n  margin: 10px;\n  display: flex;\n  justify-content: space-between;\n}\n.search_select_wrapper_bottomTable_wrapLeft1,\n.search_select_wrapper_bottomTable_wrapLeft2,\n.search_select_wrapper_bottomTable_wrapRight {\n  background: #fff;\n  width: calc(50% - 5px);\n}\n.search_select_wrapper_bottomTable_wrapLeft1 .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper,\n.search_select_wrapper_bottomTable_wrapLeft2 .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper,\n.search_select_wrapper_bottomTable_wrapRight .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_wrapper_bottomTable_wrapLeft1 {\n  width: 100%;\n}\n.search_select_wrapper_bottomTable_wrapRight {\n  margin-left: 10px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav {\n  margin: 0;\n  padding: 6px 18.5px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-nav-wrap {\n  height: 28px;\n  font-size: 14px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-tab {\n  padding: 4px 0;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-ink-bar {\n  left: 3px !important;\n  width: 40px !important;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-extra-content > span {\n  color: #005cff;\n  cursor: pointer;\n}\n.search_select_wrapper_bottomTable .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder {\n  padding: 10px 10px 7px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table.ant-table-small .ant-table-tbody > tr > td {\n  color: #333333;\n}\n.search_select_wrapper_bottomTable .ant-checkbox-checked .ant-checkbox-inner {\n  color: #005cff;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active a {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active {\n  border-color: #005cff;\n}\n.searchSelectSpin > div {\n  height: 300px !important;\n}\n.searchSelectMaxTagToolTip .ant-tooltip-inner {\n  max-height: 72px;\n  overflow-x: auto;\n  padding: 0px;\n}\n";
+var css_248z$6 = ".search_select .ant-select-selector {\n  height: 24px;\n  overflow: hidden;\n}\n.search_select .ant-select-selector .ant-select-selection-overflow {\n  height: 40px;\n  flex-wrap: nowrap;\n  overflow-x: auto;\n}\n.search_select .ant-select-selector .ant-select-selection-overflow-item {\n  align-self: auto;\n}\n.search_select_show {\n  display: flex;\n}\n.search_select_show .ant-select-dropdown {\n  top: 24px !important;\n  width: calc(141%) !important;\n}\n.search_select_show .ant-select-clear {\n  right: 33px;\n}\n.search_select_show .ant-select-multiple.ant-select-show-arrow .ant-select-selector,\n.search_select_show .ant-select-multiple.ant-select-allow-clear .ant-select-selector {\n  padding-right: 28px;\n}\n.search_select_show.search_select_show_list .ant-select-dropdown {\n  top: 24px !important;\n  width: calc(100% + 110px) !important;\n}\n.search_select_expand_button {\n  position: relative;\n  right: -11px;\n  width: 30px;\n  border-left: 1px solid #d9d9d9;\n  height: 24px;\n  cursor: pointer;\n  font-size: 14px;\n  font-weight: bolder;\n}\n.search_select_expand_button span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.search_select_expand_button:hover {\n  background-color: #005cff;\n  color: #fff;\n  border-top-right-radius: 2px;\n  border-bottom-right-radius: 2px;\n}\n.search_select_expand_button_disabled:hover {\n  background-color: transparent;\n  color: rgba(0, 0, 0, 0.25);\n  cursor: not-allowed;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table {\n  font-family: MiSans-Regular;\n  font-weight: 400;\n  font-size: 12px;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_dropdown_table .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table tbody > tr > td {\n  color: #333333;\n}\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column,\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column {\n  visibility: hidden;\n  padding: 0;\n  margin: 0;\n  width: 0;\n  height: 0;\n  min-width: 0;\n  min-height: 0;\n  border: none;\n}\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-body > table > tbody > tr > td.ant-table-selection-column .ant-radio-wrapper,\n.search_select_dropdown_table1 .ant-table.ant-table-bordered > .ant-table-container .ant-table-header > table > thead > tr > th.ant-table-selection-column .ant-radio-wrapper {\n  display: none;\n}\n.search_select_modal_wrapper .ant-modal {\n  top: 60px;\n}\n.search_select_modal_wrapper .ant-modal-header {\n  padding: 6px 0px 6px 16px;\n}\n.search_select_modal_wrapper .ant-modal-header .ant-modal-title {\n  height: 20px;\n  color: #000000;\n  line-height: 20px;\n}\n.search_select_modal_wrapper .ant-modal-close-x {\n  width: 32px;\n  height: 32px;\n  line-height: 32px;\n}\n.search_select_modal_wrapper .ant-modal-body {\n  padding: 0px;\n  background: #F3F3F3;\n  height: calc(100vh - 235px);\n  overflow: auto;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn.ant-btn-default {\n  color: #005cff;\n  border-color: #005cff;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary,\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {\n  background: #005cff;\n  border-color: #005cff;\n}\n.search_select_modal_wrapper .ant-modal-footer .ant-btn-primary[disabled] {\n  opacity: 0.5;\n  color: #fff;\n}\n.search_select_wrapper {\n  position: relative;\n  font-size: 14px;\n}\n.search_select_wrapper_topForm .select_list_columns {\n  width: 100%;\n  padding: 10px 6px 2px 16px;\n  background-color: #fff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form {\n  padding: 0;\n  display: flex;\n  align-items: flex-start;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item,\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-col .ant-space {\n  font-size: 12px !important;\n  margin-right: 0px !important;\n  margin-bottom: 8px !important;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row.ant-form-item-row {\n  background-color: #fafafa;\n  border: 0.8px solid #D9D9D9;\n  border-radius: 2px;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row {\n  width: 100%;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label {\n  width: 110px;\n  order: 1;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-label label {\n  width: 100%;\n  text-align: left;\n  padding: 0 10px;\n  color: #333333;\n  font-size: 12px;\n  font-family: PingFangSC-Regular;\n  font-weight: 400;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control {\n  order: 2;\n  width: 100px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper {\n  border: 0;\n  font-size: 12px;\n  background-color: #fafafa;\n  padding: 0 11px;\n  height: 24px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-input-affix-wrapper .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .ant-select-selector {\n  border: 0 !important;\n  background-color: #fafafa !important;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-row .ant-form-item-control .query_input .ant-input {\n  background-color: #fafafa !important;\n  border: 0;\n  font-size: 12px;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form .ant-btn-primary {\n  background: #005cff;\n}\n.search_select_wrapper_topForm .select_list_columns .ant-form > .ant-row > .ant-col {\n  order: 2;\n  padding-right: 10px;\n}\n.search_select_wrapper_topForm .select_list_button_space {\n  margin-right: 10px;\n}\n.search_select_wrapper_bottomTable {\n  margin: 10px;\n  display: flex;\n  justify-content: space-between;\n}\n.search_select_wrapper_bottomTable_wrapLeft1,\n.search_select_wrapper_bottomTable_wrapLeft2,\n.search_select_wrapper_bottomTable_wrapRight {\n  background: #fff;\n  width: calc(50% - 5px);\n}\n.search_select_wrapper_bottomTable_wrapLeft1 .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper,\n.search_select_wrapper_bottomTable_wrapLeft2 .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper,\n.search_select_wrapper_bottomTable_wrapRight .ant-table.ant-table-bordered > .ant-table-container > .ant-table-header > table .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_wrapper_bottomTable_wrapLeft1 {\n  width: 100%;\n}\n.search_select_wrapper_bottomTable_wrapRight {\n  margin-left: 10px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav {\n  margin: 0;\n  padding: 6px 18.5px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-nav-wrap {\n  height: 28px;\n  font-size: 14px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-tab {\n  padding: 4px 0;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-ink-bar {\n  left: 3px !important;\n  width: 40px !important;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-nav .ant-tabs-extra-content > span {\n  color: #005cff;\n  cursor: pointer;\n}\n.search_select_wrapper_bottomTable .ant-tabs-tab.ant-tabs-tab-active .ant-tabs-tab-btn {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder {\n  padding: 10px 10px 7px;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead > tr > th {\n  color: #7F7F7F;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table-thead .ant-table-selection .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.search_select_wrapper_bottomTable .ant-tabs-content-holder .ant-tabs-content .ant-table-wrapper .ant-table .ant-table-container .ant-table-content .ant-table.ant-table-small .ant-table-tbody > tr > td {\n  color: #333333;\n}\n.search_select_wrapper_bottomTable .ant-checkbox-checked .ant-checkbox-inner {\n  color: #005cff;\n  background: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active a {\n  color: #005cff;\n}\n.search_select_wrapper_bottomTable .ant-pagination-item-active {\n  border-color: #005cff;\n}\n.searchSelectSpin > div {\n  height: 300px !important;\n}\n.searchSelectMaxTagToolTip .ant-tooltip-inner {\n  max-height: 72px;\n  overflow-x: auto;\n  padding: 0px;\n}\n";
 styleInject(css_248z$6);
 
 var zhankaitiaojian = "data:image/svg+xml,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22UTF-8%22%3F%3E%3Csvg%20width%3D%2224px%22%20height%3D%2224px%22%20viewBox%3D%220%200%2024%2024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%3E%20%20%20%20%3Ctitle%3Ezhankaitiaojian-icon%3C%2Ftitle%3E%20%20%20%20%3Cdefs%3E%20%20%20%20%20%20%20%20%3Crect%20id%3D%22path-1%22%20x%3D%220%22%20y%3D%220%22%20width%3D%2224%22%20height%3D%2224%22%3E%3C%2Frect%3E%20%20%20%20%3C%2Fdefs%3E%20%20%20%20%3Cg%20id%3D%22%E9%A1%B5%E9%9D%A2-1%22%20stroke%3D%22none%22%20stroke-width%3D%221%22%20fill%3D%22none%22%20fill-rule%3D%22evenodd%22%3E%20%20%20%20%20%20%20%20%3Cg%20id%3D%22icon%22%20transform%3D%22translate%28-702.000000%2C%20-498.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%3Cg%20id%3D%22zhankaitiaojian-icon%22%20transform%3D%22translate%28702.000000%2C%20498.000000%29%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cmask%20id%3D%22mask-2%22%20fill%3D%22white%22%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20xlink%3Ahref%3D%22%23path-1%22%3E%3C%2Fuse%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fmask%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cuse%20id%3D%22%E8%92%99%E7%89%88%22%20fill%3D%22%23D8D8D8%22%20opacity%3D%220%22%20xlink%3Ahref%3D%22%23path-1%22%3E%3C%2Fuse%3E%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%3Cpath%20d%3D%22M12.0142082%2C6%20L18%2C11.9972435%20L12.0142082%2C18%20L11.04209%2C17.0260337%20L16.0562218%2C11.9972435%20L11.04209%2C6.97396631%20L12.0142082%2C6%20Z%20M6.97257658%2C6%20L12.9583683%2C11.9972435%20L6.97257658%2C18%20L6.00091666%2C17.0260337%20L11.0150485%2C11.9972435%20L6%2C6.97396631%20L6.97257658%2C6%20Z%22%20id%3D%22%E5%BD%A2%E7%8A%B6%22%20fill%3D%22%23005CFF%22%20fill-rule%3D%22nonzero%22%20mask%3D%22url%28%23mask-2%29%22%20transform%3D%22translate%2812.000000%2C%2012.000000%29%20rotate%28-270.000000%29%20translate%28-12.000000%2C%20-12.000000%29%20%22%3E%3C%2Fpath%3E%20%20%20%20%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%20%20%20%20%3C%2Fg%3E%20%20%20%20%3C%2Fg%3E%3C%2Fsvg%3E";
@@ -11365,14 +11365,25 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
     }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+      var _x$, _x$$data$, _x$$data$$channelInfo;
+      debugger;
+      // 战区限制一级数据
+      var newData1 = [];
+      (_x$ = x[0]) === null || _x$ === void 0 ? void 0 : (_x$$data$ = _x$.data[0]) === null || _x$$data$ === void 0 ? void 0 : (_x$$data$$channelInfo = _x$$data$.channelInfoSon) === null || _x$$data$$channelInfo === void 0 ? void 0 : _x$$data$$channelInfo.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[0].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
       var areaDisabledJude = function areaDisabledJude(data) {
         return data['parent'] === '0';
       }; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
-      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+      formatTreeDataSource(x, 0, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     tableSearchForm = [{
       name: 'realWarehouseName*multiInput',
@@ -11490,7 +11501,7 @@ function commonFun(type, prefixUrl, parentProps) {
         },
         width: 100
       }, {
-        title: '所属销售渠道',
+        title: '战区',
         dataIndex: 'channelName',
         defaultSort: 4,
         width: 100
@@ -11573,7 +11584,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-channelCode-in',
       type: 'treeSelect',
-      label: '销售渠道',
+      label: '战区',
       field: {
         type: 'treeSelect',
         props: {
@@ -11609,7 +11620,16 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
     }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
+      var _x$2, _x$2$data$, _x$2$data$$channelInf;
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
+      var newData1 = [];
+      (_x$2 = x[1]) === null || _x$2 === void 0 ? void 0 : (_x$2$data$ = _x$2.data[0]) === null || _x$2$data$ === void 0 ? void 0 : (_x$2$data$$channelInf = _x$2$data$.channelInfoSon) === null || _x$2$data$$channelInf === void 0 ? void 0 : _x$2$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
@@ -12412,6 +12432,15 @@ function commonFun(type, prefixUrl, parentProps) {
       currentPage: 1,
       'ctl-withAuth': true
     }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
+      var _x$3, _x$3$data$, _x$3$data$$channelInf;
+      var newData1 = [];
+      (_x$3 = x[1]) === null || _x$3 === void 0 ? void 0 : (_x$3$data$ = _x$3.data[0]) === null || _x$3$data$ === void 0 ? void 0 : (_x$3$data$$channelInf = _x$3$data$.channelInfoSon) === null || _x$3$data$$channelInf === void 0 ? void 0 : _x$3$data$$channelInf.forEach(function (item) {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.1-alpha.3-aiwei",
+  "version": "4.2.1-alpha.5-aiwei",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -1351,10 +1351,20 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         'qp-status-eq': 1,
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
+      debugger
+      // 战区限制一级数据
+      const newData1 = [];
+      x[0]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({
+          code: item.code,
+          name: item.name
+        })
+      })
+      x[0].data = newData1;
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
-      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
-      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
+      formatTreeDataSource(x, 0, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
     })
     tableSearchForm = [
       { name: 'realWarehouseName*multiInput', label: '逻辑仓名称', type: 'multipleQueryInput' },
@@ -1452,7 +1462,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           width: 100,
         },
         {
-          title: '所属销售渠道',
+          title: '战区',
           dataIndex: 'channelName',
           defaultSort: 4,
           width: 100,
@@ -1529,7 +1539,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         } },
         {
-        name: 'qp-channelCode-in', type: 'treeSelect', label: '销售渠道', field: {
+        name: 'qp-channelCode-in', type: 'treeSelect', label: '战区', field: {
           type: 'treeSelect',
           props: {
             multiple: true,
@@ -1559,6 +1569,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       },getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in')),
     ]).then((x: any)=>{
       formatSource(x,0, 2, tableSearchForm,['groupCode','groupName']);
+      const newData1: any[] = [];
+      x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({ code: item.code, name: item.name })
+      });
+      x[1].data = newData1;
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       formatTreeDataSource(x, 1, 3, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
     })
@@ -2307,6 +2322,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         'ctl-withAuth': true,
       },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
     ]).then((x: any)=>{
+      const newData1: any[] = [];
+      x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
+        newData1.push({ code: item.code, name: item.name })
+      });
+      x[1].data = newData1;
       const channelDisabledJude = (data: any) => data['parentCode'] === '0'; // 所属销售渠道 树节点不能点判断
       const areaDisabledJude = (data: any) => data['parent'] === '0'; // 所属营销区域 树节点不能点判断
       formatSource(x,0, 3, tableSearchForm);

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

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
+import React, { useState, useEffect, forwardRef, useImperativeHandle, useRef } from 'react';
 import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs, Empty, DatePicker } from 'antd';
 import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/icons';
@@ -148,6 +148,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const [tableShowColumns, setTabletShowColumns] = useState(handleTableColumns(modalTableProps?.tableColumns)); // 默认展示表头-modalTableProps?.tableColumns
   const [confirmLoading, setConfirmLoading] = useState(false);
   const [modalSearched, setModalSearched]=useState(false);
+  const [overScrollY, setOverScrollY] = useState<number | undefined>(undefined);
+
+  const topFormRef = useRef<HTMLDivElement>(null);
+  const bottomWrapRef = useRef<HTMLDivElement>(null);
 
   const setSelectDataSource = (list,total: number) => {
     setItems(list);
@@ -370,6 +374,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     setModalSearched(false);
 
     setIsModalVisible(true);
+    setTimeout(() => computeScrollY(), 0);
     // 回显
     if (value) {
       if (selectMode) {
@@ -456,6 +461,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const handleCancel = () => {
     clearModalTable();
     setIsModalVisible(false);
+    setOverScrollY(undefined);
   };
 
   const refreshItems = () => {
@@ -492,6 +498,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const toggleCollapsed = () => {
     setCollapsed(!collapsed);
+    setTimeout(() => computeScrollY(), 0);
   };
 
   const handleTableChange = (pagination) => {
@@ -712,11 +719,11 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const renderShowTable =  (tableList, type) => {
     const tableBoxHeighth = getTableHeigth(modalTableProps?.tableSearchForm);
-    const x = tableList?.length ? 82 : 28;  // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
-    const oSY = `calc(100vh - ${tableBoxHeighth}px - ${x}px)`; 
+    const x = tableList?.length ? 82 : 28;
+    const oSY = overScrollY || `calc(100vh - ${tableBoxHeighth}px - ${x}px)`;
     const mTB = `calc(50vh - ${tableBoxHeighth/2}px - ${x/2}px - 40px)`
     return (
-      <div style={{ height: `calc(100vh - ${tableBoxHeighth}px)` }}> 
+      <div style={{ height: 'auto' }}> 
         <Table
           bordered
           size="middle"
@@ -954,7 +961,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
           {...(modalTableProps?.modalProps || {})}
         >
           <div className={'search_select_wrapper'}>
-            <div className={'search_select_wrapper_topForm'}>
+            <div className={'search_select_wrapper_topForm'} ref={topFormRef}>
               <div className={'select_list_columns'}>
                 <Form form={form} layout={'horizontal'} colon={false} key="modalForm">
                   <Row>
@@ -985,7 +992,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
               </div>
             </div>
 
-            <div className={'search_select_wrapper_bottomTable'}>
+            <div className={'search_select_wrapper_bottomTable'} ref={bottomWrapRef}>
               <div className={selectMode ?'search_select_wrapper_bottomTable_wrapLeft2':'search_select_wrapper_bottomTable_wrapLeft1'}><Tabs items={tabsItems1} /></div>
               {selectMode ? <div className={'search_select_wrapper_bottomTable_wrapRight'}><Tabs items={tabsItems2} tabBarExtraContent={<span onClick={()=> onChangeSelectedKeys([], [])}>清空已选</span>} /></div> : null}
             </div>
@@ -997,3 +1004,27 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 });
 
 export default SearchSelect;
+  const computeScrollY = () => {
+    try {
+      const bodyEl = document.querySelector('.search_select_modal_wrapper .ant-modal-body') as HTMLElement | null;
+      const bodyH = bodyEl?.clientHeight || 0;
+      const topH = topFormRef.current?.clientHeight || 0;
+      const navEl = bottomWrapRef.current?.querySelector('.ant-tabs-nav') as HTMLElement | null;
+      const navH = navEl?.offsetHeight || 0;
+      const extra = 30; // paddings/margins buffer
+      const tableH = Math.max(160, bodyH - topH - navH - extra);
+      setOverScrollY(tableH);
+    } catch (e) {
+      // ignore
+    }
+  };
+
+  useEffect(() => {
+    if (!isModalVisible) return;
+    computeScrollY();
+    const onResize = () => computeScrollY();
+    window.addEventListener('resize', onResize);
+    return () => {
+      window.removeEventListener('resize', onResize);
+    };
+  }, [isModalVisible, collapsed, tableData, tablePagination]);