@bit-sun/business-component 2.0.2 → 2.0.5

package/dist/index.esm.js

@@ -2363,16 +2363,26 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       var _this$props = _this.props,
           validDataUrl = _this$props.validDataUrl,
           updateData = _this$props.updateData,
-          columns = _this$props.columns;
+          columns = _this$props.columns,
+          isBrandAuth = _this$props.isBrandAuth;
 
       var resultData = _this.getData().filter(function (d) {
         return _.compact(Object.values(d)).length;
-      });
+      }); // 处理业务参数
 
-      axios.post(validDataUrl, {
+
+      var otherParams = {};
+
+      if (isBrandAuth) {
+        otherParams = {
+          brandAuth: 'ctl-withAuth'
+        };
+      }
+
+      axios.post(validDataUrl, _objectSpread2(_objectSpread2({}, otherParams), {}, {
         columns: columns,
         data: resultData
-      }).then(function (result) {
+      })).then(function (result) {
         result = result.data;
 
         if (result.status !== '0') {
@@ -2962,7 +2972,6 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       console.time();
       var sheetData = luckysheet$1.getSheetData();
       var data = JSON.parse(JSON.stringify(sheetData)).filter(function (item) {
-        debugger;
         return item[0];
       }).map(function (item) {
         var obj = {};
@@ -4386,9 +4395,72 @@ var SearchSelect = function SearchSelect(props) {
   }), " \u5168\u9009\u6240\u6709\u9875\u9762") : '')))));
 };
 
