From 750a09d5b702f8e857f09ccc124565796f601d3f Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期四, 17 十一月 2022 13:50:35 +0800
Subject: [PATCH] 升级组件依赖到最新版本
---
src/views/system/role/index.vue | 2
src/views/monitor/job/index.vue | 7 ++-
src/views/system/dept/index.vue | 3 +
src/views/system/post/index.vue | 6 ++-
src/views/monitor/online/index.vue | 4 +
src/assets/styles/ruoyi.scss | 5 ++
src/views/system/menu/index.vue | 5 +-
src/layout/components/InnerLink/index.vue | 21 ----------
src/views/tool/gen/index.vue | 4 +
package.json | 30 +++++++-------
src/views/system/dict/data.vue | 7 ++-
src/components/TopNav/index.vue | 4 +
src/views/system/notice/index.vue | 6 ++-
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 @@
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 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>
--
Gitblit v1.9.3