kts-component-invoice-operate 1.0.95 → 1.0.99

package/dist/Invoice/tools/coolingFn/index.d.ts

@@ -0,0 +1,8 @@
+declare const _default: (key: string | undefined, delayed: number | undefined, fn: Function) => void;
+/**
+ * 有冷却时间的函数
+ * @param fn 方法
+ * @param key 方法key
+ * @param delayed 冷却时间
+ */
+export default _default;

package/dist/Invoice/tools/strringFn/index.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 判断一个字符串得字节长度
+ * @param str
+ * @returns
+ */
+export declare function bytesLnegth(str: string): number;
+export declare function cutStr(str: string, L: number): string | undefined;

package/dist/index.esm.js

@@ -2,11 +2,11 @@ import 'kts-components-antd-x3/dist/kts-components-antd-x3.css';
 import React, { createElement } from 'react';
 import GreyReactBox, { decorator } from 'grey-react-box';
 import { chain as chain$1, bignumber, create, all } from 'mathjs';
-import { message, Form, Input, Icon, Tag, Select, Row, Col, Table, Button, Switch, Typography, Drawer, Menu, Dropdown, AutoComplete, Spin, Checkbox, Descriptions } from 'kts-components-antd-x3';
+import { message, Form, Input, Icon, Tag, Select, Row, Col, Table, Button, Switch, Typography, Drawer, Menu, Dropdown, AutoComplete, Spin, Checkbox, Descriptions, Modal } from 'kts-components-antd-x3';
 import { v4 } from 'uuid';
 import classnames from 'classnames';
-import { createAsyncFormActions, FormEffectHooks, SchemaForm, FormButtonGroup, SchemaMarkupField } from '@formily/antd';
 import { Input as Input$1, NumberPicker } from '@formily/antd-components';
+import { createAsyncFormActions, FormEffectHooks, SchemaForm, FormButtonGroup, SchemaMarkupField } from '@formily/antd';
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -2091,6 +2091,29 @@ var DrawerBody = decorator(Form.create())(function (props) {
   }, "\u4FDD\u5B58")));
 });
 
