kts-component-invoice-operate 3.1.16 → 3.1.18

package/dist/Invoice/index.d.ts

@@ -4,6 +4,7 @@ import InvoiceController from './InvoiceController';
 import GoodsList from './ui/GoodsList';
 import Seller from './ui/Seller';
 import Buyer from './ui/Buyer';
+import * as calculator from './tools/calculate';
 /** 发票组件的上下文 */
 export declare const InvoiceContext: React.Context<InvoiceController>;
 export interface IInvoiceProps {
@@ -37,6 +38,8 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
     static readonly Buyer: typeof Buyer;
     /** 货物索引生成器 */
     static idGenerator: () => string;
+    /** 金额计算方法 */
+    static calculator: typeof calculator;
     /** 获取控制器钩子 */
     static useInvoiceController: () => InvoiceController;
     render(): JSX.Element;

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

@@ -31,3 +31,10 @@ export declare function countTaxAmount(amountIncludeTax: string | number, deduct
  * @returns 单价
  */
 export declare function countPrice(amount: string | number, quantity: string | number, calculatingDigits?: number): number | undefined | '';
+/**
+ * 数量 = 金额/单价
+ * @param amount 金额
+ * @param price 单价
+ * @returns 数量
+ */
+export declare function countQuantity(amount: string | number, price: string | number, calculatingDigits?: number): number | undefined | '';

package/dist/index.esm.js

@@ -2,10 +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, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover, Table, Tree, Modal, Row, Col } from 'kts-components-antd-x3';
+import { message, Form, Input, Icon, Tag, Select, Button, Tooltip, Switch as Switch$1, Typography, Menu, Dropdown, AutoComplete, Spin, Checkbox, Drawer, Descriptions, Empty, Divider, Popover, Table as Table$1, Tree, Modal, Row, Col } from 'kts-components-antd-x3';
 import { v4 } from 'uuid';
 import classnames from 'classnames';
 import { TableManual, Switch, Form as Form$1, Drawer as Drawer$1 } from 'kts-xui';
+import { Table } from 'kts-components-antd-x4-v4';
 import { Input as Input$1, NumberPicker } from '@formily/antd-components';
 import { createAsyncFormActions, FormEffectHooks, SchemaForm, FormButtonGroup, SchemaMarkupField } from '@formily/antd';
 
@@ -1134,6 +1135,28 @@ function countPrice(amount, quantity, calculatingDigits) {
   if (!quantity && quantity !== 0) return undefined;
   return format15(chain$1(bignumber(amount)).divide(bignumber(quantity)).done().toNumber(), calculatingDigits);
 }
+/**
+ * 数量 = 金额/单价
+ * @param amount 金额
+ * @param price 单价
+ * @returns 数量
+ */
+function countQuantity(amount, price, calculatingDigits) {
+  if (!amount && amount !== 0) return undefined;
+  if (!price && price !== 0) return undefined;
+  return format15(chain$1(bignumber(amount)).divide(bignumber(price)).done().toNumber(), calculatingDigits);
+}
+
+var calculator = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  format2: format2,
+  format15: format15,
+  countAmountIncludeTax: countAmountIncludeTax,
+  countAmountExcludeTax: countAmountExcludeTax,
+  countTaxAmount: countTaxAmount,
+  countPrice: countPrice,
+  countQuantity: countQuantity
+});
 
 /**
  * 设置当前的编辑货物
@@ -1700,7 +1723,9 @@ function TableVirtual (props) {
       setSelf(e);
     }
   }, /*#__PURE__*/React.createElement(TableManual, _objectSpread2(_objectSpread2({}, props), {}, {
-    dataSource: dataSource
+    dataSource: dataSource,
+    // 新版本Table会有输入框无法连续输入的问题，先兼容老版本
+    tableComponent: Table
   })));
 }
 
@@ -2154,7 +2179,6 @@ function TableRow(props) {
       return undefined;
     }
   }, [props['data-row-key'], goodsMap]);
-  console.log('===> discount', discount);
   return /*#__PURE__*/React.createElement("tr", _objectSpread2(_objectSpread2({}, props), {}, {
     className: classnames(props.className, discount)
   }));
@@ -11759,7 +11783,7 @@ var DrawerBody$1 = function DrawerBody() {
       }
     });
   }, [controller]);
-  return /*#__PURE__*/React.createElement(Table, {
+  return /*#__PURE__*/React.createElement(Table$1, {
     bordered: true,
     size: "small",
     columns: columns,
@@ -11877,7 +11901,7 @@ var DrawerBody$2 = function DrawerBody() {
       }
     });
   }, [controller]);
