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

package/dist/index.esm.js

@@ -2,11 +2,11 @@ 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';
-import React$1, { useState, useEffect, useRef, forwardRef, useImperativeHandle, useMemo, Component, Fragment, useCallback, useLayoutEffect, createRef } from 'react';
+import React$1, { useState, useEffect, useRef, forwardRef, useMemo, useImperativeHandle, Component, Fragment, useCallback, useLayoutEffect, createRef } from 'react';
 import { renderToString as renderToString$1 } from 'react-dom/server';
 import moment$1 from 'moment';
 import { EyeOutlined, DeleteOutlined, EditOutlined, CopyOutlined, CloseSquareOutlined, WarningOutlined, SendOutlined, ProfileTwoTone, ExclamationCircleOutlined, DownOutlined, UnorderedListOutlined, DashOutlined, CaretUpOutlined, CaretDownOutlined, SearchOutlined, CloseCircleOutlined, DownCircleFilled, ArrowLeftOutlined, FolderOutlined, EllipsisOutlined, HomeOutlined, DoubleLeftOutlined, DoubleRightOutlined, MenuUnfoldOutlined, CaretLeftOutlined, SettingOutlined, BulbOutlined, PlayCircleOutlined, SaveOutlined, FullscreenExitOutlined, MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons';
@@ -2561,11 +2561,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 cell.v = cell.m;
               }
             }
-            // console.log(postion);
           },
           cellAllRenderBefore: function cellAllRenderBefore(data, sheetFile, ctx) {
             sheetFile.config.borderInfo = [];
-            // console.info(data,sheetFile,ctx)
           }
         },
         showtoolbarConfig: {
@@ -2733,14 +2731,21 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       };
     };
     _this.getData = function () {
-      console.time();
+      // 是否使用字符串值 默认为false
+      var useStringValue = _this.props.useStringValue || false;
       var sheetData = luckysheet.getSheetData();
       var data = JSON.parse(JSON.stringify(sheetData)).filter(function (item) {
         return item[0];
       }).map(function (item) {
         var obj = {};
         item.slice(0, itemsTemp.length).map(function (innerItem, index) {
-          obj[_this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          // 如果使用字符串值，直接赋值字符串
+          if (useStringValue) {
+            obj[_this.state.items[index].code] = innerItem && innerItem.m;
+          } else {
+            // 否则根据值是否相等来判断是否使用字符串值
+            obj[_this.state.items[index].code] = innerItem && (innerItem.v === innerItem.m ? innerItem.m : innerItem.v);
+          }
         });
         return obj;
       });
@@ -2881,7 +2886,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 errorListCheck: false,
                 resultData: res
               });
-              console.log(setExportData);
               setExportData([123123]);
             }).catch(function (err) {});
           case 3:
@@ -3177,7 +3181,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         left: '0px',
         top: '0px'
       };
-      console.log('itemsTemp', itemsTemp);
       return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement("div", {
         className: "sheet_table_top"
       }, /*#__PURE__*/React$1.createElement(Space, null, /*#__PURE__*/React$1.createElement("span", null, "\u6392\u5E8F\u5217"), /*#__PURE__*/React$1.createElement(Dropdown, {
@@ -5323,7 +5326,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     viewShowValueStr = _ref.viewShowValueStr,
     searchStartLength = _ref.searchStartLength,
     _ref$isQuery = _ref.isQuery,
-    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery;
+    isQuery = _ref$isQuery === void 0 ? false : _ref$isQuery,
+    _ref$requireSearchCon = _ref.requireSearchCondition,
+    requireSearchCondition = _ref$requireSearchCon === void 0 ? false : _ref$requireSearchCon;
   var requestConfig = _objectSpread2({
     url: url,
     method: method,
@@ -5345,10 +5350,17 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     searchStartLength: searchStartLength
   }, rCTemp);
   var resultSourceKey = handleSourceName(sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || (ctx === null || ctx === void 0 ? void 0 : ctx.name) || 'supplierCode');
+  var TABLE_PAGE_SIZE_OPTIONS = [10, 20, 50, 100, 200, 500, 1000, 2000, 3000];
+  var resolveTablePageSize = function resolveTablePageSize(pageSize) {
+    if (TABLE_PAGE_SIZE_OPTIONS.includes(Number(pageSize))) {
+      return Number(pageSize);
+    }
+    return 20;
+  };
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   var initVal = value || (selectMode ? [] : null);
   var pageSize = 100; // 下拉框默认分页 条数
-  var tableInitPageSize = 20; // 弹框默认分页 条数
+  var tableInitPageSize = resolveTablePageSize((props === null || props === void 0 ? void 0 : props.pageSize) || null); // 弹框默认分页 条数
   var currentPage = 1;
   var selectParamsKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filter) || 'qp-codeAndName-like';
   var selectParamsInitKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filterInit) || selectParamsKey;
@@ -5376,11 +5388,20 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     },
     pageSize: tableInitPageSize
   };
+  var selectedInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
+    current: 1,
+    pageSize: resolveTablePageSize((modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.selectedTablePageSize) || 20),
+    total: 0
+  });
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
     current: 1,
-    pageSizeOptions: [10, 20, 50, 100, 500, 1000]
+    pageSizeOptions: TABLE_PAGE_SIZE_OPTIONS.map(String)
   });
+  /**
+   * 左侧弹窗表格大分页时的实际渲染上限；全选仍基于完整当前页 tableData。
+   */
+  var tableRenderPageSize = 200;
   var disabled = !!noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
   var isHaveDependency = fixedparameter && fieldValToParam && ctx;
   var isHaveDValue = function isHaveDValue() {
@@ -5434,6 +5455,10 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState18 = _slicedToArray(_useState17, 2),
     uniqueValue = _useState18[0],
     setUniqueValue = _useState18[1];
+  var _useState19 = useState({}),
+    _useState20 = _slicedToArray(_useState19, 2),
+    selectToggleMap = _useState20[0],
+    setSelectToggleMap = _useState20[1];
   var _useDebounceFn = useDebounceFn(function (v) {
       // 优化搜索参数 支持传多个
       var searchParams = {};
@@ -5462,38 +5487,34 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useState19 = useState(true),
-    _useState20 = _slicedToArray(_useState19, 2),
-    collapsed = _useState20[0],
-    setCollapsed = _useState20[1];
   var _useState21 = useState(true),
     _useState22 = _slicedToArray(_useState21, 2),
-    caretLeftFlag = _useState22[0],
-    setCaretLeftFlag = _useState22[1];
-  var _useState23 = useState([]),
+    collapsed = _useState22[0],
+    setCollapsed = _useState22[1];
+  var _useState23 = useState(true),
     _useState24 = _slicedToArray(_useState23, 2),
-    tableData = _useState24[0],
-    setTableData = _useState24[1];
-  var _useState25 = useState(tableInitPagination),
+    caretLeftFlag = _useState24[0],
+    setCaretLeftFlag = _useState24[1];
+  var _useState25 = useState([]),
     _useState26 = _slicedToArray(_useState25, 2),
-    tablePagination = _useState26[0],
-    setTablePagination = _useState26[1];
-  var _useState27 = useState([]),
+    tableData = _useState26[0],
+    setTableData = _useState26[1];
+  var _useState27 = useState(tableInitPagination),
     _useState28 = _slicedToArray(_useState27, 2),
-    selectedRowKeys = _useState28[0],
-    setSelectedRowKeys = _useState28[1];
+    tablePagination = _useState28[0],
+    setTablePagination = _useState28[1];
   var _useState29 = useState([]),
     _useState30 = _slicedToArray(_useState29, 2),
-    selectedRows = _useState30[0],
-    setSelectedRows = _useState30[1];
-  var _useState31 = useState(false),
+    selectedRowKeys = _useState30[0],
+    setSelectedRowKeys = _useState30[1];
+  var _useState31 = useState([]),
     _useState32 = _slicedToArray(_useState31, 2),
-    checkedAll = _useState32[0],
-    setCheckedAll = _useState32[1];
-  var _useState33 = useState(false),
+    selectedRows = _useState32[0],
+    setSelectedRows = _useState32[1];
+  var _useState33 = useState(selectedInitPagination),
     _useState34 = _slicedToArray(_useState33, 2),
-    indeterminate = _useState34[0],
-    setIndeterminate = _useState34[1];
+    selectedTablePagination = _useState34[0],
+    setSelectedTablePagination = _useState34[1];
   var _useState35 = useState({}),
     _useState36 = _slicedToArray(_useState35, 2),
     tableFormParams = _useState36[0],
@@ -5514,6 +5535,24 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState44 = _slicedToArray(_useState43, 2),
     modalSearched = _useState44[0],
     setModalSearched = _useState44[1];
+  var selectAllTableRef = useRef(false);
+  var getRecordKey = function getRecordKey(record) {
+    var _record$mappingValueF;
+    return (_record$mappingValueF = record === null || record === void 0 ? void 0 : record[mappingValueField]) !== null && _record$mappingValueF !== void 0 ? _record$mappingValueF : record === null || record === void 0 ? void 0 : record.value;
+  };
+  /**
+   * 已选表格只向 Table 传入当前页数据，避免全选 1000 条时右侧表格同步处理全部数据。
+   */
+  var selectedTablePageRows = useMemo(function () {
+    var current = Number((selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.current) || 1);
+    var pageSize = Number((selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.pageSize) || selectedInitPagination.pageSize);
+    var start = (current - 1) * pageSize;
+    return (selectedRows || []).slice(start, start + pageSize).map(function (s, index) {
+      return _objectSpread2(_objectSpread2({}, s), {}, {
+        keyIndex: start + index + 1
+      });
+    });
+  }, [selectedRows, selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.current, selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.pageSize, selectedInitPagination.pageSize]);
   var setSelectDataSource = function setSelectDataSource(list, total) {
     setItems(list);
     setItemsTotal(total);
@@ -5521,6 +5560,20 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var clearSelectDataSource = function clearSelectDataSource() {
     setSelectDataSource([], 0);
   };
+  /**
+   * 清空弹窗已选数据。
+   */
+  var clearSelectedRows = function clearSelectedRows() {
+    setSelectedRows([]);
+    setPopValue([]);
+    setSelectedTablePagination(function (prev) {
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        total: 0,
+        current: 1
+      });
+    });
+    setSelectedRowKeys([]);
+  };
   useImperativeHandle(ref, function () {
     return {
       refreshDataSource: function refreshDataSource() {
@@ -5713,6 +5766,18 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setUniqueValue(makeUniqueValue());
     setTabletShowColumns(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns));
   }, [resultSourceKey]);
+  useEffect(function () {
+    setSelectedTablePagination(function (prev) {
+      var pageSize = (prev === null || prev === void 0 ? void 0 : prev.pageSize) || selectedInitPagination.pageSize;
+      var maxCurrent = Math.ceil(selectedRows.length / pageSize) || 1;
+      var current = selectedRows.length ? Math.min((prev === null || prev === void 0 ? void 0 : prev.current) || 1, maxCurrent) : 1;
+      if ((prev === null || prev === void 0 ? void 0 : prev.total) === selectedRows.length && (prev === null || prev === void 0 ? void 0 : prev.current) === current) return prev;
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        total: selectedRows.length,
+        current: current
+      });
+    });
+  }, [selectedRows.length, selectedInitPagination.pageSize]);
   useEffect(function () {
     if (init) {
       clearSelectDataSource();
@@ -5770,8 +5835,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             value: i
           };
         }));
