Skip to content

Commit fb68dc2

Browse files
committed
feat: 优化操作按钮组件命名;操作按钮固定在整个页面下方逻辑完成
1 parent 632dea0 commit fb68dc2

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/layout/components/AppView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ provide('reload', reload)
3636
<template>
3737
<section
3838
:class="[
39-
'p-[var(--app-content-padding)] w-full bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
39+
'p-[var(--app-content-padding)] w-full bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)] section-container',
4040
{
4141
'!min-h-[calc(100vh-var(--top-tool-height)-var(--tags-view-height)-var(--app-footer-height))] pb-0':
4242
footer

src/views/bpm/processInstance/detail/ProcessInstanceBtnConatiner.vue renamed to src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<template>
2-
<el-affix target=".formCol" position="bottom" class="h-50px" v-if="runningTask?.id">
3-
<el-divider class="!mb-8px !mt-0" />
2+
<Teleport v-if="runningTask?.id" to=".section-container">
43
<div
5-
class="pl-50px text-14px flex items-center color-#32373c dark:color-#fff font-bold btn-container"
4+
class="h-50px position-fixed bottom-10 pl-50px text-14px flex items-center color-#32373c dark:color-#fff font-bold btn-container"
65
>
76
<el-popover :visible="passVisible" placement="top-end" :width="500" trigger="click">
87
<template #reference>
@@ -126,7 +125,7 @@
126125
<div @click="handleSign"> <Icon :size="14" icon="ep:plus" />&nbsp;加签 </div>
127126
<div @click="handleBack"> <Icon :size="14" icon="fa:mail-reply" />&nbsp;退回 </div>
128127
</div>
129-
</el-affix>
128+
</Teleport>
130129
<!-- 弹窗:转派审批人 -->
131130
<TaskTransferForm ref="taskTransferFormRef" @success="getDetail" />
132131
<!-- 弹窗:回退节点 -->

src/views/bpm/processInstance/detail/index_new.vue

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@
4646
<BusinessFormComponent :id="processInstance.businessKey" />
4747
</div>
4848
</div>
49-
<!-- 操作栏按钮 -->
50-
<!-- TODO @GoldenZqqq:ProcessInstanceOperationButton,操作按钮。不叫 Container 会好点点,和后端也更统一 -->
51-
<ProcessInstanceBtnConatiner
52-
ref="processInstanceBtnRef"
53-
:processInstance="processInstance"
54-
:userOptions="userOptions"
55-
@success="getDetail"
56-
/>
5749
</el-col>
5850
<el-col :span="6">
5951
<!-- TODO @GoldenZqqq:后续这个,也拆个小组件出来 -->
@@ -126,6 +118,14 @@
126118
<!-- 流转评论 -->
127119
<el-tab-pane label="流转评论"> 流转评论 </el-tab-pane>
128120
</el-tabs>
121+
122+
<!-- 操作栏按钮 -->
123+
<ProcessInstanceOperationButton
124+
ref="operationButtonRef"
125+
:processInstance="processInstance"
126+
:userOptions="userOptions"
127+
@success="getDetail"
128+
/>
129129
</ContentWrap>
130130
</template>
131131
<script lang="ts" setup>
@@ -138,6 +138,7 @@ import * as ProcessInstanceApi from '@/api/bpm/processInstance'
138138
import * as TaskApi from '@/api/bpm/task'
139139
import ProcessInstanceBpmnViewer from './ProcessInstanceBpmnViewer.vue'
140140
import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
141+
import ProcessInstanceOperationButton from './ProcessInstanceOperationButton.vue'
141142
import { registerComponent } from '@/utils/routerHelper'
142143
import * as UserApi from '@/api/system/user'
143144
import audit1 from '@/assets/svgs/bpm/audit1.svg'
@@ -151,7 +152,7 @@ const message = useMessage() // 消息弹窗
151152
const id = query.id as unknown as string // 流程实例的编号
152153
const processInstanceLoading = ref(false) // 流程实例的加载中
153154
const processInstance = ref<any>({}) // 流程实例
154-
const processInstanceBtnRef = ref()
155+
const operationButtonRef = ref()
155156
const bpmnXml = ref('') // BPMN XML
156157
const tasksLoad = ref(true) // 任务的加载中
157158
const tasks = ref<any[]>([]) // 任务列表
@@ -244,7 +245,7 @@ const getTaskList = async () => {
244245
})
245246
246247
// 获得需要自己审批的任务
247-
processInstanceBtnRef.value.loadRunningTask(tasks.value)
248+
operationButtonRef.value?.loadRunningTask(tasks.value)
248249
} finally {
249250
tasksLoad.value = false
250251
}

0 commit comments

Comments
 (0)