-  return /*#__PURE__*/React.createElement(Table, {
+  return /*#__PURE__*/React.createElement(Table$1, {
     bordered: true,
     size: "small",
     columns: columns,
@@ -12830,6 +12854,8 @@ var Invoice = /*#__PURE__*/function (_React$PureComponent) {
 
     /** 货物索引生成器 */
 
+    /** 金额计算方法 */
+
     /** 获取控制器钩子 */
 
     function render() {
@@ -12845,6 +12871,7 @@ Invoice.Seller = Buyer;
 Invoice.Sign = Sign;
 Invoice.Buyer = Buyer$1;
 Invoice.idGenerator = idGenerator;
+Invoice.calculator = calculator;
 Invoice.useInvoiceController = function () {
   return React.useContext(InvoiceContext);
 };

package/dist/index.js

@@ -10,6 +10,7 @@ var ktsComponentsAntdX3 = require('kts-components-antd-x3');
 var uuid = require('uuid');
 var classnames = require('classnames');
 var ktsXui = require('kts-xui');
+var ktsComponentsAntdX4V4 = require('kts-components-antd-x4-v4');
 var antdComponents = require('@formily/antd-components');
 var antd = require('@formily/antd');
 
@@ -1144,6 +1145,28 @@ function countPrice(amount, quantity, calculatingDigits) {
   if (!quantity && quantity !== 0) return undefined;
   return format15(mathjs.chain(mathjs.bignumber(amount)).divide(mathjs.bignumber(quantity)).done().toNumber(), calculatingDigits);
 }
+/**
+ * 数量 = 金额/单价
+ * @param amount 金额
+ * @param price 单价
+ * @returns 数量
+ */
+function countQuantity(amount, price, calculatingDigits) {
+  if (!amount && amount !== 0) return undefined;
+  if (!price && price !== 0) return undefined;
+  return format15(mathjs.chain(mathjs.bignumber(amount)).divide(mathjs.bignumber(price)).done().toNumber(), calculatingDigits);
+}
+
+var calculator = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  format2: format2,
+  format15: format15,
+  countAmountIncludeTax: countAmountIncludeTax,
+  countAmountExcludeTax: countAmountExcludeTax,
+  countTaxAmount: countTaxAmount,
+  countPrice: countPrice,
+  countQuantity: countQuantity
+});
 
 /**
  * 设置当前的编辑货物
@@ -1710,7 +1733,9 @@ function TableVirtual (props) {
       setSelf(e);
     }
   }, /*#__PURE__*/React__default['default'].createElement(ktsXui.TableManual, _objectSpread2(_objectSpread2({}, props), {}, {
-    dataSource: dataSource
+    dataSource: dataSource,
+    // 新版本Table会有输入框无法连续输入的问题，先兼容老版本
+    tableComponent: ktsComponentsAntdX4V4.Table
   })));
 }
 
@@ -2164,7 +2189,6 @@ function TableRow(props) {
       return undefined;
     }
   }, [props['data-row-key'], goodsMap]);
-  console.log('===> discount', discount);
   return /*#__PURE__*/React__default['default'].createElement("tr", _objectSpread2(_objectSpread2({}, props), {}, {
     className: classnames__default['default'](props.className, discount)
   }));
@@ -12840,6 +12864,8 @@ var Invoice = /*#__PURE__*/function (_React$PureComponent) {
 
     /** 货物索引生成器 */
 
+    /** 金额计算方法 */
+
     /** 获取控制器钩子 */
 
     function render() {
@@ -12855,6 +12881,7 @@ Invoice.Seller = Buyer;
 Invoice.Sign = Sign;
 Invoice.Buyer = Buyer$1;
 Invoice.idGenerator = idGenerator;
+Invoice.calculator = calculator;
 Invoice.useInvoiceController = function () {
   return React__default['default'].useContext(InvoiceContext);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.1.16",
+  "version": "3.1.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -31,7 +31,8 @@
     "grey-react-box": "^0.2.22",
     "kts-components-antd-x3": "^3.26.20-5",
     "kts-components-antd-x4": "5.0.0",
-    "kts-xui": "^2.0.2",
+    "kts-components-antd-x4-v4": "npm:kts-components-antd-x4@^4.0.3",
+    "kts-xui": "^2.0.3",
     "mathjs": "^9.4.2",
     "next": "^11.0.1",
     "nzh": "^1.0.4",

package/src/Invoice/index.tsx

@@ -12,6 +12,8 @@ import ImportGoodsDrawer from './ui/ImportGoodsDrawer';
 import EndowCodeDrawer from './ui/EndowCodeDrawer';
 import AddComparisonDrawer from './ui/AddComparisonDrawer';
 import idGenerator from './tools/idGenerator';
+import * as calculator from './tools/calculate';
+
 
 /** 发票组件的上下文 */
 export const InvoiceContext = React.createContext<InvoiceController>(
@@ -63,6 +65,9 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
   /** 货物索引生成器 */
   static idGenerator = idGenerator;
 
+  /** 金额计算方法 */
+  static calculator = calculator;
+
   /** 获取控制器钩子 */
   static useInvoiceController = () => { return React.useContext(InvoiceContext) };
 

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

@@ -92,6 +92,21 @@ export function countPrice(amount: string | number, quantity: string | number, c
 }
 
 
+/**
+ * 数量 = 金额/单价
+ * @param amount 金额
+ * @param price 单价
+ * @returns 数量
+ */
+export function countQuantity(amount: string | number, price: string | number, calculatingDigits?: number): number | undefined | '' {
+    if (!amount && amount !== 0) return undefined;
+    if (!price && price !== 0) return undefined;
+
+    return format15(chain(bignumber(amount)).divide(bignumber(price))
+        .done()
+        .toNumber(), calculatingDigits)
+}
+
 
 
 

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

@@ -22,8 +22,6 @@ export default function TableRow(props: any) {
         }
     }, [props['data-row-key'], goodsMap])
 
-    console.log('===> discount', discount)
-
     return (
         <tr {...props} className={classnames(props.className, discount)} />
     )

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

@@ -1,6 +1,7 @@
 
 import React from "react";
-import { TableManual as Table, TableProps } from "kts-xui";
+import { TableManual, TableProps } from "kts-xui";
+import { Table } from 'kts-components-antd-x4-v4';
 import './index.less';
 
 export default function <T extends object = any>(props: TableProps<T>) {
@@ -97,9 +98,11 @@ export default function <T extends object = any>(props: TableProps<T>) {
 
     return (
         <span className="kts-invoice-operate-goods-table-virtual" ref={(e) => { setSelf(e) }} >
-            <Table
+            <TableManual
                 {...props}
                 dataSource={dataSource}
+                // 新版本Table会有输入框无法连续输入的问题，先兼容老版本
+                tableComponent={Table as any}
             />
         </span>
     )