Skip to content

fix: Resolve the error in file management #8966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f2c-ci-robot merged 1 commit into from
Jun 9, 2025
Merged

fix: Resolve the error in file management #8966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions frontend/src/components/file-list/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="hidden-paths">
<div v-for="(item, index) in paths.slice(1, -1)" :key="index">
<svg-icon :class="'table-icon'" iconName="p-file-folder"></svg-icon>
<el-link :underline="false" @click="jump(index + 1)">{{ item }}</el-link>
<el-link underline="never" @click="jump(index + 1)">{{ item }}</el-link>
</div>
</div>
</el-popover>
Expand Down Expand Up @@ -60,7 +60,7 @@
></svg-icon>

<template v-if="!row.isCreate">
<el-link :underline="false" @click="open(row)">
<el-link underline="never" @click="open(row)">
{{ row.name }}
</el-link>
</template>
Copy link
Copy Markdown
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The provided code snippet appears to be a Vue.js template with modifications aimed at improving the appearance and functionality of certain components using Element UI library elements like svg-icon, el-link, and el-popover. The changes include changing the value of the underline property from "false" to "never", which is not an actual property of Element UI's el-link component.

Here are some observations:

  1. Underline Property: In Element UI, the link-underline prop can have three values: "always", "never", or "hover".

    • "always" means the link will always have underline.
    • "never" means the link should never have underline.
    • "hover" means the link will have underline only on hover.

  2. Correct Usage of Link Underlining:
    To correctly set the link underlining for both the external links in the paths.slice(1, -1) iteration and the name displayed when not creating (row.isCreate), you should use "hover" or remove the underline attribute entirely if no specific styling is desired.

  3. Recommended Changes:
    Assuming you want the default behavior of underline (like <a>...</a> tags do) instead of disabling it completely, you can change the attributes like this:

@@ -22,7 +22,7 @@
                     <div class="hidden-paths">
                         <div v-for="(item, index) in paths.slice(1, -1)" :key="index">
                             <svg-icon :class="'table-icon'" iconName="p-file-folder"></svg-icon>
-                            <el-link :underline="false" @click="jump(index + 1)">{{ item }}</el-link>
+                            <el-link hover @click="jump(index + 1)">{{ item }}</el-link>
                         </div>
                     </div>
                 </el-popover>
@@ -60,7 +60,7 @@
                             ></svg-icon>
 
                             <template v-if="!row.isCreate">
-                                <el-link :underline="false" @click="open(row)">
+                                <el-link hover @click="open(row)">
                                     {{ row.name }}
                                 </el-link>
                             </template>

However, if you specifically don't want any underlines, then the most accurate update would be removing the entire underline attribute altogether:

@@ -22,7 +22,6 @@
                     <div class="hidden-paths">
                         <div v-for="(item, index) in paths.slice(1, -1)" :key="index">
                             <svg-icon :class="'table-icon'" iconName="p-file-folder"></svg-icon>
-                            <el-link :underline="false" @click="jump(index + 1)">{{ item }}</el-link>
+                            <el-link @click="jump(index + 1)">{{ item }}</el-link>
                         </div>
                     </div>
                 </el-popover>
@@ -60,7 +59,6 @@
                             ></svg-icon>
 
                             <template v-if="!row.isCreate">
-                                <el-link :underline="false" @click="open(row)">
+                                <el-link @click="open(row)">
                                     {{ row.name }}
                                 </el-link>
                             </template>

Choose the one that best fits your design requirements. If the intention was to disable the underline, the second version is more direct; if keeping it as "auto" or "default," the first version should work.

