Commit e154d1366cfa9f605f20e817807ba96a048eceda

Authored by HUCHAOQI
Committed by GitHub
1 parent 34237ef0

Fix/views login (#2789)

* fix(table): 使用lodash 的merge来递归assign,优化在多对象嵌套情况下的结构

* fix(view): 修复登入页面点击其他登入方式后返回时视图异常的bug
src/views/sys/login/MobileForm.vue
1 <template> 1 <template>
2 - <template v-if="getShow"> 2 + <div v-if="getShow">
3 <LoginFormTitle class="enter-x" /> 3 <LoginFormTitle class="enter-x" />
4 <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef"> 4 <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
5 <FormItem name="mobile" class="enter-x"> 5 <FormItem name="mobile" class="enter-x">
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 </Button> 28 </Button>
29 </FormItem> 29 </FormItem>
30 </Form> 30 </Form>
31 - </template> 31 + </div>
32 </template> 32 </template>
33 <script lang="ts" setup> 33 <script lang="ts" setup>
34 import { reactive, ref, computed, unref } from 'vue'; 34 import { reactive, ref, computed, unref } from 'vue';
src/views/sys/login/QrCodeForm.vue
1 <template> 1 <template>
2 - <template v-if="getShow"> 2 + <div v-if="getShow">
3 <LoginFormTitle class="enter-x" /> 3 <LoginFormTitle class="enter-x" />
4 <div class="enter-x min-w-64 min-h-64"> 4 <div class="enter-x min-w-64 min-h-64">
5 <QrCode 5 <QrCode
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 {{ t('sys.login.backSignIn') }} 12 {{ t('sys.login.backSignIn') }}
13 </Button> 13 </Button>
14 </div> 14 </div>
15 - </template> 15 + </div>
16 </template> 16 </template>
17 <script lang="ts" setup> 17 <script lang="ts" setup>
18 import { computed, unref } from 'vue'; 18 import { computed, unref } from 'vue';
src/views/sys/login/RegisterForm.vue
1 <template> 1 <template>
2 - <template v-if="getShow"> 2 + <div v-if="getShow">
3 <LoginFormTitle class="enter-x" /> 3 <LoginFormTitle class="enter-x" />
4 <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef"> 4 <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
5 <FormItem name="account" class="enter-x"> 5 <FormItem name="account" class="enter-x">
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 {{ t('sys.login.backSignIn') }} 63 {{ t('sys.login.backSignIn') }}
64 </Button> 64 </Button>
65 </Form> 65 </Form>
66 - </template> 66 + </div>
67 </template> 67 </template>
68 <script lang="ts" setup> 68 <script lang="ts" setup>
69 import { reactive, ref, unref, computed } from 'vue'; 69 import { reactive, ref, unref, computed } from 'vue';