Merge remote-tracking branch 'origin/main' into practical-training

This commit is contained in:
TsMask
2024-07-08 10:57:22 +08:00
7 changed files with 17 additions and 7 deletions

View File

@@ -184,7 +184,7 @@ type ModalStateType = {
/**对话框对象信息状态 */
let modalState: ModalStateType = reactive({
visibleBySelectUser: false,
title: '选择用户',
title: t('views.system.role.distributeUser'),
});
/**

View File

@@ -237,7 +237,6 @@ watch(
<template>
<ProModal
:drag="true"
:width="800"
:destroyOnClose="true"
:forceFullscreen="true"
:title="props.title"
@@ -302,7 +301,7 @@ watch(
:loading="tableState.loading"
:data-source="tableState.data"
:size="tableState.size"
:scroll="{ scrollToFirstRowOnChange: true, y: 400, x: 600 }"
:scroll="{ scrollToFirstRowOnChange: true }"
:pagination="tablePagination"
:row-selection="{
type: 'checkbox',