@kmkf-fe-packages/basic-components 2.0.54-beta.3 → 2.0.54

package/README.md

@@ -19,4 +19,4 @@ yarn start
 - config 公共方法
 - assets 静态资源
 
-1111111
+111111

package/dist/index.esm.js

@@ -473,57 +473,6 @@ function _nonIterableSpread() {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _createForOfIteratorHelper(o, allowArrayLike) {
-  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-  if (!it) {
-    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-      if (it) o = it;
-      var i = 0;
-      var F = function () {};
-      return {
-        s: F,
-        n: function () {
-          if (i >= o.length) return {
-            done: true
-          };
-          return {
-            done: false,
-            value: o[i++]
-          };
-        },
-        e: function (e) {
-          throw e;
-        },
-        f: F
-      };
-    }
-    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  var normalCompletion = true,
-    didErr = false,
-    err;
-  return {
-    s: function () {
-      it = it.call(o);
-    },
-    n: function () {
-      var step = it.next();
-      normalCompletion = step.done;
-      return step;
-    },
-    e: function (e) {
-      didErr = true;
-      err = e;
-    },
-    f: function () {
-      try {
-        if (!normalCompletion && it.return != null) it.return();
-      } finally {
-        if (didErr) throw err;
-      }
-    }
-  };
-}
 function _toPrimitive(input, hint) {
   if (typeof input !== "object" || input === null) return input;
   var prim = input[Symbol.toPrimitive];
@@ -8001,7 +7950,8 @@ var WidgetMap = {
 var pageSize = 50;
 var SubForm = function SubForm(props) {
   var _selectOptions$;
-  var value = props.value,
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     needFilterShopByPermission = props.needFilterShopByPermission,
     _props$subConfig = props.subConfig,
@@ -8303,7 +8253,7 @@ var SubForm = function SubForm(props) {
         }
       });
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), [_objectSpread2(_objectSpread2({}, newValue), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value || []), [_objectSpread2(_objectSpread2({}, newValue), {}, {
       uuid: uuid()
     })]));
   };
