@kmkf-fe-packages/basic-components 1.22.1-beta.55 → 1.22.1-beta.58

package/README.md

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

package/dist/index.esm.js

@@ -3,7 +3,7 @@ import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, messag
 import { EyeOutlined, DeleteOutlined, CloseCircleOutlined, CaretUpOutlined } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
-import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, GY_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, BsAddressData, WdtAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, filterKmOrders, KM_SYSTEM_ORDER_CONFIG, BS_E3_ORDER_STATUS_MAP, GY_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, msgTypeCh } from '@kmkf-fe-packages/kmkf-utils';
 import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
@@ -12498,8 +12498,8 @@ var getTableData$2 = function getTableData(_ref, formData) {
     pageSize = _ref.pageSize;
   var data = {
     skuName: formData.skuName || null,
-    sku: formData.sku || null,
-    goodsName: formData.goodsName || null,
+    skuCode: formData.skuCode || null,
+    goodName: formData.goodName || null,
     goodNo: formData.goodNo || null
   };
   return extendRequest('/qy/gdfw/product/product/page', {
@@ -12516,10 +12516,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
       _res$data$total = _res$data.total,
       total = _res$data$total === void 0 ? 0 : _res$data$total;
     var newProducts = productSkuList.map(function (item, index) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        salesPrice: item === null || item === void 0 ? void 0 : item.retailPrice,
-        specNo: item.goodId
-      });
+      return _objectSpread2({}, item);
     });
     return {
       total: total,
@@ -13738,10 +13735,15 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
+var getYesOrNo = function getYesOrNo(val) {
+  if (isNull(val)) return null;
+  return val ? '是' : '否';
+};
 var getColumns$4 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
   return {
     //管易商品信息
     GY_GOODS: [{
@@ -13781,7 +13783,11 @@ var getColumns$4 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'qty');
+            updateDataHandle({
+              qty: num,
+              amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
@@ -13798,17 +13804,17 @@ var getColumns$4 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'price');
+            updateDataHandle({
+              price: num,
+              amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
+            }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
       dataIndex: 'amount',
       title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150,
-      render: function render(_, record) {
-        return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
-      }
+      width: 150
     }, {
       dataIndex: 'originPrice',
       title: "\u6807\u51C6\u5355\u4EF7",
@@ -13816,10 +13822,7 @@ var getColumns$4 = function getColumns(_ref) {
     }, {
       dataIndex: 'originAmount',
       title: "\u6807\u51C6\u91D1\u989D",
-      width: 150,
-      render: function render(_, record) {
-        return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
-      }
+      width: 150
     }, {
       dataIndex: 'discountFee',
       title: "\u8BA9\u5229\u91D1\u989D",
@@ -13833,7 +13836,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React.createElement("span", null, +val ? '是' : '否');
+        return /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -13852,13 +13855,18 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, +val ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
       }
     }, {
       dataIndex: 'skuNote',
       title: "\u5546\u54C1\u5907\u6CE8",
       width: 150
-    }],
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
     //管易补发商品信息
     GY_REISSUE_GOODS: [{
       dataIndex: 'goodName',
@@ -13897,7 +13905,11 @@ var getColumns$4 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'qty');
+            updateDataHandle({
+              qty: num,
+              amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
@@ -13914,17 +13926,17 @@ var getColumns$4 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'price');
+            updateDataHandle({
+              price: num,
+              amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
+            }, index);
           }
         }) : /*#__PURE__*/React.createElement("span", null, val);
       }
     }, {
       dataIndex: 'amount',
       title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150,
-      render: function render(_, record) {
-        return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
-      }
+      width: 150
     }, {
       dataIndex: 'originPrice',
       title: "\u6807\u51C6\u5355\u4EF7",
@@ -13932,10 +13944,7 @@ var getColumns$4 = function getColumns(_ref) {
     }, {
       dataIndex: 'originAmount',
       title: "\u6807\u51C6\u91D1\u989D",
-      width: 150,
-      render: function render(_, record) {
-        return /*#__PURE__*/React.createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
-      }
+      width: 150
     }, {
       dataIndex: 'isGift',
       title: "\u662F\u5426\u8D60\u54C1",
@@ -13953,9 +13962,14 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React.createElement("span", null, +val ? '是' : '否');
+        }) : /*#__PURE__*/React.createElement("span", null, getYesOrNo(val));
       }
