bug修复
This commit is contained in:
+1
-2
@@ -16,8 +16,6 @@
|
||||
</stepin-view>
|
||||
</ThemeProvider>
|
||||
<my-personal ref="personalRef" />
|
||||
<!-- <email-set ref="emailRef" /> -->
|
||||
<!-- <login-modal :unless="['/login']" /> -->
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
@@ -36,6 +34,7 @@ const { logout } = useAccountStore();
|
||||
const showPersonalDrawer = ref<boolean>(false);
|
||||
const personalRef = ref(null);
|
||||
const emailRef = ref(null);
|
||||
const open = ref(true);
|
||||
|
||||
const showSetting = ref(false);
|
||||
const router = useRouter();
|
||||
|
||||
@@ -1,86 +1,265 @@
|
||||
<script lang="ts" setup>
|
||||
import { reactive } from 'vue';
|
||||
import { ref, h, VNode, onMounted } from 'vue';
|
||||
import { StepinHeaderAction } from 'stepin';
|
||||
// import Notice from '@/components/notice/Notice.vue';
|
||||
import DayNightSwitch from '@/components/switch/DayNightSwitch.vue';
|
||||
import { BellOutlined } from '@ant-design/icons-vue';
|
||||
import { TagsOutlined, CopyOutlined } from '@ant-design/icons-vue'; // 移除不需要的图标
|
||||
import Fullscreen from '../fullscreen/Fullscreen.vue';
|
||||
import { useApiStore } from '@/store';
|
||||
import { notification, message } from 'ant-design-vue';
|
||||
|
||||
defineEmits<{
|
||||
(e: 'showSetting'): void;
|
||||
}>();
|
||||
// 版本数据和当前版本状态
|
||||
const dyVersions = ref<string[]>([]);
|
||||
const copyLoading = ref<Record<string, boolean>>({}); // 复制按钮加载状态
|
||||
const notificationKey = ref<string>('version-notification');
|
||||
|
||||
const noticeList = reactive([
|
||||
{
|
||||
title: '消息',
|
||||
list: [
|
||||
{
|
||||
title: '影佑',
|
||||
content: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
|
||||
img: 'src/assets/avatar/face-1.jpg',
|
||||
time: 0,
|
||||
// 复制版本号方法(优化:去除“(当前版本)”标记,只复制纯版本号)
|
||||
const copyVersion = (version: string) => {
|
||||
const pureVersion = version.replace('(当前版本)', '').trim(); // 过滤标记
|
||||
copyLoading.value[version] = true;
|
||||
navigator.clipboard
|
||||
.writeText(pureVersion)
|
||||
.then(() => {
|
||||
message.success(`已复制版本: ${pureVersion}`);
|
||||
})
|
||||
.catch(() => {
|
||||
message.error('复制失败,请手动复制');
|
||||
})
|
||||
.finally(() => {
|
||||
copyLoading.value[version] = false;
|
||||
});
|
||||
};
|
||||
|
||||
// 定义版本列表组件(移除所有额外当前版本标记)
|
||||
const renderVersionList = (): VNode => {
|
||||
return h(
|
||||
'div',
|
||||
{
|
||||
class: 'custom-version-list',
|
||||
style: {
|
||||
width: '100%',
|
||||
padding: '10px 0',
|
||||
boxSizing: 'border-box',
|
||||
display: 'block',
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
},
|
||||
[
|
||||
dyVersions.value.length > 0
|
||||
? dyVersions.value.map((tag, index) => {
|
||||
const isFirstWithCurrent = tag.includes('(当前版本)'); // 只通过文本判断是否为当前版本
|
||||
return h(
|
||||
'div',
|
||||
{
|
||||
class: ['custom-version-item', isFirstWithCurrent ? 'custom-current-version' : ''],
|
||||
key: index,
|
||||
title: isFirstWithCurrent ? '当前使用版本 - 点击右侧按钮复制版本号' : '点击右侧按钮复制版本号',
|
||||
style: {
|
||||
width: '100%',
|
||||
padding: '8px 12px',
|
||||
borderBottom: '1px solid #f0f0f0',
|
||||
borderRadius: '4px',
|
||||
transition: 'all 0.2s',
|
||||
boxSizing: 'border-box',
|
||||
// 核心:块级Flex,强制内部(文字+按钮)一行
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'space-between',
|
||||
whiteSpace: 'nowrap',
|
||||
// 只保留轻微背景色(可选,可删除)
|
||||
backgroundColor: isFirstWithCurrent ? 'rgba(24, 144, 255, 0.05)' : 'transparent',
|
||||
},
|
||||
},
|
||||
[
|
||||
// 文本容器(单行+溢出省略)
|
||||
h(
|
||||
'div',
|
||||
{
|
||||
style: {
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
// 给按钮留固定空间,文本超长时省略
|
||||
maxWidth: 'calc(100% - 40px)',
|
||||
overflow: 'hidden',
|
||||
textOverflow: 'ellipsis',
|
||||
whiteSpace: 'nowrap',
|
||||
},
|
||||
},
|
||||
[
|
||||
h(
|
||||
'span',
|
||||
{
|
||||
style: {
|
||||
fontSize: '14px',
|
||||
color: isFirstWithCurrent ? '#1890ff' : '#1f2937', // 当前版本文字变色(可选,可删除)
|
||||
overflow: 'hidden',
|
||||
textOverflow: 'ellipsis',
|
||||
whiteSpace: 'nowrap',
|
||||
},
|
||||
},
|
||||
tag // 直接显示带“(当前版本)”的文本
|
||||
),
|
||||
]
|
||||
),
|
||||
// 复制按钮(固定大小,不挤压)
|
||||
h(
|
||||
'button',
|
||||
{
|
||||
style: {
|
||||
width: '24px',
|
||||
height: '24px',
|
||||
border: 'none',
|
||||
borderRadius: '4px',
|
||||
backgroundColor: 'transparent',
|
||||
color: copyLoading.value[tag] ? '#d1d5db' : isFirstWithCurrent ? '#1890ff' : '#9ca3af',
|
||||
cursor: copyLoading.value[tag] ? 'not-allowed' : 'pointer',
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
justifyContent: 'center',
|
||||
padding: '0',
|
||||
margin: '0',
|
||||
flexShrink: '0',
|
||||
transition: 'all 0.2s',
|
||||
},
|
||||
onClick: (e: Event) => {
|
||||
e.stopPropagation();
|
||||
copyVersion(tag);
|
||||
},
|
||||
disabled: copyLoading.value[tag],
|
||||
title: copyLoading.value[tag] ? '复制中...' : '复制版本号',
|
||||
},
|
||||
[
|
||||
h(CopyOutlined, {
|
||||
style: {
|
||||
fontSize: '14px',
|
||||
animation: copyLoading.value[tag] ? 'custom-spin 1s linear infinite' : 'none',
|
||||
},
|
||||
}),
|
||||
]
|
||||
),
|
||||
]
|
||||
);
|
||||
})
|
||||
: h(
|
||||
'div',
|
||||
{
|
||||
style: {
|
||||
textAlign: 'center',
|
||||
color: '#999',
|
||||
padding: '20px 0',
|
||||
fontSize: '14px',
|
||||
backgroundColor: '#f9fafb',
|
||||
borderRadius: '8px',
|
||||
margin: '0 12px',
|
||||
},
|
||||
},
|
||||
'暂无版本数据'
|
||||
),
|
||||
]
|
||||
);
|
||||
};
|
||||
|
||||
// 获取版本列表并显示Notification(核心修改这里)
|
||||
const showVersionNotification = () => {
|
||||
useApiStore()
|
||||
.CheckTag()
|
||||
.then((res) => {
|
||||
if (res.code === 1) {
|
||||
dyVersions.value = res.data;
|
||||
const versionLen = dyVersions.value.length;
|
||||
|
||||
if (versionLen > 0) {
|
||||
const newVersions = [...dyVersions.value]; // 深拷贝避免修改原数据
|
||||
|
||||
if (versionLen === 1) {
|
||||
// 只有1个版本:标记为“最新版”
|
||||
newVersions[0] = `${newVersions[0]}(最新版)`;
|
||||
} else {
|
||||
// 大于1个版本:第一个加“当前版本”,最后一个加“最新版”
|
||||
newVersions[0] = `${newVersions[0]}(当前版本)`;
|
||||
const lastIndex = versionLen - 1;
|
||||
newVersions[lastIndex] = `${newVersions[lastIndex]}(最新版)`;
|
||||
}
|
||||
|
||||
dyVersions.value = newVersions;
|
||||
}
|
||||
openVersionNotification();
|
||||
} else {
|
||||
message.error(res.msg);
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
message.error('获取版本列表失败');
|
||||
console.error(err);
|
||||
});
|
||||
};
|
||||
|
||||
// 打开版本通知
|
||||
const openVersionNotification = () => {
|
||||
notification.open({
|
||||
key: notificationKey.value,
|
||||
message: '', // 空消息标题
|
||||
duration: 5, // 5秒自动关闭(可改为0不自动关闭)
|
||||
placement: 'topRight',
|
||||
description: renderVersionList(),
|
||||
style: {
|
||||
width: '520px',
|
||||
minWidth: '520px',
|
||||
marginTop: '50px',
|
||||
height: 'auto',
|
||||
boxShadow: '0 4px 12px rgba(0, 0, 0, 0.08)',
|
||||
borderRadius: '8px',
|
||||
boxSizing: 'border-box',
|
||||
},
|
||||
});
|
||||
|
||||
// 强制覆盖AntD默认换行样式
|
||||
setTimeout(() => {
|
||||
const notificationEl = document.querySelector('.custom-version-notification');
|
||||
if (notificationEl) {
|
||||
const descriptionEls = notificationEl.querySelectorAll('.ant-notification-notice-description');
|
||||
descriptionEls.forEach((el) => {
|
||||
const htmlEl = el as HTMLElement;
|
||||
htmlEl.style.whiteSpace = 'normal';
|
||||
htmlEl.style.width = '100%';
|
||||
htmlEl.style.height = 'auto';
|
||||
htmlEl.style.overflow = 'visible';
|
||||
});
|
||||
}
|
||||
}, 0);
|
||||
};
|
||||
|
||||
// 全局注入加载动画样式
|
||||
onMounted(() => {
|
||||
if (!document.querySelector('#custom-spin-style')) {
|
||||
const style = document.createElement('style');
|
||||
style.id = 'custom-spin-style';
|
||||
style.textContent = `
|
||||
@keyframes custom-spin {
|
||||
from { transform: rotate(0deg); }
|
||||
to { transform: rotate(360deg); }
|
||||
}
|
||||
`;
|
||||
document.head.appendChild(style);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<!-- <StepinHeaderAction>
|
||||
<a-input placeholder="开始搜索...">
|
||||
<template #prefix>
|
||||
<search-outlined />
|
||||
</template>
|
||||
</a-input>
|
||||
</StepinHeaderAction> -->
|
||||
<StepinHeaderAction>
|
||||
<DayNightSwitch />
|
||||
</StepinHeaderAction>
|
||||
<!-- <StepinHeaderAction> -->
|
||||
<!-- <a-tooltip> -->
|
||||
<!-- placement="rightTop" -->
|
||||
<!-- <template #title><span style="color:yellow">Swagger Api</span></template> -->
|
||||
<!-- <a class="action-item" href="/swagger" target="_blank"> -->
|
||||
<!-- <ApiOutlined /> -->
|
||||
<!-- <img class="gitee-logo" alt="swagger api" src="@/assets/swagger.png" /> -->
|
||||
<!-- </a> -->
|
||||
<!-- </a-tooltip> -->
|
||||
|
||||
<!-- </StepinHeaderAction> -->
|
||||
<!-- <StepinHeaderAction>
|
||||
<a class="action-item" href="https://github.com/jianzhichu/dysync.net" target="_blank">
|
||||
<GithubOutlined />
|
||||
</a>
|
||||
</StepinHeaderAction>
|
||||
<!-- 版本按钮 -->
|
||||
<StepinHeaderAction>
|
||||
<a class="action-item" href="https://gitee.com/deathvicky/dysync.net" target="_blank">
|
||||
<img class="gitee-logo" src="@/assets/gitee.svg" />
|
||||
</a>
|
||||
</StepinHeaderAction> -->
|
||||
|
||||
<!-- <a-popover placement="bottomRight">
|
||||
<StepinHeaderAction>
|
||||
<div class="action-item notice">
|
||||
<BellOutlined />
|
||||
</div>
|
||||
</StepinHeaderAction>
|
||||
<template #content>
|
||||
<Notice :data-source="noticeList" />
|
||||
</template>
|
||||
</a-popover> -->
|
||||
<div @click="showVersionNotification" class="action-item">
|
||||
<TagsOutlined class="action-icon" />
|
||||
</div>
|
||||
</StepinHeaderAction>
|
||||
<StepinHeaderAction>
|
||||
<Fullscreen class="-mx-xs -my-sm h-[56px] px-xs py-sm flex items-center" target=".stepin-layout" />
|
||||
</StepinHeaderAction>
|
||||
<!-- <StepinHeaderAction>
|
||||
@click="$emit('showSetting')"
|
||||
<div class="action-item setting">
|
||||
<SettingOutlined />
|
||||
</div>
|
||||
</StepinHeaderAction> -->
|
||||
</template>
|
||||
|
||||
<style scoped lang="less">
|
||||
.gitee-logo {
|
||||
width: 20px;
|
||||
}
|
||||
/* 顶部按钮样式 */
|
||||
.action-item {
|
||||
font-size: 20px;
|
||||
height: 100%;
|
||||
@@ -89,13 +268,55 @@ const noticeList = reactive([
|
||||
line-height: 40px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
cursor: pointer;
|
||||
|
||||
&.setting {
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
&.notice {
|
||||
font-size: 18px;
|
||||
&:hover {
|
||||
color: #1890ff;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
.action-icon {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
/* 样式兜底:确保每个版本项内部单行,外部纵向排列 */
|
||||
:deep(.custom-version-notification) {
|
||||
.ant-notification-notice-description {
|
||||
white-space: normal !important; /* 允许版本项纵向换行 */
|
||||
width: 100% !important;
|
||||
height: auto !important;
|
||||
overflow: visible !important;
|
||||
}
|
||||
|
||||
.custom-version-item {
|
||||
display: flex !important;
|
||||
align-items: center !important;
|
||||
justify-content: space-between !important;
|
||||
white-space: nowrap !important; /* 禁止版本项内部换行 */
|
||||
padding: 8px 12px !important; /* 重置内边距,去掉左侧竖线空间 */
|
||||
|
||||
&:hover {
|
||||
background-color: #f5fafe !important;
|
||||
}
|
||||
|
||||
&:last-child {
|
||||
border-bottom: none !important;
|
||||
}
|
||||
}
|
||||
|
||||
/* 当前版本轻微高亮(可选,可删除) */
|
||||
.custom-current-version {
|
||||
background-color: rgba(24, 144, 255, 0.05) !important;
|
||||
|
||||
&:hover {
|
||||
background-color: rgba(24, 144, 255, 0.1) !important;
|
||||
}
|
||||
}
|
||||
|
||||
/* 按钮hover样式 */
|
||||
button:hover {
|
||||
background-color: rgba(24, 144, 255, 0.1) !important;
|
||||
color: #1890ff !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,188 @@
|
||||
<!-- components/VersionDrawer.vue -->
|
||||
<script lang="ts" setup>
|
||||
import { ref, watch, onMounted } from 'vue';
|
||||
import { Drawer } from 'ant-design-vue';
|
||||
import { CloseOutlined, CopyOutlined, CheckCircleOutlined } from '@ant-design/icons-vue';
|
||||
import { useApiStore } from '@/store';
|
||||
import { message } from 'ant-design-vue';
|
||||
|
||||
// ✅ 移除 defineProps/defineEmits 导入,直接使用
|
||||
const props = defineProps<{
|
||||
visible: boolean;
|
||||
currentVersion?: string; // 接收当前版本号
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'close'): void;
|
||||
}>();
|
||||
|
||||
// 组件挂载时获取配置
|
||||
onMounted(() => {});
|
||||
|
||||
const getVersions = () => {
|
||||
useApiStore()
|
||||
.CheckTag()
|
||||
.then((res) => {
|
||||
if (res.code == 1) {
|
||||
dyVersions.value = res.data;
|
||||
} else {
|
||||
message.error(res.msg);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// 版本数据
|
||||
const dyVersions = ref<string[]>([]);
|
||||
|
||||
// 关闭抽屉
|
||||
const handleClose = () => {
|
||||
emit('close');
|
||||
};
|
||||
|
||||
// 复制版本号
|
||||
const copyVersion = (version: string) => {
|
||||
navigator.clipboard
|
||||
.writeText(version)
|
||||
.then(() => {
|
||||
message.success(`已复制版本: ${version}`);
|
||||
})
|
||||
.catch(() => {
|
||||
message.error('复制失败,请手动复制');
|
||||
});
|
||||
};
|
||||
|
||||
// 调试:监听 visible 变化,确认父组件传递的状态是否正确
|
||||
console.log('抽屉初始状态:', props.visible);
|
||||
watch(
|
||||
() => props.visible,
|
||||
(val) => {
|
||||
console.log('抽屉 visible 变化:', val);
|
||||
if (val) {
|
||||
getVersions();
|
||||
}
|
||||
}
|
||||
);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<!-- 强制添加样式,确保不被隐藏 -->
|
||||
<a-drawer title="版本列表" placement="right" :visible="props.visible" @close="handleClose" :width="450" :mask="true" :mask-closable="true" :z-index="9999" class="version-drawer">
|
||||
<div class="version-list">
|
||||
<div v-for="(tag, index) in dyVersions" :key="index" class="version-item">
|
||||
<div class="version-info">
|
||||
{{ tag }}
|
||||
<!-- 当前版本标记 -->
|
||||
<span v-if="props.currentVersion === tag" class="current-version-tag">
|
||||
<CheckCircleOutlined class="current-icon" />
|
||||
当前版本
|
||||
</span>
|
||||
</div>
|
||||
<!-- 复制按钮 -->
|
||||
<a-tooltip title="复制版本号" placement="top">
|
||||
<div class="copy-btn" @click.stop="copyVersion(tag)">
|
||||
<CopyOutlined />
|
||||
</div>
|
||||
</a-tooltip>
|
||||
</div>
|
||||
<div v-if="dyVersions.length === 0" class="empty-tip">暂无版本数据</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="close-btn" @click="handleClose">
|
||||
<CloseOutlined /> 关闭版本列表
|
||||
</div> -->
|
||||
</a-drawer>
|
||||
</template>
|
||||
|
||||
<style scoped lang="less">
|
||||
/* 强制显示抽屉容器,避免被全局样式隐藏 */
|
||||
.version-drawer {
|
||||
display: block !important;
|
||||
}
|
||||
|
||||
:deep(.ant-drawer-content-wrapper) {
|
||||
display: block !important;
|
||||
visibility: visible !important;
|
||||
opacity: 1 !important;
|
||||
z-index: 9999 !important; /* 确保层级最高 */
|
||||
}
|
||||
|
||||
.version-list {
|
||||
padding: 20px;
|
||||
line-height: 2;
|
||||
}
|
||||
|
||||
.version-item {
|
||||
padding: 10px 0;
|
||||
border-bottom: 1px solid #f0f0f0;
|
||||
cursor: pointer;
|
||||
transition: background 0.2s;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
|
||||
&:hover {
|
||||
background: #f5f5f5;
|
||||
}
|
||||
}
|
||||
|
||||
.version-info {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
|
||||
/* 当前版本标记样式 */
|
||||
.current-version-tag {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 4px;
|
||||
font-size: 12px;
|
||||
color: #1890ff;
|
||||
background: #e6f7ff;
|
||||
padding: 2px 8px;
|
||||
border-radius: 12px;
|
||||
}
|
||||
|
||||
.current-icon {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
/* 复制按钮样式 */
|
||||
.copy-btn {
|
||||
color: #999;
|
||||
font-size: 16px;
|
||||
cursor: pointer;
|
||||
transition: color 0.2s;
|
||||
padding: 4px;
|
||||
border-radius: 4px;
|
||||
|
||||
&:hover {
|
||||
color: #1890ff;
|
||||
background: #f0f9ff;
|
||||
}
|
||||
}
|
||||
|
||||
.empty-tip {
|
||||
text-align: center;
|
||||
color: #999;
|
||||
padding: 40px 0;
|
||||
}
|
||||
|
||||
.close-btn {
|
||||
position: absolute;
|
||||
bottom: 24px;
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
color: #1890ff;
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
/* 调整tooltip样式,避免被遮挡 */
|
||||
:deep(.ant-tooltip) {
|
||||
z-index: 10000 !important;
|
||||
}
|
||||
</style>
|
||||
@@ -19,10 +19,10 @@
|
||||
</div>
|
||||
</transition>
|
||||
<!-- 同步按钮(请求期间禁用) -->
|
||||
<!-- <a-button type="primary" class="sync-btn" @click="handleSyncAll" :disabled="isSyncDisabled">
|
||||
<a-button type="primary" class="sync-btn" @click="handleSyncAll" :disabled="isSyncDisabled">
|
||||
<SyncOutlined />
|
||||
<span class="sync-btn-text">同步</span>
|
||||
</a-button> -->
|
||||
<span class="sync-btn-text">立即同步</span>
|
||||
</a-button>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 卡片列表区域 -->
|
||||
@@ -67,7 +67,7 @@
|
||||
</template>
|
||||
<template v-else>
|
||||
<span class="path-text" :class="{ 'path-empty': !item.savePath }">
|
||||
{{ item.savePath || '未设置存储文件夹名称' }}
|
||||
{{ item.savePath || '默认用作者名字' }}
|
||||
</span>
|
||||
<!-- 编辑按钮禁用:item.isSaving 为 true 时 -->
|
||||
<a-button type="text" class="edit-btn" @click="() => handleEditPath(item)" title="编辑文件夹名称" :disabled="item.isSaving">
|
||||
@@ -95,7 +95,7 @@
|
||||
<div v-if="noMoreData && followData.length > 0" class="no-more-container">暂无更多数据</div>
|
||||
<!-- 空状态 -->
|
||||
<div v-if="followData.length === 0 && !loading" class="empty-container">
|
||||
<Empty description="暂无关注用户" />
|
||||
<Empty description="暂无关注用户,或Cookie设置中未设置SecUserId" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -305,15 +305,7 @@ const handleScroll = () => {
|
||||
|
||||
// 开关状态变更(启用/禁用用户)
|
||||
const handleSwitchChange = (item, checked) => {
|
||||
item.openSync = checked;
|
||||
if (!checked) item.isEditing = false; // 禁用时关闭编辑状态
|
||||
if (!checked) {
|
||||
uploadSyncStatus(item);
|
||||
} else {
|
||||
if (item.savePath.length > 0) {
|
||||
uploadSyncStatus(item);
|
||||
}
|
||||
}
|
||||
uploadSyncStatus(item);
|
||||
};
|
||||
|
||||
// 全量同步开关变更
|
||||
@@ -342,7 +334,6 @@ const handleSavePath = (item) => {
|
||||
uploadSyncStatus(item);
|
||||
};
|
||||
const uploadSyncStatus = (item) => {
|
||||
item.isSaving = true;
|
||||
useApiStore()
|
||||
.OpenOrCloseSync({
|
||||
Id: item.id,
|
||||
@@ -371,29 +362,7 @@ const uploadSyncStatus = (item) => {
|
||||
//全量同步开关
|
||||
const uploadFullSyncStatus = (item) => {
|
||||
item.isSaving = true;
|
||||
useApiStore()
|
||||
.OpenOrCloseFullSync({
|
||||
Id: item.id,
|
||||
OpenSync: item.openSync,
|
||||
FullSync: item.fullSync,
|
||||
SavePath: item.savePath, // 保持原有逻辑:提交 savePath
|
||||
})
|
||||
.then((res) => {
|
||||
if (res.code === 0) {
|
||||
message.success(`保存成功,将在下次任务执行时生效`);
|
||||
item.isEditing = false; // 保存成功后关闭编辑状态
|
||||
} else {
|
||||
message.error('保存失败' + (res.msg || '未知错误'));
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.error('保存失败', err);
|
||||
message.error('保存失败,请重试');
|
||||
})
|
||||
.finally(() => {
|
||||
// 接口响应结束:解除禁用(无论成功失败)
|
||||
item.isSaving = false;
|
||||
});
|
||||
uploadSyncStatus(item);
|
||||
};
|
||||
|
||||
// 批量同步所有用户
|
||||
|
||||
@@ -44,10 +44,14 @@
|
||||
|
||||
<!-- 模板相关配置:只有关闭"标题当文件名"时才显示 -->
|
||||
<a-form-item has-feedback label="定义标题模板" name="FollowedTitleTemplate" :wrapper-col="{ span: 12 }" v-if="!formState.UperUseViedoTitle">
|
||||
<a-select v-model:value="formState.FollowedTitleTemplate" :options="template_options" mode="multiple" size="middle" placeholder="请选择"></a-select>
|
||||
<a-select v-model:value="formState.FollowedTitleTemplate" :options="template_options" mode="multiple" size="middle" placeholder="请选择占位符组合"></a-select>
|
||||
<div class="flex items-start mt-1 text-sm text-gray-500">
|
||||
<InfoCircleOutlined class="text-blue-400 mr-1 mt-0.5" />
|
||||
<span>选择生成文件名的占位符,顺序即为文件名顺序(需配合分隔符使用)</span>
|
||||
<span>
|
||||
选择生成文件名的占位符,顺序即为文件名顺序(需配合分隔符使用)<br />
|
||||
<strong class="text-gray-700">占位符说明:</strong>
|
||||
{Id}=视频ID、{VideoTitle}=视频标题、{ReleaseTime}=发布时间、{Author}=博主名称、{FileHash}=文件哈希、{Resolution}=分辨率
|
||||
</span>
|
||||
</div>
|
||||
</a-form-item>
|
||||
|
||||
@@ -55,13 +59,23 @@
|
||||
<a-input v-model:value="formState.FollowedTitleSeparator" placeholder="请输入分隔符(如 - _ 或空)" style="width: 200px" />
|
||||
<div class="flex items-start mt-1 text-sm text-gray-500">
|
||||
<InfoCircleOutlined class="text-blue-400 mr-1 mt-0.5" />
|
||||
<span>占位符之间的连接符(如“-”“_”),为空则直接拼接</span>
|
||||
<span>
|
||||
占位符之间的连接符(如“-”“_”“.”),为空则直接拼接<br />
|
||||
<strong class="text-gray-700">示例:</strong>选择{Author}和{VideoTitle},分隔符填“-”,将生成“博主名称-视频标题”格式文件名
|
||||
</span>
|
||||
</div>
|
||||
</a-form-item>
|
||||
|
||||
<!-- 完整模板预览:只有关闭"标题当文件名"时才显示 -->
|
||||
<a-form-item label="完整模板预览" :wrapper-col="{ span: 12 }" v-if="!formState.UperUseViedoTitle">
|
||||
<a-input v-model:value="formState.FullFollowedTitleTemplate" placeholder="最终的模板" disabled style="background: #f5f5f5" />
|
||||
<div class="flex items-start mt-1 text-sm text-gray-500">
|
||||
<InfoCircleOutlined class="text-blue-400 mr-1 mt-0.5" />
|
||||
<span>
|
||||
实时展示您选择的占位符和分隔符组合效果<br />
|
||||
<strong class="text-gray-700">示例:</strong>选择{Author}、{ReleaseTime}、{Id},分隔符填“_”,预览结果为“博主名称_20250101_123456”
|
||||
</span>
|
||||
</div>
|
||||
</a-form-item>
|
||||
</div>
|
||||
|
||||
@@ -150,20 +164,19 @@ import type { Rule } from 'ant-design-vue/es/form';
|
||||
import type { FormInstance } from 'ant-design-vue';
|
||||
import { useApiStore } from '@/store';
|
||||
import { message } from 'ant-design-vue';
|
||||
import { InfoCircleOutlined } from '@ant-design/icons-vue';
|
||||
import { InfoCircleOutlined, SaveOutlined, CheckOutlined } from '@ant-design/icons-vue';
|
||||
|
||||
// 表单引用
|
||||
const formRef = ref<FormInstance>();
|
||||
|
||||
// 模板字段:结构化数组
|
||||
const template_options = [
|
||||
{ label: '{Id}', value: '{Id}' },
|
||||
{ label: '{VideoTitle}', value: '{VideoTitle}' },
|
||||
{ label: '{FileHash}', value: '{FileHash}' },
|
||||
// { label: '{FileSize}', value: '{FileSize}' },
|
||||
{ label: '{Resolution}', value: '{Resolution}' },
|
||||
// { label: '{SyncTime}', value: '{SyncTime}' },
|
||||
{ label: '{ReleaseTime}', value: '{ReleaseTime}' },
|
||||
{ label: '{Id} (视频ID)', value: '{Id}' },
|
||||
{ label: '{VideoTitle} (视频标题)', value: '{VideoTitle}' },
|
||||
{ label: '{ReleaseTime} (发布时间)', value: '{ReleaseTime}' },
|
||||
{ label: '{Author} (博主名称)', value: '{Author}' },
|
||||
{ label: '{FileHash} (文件哈希)', value: '{FileHash}' },
|
||||
{ label: '{Resolution} (分辨率)', value: '{Resolution}' },
|
||||
];
|
||||
|
||||
// 状态定义
|
||||
@@ -415,4 +428,16 @@ const onCancel = () => {
|
||||
:deep(.ant-input-disabled) {
|
||||
color: #666 !important;
|
||||
}
|
||||
|
||||
// 模板选择器选项样式优化
|
||||
:deep(.ant-select-item-option-content) {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
// 提示信息中的强调文本样式
|
||||
:deep(.text-gray-700) {
|
||||
color: #444 !important;
|
||||
font-weight: 500;
|
||||
}
|
||||
</style>
|
||||
@@ -210,7 +210,28 @@ export const useApiStore = defineStore('coreapi', () => {
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
//当前版本
|
||||
async function MyTag() {
|
||||
return http.request<any, Response<any>>('/api/config/mytag', 'get').then(r => {
|
||||
return r.data;
|
||||
}).finally(() => {
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
//检查版本
|
||||
async function CheckTag() {
|
||||
return http.request<any, Response<any>>('/api/config/checktag', 'get').then(r => {
|
||||
return r.data;
|
||||
}).finally(() => {
|
||||
|
||||
});
|
||||
}
|
||||
return {
|
||||
CheckTag,
|
||||
MyTag,
|
||||
deleteCookie,
|
||||
UpdateConfig,
|
||||
apiCheckInitStatus,
|
||||
|
||||
Reference in New Issue
Block a user