@bit-sun/business-component 4.2.1-alpha.22-aiwei → 4.2.1-alpha.24-aiwei

package/dist/index.esm.js

@@ -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, {
@@ -5347,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;
@@ -5381,7 +5391,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
     current: 1,
-    pageSizeOptions: [10, 20, 50, 100, 500, 1000]
+    pageSizeOptions: TABLE_PAGE_SIZE_OPTIONS.map(String)
   });
   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;
@@ -5436,6 +5446,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 = {};
@@ -5464,58 +5478,58 @@ 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];
+    selectedRows = _useState32[0],
+    setSelectedRows = _useState32[1];
   var _useState33 = useState(false),
     _useState34 = _slicedToArray(_useState33, 2),
-    indeterminate = _useState34[0],
-    setIndeterminate = _useState34[1];
-  var _useState35 = useState({}),
+    checkedAll = _useState34[0],
+    setCheckedAll = _useState34[1];
+  var _useState35 = useState(false),
     _useState36 = _slicedToArray(_useState35, 2),
-    tableFormParams = _useState36[0],
-    setTableFormParams = _useState36[1];
-  var _useState37 = useState(false),
+    indeterminate = _useState36[0],
+    setIndeterminate = _useState36[1];
+  var _useState37 = useState({}),
     _useState38 = _slicedToArray(_useState37, 2),
-    tooltipVisible = _useState38[0],
-    setTooltipVisible = _useState38[1];
-  var _useState39 = useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
+    tableFormParams = _useState38[0],
+    setTableFormParams = _useState38[1];
+  var _useState39 = useState(false),
     _useState40 = _slicedToArray(_useState39, 2),
-    tableShowColumns = _useState40[0],
-    setTabletShowColumns = _useState40[1]; // 默认展示表头-modalTableProps?.tableColumns
-  var _useState41 = useState(false),
+    tooltipVisible = _useState40[0],
+    setTooltipVisible = _useState40[1];
+  var _useState41 = useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
     _useState42 = _slicedToArray(_useState41, 2),
-    confirmLoading = _useState42[0],
-    setConfirmLoading = _useState42[1];
+    tableShowColumns = _useState42[0],
+    setTabletShowColumns = _useState42[1]; // 默认展示表头-modalTableProps?.tableColumns
   var _useState43 = useState(false),
     _useState44 = _slicedToArray(_useState43, 2),
-    modalSearched = _useState44[0],
-    setModalSearched = _useState44[1];
+    confirmLoading = _useState44[0],
+    setConfirmLoading = _useState44[1];
+  var _useState45 = useState(false),
+    _useState46 = _slicedToArray(_useState45, 2),
+    modalSearched = _useState46[0],
+    setModalSearched = _useState46[1];
   var setSelectDataSource = function setSelectDataSource(list, total) {
     setItems(list);
     setItemsTotal(total);
@@ -5983,7 +5997,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   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;
@@ -6003,13 +6016,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
@@ -6026,7 +6039,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,
@@ -6034,8 +6103,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
@@ -6048,12 +6117,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
@@ -6067,12 +6136,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
@@ -6085,11 +6154,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
@@ -6101,7 +6170,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
@@ -6115,7 +6184,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
@@ -6125,8 +6194,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
@@ -6139,9 +6208,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
@@ -6170,7 +6239,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)
         }))));
       });
@@ -8361,6 +8430,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
@@ -8953,7 +9024,6 @@ var InputElement = function InputElement(_ref) {
       //   {
       //     body: {
       //       cell: ({index, record, ...props}) => {
-      //         debugger
       //         return <td {...props} style={selectIndex === record?.index ? {background: '#005CFF30'} : {} } />
       //       }
       //     }
@@ -11020,8 +11090,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名称'
@@ -11073,10 +11144,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: {
@@ -11092,12 +11178,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: '暂无数据',
@@ -11131,22 +11258,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);
     });
@@ -11163,8 +11316,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',
@@ -11183,21 +11339,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);
   }
@@ -11378,7 +11550,6 @@ function commonFun(type, prefixUrl, parentProps) {
       headers: _objectSpread2({}, extralHeaders)
     })]).then(function (x) {
       var _x$, _x$$data$, _x$$data$$channelInfo;
-      debugger;
       // 战区限制一级数据
       var newData1 = [];
       (_x$ = x[0]) === null || _x$ === void 0 ? void 0 : (_x$$data$ = _x$.data[0]) === null || _x$$data$ === void 0 ? void 0 : (_x$$data$$channelInfo = _x$$data$.channelInfoSon) === null || _x$$data$$channelInfo === void 0 ? void 0 : _x$$data$$channelInfo.forEach(function (item) {
@@ -12417,7 +12588,6 @@ function commonFun(type, prefixUrl, parentProps) {
           optionFilterProp: 'children',
           filterOption: function filterOption(input, option) {
             var _option$value;
-            debugger;
             return ((_option$value = option === null || option === void 0 ? void 0 : option.value) !== null && _option$value !== void 0 ? _option$value : '').toLowerCase().includes(input.toLowerCase());
           }
         }
@@ -12565,7 +12735,6 @@ function commonFun(type, prefixUrl, parentProps) {
       var m3 = (_opList4 = opList) === null || _opList4 === void 0 ? void 0 : _opList4.filter(function (r) {
         return (r === null || r === void 0 ? void 0 : r.field) === 'distribution_item' && trim(r === null || r === void 0 ? void 0 : r.value);
       });
-      debugger;
       var m4 = (_opList5 = opList) === null || _opList5 === void 0 ? void 0 : _opList5.filter(function (r) {
         return (r === null || r === void 0 ? void 0 : r.field) === 'head_item' && trim(r === null || r === void 0 ? void 0 : r.value);
       });
@@ -14412,7 +14581,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",
@@ -14421,7 +14590,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 = {
@@ -14458,7 +14627,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
@@ -20213,9 +20383,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"