@bit-sun/business-component 1.1.26 → 1.1.29

package/dist/index.esm.js

@@ -78,14 +78,14 @@ function _inherits(subClass, superClass) {
     throw new TypeError("Super expression must either be null or a function");
   }
 
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      writable: true,
+      configurable: true
+    }
+  });
   Object.defineProperty(subClass, "prototype", {
-    value: Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    }),
     writable: false
   });
   if (superClass) _setPrototypeOf(subClass, superClass);
@@ -484,7 +484,7 @@ function boundAlpha(a) {
  */
 function convertToPercentage(n) {
     if (n <= 1) {
-        return Number(n) * 100 + "%";
+        return "".concat(Number(n) * 100, "%");
     }
     return n;
 }
@@ -866,12 +866,12 @@ var CSS_INTEGER = '[-\\+]?\\d+%?';
 // <http://www.w3.org/TR/css3-values/#number-value>
 var CSS_NUMBER = '[-\\+]?\\d*\\.\\d+%?';
 // Allow positive/negative integer/number.  Don't capture the either/or, just the entire outcome.
-var CSS_UNIT = "(?:" + CSS_NUMBER + ")|(?:" + CSS_INTEGER + ")";
+var CSS_UNIT = "(?:".concat(CSS_NUMBER, ")|(?:").concat(CSS_INTEGER, ")");
 // Actual matching.
 // Parentheses and commas are optional, but not required.
 // Whitespace can take the place of commas or opening paren
-var PERMISSIVE_MATCH3 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
-var PERMISSIVE_MATCH4 = "[\\s|\\(]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")[,|\\s]+(" + CSS_UNIT + ")\\s*\\)?";
+var PERMISSIVE_MATCH3 = "[\\s|\\(]+(".concat(CSS_UNIT, ")[,|\\s]+(").concat(CSS_UNIT, ")[,|\\s]+(").concat(CSS_UNIT, ")\\s*\\)?");
+var PERMISSIVE_MATCH4 = "[\\s|\\(]+(".concat(CSS_UNIT, ")[,|\\s]+(").concat(CSS_UNIT, ")[,|\\s]+(").concat(CSS_UNIT, ")[,|\\s]+(").concat(CSS_UNIT, ")\\s*\\)?");
 var matchers = {
     CSS_UNIT: new RegExp(CSS_UNIT),
     rgb: new RegExp('rgb' + PERMISSIVE_MATCH3),
@@ -1222,6 +1222,17 @@ function canUseDom() {
 
 var MARK_KEY = "rc-util-key";
 
+function getMark() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+      mark = _ref.mark;
+
+  if (mark) {
+    return mark.startsWith('data-') ? mark : "data-".concat(mark);
+  }
+
+  return MARK_KEY;
+}
+
 function getContainer(option) {
   if (option.attachTo) {
     return option.attachTo;
@@ -1265,6 +1276,14 @@ function injectCSS(css) {
   return styleNode;
 }
 var containerCache = new Map();
+
+function findExistNode(key) {
+  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var container = getContainer(option);
+  return Array.from(containerCache.get(container).children).find(function (node) {
+    return node.tagName === 'STYLE' && node.getAttribute(getMark(option)) === key;
+  });
+}
 function updateCSS(css, key) {
   var option = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var container = getContainer(option); // Get real parent
@@ -1276,9 +1295,7 @@ function updateCSS(css, key) {
     parentNode.removeChild(placeholderStyle);
   }
 
-  var existNode = Array.from(containerCache.get(container).children).find(function (node) {
-    return node.tagName === 'STYLE' && node[MARK_KEY] === key;
-  });
+  var existNode = findExistNode(key, option);
 
   if (existNode) {
     var _option$csp3, _option$csp4;
@@ -1297,7 +1314,7 @@ function updateCSS(css, key) {
   }
 
   var newNode = injectCSS(css, option);
-  newNode[MARK_KEY] = key;
+  newNode.setAttribute(getMark(option), key);
   return newNode;
 }
 
@@ -2390,7 +2407,9 @@ var SearchSelect = function SearchSelect(props) {
       ctx = props.ctx,
       sourceName = props.sourceName,
       _props$needModalTable = props.needModalTable,
-      needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable;
+      needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
+      _props$getPopupContai = props.getPopupContainer,
+      _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai;
 
   var _ref = requestConfig || {},
       url = _ref.url,
@@ -2402,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; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
@@ -2651,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];
           }
         })();
       }
@@ -2683,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]
           });
@@ -2723,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;
 
@@ -2733,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方法
     }
   };
 
