diff --git a/package.json b/package.json index 1b3580d62..7a36eee49 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sub-store-front-end", - "version": "2.14.319", + "version": "2.14.320", "private": true, "scripts": { "dev": "vite --host", diff --git a/src/components/ArtifactPanel.vue b/src/components/ArtifactPanel.vue index dab1accdc..283d22ae6 100644 --- a/src/components/ArtifactPanel.vue +++ b/src/components/ArtifactPanel.vue @@ -118,7 +118,7 @@ class="artifact-radio-group" > Stash - Clash.Meta(mihomo) + Mihomo Clash(Deprecated) Egern Surfboard diff --git a/src/components/FileListItem.vue b/src/components/FileListItem.vue index a802cd133..fd46242db 100644 --- a/src/components/FileListItem.vue +++ b/src/components/FileListItem.vue @@ -236,6 +236,7 @@ import { useRouter, useRoute } from 'vue-router'; import { useHostAPI } from '@/hooks/useHostAPI'; import { useBackend } from "@/hooks/useBackend"; + import clashmetaIcon from '@/assets/icons/clashmeta_color.png'; const { copy, isSupported } = useClipboard(); const { toClipboard: copyFallback } = useV3Clipboard(); @@ -291,6 +292,7 @@ }) const { flows } = storeToRefs(subsStore); const icon = computed(() => { + if (props.file.type === 'mihomoProfile') return clashmetaIcon; return appearanceSetting.value.isDefaultIcon ? logoIcon : logoRedIcon; }) const collectionDetail = computed(() => { @@ -309,6 +311,7 @@ }); const flow = computed(() => { + if (props.file.type === 'mihomoProfile') return t('filePage.type.mihomoProfile'); if (props.file.source === 'remote') return t('filePage.source.remote'); return t('filePage.source.local'); }); diff --git a/src/components/PreviewPanel.vue b/src/components/PreviewPanel.vue index 6132413c4..e4cbf0f99 100644 --- a/src/components/PreviewPanel.vue +++ b/src/components/PreviewPanel.vue @@ -112,7 +112,7 @@ icon: stash, }, { - name: 'Clash.Meta(mihomo)', + name: 'Mihomo', path: 'ClashMeta', icon: clashmeta, }, diff --git a/src/locales/en.ts b/src/locales/en.ts index f6892fcc5..0f5384058 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -10,6 +10,7 @@ export default { all: "All", untagged: "Untagged", or: "or", + type: "Type", }, globalNotify: { refresh: { @@ -72,6 +73,10 @@ export default { "If you are seeing this, it is probably due to a routing interception issue on the front end of your browser. You can force a refresh to see it or use the link directly without affecting the use of this link.", }, filePage: { + type: { + mihomoProfile: 'Mihomo Profile', + mihomoProfileTips: 'Override is supported', + }, addFileTitle: "Create File", importFileTitle: "Import File data", importFileTips: "On the File Management page, click the Export icon button in the More items section of a file.", diff --git a/src/locales/zh.ts b/src/locales/zh.ts index 6a1ae6bd7..7109a0367 100644 --- a/src/locales/zh.ts +++ b/src/locales/zh.ts @@ -10,6 +10,7 @@ export default { all: '全部', untagged: '未分组', or: '或', + type: '类型', }, globalNotify: { refresh: { @@ -99,6 +100,10 @@ export default { backendDesc: '如果你看到这个 可能是因为浏览器前端路由拦截的问题 可以强制刷新查看或直接使用该链接 不影响此链接的使用', }, filePage: { + type: { + mihomoProfile: 'Mihomo 配置', + mihomoProfileTips: '可使用覆写', + }, addFileTitle: '创建文件', importFileTitle: '导入 Sub-Store 文件数据', importFileTips: '文件管理页面, 在某个文件左滑/右滑的更多项中, 点击导出图标按钮', diff --git a/src/router/index.ts b/src/router/index.ts index 5f08c3fee..58a7488f4 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -297,7 +297,7 @@ router.beforeResolve(async (to, from) => { // 进入编辑页面前查询是否存在订阅 if (to.fullPath.startsWith('/edit/')) { const name = to.params.id as string; - if (name !== 'UNTITLED') { + if (!['UNTITLED', 'UNTITLED-mihomoProfile'].includes(name)) { try { if (to.params.editType === 'subs') { await useSubsApi().getOne('sub', name); diff --git a/src/views/File.vue b/src/views/File.vue index bc6f2645a..7efb9e634 100644 --- a/src/views/File.vue +++ b/src/views/File.vue @@ -49,12 +49,13 @@ {{ $t(`specificWord.file`) }} - + @@ -476,7 +477,7 @@ const importTips = () => { } .add-sub-panel-list { - padding: 16px 0; + padding: 10px 0; font-size: 16px; font-weight: bold; display: flex; @@ -493,14 +494,21 @@ const importTips = () => { display: flex; flex-direction: column; align-items: center; - justify-content: space-between; + justify-content: flex-start; - > svg { + > svg, > img { width: 44px; height: 44px; color: var(--primary-color); margin-bottom: 12px; } + span { + font-size: 14px; + } + small { + font-size: 12px; + color: var(--comment-text-color); + } } } } diff --git a/src/views/FileEditor.vue b/src/views/FileEditor.vue index be2140f85..3ba850100 100644 --- a/src/views/FileEditor.vue +++ b/src/views/FileEditor.vue @@ -47,9 +47,7 @@ class="nut-input-text" data-1p-ignore v-model.trim="form.displayName" - :placeholder=" - $t(`editorPage.subConfig.basic.displayName.placeholder`) - " + :placeholder="$t(`editorPage.subConfig.basic.displayName.placeholder`)" type="text" /> @@ -62,9 +60,7 @@ class="nut-input-text" :border="false" v-model="form.remark" - :placeholder=" - $t(`editorPage.subConfig.basic.remark.placeholder`) - " + :placeholder="$t(`editorPage.subConfig.basic.remark.placeholder`)" type="text" input-align="right" rows="1" @@ -82,10 +78,7 @@ - + -
- - - {{ $t(`filePage.source.remote`) }} - - - {{ $t(`filePage.source.local`) }} - - -
- - - - - - - - - - -
- -
- - - - - - - - - - - - - + + + {{ $t(`filePage.type.mihomoProfile`) }} + + + {{ $t(`specificWord.file`) }} + + + + + + +
+

{{ $t(`filePage.type.mihomoProfileTips`) }}

+ {{ $t("subPage.panel.tips.ok") }} +
{{ $t("editorPage.subConfig.btn.compare") }} - + {{ $t("editorPage.subConfig.btn.save") }} -
+