-        setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(itemsTotal && value.length === itemsTotal);
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
         setSelectedRows(labelInValue ? [_defineProperty(_defineProperty(_defineProperty({}, mappingValueField, value.key), "value", value.key), "text", value.label)] : [_defineProperty(_defineProperty({}, mappingValueField, value), "value", value)]);
@@ -5859,8 +5922,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setTablePagination(tableInitPagination);
     setSelectedRowKeys([]);
     setSelectedRows([]);
-    setCheckedAll(false);
-    setIndeterminate(false);
   };
   var handleCancel = function handleCancel() {
     clearModalTable();
@@ -5886,6 +5947,16 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var onSearchTable = function onSearchTable() {
     var params = form.getFieldsValue();
+    // 必须选择一个值
+    if (requireSearchCondition) {
+      var hasValidValue = Object.values(params).some(function (value) {
+        return Array.isArray(value) && value.length > 0 || typeof value === 'string' && value.trim().length > 0;
+      });
+      if (!hasValidValue) {
+        message$1.warning('请至少选择一个搜索条件');
+        return;
+      }
+    }
     setModalSearched(true);
     setTableFormParams(params);
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
@@ -5909,9 +5980,17 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       currentPage: pagination.current
     }), 2);
   };
+  var handleSelectedTableChange = function handleSelectedTableChange(pagination) {
+    setSelectedTablePagination(function (prev) {
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        current: pagination.current,
+        pageSize: pagination.pageSize
+      });
+    });
+  };
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
-    var sksResult = (selectRows === null || selectRows === void 0 ? void 0 : selectRows.map(function (i) {
-      return i.value;
+    var sksResult = (selectKeys === null || selectKeys === void 0 ? void 0 : selectKeys.length) ? selectKeys : (selectRows === null || selectRows === void 0 ? void 0 : selectRows.map(function (i) {
+      return getRecordKey(i);
     })) || [];
     // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
     if (!selectMode && !(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter)) {
@@ -5921,33 +6000,96 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setSelectedRowKeys(sksResult);
     setSelectedRows(selectRows);
     setPopValue(selectRows);
-    setIndeterminate(!!selectRows.length && selectRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
-    setCheckedAll(selectRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
   };
-  var rowSelection = {
-    type: selectMode ? 'checkbox' : 'radio',
-    selectedRowKeys: selectedRowKeys,
-    preserveSelectedRowKeys: true,
-    onChange: function onChange(sks, srs) {
-      // 处理翻页后，之前存储的selectedRows变为undefined
-      // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
-      var tmpSelectedRows = selectedRows.concat(srs).filter(function (item) {
-        return item != undefined;
-      });
-      var totalSelectedRows = sks.map(function (key) {
-        return tmpSelectedRows.filter(function (item) {
-          return item[mappingValueField] == key;
-        })[0];
-      }).filter(function (item) {
-        return item != undefined;
-      });
-      onChangeSelectedKeys(sks, totalSelectedRows);
-    },
-    getCheckboxProps: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps) ? selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps : function () {
-      return {
-        disabled: disabled || !items.length && !tableData.length
-      };
-    }
+  var getRowSelection = function getRowSelection() {
+    var visibleRows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var type = arguments.length > 1 ? arguments[1] : undefined;
+    return {
+      type: selectMode ? 'checkbox' : 'radio',
+      selectedRowKeys: selectedRowKeys,
+      preserveSelectedRowKeys: true,
+      onSelectAll: function onSelectAll(selected) {
+        selectAllTableRef.current = true;
+        setTimeout(function () {
+          selectAllTableRef.current = false;
+        }, 0);
+        var targetRows = type === 'noPage' ? visibleRows : tableData;
+        var targetKeys = (targetRows || []).map(function (item) {
+          return getRecordKey(item);
+        });
+        if (!selected) {
+          var selectedKeySet = new Set((selectedRows || []).map(function (item) {
+            return getRecordKey(item);
+          }));
+          if ((selectedRows || []).length === (targetRows || []).length && targetKeys.every(function (key) {
+            return selectedKeySet.has(key);
+          })) {
+            clearSelectedRows();
+            return;
+          }
+          var targetKeySet = new Set(targetKeys);
+          var _nextSelectedRows = (selectedRows || []).filter(function (item) {
+            return !targetKeySet.has(getRecordKey(item));
+          });
+          var _nextSelectedKeys = _nextSelectedRows.map(function (item) {
+            return getRecordKey(item);
+          });
+          onChangeSelectedKeys(_nextSelectedKeys, _nextSelectedRows);
+          return;
+        }
+        if (!(selectedRows || []).length) {
+          onChangeSelectedKeys(targetKeys, targetRows || []);
+          return;
+        }
+        var selectedRowMap = new Map();
+        (selectedRows || []).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        (targetRows || []).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        var nextSelectedRows = Array.from(selectedRowMap.values()).filter(Boolean);
+        var nextSelectedKeys = nextSelectedRows.map(function (item) {
+          return getRecordKey(item);
+        });
+        onChangeSelectedKeys(nextSelectedKeys, nextSelectedRows);
+      },
+      onChange: function onChange(sks, srs) {
+        if (selectAllTableRef.current) {
+          selectAllTableRef.current = false;
+          return;
+        }
+        if (!(sks === null || sks === void 0 ? void 0 : sks.length)) {
+          clearSelectedRows();
+          return;
+        }
+        // 处理翻页后，之前存储的selectedRows变为undefined
+        // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
+        var visibleKeySet = new Set((visibleRows || []).map(function (item) {
+          return getRecordKey(item);
+        }));
+        var selectedRowMap = new Map();
+        (selectedRows || []).forEach(function (item) {
+          var key = getRecordKey(item);
+          if (!visibleKeySet.has(key)) {
+            selectedRowMap.set(key, item);
+          }
+        });
+        (srs || []).filter(Boolean).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        var totalSelectedRows = Array.from(selectedRowMap.values()).filter(Boolean);
+        var totalSelectedKeys = totalSelectedRows.map(function (item) {
+          return getRecordKey(item);
+        });
+        onChangeSelectedKeys(totalSelectedKeys, totalSelectedRows);
+      },
+      getCheckboxProps: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps) ? selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps : function () {
+        return {
+          disabled: disabled || !items.length && !tableData.length
+        };
+      }
+    };
   };
   var onRowClickSelect = function onRowClickSelect(e, record, type) {
     if (selectMode && !(disabled || !items.length && !tableData.length)) {
@@ -5955,7 +6097,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       var newSelect = [JSON.parse(JSON.stringify(record))];
       var srs = getRealStr(oldSelect, newSelect, record);
       var sks = srs.map(function (i) {
-        return i.value;
+        return getRecordKey(i);
       });
       onChangeSelectedKeys(sks, srs);
     }
@@ -5964,14 +6106,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     if (!selectMode && !(disabled || !items.length && !tableData.length)) {
       var srs = [JSON.parse(JSON.stringify(record))];
       var sks = srs.map(function (i) {
-        return i.value;
+        return getRecordKey(i);
       });
       onChangeSelectedKeys(sks, srs);
     }
   };
   var formItem = function formItem(list) {
     if (isModalVisible && (list === null || list === void 0 ? void 0 : list.length)) {
-      debugger;
       var setDisabled = function setDisabled(name) {
         if (fixedparamsDisabled && (fixedparameter === null || fixedparameter === void 0 ? void 0 : fixedparameter.length) && fixedparameter.find(function (item) {
           return item === name;
@@ -5991,13 +6132,13 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       })) || [];
       var searchList = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.noEmptySearchField) ? list : list === null || list === void 0 ? void 0 : list.concat(addKong);
       return searchList.map(function (i, index) {
-        var _i$field, _i$field3, _i$field5, _i$field7, _i$field9, _i$field0, _i$field1, _i$field10, _i$field12, _i$field13;
+        var _i$field, _i$field6, _i$field8, _i$field0, _i$field10, _i$field11, _i$field12, _i$field13, _i$field15, _i$field16;
         if ((i === null || i === void 0 ? void 0 : i.type) === 'kong') return /*#__PURE__*/React$1.createElement(Col, {
           span: ColSpan,
           key: i
         });
         if ((i === null || i === void 0 ? void 0 : i.type) === 'select' || (i === null || i === void 0 ? void 0 : (_i$field = i.field) === null || _i$field === void 0 ? void 0 : _i$field.type) === 'select') {
-          var _i$field2, _i$initialSource;
+          var _i$field2, _i$field3, _i$field3$props, _i$initialSource;
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6014,7 +6155,63 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
               return onSearchTable();
             }
           }, i === null || i === void 0 ? void 0 : (_i$field2 = i.field) === null || _i$field2 === void 0 ? void 0 : _i$field2.props), {}, {
-            disabled: setDisabled(i.name)
+            disabled: setDisabled(i.name),
+            mode: i === null || i === void 0 ? void 0 : (_i$field3 = i.field) === null || _i$field3 === void 0 ? void 0 : (_i$field3$props = _i$field3.props) === null || _i$field3$props === void 0 ? void 0 : _i$field3$props.mode,
+            dropdownRender: function dropdownRender(menu) {
+              var _i$field4, _i$field4$props, _i$field5, _i$field5$props;
+              // 候选项数组（去重）
+              var allValues = Array.isArray(i === null || i === void 0 ? void 0 : i.initialSource) ? Array.from(new Set(i.initialSource.map(function (s) {
+                return s.value;
+              }).filter(function (v) {
+                return v !== undefined && v !== null;
+              }))) : [];
+              var isMulti = (i === null || i === void 0 ? void 0 : (_i$field4 = i.field) === null || _i$field4 === void 0 ? void 0 : (_i$field4$props = _i$field4.props) === null || _i$field4$props === void 0 ? void 0 : _i$field4$props.mode) === 'multiple' || (i === null || i === void 0 ? void 0 : (_i$field5 = i.field) === null || _i$field5 === void 0 ? void 0 : (_i$field5$props = _i$field5.props) === null || _i$field5$props === void 0 ? void 0 : _i$field5$props.mode) === 'tags';
+              // 当前 toggle 状态（true 表示下一次点击是反选 -> 显示为“反选”）
+              var toggled = !!selectToggleMap[i.name];
+              var label = toggled ? '反选' : '全选';
+              // 通过 props.allSelectValues 控制按钮是否显示
+              var showSelectAllButton = props.showAllSelectBtn && isMulti && allValues.length > 0;
+              return /*#__PURE__*/React$1.createElement("div", null, showSelectAllButton && (/*#__PURE__*/React$1.createElement("div", {
+                style: {
+                  padding: 6,
+                  display: 'flex',
+                  justifyContent: 'flex-end',
+                  alignItems: 'center'
+                }
+              }, /*#__PURE__*/React$1.createElement(Button, {
+                type: "link",
+                size: "small",
+                onMouseDown: function onMouseDown(e) {
+                  return e.preventDefault();
+                },
+                onClick: function onClick(e) {
+                  e.stopPropagation();
+                  var cur = form.getFieldValue(i.name) || [];
+                  var curArr = Array.isArray(cur) ? cur : [cur].filter(Boolean);
+                  if (!toggled) {
+                    // 全选：把所有候选值写入表单
+                    form.setFieldsValue(_defineProperty({}, i.name, allValues));
+                    setSelectToggleMap(function (prev) {
+                      return _objectSpread2(_objectSpread2({}, prev || {}), {}, _defineProperty({}, i.name, true));
+                    });
+                  } else {
+                    // 反选：当前实现为“把候选项中未被选中的项选上”（基于当前值取补集）
+                    var newVals = allValues.filter(function (v) {
+                      return !curArr.includes(v);
+                    });
+                    form.setFieldsValue(_defineProperty({}, i.name, newVals));
+                    setSelectToggleMap(function (prev) {
+                      return _objectSpread2(_objectSpread2({}, prev || {}), {}, _defineProperty({}, i.name, false));
+                    });
+                  }
+                },
+                style: {
+                  padding: '0 6px',
+                  height: 20,
+                  lineHeight: '20px'
+                }
+              }, label))), /*#__PURE__*/React$1.createElement("div", null, menu));
+            }
           }), (i === null || i === void 0 ? void 0 : (_i$initialSource = i.initialSource) === null || _i$initialSource === void 0 ? void 0 : _i$initialSource.length) && (i === null || i === void 0 ? void 0 : i.initialSource.map(function (m) {
             return /*#__PURE__*/React$1.createElement(Option$1, {
               value: m.value,
@@ -6022,8 +6219,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             }, m.text);
           })))));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'treeSelect' || (i === null || i === void 0 ? void 0 : (_i$field3 = i.field) === null || _i$field3 === void 0 ? void 0 : _i$field3.type) === 'treeSelect') {
-          var _i$field4;
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'treeSelect' || (i === null || i === void 0 ? void 0 : (_i$field6 = i.field) === null || _i$field6 === void 0 ? void 0 : _i$field6.type) === 'treeSelect') {
+          var _i$field7;
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6036,12 +6233,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
               width: '100%'
             },
             placeholder: "\u8BF7\u9009\u62E9"
-          }, i === null || i === void 0 ? void 0 : (_i$field4 = i.field) === null || _i$field4 === void 0 ? void 0 : _i$field4.props), {}, {
+          }, i === null || i === void 0 ? void 0 : (_i$field7 = i.field) === null || _i$field7 === void 0 ? void 0 : _i$field7.props), {}, {
             disabled: setDisabled(i.name)
           }))));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'rangepicker' || (i === null || i === void 0 ? void 0 : (_i$field5 = i.field) === null || _i$field5 === void 0 ? void 0 : _i$field5.type) === 'rangepicker') {
-          var _i$initialValue, _i$field6;
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'rangepicker' || (i === null || i === void 0 ? void 0 : (_i$field8 = i.field) === null || _i$field8 === void 0 ? void 0 : _i$field8.type) === 'rangepicker') {
+          var _i$initialValue, _i$field9;
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6055,12 +6252,12 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
               width: '100%'
             },
             placeholder: "\u8BF7\u9009\u62E9"
