diff --git a/src/pages/calcTable/index.tsx b/src/pages/calcTable/index.tsx index 7010adc..603916a 100644 --- a/src/pages/calcTable/index.tsx +++ b/src/pages/calcTable/index.tsx @@ -105,7 +105,7 @@ const index: FunctionComponent = (props) => { i18n: item.i18n, onCell: (record: any) => ({ onContextMenu: (e: any) => { - record.lockItems && e.preventDefault(); + !item.calcDetail && e.preventDefault(); } }), render: (text: string, record: any) => { @@ -134,7 +134,7 @@ const index: FunctionComponent = (props) => { } ]; return ( - + {text} diff --git a/src/pages/unitTable/index.tsx b/src/pages/unitTable/index.tsx index cfcb283..9074aa3 100644 --- a/src/pages/unitTable/index.tsx +++ b/src/pages/unitTable/index.tsx @@ -15,6 +15,7 @@ export type extraType = { rowKey: string; showTotalCell: boolean; isSpecial: boolean; + showRowSelection: boolean; }; const UnitTable: FC = (props) => { const [unitTableType, setUnitTableType] = useState(""); @@ -48,7 +49,8 @@ const UnitTable: FC = (props) => { rowKey, showTotalCell = false, sumDataSource = {}, - isSpecial = false + isSpecial = false, + showRowSelection = true } = data; setI18n(i18n); setColumns(columns); @@ -63,6 +65,7 @@ const UnitTable: FC = (props) => { rowKey, showTotalCell, isSpecial, + showRowSelection, selectedRowKeys: [...(extraParams.selectedRowKeys as string[] | number[]), ...rowKeys] }); } @@ -99,15 +102,8 @@ const UnitTable: FC = (props) => { columns={renderCols(columns, unitTableType, i18n, extraParams)} scroll={{ x: 1200, y: `calc(100vh - ${extraParams?.scrollHeight || 109}px)` }} bordered={_.some(columns, (k) => k.children)} - rowSelection={!_.isNil(extraParams?.selectedRowKeys) ? rowSelection : undefined} - pagination={ - !_.isNil(pageInfo) - ? { - ...paginationAction(pageInfo, i18n, onChange), - size: "default" - } - : false - } + rowSelection={extraParams?.showRowSelection ? rowSelection : undefined} + pagination={!_.isNil(pageInfo) ? { ...paginationAction(pageInfo, i18n, onChange), size: "default" } : false} summary={() => !extraParams.showTotalCell ? ( <> diff --git a/src/pages/unitTable/renderColsOpts.tsx b/src/pages/unitTable/renderColsOpts.tsx index 5da7f22..c87fc0e 100644 --- a/src/pages/unitTable/renderColsOpts.tsx +++ b/src/pages/unitTable/renderColsOpts.tsx @@ -69,7 +69,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, width: 185, fixed: "right", render: (__: string, record: any) => { - const { billStatus } = record; + const { billStatus, customOptAuth } = record; const items: MenuProps["items"] = [ { key: "DeleteList", @@ -111,9 +111,11 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject, - + {(_.isEmpty(customOptAuth) || customOptAuth.FILE) && ( + + )} - + {(_.isEmpty(customOptAuth) || customOptAuth.RECALC) && ( + + )}