kts-component-invoice-operate 1.0.70 → 1.0.71

package/dist/index.esm.js

@@ -1523,7 +1523,7 @@ var Statistics = (function () {
       flex: 3,
       border: 'none'
     }
-  }, /*#__PURE__*/React.createElement("label", null, parseFloat(lineAmountIncludeTax).toFixed()), " b")));
+  }, /*#__PURE__*/React.createElement("label", null, parseFloat(lineAmountIncludeTax).toFixed()))));
 });
 
 var AddRowButton = (function () {
@@ -4908,6 +4908,19 @@ var ImportGoodsDrawer = (function () {
       };
     }())();
   }, [controller]);
+  React.useEffect(function () {
+    setTimeout(function () {
+      console.log(window.document.querySelector('.ktsAnt3x-drawer'));
+
+      if (visible) {
+        var _window$document$quer;
+
+        (_window$document$quer = window.document.querySelector('.ktsAnt3x-drawer')) === null || _window$document$quer === void 0 ? void 0 : _window$document$quer.addEventListener('click', function (e) {// debugger
+          // e.stopPropagation();
+        }, true);
+      }
+    });
+  }, [visible]);
   return /*#__PURE__*/React.createElement(Drawer, {
     title: "\u5546\u54C1\u5217\u8868",
     placement: "right",
@@ -4915,7 +4928,10 @@ var ImportGoodsDrawer = (function () {
     destroyOnClose: true,
     width: 983,
     onClose: onClose,
-    visible: visible
+    visible: visible,
+    getContainer: function getContainer() {
+      return window.document.querySelector('.kts-invoice-operate-goods-list-able');
+    }
   }, topExpand && /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: 10
@@ -4934,6 +4950,11 @@ var DrawerBody$2 = function DrawerBody() {
   var pagination = controller.useMemo(function (s) {
     return s.goodsListState.importGoods.pagination;
   }, []);
+
+  var _React$useState = React.useState(controller.state.goodsListState.editGood),
+      _React$useState2 = _slicedToArray(_React$useState, 1),
+      editGood = _React$useState2[0];
+
   React.useEffect(function () {
     controller.getGoodsList && controller.getGoodsList({
       pagination: {
@@ -4954,49 +4975,75 @@ var DrawerBody$2 = function DrawerBody() {
     },
     onRow: function onRow(record) {
       return {
-        onClick: function onClick(e) {
-          e.stopPropagation();
+        onClick: function onClick() {
           controller.pipeline( /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
               return regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
+                    case 0:
+                      if (!s.goodsListState.editGood) {
+                        _context2.next = 2;
+                        break;
+                      }
+
+                      return _context2.abrupt("return");
+
+                    case 2:
+                      s.goodsListState.editGood = editGood;
+
+                    case 3:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }
+              }, _callee2);
+            }));
+
+            return function (_x2) {
+              return _ref2.apply(this, arguments);
+            };
+          }(), /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
+              return regeneratorRuntime.wrap(function _callee3$(_context3) {
+                while (1) {
+                  switch (_context3.prev = _context3.next) {
                     case 0:
                       Object.keys(record).filter(function (e) {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
                       });
-                      _context2.next = 3;
+                      _context3.next = 3;
                       return s.goodsListState.importGoods.verifyFn(record);
 
                     case 3:
-                      _context2.t0 = _context2.sent;
+                      _context3.t0 = _context3.sent;
 
-                      if (!(_context2.t0 === false)) {
-                        _context2.next = 6;
+                      if (!(_context3.t0 === false)) {
+                        _context3.next = 6;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
                     case 6:
                       if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
-                        _context2.next = 8;
+                        _context3.next = 8;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
                     case 8:
                       s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
                       if (s.goodsListState.editGood) {
-                        _context2.next = 11;
+                        _context3.next = 11;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
                     case 11:
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
@@ -5014,14 +5061,14 @@ var DrawerBody$2 = function DrawerBody() {
 
                     case 17:
                     case "end":
-                      return _context2.stop();
+                      return _context3.stop();
                   }
                 }
-              }, _callee2);
+              }, _callee3);
             }));
 
-            return function (_x2) {
-              return _ref2.apply(this, arguments);
+            return function (_x3) {
+              return _ref3.apply(this, arguments);
             };
           }())();
         }

package/dist/index.js

@@ -1532,7 +1532,7 @@ var Statistics = (function () {
       flex: 3,
       border: 'none'
     }
-  }, /*#__PURE__*/React__default['default'].createElement("label", null, parseFloat(lineAmountIncludeTax).toFixed()), " b")));
+  }, /*#__PURE__*/React__default['default'].createElement("label", null, parseFloat(lineAmountIncludeTax).toFixed()))));
 });
 
 var AddRowButton = (function () {
@@ -4917,6 +4917,19 @@ var ImportGoodsDrawer = (function () {
       };
     }())();
   }, [controller]);
