diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index da7a63d..b5a61e7 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -248,8 +248,8 @@ const index: FunctionComponent = (props) => { }; const rowSelection = { columnWidth: 50, - columnTitle: isDetailTable ? "序号" : "", - renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable ? {index + 1} : originNode), + columnTitle: isDetailTable && _.isNil(showSee) ? "序号" : "", + renderCell: (value: boolean, record: any, index: number, originNode: React.ReactNode) => (isDetailTable && _.isNil(showSee) ? {index + 1} : originNode), selectedRowKeys, preserveSelectedRowKeys: true, onChange: (rowKeys: React.Key[]) => { diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index 784233f..16761d4 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -434,6 +434,58 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, return col; }) ]; + } else if (type === "attendanceView") { + return [ + ..._.map(initialState, (g) => { + let col = { ...g, ellipsis: true }; + switch (g.dataIndex) { + case "operate": + col = { + ...col, + width: 176, + fixed: "right" // render: (__: string, record: any) => { + // let items: MenuProps["items"] = [ + // { + // key: "DeleteList", + // label: i18n?.["删除"], + // onClick: () => postMessageToParent("DEL", record) + // }, + // { + // key: "Log", + // label: i18n?.["操作日志"], + // onClick: () => postMessageToParent("log", record) + // } + // ]; + // isSpecial && items.shift(); + // return ( + // + // + // {isSpecial ? ( + // + // ) : ( + // + // )} + // + //