+var keys = {};
+/**
+ * 有冷却时间的函数
+ * @param fn 方法
+ * @param key 方法key
+ * @param delayed 冷却时间
+ */
+
+var coolingFn = (function () {
+  var key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'default';
+  var delayed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
+  var fn = arguments.length > 2 ? arguments[2] : undefined;
+
+  if (keys[key]) {
+    return;
+  } else {
+    fn();
+    keys[key] = setTimeout(function () {
+      delete keys[key];
+    }, delayed);
+  }
+});
+
 var EndowCodeButton = (function () {
   var controller = default_1.useInvoiceController();
   /** 是否禁用 */
@@ -2123,9 +2146,8 @@ var EndowCodeButton = (function () {
                           break;
                         }
 
-                        message.error({
-                          content: '不能给正在编辑的货物赋码',
-                          key: '不能给正在编辑的货物赋码'
+                        coolingFn('不能给正在编辑的货物赋码', 3000, function () {
+                          message.error('不能给正在编辑的货物赋码');
                         });
                         return _context.abrupt("return");
 
@@ -2141,9 +2163,8 @@ var EndowCodeButton = (function () {
                           break;
                         }
 
-                        message.error({
-                          content: '商品税率不一致不能操作批量赋码',
-                          key: '商品税率不一致不能操作批量赋码'
+                        coolingFn('商品税率不一致不能操作批量赋码', 3000, function () {
+                          message.error('商品税率不一致不能操作批量赋码');
                         });
                         return _context.abrupt("return");
 
@@ -4479,9 +4500,7 @@ var Main = decorator(Form.create())(function (props) {
 
   React.useEffect(function () {
     var click = function click() {
-      setTimeout(function () {
-        controller.saveEditGood();
-      });
+      setTimeout(controller.saveEditGood);
     };
 
     window.addEventListener('click', click);
@@ -4934,7 +4953,7 @@ var ImportBuyerDrawer = (function () {
   return /*#__PURE__*/React.createElement(Drawer, {
     title: "\u8D2D\u65B9\u5217\u8868",
     placement: "right",
-    closable: false,
+    // closable={false}
     destroyOnClose: true,
     width: 983,
     onClose: onClose,
@@ -5039,6 +5058,7 @@ var ImportGoodsDrawer = (function () {
     return s.goodsListState.importGoods.topExpand;
   }, []);
   var onClose = React.useCallback(function () {
+    console.log('===> 关闭抽屉');
     controller.pipeline( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
         return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -5063,14 +5083,11 @@ var ImportGoodsDrawer = (function () {
   return /*#__PURE__*/React.createElement(Drawer, {
     title: "\u5546\u54C1\u5217\u8868",
     placement: "right",
-    closable: false,
+    // closable={false}
     destroyOnClose: true,
     width: 983,
     onClose: onClose,
-    visible: visible,
-    getContainer: function getContainer() {
-      return window.document.querySelector('.kts-invoice-operate-goods-list-able');
-    }
+    visible: visible
   }, topExpand && /*#__PURE__*/React.createElement("div", {
     style: {
       marginBottom: 10
@@ -5088,11 +5105,7 @@ 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];
+  }, []); // const [editGood] = React.useState(controller.state.goodsListState.editGood);
 
   React.useEffect(function () {
     controller.getGoodsList && controller.getGoodsList({
@@ -5210,9 +5223,61 @@ var getPriceExcludeTax = function getPriceExcludeTax(s, record) {
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")));
 };
 
+/**
+ * 判断一个字符串得字节长度
+ * @param str
+ * @returns
+ */
+function bytesLnegth(str) {
+  var count = str.length;
+
+  for (var i = 0; i < str.length; i++) {
+    if (str.charCodeAt(i) > 255) {
+      count++;
+    }
+  }
+
+  return count;
+}
+/*
+* param str 要截取的字符串
+* param L 要截取的字节长度，注意是字节不是字符，一个汉字两个字节
+* return 截取后的字符串
+*/
+
+function cutStr(str, L) {
+  var result = '',
+      strlen = str.length,
+      // 字符串长度
+  chrlen = str.replace(/[^\x00-\xff]/g, '**').length; // 字节长度
+
+  if (chrlen <= L) {
+    return str;
+  }
+
+  for (var i = 0, j = 0; i < strlen; i++) {
+    var chr = str.charAt(i);
+
+    if (/[\x00-\xff]/.test(chr)) {
+      j++; // ascii码为0-255，一个字符就是一个字节的长度
+    } else {
+      j += 2; // ascii码为0-255以外，一个字符就是两个字节的长度
+    }
+
+    if (j <= L) {
+      // 当加上当前字符以后，如果总字节长度小于等于L，则将当前字符真实的+在result后
+      result += chr;
+    } else {
+      // 反之则说明result已经是不拆分字符的情况下最接近L的值了，直接返回
+      return result;
+    }
+  }
+}
+
 var css_248z$a = ".kts-invoice-operate-goods-endow-code-button-list {\n  display: flex;\n  flex-direction: column;\n}\n.kts-invoice-operate-goods-endow-code-button-list > button {\n  margin-bottom: 10px;\n}\n";
 styleInject(css_248z$a);
 
+var confirm = Modal.confirm;
 var EndowCodeDrawer = (function () {
   var controller = default_1.useInvoiceController();
   var visible = controller.useMemo(function (s) {
@@ -5482,12 +5547,16 @@ var DrawerBody$3 = function DrawerBody(props) {
   var onSubmit = React.useCallback(function (values) {
     controller.pipeline( /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(s) {
+        var endowCodeGood;
         return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                s.goodsListState.endowCode.endowcodeGoodIndex.forEach(function (e) {
-                  var good = s.goodsListState.goodsMap.get(e);
+                endowCodeGood = s.goodsListState.endowCode.endowcodeGoodIndex.map(function (e) {
+                  return s.goodsListState.goodsMap.get(e);
+                }); // 赋码
+
+                endowCodeGood.forEach(function (good) {
                   if (!good) return; // const name = getItemName(good.itemName, values.shorthand);
 
                   good.itemName = getItemName$1(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
@@ -5512,11 +5581,41 @@ var DrawerBody$3 = function DrawerBody(props) {
                   }
 
                   good.taxAmount = chain$1(bignumber(good.lineAmountIncludeTax)).subtract(bignumber(good.lineAmountExcludeTax)).done().toNumber();
-                });
+                }); //截取名称
+
+                if (!endowCodeGood.some(function (e) {
+                  return bytesLnegth((e === null || e === void 0 ? void 0 : e.itemName) || '') > 100;
+                })) {
+                  _context6.next = 5;
+                  break;
+                }
+
+                _context6.next = 5;
+                return function () {
+                  return new Promise(function (resolve) {
+                    confirm({
+                      title: '温馨提示',
+                      content: '商品名称长度过长,是否截取名称',
+                      onOk: function onOk() {
+                        endowCodeGood.forEach(function (e) {
+                          if (e && e.itemName) {
+                            e.itemName = cutStr(e.itemName, 99);
+                          }
+                        });
+                        resolve();
+                      },
+                      onCancel: function onCancel() {
+                        resolve();
+                      }
+                    });
+                  });
+                }();
+
+              case 5:
                 s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
                 s.goodsListState.endowCode.endowcodeGoodIndex = [];
 
-              case 3:
+              case 7:
               case "end":
                 return _context6.stop();
             }

package/dist/index.js

@@ -9,8 +9,8 @@ var mathjs = require('mathjs');
 var ktsComponentsAntdX3 = require('kts-components-antd-x3');
 var uuid = require('uuid');
 var classnames = require('classnames');
-var antd = require('@formily/antd');
 var antdComponents = require('@formily/antd-components');
+var antd = require('@formily/antd');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -2101,6 +2101,29 @@ var DrawerBody = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(funct
   }, "\u4FDD\u5B58")));
 });
 
+var keys = {};
+/**
+ * 有冷却时间的函数
+ * @param fn 方法
+ * @param key 方法key
+ * @param delayed 冷却时间
+ */
+
+var coolingFn = (function () {
+  var key = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'default';
+  var delayed = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 200;
+  var fn = arguments.length > 2 ? arguments[2] : undefined;
+
+  if (keys[key]) {
+    return;
+  } else {
+    fn();
+    keys[key] = setTimeout(function () {
+      delete keys[key];
+    }, delayed);
+  }
+});
+
 var EndowCodeButton = (function () {
   var controller = default_1.useInvoiceController();
   /** 是否禁用 */
@@ -2133,9 +2156,8 @@ var EndowCodeButton = (function () {
                           break;
                         }
 
-                        ktsComponentsAntdX3.message.error({
-                          content: '不能给正在编辑的货物赋码',
-                          key: '不能给正在编辑的货物赋码'
+                        coolingFn('不能给正在编辑的货物赋码', 3000, function () {
+                          ktsComponentsAntdX3.message.error('不能给正在编辑的货物赋码');
                         });
                         return _context.abrupt("return");
 
@@ -2151,9 +2173,8 @@ var EndowCodeButton = (function () {
                           break;
                         }
 
-                        ktsComponentsAntdX3.message.error({
-                          content: '商品税率不一致不能操作批量赋码',
-                          key: '商品税率不一致不能操作批量赋码'
+                        coolingFn('商品税率不一致不能操作批量赋码', 3000, function () {
+                          ktsComponentsAntdX3.message.error('商品税率不一致不能操作批量赋码');
                         });
                         return _context.abrupt("return");
 
@@ -4489,9 +4510,7 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
 
   React__default['default'].useEffect(function () {
     var click = function click() {
-      setTimeout(function () {
-        controller.saveEditGood();
-      });
+      setTimeout(controller.saveEditGood);
     };
 
     window.addEventListener('click', click);
@@ -4944,7 +4963,7 @@ var ImportBuyerDrawer = (function () {
   return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Drawer, {
     title: "\u8D2D\u65B9\u5217\u8868",
     placement: "right",
-    closable: false,
+    // closable={false}
     destroyOnClose: true,
     width: 983,
     onClose: onClose,
@@ -5049,6 +5068,7 @@ var ImportGoodsDrawer = (function () {
     return s.goodsListState.importGoods.topExpand;
   }, []);
   var onClose = React__default['default'].useCallback(function () {
+    console.log('===> 关闭抽屉');
     controller.pipeline( /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(s) {
         return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -5073,14 +5093,11 @@ var ImportGoodsDrawer = (function () {
   return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX3.Drawer, {
     title: "\u5546\u54C1\u5217\u8868",
     placement: "right",
-    closable: false,
+    // closable={false}
     destroyOnClose: true,
     width: 983,
     onClose: onClose,
-    visible: visible,
-    getContainer: function getContainer() {
-      return window.document.querySelector('.kts-invoice-operate-goods-list-able');
-    }
+    visible: visible
   }, topExpand && /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       marginBottom: 10
@@ -5098,11 +5115,7 @@ 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];
+  }, []); // const [editGood] = React.useState(controller.state.goodsListState.editGood);
 
   React__default['default'].useEffect(function () {
     controller.getGoodsList && controller.getGoodsList({
@@ -5220,9 +5233,61 @@ var getPriceExcludeTax = function getPriceExcludeTax(s, record) {
   return format15(evaluate("".concat(record.priceIncludeTax, " / (1+").concat(s.taxRate, "/100)")));
 };
 
+/**
+ * 判断一个字符串得字节长度
+ * @param str
+ * @returns
+ */
+function bytesLnegth(str) {
+  var count = str.length;
+
+  for (var i = 0; i < str.length; i++) {
+    if (str.charCodeAt(i) > 255) {
+      count++;
+    }
+  }
+
+  return count;
+}
+/*
+* param str 要截取的字符串
+* param L 要截取的字节长度，注意是字节不是字符，一个汉字两个字节
+* return 截取后的字符串
+*/
+
+function cutStr(str, L) {
+  var result = '',
+      strlen = str.length,
+      // 字符串长度
+  chrlen = str.replace(/[^\x00-\xff]/g, '**').length; // 字节长度
+
+  if (chrlen <= L) {
+    return str;
+  }
+
+  for (var i = 0, j = 0; i < strlen; i++) {
+    var chr = str.charAt(i);
+
+    if (/[\x00-\xff]/.test(chr)) {
+      j++; // ascii码为0-255，一个字符就是一个字节的长度
+    } else {
+      j += 2; // ascii码为0-255以外，一个字符就是两个字节的长度
+    }
+
+    if (j <= L) {
+      // 当加上当前字符以后，如果总字节长度小于等于L，则将当前字符真实的+在result后
+      result += chr;
+    } else {
+      // 反之则说明result已经是不拆分字符的情况下最接近L的值了，直接返回
+      return result;
+    }
+  }
+}
+
 var css_248z$a = ".kts-invoice-operate-goods-endow-code-button-list {\n  display: flex;\n  flex-direction: column;\n}\n.kts-invoice-operate-goods-endow-code-button-list > button {\n  margin-bottom: 10px;\n}\n";
 styleInject(css_248z$a);
 
+var confirm = ktsComponentsAntdX3.Modal.confirm;
 var EndowCodeDrawer = (function () {
   var controller = default_1.useInvoiceController();
   var visible = controller.useMemo(function (s) {
@@ -5492,12 +5557,16 @@ var DrawerBody$3 = function DrawerBody(props) {
   var onSubmit = React__default['default'].useCallback(function (values) {
     controller.pipeline( /*#__PURE__*/function () {
       var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(s) {
+        var endowCodeGood;
         return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
-                s.goodsListState.endowCode.endowcodeGoodIndex.forEach(function (e) {
-                  var good = s.goodsListState.goodsMap.get(e);
+                endowCodeGood = s.goodsListState.endowCode.endowcodeGoodIndex.map(function (e) {
+                  return s.goodsListState.goodsMap.get(e);
+                }); // 赋码
+
+                endowCodeGood.forEach(function (good) {
                   if (!good) return; // const name = getItemName(good.itemName, values.shorthand);
 
                   good.itemName = getItemName$1(good.itemName, values.shorthand); // `*${values.shorthand}*${name}`;
@@ -5522,11 +5591,41 @@ var DrawerBody$3 = function DrawerBody(props) {
                   }
 
                   good.taxAmount = mathjs.chain(mathjs.bignumber(good.lineAmountIncludeTax)).subtract(mathjs.bignumber(good.lineAmountExcludeTax)).done().toNumber();
-                });
+                }); //截取名称
+
+                if (!endowCodeGood.some(function (e) {
+                  return bytesLnegth((e === null || e === void 0 ? void 0 : e.itemName) || '') > 100;
+                })) {
+                  _context6.next = 5;
+                  break;
+                }
+
+                _context6.next = 5;
+                return function () {
+                  return new Promise(function (resolve) {
+                    confirm({
+                      title: '温馨提示',
+                      content: '商品名称长度过长,是否截取名称',
+                      onOk: function onOk() {
+                        endowCodeGood.forEach(function (e) {
+                          if (e && e.itemName) {
+                            e.itemName = cutStr(e.itemName, 99);
+                          }
+                        });
+                        resolve();
+                      },
+                      onCancel: function onCancel() {
+                        resolve();
+                      }
+                    });
+                  });
+                }();
+
+              case 5:
                 s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
                 s.goodsListState.endowCode.endowcodeGoodIndex = [];
 
-              case 3:
+              case 7:
               case "end":
                 return _context6.stop();
             }

package/package.json

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

package/src/Invoice/tools/coolingFn/index.ts

@@ -0,0 +1,18 @@
+
+
+const keys: { [key: string]: any } = {}
+
+/**
+ * 有冷却时间的函数
+ * @param fn 方法
+ * @param key 方法key
+ * @param delayed 冷却时间
+ */
+export default (key: string = 'default', delayed: number = 200, fn: Function) => {
+    if (keys[key]) {
+        return;
+    } else {
+        fn();
+        keys[key] = setTimeout(() => { delete keys[key] }, delayed);
+    }
+}

package/src/Invoice/tools/strringFn/index.ts

@@ -0,0 +1,41 @@
+/**
+ * 判断一个字符串得字节长度
+ * @param str 
+ * @returns 
+ */
+ export function bytesLnegth(str: string) {
+    var count = str.length;
+    for (var i = 0; i < str.length; i++) {
+        if (str.charCodeAt(i) > 255) {
+            count++;
+        }
+    }
+    return count;
+}
+
+/*
+* param str 要截取的字符串
+* param L 要截取的字节长度，注意是字节不是字符，一个汉字两个字节
+* return 截取后的字符串
+*/
+export function cutStr(str: string, L: number) {
+    var result = '',
+        strlen = str.length, // 字符串长度
+        chrlen = str.replace(/[^\x00-\xff]/g, '**').length; // 字节长度
+
+    if (chrlen <= L) { return str; }
+
+    for (var i = 0, j = 0; i < strlen; i++) {
+        var chr = str.charAt(i);
+        if (/[\x00-\xff]/.test(chr)) {
+            j++; // ascii码为0-255，一个字符就是一个字节的长度
+        } else {
+            j += 2; // ascii码为0-255以外，一个字符就是两个字节的长度
+        }
+        if (j <= L) { // 当加上当前字符以后，如果总字节长度小于等于L，则将当前字符真实的+在result后
+            result += chr;
+        } else { // 反之则说明result已经是不拆分字符的情况下最接近L的值了，直接返回
+            return result;
+        }
+    }
+}

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

@@ -1,6 +1,12 @@
 import React from 'react';
-import { Button, Drawer, Select } from 'kts-components-antd-x3';
+import Invoice from '../../';
+import { Button, Drawer, Select, Modal } from 'kts-components-antd-x3';
 import { chain, bignumber } from 'mathjs';
+import { Input, NumberPicker } from '@formily/antd-components';
+import { format15 } from '../GoodsList/hook/useColumns/autoFillFn';
+import { LineAttributeType } from '../../InvoiceController';
+import IGood from '../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
+import { bytesLnegth, cutStr } from '../../tools/strringFn';
 import {
   SchemaForm,
   FormButtonGroup,
@@ -8,13 +14,10 @@ import {
   SchemaMarkupField as Field,
   FormEffectHooks,
 } from '@formily/antd';
-import { Input, NumberPicker } from '@formily/antd-components';
-import { format15 } from '../GoodsList/hook/useColumns/autoFillFn';
-import Invoice from '../../';
-import { LineAttributeType } from '../../InvoiceController';
-import IGood from '../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
 import './index.less';
 
+const { confirm } = Modal;
+
 export default () => {
   const controller = Invoice.useInvoiceController();
 
@@ -153,10 +156,12 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
 
   // 确定
   const onSubmit = React.useCallback(values => {
-    controller.pipeline(async (s) => {
-      s.goodsListState.endowCode.endowcodeGoodIndex.forEach(e => {
+    controller.pipeline(async s => {
 
-        const good = s.goodsListState.goodsMap.get(e);
+      const endowCodeGood = s.goodsListState.endowCode.endowcodeGoodIndex.map(e => s.goodsListState.goodsMap.get(e));
+
+      // 赋码
+      endowCodeGood.forEach(good => {
         if (!good) return;
 
         // const name = getItemName(good.itemName, values.shorthand);
@@ -186,12 +191,29 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
         good.taxAmount = chain(bignumber(good.lineAmountIncludeTax)).subtract(bignumber(good.lineAmountExcludeTax)).done().toNumber();
       });
 
+      //截取名称
+      if (endowCodeGood.some(e => bytesLnegth(e?.itemName || '') > 100)) {
+        await (() => new Promise<void>(resolve => {
+          confirm({
+            title: '温馨提示',
+            content: '商品名称长度过长,是否截取名称',
+            onOk() {
+              endowCodeGood.forEach(e => {
+                if (e && e.itemName) { e.itemName = cutStr(e.itemName, 99) }
+              })
+              resolve()
+            },
+            onCancel() {
+              resolve()
+            },
+          });
+        }))()
+      }
+
       s.goodsListState.goodsList = s.goodsListState.goodsList.slice();
       s.goodsListState.endowCode.endowcodeGoodIndex = [];
     })();
-  },
-    [controller],
-  );
+  }, [controller]);
 
   const effects = React.useCallback(() => {
     // 税率变化
@@ -251,7 +273,7 @@ const DrawerBody = (props: { defaultValue: IGood }) => {
             title="免税类型"
             default={defaultValue?.taxFreeType}
             enum={taxFreeTypeList}
-            
+
             x-rules={[{ message: '请选择免税类型', required: true }]}
           />
         }

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

@@ -1,3 +1,4 @@
+
 import React from 'react';
 import { Form } from 'kts-components-antd-x3';
 import { decorator } from 'grey-react-box';
@@ -58,9 +59,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
   /** 点击组件外部 保存正在编辑的货物 */
   React.useEffect(() => {
     const click = () => {
-      setTimeout(() => {
-        controller.saveEditGood();
-      });
+      setTimeout(controller.saveEditGood);
     };
     window.addEventListener('click', click);
     return () => {

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

@@ -1,6 +1,7 @@
 import React from 'react';
 import Invoice from '../../../../';
 import { Button, message } from 'kts-components-antd-x3';
+import coolingFn from '../../../../tools/coolingFn'
 // import { LineAttributeType } from '../../../../InvoiceController';
 
 export default () => {
@@ -18,19 +19,13 @@ export default () => {
 
       // 不能给正在编辑的货物赋码
       if (s.goodsListState.editGood && s.goodsListState.selectedGoodIndex.indexOf(s.goodsListState.editGood.$index) >= 0) {
-        message.error({
-          content: '不能给正在编辑的货物赋码',
-          key: '不能给正在编辑的货物赋码',
-        });
+        coolingFn('不能给正在编辑的货物赋码', 3000, () => { message.error('不能给正在编辑的货物赋码') });
         return;
       }
 
       // 税率不一样不能批量赋码
       if (s.goodsListState.selectedGoodIndex.map(e => s.goodsListState.goodsMap.get(e)).some((e, _, arr) => e?.taxRate !== arr[0]?.taxRate)) {
-        message.error({
-          content: '商品税率不一致不能操作批量赋码',
-          key: '商品税率不一致不能操作批量赋码',
-        });
+        coolingFn('商品税率不一致不能操作批量赋码', 3000, () => { message.error('商品税率不一致不能操作批量赋码') });
         return;
       }
 

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

@@ -21,7 +21,7 @@ export default () => {
     <Drawer
       title="购方列表"
       placement="right"
-      closable={false}
+      // closable={false}
       destroyOnClose={true}
       width={983}
       onClose={onClose}

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

@@ -20,6 +20,7 @@ export default () => {
   const topExpand = controller.useMemo(s => s.goodsListState.importGoods.topExpand, []);
 
   const onClose = React.useCallback(() => {
+    console.log('===> 关闭抽屉');
     controller.pipeline(async s => { s.goodsListState.importGoods.isVisibleDrawer = false })();
   }, [controller]);
 
@@ -27,12 +28,11 @@ export default () => {
     <Drawer
       title="商品列表"
       placement="right"
-      closable={false}
+      // closable={false}
       destroyOnClose={true}
       width={983}
       onClose={onClose}
       visible={visible}
-      getContainer={() => window.document.querySelector('.kts-invoice-operate-goods-list-able') as any}
     >
       {topExpand &&
         <div style={{ marginBottom: 10 }}  >
@@ -52,7 +52,7 @@ const DrawerBody = () => {
 
   const pagination = controller.useMemo(s => s.goodsListState.importGoods.pagination, []);
 
-  const [editGood] = React.useState(controller.state.goodsListState.editGood);
+  // const [editGood] = React.useState(controller.state.goodsListState.editGood);
 
   React.useEffect(() => {
     controller.getGoodsList &&
@@ -66,8 +66,8 @@ const DrawerBody = () => {
       columns={columns}
       dataSource={dataSource}
       pagination={pagination}
-      onChange={(pagination) => { controller.getGoodsList && controller.getGoodsList({ pagination }) }}
-      onRow={(record) => {
+      onChange={pagination => { controller.getGoodsList && controller.getGoodsList({ pagination }) }}
+      onRow={record => {
         return {
           onClick: () => {
             controller.pipeline(