@kmkf-fe-packages/basic-components 1.22.1-beta.24 → 1.22.1-beta.27

package/dist/index.esm.js

@@ -12469,7 +12469,11 @@ var GoodsModal$4 = function GoodsModal(props, ref) {
 };
 var BsE3GoodsModal = /*#__PURE__*/forwardRef(GoodsModal$4);
 
-var getColumns = function getColumns() {
+var getColumns = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    text = _ref$text === void 0 ? '' : _ref$text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
   return {
     //百胜E3补发商品
     BS_E3_REISSUE_GOODS: [{
@@ -12540,7 +12544,7 @@ var getColumns = function getColumns() {
         return /*#__PURE__*/React.createElement("span", null, +val ? '是' : '否');
       }
     }],
-    //百胜商品信息
+    //百胜E3商品信息
     BS_E3_GOODS: [{
       dataIndex: 'sku',
       title: "SKU",
@@ -12624,13 +12628,39 @@ var getColumns = function getColumns() {
       title: "\u5546\u54C1\u6570\u91CF",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'goodsNumber');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
       dataIndex: 'goodsPrice',
       title: "\u5546\u54C1\u5355\u4EF7",
       align: 'center',
       ellipsis: true,
-      width: 120
+      width: 120,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'goodsPrice');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
       dataIndex: 'shopPrice',
       title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
@@ -12654,7 +12684,20 @@ var getColumns = function getColumns() {
       title: "\u5B9E\u4ED8\u91D1\u989D",
       align: 'center',
       ellipsis: true,
-      width: 120
+      width: 120,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'payment');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
     }, {
       dataIndex: 'tcSku',
       title: "\u5957\u9910SKU",
@@ -12682,6 +12725,114 @@ var getColumns = function getColumns() {
       render: function render(val) {
         return /*#__PURE__*/React.createElement("span", null, BS_E3_BOOLEAN_STATUS_MAP[val] || val);
       }
+    }],
+    BS_GOODS: [{
+      dataIndex: 'mark',
+      title: "\u5546\u54C1\u6807\u8BB0",
+      align: 'center',
+      ellipsis: true,
+      width: 70,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React.createElement(Select, {
+          options: [{
+            label: '是',
+            value: '是'
+          }, {
+            label: '否',
+            value: '否'
+          }],
+          disabled: disabled,
+          value: val,
+          onChange: function onChange(val) {
+            return updateHandle(val, index, 'mark');
+          }
+        });
+      }
+    }, {
+      dataIndex: 'skuName',
+      title: "".concat(text, "sku\u540D\u79F0"),
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'sku',
+      title: "".concat(text, "sku\u7F16\u7801"),
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'name',
+      title: "".concat(text, "\u540D\u79F0"),
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'pic',
+      title: "\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React.createElement(Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'code',
+      title: "".concat(text, "\u7F16\u7801"),
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'money',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'number',
+      title: "".concat(text, "\u6570\u91CF"),
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canUpdateNumber && !disabled ? /*#__PURE__*/React.createElement(InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 1,
+          precision: 0,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'number');
+          }
+        }) : /*#__PURE__*/React.createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'share',
+      title: "\u5206\u644A\u4EF7",
+      align: 'center',
+      ellipsis: true,
+      width: 70
+    }, {
+      dataIndex: 'type',
+      title: "\u8D60\u54C1\u7C7B\u578B",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'batch',
+      title: "\u6279\u6B21\u53F7",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'expireDate',
+      title: "\u6709\u6548\u671F",
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }]
   };
 };
@@ -13218,7 +13369,11 @@ var getColumnsMap = function getColumnsMap(args) {
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle;
-  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns()), getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle
+  })), getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -13581,6 +13736,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'WDT_RETURN_GOODS':
         case 'WDT_EXCHANGE_GOODS':
         case 'BS_E3_GOODS':
