diff --git a/src/pages/aliTable/dragColsTable/index.tsx b/src/pages/aliTable/dragColsTable/index.tsx index d9132de..7bee10c 100644 --- a/src/pages/aliTable/dragColsTable/index.tsx +++ b/src/pages/aliTable/dragColsTable/index.tsx @@ -34,6 +34,16 @@ const index: FunctionComponent = (props) => { if (!_.isEmpty(report?.columns)) { window.document.body.innerHTML = window.document.getElementById("print")!.innerHTML; + const styleTag = document.createElement("style"); + styleTag.type = "text/css"; + styleTag.innerHTML = ` + .ant-table { + td, th, .ant-table-title, .ant-table-footer, table { + border-color: #333 !important; + } + } + `; + window.document.head.appendChild(styleTag); window.print(); // window.location.reload(); } diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index ef3714d..34f839c 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -64,11 +64,12 @@ const index: FunctionComponent = (props) => { setSelectedRowKeys(selectedRowKeys); setTableScrollHeight(tableScrollHeight); setColumns([...convertColumns(_.map(columns, o => ({ ...o, i18n: i18nRes }))), { - title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: 120, + title: i18nRes["操作"], dataIndex: "operate", fixed: "right", width: 220, render: (__, record) => ( + {record?.lockStatus === "LOCK" && {record?.lockTime}} ) }]); }