kts-component-invoice-operate 3.2.98 → 3.2.99

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

@@ -1,56 +1,56 @@
-
-export interface ISN {
-
-    /** 简称 */
-    shorthand?: string;
-
-    /** 全称 */
-    full: string
-}
-
-/** 拆分全称加简称 */
-export const getSN = (value?: string): ISN | undefined => {
-    if (!value) return undefined;
-    const arr = value.match(/\*[^*]+\*/);
-    if (arr && arr[0]) {
-        return { shorthand: arr[0].split('*')[1], full: value.replace(arr[0], '') };
-    } else {
-        return { shorthand: undefined, full: value };
-    }
-};
-
-/** 组合全称加简称 */
-export const getItemName = (value: ISN) => {
-    if (value.shorthand) {
-        return `*${value.shorthand}*${value.full}`;
-    } else {
-        return value.full;
-    }
-}
-
-/** 设置全称 */
-export const setFull = (name?:string, full?:string) => {
-    const sn = getSN(name);
-    if(!sn) return full;
-    sn.full = full || '';
-    return getItemName(sn);
-}
-
-/** 设置简称 */
-export const setShorthand = (name?:string, shorthand?:string) => {
-    if(!name) return undefined
-
-    const sn = getSN(name);
-    if(!sn) return undefined;
-    sn.shorthand = shorthand || '';
-    return getItemName(sn);
-}
-
-/** 组合全称加简称 */
-export const getItemNameWithShorthand = (value: ISN) => {
-    if (value.shorthand) {
-        return `*${value.shorthand}*${value.full}`;
-    } else {
-        return value.full;
-    }
+
+export interface ISN {
+
+    /** 简称 */
+    shorthand?: string;
+
+    /** 全称 */
+    full: string
+}
+
+/** 拆分全称加简称 */
+export const getSN = (value?: string): ISN | undefined => {
+    if (!value) return undefined;
+    const arr = value.match(/\*[^*]+\*/);
+    if (arr && arr[0]) {
+        return { shorthand: arr[0].split('*')[1], full: value.replace(arr[0], '') };
+    } else {
+        return { shorthand: undefined, full: value };
+    }
+};
+
+/** 组合全称加简称 */
+export const getItemName = (value: ISN) => {
+    if (value.shorthand) {
+        return `*${value.shorthand}*${value.full}`;
+    } else {
+        return value.full;
+    }
+}
+
+/** 设置全称 */
+export const setFull = (name?:string, full?:string) => {
+    const sn = getSN(name);
+    if(!sn) return full;
+    sn.full = full || '';
+    return getItemName(sn);
+}
+
+/** 设置简称 */
+export const setShorthand = (name?:string, shorthand?:string) => {
+    if(!name) return undefined
+
+    const sn = getSN(name);
+    if(!sn) return undefined;
+    sn.shorthand = shorthand || '';
+    return getItemName(sn);
+}
+
+/** 组合全称加简称 */
+export const getItemNameWithShorthand = (value: ISN) => {
+    if (value.shorthand) {
+        return `*${value.shorthand}*${value.full}`;
+    } else {
+        return value.full;
+    }
 }

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

@@ -1,20 +1,20 @@
-/** 延迟函数 */
-export default (fn: Function, delayed: number = 200) => {
-    // let timer: any = 0;
-    // return (...par: any[]) => {
-    //     if (timer === 0) {
-    //         timer = setTimeout(() => {
-    //             fn.apply(null, par);
-    //             timer = 0;
-    //         }, delayed);
-    //     }
-    // }
-    let timer: any;
-    return (...par: any[]) => {
-        if (timer) return;
-        timer = setTimeout(() => {
-            timer = undefined;
-            fn.apply(null, par);
-        }, delayed);
-    }
+/** 延迟函数 */
+export default (fn: Function, delayed: number = 200) => {
+    // let timer: any = 0;
+    // return (...par: any[]) => {
+    //     if (timer === 0) {
+    //         timer = setTimeout(() => {
+    //             fn.apply(null, par);
+    //             timer = 0;
+    //         }, delayed);
+    //     }
+    // }
+    let timer: any;
+    return (...par: any[]) => {
+        if (timer) return;
+        timer = setTimeout(() => {
+            timer = undefined;
+            fn.apply(null, par);
+        }, delayed);
+    }
 }

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

@@ -1,14 +1,14 @@
-
-import * as ReactDOM from 'react-dom';
-
-/** 挂在组件到跟上 */
-export default function mounting(node: JSX.Element, containerId?: string) {
-    ReactDOM.render(node, getContainer(containerId));
-}
-
-function getContainer(containerId: string = 'kts-component-invoice-operate-invoicing-authorization') {
-    const div: HTMLElement = document.querySelector(`#${containerId}`) || document.createElement("div");
-    div.id = containerId;
-    document.body.appendChild(div);
-    return div;
+
+import * as ReactDOM from 'react-dom';
+
+/** 挂在组件到跟上 */
+export default function mounting(node: JSX.Element, containerId?: string) {
+    ReactDOM.render(node, getContainer(containerId));
+}
+
+function getContainer(containerId: string = 'kts-component-invoice-operate-invoicing-authorization') {
+    const div: HTMLElement = document.querySelector(`#${containerId}`) || document.createElement("div");
+    div.id = containerId;
+    document.body.appendChild(div);
+    return div;
 }

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

@@ -1,41 +1,41 @@
-/**
- * 判断一个字符串得字节长度
- * @param str 
- * @returns 
- */
- export function bytesLnegth(str: string) {
-    var count = str.length;
-    for (var i = 0; i < str.length; i++) {
-        if (str.charCodeAt(i) > 255) {
-            count++;
-        }
-    }
-    return count;
-}
-
-/*
-* param str 要截取的字符串
-* param L 要截取的字节长度，注意是字节不是字符，一个汉字两个字节
-* return 截取后的字符串
-*/
-export function cutStr(str: string, L: number) {
-    var result = '',
-        strlen = str.length, // 字符串长度
-        chrlen = str.replace(/[^\x00-\xff]/g, '**').length; // 字节长度
-
-    if (chrlen <= L) { return str; }
-
-    for (var i = 0, j = 0; i < strlen; i++) {
-        var chr = str.charAt(i);
-        if (/[\x00-\xff]/.test(chr)) {
-            j++; // ascii码为0-255，一个字符就是一个字节的长度
-        } else {
-            j += 2; // ascii码为0-255以外，一个字符就是两个字节的长度
-        }
-        if (j <= L) { // 当加上当前字符以后，如果总字节长度小于等于L，则将当前字符真实的+在result后
-            result += chr;
-        } else { // 反之则说明result已经是不拆分字符的情况下最接近L的值了，直接返回
-            return result;
-        }
-    }
+/**
+ * 判断一个字符串得字节长度
+ * @param str 
+ * @returns 
+ */
+ export function bytesLnegth(str: string) {
+    var count = str.length;
+    for (var i = 0; i < str.length; i++) {
+        if (str.charCodeAt(i) > 255) {
+            count++;
+        }
+    }
+    return count;
+}
+
+/*
+* param str 要截取的字符串
+* param L 要截取的字节长度，注意是字节不是字符，一个汉字两个字节
+* return 截取后的字符串
+*/
+export function cutStr(str: string, L: number) {
+    var result = '',
+        strlen = str.length, // 字符串长度
+        chrlen = str.replace(/[^\x00-\xff]/g, '**').length; // 字节长度
+
+    if (chrlen <= L) { return str; }
+
+    for (var i = 0, j = 0; i < strlen; i++) {
+        var chr = str.charAt(i);
+        if (/[\x00-\xff]/.test(chr)) {
+            j++; // ascii码为0-255，一个字符就是一个字节的长度
+        } else {
+            j += 2; // ascii码为0-255以外，一个字符就是两个字节的长度
+        }
+        if (j <= L) { // 当加上当前字符以后，如果总字节长度小于等于L，则将当前字符真实的+在result后
+            result += chr;
+        } else { // 反之则说明result已经是不拆分字符的情况下最接近L的值了，直接返回
+            return result;
+        }
+    }
 }

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

@@ -1,9 +1,9 @@
-
-import React from 'react'
-import InvoiceController from '../../InvoiceController'
-
-/** 更新 商品序号 */
-export default function useToGenerateId(controller: InvoiceController) {
-    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
-    React.useEffect(() => {  goodsList.forEach((e, i) => { e.serialNo = i + 1 }) }, [goodsList])
+
+import React from 'react'
+import InvoiceController from '../../InvoiceController'
+
+/** 更新 商品序号 */
+export default function useToGenerateId(controller: InvoiceController) {
+    const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
+    React.useEffect(() => {  goodsList.forEach((e, i) => { e.serialNo = i + 1 }) }, [goodsList])
 }

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

@@ -1,150 +1,150 @@
-
-import React from "react";
-import { Row, Col, Input, Button, message } from "kts-components-antd-x3";
-import { Form, Drawer } from "kts-xui";
-import { Invoice, IGood } from "../../../..";
-import { getSN } from "../../../tools/itemName";
-import { LineAttributeType } from "../../../InvoiceController";
-
-export default function AddComparisonDrawer() {
-
-    const [form] = Form.useForm();
-
-    /** 控制器 */
-    const controller = Invoice.useInvoiceController();
-
-    /** 正在 添加商品对照 的货物索引 */
-    const addComparisonIndex = controller.useMemo(s => s.goodsListState?.addComparisonIndex, []);
-
-    /** 货物字典 */
-    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
-
-    /** 正在 对照 的货物 */
-    const good = React.useMemo(() => addComparisonIndex ? goodsMap.get(addComparisonIndex) : undefined, [addComparisonIndex]);
-
-    /** 关闭对照 */
-    const onClose = React.useCallback(controller.pipeline<any>(async s => { s.goodsListState.addComparisonIndex = undefined }), [controller]);
-
-    /** 提交数据 */
-    const onSubmit = React.useCallback(() => {
-        controller.run(async s => {
-            if (!good) return
-            
-            try {
-                const values = await form.validateFields()
-                const shorthand = s.goodsListState.isMyShow ? getSN(good.itemNameSelf)?.shorthand : getSN(good.itemName)?.shorthand;
-                const setGood = (good: IGood) => {
-                    good.itemCode = values.itemCode;
-                    good.itemCodeSelf = values.itemCodeSelf;
-                    good.itemName = shorthand ? `*${shorthand}*${values.itemName}` : values.itemName;
-                    good.itemNameSelf = shorthand ? `*${shorthand}*${values.itemNameSelf}` : values.itemNameSelf;
-
-                    if (good.lineAttribute !== LineAttributeType.折扣行) {
-                        good.itemModelName = values.itemModelName;
-                        good.itemModelNameSelf = values.itemModelNameSelf;
-                    }
-                }
-
-                setGood(good);
-
-                if (good.lineAttribute !== LineAttributeType.正常) {
-                    const c = good.lineAttribute === LineAttributeType.折扣行 ? -1 : good.lineAttribute === LineAttributeType.被折扣行 ? 1 : 0
-                    const g = s.goodsListState.goodsList[s.goodsListState.goodsList.indexOf(good) + c]
-                    setGood(g);
-                }
-
-                s.goodsListState.addComparisonIndex = undefined;
-                s.goodsListState.goodsList = [...s.goodsListState.goodsList];
-
-                message.success('商品映射成功');
-            } catch (error) {
-
-            }
-        })
-    }, [form, good])
-
-    React.useEffect(() => {
-        form.resetFields();
-        if (good) {
-            form.setFieldsValue({
-                ...good,
-                itemName: getSN(good.itemName)?.full,
-                itemNameSelf: getSN(good.itemNameSelf)?.full,
-            })
-        }
-    }, [good])
-
-    return (
-        <Drawer
-            width={500}
-            onClose={onClose}
-            placement="right"
-            title="商品映射"
-            visible={!!good}
-            footer={
-                <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 10 }} >
-                    <Button type="primary" onClick={onSubmit} >提交</Button>
-                    <Button onClick={onClose} >取消</Button>
-                </div>
-            }
-        >
-            {
-                !!good &&
-                <Form layout="vertical" style={{ flex: 1 }} form={form} >
-                    <Row gutter={[8, 8]} >
-                        {/* <Col span={12}>
-                            <Form.Item
-                                name="itemCodeSelf"
-                                label="我方商品编码"
-                            >
-                                <Input />
-                            </Form.Item>
-                        </Col>
-                        <Col span={12} >
-                            <Form.Item
-                                name="itemCode"
-                                label="对方商品编码"
-                            >
-                                <Input />
-                            </Form.Item>
-                        </Col> */}
-                        <Col span={12} >
-                            <Form.Item
-                                name="itemNameSelf"
-                                label="我方商品名称"
-                            >
-                                <Input />
-                            </Form.Item>
-                        </Col>
-                        <Col span={12} >
-                            <Form.Item
-                                name="itemName"
-                                label="对方商品名称"
-                            >
-                                <Input />
-                            </Form.Item>
-                        </Col>
-                        <Col span={12} >
-                            <Form.Item name='itemModelNameSelf' label="我方规格型号">
-                                <Input />
-                            </Form.Item>
-                        </Col>
-                        <Col span={12} >
-                            <Form.Item name="itemModelName" label="对方规格型号">
-                                <Input />
-                            </Form.Item>
-                        </Col>
-                    </Row>
-                </Form>
-            }
-        </Drawer>
-    )
-}
-
-// function validateFields(form: WrappedFormUtils<any>) {
-//     return new Promise<{ err: any, values: any }>(resolve => {
-//         form.validateFields((err, values) => {
-//             resolve({ err, values })
-//         })
-//     })
+
+import React from "react";
+import { Row, Col, Input, Button, message } from "kts-components-antd-x3";
+import { Form, Drawer } from "kts-xui";
+import { Invoice, IGood } from "../../../..";
+import { getSN } from "../../../tools/itemName";
+import { LineAttributeType } from "../../../InvoiceController";
+
+export default function AddComparisonDrawer() {
+
+    const [form] = Form.useForm();
+
+    /** 控制器 */
+    const controller = Invoice.useInvoiceController();
+
+    /** 正在 添加商品对照 的货物索引 */
+    const addComparisonIndex = controller.useMemo(s => s.goodsListState?.addComparisonIndex, []);
+
+    /** 货物字典 */
+    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
+
+    /** 正在 对照 的货物 */
+    const good = React.useMemo(() => addComparisonIndex ? goodsMap.get(addComparisonIndex) : undefined, [addComparisonIndex]);
+
+    /** 关闭对照 */
+    const onClose = React.useCallback(controller.pipeline<any>(async s => { s.goodsListState.addComparisonIndex = undefined }), [controller]);
+
+    /** 提交数据 */
+    const onSubmit = React.useCallback(() => {
+        controller.run(async s => {
+            if (!good) return
+            
+            try {
+                const values = await form.validateFields()
+                const shorthand = s.goodsListState.isMyShow ? getSN(good.itemNameSelf)?.shorthand : getSN(good.itemName)?.shorthand;
+                const setGood = (good: IGood) => {
+                    good.itemCode = values.itemCode;
+                    good.itemCodeSelf = values.itemCodeSelf;
+                    good.itemName = shorthand ? `*${shorthand}*${values.itemName}` : values.itemName;
+                    good.itemNameSelf = shorthand ? `*${shorthand}*${values.itemNameSelf}` : values.itemNameSelf;
+
+                    if (good.lineAttribute !== LineAttributeType.折扣行) {
+                        good.itemModelName = values.itemModelName;
+                        good.itemModelNameSelf = values.itemModelNameSelf;
+                    }
+                }
+
+                setGood(good);
+
+                if (good.lineAttribute !== LineAttributeType.正常) {
+                    const c = good.lineAttribute === LineAttributeType.折扣行 ? -1 : good.lineAttribute === LineAttributeType.被折扣行 ? 1 : 0
+                    const g = s.goodsListState.goodsList[s.goodsListState.goodsList.indexOf(good) + c]
+                    setGood(g);
+                }
+
+                s.goodsListState.addComparisonIndex = undefined;
+                s.goodsListState.goodsList = [...s.goodsListState.goodsList];
+
+                message.success('商品映射成功');
+            } catch (error) {
+
+            }
+        })
+    }, [form, good])
+
+    React.useEffect(() => {
+        form.resetFields();
+        if (good) {
+            form.setFieldsValue({
+                ...good,
+                itemName: getSN(good.itemName)?.full,
+                itemNameSelf: getSN(good.itemNameSelf)?.full,
+            })
+        }
+    }, [good])
+
+    return (
+        <Drawer
+            width={500}
+            onClose={onClose}
+            placement="right"
+            title="商品映射"
+            visible={!!good}
+            footer={
+                <div style={{ display: 'flex', justifyContent: 'flex-end', gap: 10 }} >
+                    <Button type="primary" onClick={onSubmit} >提交</Button>
+                    <Button onClick={onClose} >取消</Button>
+                </div>
+            }
+        >
+            {
+                !!good &&
+                <Form layout="vertical" style={{ flex: 1 }} form={form} >
+                    <Row gutter={[8, 8]} >
+                        {/* <Col span={12}>
+                            <Form.Item
+                                name="itemCodeSelf"
+                                label="我方商品编码"
+                            >
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item
+                                name="itemCode"
+                                label="对方商品编码"
+                            >
+                                <Input />
+                            </Form.Item>
+                        </Col> */}
+                        <Col span={12} >
+                            <Form.Item
+                                name="itemNameSelf"
+                                label="我方商品名称"
+                            >
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item
+                                name="itemName"
+                                label="对方商品名称"
+                            >
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item name='itemModelNameSelf' label="我方规格型号">
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                        <Col span={12} >
+                            <Form.Item name="itemModelName" label="对方规格型号">
+                                <Input />
+                            </Form.Item>
+                        </Col>
+                    </Row>
+                </Form>
+            }
+        </Drawer>
+    )
+}
+
+// function validateFields(form: WrappedFormUtils<any>) {
+//     return new Promise<{ err: any, values: any }>(resolve => {
+//         form.validateFields((err, values) => {
+//             resolve({ err, values })
+//         })
+//     })
 // }