kts-component-invoice-operate 3.2.215 → 3.2.217-chinaship

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

@@ -1,98 +1,98 @@
-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 (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 (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>
+  );
+};

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/RowSaveButton/index.tsx

@@ -1,14 +1,14 @@
-import React from 'react';
-import { Button } from 'kts-components-antd-x3';
-import Invoice from '../../../../../../';
-import { IGood } from '../../../../../../InvoiceController';
-
-export default (props: { goods: IGood }) => {
-  const controller = Invoice.useInvoiceController();
-
-  const onClick = React.useCallback(() => {
-    controller.saveEditGood();
-  }, [controller]);
-
-  return <Button type="link" icon="save" onClick={onClick} />;
-};
+import React from 'react';
+import { Button } from 'kts-components-antd-x3';
+import Invoice from '../../../../../../';
+import { IGood } from '../../../../../../InvoiceController';
+
+export default (props: { goods: IGood }) => {
+  const controller = Invoice.useInvoiceController();
+
+  const onClick = React.useCallback(() => {
+    controller.saveEditGood();
+  }, [controller]);
+
+  return <Button type="link" icon="save" onClick={onClick} />;
+};

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/TitleText/index.tsx

@@ -1,20 +1,20 @@
-
-import React from 'react';
-import { Typography } from 'kts-components-antd-x3';
-import { ValidationRule } from 'kts-components-antd-x3/lib/form';
-
-const { Text } = Typography;
-
-export default (props: { children?: React.ReactNode, required?: boolean, rules?: ValidationRule[] }) => {
-
-    const { rules, children } = props;
-
-    const required = React.useMemo(() => rules?.some(e => !!e.required) || props.required, [rules, props.required]);
-
-    return (
-        <>
-            {required ? <Text type="danger">*</Text> : <></>}
-            {children}
-        </>
-    )
-};
+
+import React from 'react';
+import { Typography } from 'kts-components-antd-x3';
+import { ValidationRule } from 'kts-components-antd-x3/lib/form';
+
+const { Text } = Typography;
+
+export default (props: { children?: React.ReactNode, required?: boolean, rules?: ValidationRule[] }) => {
+
+    const { rules, children } = props;
+
+    const required = React.useMemo(() => rules?.some(e => !!e.required) || props.required, [rules, props.required]);
+
+    return (
+        <>
+            {required ? <Text type="danger">*</Text> : <></>}
+            {children}
+        </>
+    )
+};

package/src/Invoice/ui/digtal/GoodsList/hook/useOnRow/index.tsx

@@ -1,51 +1,51 @@
-/**
- * 表格行事件
- */
-
-import React from 'react';
-import Invoice from '../../../../..';
-import IGood from '../../../../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
-import { LineAttributeType } from '../../../../../InvoiceController';
-
-export default () => {
-  /** 控制器 */
-  const controller = Invoice.useInvoiceController();
-
-  const model = controller.useMemo(s => s.model, []);
-
-  const onClick = React.useCallback(
-    async (record: IGood) => {
-      // if (model === 'prefab') return;
-      if (model === 'readOnly') return;
-
-      const editGood = controller.state.goodsListState.editGood;
-      if (record.lineAttribute !== LineAttributeType.正常) return;
-
-      if (editGood) {
-        if (editGood.$index === record.$index) return;
-        await controller.saveEditGood();
-        await controller.wait();
-        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
-          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
-          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
-          //   record.taxRate = undefined;
-          // }
-        }
-        await controller.pipeline(async s => { s.goodsListState.editGood || (await controller.setEditGood(record)) })();
-      } else {
-        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
-          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
-          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
-          //   record.taxRate = undefined;
-          // }
-        }
-        await controller.setEditGood(record);
-      }
-    },
-    [controller, model],
-  );
-
-  return {
-    onClick,
-  };
-};
+/**
+ * 表格行事件
+ */
+
+import React from 'react';
+import Invoice from '../../../../..';
+import IGood from '../../../../../InvoiceController/InvoiceControllerState/GoodsListState/IGood';
+import { LineAttributeType } from '../../../../../InvoiceController';
+
+export default () => {
+  /** 控制器 */
+  const controller = Invoice.useInvoiceController();
+
+  const model = controller.useMemo(s => s.model, []);
+
+  const onClick = React.useCallback(
+    async (record: IGood) => {
+      // if (model === 'prefab') return;
+      if (model === 'readOnly') return;
+
+      const editGood = controller.state.goodsListState.editGood;
+      if (record.lineAttribute !== LineAttributeType.正常) return;
+
+      if (editGood) {
+        if (editGood.$index === record.$index) return;
+        await controller.saveEditGood();
+        await controller.wait();
+        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
+          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
+          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
+          //   record.taxRate = undefined;
+          // }
+        }
+        await controller.pipeline(async s => { s.goodsListState.editGood || (await controller.setEditGood(record)) })();
+      } else {
+        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
+          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
+          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
+          //   record.taxRate = undefined;
+          // }
+        }
+        await controller.setEditGood(record);
+      }
+    },
+    [controller, model],
+  );
+
+  return {
+    onClick,
+  };
+};