Expand Down
12 changes: 6 additions & 6 deletions frontend/src/components/system-upgrade/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,28 @@
<div class="flex w-full flex-col gap-2 md:flex-row items-center">
<div class="flex flex-wrap gap-y-2 items-center">
<span v-if="props.footer">
<el-link type="primary" :underline="false" @click="toForum">
<el-link type="primary" underline="never" @click="toForum">
<span class="font-normal">{{ $t('setting.forum') }}</span>
</el-link>
<el-divider direction="vertical" />
<el-link type="primary" :underline="false" @click="toDoc">
<el-link type="primary" underline="never" @click="toDoc">
<span class="font-normal">{{ $t('setting.doc2') }}</span>
</el-link>
<el-divider direction="vertical" />
<el-link type="primary" :underline="false" @click="toGithub">
<el-link type="primary" underline="never" @click="toGithub">
<span class="font-normal">{{ $t('setting.project') }}</span>
</el-link>
<el-divider direction="vertical" />
</span>
<div class="flex flex-wrap items-center">
<el-link :underline="false" type="primary" @click="toLxware">
<el-link underline="never" type="primary" @click="toLxware">
{{ $t(!isMasterPro ? 'license.community' : 'license.pro') }}
</el-link>
<el-link :underline="false" class="version" type="primary" @click="copyText(version)">
<el-link underline="never" class="version" type="primary" @click="copyText(version)">
{{ version }}
</el-link>
<el-badge is-dot class="-mt-0.5" :hidden="version === 'Waiting' || !globalStore.hasNewVersion">
<el-link class="ml-2" :underline="false" type="primary" @click="onLoadUpgradeInfo">
<el-link class="ml-2" underline="never" type="primary" @click="onLoadUpgradeInfo">
{{ $t('commons.button.update') }}
</el-link>
</el-badge>
Copy link
Copy Markdown
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some minor issues can be addressed here:

  1. <el-link> Tag Attributes:

    • Ensure that type="primary" is consistent across all <el-link> instances for consistency.
    • The use of :underline="false" or underline="never" might depend on other styling requirements but should not affect functionality.

  2. Button Text Translations:

    • Verify that translations ($t() calls) remain accurate and up-to-date with current content.

  3. Link Classes:

    • The class="flex flex-wrap items-center" is applied twice which seems redundant; ensure the styles are correctly set elsewhere if necessary.

  4. Badge Display Condition:

    • Confirm that version !== 'Waiting' || !globalStore.hasNewVersion makes sense logically—ensure it's intended to hide the badge under certain conditions.

These checks should help identify simple issues before proceeding further with implementation or deployment.

Expand Down
4 changes: 2 additions & 2 deletions frontend/src/views/app-store/detail/params/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
></el-option>
</el-select>
<span v-if="p.type === 'service' && p.services.length === 0" class="ml-1.5">
<el-link type="primary" :underline="false" @click="toPage(p.key)">
<el-link type="primary" underline="never" @click="toPage(p.key)">
{{ $t('app.toInstall') }}
</el-link>
</span>
Expand Down Expand Up @@ -110,7 +110,7 @@
</el-col>
<el-col>
<span v-if="p.child.type === 'service' && p.services.length === 0">
<el-link type="primary" :underline="false" @click="toPage(form[p.envKey])">
<el-link type="primary" underline="never" @click="toPage(form[p.envKey])">
{{ $t('app.toInstall') }}
</el-link>
</span>
Expand Down
11 changes: 6 additions & 5 deletions frontend/src/views/host/file-management/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,19 +433,19 @@
</el-table-column>
<el-table-column :label="$t('file.mode')" prop="mode" min-width="110">
<template #default="{ row }">
<el-link :underline="false" @click="openMode(row)">{{ row.mode }}</el-link>
<el-link underline="never" @click="openMode(row)">{{ row.mode }}</el-link>
</template>
</el-table-column>
<el-table-column :label="$t('commons.table.user')" prop="user" show-overflow-tooltip min-width="90">
<template #default="{ row }">
<el-link :underline="false" @click="openChown(row)">
<el-link underline="never" @click="openChown(row)">
{{ row.user ? row.user : '-' }} ({{ row.uid }})
</el-link>
</template>
</el-table-column>
<el-table-column :label="$t('file.group')" prop="group" show-overflow-tooltip>
<template #default="{ row }">
<el-link :underline="false" @click="openChown(row)">
<el-link underline="never" @click="openChown(row)">
{{ row.group ? row.group : '-' }} ({{ row.gid }})
</el-link>
</template>
Expand Down Expand Up @@ -706,9 +706,10 @@ const searchFile = async () => {
const handleSearchResult = (res: ResultData<File.File>) => {
paginationConfig.total = res.data.itemTotal;
if (isHidden.value) {
data.value = res.data.items.filter((item) => !item.isHidden);
const items = res.data.items || [];
data.value = items.filter((item) => !item.isHidden);
} else {
data.value = res.data.items;
data.value = res.data.items || [];
}
dirNum.value = data.value.filter((item) => item.isDir).length;
fileNum.value = data.value.filter((item) => !item.isDir).length;
Copy link
Copy Markdown
Member

@wanghe-fit2cloud wanghe-fit2cloud Jun 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only change between versions is that false has been replaced with "never" in the underline attribute of two <el-link> components. This change does not introduce any new features, bugs, or performance optimizations.

Summary:
There are no major changes to be addressed in this code snippet. The update to use "never" instead of false for linking styles should have no impact on functionality, but it's good practice to ensure consistent coding style across the project.

If there were other specific areas needing review or concern, those would need to be identified separately before making decisions.

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/website/website/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@
></el-date-picker>
</div>
<div v-else>
<el-link type="primary" :underline="false" @click.stop="openDatePicker(row)">
<el-link type="primary" underline="never" @click.stop="openDatePicker(row)">
<span v-if="isEver(row.expireDate)">
{{ $t('website.neverExpire') }}
</span>
Expand Down
Loading