kts-component-invoice-operate 3.2.215 → 3.2.216-fix

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useAddDiscount/index.tsx

@@ -1,119 +1,119 @@
-
-import React from 'react';
-import { Typography } from 'kts-components-antd-x3';
-import { message } from 'kts-xui';
-import InvoiceController, { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
-import Invoice from '../../../../../../../../..';
-
-const { Text } = Typography;
-
-export default (goods: IGood) => {
-
-    const controller = Invoice.useInvoiceController();
-
-    const model = controller.useMemo(s => s.model, [])
-
-    /** 是否能添加折扣行 */
-    const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
-
-    /** 点击了 添加折扣行 按钮 */
-    const onClick = React.useCallback(async e => {
-        try {
-            e.stopPropagation()
-            await controller.wait();
-            await controller.saveEditGood();
-            await checkDiscount(controller);
-            await checkFieldsError(controller, goods);
-            await checkDutyFree(controller, goods);
-            await checkZeroAmount(controller, goods);
-            await controller.run(async s => {
-                s.goodsListState.discountGoodIndex = [goods.$index];
-            })
-        } catch (error: any) {
-            console.error(error);
-        }
-    }, [controller, goods.$index]);
-
-    if (goods.lineAttribute !== LineAttributeType.正常) {
-        return undefined
-    }
-
-    if (!(model !== 'prefab')) {
-        return undefined;
-    }
-
-    if (!(isAddDiscount !== false)) {
-        return undefined
-    }
-
-    if (goods.lineAttribute !== LineAttributeType.正常) {
-        return undefined
-    }
-
-    return {
-        key: 'addDiscount',
-        title: '折扣',
-        onClick,
-    }
-};
-
-/**
- * 有折让行，不可以添加折扣
- * @param controller 组件控制器
- */
-async function checkDiscount(controller: InvoiceController) {
-    const { goodsList } = controller.state.goodsListState;
-    goodsList.forEach(e => {
-        if (e.lineAttribute === LineAttributeType.折让行) {
-            const content = '有折让行，不可以添加折扣';
-            message.error({ content, key: content });
-            throw new Error(content)
-        }
-    })
-}
-
-/**
- * 零税率需要设置免税类型，请在赋码中设置！
- * @param controller 组件控制器
- * @param goods 当前行数据
- */
-async function checkDutyFree(controller: InvoiceController, goods: IGood) {
-    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
-    if (goods.taxRate === 0 && controller.state.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType) {
-        const content = '零税率需要设置免税类型，请在赋码中设置！'
-        message.error({ content, key: content });
-        throw new Error(content)
-    }
-}
-
-/** 
- * 金额为0不能添加折扣行 
- * @param controller 组件控制器
- * @param goods 当前行数据
- **/
-async function checkZeroAmount(controller: InvoiceController, goods: IGood) {
-    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
-    if (`${goods.lineAmountIncludeTax}` === '0') {
-        const content = '金额为0不能添加折扣行'
-        message.error({ content, key: content });
-        throw new Error(content)
-    }
-}
-
-/** 
- * 校验当前的表单 
- * @param controller 组件控制器
- * @param goods 当前行数据
- * */
-async function checkFieldsError(controller: InvoiceController, goods: IGood) {
-    const s = controller.state;
-    if (s.goodsListState.form && s.goodsListState.editGood?.$index === goods?.$index) {
-        const err: any = s.goodsListState.form.getFieldsError();
-        for (let key in err) {
-            if (!err[key]) continue;
-            const content = err[key][0];
-            message.error({ content, key: content });
-            throw new Error(content)
-        }
-    }
+
+import React from 'react';
+import { Typography } from 'kts-components-antd-x3';
+import { message } from 'kts-xui';
+import InvoiceController, { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
+import Invoice from '../../../../../../../../..';
+
+const { Text } = Typography;
+
+export default (goods: IGood) => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const model = controller.useMemo(s => s.model, [])
+
+    /** 是否能添加折扣行 */
+    const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
+
+    /** 点击了 添加折扣行 按钮 */
+    const onClick = React.useCallback(async e => {
+        try {
+            e.stopPropagation()
+            await controller.wait();
+            await controller.saveEditGood();
+            await checkDiscount(controller);
+            await checkFieldsError(controller, goods);
+            await checkDutyFree(controller, goods);
+            await checkZeroAmount(controller, goods);
+            await controller.run(async s => {
+                s.goodsListState.discountGoodIndex = [goods.$index];
+            })
+        } catch (error: any) {
+            console.error(error);
+        }
+    }, [controller, goods.$index]);
+
+    if (goods.lineAttribute !== LineAttributeType.正常) {
+        return undefined
+    }
+
+    if (!(model !== 'prefab')) {
+        return undefined;
+    }
+
+    if (!(isAddDiscount !== false)) {
+        return undefined
+    }
+
+    if (goods.lineAttribute !== LineAttributeType.正常) {
+        return undefined
+    }
+
+    return {
+        key: 'addDiscount',
+        title: '折扣',
+        onClick,
+    }
+};
+
+/**
+ * 有折让行，不可以添加折扣
+ * @param controller 组件控制器
+ */
+async function checkDiscount(controller: InvoiceController) {
+    const { goodsList } = controller.state.goodsListState;
+    goodsList.forEach(e => {
+        if (e.lineAttribute === LineAttributeType.折让行) {
+            const content = '有折让行，不可以添加折扣';
+            message.error({ content, key: content });
+            throw new Error(content)
+        }
+    })
+}
+
+/**
+ * 零税率需要设置免税类型，请在赋码中设置！
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ */
+async function checkDutyFree(controller: InvoiceController, goods: IGood) {
+    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
+    if (goods.taxRate === 0 && controller.state.goodsListState.endowCode.isTaxFreeTypeNeeded && !goods.taxFreeType) {
+        const content = '零税率需要设置免税类型，请在赋码中设置！'
+        message.error({ content, key: content });
+        throw new Error(content)
+    }
+}
+
+/** 
+ * 金额为0不能添加折扣行 
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ **/
+async function checkZeroAmount(controller: InvoiceController, goods: IGood) {
+    goods = controller.state.goodsListState.goodsList.filter(e => e.$index === goods.$index)[0];
+    if (`${goods.lineAmountIncludeTax}` === '0') {
+        const content = '金额为0不能添加折扣行'
+        message.error({ content, key: content });
+        throw new Error(content)
+    }
+}
+
+/** 
+ * 校验当前的表单 
+ * @param controller 组件控制器
+ * @param goods 当前行数据
+ * */
+async function checkFieldsError(controller: InvoiceController, goods: IGood) {
+    const s = controller.state;
+    if (s.goodsListState.form && s.goodsListState.editGood?.$index === goods?.$index) {
+        const err: any = s.goodsListState.form.getFieldsError();
+        for (let key in err) {
+            if (!err[key]) continue;
+            const content = err[key][0];
+            message.error({ content, key: content });
+            throw new Error(content)
+        }
+    }
 }

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useDelItem/dist/index.js

@@ -1,32 +1,32 @@
-"use strict";
-exports.__esModule = true;
-var react_1 = require("react");
-// import { Menu, Typography } from 'kts-components-antd-x3';
-var InvoiceController_1 = require("../../../../../../../../../InvoiceController");
-var __1 = require("../../../../../../../../..");
-// const { Text } = Typography;
-exports["default"] = (function (goods) {
-    var controller = __1["default"].useInvoiceController();
-    var model = controller.useMemo(function (s) { return s.model; }, []);
-    var isRemRow = controller.useMemo(function (s) { return s.goodsListState.isRemRow; }, []);
-    var onClick = react_1["default"].useCallback(function () {
-        controller.delGood(goods.$index);
-    }, [controller, goods.$index]);
-    if (goods.lineAttribute === InvoiceController_1.LineAttributeType.被折扣行) {
-        return undefined;
-    }
-    if (isRemRow === false) {
-        return undefined;
-    }
-    if (!(model !== 'prefab')) {
-        return undefined;
-    }
-    return {
-        key: 'delItem',
-        title: '删除',
-        onClick: onClick
-    };
-    // return React.useMemo(() => {
-    //     return <Menu.Item key="delItem" onClick={onClick}><Text strong type="danger">删除</Text></Menu.Item>
-    // }, [onClick])
-});
+"use strict";
+exports.__esModule = true;
+var react_1 = require("react");
+// import { Menu, Typography } from 'kts-components-antd-x3';
+var InvoiceController_1 = require("../../../../../../../../../InvoiceController");
+var __1 = require("../../../../../../../../..");
+// const { Text } = Typography;
+exports["default"] = (function (goods) {
+    var controller = __1["default"].useInvoiceController();
+    var model = controller.useMemo(function (s) { return s.model; }, []);
+    var isRemRow = controller.useMemo(function (s) { return s.goodsListState.isRemRow; }, []);
+    var onClick = react_1["default"].useCallback(function () {
+        controller.delGood(goods.$index);
+    }, [controller, goods.$index]);
+    if (goods.lineAttribute === InvoiceController_1.LineAttributeType.被折扣行) {
+        return undefined;
+    }
+    if (isRemRow === false) {
+        return undefined;
+    }
+    if (!(model !== 'prefab')) {
+        return undefined;
+    }
+    return {
+        key: 'delItem',
+        title: '删除',
+        onClick: onClick
+    };
+    // return React.useMemo(() => {
+    //     return <Menu.Item key="delItem" onClick={onClick}><Text strong type="danger">删除</Text></Menu.Item>
+    // }, [onClick])
+});

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useDelItem/index.tsx

@@ -1,41 +1,41 @@
-import React from 'react';
-// import { Menu, Typography } from 'kts-components-antd-x3';
-import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
-import Invoice from '../../../../../../../../..';
-
-// const { Text } = Typography;
-
-export default (goods: IGood) => {
-
-    const controller = Invoice.useInvoiceController();
-
-    const model = controller.useMemo(s => s.model, [])
-
-    const isRemRow = controller.useMemo(s => s.goodsListState.isRemRow, [])
-
-    const onClick = React.useCallback(() => {
-        controller.delGood(goods.$index);
-    }, [controller, goods.$index]);
-
-    if (goods.lineAttribute === LineAttributeType.被折扣行) {
-        return undefined;
-    }
-
-    if(isRemRow === false) {
-        return undefined;
-    }
-
-    if (!(model !== 'prefab')) {
-        return undefined;
-    }
-
-    return {
-        key:'delItem',
-        title:'删除',
-        onClick,
-    }
-
-    // return React.useMemo(() => {
-    //     return <Menu.Item key="delItem" onClick={onClick}><Text strong type="danger">删除</Text></Menu.Item>
-    // }, [onClick])
-};
+import React from 'react';
+// import { Menu, Typography } from 'kts-components-antd-x3';
+import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
+import Invoice from '../../../../../../../../..';
+
+// const { Text } = Typography;
+
+export default (goods: IGood) => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const model = controller.useMemo(s => s.model, [])
+
+    const isRemRow = controller.useMemo(s => s.goodsListState.isRemRow, [])
+
+    const onClick = React.useCallback(() => {
+        controller.delGood(goods.$index);
+    }, [controller, goods.$index]);
+
+    if (goods.lineAttribute === LineAttributeType.被折扣行) {
+        return undefined;
+    }
+
+    if(isRemRow === false) {
+        return undefined;
+    }
+
+    if (!(model !== 'prefab')) {
+        return undefined;
+    }
+
+    return {
+        key:'delItem',
+        title:'删除',
+        onClick,
+    }
+
+    // return React.useMemo(() => {
+    //     return <Menu.Item key="delItem" onClick={onClick}><Text strong type="danger">删除</Text></Menu.Item>
+    // }, [onClick])
+};

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useEndowCode/index.tsx

@@ -1,25 +1,25 @@
-import React from 'react';
-import Invoice from '../../../../../../../../..';
-import { endowCode } from '../../../../autoFillFn';
-import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
-
-// const { Text } = Typography;
-
-export default (goods: IGood) => {
-
-    const controller = Invoice.useInvoiceController();
-
-    const onClick = React.useCallback(async () => {
-        endowCode(controller, goods);
-    }, [controller, goods]);
-
-    if ([LineAttributeType.正常, LineAttributeType.被折扣行, LineAttributeType.折扣行].indexOf(goods.lineAttribute) >= 0) {
-        return {
-            key: 'endowCode',
-            title: '赋码',
-            onClick,
-        }
-    } else {
-        return undefined
-    }
-};
+import React from 'react';
+import Invoice from '../../../../../../../../..';
+import { endowCode } from '../../../../autoFillFn';
+import { IGood, LineAttributeType } from '../../../../../../../../../InvoiceController';
+
+// const { Text } = Typography;
+
+export default (goods: IGood) => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const onClick = React.useCallback(async () => {
+        endowCode(controller, goods);
+    }, [controller, goods]);
+
+    if ([LineAttributeType.正常, LineAttributeType.被折扣行, LineAttributeType.折扣行].indexOf(goods.lineAttribute) >= 0) {
+        return {
+            key: 'endowCode',
+            title: '赋码',
+            onClick,
+        }
+    } else {
+        return undefined
+    }
+};

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/index.less

