From ee0d657a5c116f21036bea3dadb0ce8942110d54 Mon Sep 17 00:00:00 2001
From: ldrop <ldrop>
Date: Wed, 2 Jul 2025 16:03:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9A=90=E5=BD=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messageSystem/components/addMessage.vue   | 44 +++++++++-------
 .../components/recipientSelector.vue          | 25 ++--------
 .../messageSystem/components/smallBell.vue    | 50 +++++++++++++++++++
 .../modelMessage/messageSystem/index.vue      |  2 +-
 .../components/TemplateFormDialog.vue         | 29 ++++++-----
 .../components/VariableFormDialog.vue         | 28 +++--------
 src/views/modelMessage/variable/index.vue     |  2 +-
 7 files changed, 108 insertions(+), 72 deletions(-)
 create mode 100644 src/views/modelMessage/messageSystem/components/smallBell.vue

diff --git a/src/views/modelMessage/messageSystem/components/addMessage.vue b/src/views/modelMessage/messageSystem/components/addMessage.vue
index 782e72a..b5cce8d 100644
--- a/src/views/modelMessage/messageSystem/components/addMessage.vue
+++ b/src/views/modelMessage/messageSystem/components/addMessage.vue
@@ -51,7 +51,7 @@
       </div>
 
       <!-- 收件人选择组件 -->
-      <RecipientSelector :send-mode="form.sendMode" @update:recipients="form.messageRecipient = $event" @update:contactInfo="form.code = $event" ref="recipientSelectorRef" />
+      <RecipientSelector :send-mode="form.sendMode" @update:recipients="handleRecipientsUpdate" @update:contactInfo="form.code = $event" ref="recipientSelectorRef" />
 
       <!-- 备注区域 -->
       <div class="form-section">
@@ -74,7 +74,7 @@
 </template>
 
 <script setup>
-import { ref, getCurrentInstance, watch } from 'vue';
+import { ref, getCurrentInstance, watch, nextTick } from 'vue';
 import { batchAddMessage } from '@/api/modelMessage/messageSystem';
 import { selecTemplates } from '@/api/modelMessage/template';
 import { ElMessage } from 'element-plus';
@@ -84,13 +84,11 @@ const props = defineProps({ title: { type: String, default: "发送消息" } });
 const { proxy } = getCurrentInstance();
 const { send_mode, message_type } = proxy.useDict("send_mode", "message_type");
 const emit = defineEmits(['success', 'close']);
-// Refs
 const messageSystemFormRef = ref(null);
 const recipientSelectorRef = ref(null);
 const dialogVisible = ref(false);
 const loading = ref(false);
 
