Merge branch 'iteration-20240612' into jenkins-test

package-lock.json

@@ -20,7 +20,6 @@
         "eventemitter3": "^5.0.1",
         "howler": "^2.2.3",
         "html2canvas": "^1.4.1",
-        "mobile-drag-drop": "^3.0.0-rc.0",
         "moveable": "^0.52.0",
         "naive-ui": "^2.34.4",
         "numeral": "^2.0.6",
@@ -6501,11 +6500,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/mobile-drag-drop": {
-      "version": "3.0.0-rc.0",
-      "resolved": "https://registry.npmmirror.com/mobile-drag-drop/-/mobile-drag-drop-3.0.0-rc.0.tgz",
-      "integrity": "sha512-f8wIDTbBYLBW/+5sei1cqUE+StyDpf/LP+FRZELlVX6tmOOmELk84r3wh1z3woxCB9G5octhF06K5COvFjGgqg=="
-    },
     "node_modules/moveable": {
       "version": "0.52.0",
       "resolved": "https://registry.npmmirror.com/moveable/-/moveable-0.52.0.tgz",
@@ -14253,11 +14247,6 @@
       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
       "dev": true
     },
-    "mobile-drag-drop": {
-      "version": "3.0.0-rc.0",
-      "resolved": "https://registry.npmmirror.com/mobile-drag-drop/-/mobile-drag-drop-3.0.0-rc.0.tgz",
-      "integrity": "sha512-f8wIDTbBYLBW/+5sei1cqUE+StyDpf/LP+FRZELlVX6tmOOmELk84r3wh1z3woxCB9G5octhF06K5COvFjGgqg=="
-    },
     "moveable": {
       "version": "0.52.0",
       "resolved": "https://registry.npmmirror.com/moveable/-/moveable-0.52.0.tgz",

package.json

@@ -34,7 +34,6 @@
     "eventemitter3": "^5.0.1",
     "howler": "^2.2.3",
     "html2canvas": "^1.4.1",
-    "mobile-drag-drop": "^3.0.0-rc.0",
     "moveable": "^0.52.0",
     "naive-ui": "^2.34.4",
     "numeral": "^2.0.6",

src/main.ts

@@ -16,20 +16,20 @@ import { Lazyload, setToastDefaultOptions } from 'vant';
 import useErrorLog from './hooks/useErrorLog';
 setToastDefaultOptions({ duration: 3000 });
 
-import 'mobile-drag-drop/default.css';
-import { polyfill } from 'mobile-drag-drop';
+// import 'mobile-drag-drop/default.css';
+// import { polyfill } from 'mobile-drag-drop';
 
-// 可选引入滚动行为的脚本
-import { scrollBehaviourDragImageTranslateOverride } from 'mobile-drag-drop/scroll-behaviour';
+// // 可选引入滚动行为的脚本
+// import { scrollBehaviourDragImageTranslateOverride } from 'mobile-drag-drop/scroll-behaviour';
 
-// 可选的配置项
-const options = {
-  // 使用这个选项以应用滚动行为
-  dragImageTranslateOverride: scrollBehaviourDragImageTranslateOverride
-};
+// // 可选的配置项
+// const options = {
+//   // 使用这个选项以应用滚动行为
+//   dragImageTranslateOverride: scrollBehaviourDragImageTranslateOverride
+// };
 
-// 初始化polyfill
-polyfill(options);
+// // 初始化polyfill
+// polyfill(options);
 
 
 // 获取token

src/views/tempo-practice/index.tsx

@@ -374,30 +374,30 @@ export default defineComponent({
                         state.settingStatus && styles.disabledChange
                       ]}
                       // draggable={true}
-                      onDragenter={(e: any) => {
-                        e.preventDefault();
-                      }}
-                      onDragover={(e: any) => {
-                        e.preventDefault();
-                      }}
-                      onDrop={(e: any) => {
-                        let dropItem = e.dataTransfer.getData('text');
-                        dropItem = dropItem ? JSON.parse(dropItem) : {};
-                        // 判断是否有数据
-                        if (dropItem.url) {
-                          handleStop();
-                          setting_modal.scorePart.forEach(
-                            (part: Array<any>, ci: number) => {
-                              part.forEach((child: any, cj: number) => {
-                                if (i === ci && jIndex === cj) {
-                                  child.url = dropItem.url;
-                                  child.index = dropItem.index;
-                                }
-                              });
-                            }
-                          );
-                        }
-                      }}
+                      // onDragenter={(e: any) => {
+                      //   e.preventDefault();
+                      // }}
+                      // onDragover={(e: any) => {
+                      //   e.preventDefault();
+                      // }}
+                      // onDrop={(e: any) => {
+                      //   let dropItem = e.dataTransfer.getData('text');
+                      //   dropItem = dropItem ? JSON.parse(dropItem) : {};
+                      //   // 判断是否有数据
+                      //   if (dropItem.url) {
+                      //     handleStop();
+                      //     setting_modal.scorePart.forEach(
+                      //       (part: Array<any>, ci: number) => {
+                      //         part.forEach((child: any, cj: number) => {
+                      //           if (i === ci && jIndex === cj) {
+                      //             child.url = dropItem.url;
+                      //             child.index = dropItem.index;
+                      //           }
+                      //         });
+                      //       }
+                      //     );
+                      //   }
+                      // }}
                       onClick={(e: any) => {
                         e.stopPropagation();
                         // 编辑时可以操作