@bit-sun/business-component 4.2.1-alpha.6-aiwei → 4.2.1-alpha.7-aiwei

package/dist/index.esm.js

@@ -2,7 +2,7 @@ import axios from 'axios';
 import request$1 from 'umi-request';
 import cookie from 'js-cookie';
 import { message as message$1, Tooltip, Image, Popover, Card, Avatar, Badge, Menu, Input, InputNumber, Space, Button, Dropdown, Upload, Checkbox, Modal, ConfigProvider, Tag, Select, Spin, Form, Table, Empty, Row, Col, Tabs, TreeSelect, DatePicker, Typography, Alert, Breadcrumb, Drawer as Drawer$1, List, Radio, Tree, Result, Affix, Cascader, TimePicker, Divider, Switch, Collapse } from 'antd';
-import _, { omit, uniqBy, escapeRegExp, isNil, isBoolean, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
+import _, { omit, uniqBy, escapeRegExp, isNil, trim, isBoolean, debounce, cloneDeep as cloneDeep$1, throttle, isEmpty } from 'lodash';
 import memoizeOne from 'memoize-one';
 import { formatMessage, history, useLocation, Link, useModel, setLocale, useIntl, request as request$3 } from 'umi';
 import isEqual from 'lodash/isEqual';
@@ -6180,7 +6180,26 @@ 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 _modalTableProps$tabl;
+    var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
+    var canExpand = hasMoreQueryFields(modalTableProps);
+    var collapsedList = modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableSearchForm) === null || _modalTableProps$tabl === void 0 ? void 0 : _modalTableProps$tabl.slice(0, viCount);
+    var baseHeight = getTableHeigth(collapsedList);
+    var rowsCollapsed = getFormRowInfo(collapsedList, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan).totalRows;
+    var rowsExpandedData = getFormRowInfo(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan);
+    var rowsExpanded = rowsExpandedData.totalRows;
+    var isMoreAction = false;
+    if (24 / (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan) - rowsExpandedData.emptyArray.length === 1) {
+      rowsExpanded++;
+      isMoreAction = true;
+    }
+    var extraRows = !collapsed && canExpand ? Math.max(0, rowsExpanded - rowsCollapsed) : 0;
+    var tableBoxHeighth = baseHeight;
+    if (isMoreAction && extraRows > 0) {
+      tableBoxHeighth = tableBoxHeighth + (extraRows - 1 ? extraRows - 1 : 0) * 34 + 32;
+    } else {
+      tableBoxHeighth = tableBoxHeighth + extraRows * 34;
+    }
     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 mTB = "calc(50vh - ".concat(tableBoxHeighth / 2, "px - ").concat(x / 2, "px - 40px)");
