From 6d2b0d8b1eb9e5bca8a295bf894d12f58d64964f Mon Sep 17 00:00:00 2001 From: lys <971387674@qq.com> Date: Fri, 18 Oct 2024 16:30:50 +0800 Subject: [PATCH] master --- src/pages/calcTable/calcExplainFooter.tsx | 4 +-- src/pages/calcTable/index.tsx | 34 ++++++++++------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/pages/calcTable/calcExplainFooter.tsx b/src/pages/calcTable/calcExplainFooter.tsx index 6b6fa3e..59f780d 100644 --- a/src/pages/calcTable/calcExplainFooter.tsx +++ b/src/pages/calcTable/calcExplainFooter.tsx @@ -23,11 +23,11 @@ const CalcExplainFooter: FunctionComponent = (props) => {
- {i18n["当前状态锁定,点击解锁"]} + {i18n["当前状态锁定,右击解锁"]}
- {i18n["当前状态未锁定,点击锁定"]} + {i18n["当前状态未锁定,右击锁定"]}
diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index b5330ca..6621bdd 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -4,18 +4,18 @@ * Description: * Date: 2023/9/14 */ -import React, { FunctionComponent, useEffect, useState } from 'react'; -import type { MenuProps } from 'antd'; -import { Button, Dropdown, Space, Table, Typography } from 'antd'; -import { LockOutlined } from '@ant-design/icons'; -import CustomTableTitle from '@/pages/calcTable/customTableTitle'; -import CalcExplainFooter from '@/pages/calcTable/calcExplainFooter'; -import CaclFixedTotal from './calcFixedTotal'; -import type { ColumnType } from 'antd/lib/table'; -import type { PaginationData } from 'rc-pagination'; -import { exceptStr, paginationFun } from '@/utils/common'; -import { IPage } from '@/common/types'; -import styles from '@/pages/atdTable/components/index.less'; +import React, { FunctionComponent, useEffect, useState } from "react"; +import type { MenuProps } from "antd"; +import { Button, Dropdown, Space, Table, Typography } from "antd"; +import { LockOutlined, UnlockOutlined } from "@ant-design/icons"; +import CustomTableTitle from "@/pages/calcTable/customTableTitle"; +import CalcExplainFooter from "@/pages/calcTable/calcExplainFooter"; +import CaclFixedTotal from "./calcFixedTotal"; +import type { ColumnType } from "antd/lib/table"; +import type { PaginationData } from "rc-pagination"; +import { exceptStr, paginationFun } from "@/utils/common"; +import { IPage } from "@/common/types"; +import styles from "@/pages/atdTable/components/index.less"; interface OwnProps {} @@ -124,7 +124,7 @@ const index: FunctionComponent = (props) => { { label: item.i18n["解锁"], key: "UNLOCK", - icon: , + icon: , onClick: () => handleLockEmp({ lockStatus: "UNLOCK", @@ -160,13 +160,7 @@ const index: FunctionComponent = (props) => { const sizeChange = (pageobj: IPage) => {}; const onChange = (pageobj: IPage) => { setPageInfo(() => { - window.parent.postMessage( - { - type: "turn", - payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } - }, - "*" - ); + window.parent.postMessage({ type: "turn", payload: { id: "PAGEINFO", params: { ...pageInfo, ...pageobj } } }, "*"); return { ...pageInfo, ...pageobj }; }); };