@bit-sun/business-component 1.1.28 → 1.1.29

package/dist/index.esm.js

@@ -294,10 +294,9 @@ function ownKeys$1(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-    if (enumerableOnly) symbols = symbols.filter(function (sym) {
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
       return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    });
-    keys.push.apply(keys, symbols);
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -305,19 +304,12 @@ function ownKeys$1(object, enumerableOnly) {
 
 function _objectSpread2$1(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys$1(Object(source), true).forEach(function (key) {
-        _defineProperty$1(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys$1(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) {
+      _defineProperty$1(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
   }
 
   return target;
@@ -328,14 +320,17 @@ function _arrayWithHoles$1(arr) {
 }
 
 function _iterableToArrayLimit$1(arr, i) {
-  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+  var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+
+  if (_i == null) return;
   var _arr = [];
   var _n = true;
   var _d = false;
-  var _e = undefined;
+
+  var _s, _e;
 
   try {
-    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+    for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
       _arr.push(_s.value);
 
       if (i && _arr.length === i) break;
@@ -418,17 +413,11 @@ function _objectWithoutProperties$1(source, excluded) {
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function _typeof(obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function _typeof(obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
 }
 
 /**
@@ -2432,7 +2421,8 @@ var SearchSelect = function SearchSelect(props) {
       mappingTextField = _ref$mappingTextField === void 0 ? 'name' : _ref$mappingTextField,
       mappingTextShowKeyField = _ref.mappingTextShowKeyField,
       _ref$mappingValueFiel = _ref.mappingValueField,
-      mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel;
+      mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel,
+      mappingTextShowTextField = _ref.mappingTextShowTextField;
 
   var resultSourceKey = sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || 'supplierCode';
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
@@ -2681,6 +2671,8 @@ var SearchSelect = function SearchSelect(props) {
             delete params[key];
           } else if (Array.isArray(element)) {
             params[key] = element.join(',');
+          } else if (element == null || element === undefined || String(element).trim() === '') {
+            delete params[key];
           }
         })();
       }
@@ -2713,14 +2705,44 @@ var SearchSelect = function SearchSelect(props) {
       } else {
         var keys = res.list ? 'list' : 'items';
         source = res ? res[keys] ? res[keys].map(function (item) {
+          var textShowText = item[mappingTextField];
+
+          if (mappingTextShowTextField) {
+            textShowText = [];
+
+            if (Array.isArray(mappingTextShowTextField)) {
+              mappingTextShowTextField.forEach(function (r) {
+                textShowText.push(item[r]);
+              });
+            } else {
+              textShowText = item[mappingTextShowTextField];
+            }
+          }
+
           return _objectSpread2(_objectSpread2({}, item), {}, {
             text: item[mappingTextField],
+            textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
           });
         }) : Array.isArray(res) && (res === null || res === void 0 ? void 0 : res.map(function (item) {
+          var textShowText = item[mappingTextField];
+
+          if (mappingTextShowTextField) {
+            textShowText = [];
+
+            if (Array.isArray(mappingTextShowTextField)) {
+              mappingTextShowTextField.forEach(function (r) {
+                textShowText.push(item[r]);
+              });
+            } else {
+              textShowText = item[mappingTextShowTextField];
+            }
+          }
+
           return _objectSpread2(_objectSpread2({}, item), {}, {
             text: item[mappingTextField],
+            textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
           });
@@ -2753,7 +2775,8 @@ var SearchSelect = function SearchSelect(props) {
     var target = e.target;
     var totalPage = Math.ceil(itemsTotal / pageSize); // 判断是否滑动到底部
 
-    var isTouchGround = target.scrollTop + target.offsetHeight === target.scrollHeight; // 判断数据是否还没有加载到了最后一页
+    var isTouchGround = target.scrollTop + target.offsetHeight === target.scrollHeight; // >=scrollHeight
+    // 判断数据是否还没有加载到了最后一页
 
     var canPageAdd = scrollPage < totalPage;
 
@@ -2763,6 +2786,20 @@ var SearchSelect = function SearchSelect(props) {
       getData({
         currentPage: nextScrollPage
       }); // 调用api方法
+    } //判断是否滑动到顶部
+
+
+    var isTouchTop = target.scrollTop === 0; // <=0
+    // 判断数据是否到第一页
+
+    var canPageJian = scrollPage > 1;
+
+    if (isTouchTop && canPageJian) {
+      var preScrollPage = scrollPage - 1;
+      setScrollPage(preScrollPage);
+      getData({
+        currentPage: preScrollPage
+      }); // 调用api方法
     }
   };
 
@@ -2802,7 +2839,7 @@ var SearchSelect = function SearchSelect(props) {
           };
         }));
         setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(value.length === itemsTotal); // 需清空数据
+        setCheckedAll(itemsTotal && value.length === itemsTotal); // 需清空数据
 
         if (!value.length) {
           setDoubleArr([]);
@@ -2860,6 +2897,10 @@ var SearchSelect = function SearchSelect(props) {
     form.resetFields();
     setTableFormParams({});
     setIsModalVisible(false);
+
+    if (selectMode) {
+      run();
+    }
   };
 
   var onSearchChange = function onSearchChange(e) {
@@ -2878,6 +2919,10 @@ var SearchSelect = function SearchSelect(props) {
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
+
+    if (selectMode) {
+      getData(params);
+    }
   };
 
   var onResetTable = function onResetTable() {
@@ -2898,14 +2943,22 @@ var SearchSelect = function SearchSelect(props) {
 
   var onChangeCheckAll = function onChangeCheckAll(e) {
     if (e.target.checked) {
-      // 如果下拉框有所有数据就处理选中所有，如果没有 就默认查出所有数据
-      if (items.length === itemsTotal) {
-        var currentItemsData = JSON.parse(JSON.stringify(items));
-        setSelectedRowKeys(currentItemsData.map(function (i) {
-          return i.value;
-        }));
-        setPopValue(currentItemsData);
+      // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
+      // 如果超过100条 就默认查出所有数据
+      var currentItemsData = JSON.parse(JSON.stringify(items));
+      var totalPage = Math.ceil(itemsTotal / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
+
+      for (var i = 0; i <= totalPage - 1; i++) {
+        doubleArr[i] = currentItemsData.slice((tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) * i, (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) * (i + 1));
       }
+
+      setDoubleArr(doubleArr);
+      setSelectedRowKeys(currentItemsData.map(function (i) {
+        return i.value;
+      }));
+      setPopValue(currentItemsData);
+
+      if (items.length < itemsTotal) ;
     } else {
       setSelectedRowKeys([]);
       setPopValue([]);
@@ -2930,13 +2983,15 @@ var SearchSelect = function SearchSelect(props) {
       return txt.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
     };
 
-    return /*#__PURE__*/React.createElement("div", {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      title: text
+    }, /*#__PURE__*/React.createElement("div", {
       ref: function ref(nodeElement) {
         if (nodeElement) {
           nodeElement.innerHTML = heightLightTxt(text, filterTxt);
         }
       }
-    });
+    }));
   }; // 扁平化二维数组的方法
 
 
@@ -2983,6 +3038,7 @@ var SearchSelect = function SearchSelect(props) {
       }); // 单选直接选中 不需要确定
 
       handleSelectOver(filterRows);
+      handleCancel();
     }
 
     setSelectedRowKeys(sksResult);
@@ -3058,6 +3114,14 @@ var SearchSelect = function SearchSelect(props) {
             },
             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)));
+        }
+
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'businessSearchSelect') {
+          return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Form.Item, {
+            name: i.name,
+            label: i.label,
+            key: i.name
+          }, /*#__PURE__*/React.createElement(BusinessSearchSelect$1, _objectSpread2({}, i.field.props))));
         } // 默认type是input
 
 
