diff --git a/ui/src/assets/icon_and.svg b/ui/src/assets/icon_and.svg
new file mode 100644
index 000000000..9c4842bff
--- /dev/null
+++ b/ui/src/assets/icon_and.svg
@@ -0,0 +1,6 @@
+<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.6667 3.33329H3.33335V16.6666H16.6667V3.33329ZM3.33335 1.66663C2.41288 1.66663 1.66669 2.41282 1.66669 3.33329V16.6666C1.66669 17.5871 2.41288 18.3333 3.33335 18.3333H16.6667C17.5872 18.3333 18.3334 17.5871 18.3334 16.6666V3.33329C18.3334 2.41282 17.5872 1.66663 16.6667 1.66663H3.33335Z" fill="#646A73"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.33 5.83667H15.2233V13.95H13.33V5.83667Z" fill="#646A73"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M10.83 5.83667H12.7233V13.95H10.83V5.83667Z" fill="#646A73"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.51665 13.7165V13.95H10.33V10.2333C10.33 9.53587 10.1523 8.93943 9.747 8.50803L9.7458 8.50675C9.27726 8.01218 8.58554 7.80664 7.76332 7.80664C7.08671 7.80664 6.47894 7.92104 6.00606 8.21772C5.45355 8.54628 5.11381 9.07452 4.98446 9.733L4.89493 10.1888L6.10828 10.2928C5.95695 10.3597 5.8157 10.4386 5.68578 10.5309C5.1067 10.9233 4.81665 11.5057 4.81665 12.2133C4.81665 12.7602 5.02656 13.2281 5.45194 13.5796C5.84831 13.9324 6.37585 14.09 6.98332 14.09C7.49851 14.09 7.95994 13.9889 8.36073 13.8003L8.36966 13.796C8.41982 13.7709 8.46882 13.7444 8.51665 13.7165ZM6.83361 10.0734C7.10234 10.0223 7.38998 9.99474 7.69236 9.98678L8.43243 9.96764C8.40662 9.80751 8.3491 9.71569 8.2882 9.65948C8.19958 9.57767 8.027 9.49997 7.69332 9.49997C7.40772 9.49997 7.22064 9.55283 7.10769 9.6206L7.10328 9.62324C6.96993 9.70103 6.88847 9.80826 6.85134 9.98773L6.83361 10.0734ZM8.43782 11.5718L7.78478 11.5898L7.78191 11.5899C7.33203 11.5992 7.0658 11.6834 6.9222 11.7831C6.8054 11.8642 6.73998 11.9741 6.73998 12.1733C6.73998 12.2369 6.75413 12.277 6.82642 12.3323L6.8313 12.3361L6.83606 12.3399C6.90443 12.3955 7.02395 12.4466 7.22332 12.4466C7.57815 12.4466 7.86218 12.3394 8.10462 12.1349C8.30129 11.9689 8.40794 11.7831 8.43782 11.5718Z" fill="#646A73"/>
+</svg>
diff --git a/ui/src/assets/icon_or.svg b/ui/src/assets/icon_or.svg
new file mode 100644
index 000000000..d38f01472
--- /dev/null
+++ b/ui/src/assets/icon_or.svg
@@ -0,0 +1,6 @@
+<svg width="27" height="20" viewBox="0 0 27 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.6667 3.33329H3.66667V16.6666H23.6667V3.33329ZM3.66667 1.66663C2.74619 1.66663 2 2.41282 2 3.33329V16.6666C2 17.5871 2.74619 18.3333 3.66667 18.3333H23.6667C24.5871 18.3333 25.3333 17.5871 25.3333 16.6666V3.33329C25.3333 2.41282 24.5871 1.66663 23.6667 1.66663H3.66667Z" fill="#646A73"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.2196 6.91331H18.2767L19.4 9.89549L20.4758 6.91331L22.5375 6.83044L19.4 14.8138L17.3565 14.8966L18.437 12.3756L16.2196 6.91331Z" fill="#646A73"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.1034 7.06327C13.1302 7.04839 13.1574 7.03404 13.1848 7.02023C13.5166 6.84295 13.8759 6.77344 14.2468 6.77344C14.9611 6.77344 15.5729 6.97047 15.9992 7.43635C16.419 7.89521 16.5934 8.54454 16.5934 9.3101V12.9168H14.7001V9.4001C14.7001 9.01738 14.6103 8.80651 14.5052 8.69229C14.4059 8.58445 14.2319 8.49677 13.9067 8.49677C13.7078 8.49677 13.5468 8.55932 13.4114 8.69473C13.2534 8.85274 13.1382 9.08146 13.1034 9.41091V12.9168H11.2101V6.91344H13.1034V7.06327Z" fill="#646A73"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.01665 12.6833V12.9168H10.83V9.2001C10.83 8.50266 10.6523 7.90623 10.247 7.47482L10.2458 7.47354C9.77726 6.97898 9.08554 6.77344 8.26332 6.77344C7.58671 6.77344 6.97894 6.88784 6.50606 7.18452C5.95355 7.51308 5.61381 8.04132 5.48446 8.69979L5.39493 9.15558L6.60828 9.25958C6.45695 9.32645 6.3157 9.40545 6.18578 9.49774C5.6067 9.89006 5.31665 10.4724 5.31665 11.1801C5.31665 11.727 5.52656 12.1949 5.95194 12.5464C6.34831 12.8992 6.87585 13.0568 7.48332 13.0568C7.99851 13.0568 8.45994 12.9557 8.86073 12.7671L8.86966 12.7628C8.91982 12.7377 8.96882 12.7112 9.01665 12.6833ZM7.33362 9.04021C7.60234 8.98907 7.88998 8.96154 8.19236 8.95358L8.93243 8.93444C8.90662 8.77431 8.84911 8.68249 8.7882 8.62627C8.69958 8.54447 8.527 8.46677 8.19332 8.46677C7.90772 8.46677 7.72064 8.51963 7.60769 8.58739L7.60328 8.59004C7.46993 8.66783 7.38847 8.77506 7.35134 8.95452L7.33362 9.04021ZM8.93782 10.5386L8.28478 10.5566L8.28191 10.5567C7.83203 10.566 7.5658 10.6502 7.4222 10.7499C7.3054 10.831 7.23998 10.9409 7.23998 11.1401C7.23998 11.2037 7.25413 11.2438 7.32642 11.2991L7.3313 11.3029L7.33606 11.3067C7.40443 11.3623 7.52395 11.4134 7.72332 11.4134C8.07815 11.4134 8.36218 11.3062 8.60462 11.1017C8.80129 10.9357 8.90794 10.7499 8.93782 10.5386Z" fill="#646A73"/>
+</svg>
diff --git a/ui/src/views/application-workflow/component/DropdownMenu.vue b/ui/src/views/application-workflow/component/DropdownMenu.vue
index 60a626e42..4b041712f 100644
--- a/ui/src/views/application-workflow/component/DropdownMenu.vue
+++ b/ui/src/views/application-workflow/component/DropdownMenu.vue
@@ -80,9 +80,9 @@
                   :item="item"
                 />
                 <div class="pre-wrap" style="width: 60%">
