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

Signed-off-by: tzdxf <tzdxf.fei@qq.com>

src/components/Dialog/src/Dialog.vue

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

src/views/ai/utils/constants.ts

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

src/views/system/loginlog/index.vue

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

src/views/system/operatelog/index.vue

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