kts-component-invoice-operate 3.2.244 → 3.2.246

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/svg/plus.svg

@@ -1,12 +1,12 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="15" viewBox="0 0 16 15">
-  <g clip-path="url(#clip0_715_360)">
-    <path d="M8 14.5312C4.11687 14.5312 0.96875 11.3831 0.96875 7.5C0.96875 3.61687 4.11687 0.46875 8 0.46875C11.8831 0.46875 15.0312 3.61687 15.0312 7.5C15.0312 11.3831 11.8831 14.5312 8 14.5312ZM8 13.5938C11.3656 13.5938 14.0938 10.8656 14.0938 7.5C14.0938 4.13438 11.3656 1.40625 8 1.40625C4.63438 1.40625 1.90625 4.13438 1.90625 7.5C1.90625 10.8656 4.63438 13.5938 8 13.5938Z"/>
-    <path d="M4.25 7.96875C4.12568 7.96875 4.00645 7.91936 3.91854 7.83146C3.83064 7.74355 3.78125 7.62432 3.78125 7.5C3.78125 7.37568 3.83064 7.25645 3.91854 7.16854C4.00645 7.08064 4.12568 7.03125 4.25 7.03125H11.75C11.8743 7.03125 11.9935 7.08064 12.0815 7.16854C12.1694 7.25645 12.2188 7.37568 12.2188 7.5C12.2188 7.62432 12.1694 7.74355 12.0815 7.83146C11.9935 7.91936 11.8743 7.96875 11.75 7.96875H4.25Z"/>
-    <path d="M7.53125 3.75C7.53125 3.62568 7.58064 3.50645 7.66854 3.41854C7.75645 3.33064 7.87568 3.28125 8 3.28125C8.12432 3.28125 8.24355 3.33064 8.33146 3.41854C8.41936 3.50645 8.46875 3.62568 8.46875 3.75V11.25C8.46875 11.3743 8.41936 11.4935 8.33146 11.5815C8.24355 11.6694 8.12432 11.7188 8 11.7188C7.87568 11.7188 7.75645 11.6694 7.66854 11.5815C7.58064 11.4935 7.53125 11.3743 7.53125 11.25V3.75Z"/>
-  </g>
-  <defs>
-    <clipPath id="clip0_715_360">
-      <rect width="15" height="15" transform="translate(0.5)"/>
-    </clipPath>
-  </defs>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="15" viewBox="0 0 16 15">
+  <g clip-path="url(#clip0_715_360)">
+    <path d="M8 14.5312C4.11687 14.5312 0.96875 11.3831 0.96875 7.5C0.96875 3.61687 4.11687 0.46875 8 0.46875C11.8831 0.46875 15.0312 3.61687 15.0312 7.5C15.0312 11.3831 11.8831 14.5312 8 14.5312ZM8 13.5938C11.3656 13.5938 14.0938 10.8656 14.0938 7.5C14.0938 4.13438 11.3656 1.40625 8 1.40625C4.63438 1.40625 1.90625 4.13438 1.90625 7.5C1.90625 10.8656 4.63438 13.5938 8 13.5938Z"/>
+    <path d="M4.25 7.96875C4.12568 7.96875 4.00645 7.91936 3.91854 7.83146C3.83064 7.74355 3.78125 7.62432 3.78125 7.5C3.78125 7.37568 3.83064 7.25645 3.91854 7.16854C4.00645 7.08064 4.12568 7.03125 4.25 7.03125H11.75C11.8743 7.03125 11.9935 7.08064 12.0815 7.16854C12.1694 7.25645 12.2188 7.37568 12.2188 7.5C12.2188 7.62432 12.1694 7.74355 12.0815 7.83146C11.9935 7.91936 11.8743 7.96875 11.75 7.96875H4.25Z"/>
+    <path d="M7.53125 3.75C7.53125 3.62568 7.58064 3.50645 7.66854 3.41854C7.75645 3.33064 7.87568 3.28125 8 3.28125C8.12432 3.28125 8.24355 3.33064 8.33146 3.41854C8.41936 3.50645 8.46875 3.62568 8.46875 3.75V11.25C8.46875 11.3743 8.41936 11.4935 8.33146 11.5815C8.24355 11.6694 8.12432 11.7188 8 11.7188C7.87568 11.7188 7.75645 11.6694 7.66854 11.5815C7.58064 11.4935 7.53125 11.3743 7.53125 11.25V3.75Z"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_715_360">
+      <rect width="15" height="15" transform="translate(0.5)"/>
+    </clipPath>
+  </defs>
 </svg>

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/Drag/index.less

