kts-component-invoice-operate 3.1.0 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/Invoice/InvoiceController/InvoiceControllerState/index.ts

@@ -36,4 +36,7 @@ export default class InvoiceControllerState {
 
   /** 计算中启动字段 */
   calculating?: string;
+
+  /** 组件根结构 */
+  rootElement?: HTMLDivElement | null = null;
 }

package/src/Invoice/InvoiceController/fns/saveEditGood.ts

@@ -1,4 +1,4 @@
-import { InvoiceControllerState, IGood } from '../';
+import { InvoiceControllerState } from '../';
 
 /**
  * 保存正在编辑的货物

package/src/Invoice/index.tsx

@@ -84,7 +84,7 @@ const Main = (props: IInvoiceProps) => {
   return (
     <InvoiceContext.Provider key={key} value={controller}>
 
-      <div className="kts-invoice-operate">
+      <div className="kts-invoice-operate" ref={controller.pipeline<HTMLDivElement | null>(async (s, e) => { s.rootElement = e })} >
         {props.invoiceHeader || <InvoiceHeader /> /**    发票头 */}
         {props.buyer || <Buyer /> /**                    购买方 */}
         {props.goodsList || <GoodsList /> /**            货物列表 */}

package/src/Invoice/ui/GoodsList/index.less

@@ -163,4 +163,9 @@
   .has-error .ktsAnt3x-input {
     border: #f5222d solid 1px;
   }
+
+  .ktsAntX-checkbox-wrapper .ktsAntX-checkbox-checked .ktsAntX-checkbox-inner::after {
+    width : 5px;
+    height: 10px;
+  }
 }

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

@@ -1,13 +1,15 @@
 import React from 'react';
 import Invoice from '../../../../';
 import { Button, message } from 'kts-components-antd-x3';
-import { LineAttributeType } from '../../../../InvoiceController';
+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.goodsListState.goodsList.length, []);
 
@@ -18,25 +20,12 @@ export default () => {
   const goodMax = controller.useMemo(s => s.goodsListState.goodMax, []);
 
   /** 按钮是否禁用 */
-  const disabled = React.useMemo(() => {
-    return typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue;
-  }, [goodMax, goodsNum, searchValue])
+  const disabled = React.useMemo(() => typeof goodMax === 'number' ? goodsNum >= goodMax : !!searchValue, [goodMax, goodsNum, searchValue])
 
   const onClick = React.useCallback(async () => {
-    await controller.saveEditGood();
-    await controller.wait();
-    await controller.pipeline(async (s) => {
-      if (s.goodsListState.editGood) {
-        message.error({
-          content: '你正在编辑一个货物',
-          key: '你正在编辑一个货物',
-        });
-        return;
-      }
-
-      s.goodsListState.editGood = await controller.addGood({ taxRate: s.goodsListState.defaultRate, lineAttribute: LineAttributeType.正常 });
-    })();
-  }, [controller]);
+    await addGood(controller);
+    await rollBottom(controller, rootElement);
+  }, [controller, rootElement]);
 
   if (model === 'prefab') return <></>;
   if (model === 'readOnly') return <></>;
@@ -47,3 +36,27 @@ export default () => {
     </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/GoodsList/ui/Statistics/index.tsx

@@ -77,7 +77,7 @@ export default () => {
   return (
     <div className="kts-invoice-operate-goods-list-statistics">
       <div className="kts-invoice-operate-goods-list-statistics-row">
-        <div style={{ width: 45 }} />
+        <div style={{ width: 45.92 }} />
         <div style={{ flex: 1 }}>
           <label>合计</label>
         </div>
@@ -93,7 +93,7 @@ export default () => {
         <div style={{ width: 111, border: 'none' }} />
       </div>
       <div className="kts-invoice-operate-goods-list-statistics-row">
-        <div style={{ width: 45 }} />
+        <div style={{ width: 45.92 }} />
         <div style={{ flex: 5, border: 'none' }}>
           <label>价税合计（大写）</label>
           <label>

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

@@ -1,6 +1,6 @@
 
 import React from 'react';
-import { Switch } from 'kts-components-antd-x3';
+import { Switch } from 'kts-xui';
 import Invoice from '../../../../';
 
 export default () => {
@@ -23,8 +23,6 @@ export default () => {
             <Switch
                 disabled={isSwitchTax === false}
                 checked={isTaxIncluded}
-                checkedChildren="开"
-                unCheckedChildren="关"
                 defaultChecked
                 onChange={onChange}
             />