From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-ui/src/layout/components/Settings/index.vue | 23 ++++++-----------------
1 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/ruoyi-ui/src/layout/components/Settings/index.vue b/ruoyi-ui/src/layout/components/Settings/index.vue
index a96b73f..f490b99 100644
--- a/ruoyi-ui/src/layout/components/Settings/index.vue
+++ b/ruoyi-ui/src/layout/components/Settings/index.vue
@@ -108,6 +108,7 @@
value: val
})
if (!val) {
+ this.$store.dispatch('app/toggleSideBarHide', false);
this.$store.commit("SET_SIDEBAR_ROUTERS", this.$store.state.permission.defaultRoutes);
}
}
@@ -162,14 +163,8 @@
this.sideTheme = val;
},
saveSetting() {
- const loading = this.$loading({
- lock: true,
- fullscreen: false,
- text: "姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍚�...",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)"
- });
- localStorage.setItem(
+ this.$modal.loading("姝ｅ湪淇濆瓨鍒版湰鍦帮紝璇风◢鍊�...");
+ this.$cache.local.set(
"layout-setting",
`{
"topNav":${this.topNav},
@@ -181,17 +176,11 @@
"theme":"${this.theme}"
}`
);
- setTimeout(loading.close(), 1000)
+ setTimeout(this.$modal.closeLoading(), 1000)
},
resetSetting() {
- this.$loading({
- lock: true,
- fullscreen: false,
- text: "姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍚�...",
- spinner: "el-icon-loading",
- background: "rgba(0, 0, 0, 0.7)"
- });
- localStorage.removeItem("layout-setting")
+ this.$modal.loading("姝ｅ湪娓呴櫎璁剧疆缂撳瓨骞跺埛鏂帮紝璇风◢鍊�...");
+ this.$cache.local.remove("layout-setting")
setTimeout("window.location.reload()", 1000)
}
}
--
Gitblit v1.9.3