@bit-sun/business-component 4.2.1-alpha.23-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, {
@@ -5994,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;
@@ -8428,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
@@ -9020,7 +9024,6 @@ var InputElement = function InputElement(_ref) {
       //   {
       //     body: {
       //       cell: ({index, record, ...props}) => {
-      //         debugger
       //         return <td {...props} style={selectIndex === record?.index ? {background: '#005CFF30'} : {} } />
       //       }
       //     }
@@ -11087,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名称'
@@ -11140,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: {
@@ -11159,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: '暂无数据',
@@ -11198,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);
     });
@@ -11230,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',
@@ -11250,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);
   }
@@ -11445,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) {
@@ -12484,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());
           }
         }
@@ -12632,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);
       });
@@ -14479,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",
@@ -14488,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 = {
@@ -14525,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
@@ -20280,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"

package/dist/index.js

@@ -2584,11 +2584,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: {
@@ -2756,14 +2754,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;
       });
@@ -2904,7 +2909,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
                 errorListCheck: false,
                 resultData: res
               });
-              console.log(setExportData);
               setExportData([123123]);
             }).catch(function (err) {});
           case 3:
@@ -3200,7 +3204,6 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         left: '0px',
         top: '0px'
       };
-      console.log('itemsTemp', itemsTemp);
       return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
         className: "sheet_table_top"
       }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement("span", null, "\u6392\u5E8F\u5217"), /*#__PURE__*/React__default['default'].createElement(antd.Dropdown, {
@@ -6017,7 +6020,6 @@ var SearchSelect = /*#__PURE__*/React$1.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;
@@ -8451,6 +8453,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
@@ -9043,7 +9047,6 @@ var InputElement = function InputElement(_ref) {
       //   {
       //     body: {
       //       cell: ({index, record, ...props}) => {
-      //         debugger
       //         return <td {...props} style={selectIndex === record?.index ? {background: '#005CFF30'} : {} } />
       //       }
       //     }
@@ -11110,8 +11113,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名称'
@@ -11163,10 +11167,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: {
@@ -11182,12 +11201,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: '暂无数据',
@@ -11221,22 +11281,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);
     });
@@ -11253,8 +11339,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',
@@ -11273,21 +11362,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);
   }
@@ -11468,7 +11573,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) {
@@ -12507,7 +12611,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());
           }
         }
@@ -12655,7 +12758,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);
       });
@@ -14502,7 +14604,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",
@@ -14511,7 +14613,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 = {
@@ -14548,7 +14650,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__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
     modalTableProps: modalTableProps
@@ -20303,9 +20406,16 @@ var BsSulaQueryTable = (function (props) {
           }
         }));
       }));
-    } else {
-      return undefined;
     }
+    // 判断summaryList 是否为reactNode
+    if (/*#__PURE__*/React__default['default'].isValidElement(summaryList)) {
+      return summaryList;
+    }
+    // 判断summaryList 是否为函数
+    if (Object.prototype.toString.call(summaryList) === '[object Function]') {
+      return summaryList();
+    }
+    return undefined;
   };
   var columnsDom = /*#__PURE__*/React__default['default'].createElement("span", {
     className: "ant-dropdown-link"

package/package.json

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

package/src/components/Business/AddSelectBusiness/index.tsx

@@ -433,7 +433,7 @@ export const AddSkuSelect = (parProps: any) => {
         'ctl-withAuth': true
       },
       resType: 'list',
-      resPosition: isNoUseItemBarcode ? 3 : 4,
+      resPosition: isNoUseItemBarcode ? 4 : 5,
       resKeyValue: ['id','name']
     },
     {
@@ -443,7 +443,7 @@ export const AddSkuSelect = (parProps: any) => {
         currentPage: 1,
       },
       resType: 'treeList',
-      resPosition: isNoUseItemBarcode ? 4 : 5
+      resPosition: isNoUseItemBarcode ? 5 : 6
     },
   ]
   const mTpPromiseLoadList = handleFormSearchSourceLoad(initialPromiseLoadList, parProps);
@@ -486,6 +486,7 @@ export const AddSkuSelect = (parProps: any) => {
     tableColumns: mTpTableColumn,
     selectColumn: mTpSelectColumn,
     promiseLoadList: mTpPromiseLoadList,
+    topTablePagination: parProps?.pagination || {},
   }
 
   return (

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -923,9 +923,16 @@ export default (props: any) => {
             ))}
         </Table.Summary>
       );
-    } else {
-      return undefined;
     }
+     // 判断summaryList 是否为reactNode
+    if(React.isValidElement(summaryList)){
+      return summaryList;
+    }
+    // 判断summaryList 是否为函数
+    if(Object.prototype.toString.call(summaryList) === '[object Function]'){
+      return summaryList();
+    }
+    return undefined;
   };
 
   const columnsDom = <span className="ant-dropdown-link">
