From 750a09d5b702f8e857f09ccc124565796f601d3f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 17 Nov 2022 13:50:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=BB=84=E4=BB=B6=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                              | 30 +++++++++++------------
 src/assets/styles/ruoyi.scss              |  5 +++-
 src/components/TopNav/index.vue           |  4 ++-
 src/layout/components/InnerLink/index.vue | 21 +---------------
 src/views/monitor/job/index.vue           |  7 +++---
 src/views/monitor/online/index.vue        |  4 ++-
 src/views/system/dept/index.vue           |  3 ++-
 src/views/system/dict/data.vue            |  7 +++---
 src/views/system/menu/index.vue           |  5 ++--
 src/views/system/notice/index.vue         |  6 +++--
 src/views/system/post/index.vue           |  6 +++--
 src/views/system/role/index.vue           |  2 +-
 src/views/tool/gen/index.vue              |  4 ++-
 13 files changed, 51 insertions(+), 53 deletions(-)

diff --git a/package.json b/package.json
index 8a606c6..2f921b8 100644
--- a/package.json
+++ b/package.json
@@ -15,27 +15,27 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
-    "@element-plus/icons-vue": "1.1.4",
-    "@vueuse/core": "8.5.0",
-    "axios": "0.26.1",
-    "echarts": "5.3.2",
-    "element-plus": "2.1.8",
+    "@element-plus/icons-vue": "2.0.10",
+    "@vueuse/core": "9.5.0",
+    "axios": "0.27.2",
+    "echarts": "5.4.0",
+    "element-plus": "2.2.21",
     "file-saver": "2.0.5",
-    "fuse.js": "6.5.3",
+    "fuse.js": "6.6.2",
     "js-cookie": "3.0.1",
-    "jsencrypt": "3.2.1",
+    "jsencrypt": "3.3.1",
     "nprogress": "0.2.0",
-    "pinia": "2.0.14",
-    "vue": "3.2.37",
+    "pinia": "2.0.22",
+    "vue": "3.2.45",
     "vue-cropper": "1.0.3",
-    "vue-router": "4.0.14"
+    "vue-router": "4.1.4"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "2.3.3",
-    "@vue/compiler-sfc": "3.2.36",
-    "sass": "1.52.1",
-    "unplugin-auto-import": "0.8.5",
-    "vite": "2.9.14",
+    "@vitejs/plugin-vue": "3.1.0",
+    "@vue/compiler-sfc": "3.2.45",
+    "sass": "1.56.1",
+    "unplugin-auto-import": "0.11.4",
+    "vite": "3.2.3",
     "vite-plugin-compression": "0.5.1",
     "vite-plugin-svg-icons": "2.0.1",
     "vite-plugin-vue-setup-extend": "0.4.0"
diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 6cdc2b6..a7d3ec9 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -60,12 +60,15 @@
 	color: inherit;
 }
 
