kts-component-invoice-operate 3.2.243 → 3.2.245

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

@@ -1,207 +1,207 @@
-
-import React from 'react';
-import classnames from 'classnames';
-import { Form } from 'kts-components-antd-x3';
-import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
-import { decorator } from 'grey-react-box';
-import { FormComponentProps } from 'kts-components-antd-x3/lib/form';
-
-import TableVirtual from './ui/TableVirtual';
-import Statistics from './ui/Statistics';
-import AddRowButton from './ui/AddRowButton';
-import TaxIncludedSwitch from './ui/TaxIncludedSwitch';
-import DescribeSwitch from './ui/DescribeSwitch';
-import Search from './ui/Search';
-import TableRow from './ui/TableRow';
-// import BulkMenu from './ui/default/BulkMenu';
-
-import useColumns from './hook/useColumns';
-import useOnRow from './hook/useOnRow';
-import useDeduction from './hook/useDeduction';
-import useWindowClick from './hook/useWindowClick';
-import useRowSelection from './hook/useRowSelection';
-
-import Invoice from '../../..';
-import './index.less';
-
-import useEndowCodeButton from './ui/BulkMenu/hooks/useEndowCodeButton';
-import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
-import useAddDiscountRowButton from './ui/BulkMenu/hooks/useAddDiscountRowButton';
-import useMergeDetails from './ui/BulkMenu/hooks/useMergeDetails';
-import useMergeDiscount from './ui/BulkMenu/hooks/useMergeDiscount';
-import useSalesDiscount from './ui/BulkMenu/hooks/useSalesDiscount';
-import useSalesGifts from './ui/BulkMenu/hooks/useSalesGifts';
-
-export interface IGoodsListProps {
-  /** 扩展部分 */
-  menuExpansion?: React.ReactNode;
-
-  /** 产品最大数 */
-  goodMax?: number;
-
-  /** 扣除额 */
-  deduction?: number;
-
-  /** 是否能添加折扣行 */
-  isAddDiscount?: boolean;
-
-  /** 是否可以切换(含税/不含税)状态 */
-  isSwitchTax?: boolean;
-
-  addGoodsCheck?:()=>void;
-}
-
-export default class GoodsList extends React.Component<IGoodsListProps>{
-  render() {
-    return <Main {...this.props} />
-  }
-}
-
-const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Form.create())((props) => {
-
-  /** 控制器 */
-  const controller = Invoice.useInvoiceController();
-
-  const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
-
-  const isprefab = controller.useMemo(s => s.model === 'prefab', []);
-
-  const dataSource = controller.useMemo(s => s.goodsListState.goodsList, [])
-
-  const searchValue = controller.useMemo(s => s.goodsListState.searchValue, [])
-
-  const isTaxIncluded = controller.useMemo(s => s.goodsListState.isTaxIncluded, [])
-
-  const dataSourceSearch = React.useMemo(() => controller.getGoodsSearch(dataSource, searchValue, isTaxIncluded), [dataSource, searchValue, controller, isTaxIncluded])
-
-  /** 表格行事件 */
-  const onRow = useOnRow();
-
-  useDeduction(controller, props.deduction);
-  useWindowClick(controller);
-
-  /** 批量赋码 */
-  const endowCodeButton = useEndowCodeButton();
-
-  /** 批量删除 */
-  const delRowButton = useDelRowButton();
-
-  /** 添加折扣行 */
-  const addDiscountRowButton = useAddDiscountRowButton();
-
-  /** 全单合并明细 */
-  const mergeDetails = useMergeDetails()
-
-  /** 全单合并折扣 */
-  const mergeDiscount = useMergeDiscount()
-
-  /** 销售折让 */
-  const salesDiscount = useSalesDiscount()
-
-  /** 销售赠品 */
-  const salesGifts = useSalesGifts()
-
-  /** 清空自动赋码缓存 */
-  React.useEffect(() => {
-    controller.run(async s => { s.goodsListState.endowCode.cache = {} });
-  }, [controller])
-
-  /** 注册 from 对象 */
-  React.useEffect(() => {
-    controller.pipeline<WrappedFormUtils>(async (s, form) => { s.goodsListState = { ...s.goodsListState, form } })(props.form);
-  }, [controller, props.form]);
-
-  // 跟新 货物
-  React.useEffect(() => {
-    controller.run(async (s) => {
-      s.goodsListState.goodsMap = new Map();
-      goodsList.forEach((e) => { s.goodsListState.goodsMap.set(e.$index, e); });
-    });
-  }, [controller, goodsList]);
-
-  /** props 产品最大数 更新 */
-  React.useEffect(() => {
-    controller.pipeline(async s => { s.goodsListState.goodMax = props.goodMax })()
-  }, [controller, props.goodMax])
-
-  /** props 是否能添加折扣行 更新 */
-  React.useEffect(() => {
-    controller.pipeline(async s => { s.goodsListState.isAddDiscount = props.isAddDiscount })()
-  }, [controller, props.goodMax])
-
-  /** props 是否可以切换(含税/不含税)状态 更新 */
-  React.useEffect(() => {
-    controller.pipeline(async s => { s.goodsListState.isSwitchTax = props.isSwitchTax })()
-  }, [controller, props.isSwitchTax])
-
-  return (
-    <div className="kts-invoice-operate-goods-list" onClick={(e) => { e.stopPropagation() }} >
-      <div className="kts-invoice-operate-goods-list-able">
-        <div className="kts-invoice-operate-goods-list-able-list">
-          {/* 添加行 */}
-          <AddRowButton addGoodsCheck={props.addGoodsCheck}/>
-
-          {/* 批量菜单 */}
-          {/* <BulkMenu /> */}
-
-          {/* 批量赋码 */}
-          {endowCodeButton.button}
-
-          {/* 批量删除 */}
-          {delRowButton.button}
-
-          {/* 全单合并明细 */}
-          {mergeDetails.button}
-
-          {/* 全单合并折扣 */}
-          {mergeDiscount.button}
-
-          {/* 添加折扣行 */}
-          {addDiscountRowButton.drawer}
-
-          {/* 销售折让 */}
-          {salesDiscount.button}
-
-          {/* 销售赠品 */}
-          {salesGifts.button}
-
-          {/* 搜索 */}
-          <Search />
-        </div>
-        <div className="kts-invoice-operate-goods-list-able-extend">
-
-          {/* 扩展部分 */}
-          {props.menuExpansion}
-
-          {/* 使用哪方商品描述 */}
-          <DescribeSwitch />
-
-          {/* 是否含税开关 */}
-          <TaxIncludedSwitch />
-        </div>
-      </div>
-      <div className={classnames('kts-invoice-operate-goods-list-table', { 'kts-invoice-operate-prefab': isprefab })}>
-        <TableVirtual
-          bordered
-          size="small"
-          rowKey="$index"
-          pagination={false}
-          scroll={{ y: 280 }}
-          components={{ body: { row: TableRow } }}
-          dataSource={dataSourceSearch}
-          columns={useColumns(props.form)}
-          rowSelection={useRowSelection()}
-          onRow={record => ({
-            onClick: () => {
-              onRow.onClick(record);
-            },
-          })}
-        />
-      </div>
-      <div>
-        {/* 汇总 */}
-        <Statistics />
-      </div>
-    </div>
-  );
-});
+
+import React from 'react';
+import classnames from 'classnames';
+import { Form } from 'kts-components-antd-x3';
+import { WrappedFormUtils } from 'kts-components-antd-x3/lib/form/Form';
+import { decorator } from 'grey-react-box';
+import { FormComponentProps } from 'kts-components-antd-x3/lib/form';
+
+import TableVirtual from './ui/TableVirtual';
+import Statistics from './ui/Statistics';
+import AddRowButton from './ui/AddRowButton';
+import TaxIncludedSwitch from './ui/TaxIncludedSwitch';
+import DescribeSwitch from './ui/DescribeSwitch';
+import Search from './ui/Search';
+import TableRow from './ui/TableRow';
+// import BulkMenu from './ui/default/BulkMenu';
+
+import useColumns from './hook/useColumns';
+import useOnRow from './hook/useOnRow';
+import useDeduction from './hook/useDeduction';
+import useWindowClick from './hook/useWindowClick';
+import useRowSelection from './hook/useRowSelection';
+
+import Invoice from '../../..';
+import './index.less';
+
+import useEndowCodeButton from './ui/BulkMenu/hooks/useEndowCodeButton';
+import useDelRowButton from './ui/BulkMenu/hooks/useDelRowButton';
+import useAddDiscountRowButton from './ui/BulkMenu/hooks/useAddDiscountRowButton';
+import useMergeDetails from './ui/BulkMenu/hooks/useMergeDetails';
+import useMergeDiscount from './ui/BulkMenu/hooks/useMergeDiscount';
+import useSalesDiscount from './ui/BulkMenu/hooks/useSalesDiscount';
+import useSalesGifts from './ui/BulkMenu/hooks/useSalesGifts';
+
+export interface IGoodsListProps {
+  /** 扩展部分 */
+  menuExpansion?: React.ReactNode;
+
+  /** 产品最大数 */
+  goodMax?: number;
+
+  /** 扣除额 */
+  deduction?: number;
+
+  /** 是否能添加折扣行 */
+  isAddDiscount?: boolean;
+
+  /** 是否可以切换(含税/不含税)状态 */
+  isSwitchTax?: boolean;
+
+  addGoodsCheck?:()=>void;
+}
+
+export default class GoodsList extends React.Component<IGoodsListProps>{
+  render() {
+    return <Main {...this.props} />
+  }
+}
+
+const Main = decorator<IGoodsListProps, FormComponentProps & IGoodsListProps>(Form.create())((props) => {
+
+  /** 控制器 */
+  const controller = Invoice.useInvoiceController();
+
+  const goodsList = controller.useMemo(s => s.goodsListState.goodsList, []);
+
+  const isprefab = controller.useMemo(s => s.model === 'prefab', []);
+
+  const dataSource = controller.useMemo(s => s.goodsListState.goodsList, [])
+
+  const searchValue = controller.useMemo(s => s.goodsListState.searchValue, [])
+
+  const isTaxIncluded = controller.useMemo(s => s.goodsListState.isTaxIncluded, [])
+
+  const dataSourceSearch = React.useMemo(() => controller.getGoodsSearch(dataSource, searchValue, isTaxIncluded), [dataSource, searchValue, controller, isTaxIncluded])
+
+  /** 表格行事件 */
+  const onRow = useOnRow();
+
+  useDeduction(controller, props.deduction);
+  useWindowClick(controller);
+
+  /** 批量赋码 */
+  const endowCodeButton = useEndowCodeButton();
+
+  /** 批量删除 */
+  const delRowButton = useDelRowButton();
+
+  /** 添加折扣行 */
+  const addDiscountRowButton = useAddDiscountRowButton();
+
+  /** 全单合并明细 */
+  const mergeDetails = useMergeDetails()
+
+  /** 全单合并折扣 */
+  const mergeDiscount = useMergeDiscount()
+
+  /** 销售折让 */
+  const salesDiscount = useSalesDiscount()
+
+  /** 销售赠品 */
+  const salesGifts = useSalesGifts()
+
+  /** 清空自动赋码缓存 */
+  React.useEffect(() => {
+    controller.run(async s => { s.goodsListState.endowCode.cache = {} });
+  }, [controller])
+
+  /** 注册 from 对象 */
+  React.useEffect(() => {
+    controller.pipeline<WrappedFormUtils>(async (s, form) => { s.goodsListState = { ...s.goodsListState, form } })(props.form);
+  }, [controller, props.form]);
+
+  // 跟新 货物
+  React.useEffect(() => {
+    controller.run(async (s) => {
+      s.goodsListState.goodsMap = new Map();
+      goodsList.forEach((e) => { s.goodsListState.goodsMap.set(e.$index, e); });
+    });
+  }, [controller, goodsList]);
+
+  /** props 产品最大数 更新 */
+  React.useEffect(() => {
+    controller.pipeline(async s => { s.goodsListState.goodMax = props.goodMax })()
+  }, [controller, props.goodMax])
+
+  /** props 是否能添加折扣行 更新 */
+  React.useEffect(() => {
+    controller.pipeline(async s => { s.goodsListState.isAddDiscount = props.isAddDiscount })()
+  }, [controller, props.goodMax])
+
+  /** props 是否可以切换(含税/不含税)状态 更新 */
+  React.useEffect(() => {
+    controller.pipeline(async s => { s.goodsListState.isSwitchTax = props.isSwitchTax })()
+  }, [controller, props.isSwitchTax])
+
+  return (
+    <div className="kts-invoice-operate-goods-list" onClick={(e) => { e.stopPropagation() }} >
+      <div className="kts-invoice-operate-goods-list-able">
+        <div className="kts-invoice-operate-goods-list-able-list">
+          {/* 添加行 */}
+          <AddRowButton addGoodsCheck={props.addGoodsCheck}/>
+
+          {/* 批量菜单 */}
+          {/* <BulkMenu /> */}
+
+          {/* 批量赋码 */}
+          {endowCodeButton.button}
+
+          {/* 批量删除 */}
+          {delRowButton.button}
+
+          {/* 全单合并明细 */}
+          {mergeDetails.button}
+
+          {/* 全单合并折扣 */}
+          {mergeDiscount.button}
+
+          {/* 添加折扣行 */}
+          {addDiscountRowButton.drawer}
+
+          {/* 销售折让 */}
+          {salesDiscount.button}
+
+          {/* 销售赠品 */}
+          {salesGifts.button}
+
+          {/* 搜索 */}
+          <Search />
+        </div>
+        <div className="kts-invoice-operate-goods-list-able-extend">
+
+          {/* 扩展部分 */}
+          {props.menuExpansion}
+
+          {/* 使用哪方商品描述 */}
+          <DescribeSwitch />
+
+          {/* 是否含税开关 */}
+          <TaxIncludedSwitch />
+        </div>
+      </div>
+      <div className={classnames('kts-invoice-operate-goods-list-table', { 'kts-invoice-operate-prefab': isprefab })}>
+        <TableVirtual
+          bordered
+          size="small"
+          rowKey="$index"
+          pagination={false}
+          scroll={{ y: 280 }}
+          components={{ body: { row: TableRow } }}
+          dataSource={dataSourceSearch}
+          columns={useColumns(props.form)}
+          rowSelection={useRowSelection()}
+          onRow={record => ({
+            onClick: () => {
+              onRow.onClick(record);
+            },
+          })}
+        />
+      </div>
+      <div>
+        {/* 汇总 */}
+        <Statistics />
+      </div>
+    </div>
+  );
+});

