Merge remote-tracking branch 'origin/main'

prettier.config.js

@@ -3,4 +3,5 @@ module.exports = {
   singleQuote: true,
   semi: false,
   endOfLine: 'lf',
+  bracketSameLine: true,
 }

src/components/common/ScrollX.vue

@@ -16,8 +16,7 @@
       :style="{
         height: height + 'px',
         transform: `translateX(${translateX}px)`,
-      }"
-    >
+      }">
       <slot />
     </div>
   </div>

src/layout/components/sidebar/components/SideMenu.vue

@@ -7,8 +7,7 @@
     :collapsed-width="64"
     :options="menuOptions"
     :value="(currentRoute.meta && currentRoute.meta.activeMenu) || currentRoute.name"
-    @update:value="handleMenuSelect"
-  />
+    @update:value="handleMenuSelect" />
 </template>
 
 <script setup>

src/layout/components/tags/ContextMenu.vue

@@ -6,8 +6,7 @@
     :y="y"
     placement="bottom-start"
     @clickoutside="handleHideDropdown"
-    @select="handleSelect"
-  />
+    @select="handleSelect" />
 </template>
 
 <script setup>

src/layout/components/tags/index.vue

@@ -7,8 +7,7 @@
       :closable="tagsStore.tags.length > 1"
       @click="handleTagClick(tag.path)"
       @close.stop="tagsStore.removeTag(tag.path)"
-      @contextmenu.prevent="handleContextMenu($event, tag)"
-    >
+      @contextmenu.prevent="handleContextMenu($event, tag)">
       {{ tag.title }}
     </n-tag>
   </ScrollX>
@@ -17,8 +16,7 @@
     v-model:show="contextMenuOption.show"
     :current-path="contextMenuOption.currentPath"
     :x="contextMenuOption.x"
-    :y="contextMenuOption.y"
-  />
+    :y="contextMenuOption.y" />
 </template>
 
 <script setup name="Tags">

src/layout/index.vue

@@ -6,8 +6,7 @@
       :collapsed-width="64"
       :width="220"
       :native-scrollbar="false"
-      :collapsed="appStore.collapsed"
-    >
+      :collapsed="appStore.collapsed">
       <SideBar />
     </n-layout-sider>
     <n-layout>
@@ -22,8 +21,7 @@
           :style="{
             height: `calc(100% - ${useTheme.tags.visible ? useTheme.tags.height : 0}px)`,
             overflow: 'auto',
-          }"
-        />
+          }" />
       </n-layout>
     </n-layout>
   </n-layout>

src/views/dashboard/index.vue

@@ -36,8 +36,7 @@
           class="w-300 flex-shrink-0 mt-10 mb-10 cursor-pointer"
           hover:card-shadow
           title="Vue Naive Admin"
-          size="small"
-        >
+          size="small">
           <p op-60>一个基于 Vue3.0、Vite、Naive UI 的轻量级后台管理模板</p>
         </n-card>
         <div w-300 h-0></div>

src/views/examples/table/post/PostCreate.vue

@@ -5,8 +5,7 @@
         v-model="post.title"
         class="flex-1 pt-15 pb-15 mr-20 text-20 font-bold color-primary"
         type="text"
-        placeholder="输入文章标题..."
-      />
+        placeholder="输入文章标题..." />
       <n-button type="primary" style="width: 80px" :loading="btnLoading" @click="handleSavePost">保存</n-button>
     </div>
     <MdEditor v-model="post.content" style="height: calc(100vh - 220px)" />

src/views/examples/table/post/index.vue

@@ -11,8 +11,7 @@
       :columns="columns"
       :pagination="pagination"
       :row-key="(row) => row.id"
-      @update:checked-row-keys="handleCheck"
-    />
+      @update:checked-row-keys="handleCheck" />
   </div>
 </template>
 

src/views/login/index.vue

@@ -16,8 +16,7 @@
             autofocus
             class="text-16 items-center h-50 pl-10"
             placeholder="admin"
-            :maxlength="20"
-          >
+            :maxlength="20">
           </n-input>
         </div>
         <div mt-30 w-full max-w-360>
@@ -28,8 +27,7 @@
             show-password-on="mousedown"
             placeholder="123456"
             :maxlength="20"
-            @keydown.enter="handleLogin"
-          />
+            @keydown.enter="handleLogin" />
         </div>
 
         <div mt-20 w-full max-w-360>