From f9f95f25dfee79b4792b5860dae34498e9bd953e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Tue, 13 Aug 2024 17:59:55 +0800
Subject: [PATCH] master

---
 src/pages/calcTable/calcFixedTotal.tsx |  2 +-
 src/pages/calcTable/index.tsx          |  4 ++--
 src/pages/unitTable/renderColsOpts.tsx | 16 ++++++++++++++++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/pages/calcTable/calcFixedTotal.tsx b/src/pages/calcTable/calcFixedTotal.tsx
index 09ca74f..6e61bbd 100644
--- a/src/pages/calcTable/calcFixedTotal.tsx
+++ b/src/pages/calcTable/calcFixedTotal.tsx
@@ -61,7 +61,7 @@ const calcFixedTotal: FunctionComponent<Props> = (props) => {
         return <Table.Summary.Cell index={index + 1} key={index + 1} align={_.head(columns)?.align || "left"}>
           {
             loading ? <Spin spinning={loading} size="small"></Spin> :
-              <Text type="danger">{sumRow[item.dataIndex] || "-"}</Text>
+              <Text type="danger">{!_.isNil(sumRow[item.dataIndex]) ? sumRow[item.dataIndex] : "-"}</Text>
           }
         </Table.Summary.Cell>;
       })
diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx
index 34f839c..7d2db9c 100644
--- a/src/pages/calcTable/index.tsx
+++ b/src/pages/calcTable/index.tsx
@@ -50,7 +50,7 @@ const index: FunctionComponent<Props> = (props) => {
       const {
         columns, dataSource, pageInfo, selectedRowKeys, i18n: i18nRes = {},
         showTotalCell = false, sumRowlistUrl = "", payload = {}, calcDetail,
-        fixed = true, tableScrollHeight, sumRow
+        fixed = true, tableScrollHeight, sumRow, optWidth
       } = data;
       setSumRowlistUrl(sumRowlistUrl);
       setShowTotalCell(showTotalCell);
@@ -64,7 +64,7 @@ const index: FunctionComponent<Props> = (props) => {
       setSelectedRowKeys(selectedRowKeys);
       setTableScrollHeight(tableScrollHeight);
       setColumns([...convertColumns(_.map(columns, o => ({ ...o, i18n: i18nRes }))), {
-        title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: 220,
+        title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: optWidth || 120,
         render: (__, record) => (<Space>
           <Button type="link" onClick={() => handleEdit(record?.id)}>{i18nRes["编辑"]}</Button>
           <Button type="link"
diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx
index 59d2fa6..479563f 100644
--- a/src/pages/unitTable/renderColsOpts.tsx
+++ b/src/pages/unitTable/renderColsOpts.tsx
@@ -295,6 +295,22 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
           );
         }
       }];
+    } else if (type === "variableSalary") {
+      return [..._.map(initialState, g => {
+        return { ...g, ellipsis: true, fixed: false, width: 150 };
+      }), {
+        dataIndex: "operate", title: i18n?.["操作"], width: 185, fixed: "right",
+        render: (__: string, record: any) => {
+          return (
+            <Space>
+              <Button type="link"
+                      onClick={() => postMessageToParent("VIEW", record)}>{i18n?.["查看详情"]}</Button>
+              <Button type="link"
+                      onClick={() => postMessageToParent("DEL", record)}>{i18n?.["删除"]}</Button>
+            </Space>
+          );
+        }
+      }];
     }
     return initialState;
   }, [initialState, type, i18n, extraParams]);