@kmkf-fe-packages/basic-components 1.22.1-beta.10 → 1.22.1-beta.12

package/dist/index.esm.js

@@ -10963,6 +10963,11 @@ var jstGoods = function jstGoods(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
+  useEffect(function () {
+    if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
+      setChangeIndex(0);
+    }
+  }, value);
   var content = function content(item, index) {
     return /*#__PURE__*/React.createElement("div", {
       style: {
@@ -10973,7 +10978,7 @@ var jstGoods = function jstGoods(props) {
       style: {
         textAlign: 'center'
       }
-    }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
+    }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F"), item.sid && /*#__PURE__*/React.createElement("span", null, "(\u7CFB\u7EDF\u5355\u53F7:", item.sid, ")")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
       return /*#__PURE__*/React.createElement("div", {
         key: index
       }, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Image, {
@@ -13272,13 +13277,39 @@ var GoodItem$1 = function GoodItem(props) {
               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",
@@ -13302,7 +13333,20 @@ var GoodItem$1 = function GoodItem(props) {
               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",
@@ -13605,6 +13649,7 @@ var GoodItem$1 = function GoodItem(props) {
     }].concat(_toConsumableArray(columns));
   }, []);
   var onSubmit = function onSubmit(list) {
+    console.log('🚀 ~ onSubmit ~ list:', list);
     var newList = [];
     if (['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type)) {
       newList = list.map(function (item) {
@@ -13649,6 +13694,7 @@ var GoodItem$1 = function GoodItem(props) {
           isGift: '',
           uuid: uuid(),
           canDelete: true,
+          canEdit: true,
           goodsNumber: 1,
           canUpdateNumber: canUpdateNumber
         });

package/dist/index.js

@@ -10975,6 +10975,11 @@ var jstGoods = function jstGoods(props) {
       onChange === null || onChange === void 0 ? void 0 : onChange(typeInitValueMap[type]);
     }
   }, [value, type]);
+  React.useEffect(function () {
+    if (changeIndex > (value === null || value === void 0 ? void 0 : value.length) - 1) {
+      setChangeIndex(0);
+    }
+  }, value);
   var content = function content(item, index) {
     return /*#__PURE__*/React__default['default'].createElement("div", {
       style: {
@@ -10985,7 +10990,7 @@ var jstGoods = function jstGoods(props) {
       style: {
         textAlign: 'center'
       }
-    }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
+    }, "\u5305\u88F9".concat(index + 1, "\u5546\u54C1\u4FE1\u606F"), item.sid && /*#__PURE__*/React__default['default'].createElement("span", null, "(\u7CFB\u7EDF\u5355\u53F7:", item.sid, ")")), ((item === null || item === void 0 ? void 0 : item.items) || []).map(function (t, index) {
       return /*#__PURE__*/React__default['default'].createElement("div", {
         key: index
       }, /*#__PURE__*/React__default['default'].createElement(antd.Space, null, /*#__PURE__*/React__default['default'].createElement(antd.Image, {
@@ -13284,13 +13289,39 @@ var GoodItem$1 = function GoodItem(props) {
               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",
@@ -13314,7 +13345,20 @@ var GoodItem$1 = function GoodItem(props) {
               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",
@@ -13617,6 +13661,7 @@ var GoodItem$1 = function GoodItem(props) {
     }].concat(_toConsumableArray(columns));
   }, []);
   var onSubmit = function onSubmit(list) {
+    console.log('🚀 ~ onSubmit ~ list:', list);
     var newList = [];
     if (['WDT_REISSUE_GOODS', 'WDT_GOODS', 'WDT_EXCHANGE_GOODS'].includes(type)) {
       newList = list.map(function (item) {
@@ -13661,6 +13706,7 @@ var GoodItem$1 = function GoodItem(props) {
           isGift: '',
           uuid: kmkfUtils.uuid(),
           canDelete: true,
+          canEdit: true,
           goodsNumber: 1,
           canUpdateNumber: canUpdateNumber
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.22.1-beta.10",
+  "version": "1.22.1-beta.12",
   "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.10",
+    "@kmkf-fe-packages/kmkf-utils": "1.22.1-beta.12",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "143523e8020568c583dfb07a1044dc12ade967ee"
+  "gitHead": "43e0e8a2ead29fdebc77c8d879bb2f2092b01dbe"
 }