merge wsw into master

fix: login modal size

Created-by: yfzmpj
Commit-by: 汪少伟
Merged-by: yfzmpj
Description: fix: login modal size

See merge request: hk_openRepo/OpenRepo_Portal!46

src/components/LoginModal/index.vue

@@ -794,10 +794,15 @@ $active-title: var(--color-CG900);
 $active-color: var(--color-CG800);
 $inactive-title: var(--color-CG500);
 $active-panel: var(--color-G800);
-iframe {
+.login-modal-l iframe {
   border: 0;
   width: 100%;
-  height: 60vh;
+  height: 400px;
+}
+.login-modal-r iframe {
+  border: 0;
+  width: 100%;
+  height: 580px;
 }
 .login-modal {
   box-sizing: border-box;

src/views/Jyh/Home/index.vue

@@ -48,13 +48,7 @@
             </div>
           </template>
         </d-input>
-        <d-dropdown-menu
+        <d-dropdown-menu v-model="isOpen" :origin="searchInput?.$el" :offset="offset">
-          v-model="isOpen"
-          :origin="searchInput?.$el"
-          close-scope="'blank'"
-          :offset="offset"
-          :clickOutside="closeOutside"
-        >
           <div class="advanced-search-menu" :style="{ width: dropdownWidth + 'px' }">
             <AdvanceSearch @submit="submit($event)" @cancel="isOpen = false" class="p-20" :layout="'vertical'">
               <template #title>
@@ -131,6 +125,7 @@ const industryOptions = ref(['通信', '军工', '金融', '能源']);
 const searchType = ref('软件');
 const searchOptions = ref(['软件']);
 const offset = ref({ mainAxis: 7, crossAxis: -10 });
+const isKeepOpen = ref(true);
 const isOpen = ref(false);
 const rotate = ref(0);
 const cateRotate = ref(0);