@@ -942,7 +949,7 @@ export default (props: any) => {
     bsTableCode={bsTableCode}
   />
 
-  const memoConfig = useMemo(
+  const memoConfig = useMemo(    
     () => ({
       ...config,
       summary: props.summary,

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

@@ -1007,7 +1007,7 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       ...selectConfigProps,
     }
     const tableSearchForm = handleHiddenFields([
-      { name: 'qp-code-like', label: 'SKC编码' },
+      { name: 'qp-code-in', label: 'SKC编码', type: 'multipleQueryInput' },
       { name: 'qp-skcName-like', label: 'SKC名称' },
       { name: 'qp-itemName-like', label: '商品名称' },
       { name: 'qp-colorName-in', type: 'select', label: '颜色', field: {
@@ -1042,8 +1042,40 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             dropdownStyle: { maxHeight: 400, maxWidth: 100, overflow: 'auto' }
           },
         } },
-      { name: 'qp-classId-in', type: 'select', label: '品类', field: {
-          type: 'select',
+      // { 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: '品牌', 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,
+        },
+      } },
+      // 商品属性 品类 == MAT_CATA (zzdlbm)
+      {
+        name: "qp-zzdlbm-in",
+        label: "品类",
+        field: {
+          type: "select",
           props: {
             mode: 'multiple',
             notFoundContent: '暂无数据',
@@ -1055,9 +1087,14 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             filterOption: (input: string, option: { props: { children: string } }) =>
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
-        } },
-      { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
-          type: 'select',
+        },
+      },
+      // 商品属性 大类 == MID_CATA (zzzlbm)
+      {
+        name: "qp-zzzlbm-in",
+        label: "大类",
+        field: {
+          type: "select",
           props: {
             mode: 'multiple',
             notFoundContent: '暂无数据',
@@ -1069,7 +1106,28 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
             filterOption: (input: string, option: { props: { children: string } }) =>
               option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0,
           },
-        } },
+        },
+      },
+      // 商品属性 中类 == PROP_SUBCATEORY (zzxlbm)
+      {
+        name: "qp-zzxlbm-in",
+        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,
+          },
+        },
+      },
+
     ], hiddenFields);
     const queryHeaderParams  = getQueryHeadersList({ querySelectHeadersList, extralHeaders});
     const fieldsRequest = handleHiddenFieldsRequest(
@@ -1091,25 +1149,52 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           },
           options: getQueryHeadersItem(queryHeaderParams,'qp-categoryId-in')
         },
+        // {
+        //   url: `${prefixUrl.formSelectFix}/class/withProperty`,
+        //   params: {
+        //     pageSize: 5000,
+        //     currentPage: 1,
+        //   },
+        //   options: getQueryHeadersItem(queryHeaderParams,'qp-classId-in')
+        // },
         {
-          url: `${prefixUrl.formSelectFix}/class/withProperty`,
+          url: `${prefixUrl.formSelectFix}/brand/queryBrandList`,
           params: {
             pageSize: 5000,
             currentPage: 1,
+            'ctl-withAuth': true
           },
-          options: getQueryHeadersItem(queryHeaderParams,'qp-classId-in')
+          options: getQueryHeadersItem(queryHeaderParams,'qp-brandId-in')
         },
         {
-          url: `${prefixUrl.formSelectFix}/brand/queryBrandList`,
+          url: `${prefixUrl.formSelectFix}/item/propertyValue`,
           params: {
             pageSize: 5000,
             currentPage: 1,
-            'ctl-withAuth': true
+            'qp-propertyCode-eq': 'MAT_CATA',
           },
-          options: getQueryHeadersItem(queryHeaderParams,'qp-brandId-in')
-        }
+          options: getQueryHeadersItem(queryHeaderParams,'qp-zzdlbm-in')
+        },
+        {
+          url: `${prefixUrl.formSelectFix}/item/propertyValue`,
+          params: {
+            pageSize: 5000,
+            currentPage: 1,
+            'qp-propertyCode-eq': 'MID_CATA',
+          },
+          options: getQueryHeadersItem(queryHeaderParams,'qp-zzzlbm-in')
+        },
+        {
+          url: `${prefixUrl.formSelectFix}/item/propertyValue`,
+          params: {
+            pageSize: 5000,
+            currentPage: 1,
+            'qp-propertyCode-eq': 'PROP_SUBCATEORY',
+          },
+          options: getQueryHeadersItem(queryHeaderParams,'qp-zzxlbm-in')
+        },
       ],
