Merge branch 'master' into feature/业务线管理
This commit is contained in:
commit
ee0eaf67ad
|
|
@ -22,7 +22,7 @@ const UnitTable: FC = (props) => {
|
|||
const [pageInfo, setPageInfo] = useState<Partial<PaginationData>>({});
|
||||
const [sumRow, setSumRow] = useState<Partial<{}>>({});//总计行数据
|
||||
const [i18n, setI18n] = useState<any>({});
|
||||
const [extraParams, setExtraParams] = useState<Partial<extraType>>({});//额外参数
|
||||
const [extraParams, setExtraParams] = useState<Partial<extraType>>({ selectedRowKeys: [] });//额外参数
|
||||
|
||||
useEffect(() => {
|
||||
window.parent.postMessage({ type: "init" }, "*");
|
||||
|
|
@ -46,7 +46,7 @@ const UnitTable: FC = (props) => {
|
|||
setSumRow(sumDataSource);
|
||||
setExtraParams({
|
||||
selectedKey, scrollHeight, permission, rowKey, showTotalCell,
|
||||
selectedRowKeys: [extraParams.selectedRowKeys, ...rowKeys]
|
||||
selectedRowKeys: [...extraParams.selectedRowKeys as string[] | number[], ...rowKeys]
|
||||
});
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -302,7 +302,7 @@ export function renderCols(initialState: any[], type: string, i18n?: AnyObject,
|
|||
return (
|
||||
<Space>
|
||||
<Button type="link"
|
||||
onClick={() => postMessageToParent("VIEW", record)}>{i18n?.["查看详情"]}</Button>
|
||||
onClick={() => postMessageToParent("EDIT", record)}>{i18n?.["编辑"]}</Button>
|
||||
<Button type="link"
|
||||
onClick={() => postMessageToParent("DEL", record)}>{i18n?.["删除"]}</Button>
|
||||
</Space>
|
||||
|
|
|
|||
Loading…
Reference in New Issue