Merge remote-tracking branch 'origin/main'

Alfred-Skyblue · Alfred-Skyblue · commit 2ab0b56643ba · 2024-06-18T22:44:34.000+08:00
# Conflicts:
#	docs/public/group.jpg
diff --git a/src/__docs__/basic/demo.vue b/src/__docs__/basic/demo.vue
@@ -16,7 +16,7 @@
       <div
         v-for="item in list"
         :key="item.id"
-        class="cursor-move h-30 bg-gray-500/5 rounded p-3 cursor-move"
+        class="cursor-move h-30 bg-gray-500/5 rounded p-3"
       >
         {{ item.name }}
       </div>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`<div`
`17`	`17`	`v-for="item in list"`
`18`	`18`	`:key="item.id"`
`19`		`- class="cursor-move h-30 bg-gray-500/5 rounded p-3 cursor-move"`
	`19`	`+ class="cursor-move h-30 bg-gray-500/5 rounded p-3"`
`20`	`20`	`>`
`21`	`21`	`{{ item.name }}`
`22`	`22`	`</div>`