@@ -2772,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([]);
@@ -2789,18 +2856,21 @@ var SearchSelect = function SearchSelect(props) {
     }
   };
 
-  var handleOk = function handleOk() {
-    if (popvalue === null || popvalue === void 0 ? void 0 : popvalue.length) {
+  var handleSelectOver = function handleSelectOver(selectedValue) {
+    if (selectedValue === null || selectedValue === void 0 ? void 0 : selectedValue.length) {
       var _ctx$form2;
 
-      formaData(popvalue); // 解决选择最后1页的sku，返回后，不显示名称问题
+      formaData(selectedValue); // 解决选择最后1页的sku，返回后，不显示名称问题
 
-      var source = _.uniqBy(items.concat(popvalue), 'value');
+      var source = _.uniqBy(items.concat(selectedValue), 'value');
 
       ctx === null || ctx === void 0 ? void 0 : (_ctx$form2 = ctx.form) === null || _ctx$form2 === void 0 ? void 0 : _ctx$form2.setFieldSource(resultSourceKey, source);
       setItems(source);
     }
+  };
 
+  var handleOk = function handleOk() {
+    handleSelectOver(popvalue);
     handleCancel();
   };
 
@@ -2827,6 +2897,10 @@ var SearchSelect = function SearchSelect(props) {
     form.resetFields();
     setTableFormParams({});
     setIsModalVisible(false);
+
+    if (selectMode) {
+      run();
+    }
   };
 
   var onSearchChange = function onSearchChange(e) {
@@ -2845,6 +2919,10 @@ var SearchSelect = function SearchSelect(props) {
     getData(_objectSpread2(_objectSpread2({}, params), {}, {
       pageSize: tableInitPageSize
     }), 2);
+
+    if (selectMode) {
+      getData(params);
+    }
   };
 
   var onResetTable = function onResetTable() {
@@ -2865,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([]);
@@ -2897,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);
         }
       }
-    });
+    }));
   }; // 扁平化二维数组的方法
 
 
@@ -2947,7 +3035,10 @@ var SearchSelect = function SearchSelect(props) {
       filterRows = selectRows;
       sksResult = selectRows.map(function (i) {
         return i.value;
-      });
+      }); // 单选直接选中 不需要确定
+
+      handleSelectOver(filterRows);
+      handleCancel();
     }
 
     setSelectedRowKeys(sksResult);
@@ -3023,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
 
 
@@ -3044,23 +3143,19 @@ var SearchSelect = function SearchSelect(props) {
     }
   };
 