@@ -13265,7 +13215,6 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
-    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -14178,20 +14127,15 @@ var getColumns$2 = function getColumns(_ref) {
     WDT_REISSUE_GOODS: [{
       dataIndex: 'goodId',
       title: "\u5546\u54C1ID",
-      width: 120,
-      align: 'center',
-      ellipsis: true
+      width: 120
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 180
+      width: 200
     }, {
       dataIndex: 'goodName',
       title: "\u5546\u54C1\u540D\u79F0",
       width: 200,
-      align: 'center',
       render: function render(text) {
         return /*#__PURE__*/React.createElement(CopyTextIcon, {
           val: text
@@ -14200,19 +14144,14 @@ var getColumns$2 = function getColumns(_ref) {
     }, {
       dataIndex: 'specId',
       title: "SKUID",
-      align: 'center',
-      ellipsis: true,
       width: 150
     }, {
       dataIndex: 'specNo',
       title: "\u5546\u54C1SKU\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 180
+      width: 200
     }, {
       dataIndex: 'specName',
       title: "\u5546\u54C1SKU\u540D\u79F0",
-      align: 'center',
       width: 250,
       render: function render(text) {
         return /*#__PURE__*/React.createElement(CopyTextIcon, {
@@ -14325,7 +14264,18 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: renderGiftType
+      render: function render(val) {
+        var giftTypeMap = {
+          0: '非赠品',
+          1: '自动赠送',
+          2: '手工赠送',
+          3: '回购自动送赠品',
+          4: '前N有礼送赠品',
+          6: '天猫优仓赠品',
+          7: '淘宝CRM会员送赠'
+        };
+        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
+      }
     }],
     //旺店通退货商品信息
     WDT_RETURN_GOODS: [{
@@ -14421,7 +14371,18 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: renderGiftType
+      render: function render(val) {
+        var giftTypeMap = {
+          0: '非赠品',
+          1: '自动赠送',
+          2: '手工赠送',
+          3: '回购自动送赠品',
+          4: '前N有礼送赠品',
+          6: '天猫优仓赠品',
+          7: '淘宝CRM会员送赠'
+        };
+        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
+      }
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14542,7 +14503,18 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: renderGiftType
+      render: function render(val) {
+        var giftTypeMap = {
+          0: '非赠品',
+          1: '自动赠送',
+          2: '手工赠送',
+          3: '回购自动送赠品',
+          4: '前N有礼送赠品',
+          6: '天猫优仓赠品',
+          7: '淘宝CRM会员送赠'
+        };
+        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
+      }
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14726,15 +14698,6 @@ var getYesOrNo$1 = function getYesOrNo(val) {
   if (isNull(val)) return null;
   return val ? '是' : '否';
 };
-function toNum(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
 var getColumns$4 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -14892,19 +14855,6 @@ var getColumns$4 = function getColumns(_ref) {
       dataIndex: 'qty',
       title: "\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
-          var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15008,19 +14958,6 @@ var getColumns$4 = function getColumns(_ref) {
       dataIndex: 'qty',
       title: "\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
-          var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15112,15 +15049,6 @@ var fillAttrs = function fillAttrs(item) {
   if (!item.align) item.align = 'center';
   return item;
 };
-function toNum$1(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
 var getColumns$5 = function getColumns() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     _ref$text = _ref.text,
@@ -15304,19 +15232,6 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15336,19 +15251,6 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15433,19 +15335,6 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'salePrice',
       title: '单价',
       width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15463,19 +15352,6 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'qty',
       title: '数量',
       width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
           style: {
@@ -15787,30 +15663,6 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     })['default']
   });
 };
-var erpColumnsMap = getColumnsMap$1();
-var erpFormValidator = function erpFormValidator(_rule, value, type) {
-  var validatorFnList = (erpColumnsMap[type] || erpColumnsMap['default']).map(function (column) {
-    return column.validator;
-  }).filter(Boolean);
-  var res = null;
-  var _iterator = _createForOfIteratorHelper(validatorFnList),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var validatorFn = _step.value;
-      var validatorResult = validatorFn(_rule, value, type);
-      if (validatorResult) {
-        res = validatorResult;
-        break;
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return res;
-};
 var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
   var clone_columnsMap = cloneDeep(getColumnsMap$1());
   var newColumns = {};
@@ -15818,8 +15670,7 @@ var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
       return {
         title: col.title,
-        dataIndex: col.dataIndex,
-        disabled: !!col.validator
+        dataIndex: col.dataIndex
       };
     });
   });
@@ -16201,18 +16052,16 @@ var GoodItem$1 = function GoodItem(props) {
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
     if (isStringArray) {
       baseInfoColumns = initBaseInfoColumns.filter(function (col) {
-        return showHeader.includes(col.dataIndex) || (col === null || col === void 0 ? void 0 : col.validator);
+        return showHeader.includes(col.dataIndex);
       });
     } else if (isObjectArray) {
-      baseInfoColumns = showHeader.map(function (col) {
+      baseInfoColumns = showHeader.filter(function (col) {
+        return col.show !== false;
+      }).map(function (col) {
         var currentCol = initBaseInfoColumns.find(function (item) {
           return item.dataIndex === col.dataIndex;
         });
-        // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
-        if (currentCol && (col.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator))) {
-          return currentCol;
-        }
-        return undefined;
+        return currentCol ? currentCol : undefined;
       }).filter(Boolean);
     }
     var columnList = [{
@@ -19583,7 +19432,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key] || key, item.ruleName);
+    }, msgTypeCh[key], item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -20420,4 +20269,4 @@ var GyReturnGoods = function GyReturnGoods(props) {
   })));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, erpColumnsMap, erpFormValidator, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, index$2 as erpModalColumnsMap, getColumns$5 as getJstColumns, getColumns$3 as getWlnColumns };

package/dist/index.js

@@ -485,57 +485,6 @@ function _nonIterableSpread() {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _createForOfIteratorHelper(o, allowArrayLike) {
-  var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-  if (!it) {
-    if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-      if (it) o = it;
-      var i = 0;
-      var F = function () {};
-      return {
-        s: F,
-        n: function () {
-          if (i >= o.length) return {
-            done: true
-          };
-          return {
-            done: false,
-            value: o[i++]
-          };
-        },
-        e: function (e) {
-          throw e;
-        },
-        f: F
-      };
-    }
-    throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-  }
-  var normalCompletion = true,
-    didErr = false,
-    err;
-  return {
-    s: function () {
-      it = it.call(o);
-    },
-    n: function () {
-      var step = it.next();
-      normalCompletion = step.done;
-      return step;
-    },
-    e: function (e) {
-      didErr = true;
-      err = e;
-    },
-    f: function () {
-      try {
-        if (!normalCompletion && it.return != null) it.return();
-      } finally {
-        if (didErr) throw err;
-      }
-    }
-  };
-}
 function _toPrimitive(input, hint) {
   if (typeof input !== "object" || input === null) return input;
   var prim = input[Symbol.toPrimitive];
@@ -8013,7 +7962,8 @@ var WidgetMap = {
 var pageSize = 50;
 var SubForm = function SubForm(props) {
   var _selectOptions$;
-  var value = props.value,
+  var _props$value = props.value,
+    value = _props$value === void 0 ? [] : _props$value,
     onChange = props.onChange,
     needFilterShopByPermission = props.needFilterShopByPermission,
     _props$subConfig = props.subConfig,
@@ -8315,7 +8265,7 @@ var SubForm = function SubForm(props) {
         }
       });
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value), [_objectSpread2(_objectSpread2({}, newValue), {}, {
+    onChange === null || onChange === void 0 ? void 0 : onChange([].concat(_toConsumableArray(value || []), [_objectSpread2(_objectSpread2({}, newValue), {}, {
       uuid: kmkfUtils.uuid()
     })]));
   };
@@ -13277,7 +13227,6 @@ var getTableData$2 = function getTableData(_ref, formData) {
   var current = _ref.current,
     pageSize = _ref.pageSize;
   var data = {
-    goodShortName: formData.goodShortName || null,
     goodNo: formData.goodNo || null,
     goodName: formData.goodName || null,
     skuCode: formData.skuCode || null,
@@ -14190,20 +14139,15 @@ var getColumns$2 = function getColumns(_ref) {
     WDT_REISSUE_GOODS: [{
       dataIndex: 'goodId',
       title: "\u5546\u54C1ID",
-      width: 120,
-      align: 'center',
-      ellipsis: true
+      width: 120
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 180
+      width: 200
     }, {
       dataIndex: 'goodName',
       title: "\u5546\u54C1\u540D\u79F0",
       width: 200,
-      align: 'center',
       render: function render(text) {
         return /*#__PURE__*/React__default['default'].createElement(CopyTextIcon, {
           val: text
@@ -14212,19 +14156,14 @@ var getColumns$2 = function getColumns(_ref) {
     }, {
       dataIndex: 'specId',
       title: "SKUID",
-      align: 'center',
-      ellipsis: true,
       width: 150
     }, {
       dataIndex: 'specNo',
       title: "\u5546\u54C1SKU\u7F16\u7801",
-      align: 'center',
-      ellipsis: true,
-      width: 180
+      width: 200
     }, {
       dataIndex: 'specName',
       title: "\u5546\u54C1SKU\u540D\u79F0",
-      align: 'center',
       width: 250,
       render: function render(text) {
         return /*#__PURE__*/React__default['default'].createElement(CopyTextIcon, {
@@ -14337,7 +14276,18 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: renderGiftType
+      render: function render(val) {
+        var giftTypeMap = {
+          0: '非赠品',
+          1: '自动赠送',
+          2: '手工赠送',
+          3: '回购自动送赠品',
+          4: '前N有礼送赠品',
+          6: '天猫优仓赠品',
+          7: '淘宝CRM会员送赠'
+        };
+        return /*#__PURE__*/React__default['default'].createElement("span", null, giftTypeMap[val]);
+      }
     }],
     //旺店通退货商品信息
     WDT_RETURN_GOODS: [{
@@ -14433,7 +14383,18 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: renderGiftType
+      render: function render(val) {
+        var giftTypeMap = {
+          0: '非赠品',
+          1: '自动赠送',
+          2: '手工赠送',
+          3: '回购自动送赠品',
+          4: '前N有礼送赠品',
+          6: '天猫优仓赠品',
+          7: '淘宝CRM会员送赠'
+        };
+        return /*#__PURE__*/React__default['default'].createElement("span", null, giftTypeMap[val]);
+      }
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14554,7 +14515,18 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: renderGiftType
+      render: function render(val) {
+        var giftTypeMap = {
+          0: '非赠品',
+          1: '自动赠送',
+          2: '手工赠送',
+          3: '回购自动送赠品',
+          4: '前N有礼送赠品',
+          6: '天猫优仓赠品',
+          7: '淘宝CRM会员送赠'
+        };
+        return /*#__PURE__*/React__default['default'].createElement("span", null, giftTypeMap[val]);
+      }
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14738,15 +14710,6 @@ var getYesOrNo$1 = function getYesOrNo(val) {
   if (kmkfUtils.isNull(val)) return null;
   return val ? '是' : '否';
 };
-function toNum(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
 var getColumns$4 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
@@ -14904,19 +14867,6 @@ var getColumns$4 = function getColumns(_ref) {
       dataIndex: 'qty',
       title: "\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.gyReissueGoods) || []).some(function (goods) {
-          var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15020,19 +14970,6 @@ var getColumns$4 = function getColumns(_ref) {
       dataIndex: 'qty',
       title: "\u6570\u91CF",
       width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.gyReturnGoods) || []).some(function (goods) {
-          var qty = toNum(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.goodName) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.goodName, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15124,15 +15061,6 @@ var fillAttrs = function fillAttrs(item) {
   if (!item.align) item.align = 'center';
   return item;
 };
-function toNum$1(value) {
-  if (typeof value === 'string') {
-    return value ? +value : void 0;
-  }
-  if (typeof value === 'number') {
-    return value;
-  }
-  return void 0;
-}
 var getColumns$5 = function getColumns() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     _ref$text = _ref.text,
@@ -15316,19 +15244,6 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15348,19 +15263,6 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReissueGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15445,19 +15347,6 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'salePrice',
       title: '单价',
       width: 120,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var v = toNum$1(goods === null || goods === void 0 ? void 0 : goods.salePrice);
-          var res = typeof v === 'number' ? v < 0 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u5355\u4EF7\u4E3A\u5927\u4E8E\u7B49\u4E8E0\u7684\u6570"));
-        }
-      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15475,19 +15364,6 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'qty',
       title: '数量',
       width: 100,
-      validator: function validator(_rule, value) {
-        var goodsName = '';
-        if (((value === null || value === void 0 ? void 0 : value.jstReturnGoods) || []).some(function (goods) {
-          var qty = toNum$1(goods === null || goods === void 0 ? void 0 : goods.qty);
-          var res = typeof qty === 'number' ? qty < 1 : true;
-          if (res) {
-            goodsName = (goods === null || goods === void 0 ? void 0 : goods.name) ? "[".concat(goods === null || goods === void 0 ? void 0 : goods.name, "]") : '';
-          }
-          return res;
-        })) {
-          return Promise.reject("".concat(goodsName, "\u6570\u91CF\u5FC5\u987B\u5927\u4E8E0"));
-        }
-      },
       render: function render(val, record, index) {
         return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
           style: {
@@ -15799,30 +15675,6 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     })['default']
   });
 };
-var erpColumnsMap = getColumnsMap$1();
-var erpFormValidator = function erpFormValidator(_rule, value, type) {
-  var validatorFnList = (erpColumnsMap[type] || erpColumnsMap['default']).map(function (column) {
-    return column.validator;
-  }).filter(Boolean);
-  var res = null;
-  var _iterator = _createForOfIteratorHelper(validatorFnList),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var validatorFn = _step.value;
-      var validatorResult = validatorFn(_rule, value, type);
-      if (validatorResult) {
-        res = validatorResult;
-        break;
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return res;
-};
 var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
   var clone_columnsMap = lodash.cloneDeep(getColumnsMap$1());
   var newColumns = {};
@@ -15830,8 +15682,7 @@ var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
       return {
         title: col.title,
-        dataIndex: col.dataIndex,
-        disabled: !!col.validator
+        dataIndex: col.dataIndex
       };
     });
   });
@@ -16213,18 +16064,16 @@ var GoodItem$1 = function GoodItem(props) {
     var isObjectArray = Array.isArray(showHeader) && Object.prototype.toString.call(showHeader[0]) === '[object Object]';
     if (isStringArray) {
       baseInfoColumns = initBaseInfoColumns.filter(function (col) {
-        return showHeader.includes(col.dataIndex) || (col === null || col === void 0 ? void 0 : col.validator);
+        return showHeader.includes(col.dataIndex);
       });
     } else if (isObjectArray) {
-      baseInfoColumns = showHeader.map(function (col) {
+      baseInfoColumns = showHeader.filter(function (col) {
+        return col.show !== false;
+      }).map(function (col) {
         var currentCol = initBaseInfoColumns.find(function (item) {
           return item.dataIndex === col.dataIndex;
         });
-        // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
-        if (currentCol && (col.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator))) {
-          return currentCol;
-        }
-        return undefined;
+        return currentCol ? currentCol : undefined;
       }).filter(Boolean);
     }
     var columnList = [{
@@ -19595,7 +19444,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, kmkfUtils.msgTypeCh[key] || key, item.ruleName);
+    }, kmkfUtils.msgTypeCh[key], item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -20499,10 +20348,6 @@ exports.WdtGoodList = WdtGoodList;
 exports.WdtReissue = wdtReissue;
 exports.WlnGoods = WlnGoods;
 exports.columnsBaseInfoMap = columnsBaseInfoMap;
-exports.erpColumnsMap = erpColumnsMap;
-exports.erpFormValidator = erpFormValidator;
 exports.erpModalColumnsMap = index$2;
-exports.getGyColumns = getColumns$4;
 exports.getJstColumns = getColumns$5;
-exports.getWdtColumns = getColumns$2;
 exports.getWlnColumns = getColumns$3;

package/dist/src/bs/component/GoodItem/constants/bsE3ReissueGoodsColumns.d.ts

@@ -3,13 +3,5 @@ type P = {
     updateHandle: (v: any, index: number, key: string) => void;
     operate?: boolean;
 };
-export declare const getBsE3ReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => {
-    dataIndex: string;
-    title: string;
-    width?: number | undefined;
-    align: string;
-    ellipsis: boolean;
-    render?: ((val: any, record: any, index: number) => any) | undefined;
-    validator?: ((rule: any, value: any, callback: any) => any) | undefined;
-}[];
+export declare const getBsE3ReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => any[];
 export {};

package/dist/src/bs/component/GoodItem/constants/wdtReissueGoodsColumns.d.ts

@@ -5,21 +5,5 @@ type P = {
     updateHandle: (v: any, index: number, key: string) => void;
     operate?: boolean;
 };
-export declare const getWdtReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => ({
-    dataIndex: string;
-    title: string;
-    width?: number | undefined;
-    align: string;
-    ellipsis: boolean;
-    render?: ((val: any, record: any, index: number) => any) | undefined;
-    validator?: ((rule: any, value: any, callback: any) => any) | undefined;
-} | {
-    render: ((val: number) => React.JSX.Element) | ((val: any, record: any, index: number) => React.JSX.Element);
-    dataIndex: string;
-    title: string;
-    width?: number | undefined;
-    align: string;
-    ellipsis: boolean;
-    validator?: ((rule: any, value: any, callback: any) => any) | undefined;
-})[];
+export declare const getWdtReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => any[];
 export {};

package/dist/src/constants/columnsBaseInfoMap.d.ts

@@ -1,16 +1,7 @@
-type ColumnsItemType = {
-    dataIndex: string;
-    title: string;
-    width?: number;
-    align?: 'left' | 'center' | 'right';
-    ellipsis?: boolean;
-    render?: (val: any, record: any, index: number) => any;
-    validator?: (rule: any, value: any, callback: any) => any;
+type ColumnsMapType = {
+    [key: string]: any[];
 };
-type ColumnsMapType = Record<string, ColumnsItemType[]>;
 export type GetColumnsBaseInfoMapFnType = (...args: any[]) => ColumnsMapType;
 export declare const getColumnsMap: GetColumnsBaseInfoMapFnType;
-export declare const erpColumnsMap: ColumnsMapType;
-export declare const erpFormValidator: (_rule: any, value: any, type: string) => any;
 declare const _default: ColumnsMapType;
 export default _default;

package/dist/src/constants/index.d.ts

@@ -1,4 +1,2 @@
 export { default as getJstColumns } from './jst';
 export { default as getWlnColumns } from './wln';
-export { default as getGyColumns } from './gy';
-export { default as getWdtColumns } from './wdt';

package/dist/src/index.d.ts

@@ -66,5 +66,5 @@ export type { WdtGoods } from './bs/component/model/WdtGoodList';
 export { default as GyReissue } from './gy/Reissue';
 export * from './constants/index';
 export { default as GyReturn } from './gy/Return';
-export { default as columnsBaseInfoMap, erpColumnsMap, erpFormValidator, } from './constants/columnsBaseInfoMap';
+export { default as columnsBaseInfoMap } from './constants/columnsBaseInfoMap';
 export { default as erpModalColumnsMap } from './bs/component/model/Columns';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.0.54-beta.3",
+  "version": "2.0.54",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -20,7 +20,7 @@
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
   },
   "dependencies": {
-    "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.2",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.54",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "589761f1e797ee16bb6ffe7c973181646609e556"
+  "gitHead": "67e965ffb447b6c6fc0bddb1c2ef9d78edf5f93a"
 }