-    }]
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
   };
 };
 
@@ -14070,7 +14084,8 @@ var getColumnsMap = function getColumnsMap(args) {
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
   return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
@@ -14090,7 +14105,8 @@ var getColumnsMap = function getColumnsMap(args) {
   })), getColumns$4({
     text: text,
     disabled: disabled,
-    updateHandle: updateHandle
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), {}, {
     default: getColumns$5({
       text: text,
@@ -14196,61 +14212,6 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   });
 };
 
-var renderGiftType$1 = function renderGiftType(val) {
-  var giftTypeMap = {
-    0: '非赠品',
-    1: '自动赠送',
-    2: '手工赠送',
-    3: '回购自动送赠品',
-    4: '前N有礼送赠品',
-    6: '天猫优仓赠品',
-    7: '淘宝CRM会员送赠'
-  };
-  return /*#__PURE__*/React.createElement("span", null, giftTypeMap[val]);
-};
-var renderFieldMap$2 = {
-  num: function num(_ref) {
-    var disabled = _ref.disabled,
-      updateHandle = _ref.updateHandle;
-    return function (val, record, index) {
-      return !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
-        style: {
-          width: 70
-        },
-        value: val,
-        min: 1,
-        precision: 0,
-        onChange: function onChange(num) {
-          return updateHandle(num, index, 'num');
-        }
-      }) : /*#__PURE__*/React.createElement("span", null, val);
-    };
-  },
-  giftType: function giftType() {
-    return renderGiftType$1;
-  }
-};
-var getGyReissueGoodColumns = function getGyReissueGoodColumns(_ref2) {
-  var disabled = _ref2.disabled,
-    updateHandle = _ref2.updateHandle,
-    operate = _ref2.operate;
-  return getColumnsMap()['GY_REISSUE_GOODS'].map(function (item) {
-    var newItem = _objectSpread2({
-      align: 'center',
-      ellipsis: true
-    }, item);
-    if (operate && (renderFieldMap$2 === null || renderFieldMap$2 === void 0 ? void 0 : renderFieldMap$2[item.dataIndex])) {
-      return _objectSpread2(_objectSpread2({}, newItem), {}, {
-        render: renderFieldMap$2 === null || renderFieldMap$2 === void 0 ? void 0 : renderFieldMap$2[item.dataIndex]({
-          disabled: disabled,
-          updateHandle: updateHandle
-        })
-      });
-    }
-    return newItem;
-  });
-};
-
 var MAIN_FIELD = 'uuid';
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -14403,6 +14364,12 @@ var GoodItem$1 = function GoodItem(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(value));
     }
   };
+  var updateDataHandle = function updateDataHandle(data, index) {
+    if (value === null || value === void 0 ? void 0 : value.length) {
+      value[index] = _objectSpread2(_objectSpread2({}, value[index]), data);
+      onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(value));
+    }
+  };
   var COLUMNS_MAP = function COLUMNS_MAP() {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var operate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
@@ -14416,11 +14383,13 @@ var GoodItem$1 = function GoodItem(props) {
         case 'BS_GOODS':
         case 'WLN_GOODS':
         case 'GY_GOODS':
+        case 'GY_REISSUE_GOODS':
           {
             columns = getColumnsMap({
               text: text,
               disabled: disabled,
-              updateHandle: updateHandle
+              updateHandle: updateHandle,
+              updateDataHandle: updateDataHandle
             })[type];
           }
           break;
@@ -14433,15 +14402,6 @@ var GoodItem$1 = function GoodItem(props) {
             });
           }
           break;
