From dbcfcd751e5a17dc89a4c7a01f8f278857a84af3 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 1 Mar 2024 15:31:32 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AF=86=E7=A0=81=E8=BE=93=E5=85=A5=E6=A1=86=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mobile/login/index.vue          | 25 +++++++++++++++++--
 .../views/visualized/data/dataset/index.vue   | 10 +++++++-
 .../visualized/data/datasource/index.vue      | 11 +++++++-
 3 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/views/mobile/login/index.vue b/core/core-frontend/src/views/mobile/login/index.vue
index 08d9eb9ffa..b9f60dfcbd 100644
--- a/core/core-frontend/src/views/mobile/login/index.vue
+++ b/core/core-frontend/src/views/mobile/login/index.vue
@@ -46,6 +46,10 @@ const validatePwd = value => {
   return regep.test(value)
 }
 
+const visible = ref(true)
+const clickRightIcon = () => {
+  visible.value = !visible.value
+}
 const onSubmit = async () => {
   if (!checkUsername(username.value) || !validatePwd(password.value)) {
     showToast({
@@ -106,13 +110,21 @@ const usernameEndValidate = ({ status, message }) => {
           </div>
           <van-field
             v-model="password"
-            type="password"
+            :type="visible ? 'password' : 'text'"
+            @click-right-icon="clickRightIcon"
             :style="{ borderColor: !!passwordError ? '#F54A45' : '#bbbfc4' }"
             name="密码"
             placeholder="请输入密码"
             :rules="[{ required: true, message: '请填写密码' }]"
             @end-validate="passwordEndValidate"
-          />
+          >
+            <template #right-icon>
+              <el-icon>
+                <Icon v-if="visible" name="icon_invisible_outlined"></Icon>
+                <Icon v-else name="icon_visible_outlined"></Icon>
+              </el-icon>
+            </template>
+          </van-field>
           <div v-if="!!passwordError" class="van-ed-error">
             {{ passwordError }}
           </div>
@@ -159,6 +171,15 @@ const usernameEndValidate = ({ status, message }) => {
       color: #f54a45;
     }
 
+    .van-field__right-icon {
+      padding: 0;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-right: -2px;
+      font-size: 20px;
+    }
+
     .van-field {
       border: 1px solid #bbbfc4;
       border-radius: 4px;
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index 1cc623bf9a..70cd915c61 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -599,7 +599,12 @@ const getMenuList = (val: boolean) => {
       </div>
     </el-aside>
 
-    <div class="dataset-content" :class="(isDataEaseBi || isIframe) && 'h100'">
+    <div
+      class="dataset-content"
+      :class="{
+        auto: isIframe
+      }"
+    >
       <template v-if="!state.datasetTree.length && mounted">
         <empty-background description="暂无数据集" img-type="none">
           <el-button
@@ -794,6 +799,9 @@ const getMenuList = (val: boolean) => {
 
   .dataset-content {
     background: #f5f6f7;
+    &.auto {
+      height: auto;
+    }
   }
 
   .dataset-list {
diff --git a/core/core-frontend/src/views/visualized/data/datasource/index.vue b/core/core-frontend/src/views/visualized/data/datasource/index.vue
index 09111b7698..492f134649 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/index.vue
@@ -808,7 +808,13 @@ const getMenuList = (val: boolean) => {
       </div>
     </el-aside>
 
-    <div class="datasource-content" :class="(isDataEaseBi || isIframe) && 'h100'">
+    <div
+      class="datasource-content"
+      :class="{
+        auto: isIframe,
+        h100: isDataEaseBi || isIframe
+      }"
+    >
       <template v-if="!state.datasourceTree.length && mounted">
         <empty-background description="暂无数据源" img-type="none">
           <el-button
@@ -1620,6 +1626,9 @@ const getMenuList = (val: boolean) => {
   .datasource-content {
     background: #f5f6f7;
     overflow-y: auto;
+    &.auto {
+      height: auto;
+    }
   }
 
   .m24 {