public/ruoyi-plus-vben5
1
0
Fork 0
mirror of https://gitee.com/dapppp/ruoyi-plus-vben5.git synced 2026-03-19 15:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 移除 Modal 组件直接导入，统一使用 window.modal 调用

Browse Source 
将项目中直接导入的 antdv-next Modal 组件替换为通过 window.modal 调用，提升代码一致性
删除不再使用的 table-switch.vue 组件
This commit is contained in:
dap
2026-01-16 11:21:23 +08:00
parent 20f9a8a497
commit 1f643874a9
42 changed files with 85 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/web-antd/src/views/workflow/components/actions/flow-actions.vue
View File

@@ -21,7 +21,7 @@ import {
UsergroupDeleteOutlined,
UserOutlined,
} from '@ant-design/icons-vue';
import { Dropdown, Menu, MenuItem, Modal, Space } from 'antdv-next';
import { Dropdown, Menu, MenuItem, Space } from 'antdv-next';
import {
cancelProcessApply,
@@ -68,7 +68,7 @@ const showButtonOther = computed(() => {
// 进行中 可以撤销
const revocable = computed(() => props.task?.flowStatus === 'waiting');
async function handleCancel() {
Modal.confirm({
window.modal.confirm({
title: '提示',
content: '确定要撤销该申请吗？',
centered: true,
@@ -102,7 +102,7 @@ function handleEdit() {
}
function handleRemove() {
Modal.confirm({
window.modal.confirm({
title: '提示',
content: '确定删除该申请吗？',
centered: true,
@@ -213,7 +213,7 @@ const [AddSignatureModal, addSignatureModalApi] = useVbenModal({
function handleAddSignature(userList: User[]) {
if (userList.length === 0) return;
const userIds = userList.map((user) => user.userId);
Modal.confirm({
window.modal.confirm({
title: '提示',
content: '确认加签吗?',
centered: true,
@@ -230,7 +230,7 @@ const [ReductionSignatureModal, reductionSignatureModalApi] = useVbenModal({
function handleReductionSignature(userList: User[]) {
if (userList.length === 0) return;
const userIds = userList.map((user) => user.userId);
Modal.confirm({
window.modal.confirm({
title: '提示',
content: '确认减签吗?',
centered: true,
@@ -261,7 +261,7 @@ function handleUpdateAssignee(userList: User[]) {
if (userList.length === 0) return;
const current = userList[0];
if (!current) return;
Modal.confirm({
window.modal.confirm({
title: '修改办理人',
content: `确定修改办理人为${current?.nickName}吗?`,
centered: true,
@@ -292,7 +292,7 @@ const showMultiActions = computed(() => {
cn(
'absolute bottom-0 left-0',
'border-t-solid border-t-[1px]',
'bg-background w-full p-3',
'w-full bg-background p-3',
)
"
>

10
apps/web-antd/src/views/workflow/components/flow-interfere-modal.vue
View File

@@ -8,7 +8,7 @@ import { computed, ref } from 'vue';
import { useVbenModal } from '@vben/common-ui';
import { Descriptions, Modal } from 'antdv-next';
import { Descriptions } from 'antdv-next';
import {
getTaskByTaskId,
@@ -57,7 +57,7 @@ const [TransferModal, transferModalApi] = useVbenModal({
function handleTransfer(userList: User[]) {
if (userList.length === 0 || !taskInfo.value) return;
const current = userList[0];
Modal.confirm({
window.modal.confirm({
title: '转办',
content: `确定转办给${current?.nickName}吗?`,
centered: true,
@@ -78,7 +78,7 @@ function handleTermination() {
if (!taskInfo.value) {
return;
}
Modal.confirm({
window.modal.confirm({
title: '审批终止',
content: '确定终止当前审批流程吗？',
centered: true,
@@ -96,7 +96,7 @@ const [AddSignatureModal, addSignatureModalApi] = useVbenModal({
function handleAddSignature(userList: User[]) {
if (userList.length === 0 || !taskInfo.value) return;
const userIds = userList.map((user) => user.userId);
Modal.confirm({
window.modal.confirm({
title: '提示',
content: '确认加签吗?',
centered: true,
@@ -116,7 +116,7 @@ const [ReductionSignatureModal, reductionSignatureModalApi] = useVbenModal({
function handleReductionSignature(userList: User[]) {
if (userList.length === 0 || !taskInfo.value) return;
const userIds = userList.map((user) => user.userId);
Modal.confirm({
window.modal.confirm({
title: '提示',
content: '确认减签吗?',
centered: true,

3
apps/web-antd/src/views/workflow/components/helper.tsx
View File

@@ -1,6 +1,5 @@
import { defineComponent, h, ref } from 'vue';
import { Modal } from 'antdv-next';
import dayjs from 'dayjs';
import duration from 'dayjs/plugin/duration';
import relativeTime from 'dayjs/plugin/relativeTime';
@@ -20,7 +19,7 @@ export interface ApproveWithReasonModalProps {
export function approveWithReasonModal(props: ApproveWithReasonModalProps) {
const { onOk, title, description } = props;
const content = ref('');
Modal.confirm({
window.modal.confirm({
title,
content: h(
defineComponent({

4
apps/web-antd/src/views/workflow/leave/index.vue
View File

@@ -7,7 +7,7 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
import { Page, useVbenDrawer, useVbenModal } from '@vben/common-ui';
import { Modal, Popconfirm, Space } from 'antdv-next';
import { Popconfirm, Space } from 'antdv-next';
import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
import { cancelProcessApply } from '#/api/workflow/instance';
@@ -124,7 +124,7 @@ async function handleRevoke(row: Required<LeaveForm>) {
function handleMultiDelete() {
const rows = tableApi.grid.getCheckboxRecords();
const ids = rows.map((row: Required<LeaveForm>) => row.id);
Modal.confirm({
window.modal.confirm({
title: '提示',
okType: 'danger',
content: `确认删除选中的${ids.length}条记录吗？`,

4
apps/web-antd/src/views/workflow/processDefinition/index.vue
View File

@@ -13,7 +13,7 @@ import { useRouter } from 'vue-router';
import { Page, useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { Modal, Popconfirm, RadioGroup, Space, Switch } from 'antdv-next';
import { Popconfirm, RadioGroup, Space, Switch } from 'antdv-next';
import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
import {
@@ -127,7 +127,7 @@ async function handleDelete(row: Recordable<any>) {
function handleMultiDelete() {
const rows = tableApi.grid.getCheckboxRecords();
const ids = rows.map((row: any) => row.id);
Modal.confirm({
window.modal.confirm({
title: '提示',
okType: 'danger',
content: `确认删除选中的${ids.length}条记录吗？`,

4
apps/web-antd/src/views/workflow/processInstance/index.vue
View File

@@ -11,7 +11,7 @@ import { ref } from 'vue';
import { Page, useVbenModal } from '@vben/common-ui';
import { $t } from '@vben/locales';
import { Modal, Popconfirm, RadioGroup, Space } from 'antdv-next';
import { Popconfirm, RadioGroup, Space } from 'antdv-next';
import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
import {
@@ -135,7 +135,7 @@ async function handleDelete(row: Recordable<any>) {
function handleMultiDelete() {
const rows = tableApi.grid.getCheckboxRecords();
const ids = rows.map((row: any) => row.id);
Modal.confirm({
window.modal.confirm({
title: '提示',
okType: 'danger',
content: `确认删除选中的${ids.length}条记录吗？`,

4
apps/web-antd/src/views/workflow/processInstance/instance-variable-modal.vue
View File

@@ -4,7 +4,7 @@ import { ref } from 'vue';
import { JsonPreview, useVbenModal } from '@vben/common-ui';
import { cn, getPopupContainer } from '@vben/utils';
import { Modal, Tag } from 'antdv-next';
import { Tag } from 'antdv-next';
import { useVbenForm } from '#/adapter/form';
import { instanceVariable, updateFlowVariable } from '#/api/workflow/instance';
@@ -141,7 +141,7 @@ const [Form, formApi] = useVbenForm({
},
handleSubmit: async (values) => {
console.log(values);
Modal.confirm({
window.modal.confirm({
title: '修改流程变量',
content: '确认修改流程变量吗？',
centered: true,

4
apps/web-antd/src/views/workflow/spel/index.vue
View File

@@ -6,7 +6,7 @@ import type { Spel } from '#/api/workflow/spel/model';
import { Page, useVbenDrawer } from '@vben/common-ui';
import { Modal, Popconfirm, Space } from 'antdv-next';
import { Popconfirm, Space } from 'antdv-next';
import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
import { spelDelete, spelList } from '#/api/workflow/spel';
@@ -80,7 +80,7 @@ async function handleDelete(row: Spel) {
function handleMultiDelete() {
const rows = tableApi.grid.getCheckboxRecords();
const ids = rows.map((row: Spel) => row.id);
Modal.confirm({
window.modal.confirm({
title: '提示',
okType: 'danger',
content: `确认删除选中的${ids.length}条记录吗？`,