@@ -3170,7 +3234,7 @@ var SearchSelect = function SearchSelect(props) {
       key: item.value,
       label: item.text
     }, LightHeightOption({
-      text: "".concat(item.textShowKey, "       ").concat(item.text),
+      text: "".concat(item.textShowKey, "       ").concat(Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText),
       filterTxt: searchValue
     }));
   })), needModalTable && /*#__PURE__*/React.createElement(Button, {
@@ -3549,31 +3613,50 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
 
   if (type === 'skuCommodity') {
     requestConfig = _objectSpread2({
-      url: "".concat(prefixUrl.selectPrefix, "/sku"),
-      filter: 'qp-name,skuCode-orGroup,like',
+      url: "".concat(prefixUrl.selectPrefix, "/sku/pager/v2"),
+      filter: 'skuCodeAndSkuName',
       mappingTextField: 'name',
       mappingValueField: 'skuCode',
+      mappingTextShowTextField: ['name', 'propertyNameAndValue'],
       otherParams: {
-        'qp-approveStatus-eq': 2,
+        'qp-approveStatus-eq': 1,
+        'qp-type-eq': 10,
         sorter: 'desc-id'
       },
       sourceName: 'skuCode'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
+      name: 'qp-skuName-like',
       label: 'SKU名称'
     }, {
       name: 'qp-skuCode-like',
       label: 'SKU编码'
     }, {
-      name: 'qp-barCode-like',
-      label: '条形码'
+      name: 'qp-code-like',
+      label: '国际条码'
     }, {
       name: 'qp-itemName-like',
       label: '所属SPU名称'
     }, {
       name: 'qp-itemCode-like',
       label: '所属SPU编码'
+    }, {
+      name: 'qp-externalCode-like',
+      label: '外部编码'
+    }, {
+      name: 'qp-propertyValueCode-in',
+      type: 'businessSearchSelect',
+      label: '规格',
+      field: {
+        type: 'businessSearchSelect',
+        props: {
+          selectBusinessType: 'skuPropertyValue',
+          selectProps: {
+            mode: 'multiple',
+            maxTagCount: 1
+          }
+        }
+      }
     }, {
       name: 'qp-brandId-in',
       type: 'select',
@@ -3649,9 +3732,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       pageSize: 5000,
       currentPage: 1
     })]).then(function (x) {
-      formatSource(x, 0, 5, tableSearchForm, ['id', 'name']);
-      formatTreeDataSource(x, 1, 6, tableSearchForm);
-      formatSource(x, 2, 7, tableSearchForm, ['id', 'name']);
+      formatSource(x, 0, 7, tableSearchForm, ['id', 'name']);
+      formatTreeDataSource(x, 1, 8, tableSearchForm);
+      formatSource(x, 2, 9, tableSearchForm, ['id', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择SKU',
@@ -3663,11 +3746,20 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         title: 'SKU名称',
         dataIndex: 'name'
       }, {
-        title: '所属SPU',
+        title: '国际条码',
+        dataIndex: 'barCode'
+      }, {
+        title: '所属SPU名称',
         dataIndex: 'itemName'
+      }, {
+        title: '所属SPU编码',
+        dataIndex: 'itemCode'
+      }, {
+        title: '外部编码',
+        dataIndex: 'externalCode'
       }, {
         title: '规格',
-        dataIndex: 'skuSpec'
+        dataIndex: 'propertyNameAndValue'
       }, {
         title: '类目',
         dataIndex: 'categoryName'
@@ -3677,11 +3769,24 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }, {
         title: '品牌',
         dataIndex: 'brandName'
-      }, {
-        title: '条形码',
-        dataIndex: 'barCode'
       }]
     }, modalTableBusProps);
+  } // 商品规格选择器（无弹窗）
+
+
+  if (type === 'skuPropertyValue') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/skuPropertyValue/list"),
+      filter: 'qp-value-like',
+      mappingTextField: 'value',
+      mappingTextShowKeyField: 'propertyValueCode',
+      mappingValueField: 'propertyValueCode',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'qp-propertyValueCode-in'
+    }, requestConfigProp);
+    needModalTable = false;
   } // 仓库选择器（物理、逻辑仓）
 
 
