From a7376b36f8040032cd9ce5f2394dc83a30fdf2a9 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期三, 08 九月 2021 11:19:59 +0800
Subject: [PATCH] !312 修复代码生成页面数据编辑保存之后总是跳转第一页的问题 Merge pull request !312 from 稚屿/master
---
ruoyi-ui/src/components/ThemePicker/index.vue | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/ruoyi-ui/src/components/ThemePicker/index.vue b/ruoyi-ui/src/components/ThemePicker/index.vue
index 9a77cd3..6dd85f9 100644
--- a/ruoyi-ui/src/components/ThemePicker/index.vue
+++ b/ruoyi-ui/src/components/ThemePicker/index.vue
@@ -31,14 +31,24 @@
immediate: true
},
async theme(val) {
+ await this.setTheme(val)
+ }
+ },
+ created() {
+ if(this.defaultTheme !== ORIGINAL_THEME) {
+ this.setTheme(this.defaultTheme)
+ }
+ },
+
+ methods: {
+ async setTheme(val) {
const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
if (typeof val !== 'string') return
const themeCluster = this.getThemeCluster(val.replace('#', ''))
const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
- console.log(themeCluster, originalCluster)
const $message = this.$message({
- message: ' Compiling the theme',
+ message: ' 正在切换主题，请稍后...',
customClass: 'theme-message',
type: 'success',
duration: 0,
@@ -83,10 +93,9 @@
this.$emit('change', val)
$message.close()
- }
- },
- methods: {
+ },
+
updateStyle(style, oldCluster, newCluster) {
let newStyle = style
oldCluster.forEach((color, index) => {
--
Gitblit v1.9.2