+
@@ -12,8 +13,10 @@
diff --git a/modules/web/src/components/SourceTabForm.vue b/modules/web/src/components/SourceTabForm.vue
index f7df560ed..ee7e7c052 100644
--- a/modules/web/src/components/SourceTabForm.vue
+++ b/modules/web/src/components/SourceTabForm.vue
@@ -1,7 +1,7 @@
@@ -59,11 +59,7 @@
diff --git a/modules/web/src/components/ToolBar.vue b/modules/web/src/components/ToolBar.vue
index 41099d242..79df8042d 100644
--- a/modules/web/src/components/ToolBar.vue
+++ b/modules/web/src/components/ToolBar.vue
@@ -73,25 +73,27 @@ import { isInvaildSource } from "../utils/souce";
const store = useSourceStore();
const pull = () => {
const loadingMsg = ElMessage({
- message: '加载中……',
+ message: "加载中……",
showClose: true,
- duration: 0
- })
- API.getSources().then(({ data }) => {
- if (data.isSuccess) {
- store.changeTabName("editList");
- store.saveSources(data.data);
- ElMessage({
- message: `成功拉取${data.data.length}条源`,
- type: "success",
- });
- } else {
- ElMessage({
- message: data.errorMsg ?? "后端错误",
- type: "error",
- });
- }
- }).finally(() => loadingMsg.close());
+ duration: 0,
+ });
+ API.getSources()
+ .then(({ data }) => {
+ if (data.isSuccess) {
+ store.changeTabName("editList");
+ store.saveSources(data.data);
+ ElMessage({
+ message: `成功拉取${data.data.length}条源`,
+ type: "success",
+ });
+ } else {
+ ElMessage({
+ message: data.errorMsg ?? "后端错误",
+ type: "error",
+ });
+ }
+ })
+ .finally(() => loadingMsg.close());
};
const push = () => {
diff --git a/modules/web/src/plugins/utils.js b/modules/web/src/plugins/utils.js
index 399aa9615..ca98a7c14 100644
--- a/modules/web/src/plugins/utils.js
+++ b/modules/web/src/plugins/utils.js
@@ -1,7 +1,7 @@
import { formatDate } from "@vueuse/shared";
export const isLegadoUrl = (/** @type {string} */ url) =>
- /,\s*\s*\{/.test(url) ||
+ /,\s*\{/.test(url) ||
!(
url.startsWith("http") ||
url.startsWith("data:") ||
@@ -11,10 +11,6 @@ export const isLegadoUrl = (/** @type {string} */ url) =>
* @param {string} src
*/
export function getImageFromLegado(src) {
- //返回阅读代理的图片链接 已经代理的或者dataurl返回传入值
- if (!isLegadoUrl(src)) {
- return src;
- }
return (
(import.meta.env.VITE_API || location.origin) +
"/image?path=" +
diff --git a/modules/web/src/views/BookChapter.vue b/modules/web/src/views/BookChapter.vue
index 4d130a838..c59bcf242 100644
--- a/modules/web/src/views/BookChapter.vue
+++ b/modules/web/src/views/BookChapter.vue
@@ -85,7 +85,7 @@
{{ data.title }}
-
+
@@ -105,7 +105,7 @@ const loadingSerive = ref(null);
const content = ref();
watch(showLoading, (loading) => {
- if (!loading) return loadingSerive.value?.close();
+ if (!loading) return loadingSerive.value?.close();
loadingSerive.value = ElLoading.service({
target: content.value,
spinner: loadingSvg,
@@ -139,15 +139,13 @@ const {
showContent,
} = storeToRefs(store);
-const { chapterPos, index: chapterIndex} = toRefs(store.readingBook);
+const { chapterPos, index: chapterIndex } = toRefs(store.readingBook);
const { theme, infiniteLoading } = toRefs(store.config);
// 主题部分
const bodyColor = computed(() => settings.themes[theme.value].body);
-const chapterColor = computed(
- () => settings.themes[theme.value].content
-);
+const chapterColor = computed(() => settings.themes[theme.value].content);
const popupColor = computed(() => settings.themes[theme.value].popup);
const readWidth = computed(() => {
@@ -215,7 +213,6 @@ watch(popupColor, (color) => {
rightBarTheme.value.background = color;
});
-
watchEffect(() => {
if (chapterData.value.length > 0) {
store.setContentLoading(false);
diff --git a/modules/web/src/views/BookShelf.vue b/modules/web/src/views/BookShelf.vue
index 37bdc6ba1..f39abec94 100644
--- a/modules/web/src/views/BookShelf.vue
+++ b/modules/web/src/views/BookShelf.vue
@@ -147,7 +147,7 @@ const searchBook = () => {
() => {
showLoading.value = false;
if (books.value.length == 0) {
- ElMessage.info("搜索结果为空")
+ ElMessage.info("搜索结果为空");
}
}
);
@@ -224,7 +224,7 @@ const fetchBookShelfData = () => {
showLoading.value = false;
store.setConnectType("danger");
store.setConnectStatus("连接失败");
- ElMessage.error("后端连接失败")
+ ElMessage.error("后端连接失败");
store.setNewConnect(false);
throw error;
});
diff --git a/modules/web/src/views/SourceEditor.vue b/modules/web/src/views/SourceEditor.vue
index f2cd6ac70..bbd00990f 100644
--- a/modules/web/src/views/SourceEditor.vue
+++ b/modules/web/src/views/SourceEditor.vue
@@ -34,10 +34,5 @@ if (/bookSource/i.test(location.href)) {
width: 360px;
margin-right: 20px;
}
- #loading {
- position: fixed;
- top: 100px;
- left: 90vw;
- }
}