kts-component-invoice-operate 3.2.218 → 3.2.219

package/dist/Invoice/ui/default/GoodsList/index.d.ts

@@ -11,6 +11,7 @@ export interface IGoodsListProps {
     isAddDiscount?: boolean;
     /** 是否可以切换(含税/不含税)状态 */
     isSwitchTax?: boolean;
+    addGoodsCheck?: () => void;
 }
 export default class GoodsList extends React.Component<IGoodsListProps> {
     render(): JSX.Element;

package/dist/Invoice/ui/default/GoodsList/ui/AddRowButton/index.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-declare const _default: () => JSX.Element;
+declare const _default: (props: any) => JSX.Element;
 export default _default;

package/dist/index.esm.js

@@ -10652,7 +10652,7 @@ var Statistics = (function () {
   }, /*#__PURE__*/React.createElement("label", null, "\uFF08\u5C0F\u5199\uFF09 ", lineAmountIncludeTax === '' ? '' : parseFloat(lineAmountIncludeTax).toFixed(2)))));
 });
 
-var AddRowButton = (function () {
+var AddRowButton = (function (props) {
   var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
@@ -10690,14 +10690,26 @@ var AddRowButton = (function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return addGood$1(controller);
+            _context.t0 = props.addGoodsCheck;
+
+            if (!_context.t0) {
+              _context.next = 4;
+              break;
+            }
 
-          case 2:
             _context.next = 4;
-            return rollBottom(controller, rootElement);
+            return props.addGoodsCheck();
 
           case 4:
+            console.log('continue');
+            _context.next = 7;
+            return addGood$1(controller);
+
+          case 7:
+            _context.next = 9;
+            return rollBottom(controller, rootElement);
+
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -16603,7 +16615,9 @@ var Main = decorator(Form.create())(function (props) {
     className: "kts-invoice-operate-goods-list-able"
   }, /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, /*#__PURE__*/React.createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React.createElement(Search, null)), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(AddRowButton, {
+    addGoodsCheck: props.addGoodsCheck
+  }), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React.createElement(Search, null)), /*#__PURE__*/React.createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, /*#__PURE__*/React.createElement(DescribeSwitch, null), /*#__PURE__*/React.createElement(TaxIncludedSwitch, null))), /*#__PURE__*/React.createElement("div", {
     className: classnames('kts-invoice-operate-goods-list-table', {
@@ -19158,17 +19172,15 @@ function _addGood$1() {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
-                        console.log(err, values);
-
                         if (!err) {
-                          _context2.next = 4;
+                          _context2.next = 3;
                           break;
                         }
 
                         message$1.error('请先填写发票行信息，再添加新的行');
                         return _context2.abrupt("return");
 
-                      case 4:
+                      case 3:
                       case "end":
                         return _context2.stop();
                     }

package/dist/index.js

@@ -10662,7 +10662,7 @@ var Statistics = (function () {
   }, /*#__PURE__*/React__default['default'].createElement("label", null, "\uFF08\u5C0F\u5199\uFF09 ", lineAmountIncludeTax === '' ? '' : parseFloat(lineAmountIncludeTax).toFixed(2)))));
 });
 
-var AddRowButton = (function () {
+var AddRowButton = (function (props) {
   var controller = Invoice.useInvoiceController();
   var model = controller.useMemo(function (s) {
     return s.model;
@@ -10700,14 +10700,26 @@ var AddRowButton = (function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return addGood$1(controller);
+            _context.t0 = props.addGoodsCheck;
+
+            if (!_context.t0) {
+              _context.next = 4;
+              break;
+            }
 
-          case 2:
             _context.next = 4;
-            return rollBottom(controller, rootElement);
+            return props.addGoodsCheck();
 
           case 4:
+            console.log('continue');
+            _context.next = 7;
+            return addGood$1(controller);
+
+          case 7:
+            _context.next = 9;
+            return rollBottom(controller, rootElement);
+
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -16613,7 +16625,9 @@ var Main = GreyReactBox.decorator(ktsComponentsAntdX3.Form.create())(function (p
     className: "kts-invoice-operate-goods-list-able"
   }, /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-list"
-  }, /*#__PURE__*/React__default['default'].createElement(AddRowButton, null), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React__default['default'].createElement(Search, null)), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, /*#__PURE__*/React__default['default'].createElement(AddRowButton, {
+    addGoodsCheck: props.addGoodsCheck
+  }), endowCodeButton.button, delRowButton.button, mergeDetails.button, mergeDiscount.button, addDiscountRowButton.drawer, salesDiscount.button, salesGifts.button, /*#__PURE__*/React__default['default'].createElement(Search, null)), /*#__PURE__*/React__default['default'].createElement("div", {
     className: "kts-invoice-operate-goods-list-able-extend"
   }, props.menuExpansion, /*#__PURE__*/React__default['default'].createElement(DescribeSwitch, null), /*#__PURE__*/React__default['default'].createElement(TaxIncludedSwitch, null))), /*#__PURE__*/React__default['default'].createElement("div", {
     className: classnames__default['default']('kts-invoice-operate-goods-list-table', {
@@ -19168,17 +19182,15 @@ function _addGood$1() {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
-                        console.log(err, values);
-
                         if (!err) {
-                          _context2.next = 4;
+                          _context2.next = 3;
                           break;
                         }
 
                         ktsXui.message.error('请先填写发票行信息，再添加新的行');
                         return _context2.abrupt("return");
 
-                      case 4:
+                      case 3:
                       case "end":
                         return _context2.stop();
                     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.218",
+  "version": "3.2.219",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

package/src/Invoice/InvoiceController/InvoiceControllerState/index.ts

@@ -68,4 +68,5 @@ export default class InvoiceControllerState {
    * 货物运输列表
    */
   freightListState = new FreightListState();
+
 }

package/src/Invoice/_test/deduction/index.tsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Input } from 'kts-components-antd-x3';
+import { Input, message } from 'kts-components-antd-x3';
 import Invoice from '../../';
 import 'antd/dist/antd.css';
 
@@ -29,17 +29,33 @@ export default () => {
             </span>
         )
     }, [])
+    const checkGood = async () => {
+        await new Promise((resolve,) => {
+            setTimeout(() => {
+                const a = Math.random();
+                if (a > 0.5) {
+                    message.error('请先填写发票行信息，再添加新的行');
+                    return false;
+                } else {
+                    resolve(true)
+                    console.log(11112)
+                }
 
+            }, 1000)
+        })
+    }
     return (
         <Invoice
             controller={controller}
             goodsList={
                 <Invoice.GoodsList
-                    isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
-                    isAddDiscount={false}           // 不能添加折扣行
-                    goodMax={goodMax}               // 控制能可以添加的货物函数
-                    deduction={deduction}           // 扣除额
-                    menuExpansion={menuExpansion}   // 扩展
+
+                    addGoodsCheck={checkGood}
+                // isSwitchTax={false}             // 是否可以切换(含税/不含税)状态
+                // isAddDiscount={false}           // 不能添加折扣行
+                // goodMax={goodMax}               // 控制能可以添加的货物函数
+                // deduction={deduction}           // 扣除额
+                // menuExpansion={menuExpansion}   // 扩展
                 />
             }
         />

package/src/Invoice/index.md

@@ -1,18 +1,18 @@
 # 默认
 
-## 简单用法
+<!-- ## 简单用法
 <code src="./_test/easiest/index.tsx"></code>
 
 ## 设置为草稿，设置默认参数 扩展按钮
 <code src="./_test/draft/index.tsx" title="类似的操作,请查看API" ></code>
 
 ## 设置购买方名称搜索 
-<code src="./_test/buyerNameSearch/index.tsx"></code>
+<code src="./_test/buyerNameSearch/index.tsx"></code> -->
 
 ## 设置扣除额（差额征税）
 <code src="./_test/deduction/index.tsx"></code>
 
-## 设置单位列表、税率列表
+<!-- ## 设置单位列表、税率列表
 <code src="./_test/unit/index.tsx" ></code>
 
 ## 发票头类型设置和购买方信息配置
@@ -53,4 +53,4 @@
 <API name="GoodsList 商品列表 API" exports='["default"]' src="./ui/default/GoodsList/index.tsx"></API>
 <API name="Buyer 购买方 API" exports='["default"]' src="./ui/default/Buyer/index.tsx"></API>
 <API name="Seller 销售方 API" exports='["default"]' src="./ui/default/Seller/index.tsx"></API>
-<API name="Sign 落款 API" exports='["default"]' src="./ui/default/Sign/index.tsx"></API>
+<API name="Sign 落款 API" exports='["default"]' src="./ui/default/Sign/index.tsx"></API> -->

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

@@ -47,6 +47,8 @@ export interface IGoodsListProps {
 
   /** 是否可以切换(含税/不含税)状态 */
   isSwitchTax?: boolean;
+
+  addGoodsCheck?:()=>void;
 }
 
 export default class GoodsList extends React.Component<IGoodsListProps>{
@@ -137,7 +139,7 @@ const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Fo
       <div className="kts-invoice-operate-goods-list-able">
         <div className="kts-invoice-operate-goods-list-able-list">
           {/* 添加行 */}
-          <AddRowButton />
+          <AddRowButton addGoodsCheck={props.addGoodsCheck}/>
 
           {/* 批量菜单 */}
           {/* <BulkMenu /> */}

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

@@ -3,7 +3,7 @@ import Invoice from '../../../../..';
 import { Button, message } from 'kts-components-antd-x3';
 import InvoiceController, { LineAttributeType } from '../../../../../InvoiceController';
 
-export default () => {
+export default (props: any) => {
   const controller = Invoice.useInvoiceController();
 
   const model = controller.useMemo(s => s.model, []);
@@ -26,6 +26,8 @@ export default () => {
   const disabled = React.useMemo(() => typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue, [goodMax, goodsNum, searchValue])
 
   const onClick = React.useCallback(async () => {
+    props.addGoodsCheck &&await props.addGoodsCheck();
+    console.log('continue')
     await addGood(controller);
     await rollBottom(controller, rootElement);
   }, [controller, rootElement]);
@@ -43,6 +45,7 @@ export default () => {
 
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
+ 
   await controller.saveEditGood();
   await controller.wait();
   await controller.run(async (s) => {

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

@@ -46,7 +46,7 @@ export default () => {
 /** 添加一个空货物 */
 async function addGood(controller: InvoiceController) {
   await controller.formList.get('realEstateInfo')?.validateFields(async (err: any, values: any) => {
-    console.log(err, values)
+
     if (err) {
       message.error('请先填写发票行信息，再添加新的行');
       return;