@@ -1,21 +1,21 @@
-.kts-invoice-operate-goods-list-itemName-drag {
-  cursor: all-scroll;
-
-
-}
-
-.kts-invoice-operate-goods-list-itemName-drag-div {
-  z-index       : 999;
-  border        : 1px solid #E6E6E6;
-  width         : 400px;
-  height        : 50px;
-  display       : flex;
-  gap           : 10px;
-  align-items   : center;
-  position      : fixed;
-  padding       : 0 20px;
-  top           : 100px;
-  background    : #fff;
-  pointer-events: none;
-  opacity       : 0.4;
+.kts-invoice-operate-goods-list-itemName-drag {
+  cursor: all-scroll;
+
+
+}
+
+.kts-invoice-operate-goods-list-itemName-drag-div {
+  z-index       : 999;
+  border        : 1px solid #E6E6E6;
+  width         : 400px;
+  height        : 50px;
+  display       : flex;
+  gap           : 10px;
+  align-items   : center;
+  position      : fixed;
+  padding       : 0 20px;
+  top           : 100px;
+  background    : #fff;
+  pointer-events: none;
+  opacity       : 0.4;
 }

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

@@ -1,206 +1,206 @@
-
-import React from "react";
-import Icon from '@ant-design/icons';
-import { ReactComponent as I001Svg } from './svg/I001.svg';
-import { Button } from "kts-components-antd-x3";
-import { IGood, Invoice } from '../../../../../../../..';
-import mounting from "../../../../../../../tools/mounting";
-import { LineAttributeType } from "../../../../../../../InvoiceController";
-import { Popover } from "kts-xui";
-import './index.less';
-
-export interface IDragProps {
-    record: IGood
-}
-
-export default function Drag(props: IDragProps) {
-
-    const { record } = props;
-
-    const [open, setOpen] = React.useState(false)
-
-    const controller = Invoice.useInvoiceController();
-
-    const editGood = controller.useMemo(s => s.goodsListState.editGood, []);
-
-    const disabled = React.useMemo(() => !!editGood, [editGood]);
-
-    const onMouseDown = React.useCallback(() => {
-        if (!controller || !record || disabled) return;
-        controller.run(async s => s.goodsListState.drag.current = record.$index);
-
-        const rowList = window.document.querySelectorAll<HTMLDivElement>('.kts-invoice-operate-goods-list-digtal');
-
-        const currentGood = controller.state.goodsListState.goodsList.filter(e => e.$index === record.$index)[0];
-        mounting(<DragDiv {...currentGood} />)
-
-        rowList.forEach(e => { e.addEventListener('mousemove', onMousemove) });
-        function onMousemove(e: MouseEvent) {
-            controller.run(async s => {
-                const rowDom = getRow(e.target);
-                const container = s.goodsListState.drag.container = rowDom?.dataset?.rowKey;
-
-                /** 准备插入的货物 */
-                const row = s.goodsListState.goodsMap.get(container); if (!row) return;
-
-                // 不可以插入自己
-                if (container === s.goodsListState.drag.current) {
-                    return s.goodsListState.drag.container = undefined;
-                }
-
-                /** 当前拖动中的货品 */
-                const currentGood = s.goodsListState.drag.current && s.goodsListState.goodsMap.get(s.goodsListState.drag.current); if (!currentGood) return;
-
-                // 折扣行 不可以插入 自己的被折扣行
-                if (currentGood.lineAttribute === LineAttributeType.折扣行) {
-                    const currentIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(currentGood.$index)
-                    const containerIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(row.$index)
-                    if (currentIndex - 1 === containerIndex) {
-                        return s.goodsListState.drag.container = undefined;
-
-                    }
-                }
-
-                // 被折扣行 不可以插入 自己的折扣行
-                if (currentGood.lineAttribute === LineAttributeType.被折扣行) {
-                    const currentIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(currentGood.$index)
-                    const containerIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(row.$index)
-                    if (currentIndex + 1 === containerIndex) {
-                        return s.goodsListState.drag.container = undefined;
-                    }
-                }
-
-                // 折扣行 拖动的 相当于 自己的 被折扣行
-                if (row.lineAttribute === LineAttributeType.折扣行) {
-                    // const t = s.goodsListState.goodsList.map(e => e.$index).indexOf(container) - 1;
-                    // s.goodsListState.drag.container = s.goodsListState.goodsList[t].$index;
-                    s.goodsListState.drag.site = 'd'
-                } else if (row.lineAttribute === LineAttributeType.被折扣行) {
-                    s.goodsListState.drag.site = 'u'
-                } else {
-                    const rect = rowDom.getBoundingClientRect();
-                    const mouseY = e.clientY - rect.top;
-                    s.goodsListState.drag.site = mouseY > 25 ? 'd' : 'u';
-                }
-            })
-
-            const getRow = (t: any): any => {
-                try {
-                    if (t.localName === 'tr') {
-                        return t;
-                    } else {
-                        return getRow(t.parentNode);
-                    }
-                } catch (error) {
-                    return undefined;
-                }
-            }
-        }
-
-        // 放开鼠标
-        window.addEventListener('mouseup', onMouseup);
-        function onMouseup() {
-            insert();
-            controller.run(async s => s.goodsListState.drag.current = undefined);
-            window.removeEventListener('mouseup', onMouseup);
-            rowList.forEach(e => { e.removeEventListener('mousemove', onMousemove) });
-            // window.document.body.removeChild(rowDiv);
-        }
-
-        // 开始插入
-        function insert() {
-            mounting(<></>);
-            controller.run(async s => {
-                const { container, current, site } = s.goodsListState.drag;
-                if (!container || !current) return;
-                if (container !== current) {
-                    const goodsList = s.goodsListState.goodsList;
-                    const goodsMap = s.goodsListState.goodsMap;
-                    const currentGood = goodsList.filter(e => e.$index === current)[0];
-                    const currentIndex = goodsList.map(e => e.$index).indexOf(current);
-
-                    /** 需要移动的货品列表 */
-                    let moveGoods: string[] = [current];
-                    if (currentGood.lineAttribute === LineAttributeType.被折扣行) {
-                        moveGoods = [current, goodsList[currentIndex + 1].$index];
-                    } else if (currentGood.lineAttribute === LineAttributeType.折扣行) {
-                        moveGoods = [goodsList[currentIndex - 1].$index, current];
-                    }
-
-                    (() => {
-                        const g = s.goodsListState.goodsList.filter(e => moveGoods.indexOf(e.$index) < 0);
-                        const t = site === 'u' ? g.map(e => e.$index).indexOf(container) : g.map(e => e.$index).indexOf(container) + 1;
-                        const m = moveGoods.map(e => goodsMap.get(e)).filter(e => !!e) as IGood[];
-                        s.goodsListState.goodsList = (g.splice.apply(g, [t, 0, ...m]), g);
-                    })()
-
-                    s.goodsListState.goodsMap = new Map();
-                    s.goodsListState.goodsList.forEach(e => { s.goodsListState.goodsMap.set(e.$index, e) });
-                }
-
-                s.goodsListState.drag.container = undefined;
-                s.goodsListState.drag.current = undefined;
-            })
-        }
-    }, [controller, record, disabled])
-
-    const renderButton = React.useMemo(() => {
-        return (
-            <Button
-                type='link'
-                style={{ padding: 0 }}
-                onMouseDown={onMouseDown}
-                onClick={e => { e.stopPropagation() }}
-                className={"kts-invoice-operate-goods-list-itemName-drag"}
-                onMouseOver={controller.saveEditGood}
-            >
-                <Icon component={I001Svg} />
-            </Button>
-        )
-    }, [onMouseDown, controller])
-
-    if (disabled) {
-        return (
-            <Popover content={'您还有未编辑完成的商品'} trigger='focus' >
-                {renderButton}
-            </Popover>
-        )
-    } else {
-        return renderButton;
-    }
-}
-
-function DragDiv(props: IGood) {
-
-    const [x, setX] = React.useState(0);
-    const [y, setY] = React.useState(-110);
-
-    const div = React.useMemo(() => window.document.querySelector(`[data-row-key="${props.$index}"]`), [props.$index])
-
-    // 初始化位置
-    React.useEffect(() => {
-        if (!div) return;
-        const rect = div.getBoundingClientRect();
-        setX(rect.left + 135);
-        setY(rect.top);
-    }, [div])
-
-    // 移动事件
-    React.useEffect(() => {
-
-        function onMousemove(e: MouseEvent) { setY(e.clientY - 15) };
-
-        window.addEventListener('mousemove', onMousemove);
-        return () => {
-            window.removeEventListener('mousemove', onMousemove);
-        }
-    })
-
-    return (
-        <div className="kts-invoice-operate-goods-list-itemName-drag-div" style={{ top: y, left: x }} >
-            <span>{props.itemName}</span>
-            <span>{props.itemModelName}</span>
-            <span>{props.unit}</span>
-        </div>
-    )
+
+import React from "react";
+import Icon from '@ant-design/icons';
+import { ReactComponent as I001Svg } from './svg/I001.svg';
+import { Button } from "kts-components-antd-x3";
+import { IGood, Invoice } from '../../../../../../../..';
+import mounting from "../../../../../../../tools/mounting";
+import { LineAttributeType } from "../../../../../../../InvoiceController";
+import { Popover } from "kts-xui";
+import './index.less';
+
+export interface IDragProps {
+    record: IGood
+}
+
+export default function Drag(props: IDragProps) {
+
+    const { record } = props;
+
+    const [open, setOpen] = React.useState(false)
+
+    const controller = Invoice.useInvoiceController();
+
+    const editGood = controller.useMemo(s => s.goodsListState.editGood, []);
+
+    const disabled = React.useMemo(() => !!editGood, [editGood]);
+
+    const onMouseDown = React.useCallback(() => {
+        if (!controller || !record || disabled) return;
+        controller.run(async s => s.goodsListState.drag.current = record.$index);
+
+        const rowList = window.document.querySelectorAll<HTMLDivElement>('.kts-invoice-operate-goods-list-digtal');
+
+        const currentGood = controller.state.goodsListState.goodsList.filter(e => e.$index === record.$index)[0];
+        mounting(<DragDiv {...currentGood} />)
+
+        rowList.forEach(e => { e.addEventListener('mousemove', onMousemove) });
+        function onMousemove(e: MouseEvent) {
+            controller.run(async s => {
+                const rowDom = getRow(e.target);
+                const container = s.goodsListState.drag.container = rowDom?.dataset?.rowKey;
+
+                /** 准备插入的货物 */
+                const row = s.goodsListState.goodsMap.get(container); if (!row) return;
+
+                // 不可以插入自己
+                if (container === s.goodsListState.drag.current) {
+                    return s.goodsListState.drag.container = undefined;
+                }
+
+                /** 当前拖动中的货品 */
+                const currentGood = s.goodsListState.drag.current && s.goodsListState.goodsMap.get(s.goodsListState.drag.current); if (!currentGood) return;
+
+                // 折扣行 不可以插入 自己的被折扣行
+                if (currentGood.lineAttribute === LineAttributeType.折扣行) {
+                    const currentIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(currentGood.$index)
+                    const containerIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(row.$index)
+                    if (currentIndex - 1 === containerIndex) {
+                        return s.goodsListState.drag.container = undefined;
+
+                    }
+                }
+
+                // 被折扣行 不可以插入 自己的折扣行
+                if (currentGood.lineAttribute === LineAttributeType.被折扣行) {
+                    const currentIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(currentGood.$index)
+                    const containerIndex = s.goodsListState.goodsList.map(e => e.$index).indexOf(row.$index)
+                    if (currentIndex + 1 === containerIndex) {
+                        return s.goodsListState.drag.container = undefined;
+                    }
+                }
+
+                // 折扣行 拖动的 相当于 自己的 被折扣行
+                if (row.lineAttribute === LineAttributeType.折扣行) {
+                    // const t = s.goodsListState.goodsList.map(e => e.$index).indexOf(container) - 1;
+                    // s.goodsListState.drag.container = s.goodsListState.goodsList[t].$index;
+                    s.goodsListState.drag.site = 'd'
+                } else if (row.lineAttribute === LineAttributeType.被折扣行) {
+                    s.goodsListState.drag.site = 'u'
+                } else {
+                    const rect = rowDom.getBoundingClientRect();
+                    const mouseY = e.clientY - rect.top;
+                    s.goodsListState.drag.site = mouseY > 25 ? 'd' : 'u';
+                }
+            })
+
+            const getRow = (t: any): any => {
+                try {
+                    if (t.localName === 'tr') {
+                        return t;
+                    } else {
+                        return getRow(t.parentNode);
+                    }
+                } catch (error) {
+                    return undefined;
+                }
+            }
+        }
+
+        // 放开鼠标
+        window.addEventListener('mouseup', onMouseup);
+        function onMouseup() {
+            insert();
+            controller.run(async s => s.goodsListState.drag.current = undefined);
+            window.removeEventListener('mouseup', onMouseup);
+            rowList.forEach(e => { e.removeEventListener('mousemove', onMousemove) });
+            // window.document.body.removeChild(rowDiv);
+        }
+
+        // 开始插入
+        function insert() {
+            mounting(<></>);
+            controller.run(async s => {
+                const { container, current, site } = s.goodsListState.drag;
+                if (!container || !current) return;
+                if (container !== current) {
+                    const goodsList = s.goodsListState.goodsList;
+                    const goodsMap = s.goodsListState.goodsMap;
+                    const currentGood = goodsList.filter(e => e.$index === current)[0];
+                    const currentIndex = goodsList.map(e => e.$index).indexOf(current);
+
+                    /** 需要移动的货品列表 */
+                    let moveGoods: string[] = [current];
+                    if (currentGood.lineAttribute === LineAttributeType.被折扣行) {
+                        moveGoods = [current, goodsList[currentIndex + 1].$index];
+                    } else if (currentGood.lineAttribute === LineAttributeType.折扣行) {
+                        moveGoods = [goodsList[currentIndex - 1].$index, current];
+                    }
+
+                    (() => {
+                        const g = s.goodsListState.goodsList.filter(e => moveGoods.indexOf(e.$index) < 0);
+                        const t = site === 'u' ? g.map(e => e.$index).indexOf(container) : g.map(e => e.$index).indexOf(container) + 1;
+                        const m = moveGoods.map(e => goodsMap.get(e)).filter(e => !!e) as IGood[];
+                        s.goodsListState.goodsList = (g.splice.apply(g, [t, 0, ...m]), g);
+                    })()
+
+                    s.goodsListState.goodsMap = new Map();
+                    s.goodsListState.goodsList.forEach(e => { s.goodsListState.goodsMap.set(e.$index, e) });
+                }
+
+                s.goodsListState.drag.container = undefined;
+                s.goodsListState.drag.current = undefined;
+            })
+        }
+    }, [controller, record, disabled])
+
+    const renderButton = React.useMemo(() => {
+        return (
+            <Button
+                type='link'
+                style={{ padding: 0 }}
+                onMouseDown={onMouseDown}
+                onClick={e => { e.stopPropagation() }}
+                className={"kts-invoice-operate-goods-list-itemName-drag"}
+                onMouseOver={controller.saveEditGood}
+            >
+                <Icon component={I001Svg} />
+            </Button>
+        )
+    }, [onMouseDown, controller])
+
+    if (disabled) {
+        return (
+            <Popover content={'您还有未编辑完成的商品'} trigger='focus' >
+                {renderButton}
+            </Popover>
+        )
+    } else {
+        return renderButton;
+    }
+}
+
+function DragDiv(props: IGood) {
+
+    const [x, setX] = React.useState(0);
+    const [y, setY] = React.useState(-110);
+
+    const div = React.useMemo(() => window.document.querySelector(`[data-row-key="${props.$index}"]`), [props.$index])
+
+    // 初始化位置
+    React.useEffect(() => {
+        if (!div) return;
+        const rect = div.getBoundingClientRect();
+        setX(rect.left + 135);
+        setY(rect.top);
+    }, [div])
+
+    // 移动事件
+    React.useEffect(() => {
+
+        function onMousemove(e: MouseEvent) { setY(e.clientY - 15) };
+
+        window.addEventListener('mousemove', onMousemove);
+        return () => {
+            window.removeEventListener('mousemove', onMousemove);
+        }
+    })
+
+    return (
+        <div className="kts-invoice-operate-goods-list-itemName-drag-div" style={{ top: y, left: x }} >
+            <span>{props.itemName}</span>
+            <span>{props.itemModelName}</span>
+            <span>{props.unit}</span>
+        </div>
+    )
 }

package/src/Invoice/ui/digtal/GoodsList/hook/useColumns/ui/ItemNameInput/index.less

@@ -1,10 +1,10 @@
-.kts-invoice-operate-goods-list-itemName-input {
-  display     : flex;
-  flex        : 1;
-  padding-left: 0;
-  height      : 31px;
-}
-
-// .has-error .kts-invoice-operate-goods-list-itemName-input{
-//   border: 1px solid #f5222d;
+.kts-invoice-operate-goods-list-itemName-input {
+  display     : flex;
+  flex        : 1;
+  padding-left: 0;
+  height      : 31px;
+}
+
+// .has-error .kts-invoice-operate-goods-list-itemName-input{
+//   border: 1px solid #f5222d;
 // }