@@ -4393,7 +4498,7 @@ var BusinessSearchSelect = function BusinessSearchSelect(props) {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(MemoSearchSelect, _objectSpread2({}, currentProps)));
 };
 
-var index = /*#__PURE__*/React.memo(BusinessSearchSelect, function (props, nextProps) {
+var BusinessSearchSelect$1 = /*#__PURE__*/React.memo(BusinessSearchSelect, function (props, nextProps) {
   if (props && props.labelInValue && props.value && JSON.stringify(props.value) !== JSON.stringify(nextProps.value)) {
     return false;
   }
@@ -4490,7 +4595,7 @@ var CommodityEntry = function CommodityEntry(props) {
  * @LastEditTime: 2022-01-14 17:17:26
  * @LastEditors: rodchen
  */
-var index$1 = (function (storageKeyString) {
+var index = (function (storageKeyString) {
   var seconds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
   var tipsCallFunction = arguments.length > 2 ? arguments[2] : undefined;
   if (typeof seconds !== 'number') throw new Error('seconds should be number');
@@ -4550,4 +4655,4 @@ function getStorageVale(storageKeyString) {
 var resposne = JSON.parse(localStorage.getItem('userInfo') || '{}');
 axios.defaults.headers.common['sso-sessionid'] = (resposne === null || resposne === void 0 ? void 0 : resposne.sessionId) || '';
 
-export { index as BusinessSearchSelect, index$1 as CheckOneUser, CommodityEntry, DataValidation, QueryMutipleInput, SearchSelect };
+export { BusinessSearchSelect$1 as BusinessSearchSelect, index as CheckOneUser, CommodityEntry, DataValidation, QueryMutipleInput, SearchSelect };

package/dist/index.js

@@ -305,10 +305,9 @@ function ownKeys$1(object, enumerableOnly) {
 
   if (Object.getOwnPropertySymbols) {
     var symbols = Object.getOwnPropertySymbols(object);
-    if (enumerableOnly) symbols = symbols.filter(function (sym) {
+    enumerableOnly && (symbols = symbols.filter(function (sym) {
       return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    });
-    keys.push.apply(keys, symbols);
+    })), keys.push.apply(keys, symbols);
   }
 
   return keys;
@@ -316,19 +315,12 @@ function ownKeys$1(object, enumerableOnly) {
 
 function _objectSpread2$1(target) {
   for (var i = 1; i < arguments.length; i++) {
-    var source = arguments[i] != null ? arguments[i] : {};
-
-    if (i % 2) {
-      ownKeys$1(Object(source), true).forEach(function (key) {
-        _defineProperty$1(target, key, source[key]);
-      });
-    } else if (Object.getOwnPropertyDescriptors) {
-      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-      ownKeys$1(Object(source)).forEach(function (key) {
-        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-      });
-    }
+    var source = null != arguments[i] ? arguments[i] : {};
+    i % 2 ? ownKeys$1(Object(source), !0).forEach(function (key) {
+      _defineProperty$1(target, key, source[key]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$1(Object(source)).forEach(function (key) {
+      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    });
   }
 
   return target;
@@ -339,14 +331,17 @@ function _arrayWithHoles$1(arr) {
 }
 
 function _iterableToArrayLimit$1(arr, i) {
-  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+  var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+
+  if (_i == null) return;
   var _arr = [];
   var _n = true;
   var _d = false;
-  var _e = undefined;
+
+  var _s, _e;
 
   try {
-    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+    for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) {
       _arr.push(_s.value);
 
       if (i && _arr.length === i) break;
@@ -429,17 +424,11 @@ function _objectWithoutProperties$1(source, excluded) {
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
-  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
-    _typeof = function _typeof(obj) {
-      return typeof obj;
-    };
-  } else {
-    _typeof = function _typeof(obj) {
-      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-    };
-  }
-
-  return _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
+    return typeof obj;
+  } : function (obj) {
+    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+  }, _typeof(obj);
 }
 
 /**
@@ -2443,7 +2432,8 @@ var SearchSelect = function SearchSelect(props) {
       mappingTextField = _ref$mappingTextField === void 0 ? 'name' : _ref$mappingTextField,
       mappingTextShowKeyField = _ref.mappingTextShowKeyField,
       _ref$mappingValueFiel = _ref.mappingValueField,
-      mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel;
+      mappingValueField = _ref$mappingValueFiel === void 0 ? 'code' : _ref$mappingValueFiel,
+      mappingTextShowTextField = _ref.mappingTextShowTextField;
 
   var resultSourceKey = sourceName || (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.sourceName) || 'supplierCode';
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
@@ -2692,6 +2682,8 @@ var SearchSelect = function SearchSelect(props) {
             delete params[key];
           } else if (Array.isArray(element)) {
             params[key] = element.join(',');
+          } else if (element == null || element === undefined || String(element).trim() === '') {
+            delete params[key];
           }
         })();
       }
@@ -2724,14 +2716,44 @@ var SearchSelect = function SearchSelect(props) {
       } else {
         var keys = res.list ? 'list' : 'items';
         source = res ? res[keys] ? res[keys].map(function (item) {
+          var textShowText = item[mappingTextField];
+
+          if (mappingTextShowTextField) {
+            textShowText = [];
+
+            if (Array.isArray(mappingTextShowTextField)) {
+              mappingTextShowTextField.forEach(function (r) {
+                textShowText.push(item[r]);
+              });
+            } else {
+              textShowText = item[mappingTextShowTextField];
+            }
+          }
+
           return _objectSpread2(_objectSpread2({}, item), {}, {
             text: item[mappingTextField],
+            textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
           });
         }) : Array.isArray(res) && (res === null || res === void 0 ? void 0 : res.map(function (item) {
+          var textShowText = item[mappingTextField];
+
+          if (mappingTextShowTextField) {
+            textShowText = [];
+
+            if (Array.isArray(mappingTextShowTextField)) {
+              mappingTextShowTextField.forEach(function (r) {
+                textShowText.push(item[r]);
+              });
+            } else {
+              textShowText = item[mappingTextShowTextField];
+            }
+          }
+
           return _objectSpread2(_objectSpread2({}, item), {}, {
             text: item[mappingTextField],
+            textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
             value: item[mappingValueField]
           });
@@ -2764,7 +2786,8 @@ var SearchSelect = function SearchSelect(props) {
     var target = e.target;
     var totalPage = Math.ceil(itemsTotal / pageSize); // 判断是否滑动到底部
 
-    var isTouchGround = target.scrollTop + target.offsetHeight === target.scrollHeight; // 判断数据是否还没有加载到了最后一页
+    var isTouchGround = target.scrollTop + target.offsetHeight === target.scrollHeight; // >=scrollHeight
+    // 判断数据是否还没有加载到了最后一页
 
     var canPageAdd = scrollPage < totalPage;
 
@@ -2774,6 +2797,20 @@ var SearchSelect = function SearchSelect(props) {
       getData({
         currentPage: nextScrollPage
       }); // 调用api方法
+    } //判断是否滑动到顶部
+
+
+    var isTouchTop = target.scrollTop === 0; // <=0
+    // 判断数据是否到第一页
+
+    var canPageJian = scrollPage > 1;
+
+    if (isTouchTop && canPageJian) {
+      var preScrollPage = scrollPage - 1;
+      setScrollPage(preScrollPage);
+      getData({
+        currentPage: preScrollPage
+      }); // 调用api方法
     }
   };
 
@@ -2813,7 +2850,7 @@ var SearchSelect = function SearchSelect(props) {
           };
         }));
         setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(value.length === itemsTotal); // 需清空数据
+        setCheckedAll(itemsTotal && value.length === itemsTotal); // 需清空数据
 
         if (!value.length) {
           setDoubleArr([]);
@@ -2871,6 +2908,10 @@ var SearchSelect = function SearchSelect(props) {
     form.resetFields();
     setTableFormParams({});
     setIsModalVisible(false);
+
+    if (selectMode) {
+      run();
+    }
   };
 
   var onSearchChange = function onSearchChange(e) {
@@ -2889,6 +2930,10 @@ var SearchSelect = function SearchSelect(props) {
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
+
+    if (selectMode) {
+      getData(params);
+    }
   };
 
   var onResetTable = function onResetTable() {
@@ -2909,14 +2954,22 @@ var SearchSelect = function SearchSelect(props) {
 
   var onChangeCheckAll = function onChangeCheckAll(e) {
     if (e.target.checked) {
-      // 如果下拉框有所有数据就处理选中所有，如果没有 就默认查出所有数据
-      if (items.length === itemsTotal) {
-        var currentItemsData = JSON.parse(JSON.stringify(items));
-        setSelectedRowKeys(currentItemsData.map(function (i) {
-          return i.value;
-        }));
-        setPopValue(currentItemsData);
+      // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
+      // 如果超过100条 就默认查出所有数据
+      var currentItemsData = JSON.parse(JSON.stringify(items));
+      var totalPage = Math.ceil(itemsTotal / (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize));
+
+      for (var i = 0; i <= totalPage - 1; i++) {
+        doubleArr[i] = currentItemsData.slice((tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) * i, (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) * (i + 1));
       }
+
+      setDoubleArr(doubleArr);
+      setSelectedRowKeys(currentItemsData.map(function (i) {
+        return i.value;
+      }));
+      setPopValue(currentItemsData);
+
+      if (items.length < itemsTotal) ;
     } else {
       setSelectedRowKeys([]);
       setPopValue([]);
@@ -2941,13 +2994,15 @@ var SearchSelect = function SearchSelect(props) {
       return txt.replace(regexp, "<span style=\"color:red\">".concat(heightTxt, "</span>"));
     };
 
-    return /*#__PURE__*/React__default['default'].createElement("div", {
+    return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+      title: text
+    }, /*#__PURE__*/React__default['default'].createElement("div", {
       ref: function ref(nodeElement) {
         if (nodeElement) {
           nodeElement.innerHTML = heightLightTxt(text, filterTxt);
         }
       }
-    });
+    }));
   }; // 扁平化二维数组的方法
 
 
@@ -2994,6 +3049,7 @@ var SearchSelect = function SearchSelect(props) {
       }); // 单选直接选中 不需要确定
 
       handleSelectOver(filterRows);
+      handleCancel();
     }
 
     setSelectedRowKeys(sksResult);
@@ -3069,6 +3125,14 @@ var SearchSelect = function SearchSelect(props) {
             },
             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)));
+        }
+
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'businessSearchSelect') {
+          return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
+            name: i.name,
+            label: i.label,
+            key: i.name
+          }, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, _objectSpread2({}, i.field.props))));
         } // 默认type是input
 
 
@@ -3181,7 +3245,7 @@ var SearchSelect = function SearchSelect(props) {
       key: item.value,
       label: item.text
     }, LightHeightOption({
-      text: "".concat(item.textShowKey, "       ").concat(item.text),
+      text: "".concat(item.textShowKey, "       ").concat(Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText),
       filterTxt: searchValue
     }));
   })), needModalTable && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
