From 52254e8b58b7e8bf3b0ee75639ed08b4adb0011a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 8 Nov 2023 14:46:53 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=96=87=E6=9C=AC=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A6=96=E9=A1=B9=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/frontend/src/components/elVisualSelect/index.vue  |  2 +-
 .../src/components/widget/deWidget/DeSelect.vue        | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/frontend/src/components/elVisualSelect/index.vue b/core/frontend/src/components/elVisualSelect/index.vue
index 31ee58e20d..9778792549 100644
--- a/core/frontend/src/components/elVisualSelect/index.vue
+++ b/core/frontend/src/components/elVisualSelect/index.vue
@@ -14,7 +14,7 @@
     @visible-change="popChange"
   >
     <p
-      v-if="startIndex === 0 && $attrs.multiple"
+      v-if="startIndex === 0 && $attrs.multiple && !itemDisabled"
       class="select-all"
     >
       <el-checkbox
diff --git a/core/frontend/src/components/widget/deWidget/DeSelect.vue b/core/frontend/src/components/widget/deWidget/DeSelect.vue
index e01b735f2d..fa5cddcb81 100644
--- a/core/frontend/src/components/widget/deWidget/DeSelect.vue
+++ b/core/frontend/src/components/widget/deWidget/DeSelect.vue
@@ -11,11 +11,12 @@
     :placeholder="$t(element.options.attrs.placeholder) + placeholderSuffix"
     :popper-append-to-body="inScreen"
     :size="size"
-    :filterable="true"
+    :filterable="inDraw || !selectFirst"
     :filter-method="filterMethod"
     :item-disabled="!inDraw && selectFirst"
     :key-word="keyWord"
     popper-class="coustom-de-select"
+    :class="{'disabled-close': !inDraw && selectFirst && element.options.attrs.multiple}"
     :list="data"
     :is-config="isConfig"
     :custom-style="customStyle"
@@ -467,7 +468,14 @@ export default {
 }
 </script>
 
+<style lang="scss" scoped>
+  .disabled-close ::v-deep .el-icon-close {
+    display: none !important;
+  }
+</style>
 <style lang="scss">
+
+
 .coustom-de-select {
   background-color: var(--BgSelectColor, #FFFFFF) !important;
   border-color: var(--BrSelectColor, #E4E7ED) !important;