From 53ab122715384cf672174f4241defd11b2a0b8d9 Mon Sep 17 00:00:00 2001
From: lizijiee <562949697@qq.com>
Date: Sat, 23 Mar 2024 18:27:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=202568=20=E3=80=90AI=E4=B8=80=E9=94=AE?=
 =?UTF-8?q?=E6=9F=A5=E9=87=8D--=E8=87=AA=E5=AE=9A=E4=B9=89=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E3=80=91=E5=8F=B3=E4=BE=A7=E6=B7=BB=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E5=90=8E=EF=BC=8C=E5=AF=B9=E5=85=B6?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8B=96=E5=8A=A8=EF=BC=8C=E6=8B=96=E5=8A=A8?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=E5=90=8E=E6=97=A0=E6=B3=95=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E6=8B=96=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aside/comp/modals/CustomFilterModal.vue   | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/home/aside/comp/modals/CustomFilterModal.vue b/src/views/home/aside/comp/modals/CustomFilterModal.vue
index 1084bb1..6728098 100644
--- a/src/views/home/aside/comp/modals/CustomFilterModal.vue
+++ b/src/views/home/aside/comp/modals/CustomFilterModal.vue
@@ -275,6 +275,12 @@ async function getfield() {
   const userInfo = userStore.getUserInfo;
   res = await getfieldList(3, userInfo.id)
 }
+function onMove(e) {
+  // 这里的e表示即将停靠的元素。
+  if (e?.related?.className?.indexOf('fix') !== -1) {
+    return false;
+  }
+}
 
 onMounted(() => {
   getfield();
@@ -342,18 +348,14 @@ onMounted(() => {
                   </template>
                 </n-input>
                 <n-scrollbar style="max-height: 500px;border: 1px solid #cad2dd;border-radius: 2px;" class="scroll">
-                  <!-- filter=".draggable-li[draggable='false']" -->
-                  <VueDraggable v-model="onList"  class="draggable-ul" :animation="150" group="shared">
-                    <div
-                      v-for="item in onList" v-show="item.name.includes(onKeyword)" :key="item.id" :draggable="!item.fix" :class="{ fix: item.fix }"
-                      class="cursor-move draggable-li"
-                    >
+                  <VueDraggable v-model="onList" filter=".fix" class="draggable-ul" :animation="150" group="shared"
+                    :onMove="onMove">
+                    <div v-for="item in onList" v-show="item.name.includes(onKeyword)" :key="item.id"
+                      :draggable="!item.fix" :class="{ move: !item.fix, fix: item.fix }" class="cursor-move draggable-li">
                       <SvgIcon v-show="!item.fix" name="drag" size="24" />
                       <span class="ml-2">{{ item.name }}</span>
-                      <SvgIcon
-                        v-if="!item.fix" size="16px" style="display:block;margin-left: auto;cursor: pointer;"
-                        name="clear" @click="removeHandler(item.id)"
-                      />
+                      <SvgIcon v-if="!item.fix" size="16px" style="display:block;margin-left: auto;cursor: pointer;"
+                        name="clear" @click="removeHandler(item.id)" />
                     </div>
                   </VueDraggable>
                 </n-scrollbar>
@@ -444,6 +446,10 @@ onMounted(() => {
     align-items: center;
   }
 
+  .fix {
+    cursor: default !important;
+  }
+
   .disable-check {
     color: gainsboro;
   }