+        case 'BS_GOODS':
         case 'WLN_GOODS':
           {
             columns = getColumnsMap({
@@ -13638,8 +13794,8 @@ var GoodItem$1 = function GoodItem(props) {
         var currentCol = initBaseInfoColumns.find(function (item) {
           return item.dataIndex === col.dataIndex;
         });
-        return currentCol !== null && currentCol !== void 0 ? currentCol : col;
-      });
+        return currentCol ? currentCol : undefined;
+      }).filter(Boolean);
     }
     var columnList = [{
       dataIndex: '',

package/dist/index.js

@@ -12481,7 +12481,11 @@ var GoodsModal$4 = function GoodsModal(props, ref) {
 };
 var BsE3GoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$4);
 
-var getColumns = function getColumns() {
+var getColumns = function getColumns(_ref) {
+  var _ref$text = _ref.text,
+    text = _ref$text === void 0 ? '' : _ref$text,
+    disabled = _ref.disabled,
+    updateHandle = _ref.updateHandle;
   return {
     //百胜E3补发商品
     BS_E3_REISSUE_GOODS: [{
@@ -12552,7 +12556,7 @@ var getColumns = function getColumns() {
         return /*#__PURE__*/React__default['default'].createElement("span", null, +val ? '是' : '否');
       }
     }],
-    //百胜商品信息
+    //百胜E3商品信息
     BS_E3_GOODS: [{
       dataIndex: 'sku',
       title: "SKU",
@@ -12636,13 +12640,39 @@ var getColumns = function getColumns() {
       title: "\u5546\u54C1\u6570\u91CF",
       align: 'center',
       ellipsis: true,
-      width: 100
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canEdit && !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, 'goodsNumber');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
     }, {
       dataIndex: 'goodsPrice',
       title: "\u5546\u54C1\u5355\u4EF7",
       align: 'center',
       ellipsis: true,
-      width: 120
+      width: 120,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'goodsPrice');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
     }, {
       dataIndex: 'shopPrice',
       title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
@@ -12666,7 +12696,20 @@ var getColumns = function getColumns() {
       title: "\u5B9E\u4ED8\u91D1\u989D",
       align: 'center',
       ellipsis: true,
-      width: 120
+      width: 120,
+      render: function render(val, record, index) {
+        return record.canEdit && !disabled ? /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, {
+          style: {
+            width: 70
+          },
+          value: val,
+          min: 0,
+          precision: 2,
+          onChange: function onChange(num) {
+            return updateHandle(num, index, 'payment');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
     }, {
       dataIndex: 'tcSku',
       title: "\u5957\u9910SKU",
@@ -12694,6 +12737,114 @@ var getColumns = function getColumns() {
       render: function render(val) {
         return /*#__PURE__*/React__default['default'].createElement("span", null, kmkfUtils.BS_E3_BOOLEAN_STATUS_MAP[val] || val);
       }
+    }],
+    BS_GOODS: [{
+      dataIndex: 'mark',
+      title: "\u5546\u54C1\u6807\u8BB0",
+      align: 'center',
+      ellipsis: true,
+      width: 70,
+      render: function render(val, record, index) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+          options: [{
+            label: '是',
+            value: '是'
+          }, {
+            label: '否',
+            value: '否'
+          }],
+          disabled: disabled,
+          value: val,
+          onChange: function onChange(val) {
+            return updateHandle(val, index, 'mark');
+          }
+        });
+      }
+    }, {
+      dataIndex: 'skuName',
+      title: "".concat(text, "sku\u540D\u79F0"),
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'sku',
+      title: "".concat(text, "sku\u7F16\u7801"),
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'name',
+      title: "".concat(text, "\u540D\u79F0"),
+      align: 'center',
+      ellipsis: true,
+      width: 250
+    }, {
+      dataIndex: 'pic',
+      title: "\u56FE\u7247",
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Image, {
+          width: 60,
+          src: val
+        });
+      }
+    }, {
+      dataIndex: 'code',
+      title: "".concat(text, "\u7F16\u7801"),
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'money',
+      title: "\u5B9E\u4ED8\u91D1\u989D",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'number',
+      title: "".concat(text, "\u6570\u91CF"),
+      align: 'center',
+      ellipsis: true,
+      width: 100,
+      render: function render(val, record, index) {
+        return record.canUpdateNumber && !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, 'number');
+          }
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val);
+      }
+    }, {
+      dataIndex: 'share',
+      title: "\u5206\u644A\u4EF7",
+      align: 'center',
+      ellipsis: true,
+      width: 70
+    }, {
+      dataIndex: 'type',
+      title: "\u8D60\u54C1\u7C7B\u578B",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'batch',
+      title: "\u6279\u6B21\u53F7",
+      align: 'center',
+      ellipsis: true,
+      width: 100
+    }, {
+      dataIndex: 'expireDate',
+      title: "\u6709\u6548\u671F",
+      align: 'center',
+      ellipsis: true,
+      width: 100
     }]
   };
 };
@@ -13230,7 +13381,11 @@ var getColumnsMap = function getColumnsMap(args) {
     text = _ref$text === void 0 ? '' : _ref$text,
     disabled = _ref.disabled,
     updateHandle = _ref.updateHandle;
-  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns()), getColumns$1({
+  return _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2({}, getColumns({
+    text: text,
+    disabled: disabled,
+    updateHandle: updateHandle
+  })), getColumns$1({
     text: text,
     disabled: disabled,
     updateHandle: updateHandle
@@ -13593,6 +13748,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'WDT_RETURN_GOODS':
         case 'WDT_EXCHANGE_GOODS':
         case 'BS_E3_GOODS':
+        case 'BS_GOODS':
         case 'WLN_GOODS':
           {
             columns = getColumnsMap({
@@ -13650,8 +13806,8 @@ var GoodItem$1 = function GoodItem(props) {
         var currentCol = initBaseInfoColumns.find(function (item) {
           return item.dataIndex === col.dataIndex;
         });
-        return currentCol !== null && currentCol !== void 0 ? currentCol : col;
-      });
+        return currentCol ? currentCol : undefined;
+      }).filter(Boolean);
     }
     var columnList = [{
       dataIndex: '',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.22.1-beta.24",
+  "version": "1.22.1-beta.27",
   "description": "> TODO: description",
   "homepage": "",
   "license": "ISC",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b1d34c21e022e6d187eafe08e7838b861a5ac07c"
+  "gitHead": "f9145447958ab0b77b8c25cb6dd67ceb990028d0"
 }