package/src/Invoice/ui/default/GoodsList/ui/AddRowButton/index.tsx

@@ -1,73 +1,73 @@
-import React from 'react';
-import Invoice from '../../../../..';
-import { Button, message } from 'kts-components-antd-x3';
-import InvoiceController, { LineAttributeType } from '../../../../../InvoiceController';
-
-export default (props: any) => {
-  const controller = Invoice.useInvoiceController();
-
-  const model = controller.useMemo(s => s.model, []);
-
-  const rootElement = controller.useMemo(s => s.rootElement, []);
-
-  /** 产品数据量 */
-  const goodsNum = controller.useMemo(s => s.goodsListState.goodsList.length, []);
-
-  /** 搜索条件 */
-  const searchValue = controller.useMemo(s => s.goodsListState.searchValue, []);
-
-  /** 搜索条件 */
-  const isAddRow = controller.useMemo(s => s.goodsListState.isAddRow, []);
-
-  /** 产品最大数 */
-  const goodMax = controller.useMemo(s => s.goodsListState.goodMax, []);
-
-  /** 按钮是否禁用 */
-  const disabled = React.useMemo(() => typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue, [goodMax, goodsNum, searchValue])
-
-  const onClick = React.useCallback(async () => {
-    await controller.run(async (s) => {
-      if (s.addGoodsCheck) {  
-        await s.addGoodsCheck();
-      }
-    });
-    console.log('continue')
-    await addGood(controller);
-    await rollBottom(controller, rootElement);
-  }, [controller, rootElement]);
-
-  if (isAddRow === false) return <></>;
-  if (model === 'prefab') return <></>;
-  if (model === 'readOnly') return <></>;
-
-  return (
-    <Button onClick={onClick} disabled={disabled}>
-      添加行
-    </Button>
-  );
-};
-
-/** 添加一个空货物 */
-async function addGood(controller: InvoiceController) {
-
-  await controller.saveEditGood();
-  await controller.wait();
-  await controller.run(async (s) => {
-    if (s.goodsListState.editGood) {
-      message.error({
-        content: '你正在编辑一个货物',
-        key: '你正在编辑一个货物',
-      });
-      return;
-    }
-    s.goodsListState.editGood = await controller.addGood({ taxRate: s.goodsListState.defaultRate, lineAttribute: LineAttributeType.正常 });
-  });
-}
-
-/** 货物列表，滚动到底部 */
-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-components-antd-x3';
+import InvoiceController, { LineAttributeType } from '../../../../../InvoiceController';
+
+export default (props: any) => {
+  const controller = Invoice.useInvoiceController();
+
+  const model = controller.useMemo(s => s.model, []);
+
+  const rootElement = controller.useMemo(s => s.rootElement, []);
+
+  /** 产品数据量 */
+  const goodsNum = controller.useMemo(s => s.goodsListState.goodsList.length, []);
+
+  /** 搜索条件 */
+  const searchValue = controller.useMemo(s => s.goodsListState.searchValue, []);
+
+  /** 搜索条件 */
+  const isAddRow = controller.useMemo(s => s.goodsListState.isAddRow, []);
+
+  /** 产品最大数 */
+  const goodMax = controller.useMemo(s => s.goodsListState.goodMax, []);
+
+  /** 按钮是否禁用 */
+  const disabled = React.useMemo(() => typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue, [goodMax, goodsNum, searchValue])
+
+  const onClick = React.useCallback(async () => {
+    await controller.run(async (s) => {
+      if (s.addGoodsCheck) {  
+        await s.addGoodsCheck();
+      }
+    });
+    console.log('continue')
+    await addGood(controller);
+    await rollBottom(controller, rootElement);
+  }, [controller, rootElement]);
+
+  if (isAddRow === false) return <></>;
+  if (model === 'prefab') return <></>;
+  if (model === 'readOnly') return <></>;
+
+  return (
+    <Button onClick={onClick} disabled={disabled}>
+      添加行
+    </Button>
+  );
+};
+
+/** 添加一个空货物 */
+async function addGood(controller: InvoiceController) {
+
+  await controller.saveEditGood();
+  await controller.wait();
+  await controller.run(async (s) => {
+    if (s.goodsListState.editGood) {
+      message.error({
+        content: '你正在编辑一个货物',
+        key: '你正在编辑一个货物',
+      });
+      return;
+    }
+    s.goodsListState.editGood = await controller.addGood({ taxRate: s.goodsListState.defaultRate, lineAttribute: LineAttributeType.正常 });
+  });
+}
+
+/** 货物列表，滚动到底部 */
+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/default/GoodsList/ui/BulkMenu/hooks/useAddDiscountRowButton/index.less

@@ -1,21 +1,21 @@
-.kts-invoice-operate-goods-list-add-discount-row {
-  .ktsAnt3x-drawer-wrapper-body {
-    display: flex;
-    flex-direction: column;
-
-    .ktsAnt3x-drawer-body {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-
-      .add-discount-row-body {
-        flex: 1;
-        overflow: auto;
-      }
-
-      .add-discount-row-footer {
-        flex: none;
-      }
-    }
-  }
-}
+.kts-invoice-operate-goods-list-add-discount-row {
+  .ktsAnt3x-drawer-wrapper-body {
+    display: flex;
+    flex-direction: column;
+
+    .ktsAnt3x-drawer-body {
+      flex: 1;
+      display: flex;
+      flex-direction: column;
+
+      .add-discount-row-body {
+        flex: 1;
+        overflow: auto;
+      }
+
+      .add-discount-row-footer {
+        flex: none;
+      }
+    }
+  }
+}