-          }, i === null || i === void 0 ? void 0 : (_i$field6 = i.field) === null || _i$field6 === void 0 ? void 0 : _i$field6.props), {}, {
+          }, i === null || i === void 0 ? void 0 : (_i$field9 = i.field) === null || _i$field9 === void 0 ? void 0 : _i$field9.props), {}, {
             disabled: setDisabled(i.name)
           }))));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'datepicker' || (i === null || i === void 0 ? void 0 : (_i$field7 = i.field) === null || _i$field7 === void 0 ? void 0 : _i$field7.type) === 'datepicker') {
-          var _i$field8;
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'datepicker' || (i === null || i === void 0 ? void 0 : (_i$field0 = i.field) === null || _i$field0 === void 0 ? void 0 : _i$field0.type) === 'datepicker') {
+          var _i$field1;
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6073,11 +6270,11 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
               width: '100%'
             },
             placeholder: "\u8BF7\u9009\u62E9"
-          }, i === null || i === void 0 ? void 0 : (_i$field8 = i.field) === null || _i$field8 === void 0 ? void 0 : _i$field8.props), {}, {
+          }, i === null || i === void 0 ? void 0 : (_i$field1 = i.field) === null || _i$field1 === void 0 ? void 0 : _i$field1.props), {}, {
             disabled: setDisabled(i.name)
           }))));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'businessSearchSelect' || (i === null || i === void 0 ? void 0 : (_i$field9 = i.field) === null || _i$field9 === void 0 ? void 0 : _i$field9.type) === 'businessSearchSelect') {
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'businessSearchSelect' || (i === null || i === void 0 ? void 0 : (_i$field10 = i.field) === null || _i$field10 === void 0 ? void 0 : _i$field10.type) === 'businessSearchSelect') {
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6089,7 +6286,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             disabled: setDisabled(i.name)
           }))));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'multipleQueryInput' || (i === null || i === void 0 ? void 0 : (_i$field0 = i.field) === null || _i$field0 === void 0 ? void 0 : _i$field0.type) === 'multipleQueryInput') {
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'multipleQueryInput' || (i === null || i === void 0 ? void 0 : (_i$field11 = i.field) === null || _i$field11 === void 0 ? void 0 : _i$field11.type) === 'multipleQueryInput') {
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6103,7 +6300,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             }
           })));
         }