@@ -3560,31 +3624,50 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
 
   if (type === 'skuCommodity') {
     requestConfig = _objectSpread2({
-      url: "".concat(prefixUrl.selectPrefix, "/sku"),
-      filter: 'qp-name,skuCode-orGroup,like',
+      url: "".concat(prefixUrl.selectPrefix, "/sku/pager/v2"),
+      filter: 'skuCodeAndSkuName',
       mappingTextField: 'name',
       mappingValueField: 'skuCode',
+      mappingTextShowTextField: ['name', 'propertyNameAndValue'],
       otherParams: {
-        'qp-approveStatus-eq': 2,
+        'qp-approveStatus-eq': 1,
+        'qp-type-eq': 10,
         sorter: 'desc-id'
       },
       sourceName: 'skuCode'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
+      name: 'qp-skuName-like',
       label: 'SKU名称'
     }, {
       name: 'qp-skuCode-like',
       label: 'SKU编码'
     }, {
-      name: 'qp-barCode-like',
-      label: '条形码'
+      name: 'qp-code-like',
+      label: '国际条码'
     }, {
       name: 'qp-itemName-like',
       label: '所属SPU名称'
     }, {
       name: 'qp-itemCode-like',
       label: '所属SPU编码'
+    }, {
+      name: 'qp-externalCode-like',
+      label: '外部编码'
+    }, {
+      name: 'qp-propertyValueCode-in',
+      type: 'businessSearchSelect',
+      label: '规格',
+      field: {
+        type: 'businessSearchSelect',
+        props: {
+          selectBusinessType: 'skuPropertyValue',
+          selectProps: {
+            mode: 'multiple',
+            maxTagCount: 1
+          }
+        }
+      }
     }, {
       name: 'qp-brandId-in',
       type: 'select',
@@ -3660,9 +3743,9 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       pageSize: 5000,
       currentPage: 1
     })]).then(function (x) {
-      formatSource(x, 0, 5, tableSearchForm, ['id', 'name']);
-      formatTreeDataSource(x, 1, 6, tableSearchForm);
-      formatSource(x, 2, 7, tableSearchForm, ['id', 'name']);
+      formatSource(x, 0, 7, tableSearchForm, ['id', 'name']);
+      formatTreeDataSource(x, 1, 8, tableSearchForm);
+      formatSource(x, 2, 9, tableSearchForm, ['id', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择SKU',
@@ -3674,11 +3757,20 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         title: 'SKU名称',
         dataIndex: 'name'
       }, {
-        title: '所属SPU',
+        title: '国际条码',
+        dataIndex: 'barCode'
+      }, {
+        title: '所属SPU名称',
         dataIndex: 'itemName'
+      }, {
+        title: '所属SPU编码',
+        dataIndex: 'itemCode'
+      }, {
+        title: '外部编码',
+        dataIndex: 'externalCode'
       }, {
         title: '规格',
-        dataIndex: 'skuSpec'
+        dataIndex: 'propertyNameAndValue'
       }, {
         title: '类目',
         dataIndex: 'categoryName'
@@ -3688,11 +3780,24 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }, {
         title: '品牌',
         dataIndex: 'brandName'
-      }, {
-        title: '条形码',
-        dataIndex: 'barCode'
       }]
     }, modalTableBusProps);