-var css_248z$4 = ".add_select_show {\n  display: flex;\n}\n.add_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.add_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.add_select_header {\n  border-bottom: 1px solid #D9D9D9;\n  height: 24px;\n  height: 40px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 40px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n}\n.add_select_header > span {\n  margin-left: 20px;\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 40px;\n}\n.add_select_header > span > span {\n  color: #ff0000;\n}\n.add_select_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_wrapper {\n  position: relative;\n  display: flex;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n  margin: 5px 10px;\n}\n.add_select_wrapper .ant-table-pagination.ant-pagination {\n  margin: 5px;\n  padding-right: 5px;\n}\n.add_select_wrapper .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.add_select_wrapper .ant-table-thead th {\n  height: 20px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper .row-class {\n  height: 24px;\n}\n.add_select_wrapper .row-class td {\n  font-size: 12px !important;\n  height: 24px !important;\n  padding: 0px 8px !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-table-body {\n  height: 240px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.add_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_left {\n  flex-basis: 298px;\n  width: 298px;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-right: 10px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.add_select_wrapper_right {\n  width: 872px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 10px;\n}\n.add_select_wrapper_right,\n.add_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.add_select_wrapper .select_list_columns {\n  height: 272px;\n  overflow-y: auto;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.add_select_wrapper .select_list_columns_formItems {\n  padding: 10px;\n}\n.add_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px;\n  justify-content: flex-end;\n}\n.add_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.add_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 5px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.add_select_wrapper_select {\n  margin-top: 4px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n  margin: 5px 10px;\n}\n.add_select_wrapper_select .ant-table-pagination.ant-pagination {\n  margin: 9px;\n  padding-right: 5px;\n}\n.add_select_wrapper_select .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper_select .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper_select .ant-table-thead th {\n  height: 23px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 23px !important;\n}\n.add_select_wrapper_select .ant-modal-close-x {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class td {\n  font-size: 12px !important;\n  height: 30px !important;\n  padding: 4px 8px !important;\n}\n.add_select_wrapper_select .ant-table-body {\n  height: 200px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper_select .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_select .ant-input-number-input {\n  height: auto;\n}\n.add_select_wrapper_select .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 3px;\n  border-bottom: 1px solid #D9D9D9;\n}\n";
+var css_248z$4 = ".add_select_show {\n  display: flex;\n}\n.add_select_expand_button {\n  position: relative;\n  width: 30px;\n  color: #ffffff;\n  cursor: pointer;\n}\n.add_select_expand_button span {\n  position: absolute;\n  height: 20px;\n  line-height: 14px;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n.add_select_header {\n  border-bottom: 1px solid #D9D9D9;\n  height: 24px;\n  height: 40px;\n  font-family: PingFangSC-Medium;\n  font-weight: 500;\n  font-size: 18px;\n  color: #000000;\n  letter-spacing: 0;\n  line-height: 40px;\n  margin-bottom: 10px;\n  padding-left: 10px;\n}\n.add_select_header > span {\n  margin-left: 20px;\n  font-weight: 400;\n  font-size: 12px;\n  color: #666666;\n  letter-spacing: 0;\n  line-height: 40px;\n}\n.add_select_header > span > span {\n  color: #ff0000;\n}\n.add_select_header_close span {\n  position: absolute;\n  color: black !important;\n  right: 10px;\n  top: 10px;\n}\n.add_select_wrapper {\n  position: relative;\n  display: flex;\n  max-height: 60vh;\n  overflow: hidden;\n  font-size: 14px;\n  margin: 5px 10px;\n}\n.add_select_wrapper .ant-table-pagination.ant-pagination {\n  margin: 5px;\n  padding-right: 5px;\n}\n.add_select_wrapper .ant-checkbox-wrapper {\n  justify-content: center;\n}\n.add_select_wrapper .ant-form-item-label {\n  padding: 0PX;\n  line-height: 23px !important;\n}\n.add_select_wrapper .ant-form-item-label > label {\n  font-size: 12px;\n}\n.add_select_wrapper .ant-table-thead th {\n  height: 20px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper .row-class {\n  height: 24px;\n}\n.add_select_wrapper .row-class td {\n  font-size: 12px !important;\n  height: 24px !important;\n  padding: 0px 8px !important;\n  line-height: 20px !important;\n}\n.add_select_wrapper .ant-table-body {\n  height: 240px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_click_flag {\n  position: absolute;\n  z-index: 10;\n}\n.add_select_wrapper_click_flag_arrow {\n  transform: rotate(0deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_click_flag_arrow_1 {\n  transform: rotate(-180deg);\n  transition: transform 0.5s;\n}\n.add_select_wrapper_left {\n  flex-basis: 298px;\n  width: 298px;\n  overflow-y: hidden;\n  transition: all 0.3s;\n  margin-right: 10px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_left1 {\n  width: 0;\n  height: 0;\n  transition: all 0.3s;\n  display: none;\n}\n.add_select_wrapper_right {\n  width: 872px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n}\n.add_select_wrapper_right1 {\n  width: 100%;\n  margin-left: 10px;\n}\n.add_select_wrapper_right,\n.add_select_wrapper_right1 {\n  overflow-x: auto;\n}\n.add_select_wrapper .select_list_columns {\n  height: 272px;\n  overflow-y: auto;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_columns_tips {\n  background: #eee;\n  padding: 6px 20px;\n  margin-bottom: 10px;\n}\n.add_select_wrapper .select_list_columns_formItems {\n  padding: 7px 10px;\n}\n.add_select_wrapper .select_list_searchButton {\n  display: flex;\n  margin: 10px;\n  justify-content: flex-end;\n}\n.add_select_wrapper .select_list_button_space {\n  margin-right: 10px;\n}\n.add_select_wrapper .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 5px;\n  border-bottom: 1px solid #D9D9D9;\n}\n.add_select_wrapper .select_list_selectAll {\n  position: relative;\n  top: -40px;\n  left: 20px;\n  width: 160px;\n}\n.add_select_wrapper_select {\n  margin-top: 4px;\n  border: 1px solid #D9D9D9;\n  border-radius: 5px;\n  margin: 5px 10px;\n}\n.add_select_wrapper_select .ant-table-pagination.ant-pagination {\n  margin: 9px;\n  padding-right: 5px;\n}\n.add_select_wrapper_select .ant-modal-body {\n  padding: 10px;\n}\n.add_select_wrapper_select .ant-table-wrapper {\n  padding: 0px !important;\n}\n.add_select_wrapper_select .ant-table-thead th {\n  height: 23px !important;\n  padding: 0px 8px !important;\n  font-size: 12px !important;\n  font-weight: 600 !important;\n  line-height: 23px !important;\n}\n.add_select_wrapper_select .ant-modal-close-x {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class {\n  height: 30px;\n}\n.add_select_wrapper_select .row-class td {\n  font-size: 12px !important;\n  height: 30px !important;\n  padding: 4px 8px !important;\n}\n.add_select_wrapper_select .ant-table-body {\n  height: 200px;\n  overflow-y: auto !important;\n}\n.add_select_wrapper_select .ant-row.ant-form-item {\n  margin-bottom: 10px;\n}\n.add_select_wrapper_select .ant-input-number-input {\n  height: auto;\n}\n.add_select_wrapper_select .select_list_selectTips {\n  display: flex;\n  justify-content: space-between;\n  height: 24px;\n  font-size: 12px;\n  line-height: 24px;\n  background: #F7F8FB;\n  padding: 0 3px;\n  border-bottom: 1px solid #D9D9D9;\n}\n";
 styleInject(css_248z$4);
 
