Merge branch 'beta' into 'master'

fix: 期望点击弹窗外不会自动关闭

See merge request !220

src/components/custom-modal/custom-modal.vue

@@ -16,6 +16,7 @@ interface Props {
   labelWidth?: number // 标签的宽度
   labelPlacement?: 'left' | 'top' // 标签显示的位置
   contentStyle?: object
+  maskClosable?: boolean // 点击遮罩层是否关闭
 }
 
 interface Emits {
@@ -37,6 +38,7 @@ const props = withDefaults(defineProps<Props>(), {
   labelWidth: 80,
   labelPlacement: 'left',
   contentStyle: () => ({}),
+  maskClosable: true,
 })
 
 const cancelBtnText = computed(() => props.cancelBtnText || t('common_module.cancel_btn_text'))
@@ -73,6 +75,12 @@ function handleCloseModal() {
 function handleConfirm() {
   emit('confirm')
 }
+
+function handleMaskClick() {
+  if (props.maskClosable) {
+    handleCloseModal()
+  }
+}
 </script>
 
 <template>
@@ -87,7 +95,8 @@ function handleConfirm() {
     :header-style="modalHeaderStyle"
     :content-style="contentStyle"
     :footer-style="modalFooterStyle"
-    :on-mask-click="handleCloseModal"
+    :mask-closable="maskClosable"
+    :on-mask-click="handleMaskClick"
     @close="handleCloseModal"
   >
     <template #header>

src/views/personal-space/personal-app-setting/components/agent-config/agent-setting/components/add-agent-plugin-modal.vue

@@ -164,6 +164,7 @@ function handleCloseModal() {
     v-model:show="showModal"
     class="h-[700px] w-[954px] rounded-[10px] bg-white"
     :auto-focus="false"
+    :mask-closable="false"
     @after-leave="handleCloseModal"
   >
     <div class="flex">