-        if ((i === null || i === void 0 ? void 0 : (_i$field1 = i.field) === null || _i$field1 === void 0 ? void 0 : _i$field1.type) === 'proppertySelector') {
+        if ((i === null || i === void 0 ? void 0 : (_i$field12 = i.field) === null || _i$field12 === void 0 ? void 0 : _i$field12.type) === 'proppertySelector') {
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6113,8 +6310,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             key: i.name
           }, /*#__PURE__*/React$1.createElement(PropertySelector, null)));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'itemPropertySelector' || (i === null || i === void 0 ? void 0 : (_i$field10 = i.field) === null || _i$field10 === void 0 ? void 0 : _i$field10.type) === 'itemPropertySelector') {
-          var _i$field11;
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'itemPropertySelector' || (i === null || i === void 0 ? void 0 : (_i$field13 = i.field) === null || _i$field13 === void 0 ? void 0 : _i$field13.type) === 'itemPropertySelector') {
+          var _i$field14;
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6127,9 +6324,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
               width: '100%'
             },
             placeholder: "\u8BF7\u9009\u62E9"
-          }, i === null || i === void 0 ? void 0 : (_i$field11 = i.field) === null || _i$field11 === void 0 ? void 0 : _i$field11.props))));
+          }, i === null || i === void 0 ? void 0 : (_i$field14 = i.field) === null || _i$field14 === void 0 ? void 0 : _i$field14.props))));
         }
-        if ((i === null || i === void 0 ? void 0 : (_i$field12 = i.field) === null || _i$field12 === void 0 ? void 0 : _i$field12.type) === 'multipleQuerySearchSelect') {
+        if ((i === null || i === void 0 ? void 0 : (_i$field15 = i.field) === null || _i$field15 === void 0 ? void 0 : _i$field15.type) === 'multipleQuerySearchSelect') {
           return /*#__PURE__*/React$1.createElement(Col, {
             span: ColSpan,
             key: i.name
@@ -6158,7 +6355,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
           placeholder: "\u8BF7\u8F93\u5165",
           allowClear: true,
           maxLength: 100
-        }, i === null || i === void 0 ? void 0 : (_i$field13 = i.field) === null || _i$field13 === void 0 ? void 0 : _i$field13.props), {}, {
+        }, i === null || i === void 0 ? void 0 : (_i$field16 = i.field) === null || _i$field16 === void 0 ? void 0 : _i$field16.props), {}, {
           disabled: setDisabled(i.name)
         }))));
       });
@@ -6180,7 +6377,30 @@ 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 currentPageSize = Number((tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) || tableInitPageSize);
+    var needLimitRenderRows = type !== 'noPage' && currentPageSize >= tableRenderPageSize && (tableList === null || tableList === void 0 ? void 0 : tableList.length) > tableRenderPageSize;
+    var currentTableList = needLimitRenderRows ? tableList.slice(0, tableRenderPageSize) : tableList;
+    var currentDataSource = type == 'noPage' ? selectedTablePageRows : currentTableList;
+    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)");
@@ -6191,13 +6411,14 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }, /*#__PURE__*/React$1.createElement(Table, _objectSpread2(_objectSpread2({
       bordered: true,
       size: "middle",
-      rowSelection: rowSelection,
+      rowSelection: getRowSelection(currentDataSource, type),
       columns: tableShowColumns,
-      dataSource: tableList
+      dataSource: currentDataSource
     }, type == 'noPage' ? {
-      pagination: _objectSpread2(_objectSpread2({}, initPagination), {}, {
+      pagination: _objectSpread2(_objectSpread2({}, selectedTablePagination), {}, {
         showSizeChanger: false
       }),
+      onChange: handleSelectedTableChange,
       locale: {
         emptyText: renderEmptyText('暂无已选结果', mTB)
       }
@@ -6233,13 +6454,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   } // 务必填写 key
   ];
   var tabsItems2 = [{
-    label: "\u5DF2\u9009\uFF08".concat((selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0, "\uFF09"),
+    label: "\u5DF2\u9009\uFF08".concat((selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) || 0, "\uFF09"),
     key: 'selected',
-    children: renderShowTable((selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (s, index) {
-      return _objectSpread2(_objectSpread2({}, s), {}, {
-        keyIndex: index + 1
-      });
-    })) || [], 'noPage')
+    children: renderShowTable(selectedRows, 'noPage')
   }];
   var resetSelectDataSource = function resetSelectDataSource() {
     var isClear = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -6255,7 +6472,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     props === null || props === void 0 ? void 0 : (_props$onClear = props.onClear) === null || _props$onClear === void 0 ? void 0 : _props$onClear.call(props);
     // 清空下拉框 / 弹窗 选中数据
     formaData([], items);
-    onChangeSelectedKeys([], []);
+    clearSelectedRows();
     // 重置下拉框数据源
     resetSelectDataSource(true);
   };
@@ -6512,9 +6729,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }, /*#__PURE__*/React$1.createElement(Tabs, {
     items: tabsItems2,
     tabBarExtraContent: /*#__PURE__*/React$1.createElement("span", {
-      onClick: function onClick() {
-        return onChangeSelectedKeys([], []);
-      }
+      onClick: clearSelectedRows
     }, "\u6E05\u7A7A\u5DF2\u9009")
   })) : null)))));
 });
