@kmkf-fe-packages/basic-components 1.19.4-beta.6 → 1.19.4-beta.8

package/dist/index.esm.js

@@ -12093,7 +12093,7 @@ var getTableData$1 = function getTableData(_ref, formData) {
     data: _objectSpread2({
       pageSize: pageSize,
       pageNo: current,
-      platform: 'WDT_ERP'
+      platform: 'BS_E3_ERP'
     }, data)
   }).then(function (res) {
     var _res$data = res.data,
@@ -12124,125 +12124,85 @@ var columns$2 = [{
   },
   width: 100
 }, {
-  dataIndex: 'sku',
+  dataIndex: 'specNo',
   title: "SKU",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'skuId',
+  dataIndex: 'specId',
   title: "SKU ID",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'goodsName',
+  dataIndex: 'goodName',
   title: "\u5546\u54C1\u540D\u79F0",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'goodsShortName',
+  dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'picPath',
+  dataIndex: 'goodPicUrl',
   title: "\u5546\u54C1\u56FE\u7247",
   ellipsis: true,
   width: 100,
   render: function render(picUrl) {
     return /*#__PURE__*/React.createElement("img", {
       style: {
-        width: '60px',
-        height: '60px',
+        width: '40px',
+        height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
     });
   }
 }, {
-  dataIndex: 'goodsSn',
+  dataIndex: 'goodNo',
   title: "\u8D27\u53F7",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'goodsId',
+  dataIndex: 'goodId',
   title: "\u8D27\u53F7ID",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
   dataIndex: 'colorName',
   title: "\u989C\u8272\u540D\u79F0",
   ellipsis: true,
-  width: 70
+  width: 100
 }, {
   dataIndex: 'colorCode',
   title: "\u989C\u8272\u4EE3\u7801",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
   dataIndex: 'sizeName',
   title: "\u5C3A\u7801\u540D\u79F0",
   ellipsis: true,
-  width: 70
+  width: 100
 }, {
   dataIndex: 'sizeCode',
   title: "\u5C3A\u7801\u4EE3\u7801",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
   dataIndex: 'brandName',
   title: "\u54C1\u724C\u540D\u79F0",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'goodsNumber',
-  title: "\u5546\u54C1\u6570\u91CF",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'goodsPrice',
-  title: "\u5546\u54C1\u5355\u4EF7",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'shopPrice',
-  title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'sharePrice',
-  title: "\u5206\u644A\u4EF7",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'sharePayment',
-  title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'payment',
-  title: "\u5B9E\u4ED8\u91D1\u989D",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'tcSku',
-  title: "\u5957\u9910SKU",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'tcGoodsNumber',
-  title: "\u5957\u9910\u5957\u6570",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'taoCanSingleSl',
-  title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
   ellipsis: true,
-  width: 70
+  width: 100
 }, {
-  dataIndex: 'isGift',
-  title: "\u662F\u5426\u8D60\u54C1",
+  dataIndex: 'retailPrice',
+  title: "\u552E\u4EF7",
   ellipsis: true,
-  width: 70
+  width: 100
 }];
 var GoodList$1 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -12276,7 +12236,7 @@ var GoodList$1 = function GoodList(props, ref) {
     layout: "inline",
     form: form
   }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodsSn",
+    name: "goodNo",
     style: {
       marginBottom: '12px'
     }
@@ -12287,7 +12247,7 @@ var GoodList$1 = function GoodList(props, ref) {
       width: 150
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodsName",
+    name: "goodName",
     style: {
       marginBottom: '12px'
     }
@@ -12298,7 +12258,7 @@ var GoodList$1 = function GoodList(props, ref) {
       width: 150
     }
   })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "sku",
+    name: "skuCode",
     style: {
       marginBottom: '12px'
     }
@@ -12415,7 +12375,7 @@ var GoodList$1 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "goodsId",
+    rowKey: "specNo",
     columns: columns$2,
     scroll: {
       x: '100%',
@@ -12483,7 +12443,6 @@ var BsE3GoodsModal = /*#__PURE__*/forwardRef(GoodsModal$4);
 //   styleId: string;
 // }
 var GoodItem$1 = function GoodItem(props) {
-  var _ref;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     type = props.type,
@@ -13220,12 +13179,36 @@ var GoodItem$1 = function GoodItem(props) {
       });
     } else if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
       newList = list.map(function (item) {
-        item.uuid = uuid();
-        item.canDelete = true;
-        item.goodsNumber = 1;
-        item.goodsPrice = 0;
-        item.canUpdateNumber = canUpdateNumber;
-        return item;
+        var specNo = item.specNo,
+          specId = item.specId,
+          goodName = item.goodName,
+          goodShortName = item.goodShortName,
+          goodPicUrl = item.goodPicUrl,
+          goodNo = item.goodNo,
+          goodId = item.goodId,
+          retailPrice = item.retailPrice;
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          sku: specNo,
+          skuId: specId,
+          goodsName: goodName,
+          goodsShortName: goodShortName,
+          picPath: goodPicUrl,
+          goodsSn: goodNo,
+          goodsId: goodId,
+          goodsPrice: retailPrice,
+          shopPrice: retailPrice,
+          sharePayment: '',
+          sharePrice: '',
+          payment: '',
+          tcSku: '',
+          tcGoodsNumber: '',
+          taoCanSingleSl: '',
+          isGift: '',
+          uuid: uuid(),
+          canDelete: true,
+          goodsNumber: 1,
+          canUpdateNumber: canUpdateNumber
+        });
       });
     } else {
       newList = list.map(function (item) {
@@ -13286,7 +13269,7 @@ var GoodItem$1 = function GoodItem(props) {
   }, showModeBtn && /*#__PURE__*/React.createElement(Checkbox, {
     checked: isStrict,
     onChange: handleCheckboxChange
-  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !((_ref = ['BS_E3_GOODS']) === null || _ref === void 0 ? void 0 : _ref.includes(type)) && /*#__PURE__*/React.createElement(Button, {
+  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleChangeGoods
   }, "\u9009\u62E9\u5546\u54C1"), otherOperations), /*#__PURE__*/React.createElement(Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {

package/dist/index.js

@@ -12105,7 +12105,7 @@ var getTableData$1 = function getTableData(_ref, formData) {
     data: _objectSpread2({
       pageSize: pageSize,
       pageNo: current,
-      platform: 'WDT_ERP'
+      platform: 'BS_E3_ERP'
     }, data)
   }).then(function (res) {
     var _res$data = res.data,
@@ -12136,125 +12136,85 @@ var columns$2 = [{
   },
   width: 100
 }, {
-  dataIndex: 'sku',
+  dataIndex: 'specNo',
   title: "SKU",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'skuId',
+  dataIndex: 'specId',
   title: "SKU ID",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'goodsName',
+  dataIndex: 'goodName',
   title: "\u5546\u54C1\u540D\u79F0",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'goodsShortName',
+  dataIndex: 'goodShortName',
   title: "\u5546\u54C1\u7B80\u79F0",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'picPath',
+  dataIndex: 'goodPicUrl',
   title: "\u5546\u54C1\u56FE\u7247",
   ellipsis: true,
   width: 100,
   render: function render(picUrl) {
     return /*#__PURE__*/React__default['default'].createElement("img", {
       style: {
-        width: '60px',
-        height: '60px',
+        width: '40px',
+        height: '40px',
         objectFit: 'contain'
       },
       src: picUrl
     });
   }
 }, {
-  dataIndex: 'goodsSn',
+  dataIndex: 'goodNo',
   title: "\u8D27\u53F7",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'goodsId',
+  dataIndex: 'goodId',
   title: "\u8D27\u53F7ID",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
   dataIndex: 'colorName',
   title: "\u989C\u8272\u540D\u79F0",
   ellipsis: true,
-  width: 70
+  width: 100
 }, {
   dataIndex: 'colorCode',
   title: "\u989C\u8272\u4EE3\u7801",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
   dataIndex: 'sizeName',
   title: "\u5C3A\u7801\u540D\u79F0",
   ellipsis: true,
-  width: 70
+  width: 100
 }, {
   dataIndex: 'sizeCode',
   title: "\u5C3A\u7801\u4EE3\u7801",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
   dataIndex: 'brandName',
   title: "\u54C1\u724C\u540D\u79F0",
   ellipsis: true,
-  width: 70
+  width: 150
 }, {
-  dataIndex: 'goodsNumber',
-  title: "\u5546\u54C1\u6570\u91CF",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'goodsPrice',
-  title: "\u5546\u54C1\u5355\u4EF7",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'shopPrice',
-  title: "\u5546\u54C1\u7F51\u5E97\u552E\u4EF7",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'sharePrice',
-  title: "\u5206\u644A\u4EF7",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'sharePayment',
-  title: "\u5206\u644A\u5B9E\u4ED8\u91D1\u989D",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'payment',
-  title: "\u5B9E\u4ED8\u91D1\u989D",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'tcSku',
-  title: "\u5957\u9910SKU",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'tcGoodsNumber',
-  title: "\u5957\u9910\u5957\u6570",
-  ellipsis: true,
-  width: 70
-}, {
-  dataIndex: 'taoCanSingleSl',
-  title: "\u5355\u4E2A\u5957\u9910\u6570\u91CF",
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
   ellipsis: true,
-  width: 70
+  width: 100
 }, {
-  dataIndex: 'isGift',
-  title: "\u662F\u5426\u8D60\u54C1",
+  dataIndex: 'retailPrice',
+  title: "\u552E\u4EF7",
   ellipsis: true,
-  width: 70
+  width: 100
 }];
 var GoodList$1 = function GoodList(props, ref) {
   var _useState = React.useState([]),
@@ -12288,7 +12248,7 @@ var GoodList$1 = function GoodList(props, ref) {
     layout: "inline",
     form: form
   }, /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodsSn",
+    name: "goodNo",
     style: {
       marginBottom: '12px'
     }
@@ -12299,7 +12259,7 @@ var GoodList$1 = function GoodList(props, ref) {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "goodsName",
+    name: "goodName",
     style: {
       marginBottom: '12px'
     }
@@ -12310,7 +12270,7 @@ var GoodList$1 = function GoodList(props, ref) {
       width: 150
     }
   })), /*#__PURE__*/React__default['default'].createElement(antd.Form.Item, {
-    name: "sku",
+    name: "skuCode",
     style: {
       marginBottom: '12px'
     }
@@ -12427,7 +12387,7 @@ var GoodList$1 = function GoodList(props, ref) {
     }
   }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2({
     rowSelection: rowSelection,
-    rowKey: "goodsId",
+    rowKey: "specNo",
     columns: columns$2,
     scroll: {
       x: '100%',
@@ -12495,7 +12455,6 @@ var BsE3GoodsModal = /*#__PURE__*/React.forwardRef(GoodsModal$4);
 //   styleId: string;
 // }
 var GoodItem$1 = function GoodItem(props) {
-  var _ref;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     type = props.type,
@@ -13232,12 +13191,36 @@ var GoodItem$1 = function GoodItem(props) {
       });
     } else if (['BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_EXCHANGE_GOODS'].includes(type)) {
       newList = list.map(function (item) {
-        item.uuid = kmkfUtils.uuid();
-        item.canDelete = true;
-        item.goodsNumber = 1;
-        item.goodsPrice = 0;
-        item.canUpdateNumber = canUpdateNumber;
-        return item;
+        var specNo = item.specNo,
+          specId = item.specId,
+          goodName = item.goodName,
+          goodShortName = item.goodShortName,
+          goodPicUrl = item.goodPicUrl,
+          goodNo = item.goodNo,
+          goodId = item.goodId,
+          retailPrice = item.retailPrice;
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          sku: specNo,
+          skuId: specId,
+          goodsName: goodName,
+          goodsShortName: goodShortName,
+          picPath: goodPicUrl,
+          goodsSn: goodNo,
+          goodsId: goodId,
+          goodsPrice: retailPrice,
+          shopPrice: retailPrice,
+          sharePayment: '',
+          sharePrice: '',
+          payment: '',
+          tcSku: '',
+          tcGoodsNumber: '',
+          taoCanSingleSl: '',
+          isGift: '',
+          uuid: kmkfUtils.uuid(),
+          canDelete: true,
+          goodsNumber: 1,
+          canUpdateNumber: canUpdateNumber
+        });
       });
     } else {
       newList = list.map(function (item) {
@@ -13298,7 +13281,7 @@ var GoodItem$1 = function GoodItem(props) {
   }, showModeBtn && /*#__PURE__*/React__default['default'].createElement(antd.Checkbox, {
     checked: isStrict,
     onChange: handleCheckboxChange
-  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), !((_ref = ['BS_E3_GOODS']) === null || _ref === void 0 ? void 0 : _ref.includes(type)) && /*#__PURE__*/React__default['default'].createElement(antd.Button, {
+  }, "\u5408\u5E76\u5355\uFF0C\u52FE\u9009\u540E\u53EA\u5C55\u793A\u5F53\u524D\u5E73\u53F0\u8BA2\u5355\u5546\u54C1"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "link",
     onClick: handleChangeGoods
   }, "\u9009\u62E9\u5546\u54C1"), otherOperations), /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({}, tableConfig), {}, {

package/dist/src/bs/component/model/BsE3GoodList.d.ts

@@ -20,6 +20,10 @@ export declare namespace BsE3Goods {
         uuid: string;
         canDelete: boolean;
         num: number;
+        colorCode: string;
+        colorName: string;
+        sizeCode: string;
+        sizeName: string;
         orderPrice: number;
         sharePrice: number;
         canUpdateNumber: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "1.19.4-beta.6",
+  "version": "1.19.4-beta.8",
   "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.19.4-beta.4",
+    "@kmkf-fe-packages/kmkf-utils": "1.19.4-beta.7",
     "ahooks": "^3.7.4",
     "bignumber.js": "^9.1.2",
     "kmkf-monitor": "^0.8.9",
@@ -65,5 +65,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ffed76730789e8e4745576aa90a2e6d7a96c6732"
+  "gitHead": "c34a35404bcdb337d537ab96cccdf70f3c116919"
 }