-  var TooltipContent = function TooltipContent() {
-    if (selectMode && value && (value === null || value === void 0 ? void 0 : value.length)) {
-      var listSelected = JSON.parse(JSON.stringify(items)).filter(function (i) {
-        return value.find(function (item) {
-          return item === i.value;
-        });
-      }) || [];
-
-      var _onClose = function onClose(e, item) {
-        e.preventDefault();
-        var newValue = JSON.parse(JSON.stringify(value)).filter(function (i) {
-          return i !== item.value;
-        });
-        onChange(newValue);
-      };
+  var maxTagPlaceholder = function maxTagPlaceholder(selectedValues) {
+    var _onClose = function onClose(e, item) {
+      e.preventDefault();
+      var newValue = labelInValue ? JSON.parse(JSON.stringify(value)).filter(function (i) {
+        return i.value !== item.value;
+      }) : JSON.parse(JSON.stringify(value)).filter(function (i) {
+        return i !== item.value;
+      });
+      onChange(newValue);
+    };
 
-      return (listSelected === null || listSelected === void 0 ? void 0 : listSelected.length) && listSelected.map(function (i) {
+    return /*#__PURE__*/React.createElement(Tooltip, {
+      title: selectedValues.map(function (i) {
         return /*#__PURE__*/React.createElement(Tag, {
           closable: true,
           onClose: function onClose(e) {
@@ -3072,13 +3167,9 @@ var SearchSelect = function SearchSelect(props) {
             height: '24px',
             border: '1px solid #f0f0f0'
           }
-        }, i.text);
-      }) || '';
-    } else {
-      setTooltipVisible(false);
-    }
-
-    return '';
+        }, i.label);
+      })
+    }, "+ ".concat(selectedValues === null || selectedValues === void 0 ? void 0 : selectedValues.length));
   };
 
   return /*#__PURE__*/React.createElement("div", {
@@ -3086,15 +3177,6 @@ var SearchSelect = function SearchSelect(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "search_select_show",
     id: "search_select_div_".concat(uniqueValue)
-  }, /*#__PURE__*/React.createElement(Tooltip, {
-    title: TooltipContent,
-    visible: tooltipVisible,
-    trigger: 'hover',
-    onVisibleChange: function onVisibleChange(visible) {
-      if (selectMode && value && (value === null || value === void 0 ? void 0 : value.length)) {
-        setTooltipVisible(visible);
-      }
-    }
   }, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({
     virtual: true,
     labelInValue: labelInValue,
@@ -3141,20 +3223,21 @@ var SearchSelect = function SearchSelect(props) {
     style: {
       width: needModalTable ? 'calc(100% - 30px)' : 'calc(100%)'
     },
-    placeholder: "\u8BF7\u9009\u62E9"
+    placeholder: "\u8BF7\u9009\u62E9",
+    maxTagPlaceholder: maxTagPlaceholder
   }, currentSelectProps), {}, {
     getPopupContainer: function getPopupContainer() {
-      return document.getElementById("search_select_div_".concat(uniqueValue));
+      return _getPopupContainer && _getPopupContainer() || document.getElementById("search_select_div_".concat(uniqueValue));
     }
   }), items.map(function (item) {
     return /*#__PURE__*/React.createElement(Option, {
       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, {
+  })), needModalTable && /*#__PURE__*/React.createElement(Button, {
     style: {
       width: '30px',
       padding: '2px',
@@ -3168,7 +3251,7 @@ var SearchSelect = function SearchSelect(props) {
     visible: isModalVisible,
     onOk: handleOk,
     onCancel: handleCancel,
-    footer: [/*#__PURE__*/React.createElement(Button, {
+    footer: selectMode ? [/*#__PURE__*/React.createElement(Button, {
       key: "back",
       onClick: handleCancel
     }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(Button, {
@@ -3176,7 +3259,7 @@ var SearchSelect = function SearchSelect(props) {
       type: "primary",
       onClick: handleOk,
       disabled: !tableData.length || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled)
-    }, "\u786E\u5B9A")]
+    }, "\u786E\u5B9A")] : null
   }, /*#__PURE__*/React.createElement("div", {
     className: 'search_select_wrapper'
   }, /*#__PURE__*/React.createElement("div", {
@@ -3342,16 +3425,15 @@ var loadSelectSource = function loadSelectSource(url, params) {
 var _getDictionarySource;
 var hasDictSharingType = (_getDictionarySource = getDictionarySource('UC000013')) === null || _getDictionarySource === void 0 ? void 0 : _getDictionarySource.length;
 var sharingTypeDataList = hasDictSharingType && getDictionarySource('UC000013') || sharingType;
-function commonFun(type, prefixUrl) {
+function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
   // 默认type === 'supplier' 供应商选择器
-  var requestConfig = {
+  var requestConfig = _objectSpread2({
     url: "".concat(prefixUrl.selectPrefix, "/supplier"),
     filter: 'qp-name,code-orGroup,like',
     otherParams: {
       sorter: 'desc-id'
-    } // 默认参数
-
-  };
+    }
+  }, requestConfigProp);
   /*
   * 处理 格式化下拉框数据源
   * reData 必传 promise返回响应的数据 格式为[{},{},{},...] Promise.all第一个参数数组有多少个数组长度就是多少，其中每个对象为每次请求的结果数据
@@ -3361,6 +3443,7 @@ function commonFun(type, prefixUrl) {
   * changeSearchForm 必传 为搜索表单Form数据
   * */
 
+
   var formatSource = function formatSource(reData, position, changePosition, changeSearchForm) {
     var _reData$position;
 
@@ -3495,7 +3578,7 @@ function commonFun(type, prefixUrl) {
     });
   }
 
-  var modalTableProps = {
+  var modalTableProps = _objectSpread2({
     modalTableTitle: '选择供应商',
     tableSearchForm: tableSearchForm,
     tableColumns: [{
@@ -3524,36 +3607,56 @@ function commonFun(type, prefixUrl) {
         })) === null || _sharingType$find === void 0 ? void 0 : _sharingType$find.text;
       }
     }]
-  };
+  }, modalTableBusProps);
+
   var needModalTable = true; // 商品选择器
 
   if (type === 'skuCommodity') {
-    requestConfig = {
-      url: "".concat(prefixUrl.selectPrefix, "/sku"),
-      filter: 'qp-name,skuCode-orGroup,like',
+    requestConfig = _objectSpread2({
+      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',
@@ -3629,11 +3732,11 @@ function commonFun(type, prefixUrl) {
       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 = {
+    modalTableProps = _objectSpread2({
       modalTableTitle: '选择SKU',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
@@ -3643,11 +3746,20 @@ function commonFun(type, prefixUrl) {
         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'
@@ -3657,16 +3769,29 @@ function commonFun(type, prefixUrl) {
       }, {
         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;
   } // 仓库选择器（物理、逻辑仓）
 
 
   if (type === 'physicalWarehouse') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/physicalWarehouse"),
       filter: 'qp-physicalWarehouseName,physicalWarehouseCode-orGroup,like',
       mappingTextField: 'physicalWarehouseName',
@@ -3677,7 +3802,7 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'warehouseIds'
-    };
+    }, requestConfigProp);
     tableSearchForm = [{
       name: 'qp-physicalWarehouseName-like',
       label: '物理仓名称'
@@ -3716,7 +3841,7 @@ function commonFun(type, prefixUrl) {
     })]).then(function (x) {
       formatSource(x, 0, 3, tableSearchForm);
     });
-    modalTableProps = {
+    modalTableProps = _objectSpread2({
       modalTableTitle: '选择物理仓',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
@@ -3735,11 +3860,11 @@ function commonFun(type, prefixUrl) {
         title: '所属公司',
         dataIndex: 'companyName'
       }]
-    };
+    }, modalTableBusProps);
   }
 
   if (type === 'realWarehouse') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/realWarehouse"),
       filter: 'qp-realWarehouseName,realWarehouseCode-orGroup,like',
       mappingTextField: 'realWarehouseName',
@@ -3750,7 +3875,7 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'warehouseIds'
-    };
+    }, requestConfigProp);
     tableSearchForm = [{
       name: 'qp-realWarehouseName-like',
       label: '逻辑仓名称'
@@ -3763,7 +3888,7 @@ function commonFun(type, prefixUrl) {
       label: '逻辑仓类型',
       initialSource: getDictionarySource('SC00004')
     }];
-    modalTableProps = {
+    modalTableProps = _objectSpread2({
       modalTableTitle: '选择逻辑仓',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
@@ -3779,12 +3904,12 @@ function commonFun(type, prefixUrl) {
           return getDictionaryTextByValue('SC00004', text);
         }
       }]
-    };
+    }, modalTableBusProps);
   } // 仓库选择器（虚拟、渠道仓）（无弹窗）
 
 
   if (type === 'virtualWarehouse') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/virtualWarehouse"),
       filter: 'qp-virtualWarehouseName,virtualWarehouseCode-orGroup,like',
       mappingTextField: 'virtualWarehouseName',
@@ -3795,12 +3920,12 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'warehouseIds'
-    };
+    }, requestConfigProp);
     needModalTable = false;
   }
 
   if (type === 'channelWarehouse') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/channelWarehouse"),
       filter: 'qp-channelWarehouseName,channelWarehouseCode-orGroup,like',
       mappingTextField: 'channelWarehouseName',
@@ -3811,13 +3936,13 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'warehouseIds'
-    };
+    }, requestConfigProp);
     needModalTable = false;
   } // 客户选择器
 
 
   if (type === 'customer') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/uc/customer/v2"),
       filter: 'qp-name,code-orGroup,like',
       mappingTextField: 'name',