-        case 'GY_REISSUE_GOODS':
-          {
-            columns = getGyReissueGoodColumns({
-              disabled: disabled,
-              updateHandle: updateHandle,
-              operate: operate
-            });
-          }
-          break;
         case 'BS_E3_REISSUE_GOODS':
           {
             columns = getBsE3ReissueGoodColumns({
@@ -14455,7 +14415,8 @@ var GoodItem$1 = function GoodItem(props) {
           columns = getColumnsMap({
             text: text,
             disabled: disabled,
-            updateHandle: updateHandle
+            updateHandle: updateHandle,
+            updateDataHandle: updateDataHandle
           })['default'];
       }
       return columns;
@@ -14596,7 +14557,8 @@ var GoodItem$1 = function GoodItem(props) {
           goodNo: goodNo,
           specName: specName,
           specNo: specNo,
-          originPrice: retailPrice
+          originPrice: !isNull(retailPrice) ? Number(retailPrice) : null,
+          originAmount: !isNull(retailPrice) ? Number(retailPrice) : null
         });
       });
     } else {

package/dist/index.js

@@ -12510,8 +12510,8 @@ var getTableData$2 = function getTableData(_ref, formData) {
     pageSize = _ref.pageSize;
   var data = {
     skuName: formData.skuName || null,
-    sku: formData.sku || null,
-    goodsName: formData.goodsName || null,
+    skuCode: formData.skuCode || null,
+    goodName: formData.goodName || null,
     goodNo: formData.goodNo || null
   };
   return extendRequest('/qy/gdfw/product/product/page', {
@@ -12528,10 +12528,7 @@ var getTableData$2 = function getTableData(_ref, formData) {
       _res$data$total = _res$data.total,
       total = _res$data$total === void 0 ? 0 : _res$data$total;
     var newProducts = productSkuList.map(function (item, index) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        salesPrice: item === null || item === void 0 ? void 0 : item.retailPrice,
-        specNo: item.goodId
-      });
+      return _objectSpread2({}, item);
     });
     return {
       total: total,
@@ -13750,10 +13747,15 @@ var isNumberOrNumberString = function isNumberOrNumberString(value) {
   if (typeof value === 'string' && !isNaN(Number(value)) && value.trim() !== '') return true;
   return false;
 };
+var getYesOrNo = function getYesOrNo(val) {
+  if (kmkfUtils.isNull(val)) return null;
+  return val ? '是' : '否';
+};
 var getColumns$4 = function getColumns(_ref) {
   var _ref$text = _ref.text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
   return {
     //管易商品信息
     GY_GOODS: [{
@@ -13793,7 +13795,11 @@ var getColumns$4 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'qty');
+            updateDataHandle({
+              qty: num,
+              amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
@@ -13810,17 +13816,17 @@ var getColumns$4 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'price');
+            updateDataHandle({
+              price: num,
+              amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
       dataIndex: 'amount',
       title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150,
-      render: function render(_, record) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
-      }
+      width: 150
     }, {
       dataIndex: 'originPrice',
       title: "\u6807\u51C6\u5355\u4EF7",
@@ -13828,10 +13834,7 @@ var getColumns$4 = function getColumns(_ref) {
     }, {
       dataIndex: 'originAmount',
       title: "\u6807\u51C6\u91D1\u989D",
-      width: 150,
-      render: function render(_, record) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
-      }
+      width: 150
     }, {
       dataIndex: 'discountFee',
       title: "\u8BA9\u5229\u91D1\u989D",
@@ -13845,7 +13848,7 @@ var getColumns$4 = function getColumns(_ref) {
       title: "\u662F\u5426\u53D6\u6D88",
       width: 150,
       render: function render(val) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, +val ? '是' : '否');
+        return /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
       }
     }, {
       dataIndex: 'isGift',
@@ -13864,13 +13867,18 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, +val ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
       }
     }, {
       dataIndex: 'skuNote',
       title: "\u5546\u54C1\u5907\u6CE8",
       width: 150
-    }],
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    }),
     //管易补发商品信息
     GY_REISSUE_GOODS: [{
       dataIndex: 'goodName',
@@ -13909,7 +13917,11 @@ var getColumns$4 = function getColumns(_ref) {
           min: 1,
           precision: 0,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'qty');
+            updateDataHandle({
+              qty: num,
+              amount: num && isNumberOrNumberString(record.price) ? num * record.price : null,
+              originAmount: num && isNumberOrNumberString(record.originPrice) ? num * record.originPrice : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
@@ -13926,17 +13938,17 @@ var getColumns$4 = function getColumns(_ref) {
           min: 0,
           precision: 2,
           onChange: function onChange(num) {
-            return updateHandle(num, index, 'price');
+            updateDataHandle({
+              price: num,
+              amount: num && isNumberOrNumberString(record.qty) ? num * record.qty : null
+            }, index);
           }
         }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
       }
     }, {
       dataIndex: 'amount',
       title: "\u5B9E\u9645\u91D1\u989D",
-      width: 150,
-      render: function render(_, record) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.price) ? record.qty * record.price : '');
-      }
+      width: 150
     }, {
       dataIndex: 'originPrice',
       title: "\u6807\u51C6\u5355\u4EF7",
@@ -13944,10 +13956,7 @@ var getColumns$4 = function getColumns(_ref) {
     }, {
       dataIndex: 'originAmount',
       title: "\u6807\u51C6\u91D1\u989D",
-      width: 150,
-      render: function render(_, record) {
-        return /*#__PURE__*/React__default['default'].createElement("span", null, isNumberOrNumberString(record.qty) && isNumberOrNumberString(record.originPrice) ? record.qty * record.originPrice : '');
-      }
+      width: 150
     }, {
       dataIndex: 'isGift',
       title: "\u662F\u5426\u8D60\u54C1",
@@ -13965,9 +13974,14 @@ var getColumns$4 = function getColumns(_ref) {
             label: '否',
             value: 0
           }]
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, +val ? '是' : '否');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, getYesOrNo(val));
       }
