@@ -31,22 +33,22 @@
@@ -55,7 +57,7 @@
- {{ displayName || name }}
+ {{ displayName }}
@@ -68,7 +70,7 @@
class="sub-item-title"
style="color: var(--primary-text-color); font-size: 16px"
>
- {{ displayName || name }}
+ {{ displayName }}
@@ -162,52 +164,63 @@
-
-
-
- {{ flow }}
+
+
+
+ {{ nonSimplePrimaryLine }}
-
-
-
- {{ flow.firstLine }}
+
+
-
-
- {{ collectionDetail }}
-
-
+
+
+
+
+
+
+ {{ flow }}
+
+
+
+
+ {{ flow.firstLine }}
+
+ {{ flow.secondLine }}
+
+
+
+ {{ collectionDetail }}
+
+
+
- {{ flow }}
+ {{ simpleSubDetailLine }}
- {{ `${flow.firstLine} | ${flow.secondLine}` }}
-
-
- {{ flow.firstLine }}
+ {{ simpleSubDetailLine }}
- {{ collectionDetail }}
+ {{ simpleCollectionDetailLine }}
@@ -321,7 +336,9 @@ import { useGlobalStore } from "@/store/global";
import { useSettingsStore } from "@/store/settings";
import { useSubsStore } from "@/store/subs";
import { getString } from "@/utils/flowTransfer";
+import { createGithubProxyUrlRewriter } from "@/utils/githubProxy";
import { isMobile } from "@/utils/isMobile";
+import { openManagedDeleteDialog } from "@/utils/archive";
import CompareTable from "@/views/CompareTable.vue";
const props = defineProps<{
@@ -329,6 +346,7 @@ const props = defineProps<{
sub?: Sub;
collection?: Collection;
disabled?: boolean;
+ isDualColumn?: boolean;
}>();
const emit = defineEmits(["update:visible", "share"]);
const { copy, isSupported } = useClipboard();
@@ -355,7 +373,7 @@ const globalStore = useGlobalStore();
const subsStore = useSubsStore();
const subsApi = useSubsApi();
const settingsStore = useSettingsStore();
-const { appearanceSetting } = storeToRefs(settingsStore);
+const { appearanceSetting, githubProxy, githubProxyRegex } = storeToRefs(settingsStore);
const {
isFlowFetching,
@@ -370,7 +388,7 @@ const { showNotify } = useAppNotifyStore();
const { currentUrl: host } = useHostAPI();
const displayName =
- props[props.type].displayName || props[props.type]["display-name"];
+ props[props.type].displayName || props[props.type]["display-name"] || props[props.type].name;
const name = props[props.type].name;
const tag = props[props.type].tag;
@@ -382,11 +400,43 @@ const remarkText = computed(() => {
return "";
}
});
+const shouldInlineRemarkInSecondLine = computed(() => {
+ return Boolean(
+ props.isDualColumn
+ && appearanceSetting.value.isSimpleMode
+ && remarkText.value
+ && appearanceSetting.value.isSimpleShowRemark
+ );
+});
+const isDualNonSimpleMode = computed(() => {
+ return Boolean(
+ props.isDualColumn
+ && !appearanceSetting.value.isSimpleMode,
+ );
+});
const { flows } = storeToRefs(subsStore);
const icon = computed(() => {
return appearanceSetting.value.isDefaultIcon ? logoIcon : logoRedIcon;
});
+const avatarSize = computed(() => {
+ if (appearanceSetting.value.isSimpleMode) return "36";
+ return props.isDualColumn ? "40" : "48";
+});
+const itemPadding = computed(() => {
+ if (appearanceSetting.value.isSimpleMode) return "9px";
+ return props.isDualColumn ? "12px" : "16px";
+});
+const imageMarginTop = computed(() => {
+ if (appearanceSetting.value.isSimpleMode) return "5px";
+ return props.isDualColumn ? "2px" : "0";
+});
+const githubUrlRewriter = computed(() => {
+ return createGithubProxyUrlRewriter(githubProxy.value, githubProxyRegex.value);
+});
+const rewriteGithubUrl = (url?: string | null) => {
+ return githubUrlRewriter.value(url);
+};
const isIconColor = computed(() => {
return props[props.type].isIconColor !== false;
@@ -400,7 +450,7 @@ const collectionDetail = computed(() => {
} else {
const displayNameList = nameList.map((name) => {
const sub = subsStore.getOneSub(name);
- return sub?.displayName || sub?.["display-name"] || sub.name;
+ return sub?.displayName || sub?.["display-name"] || sub?.name || `${name}(🚫)`;
});
if (nameList.length === 0) {
return `${t("subPage.collectionItem.containTag")}: ${subTags.join(", ")}`;
@@ -415,6 +465,16 @@ const collectionDetail = computed(() => {
)} | ${t("subPage.collectionItem.contain")}: ${displayNameList.join(", ")}`;
}
});
+const appendRemarkToSimpleDetailLine = (value: string) => {
+ if (!shouldInlineRemarkInSecondLine.value) {
+ return value;
+ }
+
+ return [value, remarkText.value].filter(Boolean).join(" · ");
+};
+const simpleCollectionDetailLine = computed(() => {
+ return appendRemarkToSimpleDetailLine(collectionDetail.value);
+});
const flow = computed(() => {
if (props.type === "sub") {
@@ -447,7 +507,7 @@ const flow = computed(() => {
firstLine: t("subPage.subItem.noFlow"),
secondLine: ``,
};
- } else if (target.status === "success") {
+ } else if (target.status === "success" && target.data?.usage) {
let {
planName,
appUrl,
@@ -472,7 +532,7 @@ const flow = computed(() => {
: "";
const expiresInfo = !expires
? ""
- : `${dayjs.unix(expires).format("YYYY-MM-DD")}`;
+ : `${dayjs.unix(expires).format("YYYY-MM-DD HH:mm")}`;
if (expiresInfo) {
secondLine = secondLine
? `${secondLine} | ${expiresInfo}`
@@ -501,7 +561,7 @@ const flow = computed(() => {
? t("subPage.subItem.noExpiresInfo")
: `${t("subPage.subItem.expires")}: ${dayjs
.unix(expires)
- .format("YYYY-MM-DD")}`;
+ .format("YYYY-MM-DD HH:mm")}`;
if (target.hideExpire) {
expiresInfo = "";
}
@@ -541,8 +601,54 @@ const flow = computed(() => {
};
}
}
+ return {
+ firstLine: t("subPage.subItem.noFlowInfo"),
+ secondLine: ``,
+ };
}
});
+const simpleSubDetailLine = computed(() => {
+ if (props.type !== "sub") {
+ return "";
+ }
+
+ if (typeof flow.value === "string") {
+ return appendRemarkToSimpleDetailLine(flow.value);
+ }
+
+ const baseLine = flow.value.secondLine
+ ? `${flow.value.firstLine} · ${flow.value.secondLine}`
+ : flow.value.firstLine;
+
+ return appendRemarkToSimpleDetailLine(baseLine);
+});
+const nonSimpleLineTitle = computed(() => {
+ return props.type === "sub" && typeof flow.value === "object"
+ ? flow.value.planName
+ : undefined;
+});
+const nonSimplePrimaryLine = computed(() => {
+ if (props.type === "collection") {
+ return collectionDetail.value;
+ }
+
+ if (typeof flow.value === "string") {
+ return flow.value;
+ }
+
+ return flow.value.firstLine;
+});
+const nonSimpleSecondLine = computed(() => {
+ if (props.type === "collection") {
+ return remarkText.value;
+ }
+
+ if (typeof flow.value === "string") {
+ return remarkText.value;
+ }
+
+ return [flow.value.secondLine, remarkText.value].filter(Boolean).join(" · ");
+});
const closeCompare = () => {
document.querySelector("html").style["overflow-y"] = "";
@@ -581,32 +687,62 @@ const openAppUrl = () => {
}
};
-const compareSub = async () => {
+const fetchCompareData = async (data?: any) => {
Toast.loading("生成节点对比中...", {
id: "compare",
cover: true,
duration: 1500,
});
- const res = await useSubsApi().compareSub(
- props.type,
- props.sub ?? props.collection,
- );
- if (res?.data?.status === "success") {
- compareData.value = res.data.data;
+ try {
+ const res = await subsApi.compareSub(
+ props.type,
+ data ?? props.sub ?? props.collection,
+ );
+ if (res?.data?.status === "success") {
+ compareData.value = res.data.data;
+ } else {
+ compareData.value = null;
+ }
+ } catch (e) {
+ console.error(e);
+ compareData.value = null;
+ }
+ await refreshSubFlowsIfNeeded()
+
+ Toast.hide("compare");
+};
+
+const openComparePanel = () => {
+ scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
+ globalStore.setSavedPositions(route.path, { left: 0, top: scrollTop });
- scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
+ document.querySelector("html").style["overflow-y"] = "hidden";
+ document.querySelector("html").style.height = "100%";
+ document.body.style.height = "100%";
+ document.body.style["overflow-y"] = "hidden";
+ (document.querySelector("#app") as HTMLElement).style["overflow-y"] = "hidden";
+ (document.querySelector("#app") as HTMLElement).style.height = "100%";
- globalStore.setSavedPositions(route.path, { left: 0, top: scrollTop });
+ compareTableIsVisible.value = true;
+};
- document.querySelector("html").style["overflow-y"] = "hidden";
- document.querySelector("html").style.height = "100%";
- document.body.style.height = "100%";
- document.body.style["overflow-y"] = "hidden";
- (document.querySelector("#app") as HTMLElement).style["overflow-y"] =
- "hidden";
- (document.querySelector("#app") as HTMLElement).style.height = "100%";
+const compareSub = async () => {
+ await fetchCompareData();
+ openComparePanel();
+};
- compareTableIsVisible.value = true;
+const refreshCompare = async () => {
+ try {
+ // 重新获取最新订阅/组合订阅信息
+ const type = props.type === 'collection' ? 'collection' : 'sub';
+ const infoRes = await subsApi.getOne(type, name);
+ const latestData = (infoRes?.data?.status === 'success' ? infoRes.data.data : null) ?? (props.sub ?? props.collection);
+ await fetchCompareData(latestData);
+ // 同步更新 store，使进入编辑器时数据一致
+ subsStore.setOneData(props.type === 'collection' ? 'collections' : 'subs', name, latestData);
+ } catch (e) {
+ console.error(e);
+ compareData.value = null;
Toast.hide("compare");
}
};
@@ -659,8 +795,12 @@ const handleGlobalClick = (event) => {
document.removeEventListener('click', handleGlobalClick);
};
-const onDeleteConfirm = async () => {
- await subsStore.deleteSub(props.type, name);
+const isArchiveEnabled = computed(() => {
+ return env.value?.feature?.archive;
+});
+
+const onDeleteConfirm = async (mode: DeleteMode = "permanent") => {
+ await subsStore.deleteSub(props.type, name, mode);
// Notify.danger(t('subPage.deleteSub.succeedNotify'), { duration: 1500 });
};
@@ -738,6 +878,15 @@ const openPreviewPanel = () => {
const shareBtnVisible = computed(() => {
return env.value?.feature?.share;
});
+
+const closeExpandedMenu = () => {
+ swipe.value.close();
+ swipeIsOpen.value = false;
+ itemMenuVisible.value = false;
+ if (moreAction.value) moreAction.value.style.transform = "rotate(0deg)";
+ document.removeEventListener("click", handleGlobalClick);
+};
+
const onClickShareLink = async () => {
const type = props.type;
const data = props.type === "sub" ? props.sub : props.collection;
@@ -761,6 +910,7 @@ const onClickCopyConfig = async () => {
await subsStore.fetchSubsData();
Toast.hide("copyConfig");
showNotify({ title: t("subPage.copyConfigNotify.succeed") });
+ closeExpandedMenu();
};
// const onClickExport = async () => {
// swipeController()
@@ -788,20 +938,18 @@ const onClickEdit = () => {
};
const onClickDelete = () => {
- Dialog({
- title: t("subPage.deleteSub.title"),
- content: createVNode(
- "span",
- {},
- t("subPage.deleteSub.desc", { displayName }),
- ),
- onCancel: () => {},
- onOk: onDeleteConfirm,
- popClass: "auto-dialog",
- cancelText: t("subPage.deleteSub.btn.cancel"),
- okText: t("subPage.deleteSub.btn.confirm"),
- closeOnPopstate: true,
- lockScroll: false,
+ openManagedDeleteDialog({
+ enabled: isArchiveEnabled.value,
+ managedTitle: t("archivePage.liveDelete.title"),
+ managedContent: t("archivePage.liveDelete.desc", { displayName }),
+ managedCancelText: t("archivePage.liveDelete.btn.archive"),
+ managedOkText: t("archivePage.liveDelete.btn.permanent"),
+ legacyTitle: t("subPage.deleteSub.title"),
+ legacyContent: t("subPage.deleteSub.desc", { displayName }),
+ legacyCancelText: t("subPage.deleteSub.btn.cancel"),
+ legacyOkText: t("subPage.deleteSub.btn.confirm"),
+ onArchive: () => onDeleteConfirm("archive"),
+ onPermanent: () => onDeleteConfirm("permanent"),
});
};
@@ -828,19 +976,26 @@ const onClickRefresh = async () => {
} catch (e) {
console.error(e);
}
- try {
- await subsStore.fetchFlows(ref([props.sub]).value);
- } catch (e) {
- console.error(e);
- }
+ await refreshSubFlowsIfNeeded()
Toast.hide("refresh");
showNotify({ title: t("globalNotify.refresh.succeed") });
};
+
+const refreshSubFlowsIfNeeded = async () => {
+ if (!props.sub) return
+ try {
+ await subsStore.fetchFlows([props.sub])
+ } catch (e) {
+ console.error(e)
+ }
+}
diff --git a/src/views/FileEditor.vue b/src/views/FileEditor.vue
index 751c67894..204cc3d41 100644
--- a/src/views/FileEditor.vue
+++ b/src/views/FileEditor.vue
@@ -77,6 +77,23 @@
@@ -256,6 +277,7 @@
style="display: none"
/>