Skip to content

Commit

Permalink
Merge pull request #42 from beclab/fix/search_enter
Browse files Browse the repository at this point in the history 
fix: add terminusLanguage
  • Loading branch information
@wushuangs
wushuangs authored Sep 5, 2024
2 parents 00bb359 + 4302f13 commit 466eaa2
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 99 deletions.
4 changes: 4 additions & 0 deletions packages/frontend/quasar.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ module.exports = configure(function (ctx) {
pathRewrite: {
'^/api': 'api'
}
},
'/seahub': {
target: process.env.URL,
changeOrigin: true
}
},
port: 9000
Expand Down
20 changes: 20 additions & 0 deletions packages/frontend/src/App.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import { useTokenStore } from './stores/token';
import { useSocketStore } from './stores/websocketStore';
import axios from 'axios';
import { WebPlatform } from './utils/platform';
import { supportLanguages } from './i18n';
import { i18n } from './boot/i18n';
const platform = new WebPlatform();
Expand Down Expand Up @@ -58,6 +60,24 @@ export default defineComponent({
websocketStore.start();
});
let terminusLanguage = '';
let terminusLanguageInfo: any = document.querySelector(
'meta[name="terminus-language"]'
);
if (terminusLanguageInfo && terminusLanguageInfo.content) {
terminusLanguage = terminusLanguageInfo.content;
} else {
terminusLanguage = navigator.language;
}
console.log(navigator.language);
if (terminusLanguage) {
if (supportLanguages.find((e) => e.value == terminusLanguage)) {
i18n.global.locale.value = terminusLanguage as any;
}
}
return {};
}
});
Expand Down
201 changes: 102 additions & 99 deletions packages/frontend/src/pages/Search/TextSearch.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,108 +27,112 @@
/>
</div>
<div class="files">
<div class="fileDetails q-pa-md" v-if="fileData && fileData.length > 0">
<div
class="fileItem q-pa-sm q-mb-xs"
:class="activeItem === file.id ? 'active' : ''"
v-for="(file, index) in fileData"
:key="file.id"
@click="clickItem(file, index)"
>
<div class="item-icon">
<img
v-if="item?.name === 'Wise' && file.meta?.image_url"
class="icon"
:src="
file.meta?.image_url
? file.meta?.image_url
: './../../assets/search-wise-default.png'
"
alt="file"
/>

<img
v-else-if="item?.name === 'Wise' && !file.meta?.image_url"
class="icon"
style="width: 48px; height: 48px"
src="./../../assets/search-wise-default.png"
alt="file"
/>

<img
v-else
class="icon"
:src="
!file.isDir
? `/files/file-${file.fileIcon}.svg`
: `/files/folder-default.svg`
"
alt="file"
/>
</div>
<div class="item-content q-mx-md">
<div
class="title"
v-if="file.highlight_field === 'title'"
v-html="file.highlight"
></div>
<div class="title" v-else>
{{ file.title }}
<div class="fileDetails" v-if="fileData && fileData.length > 0">
<bt-scroll-area class="full-width full-height q-pa-md">
<div
class="fileItem q-pa-sm q-mb-xs"
:class="activeItem === file.id ? 'active' : ''"
v-for="(file, index) in fileData"
:key="file.id"
@click="clickItem(file, index)"
>
<div class="item-icon">
<img
v-if="item?.name === 'Wise' && file.meta?.image_url"
class="icon"
:src="
file.meta?.image_url
? file.meta?.image_url
: './../../assets/search-wise-default.png'
"
alt="file"
/>

<img
v-else-if="item?.name === 'Wise' && !file.meta?.image_url"
class="icon"
style="width: 48px; height: 48px"
src="./../../assets/search-wise-default.png"
alt="file"
/>

<img
v-else
class="icon"
:src="
!file.isDir
? `/files/file-${file.fileIcon}.svg`
: `/files/folder-default.svg`
"
alt="file"
/>
</div>

<div class="desc q-my-xs" v-if="item?.name === 'Wise'">
<span>Author: {{ file.author || '-' }}</span>
<span v-if="file.meta && file.meta.published_at">
Published at:
{{
date.formatDate(
file.meta.published_at * 1000,
'MMM Do YYYY, HH:mm:ss'
)
}}
</span>

<!-- <span>{{ file.path }}</span> -->
<div class="item-content q-mx-md">
<div
class="title"
v-if="file.highlight_field === 'title'"
v-html="file.highlight"
></div>
<div class="title" v-else>
{{ file.title }}
</div>

<div class="desc q-my-xs" v-if="item?.name === 'Wise'">
<span>Author: {{ file.author || '-' }}</span>
<span v-if="file.meta && file.meta.published_at">
Published at:
{{
date.formatDate(
file.meta.published_at * 1000,
'MMM Do YYYY, HH:mm:ss'
)
}}
</span>

<!-- <span>{{ file.path }}</span> -->
</div>

<div class="desc q-my-xs" v-else>
<span v-if="file.owner_userid"
>Owner: {{ file.owner_userid }}</span
>
<span v-if="file.meta && file.meta.updated">
Modified:
{{
date.formatDate(
file.meta.updated * 1000,
'MMM Do YYYY, HH:mm:ss'
)
}}
</span>
<span>{{ file.path }}</span>
</div>

<div
class="context"
v-if="file.highlight_field === 'content'"
v-html="file.highlight"
></div>
<!-- <div class="context" v-else>{{ item.content }}</div> -->
</div>

<div class="desc q-my-xs" v-else>
<span v-if="file.owner_userid">Owner: {{ file.owner_userid }}</span>
<span v-if="file.meta && file.meta.updated">
Modified:
{{
date.formatDate(
file.meta.updated * 1000,
'MMM Do YYYY, HH:mm:ss'
)
}}
</span>
<span>{{ file.path }}</span>
<div class="item-search">
<q-icon
v-if="file?.name === 'Wise'"
class="icon cursor-pointer"
name="sym_r_share_windows"
size="20px"
@click="open(file)"
/>
<q-icon
v-else
class="icon cursor-pointer"
name="sym_r_search"
size="20px"
@click="open(file)"
/>
</div>

<div
class="context"
v-if="file.highlight_field === 'content'"
v-html="file.highlight"
></div>
<!-- <div class="context" v-else>{{ item.content }}</div> -->
</div>
<div class="item-search">
<q-icon
v-if="file?.name === 'Wise'"
class="icon cursor-pointer"
name="sym_r_share_windows"
size="20px"
@click="open(file)"
/>
<q-icon
v-else
class="icon cursor-pointer"
name="sym_r_search"
size="20px"
@click="open(file)"
/>
</div>
</div>
</bt-scroll-area>
</div>
<div v-else class="no_data column items-center justify-center">
<img class="icon" src="./../../assets/nodata.svg" alt="no_data" />
Expand Down Expand Up @@ -345,7 +349,6 @@ hi {
.fileDetails {
width: 100%;
overflow: scroll;
.fileItem {
width: 100%;
Expand Down

0 comments on commit 466eaa2

Please sign in to comment.