Merge branch 'master' of gitee.com:yudaocode/yudao-ui-admin-vue3 into fix-dialog-submit

Signed-off-by: tzdxf <tzdxf.fei@qq.com>
This commit is contained in:
tzdxf 2025-03-24 02:07:01 +00:00 committed by Gitee
commit 22ba38957b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 23 additions and 7 deletions

View File

@ -1,9 +1,11 @@
<script lang="ts" setup>
import { propTypes } from '@/utils/propTypes'
import { isNumber } from '@/utils/is'
defineOptions({ name: 'Dialog' })
const slots = useSlots()
const emits = defineEmits(['update:modelValue'])
const props = defineProps({
modelValue: propTypes.bool.def(false),
@ -57,6 +59,15 @@ const dialogStyle = computed(() => {
})
const closing = ref(false)
function closeHandler() {
emits('update:modelValue', false)
closing.value = true
}
function closedHandler() {
closing.value = false
}
</script>
<template>
@ -70,8 +81,8 @@ const closing = ref(false)
draggable
class="com-dialog"
:show-close="false"
@close="closing=true"
@closed="closing=false"
@close="closeHandler"
@closed="closedHandler"
>
<template #header="{ close }">
<div class="relative h-54px flex items-center justify-between pl-15px pr-15px">

View File

@ -16,6 +16,7 @@ export const AiPlatformEnum = {
DEEP_SEEK: 'DeepSeek', // DeepSeek
ZHI_PU: 'ZhiPu', // 智谱 AI
XING_HUO: 'XingHuo', // 讯飞
SiliconFlow: 'SiliconFlow', // 硅基流动
OPENAI: 'OpenAI',
Ollama: 'Ollama',
STABLE_DIFFUSION: 'StableDiffusion', // Stability AI
@ -44,6 +45,10 @@ export const OtherPlatformEnum: ImageModelVO[] = [
{
key: AiPlatformEnum.ZHI_PU,
name: '智谱 AI'
},
{
key: AiPlatformEnum.SiliconFlow,
name: '硅基流动'
}
]

View File

@ -47,7 +47,7 @@
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['infra:login-log:export']"
v-hasPermi="['system:login-log:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
@ -85,7 +85,7 @@
link
type="primary"
@click="openDetail(scope.row)"
v-hasPermi="['infra:login-log:query']"
v-hasPermi="['system:login-log:query']"
>
详情
</el-button>

View File

@ -81,7 +81,7 @@
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['infra:operate-log:export']"
v-hasPermi="['system:operate-log:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
@ -112,7 +112,7 @@
link
type="primary"
@click="openDetail(scope.row)"
v-hasPermi="['infra:operate-log:query']"
v-hasPermi="['system:operate-log:query']"
>
详情
</el-button>