@kmkf-fe-packages/basic-components 2.5.1-rc.0 → 2.6.0

package/dist/index.esm.js

@@ -21141,7 +21141,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+        return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'salePrice',
@@ -21160,7 +21160,7 @@ var getColumns$5 = function getColumns() {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
       }
     }, {
       dataIndex: 'qty',
@@ -21188,7 +21188,8 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        var amount = (record.qty || 0) * (+record.salePrice || 0);
+        return Number(amount).toFixed(4).replace(/\.?0+$/, '');
       }
     }, {
       dataIndex: 'batchId',
@@ -21273,7 +21274,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+        return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'salePrice',
@@ -21307,7 +21308,7 @@ var getColumns$5 = function getColumns() {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
       }
     }, {
       dataIndex: 'qty',
@@ -21410,7 +21411,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleBasePrice',
       title: '原价',
       render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+        return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'salePrice',
@@ -21440,7 +21441,7 @@ var getColumns$5 = function getColumns() {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
       }
     }, {
       dataIndex: 'qty',
@@ -21476,7 +21477,8 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        var amount = (record.qty || 0) * (+record.salePrice || 0);
+        return Number(amount).toFixed(4).replace(/\.?0+$/, '');
       }
     }, {
       dataIndex: 'batchId',
@@ -21551,7 +21553,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleBasePrice',
       title: '原价',
       render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+        return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'salePrice',
@@ -21568,7 +21570,7 @@ var getColumns$5 = function getColumns() {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React.createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
       }
     }, {
       dataIndex: 'qty',
@@ -21591,7 +21593,8 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        var amount = (record.qty || 0) * (+record.salePrice || 0);
+        return amount ? Number(amount).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'isGift',
@@ -21838,6 +21841,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -21966,6 +21974,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22134,6 +22147,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22315,6 +22333,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -24038,6 +24061,7 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
       itemSysId: item.goodId,
       sysItemId: item.goodId,
       sysPicPath: item.goodPicUrl,
+      sysItemOuterId: item.goodNo,
       payment: null,
       price: item.retailPrice,
       type: (kmSkuTypeMap === null || kmSkuTypeMap === void 0 ? void 0 : kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
@@ -28283,7 +28307,9 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[componentMap$4[compType].oIdKey] === systemOrderNo;
     });