@@ -1,13 +1,13 @@
-.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:focus,
-.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,
-.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu {
-    font-size: 16px;
-    color: #000;
-    text-align: center;
-    padding: 0;
-}
-.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,
-.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu.ktsAnt3x-dropdown-open{
-    background: #ebebeb;
-    border-radius: 9999px;
-}
+.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:focus,
+.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,
+.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu {
+    font-size: 16px;
+    color: #000;
+    text-align: center;
+    padding: 0;
+}
+.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu:hover,
+.ktsAnt3x-btn.kts-invoice-operate-goods-list-columns-row-menu.ktsAnt3x-dropdown-open{
+    background: #ebebeb;
+    border-radius: 9999px;
+}

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/index.tsx

@@ -1,99 +1,99 @@
-import React from 'react';
-import { Button, Menu, Dropdown, Icon, Typography } from 'kts-components-antd-x3';
-import Invoice from '../../../../../../..';
-import { IGood } from '../../../../../../../InvoiceController';
-import { ReactComponent as SpotSvg } from './spot.svg';
-
-import useDelItem from './hook/useDelItem';
-import useAddDiscount from './hook/useAddDiscount';
-import useEndowCode from './hook/useEndowCode';
-// import useAddComparison from './hook/useAddComparison';
-
-import './index.less';
-
-const { Text } = Typography;
-
-export default (props: { goods: IGood }) => {
-
-  const controller = Invoice.useInvoiceController();
-
-  const model = controller.useMemo(s => s.model, [])
-
-  /** 是否能添加折扣行 */
-  const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
-
-  const goodsMenuExpand = controller.useMemo(s => s.goodsListState.goodsMenuExpand, []);
-
-  const delItem = useDelItem(props.goods);
-  const addDiscount = useAddDiscount(props.goods);
-  const endowCode = useEndowCode(props.goods);
-  // const addComparison = useAddComparison(props.goods);
-
-  const itemList = React.useMemo(() => {
-    const arr: any[] = [];
-
-    endowCode && arr.push(endowCode);           // 赋码
-    addDiscount && arr.push(addDiscount);       // 添加折扣行
-    delItem && arr.push(delItem);               // 删除
-
-    // addComparison && arr.push(addComparison);   // 添加商品对照
-
-    if (!goodsMenuExpand || goodsMenuExpand.length === 0) return arr;
-
-    arr.unshift(<Menu.Divider key="divider-1" />);
-
-    for (let i = goodsMenuExpand.length - 1; i >= 0; i--) {
-      const fn = goodsMenuExpand[i];
-      arr.unshift(fn(props.goods.$index, controller));
-    }
-
-    return arr;
-  }, [controller, endowCode, addDiscount, delItem, goodsMenuExpand, props.goods, model, isAddDiscount])
-
-  const overlay = React.useMemo(() => {
-    if (itemList.length <= 2) {
-      return undefined
-    }
-
-    return (
-      <Menu>
-        {itemList.slice(2).map(e => {
-          return <Menu.Item key={e.key} onClick={e.onClick} ><Text strong>{e.title}</Text></Menu.Item>
-        })}
-      </Menu>
-    )
-  }, [itemList])
-
-  const buttonList = React.useMemo(() => {
-    return (
-      <div style={{ flex: 1, textAlign: 'left', display: 'flex', gap: 10 }} >
-        {
-          itemList.slice(0, 2).map(e => {
-            return (
-              <Button key={e.key} type='link' onClick={e.onClick} style={{ padding: 0 }} >
-                {e.title}
-              </Button>
-            )
-          })
-        }
-      </div>
-    )
-  }, [itemList])
-
-  if (props.goods.level && props.goods.level > 0) { return <></> }
-  if (itemList.length === 0) { return (<></>) }
-
-  return (
-    <span style={{ padding: '0 0 0 10px', display: 'flex' }}>
-      {buttonList}
-      {
-        overlay &&
-        <Dropdown overlay={overlay} trigger={['click']}>
-          <Button className="kts-invoice-operate-goods-list-columns-row-menu ant-btn-icon-only" type="link">
-            <Icon component={SpotSvg} />
-          </Button>
-        </Dropdown>
-      }
-    </span>
-  );
-};
+import React from 'react';
+import { Button, Menu, Dropdown, Icon, Typography } from 'kts-components-antd-x3';
+import Invoice from '../../../../../../..';
+import { IGood } from '../../../../../../../InvoiceController';
+import { ReactComponent as SpotSvg } from './spot.svg';
+
+import useDelItem from './hook/useDelItem';
+import useAddDiscount from './hook/useAddDiscount';
+import useEndowCode from './hook/useEndowCode';
+// import useAddComparison from './hook/useAddComparison';
+
+import './index.less';
+
+const { Text } = Typography;
+
+export default (props: { goods: IGood }) => {
+
+  const controller = Invoice.useInvoiceController();
+
+  const model = controller.useMemo(s => s.model, [])
+
+  /** 是否能添加折扣行 */
+  const isAddDiscount = controller.useMemo(s => s.goodsListState.isAddDiscount, [])
+
+  const goodsMenuExpand = controller.useMemo(s => s.goodsListState.goodsMenuExpand, []);
+
+  const delItem = useDelItem(props.goods);
+  const addDiscount = useAddDiscount(props.goods);
+  const endowCode = useEndowCode(props.goods);
+  // const addComparison = useAddComparison(props.goods);
+
+  const itemList = React.useMemo(() => {
+    const arr: any[] = [];
+
+    endowCode && arr.push(endowCode);           // 赋码
+    addDiscount && arr.push(addDiscount);       // 添加折扣行
+    delItem && arr.push(delItem);               // 删除
+
+    // addComparison && arr.push(addComparison);   // 添加商品对照
+
+    if (!goodsMenuExpand || goodsMenuExpand.length === 0) return arr;
+
+    arr.unshift(<Menu.Divider key="divider-1" />);
+
+    for (let i = goodsMenuExpand.length - 1; i >= 0; i--) {
+      const fn = goodsMenuExpand[i];
+      arr.unshift(fn(props.goods.$index, controller));
+    }
+
+    return arr;
+  }, [controller, endowCode, addDiscount, delItem, goodsMenuExpand, props.goods, model, isAddDiscount])
+
+  const overlay = React.useMemo(() => {
+    if (itemList.length <= 2) {
+      return undefined
+    }
+
+    return (
+      <Menu>
+        {itemList.slice(2).map(e => {
+          return <Menu.Item key={e.key} onClick={e.onClick} ><Text strong>{e.title}</Text></Menu.Item>
+        })}
+      </Menu>
+    )
+  }, [itemList])
+
+  const buttonList = React.useMemo(() => {
+    return (
+      <div style={{ flex: 1, textAlign: 'left', display: 'flex', gap: 10 }} >
+        {
+          itemList.slice(0, 2).map(e => {
+            return (
+              <Button key={e.key} type='link' onClick={e.onClick} style={{ padding: 0 }} >
+                {e.title}
+              </Button>
+            )
+          })
+        }
+      </div>
+    )
+  }, [itemList])
+
+  if (props.goods.level && props.goods.level > 0) { return <></> }
+  if (itemList.length === 0) { return (<></>) }
+
+  return (
+    <span style={{ padding: '0 0 0 10px', display: 'flex' }}>
+      {buttonList}
+      {
+        overlay &&
+        <Dropdown overlay={overlay} trigger={['click']}>
+          <Button className="kts-invoice-operate-goods-list-columns-row-menu ant-btn-icon-only" type="link">
+            <Icon component={SpotSvg} />
+          </Button>
+        </Dropdown>
+      }
+    </span>
+  );
+};