package/src/Invoice/ui/digtal/GoodsList/hook/useRowSelection/index.tsx

@@ -1,122 +1,122 @@
-
-import React from 'react';
-import { Checkbox } from 'kts-components-antd-x3';
-import { LineAttributeType } from '../../../../../InvoiceController';
-import Invoice from '../../../../..';
-
-export default () => {
-
-    /** 控制器 */
-    const controller = Invoice.useInvoiceController();
-
-    /** 列表选中的货物索引列表 */
-    const selectedRowKeys = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
-
-    /** 货物列表 */
-    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
-
-    /** 组件模式 */
-    const model = controller.useMemo(s => s.model, []);
-
-    /** 搜索条件 */
-    // const searchValue = controller.useMemo(s => s.goodsListState.searchValue, []);
-
-    /** 是否显示选择框 */
-    const isShow = React.useMemo(() => {
-        if (model === 'readOnly') return false
-        return true;
-    }, [model])
-
-    /** 是否全选 */
-    // const isAll = controller.useMemo(s => s.goodsListState.goodsList.length > 0 && s.goodsListState.selectedGoodIndex.length === s.goodsListState.goodsList.length, [])
-    const isAll = controller.useMemo(s => {
-        if (s.goodsListState.selectedGoodIndex.length <= 0) return false;
-        const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index);
-        const selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => seeGoodsIndex.some(t => e === t));
-        return selectedGoodIndex.length === seeGoodsIndex.length
-    }, [])
-
-    const indeterminate = controller.useMemo(s => {
-        const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index);
-        const selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => seeGoodsIndex.some(t => e === t));
-        if (selectedGoodIndex.length === 0) return false;
-        return selectedGoodIndex.length < seeGoodsIndex.length
-    }, [])
-
-    /** 点击了全选 */
-    const onClickSelectAll = React.useCallback(async () => {
-        if (isAll) {
-            await controller.pipeline(async s => {
-                const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index)
-
-                s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => !seeGoodsIndex.some(t => e === t));
-            })()
-        } else {
-            await controller.pipeline(async s => {
-                const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index)
-
-                s.goodsListState.selectedGoodIndex = [...s.goodsListState.selectedGoodIndex, ...seeGoodsIndex];
-                s.goodsListState.selectedGoodIndex = Array.from(new Set(s.goodsListState.selectedGoodIndex));
-            })()
-        }
-        await sortOut(true);
-    }, [controller, isAll])
-
-    const onSelect = React.useCallback(async (record, selected) => {
-        if (selected) {
-            await controller.pipeline(async s => {
-                s.goodsListState.selectedGoodIndex = [...s.goodsListState.selectedGoodIndex, record.$index];
-                s.goodsListState = { ...s.goodsListState };
-            })()
-        } else {
-            await controller.pipeline(async s => {
-                s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => e !== record.$index);
-                s.goodsListState = { ...s.goodsListState };
-            })()
-        }
-        await sortOut(selected);
-    }, [controller])
-
-    const columnTitle = React.useMemo(() => {
-        return (
-            <Checkbox
-                onChange={onClickSelectAll}
-                indeterminate={indeterminate}
-                checked={isAll}
-            ></Checkbox>
-        )
-    }, [goodsList, selectedRowKeys, onClickSelectAll, isAll, indeterminate])
-
-    /** 选择了商品后 调整 折扣行 和 被折扣行 */
-    const sortOut = React.useCallback(async (selected: boolean) => {
-        await controller.wait();
-        await controller.pipeline(async s => {
-            s.goodsListState.selectedGoodIndex.forEach($index => {
-                const goods = s.goodsListState.goodsMap.get($index);
-                if (!goods || goods.lineAttribute === LineAttributeType.正常) return;
-
-                // 数组位置
-                let t = s.goodsListState.goodsList.indexOf(goods);
-                goods.lineAttribute === LineAttributeType.折扣行 ? t : t++;
-                const i = s.goodsListState.goodsList[t].$index;
-                if (selected) {
-                    if (s.goodsListState.selectedGoodIndex.indexOf(i) < 0) s.goodsListState.selectedGoodIndex = [...s.goodsListState.selectedGoodIndex, i];
-                } else {
-                    if (s.goodsListState.selectedGoodIndex.indexOf(i) < 0) s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => e !== $index);
-                }
-            })
-        })()
-    }, [controller])
-
-    React.useEffect(() => {
-        sortOut(true);
-    }, [sortOut, goodsList])
-
-    if (isShow === false) return undefined;
-    return {
-        columnWidth: 45,
-        columnTitle,
-        onSelect,
-        selectedRowKeys,
-    }
+
+import React from 'react';
+import { Checkbox } from 'kts-components-antd-x3';
+import { LineAttributeType } from '../../../../../InvoiceController';
+import Invoice from '../../../../..';
+
+export default () => {
+
+    /** 控制器 */
+    const controller = Invoice.useInvoiceController();
+
+    /** 列表选中的货物索引列表 */
+    const selectedRowKeys = controller.useMemo(s => s.goodsListState.selectedGoodIndex, []);
+
+    /** 货物列表 */
+    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
+
+    /** 组件模式 */
+    const model = controller.useMemo(s => s.model, []);
+
+    /** 搜索条件 */
+    // const searchValue = controller.useMemo(s => s.goodsListState.searchValue, []);
+
+    /** 是否显示选择框 */
+    const isShow = React.useMemo(() => {
+        if (model === 'readOnly') return false
+        return true;
+    }, [model])
+
+    /** 是否全选 */
+    // const isAll = controller.useMemo(s => s.goodsListState.goodsList.length > 0 && s.goodsListState.selectedGoodIndex.length === s.goodsListState.goodsList.length, [])
+    const isAll = controller.useMemo(s => {
+        if (s.goodsListState.selectedGoodIndex.length <= 0) return false;
+        const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index);
+        const selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => seeGoodsIndex.some(t => e === t));
+        return selectedGoodIndex.length === seeGoodsIndex.length
+    }, [])
+
+    const indeterminate = controller.useMemo(s => {
+        const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index);
+        const selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => seeGoodsIndex.some(t => e === t));
+        if (selectedGoodIndex.length === 0) return false;
+        return selectedGoodIndex.length < seeGoodsIndex.length
+    }, [])
+
+    /** 点击了全选 */
+    const onClickSelectAll = React.useCallback(async () => {
+        if (isAll) {
+            await controller.pipeline(async s => {
+                const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index)
+
+                s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => !seeGoodsIndex.some(t => e === t));
+            })()
+        } else {
+            await controller.pipeline(async s => {
+                const seeGoodsIndex = controller.getGoodsSearch(s.goodsListState.goodsList, s.goodsListState.searchValue, s.goodsListState.isTaxIncluded).map(e => e.$index)
+
+                s.goodsListState.selectedGoodIndex = [...s.goodsListState.selectedGoodIndex, ...seeGoodsIndex];
+                s.goodsListState.selectedGoodIndex = Array.from(new Set(s.goodsListState.selectedGoodIndex));
+            })()
+        }
+        await sortOut(true);
+    }, [controller, isAll])
+
+    const onSelect = React.useCallback(async (record, selected) => {
+        if (selected) {
+            await controller.pipeline(async s => {
+                s.goodsListState.selectedGoodIndex = [...s.goodsListState.selectedGoodIndex, record.$index];
+                s.goodsListState = { ...s.goodsListState };
+            })()
+        } else {
+            await controller.pipeline(async s => {
+                s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => e !== record.$index);
+                s.goodsListState = { ...s.goodsListState };
+            })()
+        }
+        await sortOut(selected);
+    }, [controller])
+
+    const columnTitle = React.useMemo(() => {
+        return (
+            <Checkbox
+                onChange={onClickSelectAll}
+                indeterminate={indeterminate}
+                checked={isAll}
+            ></Checkbox>
+        )
+    }, [goodsList, selectedRowKeys, onClickSelectAll, isAll, indeterminate])
+
+    /** 选择了商品后 调整 折扣行 和 被折扣行 */
+    const sortOut = React.useCallback(async (selected: boolean) => {
+        await controller.wait();
+        await controller.pipeline(async s => {
+            s.goodsListState.selectedGoodIndex.forEach($index => {
+                const goods = s.goodsListState.goodsMap.get($index);
+                if (!goods || goods.lineAttribute === LineAttributeType.正常) return;
+
+                // 数组位置
+                let t = s.goodsListState.goodsList.indexOf(goods);
+                goods.lineAttribute === LineAttributeType.折扣行 ? t : t++;
+                const i = s.goodsListState.goodsList[t].$index;
+                if (selected) {
+                    if (s.goodsListState.selectedGoodIndex.indexOf(i) < 0) s.goodsListState.selectedGoodIndex = [...s.goodsListState.selectedGoodIndex, i];
+                } else {
+                    if (s.goodsListState.selectedGoodIndex.indexOf(i) < 0) s.goodsListState.selectedGoodIndex = s.goodsListState.selectedGoodIndex.filter(e => e !== $index);
+                }
+            })
+        })()
+    }, [controller])
+
+    React.useEffect(() => {
+        sortOut(true);
+    }, [sortOut, goodsList])
+
+    if (isShow === false) return undefined;
+    return {
+        columnWidth: 45,
+        columnTitle,
+        onSelect,
+        selectedRowKeys,
+    }
 }