@@ -3826,7 +3951,7 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'customCode'
-    };
+    }, requestConfigProp);
     tableSearchForm = [{
       name: 'qp-name-like',
       label: '客户名称'
@@ -3912,7 +4037,7 @@ function commonFun(type, prefixUrl) {
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 4, tableSearchForm);
     });
-    modalTableProps = {
+    modalTableProps = _objectSpread2({
       modalTableTitle: '选择客户',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
@@ -3941,12 +4066,12 @@ function commonFun(type, prefixUrl) {
           })) === null || _sharingType$find2 === void 0 ? void 0 : _sharingType$find2.text;
         }
       }]
-    };
+    }, modalTableBusProps);
   } // 店铺选择器
 
 
   if (type === 'shopFile') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/store"),
       filter: 'qp-name,code-orGroup,like',
       mappingTextField: 'name',
@@ -3955,7 +4080,7 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'code'
-    };
+    }, requestConfigProp);
     tableSearchForm = [{
       name: 'qp-name-like',
       label: '店铺名称'
@@ -4065,7 +4190,7 @@ function commonFun(type, prefixUrl) {
       formatSource(x, 2, 5, tableSearchForm);
       formatSource(x, 3, 6, tableSearchForm);
     });
-    modalTableProps = {
+    modalTableProps = _objectSpread2({
       modalTableTitle: '选择店铺',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
@@ -4097,12 +4222,12 @@ function commonFun(type, prefixUrl) {
         title: '归属核算主体',
         dataIndex: 'accountingName'
       }]
-    };
+    }, modalTableBusProps);
   } // 核算主体选择器（无弹窗）
 
 
   if (type === 'accountingSubject') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/accountingSubject"),
       filter: 'qp-name,code-orGroup,like',
       mappingTextField: 'name',