-    }]
+    }].map(function (item) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        align: 'center',
+        ellipsis: true
+      });
+    })
   };
 };
 
@@ -14082,7 +14096,8 @@ var getColumnsMap = function getColumnsMap(args) {
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
-    updateHandle = _ref.updateHandle;
+    updateHandle = _ref.updateHandle,
+    updateDataHandle = _ref.updateDataHandle;
   return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns$1({
     text: text,
     disabled: disabled,
@@ -14102,7 +14117,8 @@ var getColumnsMap = function getColumnsMap(args) {
   })), getColumns$4({
     text: text,
     disabled: disabled,
-    updateHandle: updateHandle
+    updateHandle: updateHandle,
+    updateDataHandle: updateDataHandle
   })), {}, {
     default: getColumns$5({
       text: text,
@@ -14208,61 +14224,6 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   });
 };
 
-var renderGiftType$1 = function renderGiftType(val) {
-  var giftTypeMap = {
-    0: '非赠品',
-    1: '自动赠送',
-    2: '手工赠送',
-    3: '回购自动送赠品',
-    4: '前N有礼送赠品',
-    6: '天猫优仓赠品',
-    7: '淘宝CRM会员送赠'
-  };
-  return /*#__PURE__*/React__default['default'].createElement("span", null, giftTypeMap[val]);
-};
-var renderFieldMap$2 = {
-  num: function num(_ref) {
-    var disabled = _ref.disabled,
-      updateHandle = _ref.updateHandle;
-    return function (val, record, index) {
-      return !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
-        style: {
-          width: 70
-        },
-        value: val,
-        min: 1,
-        precision: 0,
-        onChange: function onChange(num) {
-          return updateHandle(num, index, 'num');
-        }
-      }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
-    };
-  },
-  giftType: function giftType() {
-    return renderGiftType$1;
-  }
-};
-var getGyReissueGoodColumns = function getGyReissueGoodColumns(_ref2) {
-  var disabled = _ref2.disabled,
-    updateHandle = _ref2.updateHandle,
-    operate = _ref2.operate;
-  return getColumnsMap()['GY_REISSUE_GOODS'].map(function (item) {
-    var newItem = _objectSpread2({
-      align: 'center',
-      ellipsis: true
-    }, item);
-    if (operate && (renderFieldMap$2 === null || renderFieldMap$2 === void 0 ? void 0 : renderFieldMap$2[item.dataIndex])) {
-      return _objectSpread2(_objectSpread2({}, newItem), {}, {
-        render: renderFieldMap$2 === null || renderFieldMap$2 === void 0 ? void 0 : renderFieldMap$2[item.dataIndex]({
-          disabled: disabled,
-          updateHandle: updateHandle
-        })
-      });
-    }
-    return newItem;
-  });
-};
-
 var MAIN_FIELD = 'uuid';
 var SelectTradeGoods = function SelectTradeGoods(_ref) {
   var columns = _ref.columns,
@@ -14415,6 +14376,12 @@ var GoodItem$1 = function GoodItem(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(value));
     }
   };