-    var goodDetails = jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], true) : []);
+    var goodDetails = jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], {
+      canEdit: true
+    }) : []);
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[componentMap$4[compType].outerOiIdKey] === orderNo;
@@ -28917,7 +28943,9 @@ var PublicReissue = function PublicReissue(props) {
     });
     var orderRest = undefined;
     if (['JST_REISSUE_GOODS', 'JST_RETURN_GOODS'].includes(type)) {
-      orderRest = true;
+      orderRest = {
+        canEdit: true
+      };
     } else if (['KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
       orderRest = {
         orderBackGoodsLevel: props.orderBackGoodsLevel,

package/dist/index.js

@@ -21156,7 +21156,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+        return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'salePrice',
@@ -21175,7 +21175,7 @@ var getColumns$5 = function getColumns() {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
       }
     }, {
       dataIndex: 'qty',
@@ -21203,7 +21203,8 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(val, record, index) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        var amount = (record.qty || 0) * (+record.salePrice || 0);
+        return Number(amount).toFixed(4).replace(/\.?0+$/, '');
       }
     }, {
       dataIndex: 'batchId',
@@ -21288,7 +21289,7 @@ var getColumns$5 = function getColumns() {
       ellipsis: true,
       align: 'center',
       render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+        return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'salePrice',
@@ -21322,7 +21323,7 @@ var getColumns$5 = function getColumns() {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
       }
     }, {
       dataIndex: 'qty',
@@ -21425,7 +21426,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleBasePrice',
       title: '原价',
       render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+        return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'salePrice',
@@ -21455,7 +21456,7 @@ var getColumns$5 = function getColumns() {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
       }
     }, {
       dataIndex: 'qty',
@@ -21491,7 +21492,8 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        var amount = (record.qty || 0) * (+record.salePrice || 0);
+        return Number(amount).toFixed(4).replace(/\.?0+$/, '');
       }
     }, {
       dataIndex: 'batchId',
@@ -21566,7 +21568,7 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleBasePrice',
       title: '原价',
       render: function render(price) {
-        return price || price === 0 ? Number(price).toFixed(2) : '';
+        return price || price === 0 ? Number(price).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'salePrice',
@@ -21583,7 +21585,7 @@ var getColumns$5 = function getColumns() {
           onChange: function onChange(num) {
             return updateHandle === null || updateHandle === void 0 ? void 0 : updateHandle(num, index, 'salePrice');
           }
-        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(2) : '');
+        }) : /*#__PURE__*/React__default['default'].createElement("span", null, val || val === 0 ? Number(val).toFixed(4).replace(/\.?0+$/, '') : '');
       }
     }, {
       dataIndex: 'qty',
@@ -21606,7 +21608,8 @@ var getColumns$5 = function getColumns() {
       dataIndex: 'saleAmount',
       title: '总金额',
       render: function render(val, record) {
-        return (record.qty || 0) * (+record.salePrice || 0);
+        var amount = (record.qty || 0) * (+record.salePrice || 0);
+        return amount ? Number(amount).toFixed(4).replace(/\.?0+$/, '') : '';
       }
     }, {
       dataIndex: 'isGift',
@@ -21853,6 +21856,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5546\u54C1\u7B80\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -21981,6 +21989,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22149,6 +22162,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -22330,6 +22348,11 @@ var getColumns$6 = function getColumns() {
       title: "\u5E73\u53F0\u5546\u54C1\u540D\u79F0",
       width: 150,
       render: renderTextEllipsis
+    }, {
+      dataIndex: 'sysItemOuterId',
+      title: "\u7CFB\u7EDF\u4E3B\u5546\u5BB6\u7F16\u7801",
+      width: 250,
+      render: renderTextEllipsis
     }, {
       dataIndex: 'sysOuterId',
       title: "\u7CFB\u7EDF\u5546\u5BB6\u7F16\u7801",
@@ -24053,6 +24076,7 @@ var processKmGoods$1 = function processKmGoods(_ref8) {
       itemSysId: item.goodId,
       sysItemId: item.goodId,
       sysPicPath: item.goodPicUrl,
+      sysItemOuterId: item.goodNo,
       payment: null,
       price: item.retailPrice,
       type: (kmkfUtils.kmSkuTypeMap === null || kmkfUtils.kmSkuTypeMap === void 0 ? void 0 : kmkfUtils.kmSkuTypeMap[item === null || item === void 0 ? void 0 : item.skuType]) || '',
@@ -28298,7 +28322,9 @@ var CommonExchangeGoods = function CommonExchangeGoods(props) {
     var order = systemOrderNo && ((systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orders) || []).find(function (order) {
       return order[componentMap$4[compType].oIdKey] === systemOrderNo;
     });
-    var goodDetails = kmkfUtils.jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], true) : []);
+    var goodDetails = kmkfUtils.jstMergeIdenticalGoods((order === null || order === void 0 ? void 0 : (_order$componentMap$c = order[componentMap$4[compType].goodDetailsKey]) === null || _order$componentMap$c === void 0 ? void 0 : _order$componentMap$c.length) ? (_componentMap$compTyp7 = componentMap$4[compType]) === null || _componentMap$compTyp7 === void 0 ? void 0 : _componentMap$compTyp7.updateGoodsHandle([order], {
+      canEdit: true
+    }) : []);
     var orderNo = systemOrder === null || systemOrder === void 0 ? void 0 : systemOrder.orderNo;
     return mode ? goodDetails.filter(function (goodItem) {
       return !orderNo || goodItem[componentMap$4[compType].outerOiIdKey] === orderNo;
@@ -28932,7 +28958,9 @@ var PublicReissue = function PublicReissue(props) {
     });
     var orderRest = undefined;
     if (['JST_REISSUE_GOODS', 'JST_RETURN_GOODS'].includes(type)) {
-      orderRest = true;
+      orderRest = {
+        canEdit: true
+      };
     } else if (['KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(type)) {
       orderRest = {
         orderBackGoodsLevel: props.orderBackGoodsLevel,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/basic-components",
-  "version": "2.5.1-rc.0",
+  "version": "2.6.0",
   "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.5.1-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.6.0",
     "ahooks": "^3.7.4",
     "ali-react-table": "2.6.1",
     "bignumber.js": "^9.1.2",
@@ -66,5 +66,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d36e06faa887ec2f47039bb9d3c7a30b573a81ae"
+  "gitHead": "271b117e3e4afe8fadcc540ebecb963017e789bf"
 }