@@ -4112,13 +4237,13 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'accountingSubjectCode'
-    };
+    }, requestConfigProp);
     needModalTable = false;
   } // 库存组织选择器（无弹窗）
 
 
   if (type === 'inventoryOrg') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/inventoryOrg"),
       filter: 'qp-name,code-orGroup,like',
       mappingTextField: 'name',
@@ -4128,13 +4253,13 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'inventoryOrgCode'
-    };
+    }, requestConfigProp);
     needModalTable = false;
   } // 法人公司选择器（无弹窗）
 
 
   if (type === 'corporationCompany') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/company"),
       filter: 'qp-name,code-orGroup,like',
       mappingTextField: 'name',
@@ -4144,15 +4269,15 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'corporationCompany'
-    };
+    }, requestConfigProp);
     needModalTable = false;
   } // 员工选择器
 
 
   if (type === 'employee') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/employee/v2"),
-      filter: 'qp-name,employeeNumber-orGroup,like',
+      filter: 'qp-employeeNumber,name-orGroup,like',
       mappingTextField: 'name',
       mappingTextShowKeyField: 'employeeNumber',
       mappingValueField: 'employeeNumber',
@@ -4161,7 +4286,7 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'employeeNumber'
-    };
+    }, requestConfigProp);
     tableSearchForm = [{
       name: 'qp-name-like',
       label: '员工名称'
@@ -4201,7 +4326,7 @@ function commonFun(type, prefixUrl) {
     })]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
-    modalTableProps = {
+    modalTableProps = _objectSpread2({
       modalTableTitle: '选择员工',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
@@ -4220,12 +4345,12 @@ function commonFun(type, prefixUrl) {
         title: '手机号',
         dataIndex: 'officeTelephone'
       }]
-    };
+    }, modalTableBusProps);
   } // 配送方式选择器
 
 
   if (type === 'deliveryMode') {
-    requestConfig = {
+    requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/deliveryMode"),
       filter: 'qp-name,code-orGroup,like',
       mappingTextField: 'name',
@@ -4235,7 +4360,7 @@ function commonFun(type, prefixUrl) {
         sorter: 'desc-id'
       },
       sourceName: 'deliveryModeCode'
-    };
+    }, requestConfigProp);
     tableSearchForm = [{
       name: 'qp-name-like',
       label: '配送方式名称'
@@ -4304,7 +4429,7 @@ function commonFun(type, prefixUrl) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 5, tableSearchForm);
     });
-    modalTableProps = {
+    modalTableProps = _objectSpread2({
       modalTableTitle: '选择配送方式',
       tableSearchForm: tableSearchForm,
       tableColumns: [{
@@ -4339,7 +4464,7 @@ function commonFun(type, prefixUrl) {
         dataIndex: 'remark',
         title: '备注'
       }]
-    };
+    }, modalTableBusProps);
   }
 
   return {
@@ -4358,23 +4483,30 @@ var BusinessSearchSelect = function BusinessSearchSelect(props) {
     formSelectFix: '/bop/api'
   };
 
-  var _commonFun = commonFun(businessType, prefixUrl),
+  var _commonFun = commonFun(businessType, prefixUrl, (props === null || props === void 0 ? void 0 : props.requestConfig) || {}, (props === null || props === void 0 ? void 0 : props.modalTableProps) || {}),
       requestConfig = _commonFun.requestConfig,
       modalTableProps = _commonFun.modalTableProps,
       needModalTable = _commonFun.needModalTable;
 
   var currentProps = useMemo(function () {
-    return _objectSpread2(_objectSpread2({
-      requestConfig: requestConfig
-    }, props), {}, {
+    return _objectSpread2(_objectSpread2({}, props), {}, {
+      requestConfig: requestConfig,
       needModalTable: needModalTable,
       modalTableProps: modalTableProps
     });
-  }, []);
+  }, [props === null || props === void 0 ? void 0 : props.value]);
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(MemoSearchSelect, _objectSpread2({}, currentProps)));
 };
 
-var index = /*#__PURE__*/React.memo(BusinessSearchSelect, function () {
+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;
+  }
+
+  if (props && props.value !== nextProps.value) {
+    return false;
+  }
+
   return true;
 });
 
@@ -4463,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');
@@ -4523,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 };