kts-component-invoice-operate 3.2.153 → 3.2.155

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

@@ -1,11 +1,17 @@
 
 import React from "react";
+import Invoice from '../../../../..';
 import { TableManual, TableProps } from "kts-xui";
 import { Table } from 'kts-components-antd-x4-v4';
 import './index.less';
+import { e } from "mathjs";
 
 export default function <T extends object = any>(props: TableProps<T>) {
 
+    const controller = Invoice.useInvoiceController();
+
+    const expandedRowKeys = controller.useMemo(s => s.goodsListState.expandedRowKeys, []);
+
     const [self, setSelf] = React.useState<HTMLSpanElement | null>(null);
 
     const tableBody = React.useMemo(() => {
@@ -38,13 +44,29 @@ export default function <T extends object = any>(props: TableProps<T>) {
         return placeholder;
     }, [self, tableBody]);
 
+    /** 处理扩展行 */
+    const goodsList = React.useMemo(() => {
+        if (!props.dataSource) return [];
+        const gl: any[] = props.dataSource.map(e => ({ ...e, level: 0 }));
+
+        for (let i = 0; i < gl.length; i++) {
+            const e = gl[i];
+            if (expandedRowKeys.includes(e.$index) && e.children) {
+                let c = e.children.map((t: any) => ({ ...t, level: 1 }));
+                gl.splice(i + 1, 0, ...c);
+            }
+        }
+
+        return gl;
+    }, [props.dataSource, expandedRowKeys])
+
     // 设置占位dom的搞
     const placeholderHeight = React.useMemo(() => {
-        if (!self || !rowHeight || !props.dataSource || !placeholder) return;
-        const placeholderHeight = rowHeight * props.dataSource.length;
+        if (!self || !rowHeight || !goodsList || !placeholder) return;
+        const placeholderHeight = rowHeight * goodsList.length;
         placeholder.style.height = `${placeholderHeight}px`;
         return placeholderHeight;
-    }, [self, rowHeight, props.dataSource, placeholder]);
+    }, [self, rowHeight, goodsList, placeholder]);
 
     /** 可以容纳的行数 */
     const rowSize = React.useMemo(() => {
@@ -54,21 +76,20 @@ export default function <T extends object = any>(props: TableProps<T>) {
 
     // 计算渲染的行
     const dataSource = React.useMemo(() => {
-        if (!props.dataSource) return [];
-        if (props.dataSource.length < 10) return props.dataSource;
+        if (goodsList.length < 10) return goodsList;
 
-        if (!rowSize) return [props.dataSource[0]];
-        return props.dataSource?.slice(pointer, pointer + 2 * rowSize);
-    }, [props.dataSource, pointer, rowSize]);
+        if (!rowSize) return [goodsList[0]];
+        return goodsList?.slice(pointer, pointer + 2 * rowSize);
+    }, [pointer, rowSize, goodsList]);
 
     // 监听滚动
     React.useEffect(() => {
-        if (!self || !placeholder || !props.dataSource || !rowHeight || !tableBody)
+        if (!self || !placeholder || !goodsList || !rowHeight || !tableBody)
             return;
 
         const onScroll = () => {
-            if (!props.dataSource || !tableBody) return;
-            setPointer(Math.floor((props.dataSource.length - rowSize) * (tableBody.scrollTop / (placeholder.clientHeight - tableBody.clientHeight))));
+            if (!goodsList || !tableBody) return;
+            setPointer(Math.floor((goodsList.length - rowSize) * (tableBody.scrollTop / (placeholder.clientHeight - tableBody.clientHeight))));
         };
         onScroll();
 
@@ -76,7 +97,7 @@ export default function <T extends object = any>(props: TableProps<T>) {
         return () => {
             tableBody.removeEventListener('scroll', onScroll);
         };
-    }, [self, placeholder, props.dataSource, rowHeight, rowSize]);
+    }, [self, placeholder, goodsList, rowHeight, rowSize]);
 
     // 移动列表
     React.useEffect(() => {
@@ -96,6 +117,8 @@ export default function <T extends object = any>(props: TableProps<T>) {
         cont.scrollTop = 0;
     }, [props.dataSource?.length])
 
+    // console.log('===> pointer', pointer, dataSource);
+
     return (
         <span className="kts-invoice-operate-goods-table-virtual" ref={(e) => { setSelf(e) }} >
             <TableManual

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

@@ -35,6 +35,9 @@ export default (form: WrappedFormUtils) => {
   /** 组件模式 */
   const model = controller.useMemo(e => e.model, []);
 
+  /** 计算类型 */
+  const calculateType = controller.useMemo(e => e.goodsListState.calculateType, []);
+
   /** 是否显示我方 */
   const isMyShow = controller.useMemo(e => e.goodsListState.isMyShow, []);
 
@@ -104,7 +107,7 @@ export default (form: WrappedFormUtils) => {
         title: <TitleText required >项目名称</TitleText>,
         key: 'itemName',
         render: (_: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('itemName')) {
+          if (editGood?.$index === record.$index && !disableds.includes('itemName') && model !== 'prefab') {
             return (
               <Form.Item>
                 <div style={{ display: 'flex' }} >
@@ -165,7 +168,7 @@ export default (form: WrappedFormUtils) => {
         key: 'itemModelName',
         width: 119,
         render: (_: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('itemModelName')) {
+          if (editGood?.$index === record.$index && !disableds.includes('itemModelName') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('itemModelName', {
@@ -200,7 +203,7 @@ export default (form: WrappedFormUtils) => {
         key: 'unit',
         width: 70,
         render: (_: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('unit')) {
+          if (editGood?.$index === record.$index && !disableds.includes('unit') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('unit', {
@@ -231,7 +234,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 149,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('quantity')) {
+          if (editGood?.$index === record.$index && !disableds.includes('quantity') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('quantity', {
@@ -275,7 +278,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 149,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('priceIncludeTax')) {
+          if (editGood?.$index === record.$index && !disableds.includes('priceIncludeTax') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('priceIncludeTax', {
@@ -319,7 +322,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 149,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('priceExcludeTax')) {
+          if (editGood?.$index === record.$index && !disableds.includes('priceExcludeTax') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('priceExcludeTax', {
@@ -363,7 +366,7 @@ export default (form: WrappedFormUtils) => {
         width: 119,
         align: 'right',
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('lineAmountIncludeTax')) {
+          if (editGood?.$index === record.$index && !disableds.includes('lineAmountIncludeTax') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('lineAmountIncludeTax', {
@@ -412,7 +415,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 119,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('lineAmountExcludeTax')) {
+          if (editGood?.$index === record.$index && !disableds.includes('lineAmountExcludeTax') && model !== 'prefab') {
             return (
               <Form.Item>
                 {getFieldDecorator('lineAmountExcludeTax', {
@@ -454,7 +457,7 @@ export default (form: WrappedFormUtils) => {
         align: 'right',
         width: 70,
         render: (value: string, record: IGood) => {
-          if (editGood?.$index === record.$index && !disableds.includes('taxRate')) {
+          if (editGood?.$index === record.$index && !disableds.includes('taxRate') && !(model === 'prefab' && calculateType === '3')) {
             return (
               <Form.Item>
                 {getFieldDecorator('taxRate', {
@@ -476,7 +479,7 @@ export default (form: WrappedFormUtils) => {
                       onChangeTaxRate(controller, form, record);
                     }}
                   >
-                    {taxRateList.map((e, i) => {
+                    {(record.goodsTaxRateList || taxRateList).map((e, i) => {
                       return (
                         <Select.Option key={i} value={e}>
                           {e}%
@@ -542,7 +545,7 @@ export default (form: WrappedFormUtils) => {
           ellipsis: true,
         };
       }) as any[];
-  }, [isTaxIncluded, editGood, controller, taxRateList, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart]);
+  }, [isTaxIncluded, editGood, controller, taxRateList, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, isStart, calculateType]);
 
   // React.useEffect(() => {
   //   clearTimeout(t)

package/src/Invoice/ui/digtal/GoodsList/hook/useOnRow/index.tsx

@@ -15,7 +15,7 @@ export default () => {
 
   const onClick = React.useCallback(
     async (record: IGood) => {
-      if (model === 'prefab') return;
+      // if (model === 'prefab') return;
       if (model === 'readOnly') return;
 
       const editGood = controller.state.goodsListState.editGood;
@@ -25,8 +25,20 @@ export default () => {
         if (editGood.$index === record.$index) return;
         await controller.saveEditGood();
         await controller.wait();
+        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
+          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
+          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
+          //   record.taxRate = undefined;
+          // }
+        }
         await controller.pipeline(async s => { s.goodsListState.editGood || (await controller.setEditGood(record)) })();
       } else {
+        if (controller.getGoodsTaxRateList && record.taxClassificationCode && !record.goodsTaxRateList ) {
+          record.goodsTaxRateList = await controller.getGoodsTaxRateList(record.taxClassificationCode);
+          // if (record.taxRate !== undefined && record.taxRate !== null && !record.goodsTaxRateList.includes(record.taxRate)) {
+          //   record.taxRate = undefined;
+          // }
+        }
         await controller.setEditGood(record);
       }
     },