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

package/dist/index.esm.js

@@ -14127,15 +14127,20 @@ var getColumns$2 = function getColumns(_ref) {
     WDT_REISSUE_GOODS: [{
       dataIndex: 'goodId',
       title: "\u5546\u54C1ID",
-      width: 120
+      width: 120,
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
-      width: 200
+      align: 'center',
+      ellipsis: true,
+      width: 180
     }, {
       dataIndex: 'goodName',
       title: "\u5546\u54C1\u540D\u79F0",
       width: 200,
+      align: 'center',
       render: function render(text) {
         return /*#__PURE__*/React.createElement(CopyTextIcon, {
           val: text
@@ -14144,14 +14149,19 @@ var getColumns$2 = function getColumns(_ref) {
     }, {
       dataIndex: 'specId',
       title: "SKUID",
+      align: 'center',
+      ellipsis: true,
       width: 150
     }, {
       dataIndex: 'specNo',
       title: "\u5546\u54C1SKU\u7F16\u7801",
-      width: 200
+      align: 'center',
+      ellipsis: true,
+      width: 180
     }, {
       dataIndex: 'specName',
       title: "\u5546\u54C1SKU\u540D\u79F0",
+      align: 'center',
       width: 250,
       render: function render(text) {
         return /*#__PURE__*/React.createElement(CopyTextIcon, {
@@ -14264,18 +14274,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: function render(val) {
-        var giftTypeMap = {
-          0: '非赠品',
-          1: '自动赠送',
-          2: '手工赠送',
-          3: '回购自动送赠品',
-          4: '前N有礼送赠品',
-          6: '天猫优仓赠品',
-          7: '淘宝CRM会员送赠'
-        };
-        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }],
     //旺店通退货商品信息
     WDT_RETURN_GOODS: [{
@@ -14371,18 +14370,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: function render(val) {
-        var giftTypeMap = {
-          0: '非赠品',
-          1: '自动赠送',
-          2: '手工赠送',
-          3: '回购自动送赠品',
-          4: '前N有礼送赠品',
-          6: '天猫优仓赠品',
-          7: '淘宝CRM会员送赠'
-        };
-        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14503,18 +14491,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      render: function render(val) {
-        var giftTypeMap = {
-          0: '非赠品',
-          1: '自动赠送',
-          2: '手工赠送',
-          3: '回购自动送赠品',
-          4: '前N有礼送赠品',
-          6: '天猫优仓赠品',
-          7: '淘宝CRM会员送赠'
-        };
-        return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
-      }
+      render: renderGiftType
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14698,6 +14675,15 @@ 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,
@@ -14855,6 +14841,19 @@ 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: {
@@ -14958,6 +14957,19 @@ 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: {
@@ -15049,6 +15061,15 @@ 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,
@@ -15232,6 +15253,19 @@ 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: {
@@ -15251,6 +15285,19 @@ 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: {
@@ -15335,6 +15382,19 @@ 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: {
@@ -15352,6 +15412,19 @@ 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: {
@@ -15663,6 +15736,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     })['default']
   });
 };
+var erpColumnsMap = getColumnsMap$1();
 var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
   var clone_columnsMap = cloneDeep(getColumnsMap$1());
   var newColumns = {};
@@ -15670,7 +15744,8 @@ var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
       return {
         title: col.title,
-        dataIndex: col.dataIndex
+        dataIndex: col.dataIndex,
+        disabled: !!col.validator
       };
     });
   });
@@ -16052,16 +16127,18 @@ 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);
+        return showHeader.includes(col.dataIndex) || (col === null || col === void 0 ? void 0 : col.validator);
       });
     } else if (isObjectArray) {
-      baseInfoColumns = showHeader.filter(function (col) {
-        return col.show !== false;
-      }).map(function (col) {
+      baseInfoColumns = showHeader.map(function (col) {
         var currentCol = initBaseInfoColumns.find(function (item) {
           return item.dataIndex === col.dataIndex;
         });
-        return currentCol ? currentCol : undefined;
+        // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
+        if (currentCol && (col.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator))) {
+          return currentCol;
+        }
+        return undefined;
       }).filter(Boolean);
     }
     var columnList = [{
@@ -20269,4 +20346,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, index$2 as erpModalColumnsMap, getColumns$5 as getJstColumns, 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, erpColumnsMap, index$2 as erpModalColumnsMap, getColumns$4 as getGyColumns, getColumns$5 as getJstColumns, getColumns$2 as getWdtColumns, getColumns$3 as getWlnColumns };

package/dist/index.js

@@ -14139,15 +14139,20 @@ var getColumns$2 = function getColumns(_ref) {
     WDT_REISSUE_GOODS: [{
       dataIndex: 'goodId',
       title: "\u5546\u54C1ID",
-      width: 120
+      width: 120,
+      align: 'center',
+      ellipsis: true
     }, {
       dataIndex: 'goodNo',
       title: "\u5546\u54C1\u7F16\u7801",
-      width: 200
+      align: 'center',
+      ellipsis: true,
+      width: 180
     }, {
       dataIndex: 'goodName',
       title: "\u5546\u54C1\u540D\u79F0",
       width: 200,
+      align: 'center',
       render: function render(text) {
         return /*#__PURE__*/React__default['default'].createElement(CopyTextIcon, {
           val: text
@@ -14156,14 +14161,19 @@ var getColumns$2 = function getColumns(_ref) {
     }, {
       dataIndex: 'specId',
       title: "SKUID",
+      align: 'center',
+      ellipsis: true,
       width: 150
     }, {
       dataIndex: 'specNo',
       title: "\u5546\u54C1SKU\u7F16\u7801",
-      width: 200
+      align: 'center',
+      ellipsis: true,
+      width: 180
     }, {
       dataIndex: 'specName',
       title: "\u5546\u54C1SKU\u540D\u79F0",
+      align: 'center',
       width: 250,
       render: function render(text) {
         return /*#__PURE__*/React__default['default'].createElement(CopyTextIcon, {
@@ -14276,18 +14286,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      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]);
-      }
+      render: renderGiftType
     }],
     //旺店通退货商品信息
     WDT_RETURN_GOODS: [{
@@ -14383,18 +14382,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      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]);
-      }
+      render: renderGiftType
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14515,18 +14503,7 @@ var getColumns$2 = function getColumns(_ref) {
       align: 'center',
       ellipsis: true,
       width: 100,
-      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]);
-      }
+      render: renderGiftType
     }, {
       dataIndex: 'type',
       title: "".concat(text, "\u5546\u54C1\u7C7B\u578B"),
@@ -14710,6 +14687,15 @@ 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,
@@ -14867,6 +14853,19 @@ 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: {
@@ -14970,6 +14969,19 @@ 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: {
@@ -15061,6 +15073,15 @@ 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,
@@ -15244,6 +15265,19 @@ 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: {
@@ -15263,6 +15297,19 @@ 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: {
@@ -15347,6 +15394,19 @@ 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: {
@@ -15364,6 +15424,19 @@ 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: {
@@ -15675,6 +15748,7 @@ var getColumnsMap$1 = function getColumnsMap(args) {
     })['default']
   });
 };
+var erpColumnsMap = getColumnsMap$1();
 var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
   var clone_columnsMap = lodash.cloneDeep(getColumnsMap$1());
   var newColumns = {};
@@ -15682,7 +15756,8 @@ var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
       return {
         title: col.title,
-        dataIndex: col.dataIndex
+        dataIndex: col.dataIndex,
+        disabled: !!col.validator
       };
     });
   });
@@ -16064,16 +16139,18 @@ 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);
+        return showHeader.includes(col.dataIndex) || (col === null || col === void 0 ? void 0 : col.validator);
       });
     } else if (isObjectArray) {
-      baseInfoColumns = showHeader.filter(function (col) {
-        return col.show !== false;
-      }).map(function (col) {
+      baseInfoColumns = showHeader.map(function (col) {
         var currentCol = initBaseInfoColumns.find(function (item) {
           return item.dataIndex === col.dataIndex;
         });
-        return currentCol ? currentCol : undefined;
+        // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
+        if (currentCol && (col.show !== false || (currentCol === null || currentCol === void 0 ? void 0 : currentCol.validator))) {
+          return currentCol;
+        }
+        return undefined;
       }).filter(Boolean);
     }
     var columnList = [{
@@ -20348,6 +20425,9 @@ exports.WdtGoodList = WdtGoodList;
 exports.WdtReissue = wdtReissue;
 exports.WlnGoods = WlnGoods;
 exports.columnsBaseInfoMap = columnsBaseInfoMap;
+exports.erpColumnsMap = erpColumnsMap;
 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,5 +3,13 @@ type P = {
     updateHandle: (v: any, index: number, key: string) => void;
     operate?: boolean;
 };
-export declare const getBsE3ReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => any[];
+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 {};

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

@@ -5,5 +5,21 @@ type P = {
     updateHandle: (v: any, index: number, key: string) => void;
     operate?: boolean;
 };
-export declare const getWdtReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => any[];
+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 {};

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

@@ -1,7 +1,15 @@
-type ColumnsMapType = {
-    [key: string]: any[];
+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 = Record<string, ColumnsItemType[]>;
 export type GetColumnsBaseInfoMapFnType = (...args: any[]) => ColumnsMapType;
 export declare const getColumnsMap: GetColumnsBaseInfoMapFnType;
+export declare const erpColumnsMap: ColumnsMapType;
 declare const _default: ColumnsMapType;
 export default _default;

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

@@ -1,2 +1,4 @@
 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 } from './constants/columnsBaseInfoMap';
+export { default as columnsBaseInfoMap, erpColumnsMap, } 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.0",
+  "version": "2.0.54-beta.2",
   "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.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.54-beta.2",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "5c5a9341478c1a70321e3095479993d4649709da"
+  "gitHead": "b55971e660354da35d280c9894c498c607c26594"
 }