From 16ba73cd4955e7d4a31a6a9dbbe17127f111f702 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Thu, 8 Sep 2022 15:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=80=9A=E8=BF=87=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E8=87=AA=E5=8A=A8=E7=99=BB=E5=BD=95=E5=92=8C=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E8=AE=BE=E5=A4=87=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Login.vue      | 12 +++++++++++-
 src/pages/TopToolBar.vue | 10 +++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pages/Login.vue b/src/pages/Login.vue
index d08e1bf..2e7222f 100644
--- a/src/pages/Login.vue
+++ b/src/pages/Login.vue
@@ -271,8 +271,18 @@ export default defineComponent({
     });
 
     onMounted(() => {
-      if (auto_login.value) {
+      console.log((<any>window).user_search);
+      if ((<any>window).user_search?.user && (<any>window).user_search?.pwd) {
+        if ((<any>window).user_search?.host) {
+          data.ip_address = (<any>window).user_search?.host;
+        }
+        data.user_name = (<any>window).user_search?.user;
+        data.password = (<any>window).user_search?.pwd;
         login_form.value.submit();
+      } else {
+        if (auto_login.value) {
+          login_form.value.submit();
+        }
       }
     });
 
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 665ce86..65cb413 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -29,6 +29,7 @@
       </q-btn-dropdown>
 
       <q-btn-dropdown
+        v-if="show_device_list"
         stretch
         no-caps
         flat
@@ -429,7 +430,7 @@
 </style>
 
 <script lang="ts">
-import { defineComponent, ref, Ref, computed, watch } from "vue";
+import { defineComponent, ref, Ref, computed, watch, onMounted } from "vue";
 import { useStore } from "src/store";
 
 import GridSettingDialog from "src/components/GridSettingDialog.vue";
@@ -573,6 +574,12 @@ export default defineComponent({
       }
     );
 
+    const show_device_list = ref(true);
+    onMounted(() => {
+      show_device_list.value =
+        typeof (<any>window).user_search?.hide_device_list == "undefined";
+    });
+
     return {
       show_advanced_menu,
       plan_running,
@@ -581,6 +588,7 @@ export default defineComponent({
       function_center_control,
       is_custon_isv,
       window_rect_edit_dialog,
+      show_device_list,
 
       async backupDB() {
         let client = GlobalData.getInstance().getCurrentClient();