+.el-form .el-form-item__label {
+	font-weight: 700;
+}
 .el-dialog:not(.is-fullscreen) {
 	margin-top: 6vh !important;
 }
 
 .el-dialog.scrollbar .el-dialog__body {
-    overflow: auto;
+	overflow: auto;
 	overflow-x: hidden;
 	max-height: 70vh;
 	padding: 10px 20px 0;
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index 4b8f206..f7e2654 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -97,7 +97,9 @@ const activeMenu = computed(() => {
   if (path !== undefined && path.lastIndexOf("/") > 0 && hideList.indexOf(path) === -1) {
     const tmpPath = path.substring(1, path.length);
     activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
-    appStore.toggleSideBarHide(false);
+    if (!route.meta.link) {
+        appStore.toggleSideBarHide(false);
+    }
   } else if(!route.children) {
     activePath = path;
     appStore.toggleSideBarHide(true);
diff --git a/src/layout/components/InnerLink/index.vue b/src/layout/components/InnerLink/index.vue
index a1c3ef6..6d77d3a 100644
--- a/src/layout/components/InnerLink/index.vue
+++ b/src/layout/components/InnerLink/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div :style="'height:' + height" v-loading="loading" element-loading-text="正在加载页面，请稍候！">
+  <div :style="'height:' + height">
     <iframe
       :id="iframeId"
       style="width: 100%; height: 100%"
@@ -21,23 +21,4 @@ const props = defineProps({
 });
 
 const height = ref(document.documentElement.clientHeight - 94.5 + "px");
-const loading = ref(false);
-
-onMounted(() => {
-    const { proxy } = getCurrentInstance()
-    const iframeId = ("#" + props.iframeId).replace(/\//g, "\\/");
-    const iframe = document.querySelector(iframeId);
-    // iframe页面loading控制
-    if (iframe.attachEvent) {
-      loading.value = true;
-      iframe.attachEvent("onload", function () {
-        proxy.loading = false;
-      });
-    } else {
-      loading.value = true;
-      iframe.onload = function () {
-        proxy.loading = false;
-      };
-    }
-})
 </script>
diff --git a/src/views/monitor/job/index.vue b/src/views/monitor/job/index.vue
index 8f79229..b93e9df 100644
--- a/src/views/monitor/job/index.vue
+++ b/src/views/monitor/job/index.vue
@@ -1,16 +1,17 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
          <el-form-item label="任务名称" prop="jobName">
             <el-input
                v-model="queryParams.jobName"
                placeholder="请输入任务名称"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="任务组名" prop="jobGroup">
-            <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable>
+            <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_job_group"
                   :key="dict.value"
@@ -20,7 +21,7 @@
             </el-select>
          </el-form-item>
          <el-form-item label="任务状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
+            <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_job_status"
                   :key="dict.value"
diff --git a/src/views/monitor/online/index.vue b/src/views/monitor/online/index.vue
index ca2d767..4e34135 100644
--- a/src/views/monitor/online/index.vue
+++ b/src/views/monitor/online/index.vue
@@ -1,11 +1,12 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" label-width="68px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true">
          <el-form-item label="登录地址" prop="ipaddr">
             <el-input
                v-model="queryParams.ipaddr"
                placeholder="请输入登录地址"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
@@ -14,6 +15,7 @@
                v-model="queryParams.userName"
                placeholder="请输入用户名称"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 7df4b61..1b2dc44 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -6,11 +6,12 @@
                v-model="queryParams.deptName"
                placeholder="请输入部门名称"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
+            <el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 12c6492..a8fa6ef 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -1,8 +1,8 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
          <el-form-item label="字典名称" prop="dictType">
-            <el-select v-model="queryParams.dictType">
+            <el-select v-model="queryParams.dictType" style="width: 200px">
                <el-option
                   v-for="item in typeOptions"
                   :key="item.dictId"
@@ -16,11 +16,12 @@
                v-model="queryParams.dictLabel"
                placeholder="请输入字典标签"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="数据状态" clearable>
+            <el-select v-model="queryParams.status" placeholder="数据状态" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index f6b118f..3dd26be 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -6,11 +6,12 @@
                v-model="queryParams.menuName"
                placeholder="请输入菜单名称"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
+            <el-select v-model="queryParams.status" placeholder="菜单状态" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -132,7 +133,7 @@
                         @show="showSelectIcon"
                      >
                         <template #reference>
-                           <el-input v-model="form.icon" placeholder="点击选择图标" @click="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
+                           <el-input v-model="form.icon" placeholder="点击选择图标" @blur="showSelectIcon" v-click-outside="hideSelectIcon" readonly>
                               <template #prefix>
                                  <svg-icon
                                     v-if="form.icon"
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 7780641..2bcd877 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -1,11 +1,12 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
          <el-form-item label="公告标题" prop="noticeTitle">
             <el-input
                v-model="queryParams.noticeTitle"
                placeholder="请输入公告标题"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
@@ -14,11 +15,12 @@
                v-model="queryParams.createBy"
                placeholder="请输入操作人员"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="类型" prop="noticeType">
-            <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable>
+            <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_notice_type"
                   :key="dict.value"
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 265bfe5..729bee7 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -1,11 +1,12 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
          <el-form-item label="岗位编码" prop="postCode">
             <el-input
                v-model="queryParams.postCode"
                placeholder="请输入岗位编码"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
@@ -14,11 +15,12 @@
                v-model="queryParams.postName"
                placeholder="请输入岗位名称"
                clearable
+               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
          <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
+            <el-select v-model="queryParams.status" placeholder="岗位状态" clearable style="width: 200px">
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index ee2e11d..1f83a11 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true">
+      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
          <el-form-item label="角色名称" prop="roleName">
             <el-input
                v-model="queryParams.roleName"
diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue
index 262edee..3020e9b 100644
--- a/src/views/tool/gen/index.vue
+++ b/src/views/tool/gen/index.vue
@@ -1,11 +1,12 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
       <el-form-item label="表名称" prop="tableName">
         <el-input
           v-model="queryParams.tableName"
           placeholder="请输入表名称"
           clearable
+          style="width: 200px"
           @keyup.enter="handleQuery"
         />
       </el-form-item>
@@ -14,6 +15,7 @@
           v-model="queryParams.tableComment"
           placeholder="请输入表描述"
           clearable
+          style="width: 200px"
           @keyup.enter="handleQuery"
         />
       </el-form-item>