From b7cc4fb45e6b9957e1901a69a6b13b758ff4baad Mon Sep 17 00:00:00 2001
From: baiqi <qi.bai@fit2cloud.com>
Date: Wed, 18 Oct 2023 13:41:13 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86&?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=85=8D=E7=BD=AE):=20=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E7=89=88=E6=94=AF=E6=8C=81=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C&=E7=95=8C=E9=9D=A2=E9=85=8D=E7=BD=AE=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=9B=BA=E5=AE=9A=E6=AF=94=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/ms-card-list/index.vue           |  4 +--
 .../src/components/business/ms-tree/index.vue |  2 ++
 .../src/components/business/ms-tree/types.ts  |  1 +
 .../src/views/login/components/banner.vue     |  2 +-
 .../components/messageList.vue                |  4 ++-
 .../components/messagePreview.vue             | 26 ++++++++++---------
 .../messageManagement/locale/en-US.ts         |  1 +
 .../messageManagement/locale/zh-CN.ts         |  1 +
 8 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/business/ms-card-list/index.vue b/frontend/src/components/business/ms-card-list/index.vue
index edca5dd96b..ad6b7cb200 100644
--- a/frontend/src/components/business/ms-card-list/index.vue
+++ b/frontend/src/components/business/ms-card-list/index.vue
@@ -34,7 +34,7 @@
 
   import useContainerShadow from '@/hooks/useContainerShadow';
 
