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

package/src/Invoice/ui/digtal/FreightList/index.tsx

@@ -1,129 +1,129 @@
-
-import React from 'react';
-import classnames from 'classnames';
-import { decorator } from 'grey-react-box';
-import { Form } from 'kts-components-antd-x3';
-import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
-import { FormComponentProps } from 'kts-components-antd-x3/lib/form';
-import Invoice from '../../..';
-
-import TableVirtual from './ui/TableVirtual';
-import AddRowButton from './ui/AddRowButton';
-import TableRow from './ui/TableRow';
-
-import useColumns from './hook/useColumns';
-import useOnRow from './hook/useOnRow';
-import useWindowClick from './hook/useWindowClick';
-import useRowSelection from './hook/useRowSelection';
-
-import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
-
-import './index.less';
-
-export interface IGoodsListProps {
-
-  /** 产品最大数 */
-  goodMax?: number;
-
-  addressOptions: any[];
-  vehicleTypeList:any[];
-  /**
-   * 地址数据字段名
-   */
-  fieldNames?: any;
-
-}
-
-export default class FreightList extends React.Component<IGoodsListProps> {
-  render() {
-    return <Main {...this.props} />
-  }
-}
-
-const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Form.create())((props) => {
-  const { form } = props;
-  /** 控制器 */
-  const controller = Invoice.useInvoiceController();
-
-  const goodsList = controller.useMemo(s => s.freightListState.goodsList, []);
-
-  /** 货物列表 */
-  const dataSource = controller.useMemo(s => s.freightListState.goodsList, [])
-
-  /** 表格行事件 */
-  const onRow = useOnRow();
-
-  /** 批量删除 */
-  const delRowButton = useDelRowButton();
-
-
-  useWindowClick(controller); // 点击组件外部 保存正在编辑的货物
-
-  /** 注册 from 对象 */
-  React.useEffect(() => {
-    controller.pipeline<WrappedFormUtils>(async (s, form) => { s.freightListState = { ...s.freightListState, form } })(props.form);
-  }, [controller, props.form]);
-  React.useEffect(() => {
-    controller.run(async (s) => {
-      s.freightListState.addressFieldNames = props.fieldNames
-    });
-  }, [props.fieldNames])
-  React.useEffect(() => {
-    controller.run(async (s) => {
-      s.freightListState.vehicleTypeList = props.vehicleTypeList
-    });
-  }, [props.vehicleTypeList])
-  React.useEffect(() => {
-    controller.run(async (s) => {
-      s.freightListState.area = props.addressOptions
-    });
-  }, [props.addressOptions])
-  // 跟新 货物
-  React.useEffect(() => {
-    controller.run(async (s) => {
-      s.freightListState.goodsMap = new Map();
-      goodsList.forEach((e) => { s.freightListState.goodsMap.set(e.$index, e); });
-    });
-  }, [controller, goodsList]);
-
-  /** props 产品最大数 更新 */
-  React.useEffect(() => {
-    controller.pipeline(async s => { s.freightListState.goodMax = props.goodMax })()
-  }, [controller, props.goodMax])
-  // 注册 form
-  //  controller.useForm('freightInfo', form);
-  return (
-    <div className="kts-invoice-operate-freight">
-      <div className='real-estate-info-digtal-label' >特殊信息-货物运输</div>
-      <div className="kts-invoice-operate-goods-list-digtal" onClick={(e) => { e.stopPropagation() }} >
-        <div className="kts-invoice-operate-freight-list-able">
-          {/* 添加行 */}
-          <AddRowButton />
-
-          {/* 批量删除 */}
-          {delRowButton.button}
-
-          <div style={{ flex: 1 }} />
-
-        </div>
-        <div className={classnames('kts-invoice-operate-goods-list-table-digtal')}>
-          <TableVirtual
-            size="small"
-            rowKey="$index"
-            pagination={false}
-            scroll={{ y: 280 }}
-            components={{ body: { row: TableRow } }}
-            dataSource={dataSource}
-            columns={useColumns(props.form)}
-            rowSelection={useRowSelection()}
-            onRow={record => ({
-              onClick: () => {
-                onRow.onClick(record);
-              },
-            })}
-          />
-        </div>
-      </div>
-    </div>
-  );
-});
+
+import React from 'react';
+import classnames from 'classnames';
+import { decorator } from 'grey-react-box';
+import { Form } from 'kts-components-antd-x3';
+import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
+import { FormComponentProps } from 'kts-components-antd-x3/lib/form';
+import Invoice from '../../..';
+
+import TableVirtual from './ui/TableVirtual';
+import AddRowButton from './ui/AddRowButton';
+import TableRow from './ui/TableRow';
+
+import useColumns from './hook/useColumns';
+import useOnRow from './hook/useOnRow';
+import useWindowClick from './hook/useWindowClick';
+import useRowSelection from './hook/useRowSelection';
+
+import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
+
+import './index.less';
+
+export interface IGoodsListProps {
+
+  /** 产品最大数 */
+  goodMax?: number;
+
+  addressOptions: any[];
+  vehicleTypeList:any[];
+  /**
+   * 地址数据字段名
+   */
+  fieldNames?: any;
+
+}
+
+export default class FreightList extends React.Component<IGoodsListProps> {
+  render() {
+    return <Main {...this.props} />
+  }
+}
+
+const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Form.create())((props) => {
+  const { form } = props;
+  /** 控制器 */
+  const controller = Invoice.useInvoiceController();
+
+  const goodsList = controller.useMemo(s => s.freightListState.goodsList, []);
+
+  /** 货物列表 */
+  const dataSource = controller.useMemo(s => s.freightListState.goodsList, [])
+
+  /** 表格行事件 */
+  const onRow = useOnRow();
+
+  /** 批量删除 */
+  const delRowButton = useDelRowButton();
+
+
+  useWindowClick(controller); // 点击组件外部 保存正在编辑的货物
+
+  /** 注册 from 对象 */
+  React.useEffect(() => {
+    controller.pipeline<WrappedFormUtils>(async (s, form) => { s.freightListState = { ...s.freightListState, form } })(props.form);
+  }, [controller, props.form]);
+  React.useEffect(() => {
+    controller.run(async (s) => {
+      s.freightListState.addressFieldNames = props.fieldNames
+    });
+  }, [props.fieldNames])
+  React.useEffect(() => {
+    controller.run(async (s) => {
+      s.freightListState.vehicleTypeList = props.vehicleTypeList
+    });
+  }, [props.vehicleTypeList])
+  React.useEffect(() => {
+    controller.run(async (s) => {
+      s.freightListState.area = props.addressOptions
+    });
+  }, [props.addressOptions])
+  // 跟新 货物
+  React.useEffect(() => {
+    controller.run(async (s) => {
+      s.freightListState.goodsMap = new Map();
+      goodsList.forEach((e) => { s.freightListState.goodsMap.set(e.$index, e); });
+    });
+  }, [controller, goodsList]);
+
+  /** props 产品最大数 更新 */
+  React.useEffect(() => {
+    controller.pipeline(async s => { s.freightListState.goodMax = props.goodMax })()
+  }, [controller, props.goodMax])
+  // 注册 form
+  //  controller.useForm('freightInfo', form);
+  return (
+    <div className="kts-invoice-operate-freight">
+      <div className='real-estate-info-digtal-label' >特殊信息-货物运输</div>
+      <div className="kts-invoice-operate-goods-list-digtal" onClick={(e) => { e.stopPropagation() }} >
+        <div className="kts-invoice-operate-freight-list-able">
+          {/* 添加行 */}
+          <AddRowButton />
+
+          {/* 批量删除 */}
+          {delRowButton.button}
+
+          <div style={{ flex: 1 }} />
+
+        </div>
+        <div className={classnames('kts-invoice-operate-goods-list-table-digtal')}>
+          <TableVirtual
+            size="small"
+            rowKey="$index"
+            pagination={false}
+            scroll={{ y: 280 }}
+            components={{ body: { row: TableRow } }}
+            dataSource={dataSource}
+            columns={useColumns(props.form)}
+            rowSelection={useRowSelection()}
+            onRow={record => ({
+              onClick: () => {
+                onRow.onClick(record);
+              },
+            })}
+          />
+        </div>
+      </div>
+    </div>
+  );
+});

