From b8034ea8d5eac3eb346ec18f905b4a79cd9fdc13 Mon Sep 17 00:00:00 2001
From: Flex <q1406482700@163.com>
Date: 星期六, 21 六月 2025 18:05:48 +0800
Subject: [PATCH] Merge branch 'master' of http://yykjgit.sdyyst.com/r/easegen
---
easegen-front/src/views/mp/material/components/UploadVideo.vue | 1 +
easegen-front/src/components/Crontab/src/Crontab.vue | 1 +
easegen-front/src/views/File/index.vue | 4 ++--
easegen-front/src/views/mp/components/wx-reply/components/TabMusic.vue | 1 +
easegen-front/src/views/mp/components/wx-reply/components/TabNews.vue | 2 +-
easegen-front/src/views/mp/draft/components/CoverSelect.vue | 1 +
easegen-front/src/views/mp/menu/components/MenuEditor.vue | 2 +-
easegen-front/src/views/chooseTemplate/speakvideo.vue | 2 +-
easegen-front/src/views/chooseTemplate/rewriter.vue | 1 +
easegen-front/src/views/chooseTemplate/index.vue | 7 ++++---
easegen-front/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue | 2 +-
easegen-front/src/views/myCourse/index.vue | 3 +++
easegen-front/src/views/mp/components/wx-reply/components/TabImage.vue | 1 +
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue | 1 +
easegen-front/src/views/mp/autoReply/index.vue | 1 +
easegen-front/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue | 1 +
easegen-front/src/views/mp/components/wx-video-play/main.vue | 2 +-
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue | 1 +
easegen-front/src/views/mp/components/wx-reply/components/TabVoice.vue | 1 +
easegen-front/src/views/mp/message/index.vue | 1 +
easegen-front/src/views/mp/draft/index.vue | 1 +
easegen-front/src/components/Dialog/src/Dialog.vue | 2 +-
easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/template.js | 2 +-
easegen-front/src/views/mp/components/wx-reply/components/TabVideo.vue | 1 +
24 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/easegen-front/src/components/Crontab/src/Crontab.vue b/easegen-front/src/components/Crontab/src/Crontab.vue
index 0914bb7..519e986 100644
--- a/easegen-front/src/components/Crontab/src/Crontab.vue
+++ b/easegen-front/src/components/Crontab/src/Crontab.vue
@@ -535,6 +535,7 @@
append-to-body
destroy-on-close
title="cron瑙勫垯鐢熸垚鍣�"
+ :close-on-click-modal="false"
>
<div class="sc-cron">
<el-tabs>
diff --git a/easegen-front/src/components/Dialog/src/Dialog.vue b/easegen-front/src/components/Dialog/src/Dialog.vue
index a1eb550..35f6b72 100644
--- a/easegen-front/src/components/Dialog/src/Dialog.vue
+++ b/easegen-front/src/components/Dialog/src/Dialog.vue
@@ -60,7 +60,7 @@
<template>
<ElDialog
v-bind="getBindValue"
- :close-on-click-modal="true"
+ :close-on-click-modal="false"
:fullscreen="isFullscreen"
:width="width"
destroy-on-close
diff --git a/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue b/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
index de5445c..cd6de28 100644
--- a/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
+++ b/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue
@@ -195,6 +195,7 @@
width="600px"
append-to-body
destroy-on-close
+ :close-on-click-modal="false"
>
<el-form
:model="listenerFieldForm"
diff --git a/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue b/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
index 76e0c80..039acbc 100644
--- a/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
+++ b/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue
@@ -239,6 +239,7 @@
width="600px"
append-to-body
destroy-on-close
+ :close-on-click-modal="false"
>
<el-form
:model="listenerFieldForm"
diff --git a/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/template.js b/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
index 430dc64..1fb8aa8 100644
--- a/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
+++ b/easegen-front/src/components/bpmnProcessDesigner/package/penal/listeners/template.js
@@ -139,7 +139,7 @@
</el-drawer>
<!-- 娉ㄥ叆瑗挎 缂栬緫/鍒涘缓 閮ㄥ垎 -->
- <el-dialog title="瀛楁閰嶇疆" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close>
+ <el-dialog title="瀛楁閰嶇疆" :visible.sync="listenerFieldFormModelVisible" width="600px" append-to-body destroy-on-close :close-on-click-modal="false" >
<el-form :model="listenerFieldForm" size="small" label-width="96px" ref="listenerFieldFormRef" style="height: 136px" @submit.native.prevent>
<el-form-item label="瀛楁鍚嶇О锛�" prop="name" :rules="{ required: true, trigger: ['blur', 'change'] }">
<el-input v-model="listenerFieldForm.name" clearable />
diff --git a/easegen-front/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue b/easegen-front/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
index 494b3d9..48104c7 100644
--- a/easegen-front/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
+++ b/easegen-front/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue
@@ -36,6 +36,7 @@
width="600px"
append-to-body
destroy-on-close
+ :close-on-click-modal="false"
>
<el-form :model="propertyForm" label-width="80px" ref="attributeFormRef">
<el-form-item label="灞炴�у悕锛�" prop="name">
diff --git a/easegen-front/src/views/File/index.vue b/easegen-front/src/views/File/index.vue
index a555dfe..4d28cf8 100644
--- a/easegen-front/src/views/File/index.vue
+++ b/easegen-front/src/views/File/index.vue
@@ -85,7 +85,7 @@
/>
<!-- 鏂板寮圭獥 -->
- <el-dialog :title="dialogTitle" v-model="open" width="40%" append-to-body>
+ <el-dialog :title="dialogTitle" v-model="open" width="40%" append-to-body :close-on-click-modal="false" >
<el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="鏂囦欢鍚�" prop="name">
<el-input v-model="form.name" placeholder="璇疯緭鍏ユ枃浠跺悕" />
@@ -109,7 +109,7 @@
</el-dialog>
<!-- 瑙嗛棰勮寮圭獥 -->
- <el-dialog title="瑙嗛棰勮" v-model="previewVisible" width="50%" append-to-body>
+ <el-dialog title="瑙嗛棰勮" v-model="previewVisible" width="50%" append-to-body :close-on-click-modal="false" >
<video
v-if="previewUrl"
:src="previewUrl"
diff --git a/easegen-front/src/views/chooseTemplate/index.vue b/easegen-front/src/views/chooseTemplate/index.vue
index 2b51fc2..b565054 100644
--- a/easegen-front/src/views/chooseTemplate/index.vue
+++ b/easegen-front/src/views/chooseTemplate/index.vue
@@ -777,6 +777,7 @@
title="鐐瑰嚮闇�瑕佺籂姝ｇ殑澶氶煶瀛楋紝閫夋嫨姝ｇ‘鐨勫彂闊�"
width="500"
@close="dialogVisible = false"
+ :close-on-click-modal="false"
>
<el-tag
v-for="(item, index) in textList"
@@ -789,14 +790,14 @@
{{ item }}
</el-tag>
</el-dialog>
- <el-dialog v-model="dialogVisible1" title="鎻愮ず" width="500px" style="height: 150px">
+ <el-dialog v-model="dialogVisible1" title="鎻愮ず" width="500px" style="height: 150px" :close-on-click-modal="false" >
<p style="margin-bottom: 20px; font-size: 18px">鏄惁瑕佸皢姝ゆā鏉垮簲鐢ㄥ埌鎵�鏈夐〉闈�</p>
<span class="dialog-footer">
<el-button @click="handleTemplateSelection1(1)">搴旂敤褰撳墠椤�</el-button>
<el-button type="primary" @click="handleTemplateSelection1(2)">搴旂敤鎵�鏈夐〉</el-button>
</span>
</el-dialog>
- <el-dialog v-model="dialogVisible2" title="鎻愮ず" width="500px" style="height: 150px">
+ <el-dialog v-model="dialogVisible2" title="鎻愮ず" width="500px" style="height: 150px" :close-on-click-modal="false" >
<p style="margin-bottom: 20px; font-size: 18px">鏄惁瑕佸皢姝ゆ暟瀛椾汉搴旂敤鍒版墍鏈夐〉闈�</p>
<span class="dialog-footer">
<el-button @click="chooseHost1(1)">搴旂敤褰撳墠椤�</el-button>
@@ -1776,7 +1777,7 @@
message.warning('璇峰厛閫夋嫨瑕佸垹闄ょ殑ppt')
} else {
PPTArr.value = PPTArr.value.filter((child) => child.isChecked !== true)
-
+ DeleteD.value = true
}
}
diff --git a/easegen-front/src/views/chooseTemplate/rewriter.vue b/easegen-front/src/views/chooseTemplate/rewriter.vue
index 7e9acb5..ea26974 100644
--- a/easegen-front/src/views/chooseTemplate/rewriter.vue
+++ b/easegen-front/src/views/chooseTemplate/rewriter.vue
@@ -4,6 +4,7 @@
:title="t('courseCenter.intelligentSpeech')"
width="80%"
:before-close="handleClose"
+ :close-on-click-modal="false"
>
<div class="rewriter-container flex-col">
<div class="content-wrapper flex-col">
diff --git a/easegen-front/src/views/chooseTemplate/speakvideo.vue b/easegen-front/src/views/chooseTemplate/speakvideo.vue
index 1a336d8..8f89b10 100644
--- a/easegen-front/src/views/chooseTemplate/speakvideo.vue
+++ b/easegen-front/src/views/chooseTemplate/speakvideo.vue
@@ -564,7 +564,7 @@
@confirm="handleRewritten"
/>
<!-- 澶氶煶瀛� -->
- <el-dialog v-model="dialogVisible" title="鐐瑰嚮闇�瑕佺籂姝ｇ殑澶氶煶瀛楋紝閫夋嫨姝ｇ‘鐨勫彂闊�" width="500" @close="dialogVisible = false">
+ <el-dialog v-model="dialogVisible" title="鐐瑰嚮闇�瑕佺籂姝ｇ殑澶氶煶瀛楋紝閫夋嫨姝ｇ‘鐨勫彂闊�" width="500" @close="dialogVisible = false" :close-on-click-modal="false" >
<el-tag v-for="(item, index) in textList" :key="index" type="primary" effect="dark" style="margin-right: 10px;cursor: pointer;" @click="handleTag(item)">
{{ item }}
</el-tag>
diff --git a/easegen-front/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue b/easegen-front/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
index 077ba67..fd25349 100644
--- a/easegen-front/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
+++ b/easegen-front/src/views/mall/trade/delivery/pickUpStore/PickUpStoreForm.vue
@@ -106,7 +106,7 @@
<el-button @click="submitForm" type="primary" :disabled="formLoading">纭� 瀹�</el-button>
<el-button @click="dialogVisible = false">鍙� 娑�</el-button>
</template>
- <el-dialog v-model="mapDialogVisible" title="鑾峰彇缁忕含搴�" append-to-body>
+ <el-dialog v-model="mapDialogVisible" title="鑾峰彇缁忕含搴�" append-to-body :close-on-click-modal="false" >
<IFrame class="h-609px" :src="tencentLbsUrl" />
</el-dialog>
</Dialog>
diff --git a/easegen-front/src/views/mp/autoReply/index.vue b/easegen-front/src/views/mp/autoReply/index.vue
index 0b00647..e13eec1 100644
--- a/easegen-front/src/views/mp/autoReply/index.vue
+++ b/easegen-front/src/views/mp/autoReply/index.vue
@@ -58,6 +58,7 @@
v-model="showDialog"
width="800px"
destroy-on-close
+ :close-on-click-modal="false"
>
<ReplyForm v-model="replyForm" v-model:reply="reply" :msg-type="msgType" ref="formRef" />
<template #footer>
diff --git a/easegen-front/src/views/mp/components/wx-reply/components/TabImage.vue b/easegen-front/src/views/mp/components/wx-reply/components/TabImage.vue
index 6dbfeed..eafef67 100644
--- a/easegen-front/src/views/mp/components/wx-reply/components/TabImage.vue
+++ b/easegen-front/src/views/mp/components/wx-reply/components/TabImage.vue
@@ -23,6 +23,7 @@
width="90%"
append-to-body
destroy-on-close
+ :close-on-click-modal="false"
>
<WxMaterialSelect
type="image"
diff --git a/easegen-front/src/views/mp/components/wx-reply/components/TabMusic.vue b/easegen-front/src/views/mp/components/wx-reply/components/TabMusic.vue
index 6421d24..4720562 100644
--- a/easegen-front/src/views/mp/components/wx-reply/components/TabMusic.vue
+++ b/easegen-front/src/views/mp/components/wx-reply/components/TabMusic.vue
@@ -37,6 +37,7 @@
width="80%"
append-to-body
destroy-on-close
+ :close-on-click-modal="false"
>
<WxMaterialSelect
type="image"
diff --git a/easegen-front/src/views/mp/components/wx-reply/components/TabNews.vue b/easegen-front/src/views/mp/components/wx-reply/components/TabNews.vue
index 565b1fb..2c54dc5 100644
--- a/easegen-front/src/views/mp/components/wx-reply/components/TabNews.vue
+++ b/easegen-front/src/views/mp/components/wx-reply/components/TabNews.vue
@@ -20,7 +20,7 @@
</el-col>
</el-row>
</el-col>
- <el-dialog title="閫夋嫨鍥炬枃" v-model="showDialog" width="90%" append-to-body destroy-on-close>
+ <el-dialog title="閫夋嫨鍥炬枃" v-model="showDialog" width="90%" append-to-body destroy-on-close :close-on-click-modal="false" >
<WxMaterialSelect
type="news"
:account-id="reply.accountId"
diff --git a/easegen-front/src/views/mp/components/wx-reply/components/TabVideo.vue b/easegen-front/src/views/mp/components/wx-reply/components/TabVideo.vue
index adb8fa3..3872b09 100644
--- a/easegen-front/src/views/mp/components/wx-reply/components/TabVideo.vue
+++ b/easegen-front/src/views/mp/components/wx-reply/components/TabVideo.vue
@@ -19,6 +19,7 @@
width="90%"
append-to-body
destroy-on-close
+ :close-on-click-modal="false"
>
<WxMaterialSelect
type="video"
diff --git a/easegen-front/src/views/mp/components/wx-reply/components/TabVoice.vue b/easegen-front/src/views/mp/components/wx-reply/components/TabVoice.vue
index 5dbe9a0..6c970ec 100644
--- a/easegen-front/src/views/mp/components/wx-reply/components/TabVoice.vue
+++ b/easegen-front/src/views/mp/components/wx-reply/components/TabVoice.vue
@@ -21,6 +21,7 @@
width="90%"
append-to-body
destroy-on-close
+ :close-on-click-modal="false"
>
<WxMaterialSelect
type="voice"
diff --git a/easegen-front/src/views/mp/components/wx-video-play/main.vue b/easegen-front/src/views/mp/components/wx-video-play/main.vue
index d544bbe..17e0fda 100644
--- a/easegen-front/src/views/mp/components/wx-video-play/main.vue
+++ b/easegen-front/src/views/mp/components/wx-video-play/main.vue
@@ -19,7 +19,7 @@
</div>
<!-- 寮圭獥鎾斁 -->
- <el-dialog v-model="dialogVideo" title="瑙嗛鎾斁" append-to-body>
+ <el-dialog v-model="dialogVideo" title="瑙嗛鎾斁" append-to-body :close-on-click-modal="false" >
<video-player
v-if="dialogVideo"
class="video-player vjs-big-play-centered"
diff --git a/easegen-front/src/views/mp/draft/components/CoverSelect.vue b/easegen-front/src/views/mp/draft/components/CoverSelect.vue
index 499f1a6..7b06bf7 100644
--- a/easegen-front/src/views/mp/draft/components/CoverSelect.vue
+++ b/easegen-front/src/views/mp/draft/components/CoverSelect.vue
@@ -48,6 +48,7 @@
width="80%"
append-to-body
destroy-on-close
+ :close-on-click-modal="false"
>
<WxMaterialSelect
type="image"
diff --git a/easegen-front/src/views/mp/draft/index.vue b/easegen-front/src/views/mp/draft/index.vue
index db24596..6fb2f27 100644
--- a/easegen-front/src/views/mp/draft/index.vue
+++ b/easegen-front/src/views/mp/draft/index.vue
@@ -52,6 +52,7 @@
v-model="showDialog"
:before-close="onBeforeDialogClose"
destroy-on-close
+ :close-on-click-modal="false"
>
<NewsForm v-model="newsList" v-loading="isSubmitting" :is-creating="isCreating" />
<template #footer>
diff --git a/easegen-front/src/views/mp/material/components/UploadVideo.vue b/easegen-front/src/views/mp/material/components/UploadVideo.vue
index 0eda1ce..f0f62ae 100644
--- a/easegen-front/src/views/mp/material/components/UploadVideo.vue
+++ b/easegen-front/src/views/mp/material/components/UploadVideo.vue
@@ -13,6 +13,7 @@
ref="uploadVideoRef"
:auto-upload="false"
class="mb-5"
+ :close-on-click-modal="false"
>
<template #trigger>
<el-button type="primary" plain>閫夋嫨瑙嗛</el-button>
diff --git a/easegen-front/src/views/mp/menu/components/MenuEditor.vue b/easegen-front/src/views/mp/menu/components/MenuEditor.vue
index 5df1785..1720970 100644
--- a/easegen-front/src/views/mp/menu/components/MenuEditor.vue
+++ b/easegen-front/src/views/mp/menu/components/MenuEditor.vue
@@ -92,7 +92,7 @@
</el-col>
</el-row>
</div>
- <el-dialog title="閫夋嫨鍥炬枃" v-model="showNewsDialog" width="80%" destroy-on-close>
+ <el-dialog title="閫夋嫨鍥炬枃" v-model="showNewsDialog" width="80%" destroy-on-close :close-on-click-modal="false" >
<WxMaterialSelect
type="news"
:account-id="props.accountId"
diff --git a/easegen-front/src/views/mp/message/index.vue b/easegen-front/src/views/mp/message/index.vue
index adceec5..742c122 100644
--- a/easegen-front/src/views/mp/message/index.vue
+++ b/easegen-front/src/views/mp/message/index.vue
@@ -75,6 +75,7 @@
@click="messageBox.show = true"
width="50%"
destroy-on-close
+ :close-on-click-modal="false"
>
<WxMsg :user-id="messageBox.userId" />
</el-dialog>
diff --git a/easegen-front/src/views/myCourse/index.vue b/easegen-front/src/views/myCourse/index.vue
index d60c09e..f543a8c 100644
--- a/easegen-front/src/views/myCourse/index.vue
+++ b/easegen-front/src/views/myCourse/index.vue
@@ -156,6 +156,7 @@
width="70%"
class="subtitle-dialog"
@close="pauseAllVideos('subtitle')"
+ :close-on-click-modal="false"
>
<el-tabs v-model="activeSubtitleTab">
<el-tab-pane label="瀛楀箷璁剧疆" name="setting">
@@ -279,6 +280,7 @@
title="鐗囧ご鐗囧熬"
width="70%"
@close="pauseAllVideos('headerFooter')"
+ :close-on-click-modal="false"
>
<el-tabs v-model="activeTab">
<el-tab-pane label="鍚堟垚瑙嗛" name="merge">
@@ -434,6 +436,7 @@
v-model="dialogVisible"
title="瑙嗛鍚堟垚"
width="50%"
+ :close-on-click-modal="false"
>
<el-form :model="formData1" label-width="120px">
<el-form-item label="瑙嗛鏍煎紡">
--
Gitblit v1.9.3