+  React__default['default'].useEffect(function () {
+    setTimeout(function () {
+      console.log(window.document.querySelector('.ktsAnt3x-drawer'));
+
+      if (visible) {
+        var _window$document$quer;
+
+        (_window$document$quer = window.document.querySelector('.ktsAnt3x-drawer')) === null || _window$document$quer === void 0 ? void 0 : _window$document$quer.addEventListener('click', function (e) {// debugger
+          // e.stopPropagation();
+        }, true);
+      }
+    });
+  }, [visible]);
   return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Drawer, {
     title: "\u5546\u54C1\u5217\u8868",
     placement: "right",
@@ -4924,7 +4937,10 @@ var ImportGoodsDrawer = (function () {
     destroyOnClose: true,
     width: 983,
     onClose: onClose,
-    visible: visible
+    visible: visible,
+    getContainer: function getContainer() {
+      return window.document.querySelector('.kts-invoice-operate-goods-list-able');
+    }
   }, topExpand && /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       marginBottom: 10
@@ -4943,6 +4959,11 @@ var DrawerBody$2 = function DrawerBody() {
   var pagination = controller.useMemo(function (s) {
     return s.goodsListState.importGoods.pagination;
   }, []);
+
+  var _React$useState = React__default['default'].useState(controller.state.goodsListState.editGood),
+      _React$useState2 = _slicedToArray(_React$useState, 1),
+      editGood = _React$useState2[0];
+
   React__default['default'].useEffect(function () {
     controller.getGoodsList && controller.getGoodsList({
       pagination: {
@@ -4963,49 +4984,75 @@ var DrawerBody$2 = function DrawerBody() {
     },
     onRow: function onRow(record) {
       return {
-        onClick: function onClick(e) {
-          e.stopPropagation();
+        onClick: function onClick() {
           controller.pipeline( /*#__PURE__*/function () {
             var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(s) {
               return regeneratorRuntime.wrap(function _callee2$(_context2) {
                 while (1) {
                   switch (_context2.prev = _context2.next) {
+                    case 0:
+                      if (!s.goodsListState.editGood) {
+                        _context2.next = 2;
+                        break;
+                      }
+
+                      return _context2.abrupt("return");
+
+                    case 2:
+                      s.goodsListState.editGood = editGood;
+
+                    case 3:
+                    case "end":
+                      return _context2.stop();
+                  }
+                }
+              }, _callee2);
+            }));
+
+            return function (_x2) {
+              return _ref2.apply(this, arguments);
+            };
+          }(), /*#__PURE__*/function () {
+            var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(s) {
+              return regeneratorRuntime.wrap(function _callee3$(_context3) {
+                while (1) {
+                  switch (_context3.prev = _context3.next) {
                     case 0:
                       Object.keys(record).filter(function (e) {
                         return !record[e] && record[e] !== 0;
                       }).forEach(function (e) {
                         delete record[e];
                       });
-                      _context2.next = 3;
+                      _context3.next = 3;
                       return s.goodsListState.importGoods.verifyFn(record);
 
                     case 3:
-                      _context2.t0 = _context2.sent;
+                      _context3.t0 = _context3.sent;
 
-                      if (!(_context2.t0 === false)) {
-                        _context2.next = 6;
+                      if (!(_context3.t0 === false)) {
+                        _context3.next = 6;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
                     case 6:
                       if (!(!s.goodsListState.editGood || !s.goodsListState.form)) {
-                        _context2.next = 8;
+                        _context3.next = 8;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
                     case 8:
                       s.goodsListState.editGood = _objectSpread2(_objectSpread2({}, s.goodsListState.editGood), record);
 
                       if (s.goodsListState.editGood) {
-                        _context2.next = 11;
+                        _context3.next = 11;
                         break;
                       }
 
-                      return _context2.abrupt("return");
+                      return _context3.abrupt("return");
 
                     case 11:
                       if ("".concat(s.goodsListState.editGood.priceIncludeTax) === '0') {
@@ -5023,14 +5070,14 @@ var DrawerBody$2 = function DrawerBody() {
 
                     case 17:
                     case "end":
-                      return _context2.stop();
+                      return _context3.stop();
                   }
                 }
-              }, _callee2);
+              }, _callee3);
             }));
 
-            return function (_x2) {
-              return _ref2.apply(this, arguments);
+            return function (_x3) {
+              return _ref3.apply(this, arguments);
             };
           }())();
         }

package/package.json

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

package/src/Invoice/ui/GoodsList/index.tsx

@@ -48,9 +48,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   React.useEffect(() => {
     controller.pipeline(async (s) => {
       s.goodsListState.goodsMap = new Map();
-      goodsList.forEach((e) => {
-        s.goodsListState.goodsMap.set(e.$index, e);
-      });
+      goodsList.forEach((e) => { s.goodsListState.goodsMap.set(e.$index, e); });
     })();
   }, [goodsList, controller]);
 

package/src/Invoice/ui/GoodsList/ui/Statistics/index.tsx

@@ -82,7 +82,7 @@ export default () => {
           <label>（小写）</label>
         </div>
         <div style={{ flex: 3, border: 'none' }}>
-          <label>{parseFloat(lineAmountIncludeTax).toFixed()}</label> b
+          <label>{parseFloat(lineAmountIncludeTax).toFixed()}</label>
         </div>
       </div>
     </div>

package/src/Invoice/ui/ImportGoodsDrawer/index.tsx

@@ -23,6 +23,19 @@ export default () => {
     controller.pipeline(async s => { s.goodsListState.importGoods.isVisibleDrawer = false })();
   }, [controller]);
 
+  React.useEffect(() => {
+    setTimeout(() => {
+      console.log(window.document.querySelector('.ktsAnt3x-drawer'))
+      if (visible) {
+        window.document.querySelector('.ktsAnt3x-drawer')?.addEventListener('click', e => {
+          // debugger
+          // e.stopPropagation();
+        }, true)
+      } else {
+      }
+    });
+  }, [visible])
+
   return (
     <Drawer
       title="商品列表"
@@ -32,9 +45,10 @@ export default () => {
       width={983}
       onClose={onClose}
       visible={visible}
+      getContainer={() => window.document.querySelector('.kts-invoice-operate-goods-list-able') as any}
     >
       {topExpand &&
-        <div style={{ marginBottom: 10 }} >
+        <div style={{ marginBottom: 10 }}  >
           {topExpand}
         </div>}
       <DrawerBody />
@@ -51,6 +65,8 @@ const DrawerBody = () => {
 
   const pagination = controller.useMemo(s => s.goodsListState.importGoods.pagination, []);
 
+  const [editGood] = React.useState(controller.state.goodsListState.editGood);
+
   React.useEffect(() => {
     controller.getGoodsList &&
       controller.getGoodsList({ pagination: { current: 1 } });
@@ -68,36 +84,40 @@ const DrawerBody = () => {
       }}
       onRow={(record) => {
         return {
-          onClick: e => {
-            e.stopPropagation();
-            controller.pipeline(async (s) => {
-              
-              Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
-
-              if (await s.goodsListState.importGoods.verifyFn(record) === false) return;
-              
-              if (!s.goodsListState.editGood || !s.goodsListState.form) return;
-
-              s.goodsListState.editGood = { ...s.goodsListState.editGood, ...record };
-              if (!s.goodsListState.editGood) return;
-
-              if (`${s.goodsListState.editGood.priceIncludeTax}` === '0') {
-                s.goodsListState.editGood.priceIncludeTax = undefined;
-                s.goodsListState.editGood.priceExcludeTax = undefined;
-              } else {
-                s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record) as number;
+          onClick: () => {
+            controller.pipeline(
+              async s => {
+                if(s.goodsListState.editGood) return;
+                s.goodsListState.editGood = editGood;
+              },
+              async s => {
+                Object.keys(record).filter(e => !record[e] && record[e] !== 0).forEach(e => { delete record[e] });
+
+                if (await s.goodsListState.importGoods.verifyFn(record) === false) return;
+
+                if (!s.goodsListState.editGood || !s.goodsListState.form) return;
+
+                s.goodsListState.editGood = { ...s.goodsListState.editGood, ...record };
+                if (!s.goodsListState.editGood) return;
+
+                if (`${s.goodsListState.editGood.priceIncludeTax}` === '0') {
+                  s.goodsListState.editGood.priceIncludeTax = undefined;
+                  s.goodsListState.editGood.priceExcludeTax = undefined;
+                } else {
+                  s.goodsListState.editGood.priceExcludeTax = getPriceExcludeTax(s.goodsListState.editGood, record) as number;
+                }
+
+                s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
+                s.goodsListState.editGood.itemName = getItemName(record);
+
+                s.goodsListState.form.setFieldsValue(s.goodsListState.editGood as any);
+                s.goodsListState.importGoods.isVisibleDrawer = false;
+
+                s.goodsListState.isTaxIncluded
+                  ? updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
+                  : updateUnitPriceTax(controller, s.goodsListState.form, record)
               }
-
-              s.goodsListState.editGood.lineAmountIncludeTax = quantityPriceIncludeTax(s.goodsListState.editGood.quantity, s.goodsListState.editGood.priceIncludeTax);
-              s.goodsListState.editGood.itemName = getItemName(record);
-
-              s.goodsListState.form.setFieldsValue(s.goodsListState.editGood as any);
-              s.goodsListState.importGoods.isVisibleDrawer = false;
-
-              s.goodsListState.isTaxIncluded
-                ? updateUnitPriceExcludingTax(controller, s.goodsListState.form, record)
-                : updateUnitPriceTax(controller, s.goodsListState.form, record)
-            })();
+            )();
           },
         };
       }}