Merge branch 'youlaitech:master' into master

Author: Ninjaxsh

src/layout/components/NavBar/components/NavbarAction.vue

@@ -43,21 +43,21 @@
                 >
                   <el-link type="primary">
                     <el-text class="w-350px" size="default" truncated>
-                      {{ message.title }}</el-text
-                    >
+                      {{ message.title }}
+                    </el-text>
                   </el-link>
                 </div>
               </el-tab-pane>
             </el-tabs>
             <el-divider />
             <div class="flex-x-between">
               <el-link type="primary" :underline="false">
-                <span class="text-xs">查看更多</span
-                ><el-icon class="text-xs"><ArrowRight /></el-icon
-              ></el-link>
+                <span class="text-xs">查看更多</span>
+                <el-icon class="text-xs"><ArrowRight /></el-icon>
+              </el-link>
               <el-link type="primary" :underline="false">
-                <span class="text-xs">全部已读</span></el-link
-              >
+                <span class="text-xs">全部已读</span>
+              </el-link>
             </div>
           </div>
         </template>
@@ -211,13 +211,8 @@ function logout() {
   background: rgb(255 255 255 / 20%);
 }
 
-.see-more {
-  padding: 10px 0;
-  text-align: center;
-}
-
-.see-more a {
-  color: var(--el-color-primary);
-  text-decoration: none;
+.layout-top .nav-action-item,
+.layout-mix .nav-action-item {
+  color: #fff;
 }
 </style>

src/layout/components/Sidebar/components/SidebarMixTopMenu.vue

@@ -19,7 +19,7 @@
             v-if="route.meta && route.meta.icon"
             :icon-class="route.meta.icon"
           />
-          <span v-if="route.path === '/'"> 首页 </span>
+          <span v-if="route.path === '/'">首页</span>
           <template v-else>
             <span v-if="route.meta && route.meta.title" class="ml-1">
               {{ translateRouteTitle(route.meta.title) }}
@@ -41,8 +41,10 @@ const appStore = useAppStore();
 const permissionStore = usePermissionStore();
 const router = useRouter();
 
+console.log("当前路由", useRoute().path);
+
 // 避免 activeTopMenuPath 缓存被清理，从当前路由路径获取顶部菜单路径，eg. /system/user → /system
-const activeTopMenuPath = useRoute().path.replace(/\/[^\/]+$/, "") || "/";
+const activeTopMenuPath = useRoute().path.match(/^\/[^\/]+/)?.[0] || "/";
 appStore.activeTopMenu(activeTopMenuPath);
 
 // 激活的顶部菜单路径

src/views/system/user/index.vue

@@ -46,13 +46,14 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" @click="handleQuery"
-                ><i-ep-search />搜索</el-button
-              >
+              <el-button type="primary" @click="handleQuery">
+                <i-ep-search />
+                搜索
+              </el-button>
               <el-button @click="handleResetQuery">
                 <i-ep-refresh />
-                重置</el-button
-              >
+                重置
+              </el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -65,24 +66,30 @@
                   v-hasPerm="['sys:user:add']"
                   type="success"
                   @click="handleOpenDialog()"
-                  ><i-ep-plus />新增</el-button
                 >
+                  <i-ep-plus />
+                  新增
+                </el-button>
                 <el-button
                   v-hasPerm="['sys:user:delete']"
                   type="danger"
                   :disabled="removeIds.length === 0"
                   @click="handleDelete()"
-                  ><i-ep-delete />删除</el-button
                 >
+                  <i-ep-delete />
+                  删除
+                </el-button>
               </div>
               <div>
-                <el-button class="ml-3" @click="handleOpenImportDialog"
-                  ><template #icon><i-ep-upload /></template>导入</el-button
-                >
-
-                <el-button class="ml-3" @click="handleExport"
-                  ><template #icon><i-ep-download /></template>导出</el-button
-                >
+                <el-button class="ml-3" @click="handleOpenImportDialog">
+                  <template #icon><i-ep-upload /></template>
+                  导入
+                </el-button>
+
+                <el-button class="ml-3" @click="handleExport">
+                  <template #icon><i-ep-download /></template>
+                  导出
+                </el-button>
               </div>
             </div>
           </template>
@@ -135,9 +142,9 @@
 
             <el-table-column label="状态" align="center" prop="status">
               <template #default="scope">
-                <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">{{
-                  scope.row.status == 1 ? "启用" : "禁用"
-                }}</el-tag>
+                <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">
+                  {{ scope.row.status == 1 ? "启用" : "禁用" }}
+                </el-tag>
               </template>
             </el-table-column>
             <el-table-column
@@ -154,24 +161,30 @@
                   size="small"
                   link
                   @click="hancleResetPassword(scope.row)"
-                  ><i-ep-refresh-left />重置密码</el-button
                 >
+                  <i-ep-refresh-left />
+                  重置密码
+                </el-button>
                 <el-button
                   v-hasPerm="['sys:user:edit']"
                   type="primary"
                   link
                   size="small"
                   @click="handleOpenDialog(scope.row.id)"
-                  ><i-ep-edit />编辑</el-button
                 >
+                  <i-ep-edit />
+                  编辑
+                </el-button>
                 <el-button
                   v-hasPerm="['sys:user:delete']"
                   type="danger"
                   link
                   size="small"
                   @click="handleDelete(scope.row.id)"
-                  ><i-ep-delete />删除</el-button
                 >
+                  <i-ep-delete />
+                  删除
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -257,8 +270,8 @@
 
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="formData.status">
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="0">禁用</el-radio>
+            <el-radio :value="1">正常</el-radio>
+            <el-radio :value="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -392,16 +405,21 @@ function hancleResetPassword(row: { [key: string]: any }) {
       confirmButtonText: "确定",
       cancelButtonText: "取消",
     }
-  ).then(({ value }) => {
-    if (!value || value.length < 6) {
-      // 检查密码是否为空或少于6位
-      ElMessage.warning("密码至少需要6位字符，请重新输入");
-      return false;
+  ).then(
+    ({ value }) => {
+      if (!value || value.length < 6) {
+        // 检查密码是否为空或少于6位
+        ElMessage.warning("密码至少需要6位字符，请重新输入");
+        return false;
+      }
+      UserAPI.updatePassword(row.id, value).then(() => {
+        ElMessage.success("密码重置成功，新密码是：" + value);
+      });
+    },
+    () => {
+      ElMessage.info("已取消重置密码");
     }
-    UserAPI.updatePassword(row.id, value).then(() => {
-      ElMessage.success("密码重置成功，新密码是：" + value);
-    });
-  });
+  );
 }
 
 /**