chore: 🔨 合并冲突解决

2024-11-16 23:00:30 +08:00
parent 2dd4421fdf
commit 711e3ba5f4
48 changed files with 207 additions and 791 deletions
--- a/src/views/demo/wang-editor.vue
+++ b/src/views/demo/wang-editor.vue
@@ -15,9 +15,6 @@ const value = ref("初始内容");
    >
      示例源码 请点击>>>>
    </el-link>
-    <editor
-      v-model="value"
-      style="z-index: 99999; height: calc(100vh - 180px)"
-    />
+    <editor v-model="value" style="z-index: 99999; height: calc(100vh - 180px)" />
  </div>
 </template>