kts-component-invoice-operate 3.2.155 → 3.2.157

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-component-invoice-operate",
-  "version": "3.2.155",
+  "version": "3.2.157",
   "scripts": {
     "dev": "dumi dev --max-old-space-size=6096",
     "start": "dumi dev",

package/src/Invoice/Invoice-digtal/_test/easiest/index.tsx

@@ -6,6 +6,7 @@ export default () => {
     return (
         <Invoice
             invoiceType='digtal'
+            stakeholder={<Invoice.StakeFarmerholder/>}
             invoiceHeader={ 
                 <Invoice.InvoiceHeader
                     title='自定义'

package/src/Invoice/InvoiceController/index.ts

@@ -82,4 +82,6 @@ export default class InvoiceController extends InvoiceControllerForm {
   /** 获取货物的税率可选列表, 如果没传taxClassificationCode，返回undefined */
   getGoodsTaxRateList?: (taxClassificationCode: string) => Promise<number[] | undefined | null>;
 
+  /** 商品列表配置器 */
+  setColumnsConfig?: (columns: any[]) => any[];
 }

package/src/Invoice/_test/children/index.tsx

@@ -9,8 +9,20 @@ export default () => {
     const invoiceController = React.useMemo(() => new Invoice.InvoiceController(), [])
 
     React.useEffect(() => {
+        invoiceController.setColumnsConfig = e => {
+            const l = [...e];
+            l.splice(-1, 0, {
+                title: '扩展',
+                dataIndex: 'zk',
+                key: 'zk',
+                align: 'right',
+            });
+            return l;
+        };
+
         setTimeout(() => {
             invoiceController.run(async s => {
+                s.goodsListState.columnshide = Array.from(new Set([...s.goodsListState.columnshide, 'lineAttribute']))
                 s.goodsListState.goodsList = lines.map(e => ({ $index: idGenerator(), ...e }));
             })
         }, 1000)

package/src/Invoice/index.tsx

@@ -15,6 +15,7 @@ import Sign from './ui/default/Sign';
 
 import InvoiceHeaderDigtal from './ui/digtal/InvoiceHeader';
 import Stakeholder from './ui/digtal/Stakeholder';
+import StakeFarmerholder from './ui/digtal/StakeFarmerholder';
 import SignDigtal from './ui/digtal/Sign';
 import GoodsListDigtal from './ui/digtal/GoodsList';
 import RealEstateInfo from './ui/digtal/RealEstateInfo';
@@ -85,6 +86,9 @@ export default class Invoice extends React.PureComponent<IInvoiceProps> {
 
   /** 干系人(数电) */
   static readonly Stakeholder = Stakeholder;
+  
+  /** 农产品干系人(数电) */
+  static readonly StakeFarmerholder = StakeFarmerholder;
 
   /** 落款(数电) */
   static readonly SignDigtal = SignDigtal;

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

@@ -103,7 +103,7 @@ export default (form: WrappedFormUtils) => {
       {
         title: ' ',
         key: 'expand',
-        width: 40,
+        width: 50,
         align: 'center',
         render: (_: any, record: IGood) => <Expand record={record} />
       },
@@ -612,7 +612,8 @@ export default (form: WrappedFormUtils) => {
         };
       }) as any[];
   }, [isTaxIncluded, editGood, goodsList, controller, changeField, deduction, isMyShow, searchValue, model, columnsReplenish, columnshide, isStart]);
-  return columns;
+  
+  return controller.setColumnsConfig ? controller.setColumnsConfig(columns) : columns;
 };
 
 /** 字段 */

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/Expand/index.tsx

@@ -26,25 +26,29 @@ export default function Expand(props: IExpandProps) {
             return (
                 <Button
                     type='text'
-                    style={{ width: 'auto', color: "#0074ff" }}
-                    icon={<Icon component={I002Svg} />}
+                    style={{ width: 'auto', color: "#0074ff", padding:0 }}
+                    // icon={<Icon component={I002Svg} />}
                     onClick={controller.pipeline(async (s, e) => {
                         e?.stopPropagation()
                         s.goodsListState.expandedRowKeys = s.goodsListState.expandedRowKeys.filter(e => e !== record.$index)
                     })}
-                />
+                >
+                    收起
+                </Button>
             )
         } else {
             return (
                 <Button
                     type='text'
-                    style={{ width: 'auto', color: "#0074ff" }}
-                    icon={<Icon component={I001Svg} />}
+                    style={{ width: 'auto', color: "#0074ff", padding:0 }}
+                    // icon={<Icon component={I001Svg} />}
                     onClick={controller.pipeline(async (s, e) => {
                         e?.stopPropagation()
                         s.goodsListState.expandedRowKeys = [...s.goodsListState.expandedRowKeys, record.$index]
                     })}
-                />
+                >
+                    展开
+                </Button>
             )
         }
     } else {

package/src/Invoice/ui/default/GoodsList/hook/useColumns/ui/RowMenu/hook/useDelItem/dist/index.js

@@ -0,0 +1,32 @@
+"use strict";
+exports.__esModule = true;
+var react_1 = require("react");
+// import { Menu, Typography } from 'kts-components-antd-x3';
+var InvoiceController_1 = require("../../../../../../../../../InvoiceController");
+var __1 = require("../../../../../../../../..");
+// const { Text } = Typography;
+exports["default"] = (function (goods) {
+    var controller = __1["default"].useInvoiceController();
+    var model = controller.useMemo(function (s) { return s.model; }, []);
+    var isRemRow = controller.useMemo(function (s) { return s.goodsListState.isRemRow; }, []);
+    var onClick = react_1["default"].useCallback(function () {
+        controller.delGood(goods.$index);
+    }, [controller, goods.$index]);
+    if (goods.lineAttribute === InvoiceController_1.LineAttributeType.被折扣行) {
+        return undefined;
+    }
+    if (isRemRow === false) {
+        return undefined;
+    }
+    if (!(model !== 'prefab')) {
+        return undefined;
+    }
+    return {
+        key: 'delItem',
+        title: '删除',
+        onClick: onClick
+    };
+    // return React.useMemo(() => {
+    //     return <Menu.Item key="delItem" onClick={onClick}><Text strong type="danger">删除</Text></Menu.Item>
+    // }, [onClick])
+});

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

@@ -26,4 +26,15 @@
     bottom    : 0;
     z-index   : 9999;
   }
-}
+}
+
+.ktsAntX-table .ktsAntX-table-row.ktsAntX-table-row-level-0.kts-invoice-operate-goods-expanded .ktsAntX-table-cell-ellipsis,
+.ktsAntX-table .ktsAntX-table-row.ktsAntX-table-row-level-0.kts-invoice-operate-goods-expanded {
+  background: #f0f0f0;
+}
+
+.ktsAntX-table .ktsAntX-table-row.ktsAntX-table-row-level-0.kts-invoice-operate-goods-expanded-level-1 .ktsAntX-table-cell-ellipsis,
+.ktsAntX-table .ktsAntX-table-row.ktsAntX-table-row-level-0.kts-invoice-operate-goods-expanded-level-1{
+  background: #f6f6f6;
+}
+

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

@@ -10,18 +10,21 @@ export default function TableRow(props: any) {
 
     const controller = Invoice.useInvoiceController();
 
-    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, [])
+    const goodsMap = controller.useMemo(s => s.goodsListState.goodsMap, []);
+
+    /** 子级展开的货物 */
+    const expandedRowKeys = controller.useMemo(s => s.goodsListState.expandedRowKeys, []);
 
     /** 当前拖动中的货品索引 */
-    const current = controller.useMemo(s => s.goodsListState.drag.current, [])
+    const current = controller.useMemo(s => s.goodsListState.drag.current, []);
 
     /** 当前拖动中的货品索引 */
-    const site = controller.useMemo(s => s.goodsListState.drag.site, [])
+    const site = controller.useMemo(s => s.goodsListState.drag.site, []);
 
     /** 准备插入的货物索引 */
-    const container = controller.useMemo(s => s.goodsListState.drag.container, [])
+    const container = controller.useMemo(s => s.goodsListState.drag.container, []);
 
-    const good = React.useMemo(() => goodsMap?.get(rowKey), [rowKey, goodsMap])
+    const good = React.useMemo(() => goodsMap?.get(rowKey), [rowKey, goodsMap]);
 
     const discount = React.useMemo(() => {
         const i = good;
@@ -36,6 +39,16 @@ export default function TableRow(props: any) {
         }
     }, [good, goodsMap])
 
+    /** 扩展行样式 */
+    const expandedRow = React.useMemo(() => {
+        if (expandedRowKeys.indexOf(rowKey) > -1) return 'kts-invoice-operate-goods-expanded';
+
+        if (expandedRowKeys.map(e => goodsMap.get(e)).map(e => e?.children).flat(1).map(e => e?.$index).indexOf(rowKey) > -1)
+            return 'kts-invoice-operate-goods-expanded-level-1';
+
+        return undefined;
+    }, [rowKey, expandedRowKeys, good])
+
     return (
         rowKey === current && current
             ? (
@@ -48,6 +61,7 @@ export default function TableRow(props: any) {
                     className={classnames(
                         props.className,
                         discount,
+                        expandedRow,
                         (rowKey === container && current)
                             ? 'kts-invoice-operate-goods-list-itemName-drag-container-' + site
                             : undefined

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

@@ -4,7 +4,6 @@ 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>) {
 

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

@@ -50,14 +50,12 @@ export default decorator<RealEstateInfoProps, FormComponentProps & RealEstateInf
                         })(
                             readOnly
                                 ? (<MyArrString />)
-                                : (
-                                    <Cascader
-                                        style={{ width: '100%' }}
-                                        options={props.realEstateAddressOptions}
-                                        fieldNames={props.realEstateAddressFieldNames}
-                                        placeholder="请选择省市区县"
-                                    />
-                                )
+                                : (<Cascader
+                                    style={{ width: '100%' }}
+                                    options={props.realEstateAddressOptions}
+                                    fieldNames={props.realEstateAddressFieldNames}
+                                    placeholder="请选择省市区县"
+                                />)
                         )}
                     </Form.Item>
                 </Col>

package/src/Invoice/ui/digtal/StakeFarmerholder/index.less

@@ -0,0 +1,100 @@
+.kts-invoice-operate-invoice-digtal-stakeholder {
+
+    display: flex;
+
+    .digtal-stakeholder-expand-button {
+        cursor: pointer;
+    }
+
+    &>div {
+        border-right: 2px solid #9F613E;
+
+        &:nth-child(even) {
+            flex           : 1;
+            display        : flex;
+            flex-direction : column;
+            justify-content: end;
+        }
+
+        &:nth-child(odd) {
+            flex           : none;
+            text-align     : center;
+            color          : #9F613E;
+            display        : flex;
+            flex-direction : column;
+            justify-content: center;
+            justify-items  : center;
+            padding        : 0 4px;
+        }
+
+        &:last-child {
+            border-right: none;
+        }
+    }
+
+    .digtal-stakeholder-form {
+
+        padding: 12px 10px 5px;
+
+        .ktsAntX-col {
+            margin-bottom: 15px;
+        }
+
+        .ktsAnt3x-row.ktsAnt3x-form-item {
+            display      : flex;
+            margin-bottom: 0;
+
+            .ktsAnt3x-form-item-label {
+                flex       : none;
+                font-weight: 500;
+                line-height: 29px;
+
+                label {
+                    color: #9F603D;
+                }
+            }
+
+            .ktsAnt3x-form-item-control {
+                line-height: 1.4;
+
+                .digtal-stakeholder-form-text {
+                    word-break : break-all;
+                    line-height: 29px;
+                }
+            }
+
+            .ktsAnt3x-form-item-control-wrapper {
+                flex: 1;
+            }
+        }
+    }
+
+    .natural-person-flag {
+
+        padding: 0 8px;
+
+        .ktsAnt3x-form-item-control {
+            line-height: 32px
+        }
+
+        .ktsAnt3x-row.ktsAnt3x-form-item {
+            margin-bottom: 0
+        }
+    }
+}
+
+.kts-invoice-operate-invoice-digtal-stakeholder.readOnly {
+    &>div:nth-child(even) {
+        justify-content: start;
+    }
+
+    .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-label {
+        line-height: 1.4;
+    }
+
+    .digtal-stakeholder-form .ktsAnt3x-row.ktsAnt3x-form-item .ktsAnt3x-form-item-control {
+        .digtal-stakeholder-form-text {
+            line-height: 1.4;
+        }
+    }
+}