-// Form Data
 const form = ref({
   messageTitle: null,
   messageContent: null,
@@ -101,8 +99,6 @@ const form = ref({
   contentType: "template",
   messageType: null
 });
-
-// 内容类型和模板相关数据
 const contentType = ref('template');
 const templates = ref([]);
 const templateLoading = ref(false);
@@ -111,17 +107,40 @@ const templateLoading = ref(false);
 const rules = ref({
   messageTitle: [{ required: true, message: '请输入标题', trigger: 'blur' }],
   sendMode: [{ required: true, message: '请选择发送方式', trigger: 'change' }],
-  messageRecipient: [{ required: true, message: '请选择收件人', trigger: 'change' }],
+  messageRecipient: [
+    {
+      required: true,
+      message: '请选择收件人',
+      trigger: 'change',
+      validator: (_, value, callback) => {
+        if (!value || (Array.isArray(value) && value.length === 0)) {
+          callback(new Error('请选择收件人'));
+        } else {
+          callback();
+        }
+      }
+    }
+  ],
   messageType: [{ required: true, message: '请选择消息类型', trigger: 'change' }],
   messageContent: [{ required: true, message: '模版签名或消息内容不能为空', trigger: 'blur' }]
 });
 
 // 处理发送方式改变
 function handleSendModeChange() {
-  // 清空联系方式，子组件会自动处理数据更新
   form.value.code = '';
 }
 
+// 处理收件人更新
+function handleRecipientsUpdate(recipients) {
+  form.value.messageRecipient = recipients;
+  // 手动触发表单验证
+  nextTick(() => {
+    if (messageSystemFormRef.value) {
+      messageSystemFormRef.value.validateField('messageRecipient');
+    }
+  });
+}
+
 // 获取模板列表
 async function getTemplates() {
   try {
@@ -177,9 +196,7 @@ watch(() => form.value.sendMode, () => {
 async function submitForm() {
   loading.value = true;
   try {
-    // 表单验证
     await messageSystemFormRef.value.validate();
-    
     // 验证消息内容格式
     const contentValidation = validateMessageContent(form.value.messageContent);
     if (contentValidation !== true) {
@@ -202,15 +219,12 @@ async function submitForm() {
             recipient.name,
       sendMode: form.value.sendMode
     }));
-
-    // 发送消息
     await batchAddMessage(messages);
     ElMessage.success("消息发送成功！");
     emit('success');
     toggleDialog();
   } catch (error) {
     console.error('Submit form error:', error);
-    ElMessage.error('发送信息失败: ' + (error.message || '未知错误'));
   } finally {
     loading.value = false;
   }
@@ -228,10 +242,7 @@ function reset() {
     contentType: "template",
     messageType: null
   };
-  
   contentType.value = 'template';
-
-  // 重置子组件
   if (recipientSelectorRef.value) {
     recipientSelectorRef.value.reset();
   }
@@ -247,7 +258,6 @@ function toggleDialog() {
   }
 }
 
-// 暴露方法给父组件
 defineExpose({
   open: () => {
     dialogVisible.value = true;
diff --git a/src/views/modelMessage/messageSystem/components/recipientSelector.vue b/src/views/modelMessage/messageSystem/components/recipientSelector.vue
index 955874e..bae4976 100644
--- a/src/views/modelMessage/messageSystem/components/recipientSelector.vue
+++ b/src/views/modelMessage/messageSystem/components/recipientSelector.vue
@@ -50,26 +50,19 @@ import { ref, computed, watch } from 'vue';
 import { getSystemResource } from '@/api/modelMessage/messageSystem';
 import { ElMessage } from 'element-plus';
 
-// Props
 const props = defineProps({
   sendMode: {
     type: String,
     default: ''
   }
 });
-
-// Emits
 const emit = defineEmits(['update:recipients', 'update:contactInfo']);
-
-// 响应式数据
 const recipientType = ref('');
 const selectedRecipients = ref([]);
 const users = ref([]);
 const roles = ref([]);
 const depts = ref([]);
 const contactInfo = ref('');
-
-// 计算属性
 const recipientTypes = computed(() => [
   { value: 'user', label: '用户' },
   { value: 'role', label: '角色' },
@@ -159,22 +152,14 @@ function buildTree(depts) {
   return root;
 }
 
-// 处理收件人类型变化
+const handlers = { user: getUsers, role: getRoles, dept: getDepts};
+
+// 处理收件人选择
 async function handleTypeChange() {
   selectedRecipients.value = [];
   contactInfo.value = '';
-  
-  switch (recipientType.value) {
-    case 'user':
-      await getUsers();
-      break;
-    case 'role':
-      await getRoles();
-      break;
-    case 'dept':
-      await getDepts();
-      break;
-  }
+  const handler = handlers[recipientType.value];
+  if (handler) await handler();
 }
 
 // 处理选择变化
diff --git a/src/views/modelMessage/messageSystem/components/smallBell.vue b/src/views/modelMessage/messageSystem/components/smallBell.vue
new file mode 100644
index 0000000..e27bdbe
--- /dev/null
+++ b/src/views/modelMessage/messageSystem/components/smallBell.vue
@@ -0,0 +1,50 @@
+<template>
+  <el-popover v-model="showPopover" placement="bottom-start" width="200" trigger="hover">
+    <template #reference>
+      <el-button type="text" @mouseover="fetchLatestMessages" @mouseout="hidePopover">
+        <el-icon size="20">
+          <Bell />
+        </el-icon>
+      </el-button>
+    </template>
+    <div v-if="latestNotifications.length > 0">
+      <h4>信息中心</h4>
+      <ul>
+        <li v-for="(item, index) in latestNotifications" :key="index" @click="viewDetails(item)">
+          {{ item.messageTitle }}
+        </li>
+      </ul>
+    </div>
+    <div v-else>
+      暂无信息
+    </div>
+  </el-popover>
+</template>
+
+<script setup name="SmallBell">
+import { ref, getCurrentInstance } from 'vue';
+import { listMessageSystem } from "@/api/modelMessage/messageSystem";
+
+const { proxy } = getCurrentInstance();
+const showPopover = ref(false);
+const latestNotifications = ref([]);
+
+async function fetchLatestMessages() {
+  try {
+    const response = await listMessageSystem()
+    latestNotifications.value = response.rows.slice(0, 5);
+  } catch (error) {
+    console.error('获取信息失败:', error);
+  }
+}
+
+function viewDetails(item) {
+  proxy.$emit('view-details', item);
+}
+
+function hidePopover() {
+  showPopover.value = false;
+}
+
+defineExpose({ fetchLatestMessages });
+</script>
diff --git a/src/views/modelMessage/messageSystem/index.vue b/src/views/modelMessage/messageSystem/index.vue
index 25e7f31..79c4388 100644
--- a/src/views/modelMessage/messageSystem/index.vue
+++ b/src/views/modelMessage/messageSystem/index.vue
@@ -105,7 +105,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="创建时间">
+            <el-form-item label="发送时间">
               <span>{{ parseTime(detailForm.createTime) }}</span>
             </el-form-item>
           </el-col>
diff --git a/src/views/modelMessage/template/components/TemplateFormDialog.vue b/src/views/modelMessage/template/components/TemplateFormDialog.vue
index a720206..2d0d655 100644
--- a/src/views/modelMessage/template/components/TemplateFormDialog.vue
+++ b/src/views/modelMessage/template/components/TemplateFormDialog.vue
@@ -65,7 +65,6 @@ import { ref, reactive, toRefs, getCurrentInstance, watch } from 'vue';
 const { proxy } = getCurrentInstance();
 const { template_type } = proxy.useDict("template_type");
 
-// Props
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -85,10 +84,8 @@ const props = defineProps({
   }
 });
 
-// Emits
 const emit = defineEmits(['update:visible', 'submit', 'cancel']);
 
-// Data
 const templateRef = ref(null);
 const data = reactive({
   form: { templateContent: '' },
@@ -103,14 +100,12 @@ const data = reactive({
 
 const { form, rules } = toRefs(data);
 
-// Watch props changes
 watch(() => props.formData, (newVal) => {
   if (newVal) {
     form.value = { ...newVal };
   }
 }, { deep: true, immediate: true });
 
-// Methods
 function validateTemplateCode(_, value, callback) {
   if (!value) {
     callback(new Error('请输入模版CODE'));
@@ -128,23 +123,35 @@ function handleVariableChange(value) {
     form.value.templateContent = '';
   }
 
-  // 移除未选中的变量占位符
-  const currentPlaceholders = form.value.templateContent.match(/\$\{\w+\}/g) || [];
+  // 获取当前模板内容中的所有 ${变量名} 格式的占位符
+  const currentPlaceholders = form.value.templateContent.match(/\$\{[^}]+\}/g) || [];
   const selectedVariableNames = value.map(v => `\${${v}}`);
+
+  // 移除未选中的变量占位符
   currentPlaceholders.forEach(placeholder => {
     if (!selectedVariableNames.includes(placeholder)) {
-      form.value.templateContent = form.value.templateContent.replace(placeholder, '').trim();
+      // 使用全局替换，移除所有匹配的占位符及其前后空格
+      const escapedPlaceholder = placeholder.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+      const regex = new RegExp('\\s*' + escapedPlaceholder + '\\s*', 'g');
+      form.value.templateContent = form.value.templateContent.replace(regex, ' ');
     }
   });
 
-  // 添加新选中的变量占位符
+  // 添加新选中的变量占位符（只添加最后一个新选择的变量）
   const lastSelectedVariableName = value[value.length - 1];
   if (lastSelectedVariableName) {
     const variablePlaceholder = `\${${lastSelectedVariableName}}`;
     if (!form.value.templateContent.includes(variablePlaceholder)) {
-      form.value.templateContent += ` ${variablePlaceholder}`;
+      // 在模板内容末尾添加新变量
+      if (form.value.templateContent.trim()) {
+        form.value.templateContent = form.value.templateContent.trim() + ` ${variablePlaceholder}`;
+      } else {
+        form.value.templateContent = variablePlaceholder;
+      }
     }
   }
+
+  // 清理多余的空格
   form.value.templateContent = form.value.templateContent.replace(/\s+/g, ' ').trim();
 }
 
@@ -160,7 +167,6 @@ function handleCancel() {
   emit('cancel');
 }
 
-// Reset form
 function resetForm() {
   form.value = {
     templateId: null, templateName: null, templateCode: null, templateType: null, templateContent: '',
@@ -171,7 +177,6 @@ function resetForm() {
   }
 }
 
-// Expose methods
 defineExpose({
   resetForm
 });
diff --git a/src/views/modelMessage/variable/components/VariableFormDialog.vue b/src/views/modelMessage/variable/components/VariableFormDialog.vue
index f0f9b19..7aed860 100644
--- a/src/views/modelMessage/variable/components/VariableFormDialog.vue
+++ b/src/views/modelMessage/variable/components/VariableFormDialog.vue
@@ -25,13 +25,13 @@
           <el-form-item label="内置变量" prop="variableContent">
             <el-select v-model="form.variableContent" placeholder="请选择内置变量" style="width: 100%">
               <el-option
-                v-for="(item, key) in builtInVariableOptions"
+                v-for="(label, key) in builtInVariableOptions"
                 :key="key"
-                :label="item.label"
+                :label="label"
                 :value="key"
               >
-                <span style="float: left">{{ item.label }}</span>
-                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.description }}</span>
+                <span style="float: left">{{ label }}</span>
+                <span style="float: right; color: #8492a6; font-size: 13px">{{ key }}</span>
               </el-option>
             </el-select>
           </el-form-item>
@@ -71,7 +71,6 @@
 <script setup name="VariableFormDialog">
 import { ref } from 'vue'
 
-// Props
 const props = defineProps({
   visible: {
     type: Boolean,
@@ -90,20 +89,14 @@ const props = defineProps({
     default: false
   }
 })
-
-// Emits
 const emit = defineEmits(['update:visible', 'submit', 'cancel', 'variable-type-change'])
-
-// Refs
 const variableRef = ref(null)
-
-// 表单验证规则
 const rules = {
   variableName: [{ required: true, message: '请输入变量名称', trigger: 'blur' }],
   variableType: [{ required: true, message: '请选择变量类型', trigger: 'change' }]
 }
 
-// 内置变量的显示文本配置（简化版）
+// 内置变量的显示文本配置
 const builtInVariableLabels = {
   'time': '发送时间',
   'date': '发送日期',
@@ -115,13 +108,8 @@ const builtInVariableLabels = {
   'RandomNDigitLetters': '随机数字+字母'
 }
 
-// 将 labels 转换为 options 数组用于下拉选择器
-const builtInVariableOptions = Object.entries(builtInVariableLabels).map(([value, label]) => ({
-  value,
-  label
-}))
-
-// 方法
+// 将 labels 转换为 options 对象用于下拉选择器
+const builtInVariableOptions = builtInVariableLabels
 const handleVariableTypeChange = (value) => {
   emit('variable-type-change', value)
 }
@@ -131,7 +119,6 @@ const handleCancel = () => {
 }
 
 const handleSubmit = () => {
-  // 在子组件内部进行表单验证
   variableRef.value.validate((valid) => {
     if (valid) {
       emit('submit')
@@ -139,7 +126,6 @@ const handleSubmit = () => {
   })
 }
 
-// 暴露给父组件的方法
 defineExpose({
   variableRef
 })
diff --git a/src/views/modelMessage/variable/index.vue b/src/views/modelMessage/variable/index.vue
index c24ec14..8f65a70 100644
--- a/src/views/modelMessage/variable/index.vue
+++ b/src/views/modelMessage/variable/index.vue
@@ -79,7 +79,7 @@ const single = ref(true);
 const multiple = ref(true);
 const total = ref(0);
 const title = ref("");
-const submitLoading = ref(false); // 新增: 提交按钮加载状态
+const submitLoading = ref(false);
 
 const data = reactive({
   form: {
-- 
Gitee


From 6e38af2814f767f747a6e19b10725c31dc74efe6 Mon Sep 17 00:00:00 2001
From: ldrop <ldrop>
Date: Wed, 2 Jul 2025 16:04:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messageSystem/components/smallBell.vue    | 50 -------------------
 1 file changed, 50 deletions(-)
 delete mode 100644 src/views/modelMessage/messageSystem/components/smallBell.vue

diff --git a/src/views/modelMessage/messageSystem/components/smallBell.vue b/src/views/modelMessage/messageSystem/components/smallBell.vue
deleted file mode 100644
index e27bdbe..0000000
--- a/src/views/modelMessage/messageSystem/components/smallBell.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-  <el-popover v-model="showPopover" placement="bottom-start" width="200" trigger="hover">
-    <template #reference>
-      <el-button type="text" @mouseover="fetchLatestMessages" @mouseout="hidePopover">
-        <el-icon size="20">
-          <Bell />
-        </el-icon>
-      </el-button>
-    </template>
-    <div v-if="latestNotifications.length > 0">
-      <h4>信息中心</h4>
-      <ul>
-        <li v-for="(item, index) in latestNotifications" :key="index" @click="viewDetails(item)">
-          {{ item.messageTitle }}
-        </li>
-      </ul>
-    </div>
-    <div v-else>
-      暂无信息
-    </div>
-  </el-popover>
-</template>
-
-<script setup name="SmallBell">
-import { ref, getCurrentInstance } from 'vue';
-import { listMessageSystem } from "@/api/modelMessage/messageSystem";
-
-const { proxy } = getCurrentInstance();
-const showPopover = ref(false);
-const latestNotifications = ref([]);
-
-async function fetchLatestMessages() {
-  try {
-    const response = await listMessageSystem()
-    latestNotifications.value = response.rows.slice(0, 5);
-  } catch (error) {
-    console.error('获取信息失败:', error);
-  }
-}
-
-function viewDetails(item) {
-  proxy.$emit('view-details', item);
-}
-
-function hidePopover() {
-  showPopover.value = false;
-}
-
-defineExpose({ fetchLatestMessages });
-</script>
-- 
Gitee