Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

feat: add operation exception toasts for loading plugin resources and login #645

Merged
merged 2 commits into from
Oct 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions packages/components/src/components/dialog/Dialog.story.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script lang="ts" setup>
import { VButton } from "@/components/button";
import { Toast } from "../toast";
import { Dialog } from "@/components/dialog";

const initState = () => {
Expand All @@ -11,10 +12,10 @@ const initState = () => {
cancelText: "取消",
type: "info",
onConfirm: () => {
alert("已删除");
Toast.info("已删除");
},
onCancel: () => {
alert("已取消");
Toast.info("已取消");
},
};
};
Expand Down
9 changes: 6 additions & 3 deletions src/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import type {
MenuItemType,
Plugin,
} from "@halo-dev/console-shared";
import { Toast } from "@halo-dev/components";
import { apiClient } from "@/utils/api-client";
import { menus, minimenus, registerMenu } from "./router/menus.config";
// setup
Expand Down Expand Up @@ -135,7 +136,7 @@ async function loadPluginModules() {
registerModule(pluginModule);
}
} catch (e) {
const message = `${plugin.metadata.name}: Failed load plugin entry module`;
const message = `${plugin.metadata.name}: 加载插件入口文件失败`;
console.error(message, e);
pluginErrorMessages.push(message);
}
Expand All @@ -145,7 +146,7 @@ async function loadPluginModules() {
try {
await loadStyle(`${import.meta.env.VITE_API_URL}${stylesheet}`);
} catch (e) {
const message = `${plugin.metadata.name}: Failed load plugin stylesheet`;
const message = `${plugin.metadata.name}: 加载插件样式文件失败`;
console.error(message, e);
pluginErrorMessages.push(message);
}
Expand All @@ -155,7 +156,9 @@ async function loadPluginModules() {
}

if (pluginErrorMessages.length > 0) {
alert(pluginErrorMessages.join("\n"));
pluginErrorMessages.forEach((message) => {
Toast.error(message);
});
}
}

Expand Down
9 changes: 7 additions & 2 deletions src/modules/system/users/Login.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<script lang="ts" setup>
import { IconShieldUser, IconUserLine, VButton } from "@halo-dev/components";
import {
IconShieldUser,
IconUserLine,
VButton,
Toast,
} from "@halo-dev/components";
import { v4 as uuid } from "uuid";
import qs from "qs";
import logo from "@/assets/logo.svg";
Expand Down Expand Up @@ -47,7 +52,7 @@ const handleLogin = async () => {
router.go(0);
} catch (e) {
console.error("Failed to login", e);
alert("登录失败,用户名或密码错误");
Toast.error("登录失败,用户名或密码错误");
loginForm.value.password = "";
setFocus("passwordInput");
} finally {
Expand Down