-      ['colorName', 'categoryId', 'classId', 'brandId'],
+      ['colorName', 'categoryId', 'brandId', 'zzdlbm', 'zzzlbm', 'zzxlbm'],
       hiddenFields,
     );
     const fieldLoadSource = fieldsRequest.map((i: any) => loadSelectSource(i.url, i.params, i.options));
@@ -1128,8 +1213,11 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
     Promise.all(fieldLoadSource).then((x: any)=>{
       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 = {
       modalTableTitle: '选择SKC',
@@ -1153,24 +1241,41 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         {
           title: '商品名称',
           dataIndex: 'itemName',
+          defaultSort: 3,
         },
         {
           title: '颜色',
           dataIndex: 'colorName',
-          defaultSort: 3,
+          defaultSort: 4,
         },
         {
           title: '类目',
           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
@@ -1359,7 +1464,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
         }
       }),
     ]).then((x: any)=>{
-      debugger
       // 战区限制一级数据
       const newData1 = [];
       x[0]?.data[0]?.channelInfoSon?.forEach((item: any) => {
@@ -2326,7 +2430,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
           optionFilterProp: 'children',
           filterOption: (input: string, option: { props: { children: string } }) =>
              {
-              debugger
               return (option?.value ?? '').toLowerCase().includes(input.toLowerCase())
              }
         },
@@ -2448,7 +2551,6 @@ export function commonFun (type?: string, prefixUrl: any, parentProps?:any) {
       const m1 = opList?.filter((r: any) => r?.field === 'manage_supervisor' && trim(r?.value));
       const m2 = opList?.filter((r: any) => r?.field === 'direct_supervisor' && trim(r?.value));
       const m3 = opList?.filter((r: any) => r?.field === 'distribution_item' && trim(r?.value));
-      debugger
       const m4 = opList?.filter((r: any) => r?.field === 'head_item' && trim(r?.value));
       const m5 = opList?.filter((r: any) => r?.field === 'store_channel_name' && trim(r?.value));
       tableSearchForm[7] = { ...tableSearchForm[7], initialSource: m1 };

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

@@ -669,7 +669,7 @@ const AddSelect = (props: any) => {
         }
         // 数据源 不可以有重复key
         source = Array.isArray(source) ? _.uniqBy(source, 'value') : [];
-     
+
         setTableData(source)
         setTablePagination({ ...tablePagination, total: Number(res?.total || res?.totalCount || source.length), pageSize: Number(res?.size || res?.pageSize || (params?.pageSize || pageSize)), current: Number(res?.page || res?.currentPage || (params?.currentPage || currentPage)) })
       })
@@ -807,6 +807,8 @@ const AddSelect = (props: any) => {
   }
 
   const handleTableChange = (pagination) => {
+    // 设置分页tablePagination
+    setTablePagination({ ...tablePagination, ...pagination })
     getData({ ...tableFormParams, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
   }
 

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

@@ -126,7 +126,6 @@ const InputElement = ({
         //   {
         //     body: {
         //       cell: ({index, record, ...props}) => {
-        //         debugger
         //         return <td {...props} style={selectIndex === record?.index ? {background: '#005CFF30'} : {} } />
         //       }
         //     }

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

@@ -242,11 +242,9 @@ class DataValidation extends React.Component {
               cell.v = cell.m
             }
           }
-          // console.log(postion);
         },
         cellAllRenderBefore: function (data, sheetFile, ctx) {
           sheetFile.config.borderInfo = [];
-          // console.info(data,sheetFile,ctx)
         },
       },
       showtoolbarConfig: {
@@ -411,7 +409,8 @@ class DataValidation extends React.Component {
   };
 
   getData = () => {
-    console.time();
+    // 是否使用字符串值 默认为false
+    const useStringValue = this.props.useStringValue || false;
     let sheetData = luckysheet.getSheetData();
     let data = JSON.parse(JSON.stringify(sheetData))
       .filter((item) => item[0])
@@ -419,7 +418,13 @@ class DataValidation extends React.Component {
         let obj = {};
 
         item.slice(0, itemsTemp.length).map((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;
@@ -570,7 +575,6 @@ customSort = (a, b) => {
           resultData: res,
         });
 
-        console.log(setExportData);
         setExportData([123123]);
       })
       .catch((err:any) => { });
@@ -820,7 +824,6 @@ customSort = (a, b) => {
       top: '0px',
     };
 
-    console.log('itemsTemp', itemsTemp)
     return (
       <>
         <div className="sheet_table_top">

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

@@ -594,7 +594,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const formItem = (list) => {
     if (isModalVisible && list?.length) {
-      debugger
       const setDisabled = (name: any) => {
         if (fixedparamsDisabled && fixedparameter?.length && fixedparameter.find((item: any) => item === name)) {
           return true