chore: 🔨 合并冲突解决

src/views/demo/api/knife4j.vue

@@ -1,12 +1,7 @@
 <!-- 接口文档 -->
 <template>
   <div class="app-container">
-    <iframe
-      src="http://vapi.youlai.tech/doc.html"
-      width="100%"
-      height="100%"
-      frameborder="0"
-    />
+    <iframe src="http://vapi.youlai.tech/doc.html" width="100%" height="100%" frameborder="0" />
   </div>
 </template>
 

src/views/demo/curd/config/content2.ts

@@ -15,8 +15,7 @@ const contentConfig: IContentConfig = {
         {
           id: 1,
           username: "tom",
-          avatar:
-            "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
           percent: 99,
           price: 10,
           url: "https://www.baidu.com",
@@ -30,8 +29,7 @@ const contentConfig: IContentConfig = {
         {
           id: 2,
           username: "jerry",
-          avatar:
-            "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
           percent: 88,
           price: 999,
           url: "https://www.google.com",

src/views/demo/curd/index.vue

@@ -8,9 +8,7 @@
       >
         示例源码 请点击>>>>
       </el-link>
-      <el-button type="primary" plain round size="small" @click="isA = !isA">
-        切换示例
-      </el-button>
+      <el-button type="primary" plain round size="small" @click="isA = !isA">切换示例</el-button>
     </div>
 
     <!-- 列表 -->
@@ -146,14 +144,10 @@ function handleOperatClick(data: IOperatData) {
   console.log(data);
   // 重置密码
   if (data.name === "reset_pwd") {
-    ElMessageBox.prompt(
-      "请输入用户「" + data.row.username + "」的新密码",
-      "重置密码",
-      {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-      }
-    ).then(({ value }) => {
+    ElMessageBox.prompt("请输入用户「" + data.row.username + "」的新密码", "重置密码", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    }).then(({ value }) => {
       if (!value || value.length < 6) {
         ElMessage.warning("密码至少需要6位字符，请重新输入");
         return false;

src/views/demo/icons.vue

@@ -5,11 +5,7 @@
         <div class="grid">
           <div v-for="item of svg_icons" :key="item">
             <copy-button :text="generateIconCode(item)">
-              <el-tooltip
-                effect="dark"
-                :content="generateIconCode(item)"
-                placement="top"
-              >
+              <el-tooltip effect="dark" :content="generateIconCode(item)" placement="top">
                 <div class="icon-item">
                   <svg-icon :icon-class="item" />
                   <span>{{ item }}</span>
@@ -23,11 +19,7 @@
         <div class="grid">
           <div v-for="(icon, name) of icons" :key="name">
             <copy-button :text="generateElementIconCode(name)">
-              <el-tooltip
-                effect="dark"
-                :content="generateElementIconCode(name)"
-                placement="top"
-              >
+              <el-tooltip effect="dark" :content="generateElementIconCode(name)" placement="top">
                 <div class="icon-item">
                   <el-icon :size="20">
                     <component :is="icon" />

src/views/demo/table-select/index.vue

@@ -36,11 +36,7 @@ const text = computed(() => {
     >
       示例源码 请点击>>>>
     </el-link>
-    <table-select
-      :text="text"
-      :select-config="selectConfig"
-      @confirm-click="handleConfirm"
-    >
+    <table-select :text="text" :select-config="selectConfig" @confirm-click="handleConfirm">
       <template #status="scope">
         <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
           {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}

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>

src/views/demo/websocket.vue

@@ -22,19 +22,13 @@
               >
                 连接
               </el-button>
-              <el-button
-                type="danger"
-                :disabled="!isConnected"
-                @click="disconnectWebSocket"
-              >
+              <el-button type="danger" :disabled="!isConnected" @click="disconnectWebSocket">
                 断开
               </el-button>
             </el-col>
             <el-col :span="8" class="text-right">
               连接状态：
-              <el-tag v-if="isConnected" class="ml-2" type="success">
-                已连接
-              </el-tag>
+              <el-tag v-if="isConnected" class="ml-2" type="success">已连接</el-tag>
               <el-tag v-else class="ml-2" type="info">已断开</el-tag>
             </el-col>
           </el-row>
@@ -60,9 +54,7 @@
               <el-input v-model="receiver" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="sendToUser">
-                发送点对点消息
-              </el-button>
+              <el-button type="primary" @click="sendToUser">发送点对点消息</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -78,17 +70,14 @@
                 'tip-message': message.type === 'tip',
                 message: message.type !== 'tip',
                 'message--sent': message.sender === userStore.userInfo.username,
-                'message--received':
-                  message.sender !== userStore.userInfo.username,
+                'message--received': message.sender !== userStore.userInfo.username,
               }"
             >
               <div v-if="message.type != 'tip'" class="message-content">
                 <div
                   :class="{
-                    'message-sender':
-                      message.sender === userStore.userInfo.username,
-                    'message-receiver':
-                      message.sender !== userStore.userInfo.username,
+                    'message-sender': message.sender === userStore.userInfo.username,
+                    'message-receiver': message.sender !== userStore.userInfo.username,
                   }"
                 >
                   {{ message.sender }}
@@ -124,16 +113,10 @@ interface MessageType {
 
 const messages = ref<MessageType[]>([]);
 
-const topicMessage = ref(
-  "亲爱的大冤种们，由于一只史诗级的BUG，系统版本已经被迫回退到了0.0.1。"
-); // 广播消息
+const topicMessage = ref("亲爱的大冤种们，由于一只史诗级的BUG，系统版本已经被迫回退到了0.0.1。"); // 广播消息
 
 const queneMessage = ref(
-  "hi , " +
-    receiver.value +
-    " , 我是" +
-    userStore.userInfo.username +
-    " , 想和你交个朋友 ! "
+  "hi , " + receiver.value + " , 我是" + userStore.userInfo.username + " , 想和你交个朋友 ! "
 );
 
 let stompClient: Client;