package/src/Invoice/ui/digtal/FreightList/ui/AddRowButton/index.tsx

@@ -1,75 +1,75 @@
-import React from 'react';
-import Invoice from '../../../../..';
-import { Button, message } from 'kts-xui';
-import InvoiceController, { LineAttributeType } from '../../../../../InvoiceController';
-
-export default () => {
-  const controller = Invoice.useInvoiceController();
-
-  const model = controller.useMemo(s => s.model, []);
-
-  const rootElement = controller.useMemo(s => s.rootElement, []);
-
-  /** 产品数据量 */
-  const goodsNum = controller.useMemo(s => s.freightListState.goodsList.length, []);
-
-  /** 搜索条件 */
-  const isAddRow = controller.useMemo(s => s.freightListState.isAddRow, []);
-
-  /** 产品最大数 */
-  const goodMax = controller.useMemo(s => s.freightListState.goodMax, []);
-
-  /** 按钮是否禁用 */
-  const disabled = React.useMemo(() => {
-    return typeof goodMax === 'number' ? goodsNum >= goodMax : false
-  }, [goodMax, goodsNum])
-
-  const onClick = React.useCallback(async () => {
-    await addGood(controller);
-    await rollBottom(controller, rootElement);
-  }, [controller, rootElement]);
-
-  if (isAddRow === false) return <></>;
-  if (model === 'prefab') return <></>;
-  if (model === 'readOnly') return <></>;
-
-  return (
-    <Button size='small' type='primary' onClick={onClick} disabled={disabled}>
-      增行
-    </Button>
-  );
-};
-
-/** 添加一个空货物 */
-async function addGood(controller: InvoiceController) {
-  await controller.saveEditFreight();
-  await controller.wait();
-  await controller.run(async (s) => {
-    if (s.freightListState.editGood) {
-      // message.error({
-      //   content: '你正在编辑一个货物运输行',
-      //   key: '你正在编辑一个货物运输行',
-      // });
-      // return;
-      await controller.state.freightListState.form?.validateFields(async (err: any, values: any) => {
-        if (err) {
-          const firstError: any = Object.values(err)[0];
-          message.error({
-            content: firstError.errors[0].message,
-            key: '你正在编辑一个货物',
-          });
-          return;
-        }
-      });
-    }
-    s.freightListState.editGood = await controller.addFreight({});
-  });
-}
-
-/** 货物列表，滚动到底部 */
-async function rollBottom(controller: InvoiceController, rootElement: HTMLDivElement | null | undefined) {
-  await controller.wait();
-  const cont = rootElement?.querySelector('.ktsAntX-table-body');
-  if (!cont) return;
-  cont.scrollTop = cont.scrollHeight;
+import React from 'react';
+import Invoice from '../../../../..';
+import { Button, message } from 'kts-xui';
+import InvoiceController, { LineAttributeType } from '../../../../../InvoiceController';
+
+export default () => {
+  const controller = Invoice.useInvoiceController();
+
+  const model = controller.useMemo(s => s.model, []);
+
+  const rootElement = controller.useMemo(s => s.rootElement, []);
+
+  /** 产品数据量 */
+  const goodsNum = controller.useMemo(s => s.freightListState.goodsList.length, []);
+
+  /** 搜索条件 */
+  const isAddRow = controller.useMemo(s => s.freightListState.isAddRow, []);
+
+  /** 产品最大数 */
+  const goodMax = controller.useMemo(s => s.freightListState.goodMax, []);
+
+  /** 按钮是否禁用 */
+  const disabled = React.useMemo(() => {
+    return typeof goodMax === 'number' ? goodsNum >= goodMax : false
+  }, [goodMax, goodsNum])
+
+  const onClick = React.useCallback(async () => {
+    await addGood(controller);
+    await rollBottom(controller, rootElement);
+  }, [controller, rootElement]);
+
+  if (isAddRow === false) return <></>;
+  if (model === 'prefab') return <></>;
+  if (model === 'readOnly') return <></>;
+
+  return (
+    <Button size='small' type='primary' onClick={onClick} disabled={disabled}>
+      增行
+    </Button>
+  );
+};
+
+/** 添加一个空货物 */
+async function addGood(controller: InvoiceController) {
+  await controller.saveEditFreight();
+  await controller.wait();
+  await controller.run(async (s) => {
+    if (s.freightListState.editGood) {
+      // message.error({
+      //   content: '你正在编辑一个货物运输行',
+      //   key: '你正在编辑一个货物运输行',
+      // });
+      // return;
+      await controller.state.freightListState.form?.validateFields(async (err: any, values: any) => {
+        if (err) {
+          const firstError: any = Object.values(err)[0];
+          message.error({
+            content: firstError.errors[0].message,
+            key: '你正在编辑一个货物',
+          });
+          return;
+        }
+      });
+    }
+    s.freightListState.editGood = await controller.addFreight({});
+  });
+}
+
+/** 货物列表，滚动到底部 */
+async function rollBottom(controller: InvoiceController, rootElement: HTMLDivElement | null | undefined) {
+  await controller.wait();
+  const cont = rootElement?.querySelector('.ktsAntX-table-body');
+  if (!cont) return;
+  cont.scrollTop = cont.scrollHeight;
 }

package/src/Invoice/ui/digtal/FreightList/ui/BulkMenu/hooks/useDelRowButton/index.tsx

@@ -1,50 +1,50 @@
-import React from 'react';
-import Invoice from '../../../../../../..';
-import { Button, Menu } from 'kts-xui';
-
-export default () => {
-
-  const controller = Invoice.useInvoiceController();
-
-  const model = controller.useMemo(s => s.model, []);
-
-  const isRemRow = controller.useMemo(s => s.freightListState.isRemRow, []);
-
-  /** 是否禁用 */
-  const disabled = controller.useMemo((s) => {
-    if (s.freightListState.selectedGoodIndex.length <= 0) return true;
-    return false;
-  }, []);
-
-  /** 点击了删除 */
-  const onClick = React.useCallback(async () => {
-    const selectedGoodIndex = controller.state.freightListState.selectedGoodIndex.slice();
-    for (let i = 0; i < selectedGoodIndex.length; i++) {
-      await controller.delFreight(selectedGoodIndex[i]);
-    }
-    await controller.run(async s => { s.freightListState.selectedGoodIndex = [] });
-  }, [])
-
-  const menuItem = React.useMemo(() => {
-
-    if (model === 'prefab') return <></>;
-    if (model === 'readOnly') return <></>;
-
-    return (
-      <Menu.Item key="1" onClick={onClick} disabled={disabled}> 删除行 </Menu.Item>
-    )
-  }, [model, onClick, disabled])
-
-  const button = React.useMemo(() => {
-
-    if (isRemRow === false) return <></>;
-    if (model === 'prefab') return <></>;
-    if (model === 'readOnly') return <></>;
-
-    return (
-      <Button size='small' onClick={onClick} disabled={disabled} >删除</Button>
-    )
-  }, [model, onClick, disabled, isRemRow])
-
-  return { button, menuItem };
-};
+import React from 'react';
+import Invoice from '../../../../../../..';
+import { Button, Menu } from 'kts-xui';
+
+export default () => {
+
+  const controller = Invoice.useInvoiceController();
+
+  const model = controller.useMemo(s => s.model, []);
+
+  const isRemRow = controller.useMemo(s => s.freightListState.isRemRow, []);
+
+  /** 是否禁用 */
+  const disabled = controller.useMemo((s) => {
+    if (s.freightListState.selectedGoodIndex.length <= 0) return true;
+    return false;
+  }, []);
+
+  /** 点击了删除 */
+  const onClick = React.useCallback(async () => {
+    const selectedGoodIndex = controller.state.freightListState.selectedGoodIndex.slice();
+    for (let i = 0; i < selectedGoodIndex.length; i++) {
+      await controller.delFreight(selectedGoodIndex[i]);
+    }
+    await controller.run(async s => { s.freightListState.selectedGoodIndex = [] });
+  }, [])
+
+  const menuItem = React.useMemo(() => {
+
+    if (model === 'prefab') return <></>;
+    if (model === 'readOnly') return <></>;
+
+    return (
+      <Menu.Item key="1" onClick={onClick} disabled={disabled}> 删除行 </Menu.Item>
+    )
+  }, [model, onClick, disabled])
+
+  const button = React.useMemo(() => {
+
+    if (isRemRow === false) return <></>;
+    if (model === 'prefab') return <></>;
+    if (model === 'readOnly') return <></>;
+
+    return (
+      <Button size='small' onClick={onClick} disabled={disabled} >删除</Button>
+    )
+  }, [model, onClick, disabled, isRemRow])
+
+  return { button, menuItem };
+};

package/src/Invoice/ui/digtal/FreightList/ui/BulkMenu/hooks/useEmptyRefill/index.tsx

@@ -1,37 +1,37 @@
-
-import Invoice from '../../../../../../..';
-import { Button, Popconfirm } from "kts-xui"
-import React from "react"
-
-/** 清空重填 */
-export default () => {
-
-    const controller = Invoice.useInvoiceController();
-
-    const model = controller.useMemo(s => s.model, []);
-
-    const confirm = React.useCallback(() => {
-        controller.run(async s => {
-            s.freightListState.goodsList = [];
-            s.freightListState.goodsMap = new Map();
-            s.freightListState.selectedGoodIndex = [];
-        })
-    }, [controller])
-
-    const button = React.useMemo(() => {
-        if (model === 'readOnly') return <></>;
-        if (model === 'prefab') return <></>;
-        return (
-            <Popconfirm
-                title="将要清空所有项目信息，是否继续"
-                onConfirm={confirm}
-                okText="确定"
-                cancelText="取消"
-            >
-                <Button size='small' >清空重填</Button>
-            </Popconfirm>
-        )
-    }, [model, confirm])
-
-    return { button }
+
+import Invoice from '../../../../../../..';
+import { Button, Popconfirm } from "kts-xui"
+import React from "react"
+
+/** 清空重填 */
+export default () => {
+
+    const controller = Invoice.useInvoiceController();
+
+    const model = controller.useMemo(s => s.model, []);
+
+    const confirm = React.useCallback(() => {
+        controller.run(async s => {
+            s.freightListState.goodsList = [];
+            s.freightListState.goodsMap = new Map();
+            s.freightListState.selectedGoodIndex = [];
+        })
+    }, [controller])
+
+    const button = React.useMemo(() => {
+        if (model === 'readOnly') return <></>;
+        if (model === 'prefab') return <></>;
+        return (
+            <Popconfirm
+                title="将要清空所有项目信息，是否继续"
+                onConfirm={confirm}
+                okText="确定"
+                cancelText="取消"
+            >
+                <Button size='small' >清空重填</Button>
+            </Popconfirm>
+        )
+    }, [model, confirm])
+
+    return { button }
 }

package/src/Invoice/ui/digtal/FreightList/ui/TableRow/index.less

@@ -1,29 +1,29 @@
-.kts-invoice-operate-goods-list-itemName-drag-container-u {
-  position: relative;
-
-  &::after {
-    content   : " ";
-    width     : 100%;
-    height    : 2px;
-    background: #0074ff;
-    position  : absolute;
-    left      : 0;
-    top       : 0;
-    z-index   : 9999;
-  }
-}
-
-.kts-invoice-operate-goods-list-itemName-drag-container-d {
-  position: relative;
-
-  &::after {
-    content   : " ";
-    width     : 100%;
-    height    : 2px;
-    background: #0074ff;
-    position  : absolute;
-    left      : 0;
-    bottom    : 0;
-    z-index   : 9999;
-  }
+.kts-invoice-operate-goods-list-itemName-drag-container-u {
+  position: relative;
+
+  &::after {
+    content   : " ";
+    width     : 100%;
+    height    : 2px;
+    background: #0074ff;
+    position  : absolute;
+    left      : 0;
+    top       : 0;
+    z-index   : 9999;
+  }
+}
+
+.kts-invoice-operate-goods-list-itemName-drag-container-d {
+  position: relative;
+
+  &::after {
+    content   : " ";
+    width     : 100%;
+    height    : 2px;
+    background: #0074ff;
+    position  : absolute;
+    left      : 0;
+    bottom    : 0;
+    z-index   : 9999;
+  }
 }