@bit-sun/business-component 4.2.1-alpha.25-aiwei → 4.2.1-alpha.26-aiwei

package/dist/index.esm.js

@@ -6,7 +6,7 @@ import _, { omit, uniqBy, escapeRegExp, isNil, trim, isBoolean, debounce, cloneD
 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, {
@@ -5385,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: 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() {
@@ -5499,34 +5511,48 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState32 = _slicedToArray(_useState31, 2),
     selectedRows = _useState32[0],
     setSelectedRows = _useState32[1];
-  var _useState33 = useState(false),
+  var _useState33 = useState(selectedInitPagination),
     _useState34 = _slicedToArray(_useState33, 2),
-    checkedAll = _useState34[0],
-    setCheckedAll = _useState34[1];
-  var _useState35 = useState(false),
+    selectedTablePagination = _useState34[0],
+    setSelectedTablePagination = _useState34[1];
+  var _useState35 = useState({}),
     _useState36 = _slicedToArray(_useState35, 2),
-    indeterminate = _useState36[0],
-    setIndeterminate = _useState36[1];
-  var _useState37 = useState({}),
+    tableFormParams = _useState36[0],
+    setTableFormParams = _useState36[1];
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    tableFormParams = _useState38[0],
-    setTableFormParams = _useState38[1];
-  var _useState39 = useState(false),
+    tooltipVisible = _useState38[0],
+    setTooltipVisible = _useState38[1];
+  var _useState39 = useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
     _useState40 = _slicedToArray(_useState39, 2),
-    tooltipVisible = _useState40[0],
-    setTooltipVisible = _useState40[1];
-  var _useState41 = useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
+    tableShowColumns = _useState40[0],
+    setTabletShowColumns = _useState40[1]; // 默认展示表头-modalTableProps?.tableColumns
+  var _useState41 = useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    tableShowColumns = _useState42[0],
-    setTabletShowColumns = _useState42[1]; // 默认展示表头-modalTableProps?.tableColumns
+    confirmLoading = _useState42[0],
+    setConfirmLoading = _useState42[1];
   var _useState43 = useState(false),
     _useState44 = _slicedToArray(_useState43, 2),
-    confirmLoading = _useState44[0],
-    setConfirmLoading = _useState44[1];
-  var _useState45 = useState(false),
-    _useState46 = _slicedToArray(_useState45, 2),
-    modalSearched = _useState46[0],
-    setModalSearched = _useState46[1];
+    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);
@@ -5534,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() {
@@ -5726,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();
@@ -5783,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)]);
@@ -5872,8 +5922,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setTablePagination(tableInitPagination);
     setSelectedRowKeys([]);
     setSelectedRows([]);
-    setCheckedAll(false);
-    setIndeterminate(false);
   };
   var handleCancel = function handleCancel() {
     clearModalTable();
@@ -5932,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)) {
@@ -5944,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)) {
@@ -5978,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);
     }
@@ -5987,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;
@@ -6260,6 +6378,10 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var renderShowTable = function renderShowTable(tableList, type) {
     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);
@@ -6289,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)
       }
@@ -6331,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;
@@ -6353,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);
   };
@@ -6610,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)))));
 });
@@ -8428,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
@@ -9020,7 +9139,6 @@ var InputElement = function InputElement(_ref) {
       //   {
       //     body: {
       //       cell: ({index, record, ...props}) => {
-      //         debugger
       //         return <td {...props} style={selectIndex === record?.index ? {background: '#005CFF30'} : {} } />
       //       }
       //     }
@@ -11087,8 +11205,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名称'
@@ -11140,10 +11259,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: {
@@ -11159,12 +11293,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: '暂无数据',
@@ -11198,22 +11373,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);
     });
@@ -11230,8 +11431,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',
@@ -11250,21 +11454,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);
   }
@@ -11445,7 +11665,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) {
@@ -12484,7 +12703,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());
           }
         }
@@ -12632,7 +12850,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);
       });
@@ -14479,7 +14696,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",
@@ -14488,7 +14705,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 = {
@@ -14525,7 +14742,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
@@ -20280,9 +20498,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"