Skip to content

Commit 583a9d6

Browse files
xlornexlorne
committed
fix flow
1 parent e83083a commit 583a9d6

File tree

6 files changed

+79
-20
lines changed

6 files changed

+79
-20
lines changed

‎admin-pro-ui/src/components/flow/types.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@ export interface FlowFormView {
135135
export interface FlowViewProps {
136136
// 流程编号
137137
id?: string;
138-
// 是否展示
139-
visible: boolean;
140-
// 设置展示
141-
setVisible:(visible:boolean)=>void;
142138
// 流程的设计编号
143139
workCode?: string;
144140
// 流程的视图数据

‎admin-pro-ui/src/components/flow/view/FlowModelView.scss

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.flow-modal.ant-modal {
2+
width: 100% !important;
3+
top: 0 !important;
4+
max-width: 100% !important;
5+
}
6+
.flow-modal.ant-modal.ant-modal-content {
7+
height: 100vh !important;
8+
}
9+
10+
.flow-modal {
11+
margin: 0 !important;
12+
padding: 0 !important;
13+
width: 100vw !important;
14+
height: 100vh !important;
15+
overflow-y: hidden;
16+
17+
.ant-modal-content{
18+
width: 100vw !important;
19+
height: 100vh !important;
20+
}
21+
22+
.ant-modal-footer{
23+
margin: 0 !important;
24+
}
25+
}

‎admin-pro-ui/src/components/flow/view/FlowModelView.tsx

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import {FlowViewProps} from "@/components/flow/types";
2+
import React from "react";
3+
import {Modal} from "antd";
4+
import FlowView from "@/components/flow/view/index";
5+
import "./FlowModelView.scss";
6+
7+
interface FlowModelViewProps extends FlowViewProps{
8+
visible:boolean;
9+
setVisible:(visible:boolean)=>void;
10+
}
11+
12+
const FlowModelView:React.FC<FlowModelViewProps> = (props)=>{
13+
return (
14+
<Modal
15+
className={"flow-modal"}
16+
open={props.visible}
17+
onCancel={()=>{
18+
props.setVisible(false);
19+
}}
20+
onOk={()=>{
21+
props.setVisible(false);
22+
}}
23+
onClose={()=>{
24+
props.setVisible(false);
25+
}}
26+
destroyOnClose={true}
27+
footer={false}
28+
closable={false}
29+
>
30+
<FlowView
31+
{...props}
32+
/>
33+
</Modal>
34+
)
35+
}
36+
37+
export default FlowModelView;

‎admin-pro-ui/src/components/flow/view/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,4 @@ const FlowView:React.FC<FlowViewProps> = (props)=>{
99
}
1010

1111
export default FlowView;
12+

‎admin-pro-ui/src/pages/flow/leave/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import React from "react";
22
import {ActionType, PageContainer, ProTable} from "@ant-design/pro-components";
33
import {list} from "@/api/leave";
44
import {Button} from "antd";
5-
import FlowView from "@/components/flow/view";
65
import LeaveForm from "@/pages/flow/leave/LeaveForm";
6+
import FlowModelView from "@/components/flow/view/FlowModelView";
77

88
const LeavePage = () => {
99

@@ -53,7 +53,7 @@ const LeavePage = () => {
5353
}}
5454
/>
5555

56-
<FlowView
56+
<FlowModelView
5757
visible={visible}
5858
setVisible={setVisible}
5959
view={LeaveForm}

‎admin-pro-ui/src/pages/flow/record/index.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import {
1212
import moment from "moment";
1313
import {message, Tabs} from "antd";
1414
import "./index.scss";
15-
import FlowView from "@/components/flow/view";
1615
import LeaveForm from "@/pages/flow/leave/LeaveForm";
16+
import FlowModelView from "@/components/flow/view/FlowModelView";
1717

1818
const FlowRecordPage = () => {
1919

@@ -31,7 +31,7 @@ const FlowRecordPage = () => {
3131
const allTodoActionRef = React.useRef<ActionType>();
3232

3333

34-
const handlerUrgeFlow = (recordId:any) => {
34+
const handlerUrgeFlow = (recordId: any) => {
3535
const body = {
3636
recordId,
3737
}
@@ -61,9 +61,9 @@ const FlowRecordPage = () => {
6161
{
6262
title: '标题',
6363
dataIndex: 'title',
64-
render:(value:any,record:any)=>{
64+
render: (value: any, record: any) => {
6565
return (
66-
<div dangerouslySetInnerHTML={{ __html: value }}></div>
66+
<div dangerouslySetInnerHTML={{__html: value}}></div>
6767
);
6868
}
6969
},
@@ -171,7 +171,7 @@ const FlowRecordPage = () => {
171171
] as any[];
172172

173173

174-
const reloadTable = ()=>{
174+
const reloadTable = () => {
175175
if (key === 'todo') {
176176
todoActionRef.current?.reload();
177177
}
@@ -213,7 +213,7 @@ const FlowRecordPage = () => {
213213
search={false}
214214
columns={columns}
215215
rowClassName={(record) => {
216-
return record.read?"record-read":"record-unread";
216+
return record.read ? "record-read" : "record-unread";
217217
}}
218218
request={async (params, sort, filter) => {
219219
return findTodoByOperatorId(params, sort, filter, []);
@@ -230,7 +230,7 @@ const FlowRecordPage = () => {
230230
search={false}
231231
columns={columns}
232232
rowClassName={(record) => {
233-
return record.read?"record-read":"record-unread";
233+
return record.read ? "record-read" : "record-unread";
234234
}}
235235
request={async (params, sort, filter) => {
236236
return findDoneByOperatorId(params, sort, filter, []);
@@ -247,7 +247,7 @@ const FlowRecordPage = () => {
247247
search={false}
248248
columns={columns}
249249
rowClassName={(record) => {
250-
return record.read?"record-read":"record-unread";
250+
return record.read ? "record-read" : "record-unread";
251251
}}
252252
request={async (params, sort, filter) => {
253253
return findInitiatedByOperatorId(params, sort, filter, []);
@@ -264,7 +264,7 @@ const FlowRecordPage = () => {
264264
search={false}
265265
columns={columns}
266266
rowClassName={(record) => {
267-
return record.read?"record-read":"record-unread";
267+
return record.read ? "record-read" : "record-unread";
268268
}}
269269
request={async (params, sort, filter) => {
270270
return findTimeoutTodoByOperatorId(params, sort, filter, []);
@@ -282,7 +282,7 @@ const FlowRecordPage = () => {
282282
search={false}
283283
columns={columns}
284284
rowClassName={(record) => {
285-
return record.read?"record-read":"record-unread";
285+
return record.read ? "record-read" : "record-unread";
286286
}}
287287
request={async (params, sort, filter) => {
288288
return findPostponedTodoByOperatorId(params, sort, filter, []);
@@ -299,7 +299,7 @@ const FlowRecordPage = () => {
299299
search={false}
300300
columns={columns}
301301
rowClassName={(record) => {
302-
return record.read?"record-read":"record-unread";
302+
return record.read ? "record-read" : "record-unread";
303303
}}
304304
request={async (params, sort, filter) => {
305305
return findAllByOperatorId(params, sort, filter, []);
@@ -310,16 +310,16 @@ const FlowRecordPage = () => {
310310
]}
311311
/>
312312

313-
<FlowView
314-
id={currentId}
313+
314+
<FlowModelView
315315
visible={flowViewVisible}
316316
setVisible={setFlowViewVisible}
317+
id={currentId}
317318
view={{
318319
'default': LeaveForm
319320
}}
320321
/>
321322

322-
323323
</PageContainer>
324324
)
325325
}

0 commit comments

Comments
 (0)