+var loadSelectSource = function loadSelectSource(url, params) {
+  return new Promise(function (resolve, reject) {
+    axios.get("".concat(url, "?").concat(stringify(params))).then(function (result) {
+      var _result, _result2;
+
+      result = result.data;
+
+      if (((_result = result) === null || _result === void 0 ? void 0 : _result.status) && result.status !== '0' || ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.code) && result.code !== '000000') {
+        message.error(result.msg);
+        return;
+      }
+
+      resolve(result);
+    }).catch(function (err) {
+      reject(err);
+    });
+  });
+};
+
+var formatSource = function formatSource(reData, position, changePosition, changeSearchForm) {
+  var _reData$position;
+
+  var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['code', 'name'];
+  var data = reData && ((_reData$position = reData[position]) === null || _reData$position === void 0 ? void 0 : _reData$position.data);
+  var list = Array.isArray(data) ? data : (data === null || data === void 0 ? void 0 : data.items) || (data === null || data === void 0 ? void 0 : data.list) || (data === null || data === void 0 ? void 0 : data.children) || [];
+  var formatData = (list === null || list === void 0 ? void 0 : list.length) ? list.map(function (v) {
+    return {
+      text: v[resKeyValue[1]],
+      value: v[resKeyValue[0]]
+    };
+  }) : [];
+  changeSearchForm[changePosition] = _objectSpread2(_objectSpread2({}, changeSearchForm[changePosition]), {}, {
+    initialSource: formatData
+  });
+}; // 格式化树选择器数据源
+
+
+var mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue) {
+  var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  return {
+    title: treeDataItem[resKeyValue[1]],
+    value: treeDataItem[resKeyValue[0]],
+    parentId: treeDataItem.parent,
+    data: _objectSpread2({}, treeDataItem),
+    isLeaf: !haveChildren,
+    disabled: haveChildren,
+    children: haveChildren ? treeDataItem.children.map(function (i) {
+      return mapSearchTree(i, resKeyValue);
+    }) : []
+  };
+};
+
+var formatTreeDataSource = function formatTreeDataSource(reData, position, changePosition, changeSearchForm) {
+  var _reData$position2;
+
+  var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
+  var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
+  var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
+    return mapSearchTree(ites, resKeyValue);
+  }) || [];
+  changeSearchForm[changePosition].field.props.treeData = formatData;
+};
+
 var Option$1 = Select.Option;
 
 var AddSelect = function AddSelect(props) {
@@ -4406,7 +4478,10 @@ var AddSelect = function AddSelect(props) {
       _props$needModalTable = props.needModalTable,
       needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
       _props$getPopupContai = props.getPopupContainer,
-      onSaveCallback = props.onSaveCallback;
+      onSaveCallback = props.onSaveCallback,
+      _props$buttonText = props.buttonText,
+      buttonText = _props$buttonText === void 0 ? '添加' : _props$buttonText,
+      beforeShowModal = props.beforeShowModal;
 
   var _ref = requestConfig || {},
       url = _ref.url,
@@ -4508,51 +4583,56 @@ var AddSelect = function AddSelect(props) {
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
       form = _Form$useForm2[0];
 
-  var _useState17 = useState(true),
+  var _useState17 = useState(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm),
       _useState18 = _slicedToArray(_useState17, 2),
-      caretLeftFlag = _useState18[0],
-      setCaretLeftFlag = _useState18[1];
+      tableSearchForm = _useState18[0],
+      setTableSearchForm = _useState18[1];
 
-  var _useState19 = useState([]),
+  var _useState19 = useState(true),
       _useState20 = _slicedToArray(_useState19, 2),
-      tableData = _useState20[0],
-      setTableData = _useState20[1];
+      caretLeftFlag = _useState20[0],
+      setCaretLeftFlag = _useState20[1];
 
-  var _useState21 = useState({
+  var _useState21 = useState([]),
+      _useState22 = _slicedToArray(_useState21, 2),
+      tableData = _useState22[0],
+      setTableData = _useState22[1];
+
+  var _useState23 = useState({
     total: 0,
     size: "small",
     current: 1,
     pageSize: tableInitPageSize
   }),
-      _useState22 = _slicedToArray(_useState21, 2),
-      tablePagination = _useState22[0],
-      setTablePagination = _useState22[1];
-
-  var _useState23 = useState([]),
       _useState24 = _slicedToArray(_useState23, 2),
-      selectedRowKeys = _useState24[0],
-      setSelectedRowKeys = _useState24[1];
+      tablePagination = _useState24[0],
+      setTablePagination = _useState24[1];
 
   var _useState25 = useState([]),
       _useState26 = _slicedToArray(_useState25, 2),
-      doubleArr = _useState26[0],
-      setDoubleArr = _useState26[1]; // 存放双数组的数组
+      selectedRowKeys = _useState26[0],
+      setSelectedRowKeys = _useState26[1];
 
-
-  var _useState27 = useState(false),
+  var _useState27 = useState([]),
       _useState28 = _slicedToArray(_useState27, 2),
-      checkedAll = _useState28[0],
-      setCheckedAll = _useState28[1];
+      doubleArr = _useState28[0],
+      setDoubleArr = _useState28[1]; // 存放双数组的数组
+
 
   var _useState29 = useState(false),
       _useState30 = _slicedToArray(_useState29, 2),
-      indeterminate = _useState30[0],
-      setIndeterminate = _useState30[1];
+      checkedAll = _useState30[0],
+      setCheckedAll = _useState30[1];
 
-  var _useState31 = useState({}),
+  var _useState31 = useState(false),
       _useState32 = _slicedToArray(_useState31, 2),
-      tableFormParams = _useState32[0],
-      setTableFormParams = _useState32[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
+      indeterminate = _useState32[0],
+      setIndeterminate = _useState32[1];
+
+  var _useState33 = useState({}),
+      _useState34 = _slicedToArray(_useState33, 2),
+      tableFormParams = _useState34[0],
+      setTableFormParams = _useState34[1]; // 获取数据源 （type: 1下拉框 2弹框  不传值默认为下拉框）
 
 
   var getData = function getData() {
@@ -4677,12 +4757,12 @@ var AddSelect = function AddSelect(props) {
     }, otherParams), fixedParam), params);
 
     axios.get("".concat(url, "?").concat(stringify(queryParams))).then(function (result) {
-      var _result, _result2;
+      var _result3, _result4;
 
       setFetching(false);
       result = result.data;
 
-      if (((_result = result) === null || _result === void 0 ? void 0 : _result.status) && result.status !== '0' || ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.code) && result.code !== '000000') {
+      if (((_result3 = result) === null || _result3 === void 0 ? void 0 : _result3.status) && result.status !== '0' || ((_result4 = result) === null || _result4 === void 0 ? void 0 : _result4.code) && result.code !== '000000') {
         message.error(result.msg);
         return;
       }
@@ -4700,6 +4780,8 @@ var AddSelect = function AddSelect(props) {
       } else {
         var keys = res.list ? 'list' : 'items';
         source = res ? res[keys] ? res[keys].map(function (item) {
+          var _item$packingUnitList, _item$packingUnitList2;
+
           var textShowText = item[mappingTextField];
 
           if (mappingTextShowTextField) {
@@ -4718,9 +4800,14 @@ var AddSelect = function AddSelect(props) {
             text: item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
-            value: item[mappingValueField]
+            value: item[mappingValueField],
+            baseUnitCode: item === null || item === void 0 ? void 0 : (_item$packingUnitList = item.packingUnitList) === null || _item$packingUnitList === void 0 ? void 0 : (_item$packingUnitList2 = _item$packingUnitList.find(function (item) {
+              return item.baseUnit === true;
+            })) === null || _item$packingUnitList2 === void 0 ? void 0 : _item$packingUnitList2.unitCode
           });
         }) : Array.isArray(res) && (res === null || res === void 0 ? void 0 : res.map(function (item) {
+          var _item$packingUnitList3, _item$packingUnitList4;
+
           var textShowText = item[mappingTextField];
 
           if (mappingTextShowTextField) {
@@ -4739,7 +4826,10 @@ var AddSelect = function AddSelect(props) {
             text: item[mappingTextField],
             textShowText: textShowText,
             textShowKey: item[mappingTextShowKeyField || mappingValueField],
-            value: item[mappingValueField]
+            value: item[mappingValueField],
+            baseUnitCode: item === null || item === void 0 ? void 0 : (_item$packingUnitList3 = item.packingUnitList) === null || _item$packingUnitList3 === void 0 ? void 0 : (_item$packingUnitList4 = _item$packingUnitList3.find(function (item) {
+              return item.baseUnit === true;
+            })) === null || _item$packingUnitList4 === void 0 ? void 0 : _item$packingUnitList4.unitCode
           });
         })) : [];
       }
@@ -4766,7 +4856,17 @@ var AddSelect = function AddSelect(props) {
   };
 
   useEffect(function () {
-    run('init');
+    Promise.all([loadSelectSource("/items/brand/queryBrandList", {
+      pageSize: 5000,
+      currentPage: 1,
+      'ctl-withAuth': true
+    }), loadSelectSource("/items/category/queryCategoryTree", {
+      pageSize: 5000,
+      currentPage: 1
+    })]).then(function (x) {
+      formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
+      formatTreeDataSource(x, 1, 3, tableSearchForm);
+    });
   }, []);
   useEffect(function () {
     if (value) {
@@ -4778,10 +4878,7 @@ var AddSelect = function AddSelect(props) {
   }, [sourceName]);
 
   var showModal = function showModal() {
-    getData({
-      pageSize: tableInitPageSize,
-      currentPage: 1
-    }, 2);
+    // getData({ pageSize: tableInitPageSize, currentPage: 1 }, 2)
     setIsModalVisible(true); // 回显
 
     if (value) {
@@ -4815,6 +4912,24 @@ var AddSelect = function AddSelect(props) {
         }]);
       }
     }
+
+    setTimeout(function () {
+      var _document$getElementB;
+
+      (_document$getElementB = document.getElementById("first-query")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
+    }, 50);
+  };
+
+  var handleShowModal = function handleShowModal() {
+    if (beforeShowModal) {
+      beforeShowModal(popvalue).then(function (res) {
+        showModal();
+      }).catch(function (Error) {
+        message.warning(Error);
+      });
+    } else {
+      showModal();
+    }
   };
 
   var handleOk = function handleOk(isContinue) {
@@ -4827,8 +4942,11 @@ var AddSelect = function AddSelect(props) {
     if (onSaveCallback) {
       onSaveCallback(popvalue).then(function (res) {
         {
+          var _document$getElementB2;
+
           message.success('保存成功');
           deleteSelectRows();
+          (_document$getElementB2 = document.getElementById('first-query')) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
           !isContinue && handleCancel();
         }
       }).catch(function (Error) {
@@ -4843,10 +4961,9 @@ var AddSelect = function AddSelect(props) {
     form.resetFields();
     setTableFormParams({});
     setIsModalVisible(false);
-
-    if (selectMode) {
-      run();
-    }
+    setTableData([]); // if (selectMode) {
+    //   run();
+    // }
   };
 
   var onSearchTable = function onSearchTable() {
@@ -4878,6 +4995,14 @@ var AddSelect = function AddSelect(props) {
   }; // 扁平化二维数组的方法
 
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
+    if (selectKeys.length - selectedRowKeys.length > 0) {
+      if (selectKeys.length - selectedRowKeys.length === 1) {
+        selectRows[selectRows.length - 1]['needFocus'] = true;
+      } else {
+        selectRows[selectedRowKeys.length]['needFocus'] = true;
+      }
+    }
+
     setPopValue(selectRows);
     setSelectedRowKeys(selectKeys); // setIndeterminate(!!filterRows.length && filterRows.length < tablePagination?.total);
     // setCheckedAll(filterRows.length === tablePagination?.total);
@@ -4984,10 +5109,15 @@ var AddSelect = function AddSelect(props) {
           label: i.label,
           key: i.name
         }, /*#__PURE__*/React.createElement(Input, _objectSpread2({
-          id: index === 0 ? "2345234242342" : 'index',
+          id: index === 0 ? "first-query" : 'index',
           style: {
             width: '100%'
           },
+          onKeyDown: function onKeyDown(e) {
+            if (e.keyCode === 13) {
+              onSearchTable();
+            }
+          },
           placeholder: "\u8BF7\u8F93\u5165",
           allowClear: true,
           maxLength: 100
@@ -5023,12 +5153,16 @@ var AddSelect = function AddSelect(props) {
       inputIndex++;
       return _objectSpread2(_objectSpread2({}, item), {}, {
         render: function render(text, record, index) {
+          // let
+          if (record.needFocus === true && currentIndex === 0) ;
+
           return /*#__PURE__*/React.createElement(InputNumber, {
             defaultValue: text || 0,
             min: 0,
+            autoFocus: record.needFocus,
             keyboard: false,
             onChange: function onChange(value) {
-              record['count'] = value;
+              record[item.dataIndex] = value;
             },
             // onFocus={(e)=> {
             //   let dom1 = e.currentTarget;
@@ -5037,10 +5171,10 @@ var AddSelect = function AddSelect(props) {
             // }}
             onKeyDown: function onKeyDown(e) {
               if (e.keyCode === 13 && e.ctrlKey) {
-                var _document$getElementB;
+                var _document$getElementB3;
 
                 handleOk(true);
-                (_document$getElementB = document.getElementById("2345234242342")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
+                (_document$getElementB3 = document.getElementById("first-query")) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
               }
 
               if (e.keyCode === 8 && e.ctrlKey) {
@@ -5147,14 +5281,18 @@ var AddSelect = function AddSelect(props) {
     return item;
   })), [{
     title: '操作',
-    width: 150,
+    width: 50,
     fixed: 'right',
     render: function render(text, record, index) {
-      return /*#__PURE__*/React.createElement(Button, {
+      return /*#__PURE__*/React.createElement("span", {
+        style: {
+          cursor: 'pointer',
+          color: '#005CFF'
+        },
         onClick: function onClick() {
           deleteRecord(record);
         },
-        type: "link"
+        type: "text"
       }, "\u5220\u9664");
     }
   }]);
@@ -5164,9 +5302,9 @@ var AddSelect = function AddSelect(props) {
     className: "add_select_show",
     id: "add_select_div_".concat(uniqueValue)
   }, /*#__PURE__*/React.createElement(Button, {
-    onClick: showModal,
+    onClick: handleShowModal,
     type: "primary"
-  }, "\u6DFB\u52A0")), needModalTable && isModalVisible && /*#__PURE__*/React.createElement(Modal, {
+  }, buttonText)), needModalTable && isModalVisible && /*#__PURE__*/React.createElement(Modal, {
     width: '1200px',
     style: {
       top: 20
@@ -5221,7 +5359,7 @@ var AddSelect = function AddSelect(props) {
     form: form,
     layout: 'vertical',
     key: 'modalForm'
-  }, formItem(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm)))), /*#__PURE__*/React.createElement("div", {
+  }, formItem(tableSearchForm)))), /*#__PURE__*/React.createElement("div", {
     className: 'select_list_searchButton'
   }, /*#__PURE__*/React.createElement(Button, {
     key: 'reset',
@@ -5380,7 +5518,7 @@ var getDictionaryTextByValue = function getDictionaryTextByValue(dicCode, value)
   return dicItemArray[0].text;
 };
 
-var loadSelectSource = function loadSelectSource(url, params) {
+var loadSelectSource$1 = function loadSelectSource(url, params) {
   return new Promise(function (resolve, reject) {
     axios.get("".concat(url, "?").concat(stringify(params))).then(function (result) {
       var _result, _result2;
@@ -5587,14 +5725,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       label: '共享类型',
       initialSource: sharingTypeDataList
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
@@ -5682,7 +5820,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}), loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
     });
@@ -5714,6 +5852,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       mappingValueField: 'skuCode',
       mappingTextShowTextField: ['name', 'propertyNameAndValue'],
       otherParams: {
+        'qp-combination-eq': false,
         'qp-approveStatus-eq': 1,
         // 'qp-type-eq': 10, // 查唯一国际条码【有些项目不需要必须要有国际条码，故注释，需要的项目自己定义otherParams补充上这个条件】
         sorter: 'desc-id'
@@ -5912,14 +6051,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
       pageSize: 5000,
       currentPage: 1
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
       pageSize: 5000,
       currentPage: 1
     })]).then(function (x) {
@@ -6075,14 +6214,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
       pageSize: 5000,
       currentPage: 1,
       'ctl-withAuth': true
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
       pageSize: 5000,
       currentPage: 1
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
       pageSize: 5000,
       currentPage: 1
     })]).then(function (x) {
@@ -6173,7 +6312,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': 20
@@ -6361,14 +6500,14 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       label: '共享类型',
       initialSource: sharingTypeDataList
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
@@ -6466,7 +6605,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}), loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
     });
@@ -6589,19 +6728,19 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/platformRecord/getPlatformRecordList"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/platformRecord/getPlatformRecordList"), {
       // pageSize: 5000,
       // currentPage: 1,
       'qp-status-eq': '1'
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
     })]).then(function (x) {
@@ -6689,7 +6828,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
         }
       }
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/orgView/getTree/sales-organizational-view"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getTree/sales-organizational-view"), {
       'qp-employeeCode-eq': (_JSON$parse = JSON.parse(localStorage.getItem('userInfo') || '{}')) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$employeeR = _JSON$parse.employeeResVo) === null || _JSON$parse$employeeR === void 0 ? void 0 : _JSON$parse$employeeR.employeeNumber,
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
@@ -6816,7 +6955,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/company"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': 20
@@ -6891,7 +7030,7 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {})]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -6987,10 +7126,10 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       name: 'qp-remark-like',
       label: '备注'
     }];
-    Promise.all([loadSelectSource("".concat(prefixUrl.formSelectFix, "/logisCompany"), {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/logisCompany"), {
       pageSize: 5000,
       currentPage: 1
-    }), loadSelectSource("".concat(prefixUrl.formSelectFix, "/printTemplate"), {
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/printTemplate"), {
       pageSize: 5000,
       currentPage: 1
     })]).then(function (x) {
@@ -7078,18 +7217,336 @@ var BusinessSearchSelect$1 = /*#__PURE__*/React.memo(BusinessSearchSelect, funct
   return true;
 });
 
+var AddSkuSelect = function AddSkuSelect(parProps) {
+  var selectProps = {
+    mode: 'multiple'
+  };
+
+  var _useState = useState((selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode) ? [] : null),
+      _useState2 = _slicedToArray(_useState, 2),
+      value = _useState2[0],
+      setValue = _useState2[1];
+
+  var props = {
+    buttonText: parProps.buttonText || '新增',
+    value: value,
+    // labelInValue: true, // 非必填 默认为false
+    requestConfig: {
+      url: "/items/sku/pager/v2",
+      filter: 'qp-name-like',
+      otherParams: {
+        'qp-combination-eq': false
+      },
+      mappingTextField: 'name',
+      mappingValueField: 'skuCode'
+    },
+    selectProps: selectProps,
+    onChange: function onChange(value) {
+      console.log(value);
+      setValue(value);
+    },
+    beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
+    onSaveCallback: parProps.onSaveCallback // onSaveCallback: (rows) => {
+    //   console.log('save call', rows);
+    //   // return Promise.resolve(true);
+    //   // return Promise.reject('FAILE')
+    // }
+
+  };
+  var modalTableProps = {
+    modalTableTitle: '选择商品',
+    tableSearchForm: [{
+      name: 'qp-skuCode-like',
+      label: 'SKU编码'
+    }, {
+      name: 'qp-skuName-like',
+      label: 'SKU名称'
+    }, {
+      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: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-categoryId-in',
+      type: 'treeSelect',
+      label: '类目',
+      field: {
+        type: 'treeSelect',
+        props: {
+          treeData: [],
+          treeCheckable: true,
+          showSearch: true,
+          allowClear: true,
+          showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
+          maxTagCount: 1,
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
+          }
+        }
+      }
+    }],
+    tableColumns: [{
+      title: 'SKU编码',
+      width: 150,
+      dataIndex: 'skuCode'
+    }, {
+      title: 'SKU名称',
+      width: 200,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'name'
+    }, {
+      title: '国际条码',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      dataIndex: 'barCode',
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      }
+    }, {
+      title: '所属SPU名称',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      dataIndex: 'itemName',
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      }
+    }, {
+      title: '所属SPU编码',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      dataIndex: 'itemCode',
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      }
+    }, {
+      title: '外部编码',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'externalCode'
+    }, {
+      title: '规格',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'propertyNameAndValue'
+    }, {
+      title: '类目',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'categoryName'
+    }, {
+      title: '品类',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'className'
+    }, {
+      title: '品牌',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'brandName'
+    }],
+    selectColumn: [{
+      title: 'SKU编码',
+      width: 150,
+      dataIndex: 'skuCode'
+    }, {
+      title: 'SKU名称',
+      width: 200,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'name'
+    }, {
+      title: '数量',
+      width: 100,
+      isInputItem: true,
+      dataIndex: 'count'
+    }, {
+      title: '单位',
+      dataIndex: 'selectUnitCode',
+      width: 80,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text, record) {
+        var baseUnitCode = '';
+
+        if (record === null || record === void 0 ? void 0 : record.packingUnitList) {
+          var base = record.packingUnitList.filter(function (item) {
+            return item.unitCode;
+          });
+
+          if (base.length) {
+            var _base$;
+
+            baseUnitCode = base[0].unitCode;
+            record.selectUnitCode = base[0].unitCode;
+            record.selectedScale = ((_base$ = base[0]) === null || _base$ === void 0 ? void 0 : _base$.baseUnitScale) || 1;
+          }
+        }
+
+        if (baseUnitCode) {
+          return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Select, {
+            defaultValue: baseUnitCode,
+            onChange: function onChange(value) {
+              var _record$packingUnitLi, _record$packingUnitLi2;
+
+              record.selectUnitCode = value;
+              record.selectedScale = (record === null || record === void 0 ? void 0 : (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi.find(function (item) {
+                return item.unitCode === value;
+              })) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.baseUnitScale) || 1;
+            },
+            style: {
+              width: '60px'
+            }
+          }, record.packingUnitList && record.packingUnitList.map(function (item) {
+            return /*#__PURE__*/React.createElement(Select.Option, {
+              value: item.unitCode
+            }, item.name);
+          })));
+        }
+
+        return /*#__PURE__*/React.createElement(React.Fragment, null);
+      }
+    }, {
+      title: '所属SPU编码',
+      width: 150,
+      ellipsis: {
+        showTitle: false
+      },
+      dataIndex: 'itemCode',
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      }
+    }, {
+      title: '规格',
+      width: 200,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React.createElement(Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'propertyNameAndValue'
+    }]
+  };
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
+    modalTableProps: modalTableProps
+  })));
+};
+
 var CommodityEntry = function CommodityEntry(props) {
   var dataValidationRef = useRef();
   var _props$buttonName = props.buttonName,
       buttonName = _props$buttonName === void 0 ? ' + 录入商品' : _props$buttonName,
       _props$modalTitle = props.modalTitle,
       modalTitle = _props$modalTitle === void 0 ? '录入商品' : _props$modalTitle,
+      _props$buttonProps = props.buttonProps,
+      buttonProps = _props$buttonProps === void 0 ? {} : _props$buttonProps,
       callbackHideModal = props.callbackHideModal,
       callbackHandleOk = props.callbackHandleOk,
       _props$columns = props.columns,
       columns = _props$columns === void 0 ? ["skuCode", "quantity", "price"] : _props$columns,
       _props$validDataUrl = props.validDataUrl,
-      validDataUrl = _props$validDataUrl === void 0 ? "/items/api/recordDetailImport/check" : _props$validDataUrl;
+      validDataUrl = _props$validDataUrl === void 0 ? "/items/sku/import/check" : _props$validDataUrl,
+      _props$isBrandAuth = props.isBrandAuth,
+      isBrandAuth = _props$isBrandAuth === void 0 ? true : _props$isBrandAuth;
 
   var _useState = useState({
     maskClosable: false,
@@ -7140,9 +7597,9 @@ var CommodityEntry = function CommodityEntry(props) {
     modalProps.hideModal();
   };
 
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Button, _objectSpread2({
     onClick: handleShowModal
-  }, buttonName), modalProps.visible && /*#__PURE__*/React.createElement(Modal, _objectSpread2(_objectSpread2({}, modalProps), {}, {
+  }, buttonProps), buttonName), modalProps.visible && /*#__PURE__*/React.createElement(Modal, _objectSpread2(_objectSpread2({}, modalProps), {}, {
     onOk: handleOk,
     onCancel: handleCancel,
     destroyOnClose: true,
@@ -7152,7 +7609,8 @@ var CommodityEntry = function CommodityEntry(props) {
       dataValidationRef = ref;
     },
     columns: columns,
-    validDataUrl: validDataUrl
+    validDataUrl: validDataUrl,
+    isBrandAuth: isBrandAuth
   })) || '');
 };
 
@@ -7544,4 +8002,4 @@ if (localStorage.getItem('x-user-auth-context')) {
   axios.defaults.headers.common['x-user-auth-context'] = localStorage.getItem('x-user-auth-context');
 }
 
-export { AddSelect, BusinessSearchSelect$1 as BusinessSearchSelect, index$1 as BusinessTreeSearchSelect, index as CheckOneUser, CommodityEntry, DataImport, DataValidation, QueryMutipleInput, SearchSelect, TreeSearchSelect };
+export { AddSelect, AddSkuSelect, BusinessSearchSelect$1 as BusinessSearchSelect, index$1 as BusinessTreeSearchSelect, index as CheckOneUser, CommodityEntry, DataImport, DataValidation, QueryMutipleInput, SearchSelect, TreeSearchSelect };