From 33c7f9d270df8a211e594952b4d2163017c0df2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 29 Nov 2023 17:19:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=BF=E4=B8=8B=E5=AF=B9?=
 =?UTF-8?q?=E6=AF=94=E8=A1=A8=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/OCTable/index.tsx           | 30 +++++++++++++++++++--------
 src/pages/salaryItemDiagram/index.tsx |  6 ++++++
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/pages/OCTable/index.tsx b/src/pages/OCTable/index.tsx
index ab8d780..87ca8bf 100644
--- a/src/pages/OCTable/index.tsx
+++ b/src/pages/OCTable/index.tsx
@@ -47,7 +47,15 @@ const OCTable: FC = (props) => {
             const showDifference = record[`${item["dataIndex"]}_type`] === "number";
             const { acctResultValue, excelResultValue } = record[item["dataIndex"]] || {};
             return <div className={styles["comparison-column-item-container"]}
-                        onClick={() => console.log(formulaDesc)}>
+                        onClick={() => {
+                          window.parent.postMessage(
+                            {
+                              type: "turn",
+                              payload: { id: "FORMULA", params: { formulaDesc } }
+                            },
+                            "*"
+                          );
+                        }}>
               <div className={styles["comparison-single-row"]}>
                 <span>{lanObj["系统值"]}：</span>
                 <span>{acctResultValue}</span>
@@ -80,14 +88,18 @@ const OCTable: FC = (props) => {
   const sizeChange = (pageobj: IPage) => {
   };
   const onChange = (pageobj: IPage) => {
-    setPageInfo({ ...pageInfo, ...pageobj });
-    window.parent.postMessage(
-      {
-        type: "turn",
-        payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } }
-      },
-      "*"
-    );
+    const { pageNum, size: pageSize } = pageobj;
+    setPageInfo((prevState) => {
+      const { size } = prevState;
+      window.parent.postMessage(
+        {
+          type: "turn",
+          payload: { id: "PAGEINFO", params: { ...pageInfo, pageNum: size === pageSize ? pageNum : 1, size: pageSize } }
+        },
+        "*"
+      );
+      return { ...pageInfo, current: size === pageSize ? pageNum : 1, size: pageSize };
+    });
   };
   return <Table
     rowKey="id" className={styles.tableWrapper}
diff --git a/src/pages/salaryItemDiagram/index.tsx b/src/pages/salaryItemDiagram/index.tsx
index a3ae9fb..29024c0 100644
--- a/src/pages/salaryItemDiagram/index.tsx
+++ b/src/pages/salaryItemDiagram/index.tsx
@@ -82,6 +82,11 @@ const index: FunctionComponent<Props> = (props) => {
           show: (g_level === 0 && !_.isEmpty(dataSource.children)) || getStorageIds(dataSource.children).includes(id)
         };
       },
+      layout: {
+        direction: "LR",
+        getVGap: () => 10,
+        getHGap: () => 80
+      },
       onReady: (graph: any) => {
         graph.on("node:click", (evt: any) => {
           if (_.isEmpty(evt.target.attrs) || JSON.stringify(evt.target.attrs).indexOf("cursor") !== -1) return;
@@ -93,6 +98,7 @@ const index: FunctionComponent<Props> = (props) => {
       },
       behaviors: ["drag-canvas", "zoom-canvas", "drag-node"]
     };
+    // @ts-ignore
     return !_.isEmpty(dataSource) ? <DecompositionTreeGraph {...config} /> : null;
   }, [dataSource]);
   return component;