-  import type { CommonList, TableQueryParams } from '@/models/common';
+  import type { CommonList } from '@/models/common';
 
   const props = withDefaults(
     defineProps<{
@@ -43,10 +43,10 @@
       cardMinWidth: number; // 卡片最小宽度px
       shadowLimit: number; // 滚动距离高度，用于计算顶部底部阴影
       remoteParams?: Record<string, any>; // 远程数据模式下，请求数据的参数
-      remoteFunc?: (v: TableQueryParams) => Promise<CommonList<any>>; // 远程数据模式下，请求数据的函数
       gap?: number; // 卡片之间的间距
       isProportional?: boolean; // 是否等比正方形
       paddingBottomSpace?: string; // 是否存在底部的间距
+      remoteFunc?: (v: any) => Promise<CommonList<any>>; // 远程数据模式下，请求数据的函数
     }>(),
     {
       mode: 'static',
diff --git a/frontend/src/components/business/ms-tree/index.vue b/frontend/src/components/business/ms-tree/index.vue
index 3c4e061d6f..c0400b69ff 100644
--- a/frontend/src/components/business/ms-tree/index.vue
+++ b/frontend/src/components/business/ms-tree/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div ref="treeContainerRef" :class="['ms-tree-container', containerStatusClass]">
     <a-tree
+      v-show="treeData.length > 0"
       v-bind="props"
       ref="treeRef"
       v-model:expanded-keys="expandedKeys"
@@ -16,6 +17,7 @@
       </template>
       <template v-if="$slots['extra']" #extra="_props">
         <div
+          v-if="_props.hideMoreAction !== true"
           :class="[
             'ms-tree-node-extra',
             innerFocusNodeKey === _props[props.fieldNames.key] ? 'ms-tree-node-extra--focus' : '',
diff --git a/frontend/src/components/business/ms-tree/types.ts b/frontend/src/components/business/ms-tree/types.ts
index a090ca38b1..16bf721ce6 100644
--- a/frontend/src/components/business/ms-tree/types.ts
+++ b/frontend/src/components/business/ms-tree/types.ts
@@ -9,6 +9,7 @@ export interface MsTreeFieldNames extends TreeFieldNames {
 }
 
 export type MsTreeNodeData = {
+  hideMoreAction?: boolean; // 隐藏更多操作
   [key: string]: any;
 } & TreeNodeData;
 
diff --git a/frontend/src/views/login/components/banner.vue b/frontend/src/views/login/components/banner.vue
index 95a93e138c..04ce38966b 100644
--- a/frontend/src/views/login/components/banner.vue
+++ b/frontend/src/views/login/components/banner.vue
@@ -24,7 +24,7 @@
     width: 55%;
     .img {
       width: 100%;
-      object-fit: cover;
+      object-fit: fill;
     }
   }
 </style>
diff --git a/frontend/src/views/project-management/messageManagement/components/messageList.vue b/frontend/src/views/project-management/messageManagement/components/messageList.vue
index 9619bde60f..56d237d4dd 100644
--- a/frontend/src/views/project-management/messageManagement/components/messageList.vue
+++ b/frontend/src/views/project-management/messageManagement/components/messageList.vue
@@ -8,6 +8,7 @@
             v-model:model-value="robotFilters"
             :options="robotOptions"
             :allow-search="false"
+            allow-clear
             class="mr-[8px] w-[240px]"
             :prefix="t('project.messageManagement.robot')"
             value-key="id"
@@ -62,6 +63,7 @@
             :options="defaultReceivers"
             :search-keys="['label']"
             allow-search
+            allow-clear
             value-key="id"
             label-key="name"
             :multiple="true"
@@ -365,7 +367,7 @@
         enable: val, // 消息配置是否启用
       });
       Message.success(
-        t('project.messageManagement.enableRobotSuccess', {
+        t(val ? 'project.messageManagement.enableRobotSuccess' : 'project.messageManagement.disableRobotSuccess', {
           name: `${record.functionName}-${record.eventName}-${record.projectRobotConfigMap?.[dataIndex].robotName}`,
         })
       );
diff --git a/frontend/src/views/project-management/messageManagement/components/messagePreview.vue b/frontend/src/views/project-management/messageManagement/components/messagePreview.vue
index 47e2699c15..ac86c303e3 100644
--- a/frontend/src/views/project-management/messageManagement/components/messagePreview.vue
+++ b/frontend/src/views/project-management/messageManagement/components/messagePreview.vue
@@ -194,22 +194,24 @@
   // 使用正则表达式替换 ${variableName} 格式的字符串内的变量名为变量描述
   function replaceVariableStr(str: string, fields: Field[], isSubject = false) {
     const regex = /\$\{([^}]+)\}/g;
-    return str.replace(regex, (match, variableName) => {
-      // 在数组中查找匹配的 variableName，并返回其 name 属性
-      const variable = fields.find((v) => v.id === variableName);
-      if (variableName === 'name' && !isSubject) {
-        return variable ? `<span style='color: rgb(var(--primary-6))'><${variable.name}></span>` : match;
-      }
-      if (isSubject) {
-        return variable ? variable.name : match;
-      }
-      return variable ? `<${variable.name}>` : match;
-    });
+    return str
+      .replace(regex, (match, variableName) => {
+        // 在数组中查找匹配的 variableName，并返回其 name 属性
+        const variable = fields.find((v) => v.id === variableName);
+        if (variableName === 'name' && !isSubject) {
+          return variable ? `<span style='color: rgb(var(--primary-6))'><${variable.name}></span>` : match;
+        }
+        if (isSubject) {
+          return variable ? variable.name : match;
+        }
+        return variable ? `<${variable.name}>` : match;
+      })
+      .replace(/\n/g, '<br>');
   }
 
   // 使用正则表达式替换 {{name}} 为高亮的关键字
   function replacePreviewName(str: string) {
-    return str.replace(/{{(.*?)}}/g, `<span style='color: rgb(var(--primary-6))'><$1></span>`);
+    return str.replace(/{{(.*?)}}/g, `<span style='color: rgb(var(--primary-6))'><$1></span>`).replace(/\n/g, '<br>');
   }
 
   const subject = computed(() => {
diff --git a/frontend/src/views/project-management/messageManagement/locale/en-US.ts b/frontend/src/views/project-management/messageManagement/locale/en-US.ts
index f0edbd081c..a98a26d473 100644
--- a/frontend/src/views/project-management/messageManagement/locale/en-US.ts
+++ b/frontend/src/views/project-management/messageManagement/locale/en-US.ts
@@ -94,6 +94,7 @@ export default {
   'project.messageManagement.desc': 'Description',
   'project.messageManagement.saveSuccess': 'Template saved successfully',
   'project.messageManagement.enableRobotSuccess': '{name} is enabled',
+  'project.messageManagement.disableRobotSuccess': '{name} is disabled',
   'project.messageManagement.saveReceiverSuccess': 'Recipient modified successfully',
   'project.messageManagement.unsetReceiverTip': 'Please set up message recipients before enabling the robot',
   'project.messageManagement.receiverNotNull': 'Please set at least one message recipient',
diff --git a/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts b/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts
index 6ffb7f041b..8357a198dc 100644
--- a/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts
+++ b/frontend/src/views/project-management/messageManagement/locale/zh-CN.ts
@@ -86,6 +86,7 @@ export default {
   'project.messageManagement.desc': '描述',
   'project.messageManagement.saveSuccess': '模版保存成功',
   'project.messageManagement.enableRobotSuccess': '{name} 已启用',
+  'project.messageManagement.disableRobotSuccess': '{name} 已禁用',
   'project.messageManagement.saveReceiverSuccess': '接收人修改成功',
   'project.messageManagement.unsetReceiverTip': '启用机器人前请先设置消息接收人',
   'project.messageManagement.receiverNotNull': '请最少设置一位消息接收人',