From 305f8fcc7989b894e885f4bf7532f55f36ada5c9 Mon Sep 17 00:00:00 2001
From: xream <xream@icloud.com>
Date: Sun, 24 Dec 2023 12:40:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=8A=82=E7=82=B9=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=AD=A3=E5=88=99=E6=94=AF=E6=8C=81=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                          |  2 +-
 src/App.vue                           |  4 +-
 src/store/appNotify.ts                |  1 -
 src/views/editor/components/Regex.vue | 54 +++++++++++++++++++--------
 4 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 0700767dc..1404fefaf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sub-store-front-end",
-  "version": "2.14.24",
+  "version": "2.14.25",
   "private": true,
   "scripts": {
     "dev": "vite --host",
diff --git a/src/App.vue b/src/App.vue
index acff0cb37..517187525 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <GlobalNotify />
+  <!-- <GlobalNotify /> -->
   <NavBar />
   <main class="page-body">
     <router-view />
@@ -7,7 +7,7 @@
 </template>
 
 <script setup lang="ts">
-  import GlobalNotify from '@/components/GlobalNotify.vue';
+  // import GlobalNotify from '@/components/GlobalNotify.vue';
   import NavBar from '@/components/NavBar.vue';
   import { useThemes } from '@/hooks/useThemes';
   import { useGlobalStore } from '@/store/global';
diff --git a/src/store/appNotify.ts b/src/store/appNotify.ts
index 012fdbe8a..9cf8c2f37 100644
--- a/src/store/appNotify.ts
+++ b/src/store/appNotify.ts
@@ -31,7 +31,6 @@ export const useAppNotifyStore = defineStore('appNotify', {
       // primary，success ，danger，warning
       // info, success, warning, error, default
       const types = {primary: 'INFO', success: 'SUCCESS', danger: 'ERROR', warning: 'WARNING'};
-      console.log(`html`, html)
       toast(html, {
         theme: 'colored',
         type: toast.TYPE[types[type] || 'DEFAULT'],
diff --git a/src/views/editor/components/Regex.vue b/src/views/editor/components/Regex.vue
index b5008d992..aa6bb6f43 100644
--- a/src/views/editor/components/Regex.vue
+++ b/src/views/editor/components/Regex.vue
@@ -16,19 +16,28 @@
       {{ $t(`editorPage.subConfig.nodeActions['${type}'].des[0]`) }}
     </p>
     <div class="tag-wrapper">
-      <nut-tag
-        @click="onClickTag"
-        class="tag-item"
-        v-for="(content, index) in value"
-        closeable
-        @close="deleteRegexItem(index)"
-      >
-        <span>{{
-          type === 'Regex Rename Operator'
-            ? `${content.expr}  ⇒  ${content.now}`
-            : content
-        }}</span>
-      </nut-tag>
+      <draggable
+          item-key="id"
+          v-model="dragData"
+          :force-fallback="true"
+          :scroll="true"
+        >
+        <template #item="{ element, index }">
+            <nut-tag
+              @click="onClickTag"
+              class="tag-item"
+              closeable
+              @close="deleteRegexItem(index)"
+            >
+              <span>{{
+                type === 'Regex Rename Operator'
+                  ? `${element.value.expr}  ⇒  ${element.value.now}`
+                  : element.value
+              }}
+              </span>
+            </nut-tag>
+          </template>
+      </draggable>
     </div>
     <div class="input-wrapper">
       <nut-input
@@ -54,10 +63,11 @@
 
 <script lang="ts" setup>
   import { Dialog } from '@nutui/nutui';
-  import { inject, onMounted, ref, watch } from 'vue';
+  import { inject, onMounted, ref, watch, computed } from 'vue';
   import { useI18n } from 'vue-i18n';
   import { onBeforeRouteLeave, useRouter } from 'vue-router';
-
+  import draggable from "vuedraggable";
+  
   const { t } = useI18n();
   const router = useRouter();
   const { type, id } = defineProps<{
@@ -78,6 +88,19 @@
 
   const mode = ref();
   const value = ref();
+  const dragData = computed({
+    get() {
+      return Array.isArray(value.value) ? value.value.map((item, index) => ({
+        id: index + JSON.stringify(item),
+        value: item,
+      })) : []
+    },
+    set(val) {
+      val.map((item, index) => {
+        value.value[index] = item.value
+      })
+    }
+  })
 
   const onClickTag = el => {
     const index = [...el.currentTarget.parentElement.children].indexOf(
@@ -208,6 +231,7 @@
 
       span {
         max-width: 95%;
+        min-width: 20px;
         display: -webkit-box;
         white-space: normal !important;
         overflow: hidden;