+  } // 商品规格选择器（无弹窗）
+
+
+  if (type === 'skuPropertyValue') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/skuPropertyValue/list"),
+      filter: 'qp-value-like',
+      mappingTextField: 'value',
+      mappingTextShowKeyField: 'propertyValueCode',
+      mappingValueField: 'propertyValueCode',
+      otherParams: {
+        sorter: 'desc-id'
+      },
+      sourceName: 'qp-propertyValueCode-in'
+    }, requestConfigProp);
+    needModalTable = false;
   } // 仓库选择器（物理、逻辑仓）
 
 
@@ -4404,7 +4509,7 @@ var BusinessSearchSelect = function BusinessSearchSelect(props) {
   return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(MemoSearchSelect, _objectSpread2({}, currentProps)));
 };
 
-var index = /*#__PURE__*/React__default['default'].memo(BusinessSearchSelect, function (props, nextProps) {
+var BusinessSearchSelect$1 = /*#__PURE__*/React__default['default'].memo(BusinessSearchSelect, function (props, nextProps) {
   if (props && props.labelInValue && props.value && JSON.stringify(props.value) !== JSON.stringify(nextProps.value)) {
     return false;
   }
@@ -4501,7 +4606,7 @@ var CommodityEntry = function CommodityEntry(props) {
  * @LastEditTime: 2022-01-14 17:17:26
  * @LastEditors: rodchen
  */
-var index$1 = (function (storageKeyString) {
+var index = (function (storageKeyString) {
   var seconds = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
   var tipsCallFunction = arguments.length > 2 ? arguments[2] : undefined;
   if (typeof seconds !== 'number') throw new Error('seconds should be number');
@@ -4561,8 +4666,8 @@ function getStorageVale(storageKeyString) {
 var resposne = JSON.parse(localStorage.getItem('userInfo') || '{}');
 axios__default['default'].defaults.headers.common['sso-sessionid'] = (resposne === null || resposne === void 0 ? void 0 : resposne.sessionId) || '';
 
-exports.BusinessSearchSelect = index;
-exports.CheckOneUser = index$1;
+exports.BusinessSearchSelect = BusinessSearchSelect$1;
+exports.CheckOneUser = index;
 exports.CommodityEntry = CommodityEntry;
 exports.DataValidation = DataValidation;
 exports.QueryMutipleInput = QueryMutipleInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "1.1.28",
+  "version": "1.1.29",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -164,23 +164,37 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
   // 商品选择器
   if(type === 'skuCommodity') {
     requestConfig = {
-      url: `${prefixUrl.selectPrefix}/sku`,
-      filter: 'qp-name,skuCode-orGroup,like', // 过滤参数
+      url: `${prefixUrl.selectPrefix}/sku/pager/v2`,
+      filter: 'skuCodeAndSkuName', // 过滤参数
       mappingTextField: 'name',
       mappingValueField: 'skuCode',
+      mappingTextShowTextField: ['name', 'propertyNameAndValue'],
       otherParams: {
-        'qp-approveStatus-eq':2,
+        'qp-approveStatus-eq': 1,
+        'qp-type-eq': 10, // 查唯一国际条码
         sorter: 'desc-id'
       }, // 默认参数
       sourceName: 'skuCode',
       ...requestConfigProp,
     }
     tableSearchForm = [
-      { name: 'qp-name-like', label: 'SKU名称' },
+      { name: 'qp-skuName-like', label: 'SKU名称' },
       { name: 'qp-skuCode-like', label: 'SKU编码' },
-      { name: 'qp-barCode-like', label: '条形码' },
+      { name: 'qp-code-like', label: '国际条码' },
       { name: 'qp-itemName-like', label: '所属SPU名称' },
       { name: 'qp-itemCode-like', label: '所属SPU编码' },
+      { name: 'qp-externalCode-like', label: '外部编码' },
+      { name: 'qp-propertyValueCode-in', type: 'businessSearchSelect', label: '规格', field: {
+          type: 'businessSearchSelect',
+          props: {
+            selectBusinessType: 'skuPropertyValue',
+            selectProps: {
+              mode: 'multiple',
+              maxTagCount: 1,
+            }
+          },
+        }
+      },
       { name: 'qp-brandId-in', type: 'select', label: '品牌', field: {
           type: 'select',
           props: {
@@ -242,9 +256,9 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
         currentPage: 1,
       }),
     ]).then((x: any)=>{
-      formatSource(x,0, 5, tableSearchForm,['id','name']);
-      formatTreeDataSource(x,1, 6, tableSearchForm);
-      formatSource(x,2, 7, tableSearchForm,['id','name']);
+      formatSource(x,0, 7, tableSearchForm,['id','name']);
+      formatTreeDataSource(x,1, 8, tableSearchForm);
+      formatSource(x,2, 9, tableSearchForm,['id','name']);
     })
     modalTableProps = {
       modalTableTitle: '选择SKU',
@@ -259,12 +273,24 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           dataIndex: 'name',
         },
         {
-          title: '所属SPU',
+          title: '国际条码',
+          dataIndex: 'barCode',
+        },
+        {
+          title: '所属SPU名称',
           dataIndex: 'itemName',
         },
+        {
+          title: '所属SPU编码',
+          dataIndex: 'itemCode',
+        },
+        {
+          title: '外部编码',
+          dataIndex: 'externalCode',
+        },
         {
           title: '规格',
-          dataIndex: 'skuSpec',
+          dataIndex: 'propertyNameAndValue',
         },
         {
           title: '类目',
@@ -278,15 +304,28 @@ export function commonFun (type?: string, prefixUrl: any, requestConfigProp?: an
           title: '品牌',
           dataIndex: 'brandName',
         },
-        {
-          title: '条形码',
-          dataIndex: 'barCode',
-        },
       ],
       ...modalTableBusProps
     }
   }
 
+  // 商品规格选择器（无弹窗）
+  if(type === 'skuPropertyValue') {
+    requestConfig = {
+      url: `${prefixUrl.selectPrefix}/skuPropertyValue/list`,
+      filter: 'qp-value-like', // 过滤参数
+      mappingTextField: 'value',
+      mappingTextShowKeyField: 'propertyValueCode',
+      mappingValueField: 'propertyValueCode',
+      otherParams: {
+        sorter: 'desc-id'
+      }, // 默认参数
+      sourceName: 'qp-propertyValueCode-in',
+      ...requestConfigProp,
+    }
+    needModalTable = false
+  }
+
   // 仓库选择器（物理、逻辑仓）
   if(type === 'physicalWarehouse') {
     requestConfig = {

package/src/components/Business/SearchSelect/index.md

@@ -110,8 +110,8 @@ export default () => {
       setValue(value)
     },
     // requestConfig: {
-    //   url: `/bop/api/sku`,
-    //   filter: 'qp-name,skuCode-orGroup,like',
+    //   url: `/bop/api/sku/pager/v2`,
+    //   filter: 'skuCodeAndSkuName',
     //   mappingValueField: 'skuCode',
     //   otherParams: {
     //     sorter: 'desc-id'
@@ -147,6 +147,107 @@ export default () => {
 };
 ```
 
+[comment]: <> (## 商品规格选择器 Select-SPGG-001)
+
+[comment]: <> (```tsx)
+
+[comment]: <> (import React, { useState } from 'react';)
+
+[comment]: <> (import { Tabs } from 'antd';)
+
+[comment]: <> (import {BusinessSearchSelect} from '../../../index.ts';)
+
+[comment]: <> (const { TabPane } = Tabs;)
+
+[comment]: <> (export default &#40;&#41; => {)
+
+[comment]: <> (  const selectProps = {)
+
+[comment]: <> (    // mode: 'multiple',)
+
+[comment]: <> (    // maxTagCount: 1,)
+
+[comment]: <> (    // disabled: true)
+
+[comment]: <> (  })
+
+[comment]: <> (  const selectPropsMultiple = {)
+
+[comment]: <> (    mode: 'multiple',)
+
+[comment]: <> (    maxTagCount: 1,)
+
+[comment]: <> (  })
+
+[comment]: <> (  const [ tabKey, setTabKey ] = useState&#40;'single'&#41;)
+
+[comment]: <> (  const [value, setValue] = useState&#40;selectProps?.mode ? [] : null&#41;;)
+  
+[comment]: <> (  const props = {)
+
+[comment]: <> (    value,)
+
+[comment]: <> (    onChange: &#40;value: any&#41; => {)
+
+[comment]: <> (      console.log&#40;value&#41;)
+
+[comment]: <> (      setValue&#40;value&#41;)
+
+[comment]: <> (    },)
+
+[comment]: <> (    prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },)
+
+[comment]: <> (    selectProps,)
+
+[comment]: <> (    selectBusinessType: 'skuPropertyValue',)
+
+[comment]: <> (  };)
+
+[comment]: <> (  const onTabChange = &#40;key&#41; => {)
+
+[comment]: <> (    setTabKey&#40;key&#41;)
+
+[comment]: <> (    setValue&#40;key === 'single' ? null: []&#41;)
+
+[comment]: <> (  })
+  
+[comment]: <> (  return &#40;)
+
+[comment]: <> (    <div>)
+
+[comment]: <> (      <Tabs onChange={onTabChange} activeKey={tabKey}>)
+
+[comment]: <> (        <TabPane tab='单选' key='single'>)
+
+[comment]: <> (          {tabKey === 'single' && &#40;)
+
+[comment]: <> (            <BusinessSearchSelect {...props} />)
+
+[comment]: <> (          &#41;})
+
+[comment]: <> (        </TabPane>)
+
+[comment]: <> (        <TabPane tab='多选' key='multiple'>)
+
+[comment]: <> (          {tabKey === 'multiple' && &#40;)
+
+[comment]: <> (            <BusinessSearchSelect {...props} selectProps={selectPropsMultiple} />)
+
+[comment]: <> (          &#41;})
+
+[comment]: <> (        </TabPane>)
+
+[comment]: <> (      </Tabs>)
+
+[comment]: <> (    </div>)
+
+[comment]: <> (  &#41;;)
+
+[comment]: <> (};)
+
+[comment]: <> (```)
+
+
 ## 仓库选择器(物理仓) Select-Warehouse-001
 
 ```tsx

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

@@ -7,6 +7,7 @@ import axios from 'axios';
 import { stringify } from 'querystring';
 import _ from "loadsh"
 import './index.less';
+import { BusinessSearchSelect } from '@/index';
 
 const { Option } = Select;
 
@@ -23,7 +24,7 @@ const SearchSelect = (props: any) => {
     needModalTable=true,
     getPopupContainer=undefined
   } = props;
-  const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField='name', mappingTextShowKeyField,mappingValueField='code' } = requestConfig || {};
+  const { url, otherParams, isMap, fixedparameter, fieldValToParam, mappingTextField='name', mappingTextShowKeyField,mappingValueField='code', mappingTextShowTextField } = requestConfig || {};
   const resultSourceKey = sourceName || requestConfig?.sourceName || 'supplierCode'
 
   const selectMode = selectProps?.mode  // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
@@ -184,6 +185,8 @@ const SearchSelect = (props: any) => {
           delete params[key]
         }else if (Array.isArray(element)) {
           params[key] = element.join(',');
+        } else if(element == null || element === undefined || String(element).trim() === '') {
+          delete params[key]
         }
       }
     }
@@ -219,18 +222,42 @@ const SearchSelect = (props: any) => {
           source = res
             ? res[keys]
               ? res[keys].map((item: any) => {
+                let textShowText = item[mappingTextField]
+                if(mappingTextShowTextField) {
+                  textShowText = []
+                  if(Array.isArray(mappingTextShowTextField)) {
+                    mappingTextShowTextField.forEach((r: any) => {
+                      textShowText.push(item[r])
+                    })
+                  } else {
+                    textShowText = item[mappingTextShowTextField]
+                  }
+                }
                 return {
                   ...item,
                   text: item[mappingTextField],
+                  textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
                 };
               })
               : Array.isArray(res) &&
               res?.map((item: Record<string, any>) => {
+                let textShowText = item[mappingTextField]
+                if(mappingTextShowTextField) {
+                  textShowText = []
+                  if(Array.isArray(mappingTextShowTextField)) {
+                    mappingTextShowTextField.forEach((r: any) => {
+                      textShowText.push(item[r])
+                    })
+                  } else {
+                    textShowText = item[mappingTextShowTextField]
+                  }
+                }
                 return {
                   ...item,
                   text: item[mappingTextField],
+                  textShowText,
                   textShowKey: item[mappingTextShowKeyField || mappingValueField],
                   value: item[mappingValueField],
                 };
@@ -255,7 +282,7 @@ const SearchSelect = (props: any) => {
     const { target } = e;
     const totalPage = Math.ceil(itemsTotal / pageSize)
     // 判断是否滑动到底部
-    const isTouchGround = target.scrollTop + target.offsetHeight === target.scrollHeight
+    const isTouchGround = target.scrollTop + target.offsetHeight === target.scrollHeight // >=scrollHeight
     // 判断数据是否还没有加载到了最后一页
     const canPageAdd = scrollPage < totalPage
     if (isTouchGround && canPageAdd) {
@@ -263,6 +290,16 @@ const SearchSelect = (props: any) => {
       setScrollPage(nextScrollPage);
       getData({currentPage: nextScrollPage}); // 调用api方法
     }
+
+    //判断是否滑动到顶部
+    const isTouchTop = target.scrollTop ===0  // <=0
+    // 判断数据是否到第一页
+    const canPageJian = scrollPage > 1
+    if (isTouchTop && canPageJian) {
+      const preScrollPage = scrollPage - 1;
+      setScrollPage(preScrollPage);
+      getData({currentPage: preScrollPage}); // 调用api方法
+    }
   }
 
   useEffect(() => {
@@ -289,7 +326,7 @@ const SearchSelect = (props: any) => {
         setSelectedRowKeys(labelInValue ? value.map(i => i.key) : value)
         setPopValue(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })));
         setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(value.length === itemsTotal);
+        setCheckedAll(itemsTotal && value.length === itemsTotal);
         // 需清空数据
         if(!value.length) {
           setDoubleArr([])
@@ -330,6 +367,9 @@ const SearchSelect = (props: any) => {
     form.resetFields();
     setTableFormParams({});
     setIsModalVisible(false);
+    if(selectMode) {
+      run();
+    }
   };
 
   const onSearchChange = (e) => {
@@ -346,6 +386,9 @@ const SearchSelect = (props: any) => {
     const params = form.getFieldsValue();
     setTableFormParams(params);
     getData({ ...params, pageSize: tableInitPageSize }, 2)
+    if(selectMode){
+      getData(params)
+    }
   }
 
   const onResetTable = () => {
@@ -360,12 +403,17 @@ const SearchSelect = (props: any) => {
 
   const onChangeCheckAll = (e) => {
     if(e.target.checked) {
-      // 如果下拉框有所有数据就处理选中所有，如果没有 就默认查出所有数据
-      if(items.length === itemsTotal) {
-        const currentItemsData = JSON.parse(JSON.stringify(items))
-        setSelectedRowKeys(currentItemsData.map(i => i.value))
-        setPopValue(currentItemsData);
-      } else {
+      // 如果下拉框有所有数据就处理选中所有【items.length === itemsTotal】(最多可选100条)
+      // 如果超过100条 就默认查出所有数据
+      const currentItemsData = JSON.parse(JSON.stringify(items))
+      const totalPage = Math.ceil(itemsTotal / tablePagination?.pageSize)
+      for(let i=0; i <= totalPage-1; i++){
+        doubleArr[i] = currentItemsData.slice(tablePagination?.pageSize*i,tablePagination?.pageSize*(i+1))
+      }
+      setDoubleArr(doubleArr)
+      setSelectedRowKeys(currentItemsData.map(i => i.value))
+      setPopValue(currentItemsData);
+      if(items.length < itemsTotal) {
         // TODO 请求接口获取所有数据
       }
     } else {
@@ -390,12 +438,14 @@ const SearchSelect = (props: any) => {
       return txt.replace(regexp, `<span style="color:red">${heightTxt}</span>`)
     }
     return (
-      <div ref={(nodeElement) => {
-        if (nodeElement) {
-          nodeElement.innerHTML = heightLightTxt(text, filterTxt)
-        }
-      }}
-      />
+      <Tooltip title={text}>
+        <div ref={(nodeElement) => {
+          if (nodeElement) {
+            nodeElement.innerHTML = heightLightTxt(text, filterTxt)
+          }
+        }}
+        />
+      </Tooltip>
     )
   }
 
@@ -438,6 +488,7 @@ const SearchSelect = (props: any) => {
       sksResult = selectRows.map((i) => i.value)
       // 单选直接选中 不需要确定
       handleSelectOver(filterRows)
+      handleCancel();
     }
 
     setSelectedRowKeys(sksResult)
@@ -494,6 +545,16 @@ const SearchSelect = (props: any) => {
           )
         }
 
+        if(i?.type === 'businessSearchSelect') {
+          return (
+            <div>
+              <Form.Item name={i.name} label={i.label} key={i.name}>
+                <BusinessSearchSelect {...i.field.props} />
+              </Form.Item>
+            </div>
+          )
+        }
+
         // 默认type是input
         return (
           <Form.Item name={i.name} label={i.label} key={i.name}>
@@ -570,7 +631,7 @@ const SearchSelect = (props: any) => {
         >
           {items.map(item => (
             <Option key={item.value} label={item.text}>
-              {LightHeightOption({ text: `${item.textShowKey}       ${item.text}`, filterTxt: searchValue })}
+              {LightHeightOption({ text: `${item.textShowKey}       ${Array.isArray(item.textShowText) && item.textShowText.join('    ') || item.textShowText}`, filterTxt: searchValue })}
             </Option>
           ))}
         </Select>