@@ -12371,24 +12390,100 @@ function commonFun(type, prefixUrl, parentProps) {
       }
     }, {
       name: 'qp-manageSupervisor-like',
+      type: 'select',
       label: '管理督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value;
+            debugger;
+            return ((_option$value = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value !== void 0 ? _option$value : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-directSupervisor-like',
+      type: 'select',
       label: '直接督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value2;
+            return ((_option$value2 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value2 !== void 0 ? _option$value2 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-distributionItem-like',
+      type: 'select',
       label: '分销商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value3;
+            return ((_option$value3 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value3 !== void 0 ? _option$value3 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-headItem-like',
+      type: 'select',
       label: '总部商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value4;
+            return ((_option$value4 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value4 !== void 0 ? _option$value4 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-storeChannelName-like',
+      type: 'select',
       label: '管理模式',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value5;
+            return ((_option$value5 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value5 !== void 0 ? _option$value5 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }];
     var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -12408,8 +12503,8 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
-      var _x$3, _x$3$data$, _x$3$data$$channelInf;
+    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth')), loadSelectSource$1("/channel-manage/store/selectStoreOperationalInfo", {}, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in'))]).then(function (x) {
+      var _x$3, _x$3$data$, _x$3$data$$channelInf, _x$4, _opList, _opList$, _opList2, _opList3, _opList4, _opList5, _opList6;
       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({
@@ -12428,6 +12523,46 @@ function commonFun(type, prefixUrl, parentProps) {
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
       formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
+      var opRaw = (_x$4 = x[4]) === null || _x$4 === void 0 ? void 0 : _x$4.data;
+      // 新增label属性
+      (_opList = opList) === null || _opList === void 0 ? void 0 : _opList.forEach(function (r) {
+        r.label = r === null || r === void 0 ? void 0 : r.value;
+      });
+      var opList = Array.isArray(opRaw) ? opRaw : (opRaw === null || opRaw === void 0 ? void 0 : opRaw.items) || (opRaw === null || opRaw === void 0 ? void 0 : opRaw.list) || [];
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !((_opList$ = opList[0]) === null || _opList$ === void 0 ? void 0 : _opList$.field)) {
+        opList = opList[0];
+      }
+      var m1 = (_opList2 = opList) === null || _opList2 === void 0 ? void 0 : _opList2.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'manage_supervisor' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m2 = (_opList3 = opList) === null || _opList3 === void 0 ? void 0 : _opList3.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'direct_supervisor' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m3 = (_opList4 = opList) === null || _opList4 === void 0 ? void 0 : _opList4.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'distribution_item' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      debugger;
+      var m4 = (_opList5 = opList) === null || _opList5 === void 0 ? void 0 : _opList5.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'head_item' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m5 = (_opList6 = opList) === null || _opList6 === void 0 ? void 0 : _opList6.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'store_channel_name' && trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      tableSearchForm[8] = _objectSpread2(_objectSpread2({}, tableSearchForm[8]), {}, {
+        initialSource: m1
+      });
+      tableSearchForm[9] = _objectSpread2(_objectSpread2({}, tableSearchForm[9]), {}, {
+        initialSource: m2
+      });
+      tableSearchForm[10] = _objectSpread2(_objectSpread2({}, tableSearchForm[10]), {}, {
+        initialSource: m3
+      });
+      tableSearchForm[11] = _objectSpread2(_objectSpread2({}, tableSearchForm[11]), {}, {
+        initialSource: m4
+      });
+      tableSearchForm[12] = _objectSpread2(_objectSpread2({}, tableSearchForm[12]), {}, {
+        initialSource: m5
+      });
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',

package/dist/index.js

@@ -6203,7 +6203,26 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     });
   };
   var renderShowTable = function renderShowTable(tableList, type) {
-    var tableBoxHeighth = getTableHeigth(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm);
+    var _modalTableProps$tabl;
+    var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
+    var canExpand = hasMoreQueryFields(modalTableProps);
+    var collapsedList = modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableSearchForm) === null || _modalTableProps$tabl === void 0 ? void 0 : _modalTableProps$tabl.slice(0, viCount);
+    var baseHeight = getTableHeigth(collapsedList);
+    var rowsCollapsed = getFormRowInfo(collapsedList, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan).totalRows;
+    var rowsExpandedData = getFormRowInfo(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan);
+    var rowsExpanded = rowsExpandedData.totalRows;
+    var isMoreAction = false;
+    if (24 / (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchColSpan) - rowsExpandedData.emptyArray.length === 1) {
+      rowsExpanded++;
+      isMoreAction = true;
+    }
+    var extraRows = !collapsed && canExpand ? Math.max(0, rowsExpanded - rowsCollapsed) : 0;
+    var tableBoxHeighth = baseHeight;
+    if (isMoreAction && extraRows > 0) {
+      tableBoxHeighth = tableBoxHeighth + (extraRows - 1 ? extraRows - 1 : 0) * 34 + 32;
+    } else {
+      tableBoxHeighth = tableBoxHeighth + extraRows * 34;
+    }
     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 mTB = "calc(50vh - ".concat(tableBoxHeighth / 2, "px - ").concat(x / 2, "px - 40px)");
@@ -12394,24 +12413,100 @@ function commonFun(type, prefixUrl, parentProps) {
       }
     }, {
       name: 'qp-manageSupervisor-like',
+      type: 'select',
       label: '管理督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value;
+            debugger;
+            return ((_option$value = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value !== void 0 ? _option$value : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-directSupervisor-like',
+      type: 'select',
       label: '直接督导',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value2;
+            return ((_option$value2 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value2 !== void 0 ? _option$value2 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-distributionItem-like',
+      type: 'select',
       label: '分销商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value3;
+            return ((_option$value3 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value3 !== void 0 ? _option$value3 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-headItem-like',
+      type: 'select',
       label: '总部商品',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value4;
+            return ((_option$value4 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value4 !== void 0 ? _option$value4 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }, {
       name: 'qp-storeChannelName-like',
+      type: 'select',
       label: '管理模式',
-      type: 'input'
+      field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            var _option$value5;
+            return ((_option$value5 = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value5 !== void 0 ? _option$value5 : '').toLowerCase().includes(input.toLowerCase());
+          }
+        }
+      }
     }];
     var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
@@ -12431,8 +12526,8 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
-      var _x$3, _x$3$data$, _x$3$data$$channelInf;
+    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth')), loadSelectSource$1("/channel-manage/store/selectStoreOperationalInfo", {}, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in'))]).then(function (x) {
+      var _x$3, _x$3$data$, _x$3$data$$channelInf, _x$4, _opList, _opList$, _opList2, _opList3, _opList4, _opList5, _opList6;
       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({
@@ -12451,6 +12546,46 @@ function commonFun(type, prefixUrl, parentProps) {
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
       formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
+      var opRaw = (_x$4 = x[4]) === null || _x$4 === void 0 ? void 0 : _x$4.data;
+      // 新增label属性
+      (_opList = opList) === null || _opList === void 0 ? void 0 : _opList.forEach(function (r) {
+        r.label = r === null || r === void 0 ? void 0 : r.value;
+      });
+      var opList = Array.isArray(opRaw) ? opRaw : (opRaw === null || opRaw === void 0 ? void 0 : opRaw.items) || (opRaw === null || opRaw === void 0 ? void 0 : opRaw.list) || [];
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !((_opList$ = opList[0]) === null || _opList$ === void 0 ? void 0 : _opList$.field)) {
+        opList = opList[0];
+      }
+      var m1 = (_opList2 = opList) === null || _opList2 === void 0 ? void 0 : _opList2.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'manage_supervisor' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m2 = (_opList3 = opList) === null || _opList3 === void 0 ? void 0 : _opList3.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'direct_supervisor' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m3 = (_opList4 = opList) === null || _opList4 === void 0 ? void 0 : _opList4.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'distribution_item' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      debugger;
+      var m4 = (_opList5 = opList) === null || _opList5 === void 0 ? void 0 : _opList5.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'head_item' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      var m5 = (_opList6 = opList) === null || _opList6 === void 0 ? void 0 : _opList6.filter(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.field) === 'store_channel_name' && _.trim(r === null || r === void 0 ? void 0 : r.value);
+      });
+      tableSearchForm[8] = _objectSpread2(_objectSpread2({}, tableSearchForm[8]), {}, {
+        initialSource: m1
+      });
+      tableSearchForm[9] = _objectSpread2(_objectSpread2({}, tableSearchForm[9]), {}, {
+        initialSource: m2
+      });
+      tableSearchForm[10] = _objectSpread2(_objectSpread2({}, tableSearchForm[10]), {}, {
+        initialSource: m3
+      });
+      tableSearchForm[11] = _objectSpread2(_objectSpread2({}, tableSearchForm[11]), {}, {
+        initialSource: m4
+      });
+      tableSearchForm[12] = _objectSpread2(_objectSpread2({}, tableSearchForm[12]), {}, {
+        initialSource: m5
+      });
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',

package/package.json

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

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

@@ -6,7 +6,7 @@ import { handleTextOverflow, tableColumnsImage, handleTooltip } from '@/componen
 import { getSkuImg } from '@/utils/TableUtils';
 import { getEmployeeCode, getCurrentTargetBgId } from '@/utils/LocalstorageUtils';
 import { Image } from 'antd';
-import { isBoolean } from 'lodash';
+import { isBoolean, trim } from 'lodash';
 
 const hasDictSharingType =  getDictionarySource('UC000013')?.length;
 const sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType
@@ -2295,11 +2295,74 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
         },
       },
-      { name: 'qp-manageSupervisor-like', label: '管理督导', type: 'input' },
-      { name: 'qp-directSupervisor-like', label: '直接督导', type: 'input' },
-      { name: 'qp-distributionItem-like', label: '分销商品', type: 'input' },
-      { name: 'qp-headItem-like', label: '总部商品', type: 'input' },
-      { name: 'qp-storeChannelName-like', label: '管理模式', type: 'input' },
+      { name: 'qp-manageSupervisor-like', type: 'select', label: '管理督导', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             {
+              debugger
+              return (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+             }
+        },
+      } },
+      { name: 'qp-directSupervisor-like', type: 'select', label: '直接督导', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-distributionItem-like', type: 'select', label: '分销商品', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-headItem-like', type: 'select', label: '总部商品', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
+      { name: 'qp-storeChannelName-like', type: 'select', label: '管理模式', field: {
+        type: 'select',
+        props: {
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: (input: string, option: { props: { children: string } }) =>
+             (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
+        },
+      } },
     ]
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     Promise.all([
@@ -2320,7 +2383,8 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         pageSize: 5000,
         currentPage: 1,
         'ctl-withAuth': true,
-      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth'))
+      },getQueryHeadersItem(queryHeaderParams,'ctl-withAuth')),
+      loadSelectSource(`/channel-manage/store/selectStoreOperationalInfo`, {}, getQueryHeadersItem(queryHeaderParams,'qp-orgCode-in'))
     ]).then((x: any)=>{
       const newData1: any[] = [];
       x[1]?.data[0]?.channelInfoSon?.forEach((item: any) => {
@@ -2333,6 +2397,25 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       formatTreeDataSource(x, 1, 4, tableSearchForm, ['code','name'], 'channelInfoSon', channelDisabledJude)
       formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude)
       formatSource(x,3, 7, tableSearchForm, ['brandCode', 'name']);
+      
+      const opRaw = x[4]?.data;
+      // 新增label属性
+      opList?.forEach((r: any) => {
+        r.label = r?.value;
+      })
+      let opList = Array.isArray(opRaw) ? opRaw : (opRaw?.items || opRaw?.list || []);
+      if (Array.isArray(opList) && Array.isArray(opList[0]) && !opList[0]?.field) { opList = opList[0]; }
+      const m1 = opList?.filter((r: any) => r?.field === 'manage_supervisor' && trim(r?.value));
+      const m2 = opList?.filter((r: any) => r?.field === 'direct_supervisor' && trim(r?.value));
+      const m3 = opList?.filter((r: any) => r?.field === 'distribution_item' && trim(r?.value));
+      debugger
+      const m4 = opList?.filter((r: any) => r?.field === 'head_item' && trim(r?.value));
+      const m5 = opList?.filter((r: any) => r?.field === 'store_channel_name' && trim(r?.value));
+      tableSearchForm[8] = { ...tableSearchForm[8], initialSource: m1 };
+      tableSearchForm[9] = { ...tableSearchForm[9], initialSource: m2 };
+      tableSearchForm[10] = { ...tableSearchForm[10], initialSource: m3 };
+      tableSearchForm[11] = { ...tableSearchForm[11], initialSource: m4 };
+      tableSearchForm[12] = { ...tableSearchForm[12], initialSource: m5 };
     })
     modalTableProps = {
       modalTableTitle: '选择商店',

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

@@ -711,7 +711,25 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
 
   const renderShowTable =  (tableList, type) => {
-    const tableBoxHeighth = getTableHeigth(modalTableProps?.tableSearchForm);
+    const viCount = modalTableProps?.visibleFieldsCount || defaultVisibleFieldsCount;
+    const canExpand = hasMoreQueryFields(modalTableProps);
+    const collapsedList = modalTableProps?.tableSearchForm?.slice(0, viCount);
+    const baseHeight = getTableHeigth(collapsedList);
+    const rowsCollapsed = getFormRowInfo(collapsedList, modalTableProps?.tableSearchColSpan).totalRows;
+    const rowsExpandedData = getFormRowInfo(modalTableProps?.tableSearchForm, modalTableProps?.tableSearchColSpan);
+    let rowsExpanded = rowsExpandedData.totalRows;
+    let isMoreAction = false;
+    if(24 / modalTableProps?.tableSearchColSpan  - rowsExpandedData.emptyArray.length === 1) {
+      rowsExpanded++; 
+      isMoreAction = true;
+    }
+    const extraRows = (!collapsed && canExpand) ? Math.max(0, rowsExpanded - rowsCollapsed) : 0;
+    let tableBoxHeighth = baseHeight;
+    if(isMoreAction && extraRows > 0) {
+      tableBoxHeighth = tableBoxHeighth + ((extraRows - 1) ? (extraRows - 1) : 0) * 34 + 32
+    } else {
+      tableBoxHeighth = tableBoxHeighth + extraRows * 34
+    }
     const x = tableList?.length ? 82 : 28;  // 无数据没有分页，有数据计算减去：分页 24+16*2+10 「高 + margin * 2 + paddingBottom 10 」
     const oSY = `calc(100vh - ${tableBoxHeighth}px - ${x}px)`; 
     const mTB = `calc(50vh - ${tableBoxHeighth/2}px - ${x/2}px - 40px)`