-                  <auto-tooltip :content="item.name" style="width: 80%" class="lighter">
+                  <div class="lighter ellipsis" :title="item.name">
                     {{ item.name }}
-                  </auto-tooltip>
+                  </div>
                   <el-text type="info" size="small" style="width: 80%">{{ item.desc }}</el-text>
                 </div>
                 <div class="status-tag" style="margin-left: auto">
diff --git a/ui/src/workflow/common/NodeContainer.vue b/ui/src/workflow/common/NodeContainer.vue
index 65bdc95c8..15f7ea58c 100644
--- a/ui/src/workflow/common/NodeContainer.vue
+++ b/ui/src/workflow/common/NodeContainer.vue
@@ -32,7 +32,7 @@
           </div>
 
           <div @mousemove.stop @mousedown.stop @keydown.stop @click.stop>
-            <el-button text @click="showNode = !showNode" class="mr-4">
+            <el-button text @click="showNode = !showNode">
               <el-icon class="arrow-icon color-secondary" :class="showNode ? 'rotate-180' : ''"
                 ><ArrowDownBold />
               </el-icon>
@@ -43,7 +43,10 @@
               trigger="click"
               placement="bottom-start"
             >
-              <el-button text>{{ condition }}</el-button>
+              <el-button text>
+                <img src="@/assets/icon_or.svg" alt="" v-if="condition==='OR'">
+                <img src="@/assets/icon_and.svg" alt="" v-if="condition==='AND'">
+              </el-button>
               <template #dropdown>
                 <div style="width: 280px" class="p-12-16">
                   <h5>执行条件</h5>