kts-component-invoice-operate 3.2.37 → 3.2.39

package/dist/index.esm.js

@@ -1731,10 +1731,9 @@ function _mergeDetails() {
             return _context.abrupt("return");
 
           case 2:
-            goodsList = state.goodsListState.selectedGoodIndex.map(function (e) {
-              return state.goodsListState.goodsMap.get(e);
-            }).filter(function (e) {
-              return !!e;
+            // const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
+            goodsList = state.goodsListState.goodsList.filter(function (e) {
+              return state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0;
             });
 
             if (!(goodsList.length < 2)) {
@@ -1798,21 +1797,21 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 41;
+            _context.next = 40;
             break;
 
-          case 37:
-            _context.prev = 37;
+          case 36:
+            _context.prev = 36;
             _context.t0 = _context["catch"](5);
             debugger;
             showError(_context.t0);
 
-          case 41:
+          case 40:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 37]]);
+    }, _callee, null, [[5, 36]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -14447,7 +14446,7 @@ function useMergeDetails() {
       onClick: onClick,
       disabled: selectedGoodIndex.length <= 1
     }, "\u5408\u5E76\u660E\u7EC6");
-  }, [selectedGoodIndex.length]);
+  }, [selectedGoodIndex.length, isMergeDetails]);
   return {
     /** 按钮 */
     button: button

package/dist/index.js

@@ -1741,10 +1741,9 @@ function _mergeDetails() {
             return _context.abrupt("return");
 
           case 2:
-            goodsList = state.goodsListState.selectedGoodIndex.map(function (e) {
-              return state.goodsListState.goodsMap.get(e);
-            }).filter(function (e) {
-              return !!e;
+            // const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
+            goodsList = state.goodsListState.goodsList.filter(function (e) {
+              return state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0;
             });
 
             if (!(goodsList.length < 2)) {
@@ -1808,21 +1807,21 @@ function _mergeDetails() {
               state.goodsListState.goodsMap.set(e.$index, e);
             });
             state.goodsListState.selectedGoodIndex = [];
-            _context.next = 41;
+            _context.next = 40;
             break;
 
-          case 37:
-            _context.prev = 37;
+          case 36:
+            _context.prev = 36;
             _context.t0 = _context["catch"](5);
             debugger;
             showError(_context.t0);
 
-          case 41:
+          case 40:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[5, 37]]);
+    }, _callee, null, [[5, 36]]);
   }));
   return _mergeDetails.apply(this, arguments);
 }
@@ -14457,7 +14456,7 @@ function useMergeDetails() {
       onClick: onClick,
       disabled: selectedGoodIndex.length <= 1
     }, "\u5408\u5E76\u660E\u7EC6");
-  }, [selectedGoodIndex.length]);
+  }, [selectedGoodIndex.length, isMergeDetails]);
   return {
     /** 按钮 */
     button: button

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.37",
+  "version": "3.2.39",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/Invoice/InvoiceController/fns/mergeDetails.ts

@@ -7,7 +7,8 @@ import { IGood, InvoiceControllerState, LineAttributeType } from '..';
 export default async function mergeDetails(state: InvoiceControllerState) {
     if (state.goodsListState.editGood) return;
 
-    const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
+    // const goodsList = state.goodsListState.selectedGoodIndex.map(e => state.goodsListState.goodsMap.get(e)).filter(e => !!e) as IGood[];
+    const goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) >= 0)
     if (goodsList.length < 2) return;
 
     try {
@@ -37,8 +38,8 @@ export default async function mergeDetails(state: InvoiceControllerState) {
 
         // 计算税额
         sum.taxAmount = chain(bignumber(sum.lineAmountIncludeTax)).subtract(bignumber(sum.lineAmountExcludeTax)).done().toNumber()
-
-        const p = state.goodsListState.goodsList.indexOf(goodsList[0]);9
+        
+        const p = state.goodsListState.goodsList.indexOf(goodsList[0]);
         state.goodsListState.goodsList = state.goodsListState.goodsList.filter(e => state.goodsListState.selectedGoodIndex.indexOf(e.$index) < 0);
         state.goodsListState.goodsList.splice(p, 0, sum);
         state.goodsListState.goodsMap = new Map();

package/src/Invoice/ui/default/GoodsList/ui/BulkMenu/hooks/useMergeDetails/index.tsx

@@ -28,7 +28,7 @@ export default function useMergeDetails() {
                 合并明细
             </Button>
         )
-    }, [selectedGoodIndex.length])
+    }, [selectedGoodIndex.length, isMergeDetails])
 
     return {
         /** 按钮 */