Merge pull request #15 from hiparker/development

2.0.1
hiparker · Dec 28, 2022 · a2fce86 · a2fce86
2 parents 2fc27e7 + a0de17b
commit a2fce86
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/vue-admin-beautiful/patches/zx-layouts+0.6.13.patch b/vue-admin-beautiful/patches/zx-layouts+0.6.13.patch
@@ -1,9 +1,9 @@
 diff --git a/node_modules/zx-layouts/Avatar/components/ChooseTenant.vue b/node_modules/zx-layouts/Avatar/components/ChooseTenant.vue
 new file mode 100644
-index 0000000..9e8486f
+index 0000000..836ea53
 --- /dev/null
 +++ b/node_modules/zx-layouts/Avatar/components/ChooseTenant.vue
-@@ -0,0 +1,186 @@
+@@ -0,0 +1,183 @@
 +<template>
 +  <el-dialog
 +    :title="title"
@@ -128,10 +128,9 @@ index 0000000..9e8486f
 +          const { msg } = await switchOneself();
 +          // 刷新当前用户信息
 +          const flag = await store.dispatch("user/refreshUserPerms");
-+          if(flag){
-+            this.$baseMessage(msg, "success");
-+            location.reload();
-+          }
++          this.$baseMessage(msg, "success");
++          that.close();
++          location.reload();
 +        })
 +      },
 +      close(){
@@ -148,12 +147,10 @@ index 0000000..9e8486f
 +            tenantId: this.selectRow.id
 +          });
 +          // 刷新当前用户信息
-+          const flag = await store.dispatch("user/refreshUserPerms");
-+          if(flag){
-+            this.$baseMessage(msg, "success");
-+            that.close();
-+            location.reload();
-+          }
++          await store.dispatch("user/refreshUserPerms");
++          this.$baseMessage(msg, "success");
++          that.close();
++          location.reload();
 +        })
 +      },
 +      setSelectRow(val) {

diff --git a/vue-admin-beautiful/src/views/index/index.vue b/vue-admin-beautiful/src/views/index/index.vue
@@ -1719,6 +1719,10 @@
             content: "后端：优化WrapperUtil工具类性能，提供分页与Excel导出速度",
             timestamp: "2022-12-28",
           },
+          {
+            content: "前端：修复又是未能成功切换租户问题",
+            timestamp: "2022-12-28",
+          },
           {
             content: "更新opsli-boot 2.0 README描述",
             timestamp: "2022-12-28",