@@ -8330,6 +8545,8 @@ var AddSelect = function AddSelect(props) {
     });
   };
   var handleTableChange = function handleTableChange(pagination) {
+    // 设置分页tablePagination
+    setTablePagination(_objectSpread2(_objectSpread2({}, tablePagination), pagination));
     getData(_objectSpread2(_objectSpread2({}, tableFormParams), {}, {
       pageSize: pagination.pageSize,
       currentPage: pagination.current
@@ -8922,7 +9139,6 @@ var InputElement = function InputElement(_ref) {
       //   {
       //     body: {
       //       cell: ({index, record, ...props}) => {
-      //         debugger
       //         return <td {...props} style={selectIndex === record?.index ? {background: '#005CFF30'} : {} } />
       //       }
       //     }
@@ -10455,7 +10671,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzdlbm-in',
       type: 'select',
-      label: '大类',
+      label: '品类',
       field: {
         type: 'select',
         props: {
@@ -10474,7 +10690,7 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzzlbm-in',
       type: 'select',
-      label: '中类',
+      label: '大类',
       field: {
         type: 'select',
         props: {
@@ -10493,7 +10709,26 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       name: 'qp-zzxlbm-in',
       type: 'select',
-      label: '小类',
+      label: '中类',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-brandYearSeason-in',
+      type: 'select',
+      label: '产品季',
       field: {
         type: 'select',
         props: {
@@ -10538,6 +10773,9 @@ function commonFun(type, prefixUrl, parentProps) {
     }, {
       isOpen: true,
       queryKey: 'qp-zzxlbm-in'
+    }, {
+      isOpen: true,
+      queryKey: 'qp-brandYearSeason-in'
     }];
     var _queryHeaderParams2 = getQueryHeadersList({
       defaultQSHL: defaultQSHL,
@@ -10566,7 +10804,10 @@ function commonFun(type, prefixUrl, parentProps) {
     }, getQueryHeadersItem(_queryHeaderParams2, 'qp-zzzlbm-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/item/propertyValue"), {
       'qp-propertyCode-eq': 'PROP_SUBCATEORY',
       pageSize: 999
-    }, getQueryHeadersItem(_queryHeaderParams2, 'qp-zzxlbm-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams2, 'qp-zzxlbm-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/item/propertyValue"), {
+      'qp-propertyCode-eq': 'PROP_ITEM_PRODUCTSEASON',
+      pageSize: 999
+    }, getQueryHeadersItem(_queryHeaderParams2, 'qp-brandYearSeason-in'))]).then(function (x) {
       formatSource(x, 0, 3, tableSearchForm, ['id', 'name']);
       formatTreeDataSource(x, 1, 4, tableSearchForm);
       formatSource(x, 0, getFieldIndex(tableSearchForm, 'qp-brandId-in'), tableSearchForm, ['id', 'name']);
@@ -10577,6 +10818,7 @@ function commonFun(type, prefixUrl, parentProps) {
       formatSource(x, 5, getFieldIndex(tableSearchForm, 'qp-zzdlbm-in'), tableSearchForm, ['value', 'value']);
       formatSource(x, 6, getFieldIndex(tableSearchForm, 'qp-zzzlbm-in'), tableSearchForm, ['value', 'value']);
       formatSource(x, 7, getFieldIndex(tableSearchForm, 'qp-zzxlbm-in'), tableSearchForm, ['value', 'value']);
+      formatSource(x, 8, getFieldIndex(tableSearchForm, 'qp-brandYearSeason-in'), tableSearchForm, ['value', 'value']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择SKU',
@@ -10989,8 +11231,9 @@ function commonFun(type, prefixUrl, parentProps) {
       }]
     }, selectConfigProps);
     var _tableSearchForm = handleHiddenFields([{
-      name: 'qp-code-like',
-      label: 'SKC编码'
+      name: 'qp-code-in',
+      label: 'SKC编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-skcName-like',
       label: 'SKC名称'
@@ -11042,10 +11285,25 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
-    }, {
-      name: 'qp-classId-in',
+    },
+    // { name: 'qp-classId-in', type: 'select', label: '品类', field: {
+    //     type: 'select',
+    //     props: {
+    //       mode: 'multiple',
+    //       notFoundContent: '暂无数据',
+    //       allowClear: true,
+    //       showSearch: true,
+    //       showArrow: true,
+    //       maxTagCount: 1,
+    //       optionFilterProp: 'children',
+    //       filterOption: (input: string, option: { props: { children: string } }) =>
+    //         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+    //     },
+    //   } },
+    {
+      name: 'qp-brandId-in',
       type: 'select',
-      label: '品类',
+      label: '品牌',
       field: {
         type: 'select',
         props: {
@@ -11061,12 +11319,53 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
-    }, {
-      name: 'qp-brandId-in',
-      type: 'select',
-      label: '品牌',
+    },
+    // 商品属性 品类 == MAT_CATA (zzdlbm)
+    {
+      name: "qp-zzdlbm-in",
+      label: "品类",
       field: {
-        type: 'select',
+        type: "select",
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    },
+    // 商品属性 大类 == MID_CATA (zzzlbm)
+    {
+      name: "qp-zzzlbm-in",
+      label: "大类",
+      field: {
+        type: "select",
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    },
+    // 商品属性 中类 == PROP_SUBCATEORY (zzxlbm)
+    {
+      name: "qp-zzxlbm-in",
+      label: "中类",
+      field: {
+        type: "select",
         props: {
           mode: 'multiple',
           notFoundContent: '暂无数据',
@@ -11100,22 +11399,48 @@ function commonFun(type, prefixUrl, parentProps) {
         currentPage: 1
       },
       options: getQueryHeadersItem(_queryHeaderParams5, 'qp-categoryId-in')
+    },
+    // {
+    //   url: `${prefixUrl.formSelectFix}/class/withProperty`,
+    //   params: {
+    //     pageSize: 5000,
+    //     currentPage: 1,
+    //   },
+    //   options: getQueryHeadersItem(queryHeaderParams,'qp-classId-in')
+    // },
+    {
+      url: "".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"),
+      params: {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true
+      },
+      options: getQueryHeadersItem(_queryHeaderParams5, 'qp-brandId-in')
     }, {
-      url: "".concat(prefixUrl.formSelectFix, "/class/withProperty"),
+      url: "".concat(prefixUrl.formSelectFix, "/item/propertyValue"),
       params: {
         pageSize: 5000,
-        currentPage: 1
+        currentPage: 1,
+        'qp-propertyCode-eq': 'MAT_CATA'
       },
-      options: getQueryHeadersItem(_queryHeaderParams5, 'qp-classId-in')
+      options: getQueryHeadersItem(_queryHeaderParams5, 'qp-zzdlbm-in')
     }, {
-      url: "".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"),
+      url: "".concat(prefixUrl.formSelectFix, "/item/propertyValue"),
       params: {
         pageSize: 5000,
         currentPage: 1,
-        'ctl-withAuth': true
+        'qp-propertyCode-eq': 'MID_CATA'
       },
-      options: getQueryHeadersItem(_queryHeaderParams5, 'qp-brandId-in')
-    }], ['colorName', 'categoryId', 'classId', 'brandId'], hiddenFields);
+      options: getQueryHeadersItem(_queryHeaderParams5, 'qp-zzzlbm-in')
+    }, {
+      url: "".concat(prefixUrl.formSelectFix, "/item/propertyValue"),
+      params: {
+        pageSize: 5000,
+        currentPage: 1,
+        'qp-propertyCode-eq': 'PROP_SUBCATEORY'
+      },
+      options: getQueryHeadersItem(_queryHeaderParams5, 'qp-zzxlbm-in')
+    }], ['colorName', 'categoryId', 'brandId', 'zzdlbm', 'zzzlbm', 'zzxlbm'], hiddenFields);
     var fieldLoadSource = fieldsRequest.map(function (i) {
       return loadSelectSource$1(i.url, i.params, i.options);
     });
@@ -11132,8 +11457,11 @@ function commonFun(type, prefixUrl, parentProps) {
     Promise.all(fieldLoadSource).then(function (x) {
       formatSource(x, 0, getFieldIndex(_tableSearchForm, 'colorName'), _tableSearchForm, ['value', 'value']);
       formatTreeDataSource(x, 1, getFieldIndex(_tableSearchForm, 'categoryId'), _tableSearchForm);
-      formatSource(x, 2, getFieldIndex(_tableSearchForm, 'classId'), _tableSearchForm, ['id', 'name']);
-      formatSource(x, 3, getFieldIndex(_tableSearchForm, 'brandId'), _tableSearchForm, ['id', 'name']);
+      // formatSource(x,2, getFieldIndex(tableSearchForm, 'classId'), tableSearchForm,['id','name']);
+      formatSource(x, 2, getFieldIndex(_tableSearchForm, 'brandId'), _tableSearchForm, ['id', 'name']);
+      formatSource(x, 3, getFieldIndex(_tableSearchForm, 'zzdlbm'), _tableSearchForm, ['value', 'value']);
+      formatSource(x, 4, getFieldIndex(_tableSearchForm, 'zzzlbm'), _tableSearchForm, ['value', 'value']);
+      formatSource(x, 5, getFieldIndex(_tableSearchForm, 'zzxlbm'), _tableSearchForm, ['value', 'value']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择SKC',
@@ -11152,21 +11480,37 @@ function commonFun(type, prefixUrl, parentProps) {
         defaultSort: 2
       }, {
         title: '商品名称',
-        dataIndex: 'itemName'
+        dataIndex: 'itemName',
+        defaultSort: 3
       }, {
         title: '颜色',
         dataIndex: 'colorName',
-        defaultSort: 3
+        defaultSort: 4
       }, {
         title: '类目',
-        dataIndex: 'categoryText'
+        dataIndex: 'categoryText',
+        defaultSort: 5
+      },
+      // {
+      //   title: '品类',
+      //   dataIndex: 'className',
+      // },
+      {
+        title: '品牌',
+        dataIndex: 'brandName',
+        defaultSort: 6
       }, {
         title: '品类',
-        dataIndex: 'className'
+        dataIndex: 'zzdlbm',
+        defaultSort: 7
       }, {
-        title: '品牌',
-        dataIndex: 'brandName',
-        defaultSort: 4
+        title: '大类',
+        dataIndex: 'zzzlbm',
+        defaultSort: 8
+      }, {
+        title: '中类',
+        dataIndex: 'zzxlbm',
+        defaultSort: 9
       }], hiddenFields)
     }, modalTableBusProps);
   }
@@ -11337,19 +11681,33 @@ function commonFun(type, prefixUrl, parentProps) {
     });
     Promise.all([loadSelectSource$1("/channel-manage/channelInfo/tree", {
       'qp-status-eq': 10,
-      'qp-isMain-eq': 1,
+      // 'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
+      var _x$, _x$$data$, _x$$data$$channelInfo;
+      // 战区限制一级数据
+      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 +11825,7 @@ function commonFun(type, prefixUrl, parentProps) {
         },
         width: 100
       }, {
-        title: '所属销售渠道',
+        title: '战区',
         dataIndex: 'channelName',
         defaultSort: 4,
         width: 100
@@ -11548,11 +11906,11 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }, {
-      name: 'qp-channelCode-in',
-      type: 'treeSelect',
-      label: '销售渠道',
+      name: 'qp-operationWarehouseClassification-in',
+      type: 'select',
+      label: '分类',
       field: {
-        type: 'treeSelect',
+        type: 'select',
         props: {
           multiple: true,
           treeData: [],
@@ -11581,16 +11939,28 @@ function commonFun(type, prefixUrl, parentProps) {
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/channel-manage/channelInfo/tree", {
       'qp-status-eq': 10,
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/stock/ownerWarehouse/operationWarehouseClassificationList", {}, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).then(function (x) {
+      var _x$2, _x$2$data$, _x$2$data$$channelInf;
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
-      var channelDisabledJude = function channelDisabledJude(data) {
-        return data['parentCode'] === '0';
-      }; // 所属销售渠道 树节点不能点判断
-      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatSource(x, 2, 3, tableSearchForm, ['operationWarehouseClassification', 'operationWarehouseClassificationName']);
+      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;
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11704,11 +12074,13 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'customCode'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '客户名称'
+      name: 'name*multiInput',
+      label: '客户名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-code-like',
-      label: '客户编码'
+      name: 'code*multiInput',
+      label: '客户编码',
+      type: 'multipleQueryInput'
     }, {
       name: 'qp-conglomerateCode-in',
       type: 'select',
@@ -11856,24 +12228,26 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'customCode'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '客户名称'
+      name: 'name*multiInput',
+      label: '客户名称',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-code-like',
-      label: '客户编码'
+      name: 'code*multiInput',
+      label: '客户编码',
+      type: 'multipleQueryInput'
     }, {
-      name: 'qp-createOrgCode-eq',
+      name: 'qp-createOrgCode-in',
       type: 'select',
       label: '创建组织',
       field: {
         type: 'select',
         props: {
-          // mode: 'multiple',
+          mode: 'multiple',
           notFoundContent: '暂无数据',
           allowClear: true,
           showSearch: true,
           showArrow: true,
-          // maxTagCount: 1,
+          maxTagCount: 1,
           optionFilterProp: 'children',
           filterOption: function filterOption(input, option) {
             return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
@@ -12248,26 +12622,21 @@ function commonFun(type, prefixUrl, parentProps) {
       initialSource: shopFile2Type
     },
     // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+    // { name: 'qp-orgCode-in', type: 'select', label: '所属销售组织', field: {
+    //     type: 'select',
+    //     props: {
+    //       mode: 'multiple',
+    //       notFoundContent: '暂无数据',
+    //       allowClear: true,
+    //       showSearch: true,
+    //       showArrow: true,
+    //       maxTagCount: 1,
+    //       optionFilterProp: 'children',
+    //       filterOption: (input: string, option: { props: { children: string } }) =>
+    //         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
+    //     },
+    //   } },
     {
-      name: 'qp-orgCode-in',
-      type: 'select',
-      label: '所属销售组织',
-      field: {
-        type: 'select',
-        props: {
-          mode: 'multiple',
-          notFoundContent: '暂无数据',
-          allowClear: true,
-          showSearch: true,
-          showArrow: true,
-          maxTagCount: 1,
-          optionFilterProp: 'children',
-          filterOption: function filterOption(input, option) {
-            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
-          }
-        }
-      }
-    }, {
       name: 'qp-channelCode-in',
       type: 'treeSelect',
       label: '战区',
@@ -12351,24 +12720,99 @@ 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;
+            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,
@@ -12378,27 +12822,85 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
       'qp-status-eq': 10,
       'qp-isMain-eq': 1,
       'qp-type-in': '1,2'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
+    }, {
+      headers: _objectSpread2({}, extralHeaders)
+    }), loadSelectSource$1("/channel-manage/store/selectStoreOperationalInfo", {}, {
+      headers: _objectSpread2({}, extralHeaders)
+    })]).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({
+          code: item.code,
+          name: item.name
+        });
+      });
+      x[1].data = newData1;
       var channelDisabledJude = function channelDisabledJude(data) {
         return data['parentCode'] === '0';
       }; // 所属销售渠道 树节点不能点判断
       var areaDisabledJude = function areaDisabledJude(data) {
         return data['parent'] === '0';
       }; // 所属营销区域 树节点不能点判断
-      formatSource(x, 0, 3, tableSearchForm);
-      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']);
+      // formatSource(x,0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 4, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+      formatSource(x, 3, 6, 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);
+      });
+      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[7] = _objectSpread2(_objectSpread2({}, tableSearchForm[7]), {}, {
+        initialSource: m1
+      });
+      tableSearchForm[8] = _objectSpread2(_objectSpread2({}, tableSearchForm[8]), {}, {
+        initialSource: m2
+      });
+      tableSearchForm[9] = _objectSpread2(_objectSpread2({}, tableSearchForm[9]), {}, {
+        initialSource: m3
+      });
+      tableSearchForm[10] = _objectSpread2(_objectSpread2({}, tableSearchForm[10]), {}, {
+        initialSource: m4
+      });
+      tableSearchForm[11] = _objectSpread2(_objectSpread2({}, tableSearchForm[11]), {}, {
+        initialSource: m5
+      });
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -14224,7 +14726,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       'ctl-withAuth': true
     },
     resType: 'list',
-    resPosition: isNoUseItemBarcode ? 3 : 4,
+    resPosition: isNoUseItemBarcode ? 4 : 5,
     resKeyValue: ['id', 'name']
   }, {
     url: "/items/category/queryCategoryTree",
@@ -14233,7 +14735,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       currentPage: 1
     },
     resType: 'treeList',
-    resPosition: isNoUseItemBarcode ? 4 : 5
+    resPosition: isNoUseItemBarcode ? 5 : 6
   }];
   var mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
   var props = {
@@ -14270,7 +14772,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     tableSearchForm: mTpTableSearchForm,
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
-    promiseLoadList: mTpPromiseLoadList
+    promiseLoadList: mTpPromiseLoadList,
+    topTablePagination: (parProps === null || parProps === void 0 ? void 0 : parProps.pagination) || {}
   };
   return /*#__PURE__*/React$1.createElement("div", null, /*#__PURE__*/React$1.createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
     modalTableProps: modalTableProps
@@ -19281,6 +19784,13 @@ var css_248z$j = "#bs-sula-query-table .ant-table-title + .ant-table-container t
 styleInject(css_248z$j);
 
 var _excluded$i = ["onResize", "width"];
+/**
+ * 获取列或搜索字段的稳定标识，用于过滤已经从最新配置中删除的项目。
+ */
+var getConfigItemKey = function getConfigItemKey(item, type) {
+  var value = type === 'columns' ? (item === null || item === void 0 ? void 0 : item.key) || (item === null || item === void 0 ? void 0 : item.dataIndex) : item === null || item === void 0 ? void 0 : item.name;
+  return Array.isArray(value) ? JSON.stringify(value) : value || '';
+};
 var MemoQueryTable = /*#__PURE__*/React$1.memo(QueryTable);
 var Text$2 = Typography.Text;
 var ResizeableTitle$2 = function ResizeableTitle(props) {
@@ -19485,7 +19995,8 @@ var BsSulaQueryTable = (function (props) {
     setPagePath = _useState0[1];
   var _useLocation = useLocation(),
     pathname = _useLocation.pathname,
-    _useLocation$state = _useLocation.state;
+    _useLocation$state = _useLocation.state,
+    state = _useLocation$state === void 0 ? {} : _useLocation$state;
   var _useState1 = useState(false),
     _useState10 = _slicedToArray(_useState1, 2),
     isFullScreen = _useState10[0],
@@ -19494,6 +20005,12 @@ var BsSulaQueryTable = (function (props) {
   var value = props;
   var _props$fields = props.fields,
     fields = _props$fields === void 0 ? [] : _props$fields;
+  var columnsStructureKey = JSON.stringify((props.columns || []).map(function (item) {
+    return getConfigItemKey(item, 'columns');
+  }));
+  var fieldsStructureKey = JSON.stringify((props.fields || []).map(function (item) {
+    return getConfigItemKey(item, 'searchFields');
+  }));
   var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
     showColumn = _useState12[0],
@@ -19612,35 +20129,21 @@ var BsSulaQueryTable = (function (props) {
   //组件初始挂载
   useEffect(function () {
     // getTableHeight();
-    setInitialTableInfo();
-    setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
       watchWinResize();
     });
     setPagePath(pathname); // 做处理，记录当前页面渲染的初始pathname，用于进行判断当前列表页面数据是否需要重新渲染
   }, []);
   useEffect(function () {
-    if ((props === null || props === void 0 ? void 0 : props.columns) && (value === null || value === void 0 ? void 0 : value.columns)) {
-      var newKeys = props.columns.map(function (d) {
-        return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
-      });
-      var oldKeys = value.columns.map(function (d) {
-        return Array.isArray(d.key || d.dataIndex) ? JSON.stringify(d.key || d.dataIndex) : d.key || d.dataIndex;
-      });
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialTableInfo();
+    if (props === null || props === void 0 ? void 0 : props.columns) {
+      setInitialTableInfo();
     }
-  }, [props === null || props === void 0 ? void 0 : props.columns]);
+  }, [columnsStructureKey]);
   useEffect(function () {
-    if ((props === null || props === void 0 ? void 0 : props.fields) && (value === null || value === void 0 ? void 0 : value.fields)) {
-      var newKeys = props.fields.map(function (d) {
-        return Array.isArray(d.name) ? JSON.stringify(d.name) : d.name;
-      });
-      var oldKeys = value.fields.map(function (d) {
-        return Array.isArray(d.name) ? JSON.stringify(d.name) : d.name;
-      });
-      JSON.stringify(newKeys) !== JSON.stringify(oldKeys) && setInitialSearchFieldsInfo();
+    if (props === null || props === void 0 ? void 0 : props.fields) {
+      setInitialSearchFieldsInfo();
     }
-  }, [props === null || props === void 0 ? void 0 : props.fields]);
+  }, [fieldsStructureKey]);
   useEffect(function () {
     setInitialTableInfo();
   }, [props === null || props === void 0 ? void 0 : props.refreshColumns]);
@@ -19883,9 +20386,15 @@ var BsSulaQueryTable = (function (props) {
   };
   var getColumns = function getColumns() {
     // 优化一下 减少复杂度
-    var titleMap = toMapByKey(value.columns, 'title');
+    var currentColumns = value.columns || [];
+    var currentColumnKeys = new Set(currentColumns.map(function (item) {
+      return getConfigItemKey(item, 'columns');
+    }));
+    var titleMap = toMapByKey(currentColumns, 'title');
     // 加上排序
-    var cols = showColumn.map(function (i) {
+    var cols = showColumn.filter(function (i) {
+      return currentColumnKeys.has(getConfigItemKey(i, 'columns'));
+    }).map(function (i) {
       var _titleMap$renderToStr, _titleMap$renderToStr2;
       return _objectSpread2(_objectSpread2({}, i), {}, {
         isPermissionColumn: (_titleMap$renderToStr = titleMap[renderToString(i.title)]) === null || _titleMap$renderToStr === void 0 ? void 0 : _titleMap$renderToStr.isPermissionColumn,
@@ -19956,21 +20465,26 @@ var BsSulaQueryTable = (function (props) {
       }
     }) : false,
     columns: _toConsumableArray(getColumns()),
-    fields: _toConsumableArray(showSearchFields),
+    fields: _toConsumableArray(showSearchFields.filter(function (item) {
+      return new Set((value.fields || []).map(function (field) {
+        return getConfigItemKey(field, 'searchFields');
+      })).has(getConfigItemKey(item, 'searchFields'));
+    })),
     ref: props.forwardedRef || refs,
     isFullScreen: isFullScreen
   });
   useEffect(function () {
-    // if (!localStorage.getItem('isTabChange') || state?.updateCurrentPage) {
-    //   if (pagePath === pathname) {
-    //     // @ts-ignore
-    //     config.ref?.current?.tableRef?.current?.refreshTable();
-    //   }
-    // }
-    // setTimeout(() => {
-    //   // 处理页面刷新两面
-    //   localStorage.removeItem('isTabChange');
-    // }, 0);
+    if (!localStorage.getItem('isTabChange') || (state === null || state === void 0 ? void 0 : state.updateCurrentPage)) {
+      if (pagePath === pathname) {
+        var _config$ref, _config$ref$current, _config$ref$current$t, _config$ref$current$t2;
+        // @ts-ignore
+        (_config$ref = config.ref) === null || _config$ref === void 0 ? void 0 : (_config$ref$current = _config$ref.current) === null || _config$ref$current === void 0 ? void 0 : (_config$ref$current$t = _config$ref$current.tableRef) === null || _config$ref$current$t === void 0 ? void 0 : (_config$ref$current$t2 = _config$ref$current$t.current) === null || _config$ref$current$t2 === void 0 ? void 0 : _config$ref$current$t2.refreshTable();
+      }
+    }
+    setTimeout(function () {
+      // 处理页面刷新两面
+      localStorage.removeItem('isTabChange');
+    }, 0);
   }, [pathname]);
   var expandedRowKeys = props === null || props === void 0 ? void 0 : (_props$expandable = props.expandable) === null || _props$expandable === void 0 ? void 0 : _props$expandable.expandedRowKeys;
   //todo  summary属性已经被使用，为了兼容之前的，现在使用 summaryList
@@ -20023,9 +20537,16 @@ var BsSulaQueryTable = (function (props) {
           }
         }));
       }));
-    } else {
-      return undefined;
     }
+    // 判断summaryList 是否为reactNode
+    if (/*#__PURE__*/React$1.isValidElement(summaryList)) {
+      return summaryList;
+    }
+    // 判断summaryList 是否为函数
+    if (Object.prototype.toString.call(summaryList) === '[object Function]') {
+      return summaryList();
+    }
+    return undefined;
   };
   var columnsDom = /*#__PURE__*/React$1.createElement("span", {
     className: "ant-dropdown-link"
@@ -34395,11 +34916,24 @@ var RuleField = /*#__PURE__*/function (_Component) {
         itemDetail = _this$props2$itemDeta === void 0 ? {} : _this$props2$itemDeta,
         _this$props2$others = _this$props2.others,
         others = _this$props2$others === void 0 ? {} : _this$props2$others,
-        propertyCode = _this$props2.propertyCode;
+        propertyCode = _this$props2.propertyCode,
+        isQueryParams = _this$props2.isQueryParams;
       var thresholdList = _this.state.thresholdList;
       var styleCommon = {
         width: customerWidth || '180px'
       };
+      if (isQueryParams) {
+        return /*#__PURE__*/React$1.createElement(Input, {
+          defaultValue: values.join(','),
+          disabled: disabled,
+          style: styleCommon,
+          onBlur: function onBlur(e) {
+            values = e.target.value.split(',');
+            valueNames = e.target.value.split(',');
+            callback(values, valueNames);
+          }
+        });
+      }
       if (!selectOperation) return /*#__PURE__*/React$1.createElement(Input, {
         disabled: true,
         style: styleCommon
@@ -36052,7 +36586,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
             });
           }
         }
-        // 库存组织选择器
+        // 库存组织选择器（与结算组织 290 对齐：不加 treeCheckStrictly，避免 labelInValue 回传结构异常导致 params 为空）
         if (dataChoiceBusinessType == 280) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
             return /*#__PURE__*/React$1.createElement(React$1.Fragment, null, /*#__PURE__*/React$1.createElement(BusinessTreeSearchSelect$1, {
@@ -36062,7 +36596,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -36087,7 +36620,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -36114,7 +36646,6 @@ var RuleField = /*#__PURE__*/function (_Component) {
               labelInValue: true,
               value: dataInputBusinessType === 12 ? values : values[0],
               style: styleCommon,
-              treeCheckStrictly: true,
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values = value.map(function (i) {
@@ -36925,7 +37456,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
       fieldValues: [],
       thresholdQuery: {},
       thresholdList: [],
-      options: []
+      options: [],
+      isQueryParams: false
     };
     return _this;
   }
@@ -36945,13 +37477,15 @@ var RuleField = /*#__PURE__*/function (_Component) {
         initialThresholdQuery = _this$props3.initialThresholdQuery,
         queryIdentify = _this$props3.queryIdentify,
         propertyCode = _this$props3.propertyCode,
-        queryIdentifyType = _this$props3.queryIdentifyType;
+        queryIdentifyType = _this$props3.queryIdentifyType,
+        isQueryParams = _this$props3.isQueryParams;
       this.setState({
         selectOperation: selectOperation,
         thresholdQuery: initialThresholdQuery ? _objectSpread2({}, initialThresholdQuery) : {},
         dataTypeCode: dataTypeCode,
         dataChoiceBusinessType: dataChoiceBusinessType,
         dataInputBusinessType: dataInputBusinessType,
+        isQueryParams: isQueryParams,
         others: others,
         fieldValues: _toConsumableArray(values),
         options: options
@@ -38158,6 +38692,18 @@ function RenderCompItem(props) {
 }
 
 var RangePicker$2 = DatePicker.RangePicker;
+var FIXED_DATA_TYPES = {
+  10: '字符串',
+  20: '短整数',
+  21: '长整数',
+  22: '小数',
+  40: '数组',
+  41: '布尔值',
+  12: '富文本',
+  30: '日期',
+  31: '时间',
+  32: '日期时间'
+};
 var RuleObjectComponent = /*#__PURE__*/function (_Component) {
   function RuleObjectComponent(props) {
     var _this;
@@ -38201,6 +38747,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
               value: element.id,
               id: element.id,
               dataTypeCode: element.valueType,
+              entityValueType: element.entityValueType,
+              entityInputType: element.entityInputType,
               dataChoiceBusinessType: element.choiceType,
               dataInputBusinessType: element.inputType,
               info: element.info,
@@ -38222,6 +38770,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           metaObjectCode: _this.props.metaObjectCode || item.code
         }, item), {}, {
           dataTypeCode: item.valueType,
+          entityValueType: item.entityValueType,
+          entityInputType: item.entityInputType,
           dataChoiceBusinessType: item.choiceType,
           dataInputBusinessType: item.inputType
         }));
@@ -38255,6 +38805,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           value: element.id,
           id: element.id,
           dataTypeCode: element.valueType,
+          entityValueType: element.entityValueType,
+          entityInputType: element.entityInputType,
           dataChoiceBusinessType: element.choiceType,
           dataInputBusinessType: element.inputType,
           info: element.info,
@@ -38616,7 +39168,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       });
     };
     _this.renderRuleItem = function (itemDetail, parentDetail, floorIndex, classDataIndex, relateDatas) {
-      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2;
+      var _itemDetail$subExpres, _itemDetail$params, _itemDetail$params$, _itemDetail$params2, _itemDetail$reqCondit, _itemDetail$reqCondit2, _itemDetail$reqCondit3, _itemDetail$reqCondit4;
       var ruleTreeData = _this.state.ruleTreeData;
       var _this$props3 = _this.props,
         callBack = _this$props3.callBack,
@@ -38624,7 +39176,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         initialThresholdQuery = _this$props3$initialT === void 0 ? {} : _this$props3$initialT,
         disabled = _this$props3.disabled,
         systemVariableList = _this$props3.systemVariableList,
-        needShowInsertSQL = _this$props3.needShowInsertSQL;
+        needShowInsertSQL = _this$props3.needShowInsertSQL,
+        needShowReqCondition = _this$props3.needShowReqCondition;
       var thresholdQuery = _objectSpread2(_objectSpread2({}, initialThresholdQuery), relateDatas);
       var finalIndex = floorIndex + 1;
       var queryIdentify = '';
@@ -38715,6 +39268,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           itemDetail.elementId = nodeInfo.triggerNode.props.id;
           itemDetail.elementName = nodeInfo.triggerNode.props.title;
           itemDetail.dataTypeCode = nodeInfo.triggerNode.props.dataTypeCode;
+          itemDetail.entityValueType = nodeInfo.triggerNode.props.entityValueType;
+          itemDetail.entityInputType = nodeInfo.triggerNode.props.entityInputType;
           itemDetail.metaObjectCode = nodeInfo.triggerNode.props.metaObjectCode;
           itemDetail.isInsertParam = false;
           if (needShowInsertSQL) {
@@ -38884,12 +39439,13 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         }
       }, (itemDetail === null || itemDetail === void 0 ? void 0 : itemDetail.isInsertSQL) ? '取消插入SQL' : '插入SQL')), /*#__PURE__*/React$1.createElement("div", {
         style: {
-          display: itemDetail.operationType == 'logic' && !disabled ? 'block' : 'none'
+          display: itemDetail.operationType == 'logic' && (!disabled || itemDetail.reqConditionData && itemDetail.reqConditionData.reqParamName && ((_itemDetail$reqCondit = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit === void 0 ? void 0 : _itemDetail$reqCondit.length)) ? 'block' : 'none'
         }
       }, /*#__PURE__*/React$1.createElement("span", {
         style: {
           color: '#008fe0',
-          cursor: 'pointer'
+          cursor: 'pointer',
+          display: disabled ? 'none' : 'inline'
         },
         type: "link",
         onClick: function onClick() {
@@ -38901,7 +39457,119 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           fontSize: '14px',
           marginRight: '5px'
         }
-      }), "\u6DFB\u52A0\u6761\u4EF6"))));
+      }), "\u6DFB\u52A0\u6761\u4EF6"), needShowReqCondition && /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          marginLeft: 10,
+          display: disabled ? 'none' : 'inline'
+        }
+      }, /*#__PURE__*/React$1.createElement(Button, {
+        type: "link",
+        disabled: disabled && (!itemDetail.reqConditionData || !itemDetail.reqConditionData.reqParamName || !((_itemDetail$reqCondit2 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit2 === void 0 ? void 0 : _itemDetail$reqCondit2.length)),
+        style: {
+          padding: 0,
+          height: 'auto'
+        },
+        onClick: function onClick() {
+          return _this.handleReqConditionToggle(itemDetail);
+        }
+      }, itemDetail.isReqCondition ? '取消参数条件控制' : '参数条件控制')), (itemDetail.isReqCondition || disabled && itemDetail.reqConditionData && itemDetail.reqConditionData.reqParamName && ((_itemDetail$reqCondit3 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit3 === void 0 ? void 0 : _itemDetail$reqCondit3.length)) && itemDetail.reqConditionData && /*#__PURE__*/React$1.createElement("div", {
+        style: {
+          marginTop: 10,
+          display: disabled && (!itemDetail.reqConditionData.reqParamName || !((_itemDetail$reqCondit4 = itemDetail.reqConditionData.params) === null || _itemDetail$reqCondit4 === void 0 ? void 0 : _itemDetail$reqCondit4.length)) ? 'none' : 'flex',
+          alignItems: 'center',
+          background: '#f5f5f5',
+          padding: '10px',
+          borderRadius: '4px'
+        }
+      }, /*#__PURE__*/React$1.createElement(Select, {
+        disabled: disabled,
+        style: {
+          width: 150,
+          marginRight: 10
+        },
+        placeholder: "\u8BF7\u9009\u62E9",
+        value: String(itemDetail.reqConditionData.reqParamType || '10'),
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'reqParamType', val);
+        }
+      }, /*#__PURE__*/React$1.createElement(Select.Option, {
+        value: "10"
+      }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0"), /*#__PURE__*/React$1.createElement(Select.Option, {
+        value: "20"
+      }, "\u8BF7\u6C42\u5934\u53C2\u6570\u540D\u79F0"), /*#__PURE__*/React$1.createElement(Select.Option, {
+        value: "40"
+      }, "\u6E90\u8BF7\u6C42\u5730\u5740")), String(itemDetail.reqConditionData.reqParamType || '10') !== '40' && /*#__PURE__*/React$1.createElement(Input, {
+        disabled: disabled,
+        style: {
+          width: 150,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.reqParamName,
+        onChange: function onChange(e) {
+          return _this.handleReqDataChange(itemDetail, 'reqParamName', e.target.value);
+        }
+      }), /*#__PURE__*/React$1.createElement("span", {
+        style: {
+          marginRight: 8,
+          flexShrink: 0
+        }
+      }, "\u7C7B\u578B:"), /*#__PURE__*/React$1.createElement(Select, {
+        disabled: disabled,
+        style: {
+          width: 120,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.dataTypeCode,
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'dataTypeCode', val);
+        }
+      }, Object.keys(FIXED_DATA_TYPES).map(function (code) {
+        return /*#__PURE__*/React$1.createElement(Select.Option, {
+          key: code,
+          value: code
+        }, FIXED_DATA_TYPES[code]);
+      })), /*#__PURE__*/React$1.createElement(Select, {
+        disabled: disabled,
+        style: {
+          width: 120,
+          marginRight: 10
+        },
+        value: itemDetail.reqConditionData.operationCode,
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'operationCode', val);
+        }
+      }, [{
+        'code': '1',
+        'name': '在集合'
+      }, {
+        'code': '2',
+        'name': '不等于'
+      }, {
+        code: '3',
+        name: '小于'
+      }, {
+        code: '4',
+        name: '大于'
+      }, {
+        code: '5',
+        name: '等于'
+      }].map(function (op) {
+        return /*#__PURE__*/React$1.createElement(Select.Option, {
+          key: op.code,
+          value: op.code
+        }, op.name);
+      })), /*#__PURE__*/React$1.createElement(RuleField, {
+        customerWidth: '180px',
+        isQueryParams: true,
+        selectOperation: itemDetail.reqConditionData.operationCode,
+        dataTypeCode: itemDetail.reqConditionData.dataTypeCode,
+        values: itemDetail.reqConditionData.params || [],
+        valueNames: itemDetail.reqConditionData.paramNames || [],
+        callback: function callback(newValues, newValueNames) {
+          return _this.handleReqDataChange(itemDetail, 'params', newValues, newValueNames);
+        },
+        disabled: disabled
+      })))));
     };
     _this.handleEditExtraInfoResponse = function (code, val, parentDetail, classDataIndex, key) {
       var ruleClassData = _this.state.ruleClassData;
@@ -39217,6 +39885,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
       delete itemDetail.params;
       delete itemDetail.paramNames;
       delete itemDetail.dataTypeCode;
+      delete itemDetail.entityValueType;
+      delete itemDetail.entityInputType;
       delete itemDetail.elementId;
       delete itemDetail.elementName;
       delete itemDetail.metaObjectCode;
@@ -39267,6 +39937,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             parentDetail.elementId = parentDetail.subExpression[0].elementId;
             parentDetail.elementName = parentDetail.subExpression[0].elementName;
             parentDetail.dataTypeCode = parentDetail.subExpression[0].dataTypeCode;
+            parentDetail.entityValueType = parentDetail.subExpression[0].entityValueType;
+            parentDetail.entityInputType = parentDetail.subExpression[0].entityInputType;
             delete parentDetail.subExpression;
           }
         }
