master

src/pages/calcTable/calcExplainFooter.tsx

@@ -23,11 +23,11 @@ const CalcExplainFooter: FunctionComponent<Props> = (props) => {
       </div>
       <div className={styles["icon-item"]}>
         <LockOutlined/>
-        <span>{i18n["当前状态锁定，点击解锁"]}</span>
+        <span>{i18n["当前状态锁定，右击解锁"]}</span>
       </div>
       <div className={styles["icon-item"]}>
         <UnlockOutlined/>
-        <span>{i18n["当前状态未锁定，点击锁定"]}</span>
+        <span>{i18n["当前状态未锁定，右击锁定"]}</span>
       </div>
       <div className={styles["icon-item"]}>
         <Icon type="icon-pilianggengxin"/>

src/pages/calcTable/index.tsx

@@ -4,18 +4,18 @@
  * Description:
  * Date: 2023/9/14
  */
-import React, { FunctionComponent, useEffect, useState } from 'react';
+import React, { FunctionComponent, useEffect, useState } from "react";
-import type { MenuProps } from 'antd';
+import type { MenuProps } from "antd";
-import { Button, Dropdown, Space, Table, Typography } from 'antd';
+import { Button, Dropdown, Space, Table, Typography } from "antd";
-import { LockOutlined } from '@ant-design/icons';
+import { LockOutlined, UnlockOutlined } from "@ant-design/icons";
-import CustomTableTitle from '@/pages/calcTable/customTableTitle';
+import CustomTableTitle from "@/pages/calcTable/customTableTitle";
-import CalcExplainFooter from '@/pages/calcTable/calcExplainFooter';
+import CalcExplainFooter from "@/pages/calcTable/calcExplainFooter";
-import CaclFixedTotal from './calcFixedTotal';
+import CaclFixedTotal from "./calcFixedTotal";
-import type { ColumnType } from 'antd/lib/table';
+import type { ColumnType } from "antd/lib/table";
-import type { PaginationData } from 'rc-pagination';
+import type { PaginationData } from "rc-pagination";
-import { exceptStr, paginationFun } from '@/utils/common';
+import { exceptStr, paginationFun } from "@/utils/common";
-import { IPage } from '@/common/types';
+import { IPage } from "@/common/types";
-import styles from '@/pages/atdTable/components/index.less';
+import styles from "@/pages/atdTable/components/index.less";
 
 interface OwnProps {}
 
@@ -124,7 +124,7 @@ const index: FunctionComponent<Props> = (props) => {
               {
                 label: item.i18n["解锁"],
                 key: "UNLOCK",
-                icon: <LockOutlined />,
+                icon: <UnlockOutlined />,
                 onClick: () =>
                   handleLockEmp({
                     lockStatus: "UNLOCK",
@@ -160,13 +160,7 @@ const index: FunctionComponent<Props> = (props) => {
   const sizeChange = (pageobj: IPage) => {};
   const onChange = (pageobj: IPage) => {
     setPageInfo(() => {
-      window.parent.postMessage(
+      window.parent.postMessage({ type: "turn", payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } }, "*");
-        {
-          type: "turn",
-          payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } }
-        },
-        "*"
-      );
       return { ...pageInfo, ...pageobj };
     });
   };