+  var updateDataHandle = function updateDataHandle(data, index) {
+    if (value === null || value === void 0 ? void 0 : value.length) {
+      value[index] = _objectSpread2(_objectSpread2({}, value[index]), data);
+      onChange === null || onChange === void 0 ? void 0 : onChange(_toConsumableArray(value));
+    }
+  };
   var COLUMNS_MAP = function COLUMNS_MAP() {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var operate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
@@ -14428,11 +14395,13 @@ var GoodItem$1 = function GoodItem(props) {
         case 'BS_GOODS':
         case 'WLN_GOODS':
         case 'GY_GOODS':
+        case 'GY_REISSUE_GOODS':
           {
             columns = getColumnsMap({
               text: text,
               disabled: disabled,
-              updateHandle: updateHandle
+              updateHandle: updateHandle,
+              updateDataHandle: updateDataHandle
             })[type];
           }
           break;
@@ -14445,15 +14414,6 @@ var GoodItem$1 = function GoodItem(props) {
             });
           }
           break;
-        case 'GY_REISSUE_GOODS':
-          {
-            columns = getGyReissueGoodColumns({
-              disabled: disabled,
-              updateHandle: updateHandle,
-              operate: operate
-            });
-          }
-          break;
         case 'BS_E3_REISSUE_GOODS':
           {
             columns = getBsE3ReissueGoodColumns({
@@ -14467,7 +14427,8 @@ var GoodItem$1 = function GoodItem(props) {
           columns = getColumnsMap({
             text: text,
             disabled: disabled,
-            updateHandle: updateHandle
+            updateHandle: updateHandle,
+            updateDataHandle: updateDataHandle
           })['default'];
       }
       return columns;
@@ -14608,7 +14569,8 @@ var GoodItem$1 = function GoodItem(props) {
           goodNo: goodNo,
           specName: specName,
           specNo: specNo,
-          originPrice: retailPrice
+          originPrice: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null,
+          originAmount: !kmkfUtils.isNull(retailPrice) ? Number(retailPrice) : null
         });
       });
     } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.22.1-beta.55",
+  "version": "1.22.1-beta.58",
   "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": "1.22.1-beta.55",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.58",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d69bc4b10246044886ccaea895763a96964e9fdc"
+  "gitHead": "293214ff1b705048b15a64cff4bdff3113ee9322"
 }

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

@@ -1,9 +0,0 @@
-import React from 'react';
-export declare const renderGiftType: (val: number) => React.JSX.Element;
-type P = {
-    disabled: boolean | undefined;
-    updateHandle: (v: any, index: number, key: string) => void;
-    operate?: boolean;
-};
-export declare const getGyReissueGoodColumns: ({ disabled, updateHandle, operate, }: P) => any[];
-export {};