@@ -39340,6 +40012,57 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         callBack(ruleClassData);
       });
     };
+    _this.handleReqConditionToggle = function (itemDetail) {
+      var ruleClassData = _this.state.ruleClassData;
+      var callBack = _this.props.callBack;
+      itemDetail.isReqCondition = !itemDetail.isReqCondition;
+      if (itemDetail.isReqCondition && !itemDetail.reqConditionData) {
+        itemDetail.reqConditionData = {
+          operationType: 'relation',
+          dataTypeCode: '10',
+          entityInputType: '10',
+          entityValueType: '10',
+          operationCode: '',
+          reqParamName: '',
+          params: [],
+          paramNames: []
+        };
+      }
+      _this.setState({
+        ruleClassData: ruleClassData
+      }, function () {
+        callBack(ruleClassData);
+      });
+    };
+    _this.handleReqDataChange = function (itemDetail, field, value, valueNames) {
+      var ruleClassData = _this.state.ruleClassData;
+      var callBack = _this.props.callBack;
+      if (!itemDetail.reqConditionData) return;
+      if (field === 'dataTypeCode') {
+        itemDetail.reqConditionData.dataTypeCode = value;
+        itemDetail.reqConditionData.entityInputType = value;
+        itemDetail.reqConditionData.entityValueType = value;
+        itemDetail.reqConditionData.operationCode = '';
+        itemDetail.reqConditionData.params = [];
+        itemDetail.reqConditionData.paramNames = [];
+      } else if (field === 'operationCode') {
+        itemDetail.reqConditionData.operationCode = value;
+      } else if (field === 'reqParamName') {
+        itemDetail.reqConditionData.reqParamName = value;
+      } else if (field === 'params') {
+        itemDetail.reqConditionData.params = value;
+        if (valueNames) {
+          itemDetail.reqConditionData.paramNames = valueNames;
+        }
+      } else if (field === 'reqParamType') {
+        itemDetail.reqConditionData.reqParamType = value;
+      }
+      _this.setState({
+        ruleClassData: ruleClassData
+      }, function () {
+        callBack(ruleClassData);
+      });
+    };
     _this.state = {
       editNameIndex: 0,
       isEdit: false,