🐛 修复脚本排序问题 #425

Author: CodFrm

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scriptcat",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "description": "脚本猫,一个可以执行用户脚本的浏览器扩展,万物皆可脚本化,让你的浏览器可以做更多的事情!",
   "author": "CodFrm",
   "license": "GPLv3",

src/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "__MSG_scriptcat__",
-  "version": "0.17.1",
+  "version": "0.18.0",
   "author": "CodFrm",
   "description": "__MSG_scriptcat_description__",
   "options_ui": {

src/pages/options/routes/ScriptList.tsx

@@ -91,6 +91,7 @@ import {
 import { message, systemConfig } from "@App/pages/store/global";
 import { ValueClient } from "@App/app/service/service_worker/client";
 import { loadScriptFavicons } from "@App/pages/store/utils";
+import { store } from "@App/pages/store/store";
 
 type ListType = ScriptLoading;
 
@@ -636,7 +637,7 @@ function ScriptList() {
             if (active.id !== over.id) {
               let oldIndex = 0;
               let newIndex = 0;
-              scriptList.forEach((item, index) => {
+              store.getState().script.scripts.forEach((item, index) => {
                 if (item.uuid === active.id) {
                   oldIndex = index;
                 } else if (item.uuid === over.id) {
@@ -647,7 +648,10 @@ function ScriptList() {
             }
           }}
         >
-          <SortableContext items={scriptList.map((s) => ({ ...s, id: s.uuid }))} strategy={verticalListSortingStrategy}>
+          <SortableContext
+            items={store.getState().script.scripts.map((s) => ({ ...s, id: s.uuid }))}
+            strategy={verticalListSortingStrategy}
+          >
             <table ref={ref} {...props} />
           </SortableContext>
         </DndContext>

src/pages/store/features/script.ts

@@ -5,7 +5,6 @@ import {
   SCRIPT_RUN_STATUS,
   SCRIPT_STATUS_DISABLE,
   SCRIPT_STATUS_ENABLE,
-  ScriptDAO,
 } from "@App/app/repo/scripts";
 import { arrayMove } from "@dnd-kit/sortable";
 import {
@@ -19,8 +18,6 @@ import {
   ValueClient,
 } from "@App/app/service/service_worker/client";
 import { message } from "../global";
-import { extractFavicons } from "@App/pkg/utils/favicon";
-import { store } from "../store";
 
 export const scriptClient = new ScriptClient(message);
 export const subscribeClient = new SubscribeClient(message);