+
+
+
+
+
+
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 6ab2eb6d..1c0642a4 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,15 +1,13 @@
+
-
+
diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 82932652..7c2787a1 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -1,39 +1,41 @@
-
+
-
-
-
- {{ item.label }}
-
-
-
-
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index bdc4cc8d..bc63be4d 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -30,6 +30,10 @@ const props = defineProps({
type: [String],
default: "",
},
+ excludeKeys: {
+ type: Array,
+ default: [],
+ },
});
const emit = defineEmits(["update:modelValue"]);
@@ -37,8 +41,10 @@ const emit = defineEmits(["update:modelValue"]);
const modelValue = useVModel(props, "modelValue", emit);
const editorRef = shallowRef(); // 编辑器实例，必须用 shallowRef
-const mode = ref("default"); // 编辑器模式
-const toolbarConfig = ref({}); // 工具条配置
+const mode = ref("simple"); // 编辑器模式
+const toolbarConfig = ref({
+ excludeKeys: props.excludeKeys,
+}); // 工具条配置
// 编辑器配置
const editorConfig = ref({
placeholder: "请输入内容...",
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index 7a080e30..6dd29950 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -1,38 +1,64 @@
-import { hasAuth } from "@/plugins/permission";
-import { Directive, DirectiveBinding } from "vue";
+import type { Directive, DirectiveBinding } from "vue";
+
+import { useUserStore } from "@/store";
/**
* 按钮权限
*/
export const hasPerm: Directive = {
mounted(el: HTMLElement, binding: DirectiveBinding) {
- // DOM绑定需要的按钮权限标识
- const { value: requiredPerms } = binding;
- if (requiredPerms) {
- if (!hasAuth(requiredPerms)) {
- el.parentNode && el.parentNode.removeChild(el);
- }
- } else {
+ const requiredPerms = binding.value;
+
+ // 校验传入的权限值是否合法
+ if (!requiredPerms || (typeof requiredPerms !== "string" && !Array.isArray(requiredPerms))) {
throw new Error(
- "need perms! Like v-has-perm=\"['sys:user:add','sys:user:edit']\""
+ "需要提供权限标识！例如：v-has-perm=\"'sys:user:add'\" 或 v-has-perm=\"['sys:user:add', 'sys:user:edit']\""
);
}
+
+ const { roles, perms } = useUserStore().userInfo;
+
+ // 超级管理员拥有所有权限
+ if (roles.includes("ROOT")) {
+ return;
+ }
+
+ // 检查权限
+ const hasAuth = Array.isArray(requiredPerms)
+ ? requiredPerms.some((perm) => perms.includes(perm))
+ : perms.includes(requiredPerms);
+
+ // 如果没有权限，移除该元素
+ if (!hasAuth && el.parentNode) {
+ el.parentNode.removeChild(el);
+ }
},
};
/**
- * 角色权限
+ * 角色权限指令
*/
export const hasRole: Directive = {
mounted(el: HTMLElement, binding: DirectiveBinding) {
- // DOM绑定需要的角色编码
- const { value: requiredRoles } = binding;
- if (requiredRoles) {
- if (!hasAuth(requiredRoles, "role")) {
- el.parentNode && el.parentNode.removeChild(el);
- }
- } else {
- throw new Error("need roles! Like v-has-role=\"['admin','test']\"");
+ const requiredRoles = binding.value;
+
+ // 校验传入的角色值是否合法
+ if (!requiredRoles || (typeof requiredRoles !== "string" && !Array.isArray(requiredRoles))) {
+ throw new Error(
+ "需要提供角色标识！例如：v-has-role=\"'ADMIN'\" 或 v-has-role=\"['ADMIN', 'TEST']\""
+ );
+ }
+
+ const { roles } = useUserStore().userInfo;
+
+ // 检查是否有对应角色权限
+ const hasAuth = Array.isArray(requiredRoles)
+ ? requiredRoles.some((role) => roles.includes(role))
+ : roles.includes(requiredRoles);
+
+ // 如果没有权限，移除元素
+ if (!hasAuth && el.parentNode) {
+ el.parentNode.removeChild(el);
}
},
};
diff --git a/src/enums/CacheEnum.ts b/src/enums/CacheEnum.ts
deleted file mode 100644
index f3c434ba..00000000
--- a/src/enums/CacheEnum.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * 令牌缓存Key
- */
-export const TOKEN_KEY = "accessToken";
diff --git a/src/enums/FormTypeEnum.ts b/src/enums/FormTypeEnum.ts
index 32cb9608..583c33ae 100644
--- a/src/enums/FormTypeEnum.ts
+++ b/src/enums/FormTypeEnum.ts
@@ -9,6 +9,6 @@ export const FormTypeEnum: Record = {
INPUT_NUMBER: { value: 5, label: "数字输入框" },
SWITCH: { value: 6, label: "开关" },
TEXT_AREA: { value: 7, label: "文本域" },
- DATE_TIME: { value: 8, label: "日期时间框" },
- DATE: { value: 9, label: "日期框" },
+ DATE: { value: 8, label: "日期框" },
+ DATE_TIME: { value: 9, label: "日期时间框" },
};
diff --git a/src/enums/MessageTypeEnum.ts b/src/enums/MessageTypeEnum.ts
deleted file mode 100644
index 42a6fb94..00000000
--- a/src/enums/MessageTypeEnum.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 消息类型枚举 */
-export const enum MessageTypeEnum {
- /* 消息 */
- MESSAGE = "MESSAGE",
- /* 通知 */
- NOTICE = "NOTICE",
- /* 待办 */
- TODO = "TODO",
-}
-
-export const MessageTypeLabels = {
- [MessageTypeEnum.MESSAGE]: "消息",
- [MessageTypeEnum.NOTICE]: "通知",
- [MessageTypeEnum.TODO]: "待办",
-};
diff --git a/src/enums/NoticeTypeEnum.ts b/src/enums/NoticeTypeEnum.ts
deleted file mode 100644
index 49c0f8eb..00000000
--- a/src/enums/NoticeTypeEnum.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-/* 通知类型枚举 */
-export const enum NoticeTypeEnum {
- /** 系统升级 */
- SYSTEM_UPGRADE = "SYSTEM_UPGRADE",
- /** 系统维护 */
- SYSTEM_MAINTENANCE = "SYSTEM_MAINTENANCE",
- /** 安全警告 */
- SECURITY_ALERT = "SECURITY_ALERT",
- /** 假期通知 */
- HOLIDAY_NOTICE = "HOLIDAY_NOTICE",
- /** 公司新闻 */
- COMPANY_NEWS = "COMPANY_NEWS",
- /** 其他通知 */
- OTHER = "OTHER",
-}
-
-// 定义标签映射
-const NoticeTypeLabels: Record = {
- [NoticeTypeEnum.SYSTEM_UPGRADE]: "系统升级",
- [NoticeTypeEnum.SYSTEM_MAINTENANCE]: "系统维护",
- [NoticeTypeEnum.SECURITY_ALERT]: "安全警告",
- [NoticeTypeEnum.HOLIDAY_NOTICE]: "假期通知",
- [NoticeTypeEnum.COMPANY_NEWS]: "公司新闻",
- [NoticeTypeEnum.OTHER]: "其他通知",
-};
-
-// 导出获取标签函数
-export const getNoticeLabel = (type: NoticeTypeEnum): string => {
- return NoticeTypeLabels[type] || "";
-};
diff --git a/src/enums/ResultEnum.ts b/src/enums/ResultEnum.ts
index 2dff7c9a..349a6289 100644
--- a/src/enums/ResultEnum.ts
+++ b/src/enums/ResultEnum.ts
@@ -12,7 +12,12 @@ export const enum ResultEnum {
ERROR = "B0001",
/**
- * 令牌无效或过期
+ * 访问令牌无效或过期
*/
- TOKEN_INVALID = "A0230",
+ ACCESS_TOKEN_INVALID = "A0230",
+
+ /**
+ * 刷新令牌无效或过期
+ */
+ REFRESH_TOKEN_INVALID = "A0231",
}
diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index 7eac43b3..1b186248 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -1,5 +1,5 @@
export default {
- // 路由国际化
+ // 菜单国际化
route: {
dashboard: "Dashboard",
document: "Document",
@@ -11,6 +11,8 @@ export default {
login: "Login",
captchaCode: "Verify Code",
capsLock: "Caps Lock is On",
+ rememberMe: "Remember Me",
+ forgetPassword: "Forget Password",
message: {
username: {
required: "Please enter Username",
@@ -23,6 +25,7 @@ export default {
required: "Please enter Verify Code",
},
},
+ otherLoginMethods: "Other login methods",
},
// 导航栏国际化
navbar: {
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index 36764dc9..4bf18c70 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -1,5 +1,5 @@
export default {
- // 路由国际化
+ // 菜单国际化
route: {
dashboard: "首页",
document: "项目文档",
@@ -11,6 +11,8 @@ export default {
login: "登 录",
captchaCode: "验证码",
capsLock: "大写锁定已打开",
+ rememberMe: "记住我",
+ forgetPassword: "忘记密码",
message: {
username: {
required: "请输入用户名",
@@ -23,6 +25,7 @@ export default {
required: "请输入验证码",
},
},
+ otherLoginMethods: "其他登录方式",
},
// 导航栏国际化
navbar: {
diff --git a/src/layout/components/AppMain/index.vue b/src/layout/components/AppMain/index.vue
index d480f1a3..398ee216 100644
--- a/src/layout/components/AppMain/index.vue
+++ b/src/layout/components/AppMain/index.vue
@@ -1,11 +1,8 @@
-
+
-
+
@@ -19,8 +16,9 @@
import { useSettingsStore, useTagsViewStore } from "@/store";
import variables from "@/styles/variables.module.scss";
-const cachedViews = computed(() => useTagsViewStore().cachedViews); // 缓存页面集合
-const minHeight = computed(() => {
+// 缓存页面集合
+const cachedViews = computed(() => useTagsViewStore().cachedViews);
+const appMainHeight = computed(() => {
if (useSettingsStore().tagsView) {
return `calc(100vh - ${variables["navbar-height"]} - ${variables["tags-view-height"]})`;
} else {
@@ -32,6 +30,7 @@ const minHeight = computed(() => {
diff --git a/src/layout/components/NavBar/components/NavbarAction.vue b/src/layout/components/NavBar/components/NavbarAction.vue
deleted file mode 100644
index 1a686b7f..00000000
--- a/src/layout/components/NavBar/components/NavbarAction.vue
+++ /dev/null
@@ -1,228 +0,0 @@
-
-
+
+
+ {{ $t("navbar.profile") }}
+
+
+ {{ $t("navbar.logout") }}
+
+
+
+
+
+
+
+
+
diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue
index c985c0b9..9e8c61a5 100644
--- a/src/layout/components/NavBar/index.vue
+++ b/src/layout/components/NavBar/index.vue
@@ -1,15 +1,13 @@
-
@@ -28,8 +28,8 @@
:class="{ 'is-active': modelValue === LayoutEnum.MIX }"
@click="updateValue(LayoutEnum.MIX)"
>
-
-
+
+
diff --git a/src/layout/components/Settings/components/ThemeColorPicker.vue b/src/layout/components/Settings/components/ThemeColorPicker.vue
index 5a0d59cd..587c1ac5 100644
--- a/src/layout/components/Settings/components/ThemeColorPicker.vue
+++ b/src/layout/components/Settings/components/ThemeColorPicker.vue
@@ -15,7 +15,7 @@ const emit = defineEmits(["update:modelValue"]);
// 定义颜色预设
const colorPresets = [
- "#409EFF",
+ "#4080FF",
"#ff4500",
"#ff8c00",
"#90ee90",
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index ad3782cd..86ec1538 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,68 +1,55 @@
-
-
+
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index c080e602..9cbaeafa 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -16,20 +16,12 @@
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index d3e83fe5..6ab38f7c 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -1,21 +1,24 @@
- -
+
+
-
-
+ @@ -41,84 +43,103 @@ {{ item.title }}
+
-
+
+
+
+
暂无数据
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
- {{ $t("navbar.profile") }}
-
-
- {{ $t("navbar.gitee") }}
-
-
- {{ $t("navbar.document") }}
-
-
- {{ $t("navbar.logout") }}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
new file mode 100644
index 00000000..c4ad28ac
--- /dev/null
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/layout/components/NavBar/components/Notification.vue
new file mode 100644
index 00000000..bc6069b0
--- /dev/null
+++ b/src/layout/components/NavBar/components/Notification.vue
@@ -0,0 +1,237 @@
+
+
- ![]()
- {{ userStore.user.username }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
new file mode 100644
index 00000000..32c3e706
--- /dev/null
+++ b/src/layout/components/NavBar/components/UserProfile.vue
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+ {{ item.publishTime }}
+
+
+
+
+
+
+ 查看更多
+
+
+
+
+ 全部已读
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+ {{ item.publishTime }}
+
+
+
+
+
+
+ 查看更多
+
+
+
+
+ 全部已读
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+ {{ item.publishTime }}
+
+
+
+
+
+
+ 查看更多
+
+
+
+
+ 全部已读
+
+
+
+ ![]()
+ {{ userStore.userInfo.username }}
+
+
+
-
+
{{ $t("settings.themeColor") }}
-
-
+
{{ $t("settings.tagsView") }}
-
+
{{ $t("settings.fixedHeader") }}
-
+
-
+
-
+
保存为图片
- 保存到后端
- 清空签名
+ 保存到后端
+ 清空签名
+ />
![签名]()
diff --git a/src/views/demo/table-select/config/select.ts b/src/views/demo/table-select/config/select.ts
index 64f1e7b3..6ae6db3b 100644
--- a/src/views/demo/table-select/config/select.ts
+++ b/src/views/demo/table-select/config/select.ts
@@ -1,4 +1,4 @@
-import UserAPI from "@/api/user";
+import UserAPI from "@/api/system/user";
import type { ISelectConfig } from "@/components/TableSelect/index.vue";
const selectConfig: ISelectConfig = {
diff --git a/src/views/demo/table-select/index.vue b/src/views/demo/table-select/index.vue
index f3d62757..79240293 100644
--- a/src/views/demo/table-select/index.vue
+++ b/src/views/demo/table-select/index.vue
@@ -36,11 +36,7 @@ const text = computed(() => {
>
示例源码 请点击>>>>
-
+
{{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index cfeb16db..e248fc12 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -1,9 +1,110 @@
+
+
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 483a18ed..1550a169 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -17,59 +17,49 @@
连接
-
+
断开
-
连接状态：
-
- 已连接
-
- 已断开
+ 已连接
+ 已断开
-
+
-
-
- 发送广播
+ 发送广播
-
+
-
-
- 发送点对点消息
-
+ 发送点对点消息
-
+
{{ $t("settings.sidebarLogo") }}
-
+ {{ $t("settings.navigation") }}
- {{ scope.row[scope.prop] }}
-
@@ -89,9 +90,9 @@
-
值为String: const value = ref("1");
-
值为Number: const value = ref(1);
+
+
+
+ 值为Number: const value = ref(1);
+
+
+
+
+
+ 值为Array: const value = ref(["1", "2"]);
+
+
diff --git a/src/views/demo/icon-selector.vue b/src/views/demo/icon-selector.vue
index 6a419e2f..c9df065e 100644
--- a/src/views/demo/icon-selector.vue
+++ b/src/views/demo/icon-selector.vue
@@ -1,6 +1,9 @@
@@ -10,8 +13,9 @@ const iconName = ref("edit");
type="primary"
target="_blank"
class="mb-10"
- >示例源码 请点击>>>>
+ 示例源码 请点击>>>>
+
diff --git a/src/views/demo/icons.vue b/src/views/demo/icons.vue
index 36fe5d91..73a7aef4 100644
--- a/src/views/demo/icons.vue
+++ b/src/views/demo/icons.vue
@@ -5,11 +5,7 @@
{{ $t("settings.watermark") }}
+
-
- ![]()
-
-
-
- ![]()
- {{ defaultSettings.title }}
+
+ ![]()
+
+ {{ defaultSettings.title }}
+
@@ -15,9 +13,7 @@
diff --git a/src/views/demo/api/swagger.vue b/src/views/demo/api/swagger.vue
deleted file mode 100644
index dd6dc9d8..00000000
--- a/src/views/demo/api/swagger.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
- = {
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index 65974cce..c1c2f908 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -1,6 +1,6 @@
-import UserAPI from "@/api/user";
-import RoleAPI from "@/api/role";
-import type { UserPageQuery } from "@/api/user";
+import UserAPI from "@/api/system/user";
+import RoleAPI from "@/api/system/role";
+import type { UserPageQuery } from "@/api/system/user";
import type { IContentConfig } from "@/components/CURD/types";
const contentConfig: IContentConfig = {
@@ -56,7 +56,14 @@ const contentConfig: IContentConfig = {
{ label: "用户名", align: "center", prop: "username" },
{ label: "头像", align: "center", prop: "avatar", templet: "image" },
{ label: "用户昵称", align: "center", prop: "nickname", width: 120 },
- { label: "性别", align: "center", prop: "genderLabel", width: 100 },
+ {
+ label: "性别",
+ align: "center",
+ prop: "gender",
+ width: 100,
+ templet: "custom",
+ slotName: "gender",
+ },
{ label: "部门", align: "center", prop: "deptName", width: 120 },
{
label: "角色",
@@ -94,9 +101,14 @@ const contentConfig: IContentConfig = {
label: "操作",
align: "center",
fixed: "right",
- width: 220,
+ width: 280,
templet: "tool",
operat: [
+ {
+ icon: "Document",
+ name: "detail",
+ text: "详情",
+ },
{
name: "reset_pwd",
auth: "password:reset",
diff --git a/src/views/demo/curd/config/content2.ts b/src/views/demo/curd/config/content2.ts
index 2e72eed2..3da3999d 100644
--- a/src/views/demo/curd/config/content2.ts
+++ b/src/views/demo/curd/config/content2.ts
@@ -8,15 +8,14 @@ const contentConfig: IContentConfig = {
toolbar: [],
indexAction: function (params) {
// 模拟发起网络请求获取列表数据
- // console.log("indexAction:", params);
+ console.log("indexAction:", params);
return Promise.resolve({
total: 2,
list: [
{
id: 1,
username: "tom",
- avatar:
- "https://oss.youlai.tech/youlai-boot/2023/05/16/811270ef31f548af9cffc026dfc3777b.gif",
+ avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
percent: 99,
price: 10,
url: "https://www.baidu.com",
@@ -30,8 +29,7 @@ const contentConfig: IContentConfig = {
{
id: 2,
username: "jerry",
- avatar:
- "https://oss.youlai.tech/youlai-boot/2023/05/16/811270ef31f548af9cffc026dfc3777b.gif",
+ avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
percent: 88,
price: 999,
url: "https://www.google.com",
@@ -76,7 +74,7 @@ const contentConfig: IContentConfig = {
align: "center",
prop: "gender",
templet: "list",
- selectList: { 0: "女", 1: "男" },
+ selectList: { "0": "女", "1": "男" },
},
{
label: "自定义",
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index 2a509644..bbc0f616 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -1,4 +1,4 @@
-import UserAPI, { type UserForm } from "@/api/user";
+import UserAPI, { type UserForm } from "@/api/system/user";
import type { IModalConfig } from "@/components/CURD/types";
import { DeviceEnum } from "@/enums/DeviceEnum";
import { useAppStore } from "@/store";
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index 0105b9af..d46ae31c 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -1,4 +1,4 @@
-import DeptAPI from "@/api/dept";
+import DeptAPI from "@/api/system/dept";
import type { ISearchConfig } from "@/components/CURD/types";
const searchConfig: ISearchConfig = {
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 6877cd03..d1499d9d 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -8,9 +8,7 @@
>
示例源码 请点击>>>>
-
- 切换示例
-
+ 切换示例
@@ -40,6 +38,9 @@
{{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+
+
-
-
-
-
-
diff --git a/src/views/demo/curd/config/add.ts b/src/views/demo/curd/config/add.ts
index 6a33ebce..4cf1e5fe 100644
--- a/src/views/demo/curd/config/add.ts
+++ b/src/views/demo/curd/config/add.ts
@@ -1,4 +1,4 @@
-import UserAPI, { type UserForm } from "@/api/user";
+import UserAPI, { type UserForm } from "@/api/system/user";
import type { IModalConfig } from "@/components/CURD/types";
const modalConfig: IModalConfig
-
+
diff --git a/src/views/demo/signature.vue b/src/views/demo/signature.vue
index ce5fb4a5..c755921b 100644
--- a/src/views/demo/signature.vue
+++ b/src/views/demo/signature.vue
@@ -138,8 +138,8 @@ function paint(
基于canvas实现的签名组件
+
+ 示例源码 请点击>>>>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
- 示例源码 请点击>>>>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/views/demo/wang-editor.vue b/src/views/demo/wang-editor.vue
index d7ff4bb8..67db92d0 100644
--- a/src/views/demo/wang-editor.vue
+++ b/src/views/demo/wang-editor.vue
@@ -12,8 +12,9 @@ const value = ref("初始内容");
type="primary"
target="_blank"
class="mb-[20px]"
- >示例源码 请点击>>>>
-
@@ -79,17 +69,15 @@
:class="{
'tip-message': message.type === 'tip',
message: message.type !== 'tip',
- 'message--sent': message.sender === userStore.user.username,
- 'message--received': message.sender !== userStore.user.username,
+ 'message--sent': message.sender === userStore.userInfo.username,
+ 'message--received': message.sender !== userStore.userInfo.username,
}"
>
{{ message.sender }}
@@ -105,69 +93,45 @@
-
-
+
+
+
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index ccf03c2b..a231e051 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -16,12 +16,7 @@
size="small"
@click="triggerFileUpload"
/>
-
+
{{ userProfile.nickname }}
@@ -41,10 +36,7 @@
用户名
{{ userProfile.username }}
-
+
@@ -67,14 +59,14 @@
-
-
-
绑定手机
-
- 已绑定手机号：{{ userProfile.mobile }}
-
+ 已绑定手机号：{{ userProfile.mobile }}
未绑定手机
更换
绑定
@@ -147,27 +137,25 @@
绑定邮箱
-
- 已绑定邮箱：{{ userProfile.email }}
-
+ 已绑定邮箱：{{ userProfile.email }}
未绑定邮箱
更换
绑定
@@ -178,58 +166,46 @@
-
+
-
-
-
-
@@ -243,11 +219,7 @@
:disabled="mobileCountdown > 0"
@click="handleSendVerificationCode('MOBILE')"
>
- {{
- mobileCountdown > 0
- ? `${mobileCountdown}s后重新发送`
- : "发送验证码"
- }}
+ {{ mobileCountdown > 0 ? `${mobileCountdown}s后重新发送` : "发送验证码" }}
@@ -257,9 +229,9 @@
@@ -273,11 +245,7 @@
:disabled="emailCountdown > 0"
@click="handleSendVerificationCode('EMAIL')"
>
- {{
- emailCountdown > 0
- ? `${emailCountdown}s后重新发送`
- : "发送验证码"
- }}
+ {{ emailCountdown > 0 ? `${emailCountdown}s后重新发送` : "发送验证码" }}
@@ -300,15 +268,12 @@ import UserAPI, {
MobileBindingForm,
EmailBindingForm,
UserProfileForm,
-} from "@/api/user";
+} from "@/api/system/user";
import FileAPI from "@/api/file";
-import { useUserStore } from "@/store/modules/user";
import { Camera } from "@element-plus/icons-vue";
-const userStore = useUserStore();
-
const userProfile = ref({});
enum DialogType {
@@ -339,9 +304,7 @@ const emailTimer = ref(null);
const passwordChangeRules = {
oldPassword: [{ required: true, message: "请输入原密码", trigger: "blur" }],
newPassword: [{ required: true, message: "请输入新密码", trigger: "blur" }],
- confirmPassword: [
- { required: true, message: "请再次输入新密码", trigger: "blur" },
- ],
+ confirmPassword: [{ required: true, message: "请再次输入新密码", trigger: "blur" }],
};
// 手机号校验规则
@@ -451,7 +414,7 @@ const handleSendVerificationCode = async (contactType: string) => {
*/
const handleSubmit = async () => {
if (dialog.type === DialogType.ACCOUNT) {
- UserAPI.updateProfile(userProfileForm.id, userProfileForm).then(() => {
+ UserAPI.updateProfile(userProfileForm).then(() => {
ElMessage.success("账号资料修改成功");
dialog.visible = false;
loadUserProfile();
@@ -465,10 +428,18 @@ const handleSubmit = async () => {
ElMessage.success("密码修改成功");
dialog.visible = false;
});
- } else if (dialog.type === "mobile") {
- //await UserAPI.bindMobile(mobileBindingForm.value);
- } else if (dialog.type === "email") {
- //await UserAPI.bindEmail(emailBindingForm.value);
+ } else if (dialog.type === DialogType.MOBILE) {
+ UserAPI.bindMobile(mobileBindingForm).then(() => {
+ ElMessage.success("手机号绑定成功");
+ dialog.visible = false;
+ loadUserProfile();
+ });
+ } else if (dialog.type === DialogType.EMAIL) {
+ UserAPI.bindEmail(emailBindingForm).then(() => {
+ ElMessage.success("邮箱绑定成功");
+ dialog.visible = false;
+ loadUserProfile();
+ });
}
};
@@ -488,7 +459,7 @@ const handleFileChange = async (event: Event) => {
// 更新用户头像
userProfile.value.avatar = data.url;
// 更新用户信息
- await UserAPI.updateProfile(userProfile.value.id, {
+ await UserAPI.updateProfile({
avatar: data.url,
});
} catch (error) {
@@ -499,7 +470,7 @@ const handleFileChange = async (event: Event) => {
/** 加载用户信息 */
const loadUserProfile = async () => {
- const data = await UserAPI.getProfile(userStore.user.userId);
+ const data = await UserAPI.getProfile();
userProfile.value = data;
};
diff --git a/src/views/redirect/index.vue b/src/views/redirect/index.vue
index 4215bf69..2b613861 100644
--- a/src/views/redirect/index.vue
+++ b/src/views/redirect/index.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 60d32252..32517f01 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,41 +1,27 @@
-
+
({
const tableData = ref();
-// 字典弹窗
const dialog = reactive({
title: "",
visible: false,
@@ -248,15 +157,8 @@ const formData = reactive({});
const computedRules = computed(() => {
const rules: Partial> = {
name: [{ required: true, message: "请输入字典名称", trigger: "blur" }],
- code: [{ required: true, message: "请输入字典编码", trigger: "blur" }],
+ dictCode: [{ required: true, message: "请输入字典编码", trigger: "blur" }],
};
- if (formData.dictItems) {
- formData.dictItems.forEach((attr, index) => {
- rules[`dictItems.${index}.name`] = [
- { required: true, message: "请输入字典项名称", trigger: "blur" },
- ];
- });
- }
return rules;
});
@@ -274,7 +176,7 @@ function handleQuery() {
}
// 重置查询
-function handleResetClick() {
+function handleResetQuery() {
queryFormRef.value.resetFields();
queryParams.pageNum = 1;
handleQuery();
@@ -298,7 +200,7 @@ function handleAddClick() {
*/
function handleEditClick(id: number, name: string) {
dialog.visible = true;
- dialog.title = "【" + name + "】字典修改";
+ dialog.title = "修改字典";
DictAPI.getFormData(id).then((data) => {
Object.assign(formData, data);
});
@@ -331,7 +233,7 @@ function handleSubmitClick() {
});
}
-/** 关闭字典弹窗 */
+// 关闭字典弹窗
function handleCloseDialog() {
dialog.visible = false;
@@ -339,7 +241,6 @@ function handleCloseDialog() {
dataFormRef.value.clearValidate();
formData.id = undefined;
- formData.dictItems = [];
}
/**
* 删除字典
@@ -360,7 +261,7 @@ function handleDelete(id?: number) {
() => {
DictAPI.deleteByIds(attrGroupIds).then(() => {
ElMessage.success("删除成功");
- handleResetClick();
+ handleResetQuery();
});
},
() => {
@@ -369,17 +270,17 @@ function handleDelete(id?: number) {
);
}
-/** 新增字典项 */
-function handleAddAttrClick() {
- formData.dictItems = formData.dictItems ?? [];
- formData.dictItems.push({ sort: 1, status: 1 });
-}
+// 打开字典数据
+function handleOpenDictData(row: DictPageVO) {
+ router.push({
+ path: "/system/dict-data",
+ query: { dictCode: row.dictCode, title: "【" + row.name + "】字典数据" },
+ });
-/** 删除字典项 */
-function handleDeleteAttrClick(index: number) {
- if (formData.dictItems && formData.dictItems.length > 0) {
- formData.dictItems.splice(index, 1);
- }
+ /* router.push({
+ name: "DictData",
+ params: { dictCode: row.dictCode, title: "【" + row.name + "】字典数据" },
+ }); */
}
onMounted(() => {
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index d234135c..13cca4ef 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -1,6 +1,6 @@
-
@@ -221,7 +129,9 @@ defineOptions({
inherititems: false,
});
-import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/dict";
+import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/system/dict";
+
+import router from "@/router";
const queryFormRef = ref(ElForm);
const dataFormRef = ref(ElForm);
@@ -237,7 +147,6 @@ const queryParams = reactive
+
-
-
-
-
-
@@ -69,22 +45,29 @@
+
+
+
+
-
-
@@ -101,25 +84,20 @@
-
-
+
-
-
+
@@ -128,80 +106,10 @@
禁用
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -211,7 +119,7 @@
取 消
-
+
-
-
-
- 新增
+
删除
@@ -48,18 +34,8 @@
@selection-change="handleSelectionChange"
>
- 字典项
-
-
-
-
-
-
+
-
+
-
+
-
-
+
+
-
-
+
-
+
@@ -59,70 +50,29 @@
-
- 目录
-
-
- 菜单
-
-
- 按钮
-
-
- 外链
-
+ 目录
+ 菜单
+ 按钮
+ 外链
-
-
显示
隐藏
-
-
@@ -142,9 +92,9 @@
type="primary"
link
size="small"
+ icon="edit"
@click.stop="handleOpenDialog(undefined, scope.row.id)"
>
-
-
@@ -162,18 +112,8 @@
-
-
+
+
-
+
目录
菜单
按钮
@@ -201,30 +138,21 @@
-
-
+
-
+
-
+
-
路由名称
- 如果需要开启缓存，需保证页面 defineOptions 中的 name
- 与此处一致，建议使用驼峰。
+ 如果需要开启缓存，需保证页面 defineOptions 中的 name 与此处一致，建议使用驼峰。
-
+
@@ -232,22 +160,20 @@
+
+
-
路由路径
- 定义应用中不同页面对应的 URL 路径，目录需以 /
- 开头，菜单项不用。例如：系统管理目录
+ 定义应用中不同页面对应的 URL 路径，目录需以 / 开头，菜单项不用。例如：系统管理目录
/system，系统管理下的用户管理菜单 user。
-
+
@@ -259,82 +185,60 @@
+
-
- src/views/
-
-
- .vue
-
+
+ src/views/
+ .vue
-
组件路径
- 组件页面完整路径，相对于 src/views/，如
- system/user/index，缺省后缀 .vue
+ 组件页面完整路径，相对于 src/views/，如 system/user/index，缺省后缀 .vue
-
+
-
+
+
显示
隐藏
@@ -364,13 +262,10 @@
-
路由参数
组件页面使用 `useRoute().query.参数名` 获取路由参数值。
-
+
-
+
添加路由参数
-
@@ -352,11 +254,7 @@
-
+
+
开启
关闭
@@ -411,34 +305,23 @@
-
+
-
+
-
+
@@ -448,11 +331,11 @@
diff --git a/src/views/system/notice/components/NoticeDetail.vue b/src/views/system/notice/components/NoticeDetail.vue
new file mode 100644
index 00000000..f07a88fb
--- /dev/null
+++ b/src/views/system/notice/components/NoticeDetail.vue
@@ -0,0 +1,80 @@
+
+
+
+
+
+ {{ notice.title }}
+
+
+ 未发布
+ 已发布
+ 已撤回
+
+
+ {{ notice.publisherName }}
+
+
+ {{ notice.publishTime }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
new file mode 100644
index 00000000..f8e4db0b
--- /dev/null
+++ b/src/views/system/notice/index.vue
@@ -0,0 +1,416 @@
+
+
始终显示
@@ -380,7 +275,9 @@
如果是叶子节点，请选择“否”。 -
+
@@ -391,10 +288,7 @@
- 如果是叶子节点，请选择“否”。 -
+ 通知公告详情
+
+
+
+
+
+
+
+
+
+
+ 新增通知
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+ 全体
+ 指定
+
+
+
+
+ 未发布
+ 已发布
+ 已撤回
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 发布
+
+
+ 撤回
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 全体
+ 指定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 8fa34dc9..3f279355 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,6 +1,6 @@
+ 创建时间：
+ {{ scope.row.createTime || "-" }}
+
+
+
+ 发布时间：
+ {{ scope.row.publishTime || "-" }}
+
+
+ 撤回时间：
+ {{ scope.row.revokeTime || "-" }}
+
+
+
-
+
-
-
-
-
-
-
+
-
-
-
@@ -110,12 +96,7 @@
width="500px"
@close="handleCloseDialog"
>
-
+
@@ -165,26 +146,23 @@
size="500"
>
+ 新增
+
删除
-
+
-
+
-
- ({
sort: 1,
status: 1,
- code: "",
- name: "",
});
const rules = reactive({
@@ -287,7 +260,7 @@ const isExpanded = ref(true);
const parentChildLinked = ref(true);
-/** 查询 */
+// 查询
function handleQuery() {
loading.value = true;
RoleAPI.getPage(queryParams)
@@ -300,19 +273,19 @@ function handleQuery() {
});
}
-/** 重置查询 */
+// 重置查询
function handleResetQuery() {
queryFormRef.value.resetFields();
queryParams.pageNum = 1;
handleQuery();
}
-/** 行复选框选中记录选中ID集合 */
+// 行复选框选中
function handleSelectionChange(selection: any) {
ids.value = selection.map((item: any) => item.id);
}
-/** 打开角色弹窗 */
+// 打开角色弹窗
function handleOpenDialog(roleId?: number) {
dialog.visible = true;
if (roleId) {
@@ -325,7 +298,7 @@ function handleOpenDialog(roleId?: number) {
}
}
-/** 提交角色表单 */
+// 提交角色表单
function handleSubmit() {
roleFormRef.value.validate((valid: any) => {
if (valid) {
@@ -352,7 +325,7 @@ function handleSubmit() {
});
}
-/** 关闭角色弹窗 */
+// 关闭弹窗
function handleCloseDialog() {
dialog.visible = false;
@@ -364,7 +337,7 @@ function handleCloseDialog() {
formData.status = 1;
}
-/** 删除角色 */
+// 删除角色
function handleDelete(roleId?: number) {
const roleIds = [roleId || ids.value].join(",");
if (!roleIds) {
@@ -392,7 +365,7 @@ function handleDelete(roleId?: number) {
);
}
-/** 打开分配菜单权限弹窗 */
+// 打开分配菜单权限弹窗
async function handleOpenAssignPermDialog(row: RolePageVO) {
const roleId = row.id;
if (roleId) {
@@ -409,9 +382,7 @@ async function handleOpenAssignPermDialog(row: RolePageVO) {
RoleAPI.getRoleMenuIds(roleId)
.then((data) => {
const checkedMenuIds = data;
- checkedMenuIds.forEach((menuId) =>
- permTreeRef.value!.setChecked(menuId, true, false)
- );
+ checkedMenuIds.forEach((menuId) => permTreeRef.value!.setChecked(menuId, true, false));
})
.finally(() => {
loading.value = false;
@@ -419,7 +390,7 @@ async function handleOpenAssignPermDialog(row: RolePageVO) {
}
}
-/** 分配菜单权限提交 */
+// 分配菜单权限提交
function handleAssignPermSubmit() {
const roleId = checkedRole.value.id;
if (roleId) {
@@ -440,7 +411,7 @@ function handleAssignPermSubmit() {
}
}
-/** 展开/收缩 菜单权限树 */
+// 展开/收缩 菜单权限树
function togglePermTree() {
isExpanded.value = !isExpanded.value;
if (permTreeRef.value) {
@@ -454,7 +425,7 @@ function togglePermTree() {
}
}
-/** 权限筛选 */
+// 权限筛选
watch(permKeywords, (val) => {
permTreeRef.value!.filter(val);
});
@@ -469,7 +440,7 @@ function handlePermFilter(
return data.label.includes(value);
}
-/** 父子菜单节点是否联动 change*/
+// 父子菜单节点是否联动
function handleparentChildLinkedChange(val: any) {
parentChildLinked.value = val;
}
diff --git a/src/views/system/user/components/dept-tree.vue b/src/views/system/user/components/DeptTree.vue
similarity index 93%
rename from src/views/system/user/components/dept-tree.vue
rename to src/views/system/user/components/DeptTree.vue
index 2f386063..9558f36e 100644
--- a/src/views/system/user/components/dept-tree.vue
+++ b/src/views/system/user/components/DeptTree.vue
@@ -3,7 +3,7 @@
-
@@ -21,7 +21,7 @@
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 2ef69783..51113d70 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -4,12 +4,12 @@
-
-
+
-
父子联动
@@ -193,9 +171,9 @@
如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动
-
+
@@ -214,12 +192,9 @@
{{ data.label }}
-
@@ -233,8 +208,8 @@ defineOptions({
inheritAttrs: false,
});
-import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/role";
-import MenuAPI from "@/api/menu";
+import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role";
+import MenuAPI from "@/api/system/menu";
const queryFormRef = ref(ElForm);
const roleFormRef = ref(ElForm);
@@ -263,8 +238,6 @@ const dialog = reactive({
const formData = reactive
+
-
-
-
-
+
+
+
+
+
+
{{ scope.row.status == 1 ? "正常" : "禁用" }}
-
-
-
-
@@ -201,19 +156,14 @@
-
+
-
+
-
@@ -253,19 +203,11 @@
-
-
@@ -288,56 +230,46 @@
-
-
-
-
-
-
-
-
-
-
+
+
-
+
+ 导出
+
-
+
+
+ 新增
+
+
+ 删除
+
+
+
+
+ 导入
+
-
-
-
+