From 64036d520f8d1e41390bdf097fb87039701d0efe Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 01 十二月 2023 14:20:45 +0800
Subject: [PATCH] 升级组件依赖到最新版本
---
src/components/Crontab/year.vue | 10 +-
src/components/Crontab/hour.vue | 2
src/components/RightToolbar/index.vue | 2
src/components/Crontab/day.vue | 2
src/components/Crontab/min.vue | 2
src/components/Crontab/month.vue | 2
src/layout/components/IframeToggle/index.vue | 16 ++---
src/main.js | 3
package.json | 33 +++++-----
src/components/Crontab/week.vue | 2
src/components/ImagePreview/index.vue | 2
src/layout/components/Settings/index.vue | 58 ++-----------------
src/layout/components/Sidebar/SidebarItem.vue | 2
src/components/Crontab/second.vue | 2
14 files changed, 47 insertions(+), 91 deletions(-)
diff --git a/package.json b/package.json
index 4fe150d..e516d1d 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
"description": "鑻ヤ緷绠＄悊绯荤粺",
"author": "鑻ヤ緷",
"license": "MIT",
+ "type": "module",
"scripts": {
"dev": "vite",
"build:prod": "vite build",
@@ -15,30 +16,30 @@
"url": "https://gitee.com/y_project/RuoYi-Vue.git"
},
"dependencies": {
- "@element-plus/icons-vue": "2.0.10",
+ "@element-plus/icons-vue": "2.3.1",
"@vueup/vue-quill": "1.2.0",
- "@vueuse/core": "9.5.0",
+ "@vueuse/core": "10.6.1",
"axios": "0.27.2",
- "echarts": "5.4.0",
- "element-plus": "2.2.27",
+ "echarts": "5.4.3",
+ "element-plus": "2.4.3",
"file-saver": "2.0.5",
"fuse.js": "6.6.2",
- "js-cookie": "3.0.1",
- "jsencrypt": "3.3.1",
+ "js-cookie": "3.0.5",
+ "jsencrypt": "3.3.2",
"nprogress": "0.2.0",
- "pinia": "2.0.22",
- "vue": "3.2.45",
- "vue-cropper": "1.0.3",
- "vue-router": "4.1.4"
+ "pinia": "2.1.7",
+ "vue": "3.3.9",
+ "vue-cropper": "1.1.1",
+ "vue-router": "4.2.5"
},
"devDependencies": {
- "@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",
+ "@vitejs/plugin-vue": "4.5.0",
+ "@vue/compiler-sfc": "3.3.9",
+ "sass": "1.69.5",
+ "unplugin-auto-import": "0.17.1",
+ "vite": "5.0.4",
"vite-plugin-compression": "0.5.1",
"vite-plugin-svg-icons": "2.0.1",
- "unplugin-vue-setup-extend-plus": "0.4.9"
+ "unplugin-vue-setup-extend-plus": "1.0.0"
}
}
diff --git a/src/components/Crontab/day.vue b/src/components/Crontab/day.vue
index 90e9dab..0d804ec 100644
--- a/src/components/Crontab/day.vue
+++ b/src/components/Crontab/day.vue
@@ -1,5 +1,5 @@
<template>
- <el-form size="small">
+ <el-form>
<el-form-item>
<el-radio v-model='radioValue' :label="1">
鏃ワ紝鍏佽鐨勯�氶厤绗, - * ? / L W]
diff --git a/src/components/Crontab/hour.vue b/src/components/Crontab/hour.vue
index f9a6374..a293b29 100644
--- a/src/components/Crontab/hour.vue
+++ b/src/components/Crontab/hour.vue
@@ -1,5 +1,5 @@
<template>
- <el-form size="small">
+ <el-form>
<el-form-item>
<el-radio v-model='radioValue' :label="1">
灏忔椂锛屽厑璁哥殑閫氶厤绗, - * /]
diff --git a/src/components/Crontab/min.vue b/src/components/Crontab/min.vue
index 1879797..567e1ec 100644
--- a/src/components/Crontab/min.vue
+++ b/src/components/Crontab/min.vue
@@ -1,5 +1,5 @@
<template>
- <el-form size="small">
+ <el-form>
<el-form-item>
<el-radio v-model='radioValue' :label="1">
鍒嗛挓锛屽厑璁哥殑閫氶厤绗, - * /]
diff --git a/src/components/Crontab/month.vue b/src/components/Crontab/month.vue
index af9f0da..4bf33fd 100644
--- a/src/components/Crontab/month.vue
+++ b/src/components/Crontab/month.vue
@@ -1,5 +1,5 @@
<template>
- <el-form size='small'>
+ <el-form>
<el-form-item>
<el-radio v-model='radioValue' :label="1">
鏈堬紝鍏佽鐨勯�氶厤绗, - * /]
diff --git a/src/components/Crontab/second.vue b/src/components/Crontab/second.vue
index 39d0171..0955a00 100644
--- a/src/components/Crontab/second.vue
+++ b/src/components/Crontab/second.vue
@@ -1,5 +1,5 @@
<template>
- <el-form size="small">
+ <el-form>
<el-form-item>
<el-radio v-model='radioValue' :label="1">
绉掞紝鍏佽鐨勯�氶厤绗, - * /]
diff --git a/src/components/Crontab/week.vue b/src/components/Crontab/week.vue
index a346eb7..0309670 100644
--- a/src/components/Crontab/week.vue
+++ b/src/components/Crontab/week.vue
@@ -1,5 +1,5 @@
<template>
- <el-form size='small'>
+ <el-form>
<el-form-item>
<el-radio v-model='radioValue' :label="1">
鍛紝鍏佽鐨勯�氶厤绗, - * ? / L #]
diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue
index 43c13e1..5d8c1e1 100644
--- a/src/components/Crontab/year.vue
+++ b/src/components/Crontab/year.vue
@@ -1,5 +1,5 @@
<template>
- <el-form size="small">
+ <el-form>
<el-form-item>
<el-radio :label="1" v-model='radioValue'>
涓嶅～锛屽厑璁哥殑閫氶厤绗, - * /]
@@ -15,16 +15,16 @@
<el-form-item>
<el-radio :label="3" v-model='radioValue'>
鍛ㄦ湡浠�
- <el-input-number v-model='cycle01' :min='fullYear' :max="maxFullYear - 1" /> -
- <el-input-number v-model='cycle02' :min="cycle01 + 1" :max="maxFullYear" />
+ <el-input-number v-model='cycle01' :min='fullYear' :max="2098"/> -
+ <el-input-number v-model='cycle02' :min="cycle01 ? cycle01 + 1 : fullYear + 1" :max="2099"/>
</el-radio>
</el-form-item>
<el-form-item>
<el-radio :label="4" v-model='radioValue'>
浠�
- <el-input-number v-model='average01' :min='fullYear' :max="maxFullYear - 1"/> 骞村紑濮嬶紝姣�
- <el-input-number v-model='average02' :min="1" :max="10" /> 骞存墽琛屼竴娆�
+ <el-input-number v-model='average01' :min='fullYear' :max="2098"/> 骞村紑濮嬶紝姣�
+ <el-input-number v-model='average02' :min="1" :max="2099 - average01 || fullYear"/> 骞存墽琛屼竴娆�
</el-radio>
</el-form-item>
diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue
index 190daab..5222925 100644
--- a/src/components/ImagePreview/index.vue
+++ b/src/components/ImagePreview/index.vue
@@ -4,7 +4,7 @@
fit="cover"
:style="`width:${realWidth};height:${realHeight};`"
:preview-src-list="realSrcList"
- :preview-teleported="true"
+ preview-teleported
>
<template #error>
<div class="image-slot">
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 9c453f2..8820acb 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -10,7 +10,7 @@
<el-tooltip class="item" effect="dark" content="鏄鹃殣鍒�" placement="top" v-if="columns">
<el-button circle icon="Menu" @click="showColumn()" v-if="showColumnsType == 'transfer'"/>
<el-dropdown trigger="click" :hide-on-click="false" style="padding-left: 12px" v-if="showColumnsType == 'checkbox'">
- <el-button size="mini" circle icon="Menu" />
+ <el-button circle icon="Menu" />
<template #dropdown>
<el-dropdown-menu>
<template v-for="item in columns" :key="item.key">
diff --git a/src/layout/components/IframeToggle/index.vue b/src/layout/components/IframeToggle/index.vue
index 2109c20..4f43904 100644
--- a/src/layout/components/IframeToggle/index.vue
+++ b/src/layout/components/IframeToggle/index.vue
@@ -1,13 +1,11 @@
<template>
- <transition-group name="fade-transform" mode="out-in">
- <inner-link
- v-for="(item, index) in tagsViewStore.iframeViews"
- :key="item.path"
- :iframeId="'iframe' + index"
- v-show="route.path === item.path"
- :src="iframeUrl(item.meta.link, item.query)"
- ></inner-link>
- </transition-group>
+ <inner-link
+ v-for="(item, index) in tagsViewStore.iframeViews"
+ :key="item.path"
+ :iframeId="'iframe' + index"
+ v-show="route.path === item.path"
+ :src="iframeUrl(item.meta.link, item.query)"
+ ></inner-link>
</template>
<script setup>
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 3bf28fe..38f2d2b 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -38,35 +38,35 @@
<div class="drawer-item">
<span>寮�鍚� TopNav</span>
<span class="comp-style">
- <el-switch v-model="topNav" class="drawer-switch" />
+ <el-switch v-model="settingsStore.topNav" class="drawer-switch" />
</span>
</div>
<div class="drawer-item">
<span>寮�鍚� Tags-Views</span>
<span class="comp-style">
- <el-switch v-model="tagsView" class="drawer-switch" />
+ <el-switch v-model="settingsStore.tagsView" class="drawer-switch" />
</span>
</div>
<div class="drawer-item">
<span>鍥哄畾 Header</span>
<span class="comp-style">
- <el-switch v-model="fixedHeader" class="drawer-switch" />
+ <el-switch v-model="settingsStore.fixedHeader" class="drawer-switch" />
</span>
</div>
<div class="drawer-item">
<span>鏄剧ず Logo</span>
<span class="comp-style">
- <el-switch v-model="sidebarLogo" class="drawer-switch" />
+ <el-switch v-model="settingsStore.sidebarLogo" class="drawer-switch" />
</span>
</div>
<div class="drawer-item">
<span>鍔ㄦ�佹爣棰�</span>
<span class="comp-style">
- <el-switch v-model="dynamicTitle" class="drawer-switch" />
+ <el-switch v-model="settingsStore.dynamicTitle" class="drawer-switch" />
</span>
</div>
@@ -80,7 +80,6 @@
<script setup>
import variables from '@/assets/styles/variables.module.scss'
-import originElementPlus from 'element-plus/theme-chalk/index.css'
import axios from 'axios'
import { ElLoading, ElMessage } from 'element-plus'
import { useDynamicTitle } from '@/utils/dynamicTitle'
@@ -99,55 +98,12 @@
const storeSettings = computed(() => settingsStore);
const predefineColors = ref(["#409EFF", "#ff4500", "#ff8c00", "#ffd700", "#90ee90", "#00ced1", "#1e90ff", "#c71585"]);
-/** 鏄惁闇�瑕乼opnav */
-const topNav = computed({
- get: () => storeSettings.value.topNav,
- set: (val) => {
- settingsStore.changeSetting({ key: 'topNav', value: val })
- if (!val) {
- appStore.toggleSideBarHide(false);
- permissionStore.setSidebarRouters(permissionStore.defaultRoutes);
- }
- }
-})
-/** 鏄惁闇�瑕乼agview */
-const tagsView = computed({
- get: () => storeSettings.value.tagsView,
- set: (val) => {
- settingsStore.changeSetting({ key: 'tagsView', value: val })
- }
-})
-/**鏄惁闇�瑕佸浐瀹氬ご閮� */
-const fixedHeader = computed({
- get: () => storeSettings.value.fixedHeader,
- set: (val) => {
- settingsStore.changeSetting({ key: 'fixedHeader', value: val })
- }
-})
-/**鏄惁闇�瑕佷晶杈规爮鐨刲ogo */
-const sidebarLogo = computed({
- get: () => storeSettings.value.sidebarLogo,
- set: (val) => {
- settingsStore.changeSetting({ key: 'sidebarLogo', value: val })
- }
-})
-/**鏄惁闇�瑕佷晶杈规爮鐨勫姩鎬佺綉椤电殑title */
-const dynamicTitle = computed({
- get: () => storeSettings.value.dynamicTitle,
- set: (val) => {
- settingsStore.changeSetting({ key: 'dynamicTitle', value: val })
- // 鍔ㄦ�佽缃綉椤垫爣棰�
- useDynamicTitle()
- }
-})
-
function themeChange(val) {
- settingsStore.changeSetting({ key: 'theme', value: val })
- theme.value = val;
+ settingsStore.theme = val;
handleThemeStyle(val);
}
function handleTheme(val) {
- settingsStore.changeSetting({ key: 'sideTheme', value: val })
+ settingsStore.sideTheme = val;
sideTheme.value = val;
}
function saveSetting() {
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index b9827ce..b92ace2 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -9,7 +9,7 @@
</app-link>
</template>
- <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
+ <el-sub-menu v-else ref="subMenu" :index="resolvePath(item.path)" teleported>
<template v-if="item.meta" #title>
<svg-icon :icon-class="item.meta && item.meta.icon" />
<span class="menu-title" :title="hasTitle(item.meta.title)">{{ item.meta.title }}</span>
diff --git a/src/main.js b/src/main.js
index f349872..a7645fb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,7 +3,8 @@
import Cookies from 'js-cookie'
import ElementPlus from 'element-plus'
-import locale from 'element-plus/lib/locale/lang/zh-cn' // 涓枃璇█
+import 'element-plus/dist/index.css'
+import locale from 'element-plus/es/locale/lang/zh-cn'
import '@/assets/styles/index.scss' // global css
--
Gitblit v1.9.3