-
-
-
+
-
-
- 分钟，允许的通配符[, - * /]
-
-
+
+
+
+ 分钟，允许的通配符[, - * /]
+
+
-
-
- 周期从
-
-
+
+
+ 周期从
+
+
-
-
- 从
-
-
+
+
+ 从
+
+
-
-
- 指定
-
-
-
-
-
+
+
+ 指定
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/components/Crontab/month.vue b/src/components/Crontab/month.vue
index 98227b8..d66c605 100644
--- a/src/components/Crontab/month.vue
+++ b/src/components/Crontab/month.vue
@@ -1,141 +1,162 @@
-
-
-
- 月，允许的通配符[, - * /]
-
-
+
+
+
+ 月，允许的通配符[, - * /]
+
+
-
-
- 周期从
-
-
+
+
+ 周期从
+
+
-
-
- 从
-
-
+
+
+ 从
+
+
-
-
- 指定
-
-
-
-
-
+
+
+ 指定
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/components/Crontab/result.vue b/src/components/Crontab/result.vue
index 5a812ee..ad4bec3 100644
--- a/src/components/Crontab/result.vue
+++ b/src/components/Crontab/result.vue
@@ -1,540 +1,591 @@
-
-
-
- 秒，允许的通配符[, - * /]
-
-
+
+
+
+ 秒，允许的通配符[, - * /]
+
+
-
-
- 周期从
-
-
+
+
+ 周期从
+
+
-
-
- 从
-
-
+
+
+ 从
+
+
-
-
- 指定
-
-
-
-
-
+
+
+ 指定
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/components/Crontab/week.vue b/src/components/Crontab/week.vue
index c237c3a..a9eeae6 100644
--- a/src/components/Crontab/week.vue
+++ b/src/components/Crontab/week.vue
@@ -1,197 +1,229 @@
-
-
-
- 周，允许的通配符[, - * ? / L #]
-
-
+
+
+
+ 周，允许的通配符[, - * ? / L #]
+
+
-
-
- 不指定
-
-
+
+ 不指定
+
-
-
- 周期从
-
- {{item.value}}
-
- -
-
- {{item.value}}
-
-
-
+
+
+ 周期从
+
+ {{ item.value }}
+
+ -
+
+ {{ item.value }}
+
+
+
-
-
- 第
-
-
-
-
+
+
+ 第
+
+
+
+
-
-
- 本月最后一个
-
-
-
-
+
+
+ 本月最后一个
+
+
+
+
-
-
- 指定
-
-
-
-
-
-
+
+
+ 指定
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/components/Crontab/year.vue b/src/components/Crontab/year.vue
index 5c53614..139c505 100644
--- a/src/components/Crontab/year.vue
+++ b/src/components/Crontab/year.vue
@@ -1,149 +1,192 @@
-
-
-
- 不填，允许的通配符[, - * /]
-
-
+
+
+
+ 不填，允许的通配符[, - * /]
+
+
-
-
- 每年
-
-
+
+ 每年
+
-
-
- 周期从
-
-
+
+
+ 周期从
+
+
-
-
- 从
-
+
+
+ 从
+
+
-
-
-
-
- 指定
-
-
-
-
-
+
+
+ 指定
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 4806fdb..31f214e 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -85,4 +85,4 @@ function handleArray(array) {
.el-tag + .el-tag {
margin-left: 10px;
}
-
\ No newline at end of file
+
diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue
index eaed9c5..336c87f 100644
--- a/src/components/Editor/index.vue
+++ b/src/components/Editor/index.vue
@@ -1,18 +1,18 @@
+
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
\ No newline at end of file
+
diff --git a/src/components/Crontab/min.vue b/src/components/Crontab/min.vue
index 69a2da4..a5c6efd 100644
--- a/src/components/Crontab/min.vue
+++ b/src/components/Crontab/min.vue
@@ -1,126 +1,147 @@
-
-
+
-
-
-
-
- 时间表达式
-| {{item}} | -Cron 表达式 | - - -
- {{crontabValueObj.second}}
- |
-
- {{crontabValueObj.min}}
- |
-
- {{crontabValueObj.hour}}
- |
-
- {{crontabValueObj.day}}
- |
-
- {{crontabValueObj.month}}
- |
-
- {{crontabValueObj.week}}
- |
-
- {{crontabValueObj.year}}
- |
-
- {{crontabValueString}}
- |
-
-
|---|
+
+
+
+
+
+
+ 时间表达式
+| {{ item }} | +Cron 表达式 | + + +
+ {{
+ crontabValueObj.second
+ }}
+ |
+
+ {{
+ crontabValueObj.min
+ }}
+ |
+
+ {{
+ crontabValueObj.hour
+ }}
+ |
+
+ {{
+ crontabValueObj.day
+ }}
+ |
+
+ {{
+ crontabValueObj.month
+ }}
+ |
+
+ {{
+ crontabValueObj.week
+ }}
+ |
+
+ {{
+ crontabValueObj.year
+ }}
+ |
+
+ {{
+ crontabValueString
+ }}
+ |
+
+
|---|
- 确定
- 重置
- 取消
-
-
+ 确定
+ 重置
+ 取消
+
-
+ 最近5次运行时间
--
-
-
- {{item}} - -
- 计算结果中... -
+
\ No newline at end of file
+ expressionChange();
+});
+
diff --git a/src/components/Crontab/second.vue b/src/components/Crontab/second.vue
index 92be17f..45b30d0 100644
--- a/src/components/Crontab/second.vue
+++ b/src/components/Crontab/second.vue
@@ -1,128 +1,149 @@
- 最近5次运行时间
+-
+
+
- {{ item }} + +
- 计算结果中... +
-
\ No newline at end of file
+
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 517a4af..a5db881 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -12,9 +12,18 @@
-
+
@@ -24,88 +33,90 @@
-
\ No newline at end of file
+}
+
diff --git a/src/components/IconSelect/requireIcons.js b/src/components/IconSelect/requireIcons.js
index ac22fd7..196e4ed 100644
--- a/src/components/IconSelect/requireIcons.js
+++ b/src/components/IconSelect/requireIcons.js
@@ -1,8 +1,8 @@
-let icons = []
-const modules = import.meta.glob('./../../assets/icons/svg/*.svg');
+let icons = [];
+const modules = import.meta.glob("./../../assets/icons/svg/*.svg");
for (const path in modules) {
- const p = path.split('assets/icons/svg/')[1].split('.svg')[0];
+ const p = path.split("assets/icons/svg/")[1].split(".svg")[0];
icons.push(p);
}
-export default icons
\ No newline at end of file
+export default icons;
diff --git a/src/components/ImagePreview/index.vue b/src/components/ImagePreview/index.vue
index b607ab6..412f2c6 100644
--- a/src/components/ImagePreview/index.vue
+++ b/src/components/ImagePreview/index.vue
@@ -20,16 +20,16 @@ import { isExternal } from "@/utils/validate";
const props = defineProps({
src: {
type: String,
- default: ""
+ default: "",
},
width: {
type: [Number, String],
- default: ""
+ default: "",
},
height: {
type: [Number, String],
- default: ""
- }
+ default: "",
+ },
});
const realSrc = computed(() => {
@@ -49,7 +49,7 @@ const realSrcList = computed(() => {
}
let real_src_list = props.src.split(",");
let srcList = [];
- real_src_list.forEach(item => {
+ real_src_list.forEach((item) => {
if (isExternal(item)) {
return srcList.push(item);
}
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 55dafb8..d1976b8 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -68,7 +68,7 @@ const props = defineProps({
// 是否显示提示
isShowTip: {
type: Boolean,
- default: true
+ default: true,
},
});
@@ -86,26 +86,30 @@ const showTip = computed(
() => props.isShowTip && (props.fileType || props.fileSize)
);
-watch(() => props.modelValue, val => {
- if (val) {
- // 首先将值转为数组
- const list = Array.isArray(val) ? val : props.modelValue.split(",");
- // 然后将数组转为对象数组
- fileList.value = list.map(item => {
- if (typeof item === "string") {
- if (item.indexOf(baseUrl) === -1) {
- item = { name: baseUrl + item, url: baseUrl + item };
- } else {
- item = { name: item, url: item };
+watch(
+ () => props.modelValue,
+ (val) => {
+ if (val) {
+ // 首先将值转为数组
+ const list = Array.isArray(val) ? val : props.modelValue.split(",");
+ // 然后将数组转为对象数组
+ fileList.value = list.map((item) => {
+ if (typeof item === "string") {
+ if (item.indexOf(baseUrl) === -1) {
+ item = { name: baseUrl + item, url: baseUrl + item };
+ } else {
+ item = { name: item, url: item };
+ }
}
- }
- return item;
- });
- } else {
- fileList.value = [];
- return [];
- }
-},{ deep: true, immediate: true });
+ return item;
+ });
+ } else {
+ fileList.value = [];
+ return [];
+ }
+ },
+ { deep: true, immediate: true }
+);
// 上传前loading加载
function handleBeforeUpload(file) {
@@ -115,7 +119,7 @@ function handleBeforeUpload(file) {
if (file.name.lastIndexOf(".") > -1) {
fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
}
- isImg = props.fileType.some(type => {
+ isImg = props.fileType.some((type) => {
if (file.type.indexOf(type) > -1) return true;
if (fileExtension && fileExtension.indexOf(type) > -1) return true;
return false;
@@ -161,7 +165,7 @@ function handleUploadSuccess(res, file) {
// 删除图片
function handleDelete(file) {
- const findex = fileList.value.map(f => f.name).indexOf(file.name);
+ const findex = fileList.value.map((f) => f.name).indexOf(file.name);
if (findex > -1 && uploadList.value.length === number.value) {
fileList.value.splice(findex, 1);
emit("update:modelValue", listToString(fileList.value));
@@ -172,7 +176,9 @@ function handleDelete(file) {
// 上传结束处理
function uploadedSuccessfully() {
if (number.value > 0 && uploadList.value.length === number.value) {
- fileList.value = fileList.value.filter(f => f.url !== undefined).concat(uploadList.value);
+ fileList.value = fileList.value
+ .filter((f) => f.url !== undefined)
+ .concat(uploadList.value);
uploadList.value = [];
number.value = 0;
emit("update:modelValue", listToString(fileList.value));
@@ -208,6 +214,6 @@ function listToString(list, separator) {
\ No newline at end of file
+
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 38de953..8200733 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -1,5 +1,5 @@
-
-
+
\ No newline at end of file
+
diff --git a/src/components/ParentView/index.vue b/src/components/ParentView/index.vue
index 7bf6148..98240ae 100644
--- a/src/components/ParentView/index.vue
+++ b/src/components/ParentView/index.vue
@@ -1,3 +1,3 @@
-
+
-
+
-
+
@@ -39,9 +51,9 @@ const props = defineProps({
type: Number,
default: 10,
},
-})
+});
-const emits = defineEmits(['update:showSearch', 'queryTable']);
+const emits = defineEmits(["update:showSearch", "queryTable"]);
// 显隐数据
const value = ref([]);
@@ -89,7 +101,7 @@ for (let item in props.columns) {
}
-
\ No newline at end of file
+
diff --git a/src/components/RuoYi/Doc/index.vue b/src/components/RuoYi/Doc/index.vue
index 51f13cb..89aeae6 100644
--- a/src/components/RuoYi/Doc/index.vue
+++ b/src/components/RuoYi/Doc/index.vue
@@ -5,9 +5,9 @@
\ No newline at end of file
+
diff --git a/src/components/RuoYi/Git/index.vue b/src/components/RuoYi/Git/index.vue
index b4459f3..73f6a9c 100644
--- a/src/components/RuoYi/Git/index.vue
+++ b/src/components/RuoYi/Git/index.vue
@@ -5,9 +5,9 @@
diff --git a/src/components/Screenfull/index.vue b/src/components/Screenfull/index.vue
index 7ad28ea..eaed38f 100644
--- a/src/components/Screenfull/index.vue
+++ b/src/components/Screenfull/index.vue
@@ -1,16 +1,19 @@
-
+
{{ item.label }}
@@ -36,10 +41,10 @@ function handleSetSize(size) {
}
-
\ No newline at end of file
+
diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index 8c101f6..bb66d79 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -9,15 +9,15 @@ export default defineComponent({
props: {
iconClass: {
type: String,
- required: true
+ required: true,
},
className: {
type: String,
- default: ''
+ default: "",
},
color: {
type: String,
- default: ''
+ default: "",
},
},
setup(props) {
@@ -25,13 +25,13 @@ export default defineComponent({
iconName: computed(() => `#icon-${props.iconClass}`),
svgClass: computed(() => {
if (props.className) {
- return `svg-icon ${props.className}`
+ return `svg-icon ${props.className}`;
}
- return 'svg-icon'
- })
- }
- }
-})
+ return "svg-icon";
+ }),
+ };
+ },
+});
\ No newline at end of file
+
diff --git a/src/components/iFrame/index.vue b/src/components/iFrame/index.vue
index 091b1a2..90837b7 100644
--- a/src/components/iFrame/index.vue
+++ b/src/components/iFrame/index.vue
@@ -1,10 +1,11 @@
-
@@ -12,10 +16,10 @@
-
diff --git a/src/layout/components/IframeToggle/index.vue b/src/layout/components/IframeToggle/index.vue
index 2e07fe8..e499f92 100644
--- a/src/layout/components/IframeToggle/index.vue
+++ b/src/layout/components/IframeToggle/index.vue
@@ -11,9 +11,9 @@
diff --git a/src/layout/components/InnerLink/index.vue b/src/layout/components/InnerLink/index.vue
index 53a903c..2621838 100644
--- a/src/layout/components/InnerLink/index.vue
+++ b/src/layout/components/InnerLink/index.vue
@@ -13,11 +13,11 @@
const props = defineProps({
src: {
type: String,
- default: "/"
+ default: "/",
},
iframeId: {
- type: String
- }
+ type: String,
+ },
});
const height = ref(document.documentElement.clientHeight - 94.5 + "px");
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ab4d5f3..c55c3a4 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,8 +1,21 @@
-
-
\ No newline at end of file
+
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index 4c2e7e9..d38fc03 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -6,7 +6,12 @@
-
+
@@ -12,13 +13,13 @@
const props = defineProps({
src: {
type: String,
- required: true
- }
-})
+ required: true,
+ },
+});
-const height = ref(document.documentElement.clientHeight - 94.5 + "px;")
-const loading = ref(true)
-const url = computed(() => props.src)
+const height = ref(document.documentElement.clientHeight - 94.5 + "px;");
+const loading = ref(true);
+const url = computed(() => props.src);
onMounted(() => {
setTimeout(() => {
@@ -27,5 +28,5 @@ onMounted(() => {
window.onresize = function temp() {
height.value = document.documentElement.clientHeight - 94.5 + "px;";
};
-})
+});
diff --git a/src/constant/dict.js b/src/constant/dict.js
index d59e318..601708c 100644
--- a/src/constant/dict.js
+++ b/src/constant/dict.js
@@ -1,43 +1,43 @@
export const sys_normal_disable = [
- {
- label: "正常",
- value: "1",
- elTagType: "success"
- },
- {
+ {
+ label: "正常",
+ value: "1",
+ elTagType: "success",
+ },
+ {
label: "禁用",
value: "0",
- elTagType: "warning"
- }
-]
+ elTagType: "warning",
+ },
+];
export const sys_user_gender = [
- {
- label: "男",
- value: "0",
- elTagType: "success"
- },
- {
- label: "女",
- value: "1",
- elTagType: "warning"
- },
- {
- label: "未知",
- value: "2",
- elTagType: "warning"
- }
-]
+ {
+ label: "男",
+ value: "0",
+ elTagType: "success",
+ },
+ {
+ label: "女",
+ value: "1",
+ elTagType: "warning",
+ },
+ {
+ label: "未知",
+ value: "2",
+ elTagType: "warning",
+ },
+];
export const menu_show_hide = [
- {
+ {
label: "隐藏",
value: "0",
- elTagType: "warning"
- },
- {
- label: "显示",
- value: "1",
- elTagType: "success"
- }
-]
\ No newline at end of file
+ elTagType: "warning",
+ },
+ {
+ label: "显示",
+ value: "1",
+ elTagType: "success",
+ },
+];
diff --git a/src/directive/common/copyText.js b/src/directive/common/copyText.js
index 7063df8..fa45f5f 100644
--- a/src/directive/common/copyText.js
+++ b/src/directive/common/copyText.js
@@ -1,7 +1,7 @@
/**
-* v-copyText 复制文本内容
-* Copyright (c) 2022 ruoyi
-*/
+ * v-copyText 复制文本内容
+ * Copyright (c) 2022 ruoyi
+ */
export default {
beforeMount(el, { value, arg }) {
@@ -18,22 +18,22 @@ export default {
el.addEventListener("click", handler);
el.$destroyCopy = () => el.removeEventListener("click", handler);
}
- }
-}
+ },
+};
function copyTextToClipboard(input, { target = document.body } = {}) {
- const element = document.createElement('textarea');
+ const element = document.createElement("textarea");
const previouslyFocusedElement = document.activeElement;
element.value = input;
// Prevent keyboard from showing on mobile
- element.setAttribute('readonly', '');
+ element.setAttribute("readonly", "");
- element.style.contain = 'strict';
- element.style.position = 'absolute';
- element.style.left = '-9999px';
- element.style.fontSize = '12pt'; // Prevent zooming on iOS
+ element.style.contain = "strict";
+ element.style.position = "absolute";
+ element.style.left = "-9999px";
+ element.style.fontSize = "12pt"; // Prevent zooming on iOS
const selection = document.getSelection();
const originalRange = selection.rangeCount > 0 && selection.getRangeAt(0);
@@ -47,8 +47,8 @@ function copyTextToClipboard(input, { target = document.body } = {}) {
let isSuccess = false;
try {
- isSuccess = document.execCommand('copy');
- } catch { }
+ isSuccess = document.execCommand("copy");
+ } catch {}
element.remove();
diff --git a/src/directive/index.js b/src/directive/index.js
index 86b8f88..2979c62 100644
--- a/src/directive/index.js
+++ b/src/directive/index.js
@@ -1,9 +1,9 @@
-import hasRole from './permission/hasRole'
-import hasPermi from './permission/hasPermi'
-import copyText from './common/copyText'
+import hasRole from "./permission/hasRole";
+import hasPermi from "./permission/hasPermi";
+import copyText from "./common/copyText";
-export default function directive(app){
- app.directive('hasRole', hasRole)
- app.directive('hasPermi', hasPermi)
- app.directive('copyText', copyText)
-}
\ No newline at end of file
+export default function directive(app) {
+ app.directive("hasRole", hasRole);
+ app.directive("hasPermi", hasPermi);
+ app.directive("copyText", copyText);
+}
diff --git a/src/directive/permission/hasPermi.js b/src/directive/permission/hasPermi.js
index 44ef3f8..d04fb4e 100644
--- a/src/directive/permission/hasPermi.js
+++ b/src/directive/permission/hasPermi.js
@@ -1,28 +1,30 @@
- /**
+/**
* v-hasPermi 操作权限处理
* Copyright (c) 2019 ruoyi
*/
-
-import useUserStore from '@/store/modules/user'
+
+import useUserStore from "@/store/modules/user";
export default {
mounted(el, binding, vnode) {
- const { value } = binding
+ const { value } = binding;
const all_permission = "*:*:*";
- const permissions = useUserStore().permissions
+ const permissions = useUserStore().permissions;
if (value && value instanceof Array && value.length > 0) {
- const permissionFlag = value
+ const permissionFlag = value;
- const hasPermissions = permissions.some(permission => {
- return all_permission === permission || permissionFlag.includes(permission)
- })
+ const hasPermissions = permissions.some((permission) => {
+ return (
+ all_permission === permission || permissionFlag.includes(permission)
+ );
+ });
if (!hasPermissions) {
- el.parentNode && el.parentNode.removeChild(el)
+ el.parentNode && el.parentNode.removeChild(el);
}
} else {
- throw new Error(`请设置操作权限标签值`)
+ throw new Error(`请设置操作权限标签值`);
}
- }
-}
+ },
+};
diff --git a/src/directive/permission/hasRole.js b/src/directive/permission/hasRole.js
index 8774bdd..e244852 100644
--- a/src/directive/permission/hasRole.js
+++ b/src/directive/permission/hasRole.js
@@ -1,28 +1,28 @@
- /**
+/**
* v-hasRole 角色权限处理
* Copyright (c) 2019 ruoyi
*/
-
-import useUserStore from '@/store/modules/user'
+
+import useUserStore from "@/store/modules/user";
export default {
mounted(el, binding, vnode) {
- const { value } = binding
+ const { value } = binding;
const super_admin = "admin";
- const roles = useUserStore().roles
+ const roles = useUserStore().roles;
if (value && value instanceof Array && value.length > 0) {
- const roleFlag = value
+ const roleFlag = value;
- const hasRole = roles.some(role => {
- return super_admin === role || roleFlag.includes(role)
- })
+ const hasRole = roles.some((role) => {
+ return super_admin === role || roleFlag.includes(role);
+ });
if (!hasRole) {
- el.parentNode && el.parentNode.removeChild(el)
+ el.parentNode && el.parentNode.removeChild(el);
}
} else {
- throw new Error(`请设置角色权限标签值`)
+ throw new Error(`请设置角色权限标签值`);
}
- }
-}
+ },
+};
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 42fffdf..85e7b7f 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -3,7 +3,11 @@
-
@@ -23,7 +36,11 @@
-
+
![]()
+
-
+
![]()
-
![]()
-
@@ -78,4 +113,4 @@ const sideTheme = computed(() => settingsStore.sideTheme);
}
}
}
-
\ No newline at end of file
+
diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue
index c423fb1..4f4299f 100644
--- a/src/layout/components/Sidebar/SidebarItem.vue
+++ b/src/layout/components/Sidebar/SidebarItem.vue
@@ -1,18 +1,47 @@
{{ title }}
++ {{ title }} +
{{ title }}
++ {{ title }} +
-
-
-
-
+
+
-
+
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index 516b5d2..1914070 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -10,7 +10,7 @@
-
\ No newline at end of file
+
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1f99623..5625621 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,6 +1,10 @@
-
\ No newline at end of file
+
diff --git a/src/layout/components/index.js b/src/layout/components/index.js
index fd57731..5d8cf1c 100644
--- a/src/layout/components/index.js
+++ b/src/layout/components/index.js
@@ -1,4 +1,4 @@
-export { default as AppMain } from './AppMain'
-export { default as Navbar } from './Navbar'
-export { default as Settings } from './Settings'
-export { default as TagsView } from './TagsView/index.vue'
+export { default as AppMain } from "./AppMain";
+export { default as Navbar } from "./Navbar";
+export { default as Settings } from "./Settings";
+export { default as TagsView } from "./TagsView/index.vue";
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 9174b38..28f87f1 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,28 +1,39 @@
-
-
+
-
- ![Girl has dropped her ice cream.]()
+ ![Girl has dropped her ice cream.]()
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index f205303..79935c7 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -2,15 +2,29 @@
+
\ No newline at end of file
+
diff --git a/src/main.js b/src/main.js
index f2c6aaa..28340d9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,81 +1,88 @@
-import { createApp } from 'vue'
+import { createApp } from "vue";
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
-import ElementPlus from 'element-plus'
-import locale from 'element-plus/lib/locale/lang/zh-cn' // 中文语言
+import ElementPlus from "element-plus";
+import locale from "element-plus/lib/locale/lang/zh-cn"; // 中文语言
-import '@/assets/styles/index.scss' // global css
+import "@/assets/styles/index.scss"; // global css
-import App from './App'
-import store from './store'
-import router from './router'
-import directive from './directive' // directive
+import App from "./App";
+import store from "./store";
+import router from "./router";
+import directive from "./directive"; // directive
// 注册指令
-import plugins from './plugins' // plugins
-import { download } from '@/utils/request'
+import plugins from "./plugins"; // plugins
+import { download } from "@/utils/request";
// svg图标
-import 'virtual:svg-icons-register'
-import SvgIcon from '@/components/SvgIcon'
-import elementIcons from '@/components/SvgIcon/svgicon'
+import "virtual:svg-icons-register";
+import SvgIcon from "@/components/SvgIcon";
+import elementIcons from "@/components/SvgIcon/svgicon";
-import './permission' // permission control
+import "./permission"; // permission control
-import { parseTime, resetForm, addDateRange, handleTree, selectDictLabel, selectDictLabels } from '@/utils/ruoyi'
+import {
+ parseTime,
+ resetForm,
+ addDateRange,
+ handleTree,
+ selectDictLabel,
+ selectDictLabels,
+} from "@/utils/ruoyi";
// 分页组件
-import Pagination from '@/components/Pagination'
+import Pagination from "@/components/Pagination";
// 自定义表格工具组件
-import RightToolbar from '@/components/RightToolbar'
+import RightToolbar from "@/components/RightToolbar";
// 富文本组件
-import Editor from "@/components/Editor"
+import Editor from "@/components/Editor";
// 文件上传组件
-import FileUpload from "@/components/FileUpload"
+import FileUpload from "@/components/FileUpload";
// 图片上传组件
-import ImageUpload from "@/components/ImageUpload"
+import ImageUpload from "@/components/ImageUpload";
// 图片预览组件
-import ImagePreview from "@/components/ImagePreview"
+import ImagePreview from "@/components/ImagePreview";
// 自定义树选择组件
-import TreeSelect from '@/components/TreeSelect'
+import TreeSelect from "@/components/TreeSelect";
// 字典标签组件
-import DictTag from '@/components/DictTag'
+import DictTag from "@/components/DictTag";
-const app = createApp(App)
+const app = createApp(App);
// 全局方法挂载
-app.config.globalProperties.download = download
-app.config.globalProperties.parseTime = parseTime
-app.config.globalProperties.resetForm = resetForm
-app.config.globalProperties.handleTree = handleTree
-app.config.globalProperties.addDateRange = addDateRange
-app.config.globalProperties.selectDictLabel = selectDictLabel
-app.config.globalProperties.selectDictLabels = selectDictLabels
+app.config.globalProperties.download = download;
+app.config.globalProperties.parseTime = parseTime;
+app.config.globalProperties.resetForm = resetForm;
+app.config.globalProperties.handleTree = handleTree;
+app.config.globalProperties.addDateRange = addDateRange;
+app.config.globalProperties.selectDictLabel = selectDictLabel;
+app.config.globalProperties.selectDictLabels = selectDictLabels;
// 全局组件挂载
-app.component('DictTag', DictTag)
-app.component('Pagination', Pagination)
-app.component('TreeSelect', TreeSelect)
-app.component('FileUpload', FileUpload)
-app.component('ImageUpload', ImageUpload)
-app.component('ImagePreview', ImagePreview)
-app.component('RightToolbar', RightToolbar)
-app.component('Editor', Editor)
+app.component("DictTag", DictTag);
+app.component("Pagination", Pagination);
+app.component("TreeSelect", TreeSelect);
+app.component("FileUpload", FileUpload);
+app.component("ImageUpload", ImageUpload);
+app.component("ImagePreview", ImagePreview);
+app.component("RightToolbar", RightToolbar);
+app.component("Editor", Editor);
-app.use(router)
-app.use(store)
-app.use(plugins)
-app.use(elementIcons)
-app.component('svg-icon', SvgIcon)
+app.use(router);
+app.use(store);
+app.use(plugins);
+app.use(elementIcons);
+app.component("svg-icon", SvgIcon);
-directive(app)
+directive(app);
// 使用element-plus 并且设置全局的大小
app.use(ElementPlus, {
locale: locale,
// 支持 large、default、small
- size: Cookies.get('size') || 'default'
-})
+ size: Cookies.get("size") || "default",
+});
-app.mount('#app')
+app.mount("#app");
diff --git a/src/permission.js b/src/permission.js
index a474e0e..e3dcde8 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,63 +1,70 @@
-import router from './router'
-import { ElMessage } from 'element-plus'
-import NProgress from 'nprogress'
-import 'nprogress/nprogress.css'
-import { getToken } from '@/utils/auth'
-import { isHttp } from '@/utils/validate'
-import { isRelogin } from '@/utils/request'
-import useUserStore from '@/store/modules/user'
-import useSettingsStore from '@/store/modules/settings'
-import usePermissionStore from '@/store/modules/permission'
+import router from "./router";
+import { ElMessage } from "element-plus";
+import NProgress from "nprogress";
+import "nprogress/nprogress.css";
+import { getToken } from "@/utils/auth";
+import { isHttp } from "@/utils/validate";
+import { isRelogin } from "@/utils/request";
+import useUserStore from "@/store/modules/user";
+import useSettingsStore from "@/store/modules/settings";
+import usePermissionStore from "@/store/modules/permission";
NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/register'];
+const whiteList = ["/login", "/register"];
router.beforeEach((to, from, next) => {
- NProgress.start()
+ NProgress.start();
if (getToken()) {
- to.meta.title && useSettingsStore().setTitle(to.meta.title)
+ to.meta.title && useSettingsStore().setTitle(to.meta.title);
/* has token*/
- if (to.path === '/login') {
- next({ path: '/' })
- NProgress.done()
+ if (to.path === "/login") {
+ next({ path: "/" });
+ NProgress.done();
} else {
if (useUserStore().roles.length === 0) {
- isRelogin.show = true
+ isRelogin.show = true;
// 判断当前用户是否已拉取完user_info信息
- useUserStore().getInfo().then(() => {
- isRelogin.show = false
- usePermissionStore().generateRoutes().then(accessRoutes => {
- // 根据roles权限生成可访问的路由表
- accessRoutes.forEach(route => {
- if (!isHttp(route.path)) {
- router.addRoute(route) // 动态添加可访问路由表
- }
- })
- next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+ useUserStore()
+ .getInfo()
+ .then(() => {
+ isRelogin.show = false;
+ usePermissionStore()
+ .generateRoutes()
+ .then((accessRoutes) => {
+ // 根据roles权限生成可访问的路由表
+ accessRoutes.forEach((route) => {
+ if (!isHttp(route.path)) {
+ router.addRoute(route); // 动态添加可访问路由表
+ }
+ });
+ next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
+ });
})
- }).catch(err => {
- useUserStore().logOut().then(() => {
- ElMessage.error(err)
- next({ path: '/' })
- })
- })
+ .catch((err) => {
+ useUserStore()
+ .logOut()
+ .then(() => {
+ ElMessage.error(err);
+ next({ path: "/" });
+ });
+ });
} else {
- next()
+ next();
}
}
} else {
// 没有token
if (whiteList.indexOf(to.path) !== -1) {
// 在免登录白名单，直接进入
- next()
+ next();
} else {
- next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
- NProgress.done()
+ next(`/login?redirect=${to.fullPath}`); // 否则全部重定向到登录页
+ NProgress.done();
}
}
-})
+});
router.afterEach(() => {
- NProgress.done()
-})
+ NProgress.done();
+});
diff --git a/src/plugins/auth.js b/src/plugins/auth.js
index 5e8c28d..1c59efe 100644
--- a/src/plugins/auth.js
+++ b/src/plugins/auth.js
@@ -1,26 +1,26 @@
-import useUserStore from '@/store/modules/user'
+import useUserStore from "@/store/modules/user";
function authPermission(permission) {
const all_permission = "*:*:*";
- const permissions = useUserStore().permissions
+ const permissions = useUserStore().permissions;
if (permission && permission.length > 0) {
- return permissions.some(v => {
- return all_permission === v || v === permission
- })
+ return permissions.some((v) => {
+ return all_permission === v || v === permission;
+ });
} else {
- return false
+ return false;
}
}
function authRole(role) {
const super_admin = "admin";
- const roles = useUserStore().roles
+ const roles = useUserStore().roles;
if (role && role.length > 0) {
- return roles.some(v => {
- return super_admin === v || v === role
- })
+ return roles.some((v) => {
+ return super_admin === v || v === role;
+ });
} else {
- return false
+ return false;
}
}
@@ -31,15 +31,15 @@ export default {
},
// 验证用户是否含有指定权限，只需包含其中一个
hasPermiOr(permissions) {
- return permissions.some(item => {
- return authPermission(item)
- })
+ return permissions.some((item) => {
+ return authPermission(item);
+ });
},
// 验证用户是否含有指定权限，必须全部拥有
hasPermiAnd(permissions) {
- return permissions.every(item => {
- return authPermission(item)
- })
+ return permissions.every((item) => {
+ return authPermission(item);
+ });
},
// 验证用户是否具备某角色
hasRole(role) {
@@ -47,14 +47,14 @@ export default {
},
// 验证用户是否含有指定角色，只需包含其中一个
hasRoleOr(roles) {
- return roles.some(item => {
- return authRole(item)
- })
+ return roles.some((item) => {
+ return authRole(item);
+ });
},
// 验证用户是否含有指定角色，必须全部拥有
hasRoleAnd(roles) {
- return roles.every(item => {
- return authRole(item)
- })
- }
-}
+ return roles.every((item) => {
+ return authRole(item);
+ });
+ },
+};
diff --git a/src/plugins/cache.js b/src/plugins/cache.js
index 6b5c00b..04a33e7 100644
--- a/src/plugins/cache.js
+++ b/src/plugins/cache.js
@@ -1,69 +1,69 @@
const sessionCache = {
- set (key, value) {
+ set(key, value) {
if (!sessionStorage) {
- return
+ return;
}
if (key != null && value != null) {
- sessionStorage.setItem(key, value)
+ sessionStorage.setItem(key, value);
}
},
- get (key) {
+ get(key) {
if (!sessionStorage) {
- return null
+ return null;
}
if (key == null) {
- return null
+ return null;
}
- return sessionStorage.getItem(key)
+ return sessionStorage.getItem(key);
},
- setJSON (key, jsonValue) {
+ setJSON(key, jsonValue) {
if (jsonValue != null) {
- this.set(key, JSON.stringify(jsonValue))
+ this.set(key, JSON.stringify(jsonValue));
}
},
- getJSON (key) {
- const value = this.get(key)
+ getJSON(key) {
+ const value = this.get(key);
if (value != null) {
- return JSON.parse(value)
+ return JSON.parse(value);
}
},
- remove (key) {
+ remove(key) {
sessionStorage.removeItem(key);
- }
-}
+ },
+};
const localCache = {
- set (key, value) {
+ set(key, value) {
if (!localStorage) {
- return
+ return;
}
if (key != null && value != null) {
- localStorage.setItem(key, value)
+ localStorage.setItem(key, value);
}
},
- get (key) {
+ get(key) {
if (!localStorage) {
- return null
+ return null;
}
if (key == null) {
- return null
+ return null;
}
- return localStorage.getItem(key)
+ return localStorage.getItem(key);
},
- setJSON (key, jsonValue) {
+ setJSON(key, jsonValue) {
if (jsonValue != null) {
- this.set(key, JSON.stringify(jsonValue))
+ this.set(key, JSON.stringify(jsonValue));
}
},
- getJSON (key) {
- const value = this.get(key)
+ getJSON(key) {
+ const value = this.get(key);
if (value != null) {
- return JSON.parse(value)
+ return JSON.parse(value);
}
},
- remove (key) {
+ remove(key) {
localStorage.removeItem(key);
- }
-}
+ },
+};
export default {
/**
@@ -73,5 +73,5 @@ export default {
/**
* 本地缓存
*/
- local: localCache
-}
+ local: localCache,
+};
diff --git a/src/plugins/download.js b/src/plugins/download.js
index 67c35cc..7533814 100644
--- a/src/plugins/download.js
+++ b/src/plugins/download.js
@@ -1,63 +1,71 @@
-import axios from 'axios'
-import { ElMessage } from 'element-plus'
-import { saveAs } from 'file-saver'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
-import { blobValidate } from '@/utils/ruoyi'
+import axios from "axios";
+import { ElMessage } from "element-plus";
+import { saveAs } from "file-saver";
+import { getToken } from "@/utils/auth";
+import errorCode from "@/utils/errorCode";
+import { blobValidate } from "@/utils/ruoyi";
-const baseURL = import.meta.env.VITE_APP_BASE_API
+const baseURL = import.meta.env.VITE_APP_BASE_API;
export default {
name(name, isDelete = true) {
- var url = baseURL + "/common/download?fileName=" + encodeURIComponent(name) + "&delete=" + isDelete
+ var url =
+ baseURL +
+ "/common/download?fileName=" +
+ encodeURIComponent(name) +
+ "&delete=" +
+ isDelete;
axios({
- method: 'get',
+ method: "get",
url: url,
- responseType: 'blob',
- headers: { 'Authorization': 'Bearer ' + getToken() }
+ responseType: "blob",
+ headers: { Authorization: "Bearer " + getToken() },
}).then((res) => {
const isBlob = blobValidate(res.data);
if (isBlob) {
- const blob = new Blob([res.data])
- this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
+ const blob = new Blob([res.data]);
+ this.saveAs(blob, decodeURIComponent(res.headers["download-filename"]));
} else {
this.printErrMsg(res.data);
}
- })
+ });
},
resource(resource) {
- var url = baseURL + "/common/download/resource?resource=" + encodeURIComponent(resource);
+ var url =
+ baseURL +
+ "/common/download/resource?resource=" +
+ encodeURIComponent(resource);
axios({
- method: 'get',
+ method: "get",
url: url,
- responseType: 'blob',
- headers: { 'Authorization': 'Bearer ' + getToken() }
+ responseType: "blob",
+ headers: { Authorization: "Bearer " + getToken() },
}).then((res) => {
const isBlob = blobValidate(res.data);
if (isBlob) {
- const blob = new Blob([res.data])
- this.saveAs(blob, decodeURIComponent(res.headers['download-filename']))
+ const blob = new Blob([res.data]);
+ this.saveAs(blob, decodeURIComponent(res.headers["download-filename"]));
} else {
this.printErrMsg(res.data);
}
- })
+ });
},
zip(url, name) {
- var url = baseURL + url
+ var url = baseURL + url;
axios({
- method: 'get',
+ method: "get",
url: url,
- responseType: 'blob',
- headers: { 'Authorization': 'Bearer ' + getToken() }
+ responseType: "blob",
+ headers: { Authorization: "Bearer " + getToken() },
}).then((res) => {
const isBlob = blobValidate(res.data);
if (isBlob) {
- const blob = new Blob([res.data], { type: 'application/zip' })
- this.saveAs(blob, name)
+ const blob = new Blob([res.data], { type: "application/zip" });
+ this.saveAs(blob, name);
} else {
this.printErrMsg(res.data);
}
- })
+ });
},
saveAs(text, name, opts) {
saveAs(text, name, opts);
@@ -65,8 +73,7 @@ export default {
async printErrMsg(data) {
const resText = await data.text();
const rspObj = JSON.parse(resText);
- const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+ const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
ElMessage.error(errMsg);
- }
-}
-
+ },
+};
diff --git a/src/plugins/index.js b/src/plugins/index.js
index 47d1b41..9050925 100644
--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@@ -1,18 +1,18 @@
-import tab from './tab'
-import auth from './auth'
-import cache from './cache'
-import modal from './modal'
-import download from './download'
+import tab from "./tab";
+import auth from "./auth";
+import cache from "./cache";
+import modal from "./modal";
+import download from "./download";
-export default function installPlugins(app){
+export default function installPlugins(app) {
// 页签操作
- app.config.globalProperties.$tab = tab
+ app.config.globalProperties.$tab = tab;
// 认证对象
- app.config.globalProperties.$auth = auth
+ app.config.globalProperties.$auth = auth;
// 缓存对象
- app.config.globalProperties.$cache = cache
+ app.config.globalProperties.$cache = cache;
// 模态框对象
- app.config.globalProperties.$modal = modal
+ app.config.globalProperties.$modal = modal;
// 下载文件
- app.config.globalProperties.$download = download
+ app.config.globalProperties.$download = download;
}
diff --git a/src/plugins/modal.js b/src/plugins/modal.js
index b59e14d..d10efce 100644
--- a/src/plugins/modal.js
+++ b/src/plugins/modal.js
@@ -1,43 +1,48 @@
-import { ElMessage, ElMessageBox, ElNotification, ElLoading } from 'element-plus'
+import {
+ ElMessage,
+ ElMessageBox,
+ ElNotification,
+ ElLoading,
+} from "element-plus";
let loadingInstance;
export default {
// 消息提示
msg(content) {
- ElMessage.info(content)
+ ElMessage.info(content);
},
// 错误消息
msgError(content) {
- ElMessage.error(content)
+ ElMessage.error(content);
},
// 成功消息
msgSuccess(content) {
- ElMessage.success(content)
+ ElMessage.success(content);
},
// 警告消息
msgWarning(content) {
- ElMessage.warning(content)
+ ElMessage.warning(content);
},
// 弹出提示
alert(content) {
- ElMessageBox.alert(content, "系统提示")
+ ElMessageBox.alert(content, "系统提示");
},
// 错误提示
alertError(content) {
- ElMessageBox.alert(content, "系统提示", { type: 'error' })
+ ElMessageBox.alert(content, "系统提示", { type: "error" });
},
// 成功提示
alertSuccess(content) {
- ElMessageBox.alert(content, "系统提示", { type: 'success' })
+ ElMessageBox.alert(content, "系统提示", { type: "success" });
},
// 警告提示
alertWarning(content) {
- ElMessageBox.alert(content, "系统提示", { type: 'warning' })
+ ElMessageBox.alert(content, "系统提示", { type: "warning" });
},
// 通知提示
notify(content) {
- ElNotification.info(content)
+ ElNotification.info(content);
},
// 错误通知
notifyError(content) {
@@ -45,27 +50,27 @@ export default {
},
// 成功通知
notifySuccess(content) {
- ElNotification.success(content)
+ ElNotification.success(content);
},
// 警告通知
notifyWarning(content) {
- ElNotification.warning(content)
+ ElNotification.warning(content);
},
// 确认窗体
confirm(content) {
return ElMessageBox.confirm(content, "系统提示", {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
type: "warning",
- })
+ });
},
// 提交内容
prompt(content) {
return ElMessageBox.prompt(content, "系统提示", {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
type: "warning",
- })
+ });
},
// 打开遮罩层
loading(content) {
@@ -73,10 +78,10 @@ export default {
lock: true,
text: content,
background: "rgba(0, 0, 0, 0.7)",
- })
+ });
},
// 关闭遮罩层
closeLoading() {
loadingInstance.close();
- }
-}
+ },
+};
diff --git a/src/plugins/tab.js b/src/plugins/tab.js
index 71d99e3..b742497 100644
--- a/src/plugins/tab.js
+++ b/src/plugins/tab.js
@@ -1,5 +1,5 @@
-import useTagsViewStore from '@/store/modules/tagsView'
-import router from '@/router'
+import useTagsViewStore from "@/store/modules/tagsView";
+import router from "@/router";
export default {
// 刷新当前tab页签
@@ -8,19 +8,21 @@ export default {
if (obj === undefined) {
matched.forEach((m) => {
if (m.components && m.components.default && m.components.default.name) {
- if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
+ if (!["Layout", "ParentView"].includes(m.components.default.name)) {
obj = { name: m.components.default.name, path: path, query: query };
}
}
});
}
- return useTagsViewStore().delCachedView(obj).then(() => {
- const { path, query } = obj
- router.replace({
- path: '/redirect' + path,
- query: query
- })
- })
+ return useTagsViewStore()
+ .delCachedView(obj)
+ .then(() => {
+ const { path, query } = obj;
+ router.replace({
+ path: "/redirect" + path,
+ query: query,
+ });
+ });
},
// 关闭当前tab页签，打开新页签
closeOpenPage(obj) {
@@ -32,13 +34,15 @@ export default {
// 关闭指定tab页签
closePage(obj) {
if (obj === undefined) {
- return useTagsViewStore().delView(router.currentRoute.value).then(({ visitedViews }) => {
- const latestView = visitedViews.slice(-1)[0]
- if (latestView) {
- return router.push(latestView.fullPath)
- }
- return router.push('/');
- });
+ return useTagsViewStore()
+ .delView(router.currentRoute.value)
+ .then(({ visitedViews }) => {
+ const latestView = visitedViews.slice(-1)[0];
+ if (latestView) {
+ return router.push(latestView.fullPath);
+ }
+ return router.push("/");
+ });
}
return useTagsViewStore().delView(obj);
},
@@ -65,5 +69,5 @@ export default {
// 修改tab页签
updatePage(obj) {
return useTagsViewStore().updateVisitedView(obj);
- }
-}
+ },
+};
diff --git a/src/router/index.js b/src/router/index.js
index b44ad3b..8b17a5c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,6 +1,6 @@
-import { createWebHistory, createRouter } from 'vue-router'
+import { createWebHistory, createRouter } from "vue-router";
/* Layout */
-import Layout from '@/layout'
+import Layout from "@/layout";
/**
* Note: 路由配置项
@@ -27,106 +27,105 @@ import Layout from '@/layout'
// 公共路由
export const constantRoutes = [
{
- path: '/redirect',
+ path: "/redirect",
component: Layout,
hidden: true,
children: [
{
- path: '/redirect/:path(.*)',
- component: () => import('@/views/redirect/index.vue')
- }
- ]
+ path: "/redirect/:path(.*)",
+ component: () => import("@/views/redirect/index.vue"),
+ },
+ ],
},
{
- path: '/login',
- component: () => import('@/views/login'),
- hidden: true
+ path: "/login",
+ component: () => import("@/views/login"),
+ hidden: true,
},
{
- path: '/register',
- component: () => import('@/views/register'),
- hidden: true
+ path: "/register",
+ component: () => import("@/views/register"),
+ hidden: true,
},
{
path: "/:pathMatch(.*)*",
- component: () => import('@/views/error/404'),
- hidden: true
+ component: () => import("@/views/error/404"),
+ hidden: true,
},
{
- path: '/401',
- component: () => import('@/views/error/401'),
- hidden: true
+ path: "/401",
+ component: () => import("@/views/error/401"),
+ hidden: true,
},
{
- path: '',
+ path: "",
component: Layout,
- redirect: '/index',
+ redirect: "/index",
children: [
{
- path: '/index',
- component: () => import('@/views/index'),
- name: 'Index',
- meta: { title: '首页', icon: 'dashboard', affix: true }
- }
- ]
+ path: "/index",
+ component: () => import("@/views/index"),
+ name: "Index",
+ meta: { title: "首页", icon: "dashboard", affix: true },
+ },
+ ],
},
{
- path: '/user',
+ path: "/user",
component: Layout,
hidden: true,
- redirect: 'noredirect',
+ redirect: "noredirect",
children: [
{
- path: 'profile',
- component: () => import('@/views/system/user/profile/index'),
- name: 'Profile',
- meta: { title: '个人中心', icon: 'user' }
- }
- ]
- }
-]
+ path: "profile",
+ component: () => import("@/views/system/user/profile/index"),
+ name: "Profile",
+ meta: { title: "个人中心", icon: "user" },
+ },
+ ],
+ },
+];
// 动态路由，基于用户权限动态去加载
export const dynamicRoutes = [
{
- path: '/system/user-auth',
+ path: "/system/user-auth",
component: Layout,
hidden: true,
- permissions: ['system:user:edit'],
+ permissions: ["system:user:edit"],
children: [
{
- path: 'role/:userId(\\d+)',
- component: () => import('@/views/system/user/authRole'),
- name: 'AuthRole',
- meta: { title: '分配角色', activeMenu: '/system/user' }
- }
- ]
+ path: "role/:userId(\\d+)",
+ component: () => import("@/views/system/user/authRole"),
+ name: "AuthRole",
+ meta: { title: "分配角色", activeMenu: "/system/user" },
+ },
+ ],
},
{
- path: '/system/role-auth',
+ path: "/system/role-auth",
component: Layout,
hidden: true,
- permissions: ['system:role:edit'],
+ permissions: ["system:role:edit"],
children: [
{
- path: 'user/:roleId(\\d+)',
- component: () => import('@/views/system/role/authUser'),
- name: 'AuthUser',
- meta: { title: '分配用户', activeMenu: '/system/role' }
- }
- ]
+ path: "user/:roleId(\\d+)",
+ component: () => import("@/views/system/role/authUser"),
+ name: "AuthUser",
+ meta: { title: "分配用户", activeMenu: "/system/role" },
+ },
+ ],
},
-
-]
+];
const router = createRouter({
history: createWebHistory(),
routes: constantRoutes,
scrollBehavior(to, from, savedPosition) {
if (savedPosition) {
- return savedPosition
+ return savedPosition;
} else {
- return { top: 0 }
+ return { top: 0 };
}
},
});
diff --git a/src/settings.js b/src/settings.js
index 10e1db4..93c19be 100644
--- a/src/settings.js
+++ b/src/settings.js
@@ -6,7 +6,7 @@ export default {
/**
* 侧边栏主题 深色主题theme-dark，浅色主题theme-light
*/
- sideTheme: 'theme-dark',
+ sideTheme: "theme-dark",
/**
* 是否系统布局配置
*/
@@ -43,5 +43,5 @@ export default {
* The default is only used in the production env
* If you want to also use it in dev, you can pass ['production', 'development']
*/
- errorLog: 'production'
-}
+ errorLog: "production",
+};
diff --git a/src/store/index.js b/src/store/index.js
index 8f64fb4..d28e690 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -1,5 +1,5 @@
-import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
+import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
-const store = createPinia()
-store.use(piniaPluginPersistedstate)
-export default store
\ No newline at end of file
+const store = createPinia();
+store.use(piniaPluginPersistedstate);
+export default store;
diff --git a/src/store/modules/app.js b/src/store/modules/app.js
index 0b57159..51297dd 100644
--- a/src/store/modules/app.js
+++ b/src/store/modules/app.js
@@ -1,46 +1,46 @@
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
-const useAppStore = defineStore(
- 'app',
- {
- state: () => ({
- sidebar: {
- opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true,
- withoutAnimation: false,
- hide: false
- },
- device: 'desktop',
- size: Cookies.get('size') || 'default'
- }),
- actions: {
- toggleSideBar(withoutAnimation) {
- if (this.sidebar.hide) {
- return false;
- }
- this.sidebar.opened = !this.sidebar.opened
- this.sidebar.withoutAnimation = withoutAnimation
- if (this.sidebar.opened) {
- Cookies.set('sidebarStatus', 1)
- } else {
- Cookies.set('sidebarStatus', 0)
- }
- },
- closeSideBar({ withoutAnimation }) {
- Cookies.set('sidebarStatus', 0)
- this.sidebar.opened = false
- this.sidebar.withoutAnimation = withoutAnimation
- },
- toggleDevice(device) {
- this.device = device
- },
- setSize(size) {
- this.size = size;
- Cookies.set('size', size)
- },
- toggleSideBarHide(status) {
- this.sidebar.hide = status
+const useAppStore = defineStore("app", {
+ state: () => ({
+ sidebar: {
+ opened: Cookies.get("sidebarStatus")
+ ? !!+Cookies.get("sidebarStatus")
+ : true,
+ withoutAnimation: false,
+ hide: false,
+ },
+ device: "desktop",
+ size: Cookies.get("size") || "default",
+ }),
+ actions: {
+ toggleSideBar(withoutAnimation) {
+ if (this.sidebar.hide) {
+ return false;
}
- }
- })
+ this.sidebar.opened = !this.sidebar.opened;
+ this.sidebar.withoutAnimation = withoutAnimation;
+ if (this.sidebar.opened) {
+ Cookies.set("sidebarStatus", 1);
+ } else {
+ Cookies.set("sidebarStatus", 0);
+ }
+ },
+ closeSideBar({ withoutAnimation }) {
+ Cookies.set("sidebarStatus", 0);
+ this.sidebar.opened = false;
+ this.sidebar.withoutAnimation = withoutAnimation;
+ },
+ toggleDevice(device) {
+ this.device = device;
+ },
+ setSize(size) {
+ this.size = size;
+ Cookies.set("size", size);
+ },
+ toggleSideBarHide(status) {
+ this.sidebar.hide = status;
+ },
+ },
+});
-export default useAppStore
+export default useAppStore;
diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js
index 27fc308..a20084f 100644
--- a/src/store/modules/dict.js
+++ b/src/store/modules/dict.js
@@ -1,57 +1,54 @@
-const useDictStore = defineStore(
- 'dict',
- {
- state: () => ({
- dict: new Array()
- }),
- actions: {
- // 获取字典
- getDict(_key) {
- if (_key == null && _key == "") {
- return null;
- }
- try {
- for (let i = 0; i < this.dict.length; i++) {
- if (this.dict[i].key == _key) {
- return this.dict[i].value;
- }
- }
- } catch (e) {
- return null;
- }
- },
- // 设置字典
- setDict(_key, value) {
- if (_key !== null && _key !== "") {
- this.dict.push({
- key: _key,
- value: value
- });
- }
- },
- // 删除字典
- removeDict(_key) {
- var bln = false;
- try {
- for (let i = 0; i < this.dict.length; i++) {
- if (this.dict[i].key == _key) {
- this.dict.splice(i, 1);
- return true;
- }
- }
- } catch (e) {
- bln = false;
- }
- return bln;
- },
- // 清空字典
- cleanDict() {
- this.dict = new Array();
- },
- // 初始字典
- initDict() {
+const useDictStore = defineStore("dict", {
+ state: () => ({
+ dict: new Array(),
+ }),
+ actions: {
+ // 获取字典
+ getDict(_key) {
+ if (_key == null && _key == "") {
+ return null;
}
- }
- })
+ try {
+ for (let i = 0; i < this.dict.length; i++) {
+ if (this.dict[i].key == _key) {
+ return this.dict[i].value;
+ }
+ }
+ } catch (e) {
+ return null;
+ }
+ },
+ // 设置字典
+ setDict(_key, value) {
+ if (_key !== null && _key !== "") {
+ this.dict.push({
+ key: _key,
+ value: value,
+ });
+ }
+ },
+ // 删除字典
+ removeDict(_key) {
+ var bln = false;
+ try {
+ for (let i = 0; i < this.dict.length; i++) {
+ if (this.dict[i].key == _key) {
+ this.dict.splice(i, 1);
+ return true;
+ }
+ }
+ } catch (e) {
+ bln = false;
+ }
+ return bln;
+ },
+ // 清空字典
+ cleanDict() {
+ this.dict = new Array();
+ },
+ // 初始字典
+ initDict() {},
+ },
+});
-export default useDictStore
+export default useDictStore;
diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js
index 0b04e1f..e789200 100644
--- a/src/store/modules/permission.js
+++ b/src/store/modules/permission.js
@@ -1,150 +1,147 @@
-import auth from '@/plugins/auth'
-import router, {constantRoutes, dynamicRoutes} from '@/router'
-import Layout from '@/layout/index'
-import ParentView from '@/components/ParentView'
-import InnerLink from '@/layout/components/InnerLink'
-import {getRouters} from "@/api/login";
-import {cloneDeep} from 'lodash-es'
+import auth from "@/plugins/auth";
+import router, { constantRoutes, dynamicRoutes } from "@/router";
+import Layout from "@/layout/index";
+import ParentView from "@/components/ParentView";
+import InnerLink from "@/layout/components/InnerLink";
+import { getRouters } from "@/api/login";
+import { cloneDeep } from "lodash-es";
// 匹配views里面所有的.vue文件
-const modules = import.meta.glob('./../../views/**/*.vue')
+const modules = import.meta.glob("./../../views/**/*.vue");
-const usePermissionStore = defineStore(
- 'permission',
- {
- state: () => ({
- routesRes: null,
- routes: [],
- addRoutes: [],
- defaultRoutes: [],
- topbarRouters: [],
- sidebarRouters: []
- }),
- actions: {
- setRoutesRes(res) {
- this.routesRes = cloneDeep(res)
- },
- setRoutes(routes) {
- this.addRoutes = routes
- this.routes = constantRoutes.concat(routes)
- },
- setDefaultRoutes(routes) {
- this.defaultRoutes = constantRoutes.concat(routes)
- },
- setTopbarRoutes(routes) {
- this.topbarRouters = routes
- },
- setSidebarRouters(routes) {
- this.sidebarRouters = routes
- },
- generateRoutes(roles) {
- return new Promise(resolve => {
- // 向后端请求路由数据
- getRouters().then(res => {
- if (!this.routesRes) {
- this.setRoutesRes(res)
- }
- const sdata = JSON.parse(JSON.stringify(res.data))
- const rdata = JSON.parse(JSON.stringify(res.data))
- const defaultData = JSON.parse(JSON.stringify(res.data))
- const sidebarRoutes = filterAsyncRouter(sdata)
- const rewriteRoutes = filterAsyncRouter(rdata, false, true)
- const defaultRoutes = filterAsyncRouter(defaultData)
- const asyncRoutes = filterDynamicRoutes(dynamicRoutes)
- asyncRoutes.forEach(route => {
- router.addRoute(route)
- })
- this.setRoutes(rewriteRoutes)
- this.setSidebarRouters(constantRoutes.concat(sidebarRoutes))
- this.setDefaultRoutes(sidebarRoutes)
- this.setTopbarRoutes(defaultRoutes)
- resolve(rewriteRoutes)
- })
- })
- }
- }, persist: [
- {paths: ['routesRes'], storage: localStorage}
- ]
- })
+const usePermissionStore = defineStore("permission", {
+ state: () => ({
+ routesRes: null,
+ routes: [],
+ addRoutes: [],
+ defaultRoutes: [],
+ topbarRouters: [],
+ sidebarRouters: [],
+ }),
+ actions: {
+ setRoutesRes(res) {
+ this.routesRes = cloneDeep(res);
+ },
+ setRoutes(routes) {
+ this.addRoutes = routes;
+ this.routes = constantRoutes.concat(routes);
+ },
+ setDefaultRoutes(routes) {
+ this.defaultRoutes = constantRoutes.concat(routes);
+ },
+ setTopbarRoutes(routes) {
+ this.topbarRouters = routes;
+ },
+ setSidebarRouters(routes) {
+ this.sidebarRouters = routes;
+ },
+ generateRoutes(roles) {
+ return new Promise((resolve) => {
+ // 向后端请求路由数据
+ getRouters().then((res) => {
+ if (!this.routesRes) {
+ this.setRoutesRes(res);
+ }
+ const sdata = JSON.parse(JSON.stringify(res.data));
+ const rdata = JSON.parse(JSON.stringify(res.data));
+ const defaultData = JSON.parse(JSON.stringify(res.data));
+ const sidebarRoutes = filterAsyncRouter(sdata);
+ const rewriteRoutes = filterAsyncRouter(rdata, false, true);
+ const defaultRoutes = filterAsyncRouter(defaultData);
+ const asyncRoutes = filterDynamicRoutes(dynamicRoutes);
+ asyncRoutes.forEach((route) => {
+ router.addRoute(route);
+ });
+ this.setRoutes(rewriteRoutes);
+ this.setSidebarRouters(constantRoutes.concat(sidebarRoutes));
+ this.setDefaultRoutes(sidebarRoutes);
+ this.setTopbarRoutes(defaultRoutes);
+ resolve(rewriteRoutes);
+ });
+ });
+ },
+ },
+ persist: [{ paths: ["routesRes"], storage: localStorage }],
+});
// 遍历后台传来的路由字符串，转换为组件对象
function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
- return asyncRouterMap.filter(route => {
- if (type && route.children) {
- route.children = filterChildren(route.children)
- }
- if (route.component) {
- // Layout ParentView 组件特殊处理
- if (route.component === 'Layout') {
- route.component = Layout
- } else if (route.component === 'ParentView') {
- route.component = ParentView
- } else if (route.component === 'InnerLink') {
- route.component = InnerLink
- } else {
- route.component = loadView(route.component)
- }
- }
- if (route.children != null && route.children && route.children.length) {
- route.children = filterAsyncRouter(route.children, route, type)
- } else {
- delete route['children']
- delete route['redirect']
- }
- return true
- })
+ return asyncRouterMap.filter((route) => {
+ if (type && route.children) {
+ route.children = filterChildren(route.children);
+ }
+ if (route.component) {
+ // Layout ParentView 组件特殊处理
+ if (route.component === "Layout") {
+ route.component = Layout;
+ } else if (route.component === "ParentView") {
+ route.component = ParentView;
+ } else if (route.component === "InnerLink") {
+ route.component = InnerLink;
+ } else {
+ route.component = loadView(route.component);
+ }
+ }
+ if (route.children != null && route.children && route.children.length) {
+ route.children = filterAsyncRouter(route.children, route, type);
+ } else {
+ delete route["children"];
+ delete route["redirect"];
+ }
+ return true;
+ });
}
function filterChildren(childrenMap, lastRouter = false) {
- var children = []
- childrenMap.forEach((el, index) => {
- if (el.children && el.children.length) {
- if (el.component === 'ParentView' && !lastRouter) {
- el.children.forEach(c => {
- c.path = el.path + '/' + c.path
- if (c.children && c.children.length) {
- children = children.concat(filterChildren(c.children, c))
- return
- }
- children.push(c)
- })
- return
- }
- }
- if (lastRouter) {
- el.path = lastRouter.path + '/' + el.path
- }
- children = children.concat(el)
- })
- return children
+ var children = [];
+ childrenMap.forEach((el, index) => {
+ if (el.children && el.children.length) {
+ if (el.component === "ParentView" && !lastRouter) {
+ el.children.forEach((c) => {
+ c.path = el.path + "/" + c.path;
+ if (c.children && c.children.length) {
+ children = children.concat(filterChildren(c.children, c));
+ return;
+ }
+ children.push(c);
+ });
+ return;
+ }
+ }
+ if (lastRouter) {
+ el.path = lastRouter.path + "/" + el.path;
+ }
+ children = children.concat(el);
+ });
+ return children;
}
// 动态路由遍历，验证是否具备权限
export function filterDynamicRoutes(routes) {
- const res = []
- routes.forEach(route => {
- if (route.permissions) {
- if (auth.hasPermiOr(route.permissions)) {
- res.push(route)
- }
- } else if (route.roles) {
- if (auth.hasRoleOr(route.roles)) {
- res.push(route)
- }
- }
- })
- return res
+ const res = [];
+ routes.forEach((route) => {
+ if (route.permissions) {
+ if (auth.hasPermiOr(route.permissions)) {
+ res.push(route);
+ }
+ } else if (route.roles) {
+ if (auth.hasRoleOr(route.roles)) {
+ res.push(route);
+ }
+ }
+ });
+ return res;
}
export const loadView = (view) => {
- let res;
- for (const path in modules) {
- const dir = path.split('views/')[1].split('.vue')[0];
- if (dir === view) {
- res = () => modules[path]();
- }
+ let res;
+ for (const path in modules) {
+ const dir = path.split("views/")[1].split(".vue")[0];
+ if (dir === view) {
+ res = () => modules[path]();
}
- return res;
-}
+ }
+ return res;
+};
-export default usePermissionStore
+export default usePermissionStore;
diff --git a/src/store/modules/settings.js b/src/store/modules/settings.js
index 22b7336..0f37c1e 100644
--- a/src/store/modules/settings.js
+++ b/src/store/modules/settings.js
@@ -1,38 +1,57 @@
-import defaultSettings from '@/settings'
-import { useDynamicTitle } from '@/utils/dynamicTitle'
+import defaultSettings from "@/settings";
+import { useDynamicTitle } from "@/utils/dynamicTitle";
-const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
+const {
+ sideTheme,
+ showSettings,
+ topNav,
+ tagsView,
+ fixedHeader,
+ sidebarLogo,
+ dynamicTitle,
+} = defaultSettings;
-const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
+const storageSetting = JSON.parse(localStorage.getItem("layout-setting")) || "";
-const useSettingsStore = defineStore(
- 'settings',
- {
- state: () => ({
- title: '',
- theme: storageSetting.theme || '#409EFF',
- sideTheme: storageSetting.sideTheme || sideTheme,
- showSettings: showSettings,
- topNav: storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
- tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
- fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
- sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
- dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle
- }),
- actions: {
- // 修改布局设置
- changeSetting(data) {
- const { key, value } = data
- if (this.hasOwnProperty(key)) {
- this[key] = value
- }
- },
- // 设置网页标题
- setTitle(title) {
- this.title = title
- useDynamicTitle();
+const useSettingsStore = defineStore("settings", {
+ state: () => ({
+ title: "",
+ theme: storageSetting.theme || "#409EFF",
+ sideTheme: storageSetting.sideTheme || sideTheme,
+ showSettings: showSettings,
+ topNav:
+ storageSetting.topNav === undefined ? topNav : storageSetting.topNav,
+ tagsView:
+ storageSetting.tagsView === undefined
+ ? tagsView
+ : storageSetting.tagsView,
+ fixedHeader:
+ storageSetting.fixedHeader === undefined
+ ? fixedHeader
+ : storageSetting.fixedHeader,
+ sidebarLogo:
+ storageSetting.sidebarLogo === undefined
+ ? sidebarLogo
+ : storageSetting.sidebarLogo,
+ dynamicTitle:
+ storageSetting.dynamicTitle === undefined
+ ? dynamicTitle
+ : storageSetting.dynamicTitle,
+ }),
+ actions: {
+ // 修改布局设置
+ changeSetting(data) {
+ const { key, value } = data;
+ if (this.hasOwnProperty(key)) {
+ this[key] = value;
}
- }
- })
+ },
+ // 设置网页标题
+ setTitle(title) {
+ this.title = title;
+ useDynamicTitle();
+ },
+ },
+});
-export default useSettingsStore
+export default useSettingsStore;
diff --git a/src/store/modules/tagsView.js b/src/store/modules/tagsView.js
index 9d07f33..97c48fa 100644
--- a/src/store/modules/tagsView.js
+++ b/src/store/modules/tagsView.js
@@ -1,182 +1,186 @@
-const useTagsViewStore = defineStore(
- 'tags-view',
- {
- state: () => ({
- visitedViews: [],
- cachedViews: [],
- iframeViews: []
- }),
- actions: {
- addView(view) {
- this.addVisitedView(view)
- this.addCachedView(view)
- },
- addIframeView(view) {
- if (this.iframeViews.some(v => v.path === view.path)) return
- this.iframeViews.push(
- Object.assign({}, view, {
- title: view.meta.title || 'no-name'
- })
- )
- },
- addVisitedView(view) {
- if (this.visitedViews.some(v => v.path === view.path)) return
- this.visitedViews.push(
- Object.assign({}, view, {
- title: view.meta.title || 'no-name'
- })
- )
- },
- addCachedView(view) {
- if (this.cachedViews.includes(view.name)) return
- if (!view.meta.noCache) {
- this.cachedViews.push(view.name)
- }
- },
- delView(view) {
- return new Promise(resolve => {
- this.delVisitedView(view)
- this.delCachedView(view)
- resolve({
- visitedViews: [...this.visitedViews],
- cachedViews: [...this.cachedViews]
- })
+const useTagsViewStore = defineStore("tags-view", {
+ state: () => ({
+ visitedViews: [],
+ cachedViews: [],
+ iframeViews: [],
+ }),
+ actions: {
+ addView(view) {
+ this.addVisitedView(view);
+ this.addCachedView(view);
+ },
+ addIframeView(view) {
+ if (this.iframeViews.some((v) => v.path === view.path)) return;
+ this.iframeViews.push(
+ Object.assign({}, view, {
+ title: view.meta.title || "no-name",
})
- },
- delVisitedView(view) {
- return new Promise(resolve => {
- for (const [i, v] of this.visitedViews.entries()) {
- if (v.path === view.path) {
- this.visitedViews.splice(i, 1)
- break
- }
- }
- this.iframeViews = this.iframeViews.filter(item => item.path !== view.path)
- resolve([...this.visitedViews])
- })
- },
- delIframeView(view) {
- return new Promise(resolve => {
- this.iframeViews = this.iframeViews.filter(item => item.path !== view.path)
- resolve([...this.iframeViews])
- })
- },
- delCachedView(view) {
- return new Promise(resolve => {
- const index = this.cachedViews.indexOf(view.name)
- index > -1 && this.cachedViews.splice(index, 1)
- resolve([...this.cachedViews])
- })
- },
- delOthersViews(view) {
- return new Promise(resolve => {
- this.delOthersVisitedViews(view)
- this.delOthersCachedViews(view)
- resolve({
- visitedViews: [...this.visitedViews],
- cachedViews: [...this.cachedViews]
- })
- })
- },
- delOthersVisitedViews(view) {
- return new Promise(resolve => {
- this.visitedViews = this.visitedViews.filter(v => {
- return v.meta.affix || v.path === view.path
- })
- this.iframeViews = this.iframeViews.filter(item => item.path === view.path)
- resolve([...this.visitedViews])
- })
- },
- delOthersCachedViews(view) {
- return new Promise(resolve => {
- const index = this.cachedViews.indexOf(view.name)
- if (index > -1) {
- this.cachedViews = this.cachedViews.slice(index, index + 1)
- } else {
- this.cachedViews = []
- }
- resolve([...this.cachedViews])
- })
- },
- delAllViews(view) {
- return new Promise(resolve => {
- this.delAllVisitedViews(view)
- this.delAllCachedViews(view)
- resolve({
- visitedViews: [...this.visitedViews],
- cachedViews: [...this.cachedViews]
- })
- })
- },
- delAllVisitedViews(view) {
- return new Promise(resolve => {
- const affixTags = this.visitedViews.filter(tag => tag.meta.affix)
- this.visitedViews = affixTags
- this.iframeViews = []
- resolve([...this.visitedViews])
- })
- },
- delAllCachedViews(view) {
- return new Promise(resolve => {
- this.cachedViews = []
- resolve([...this.cachedViews])
- })
- },
- updateVisitedView(view) {
- for (let v of this.visitedViews) {
- if (v.path === view.path) {
- v = Object.assign(v, view)
- break
- }
- }
- },
- delRightTags(view) {
- return new Promise(resolve => {
- const index = this.visitedViews.findIndex(v => v.path === view.path)
- if (index === -1) {
- return
- }
- this.visitedViews = this.visitedViews.filter((item, idx) => {
- if (idx <= index || (item.meta && item.meta.affix)) {
- return true
- }
- const i = this.cachedViews.indexOf(item.name)
- if (i > -1) {
- this.cachedViews.splice(i, 1)
- }
- if(item.meta.link) {
- const fi = this.iframeViews.findIndex(v => v.path === item.path)
- this.iframeViews.splice(fi, 1)
- }
- return false
- })
- resolve([...this.visitedViews])
- })
- },
- delLeftTags(view) {
- return new Promise(resolve => {
- const index = this.visitedViews.findIndex(v => v.path === view.path)
- if (index === -1) {
- return
- }
- this.visitedViews = this.visitedViews.filter((item, idx) => {
- if (idx >= index || (item.meta && item.meta.affix)) {
- return true
- }
- const i = this.cachedViews.indexOf(item.name)
- if (i > -1) {
- this.cachedViews.splice(i, 1)
- }
- if(item.meta.link) {
- const fi = this.iframeViews.findIndex(v => v.path === item.path)
- this.iframeViews.splice(fi, 1)
- }
- return false
- })
- resolve([...this.visitedViews])
+ );
+ },
+ addVisitedView(view) {
+ if (this.visitedViews.some((v) => v.path === view.path)) return;
+ this.visitedViews.push(
+ Object.assign({}, view, {
+ title: view.meta.title || "no-name",
})
+ );
+ },
+ addCachedView(view) {
+ if (this.cachedViews.includes(view.name)) return;
+ if (!view.meta.noCache) {
+ this.cachedViews.push(view.name);
}
- }
- })
+ },
+ delView(view) {
+ return new Promise((resolve) => {
+ this.delVisitedView(view);
+ this.delCachedView(view);
+ resolve({
+ visitedViews: [...this.visitedViews],
+ cachedViews: [...this.cachedViews],
+ });
+ });
+ },
+ delVisitedView(view) {
+ return new Promise((resolve) => {
+ for (const [i, v] of this.visitedViews.entries()) {
+ if (v.path === view.path) {
+ this.visitedViews.splice(i, 1);
+ break;
+ }
+ }
+ this.iframeViews = this.iframeViews.filter(
+ (item) => item.path !== view.path
+ );
+ resolve([...this.visitedViews]);
+ });
+ },
+ delIframeView(view) {
+ return new Promise((resolve) => {
+ this.iframeViews = this.iframeViews.filter(
+ (item) => item.path !== view.path
+ );
+ resolve([...this.iframeViews]);
+ });
+ },
+ delCachedView(view) {
+ return new Promise((resolve) => {
+ const index = this.cachedViews.indexOf(view.name);
+ index > -1 && this.cachedViews.splice(index, 1);
+ resolve([...this.cachedViews]);
+ });
+ },
+ delOthersViews(view) {
+ return new Promise((resolve) => {
+ this.delOthersVisitedViews(view);
+ this.delOthersCachedViews(view);
+ resolve({
+ visitedViews: [...this.visitedViews],
+ cachedViews: [...this.cachedViews],
+ });
+ });
+ },
+ delOthersVisitedViews(view) {
+ return new Promise((resolve) => {
+ this.visitedViews = this.visitedViews.filter((v) => {
+ return v.meta.affix || v.path === view.path;
+ });
+ this.iframeViews = this.iframeViews.filter(
+ (item) => item.path === view.path
+ );
+ resolve([...this.visitedViews]);
+ });
+ },
+ delOthersCachedViews(view) {
+ return new Promise((resolve) => {
+ const index = this.cachedViews.indexOf(view.name);
+ if (index > -1) {
+ this.cachedViews = this.cachedViews.slice(index, index + 1);
+ } else {
+ this.cachedViews = [];
+ }
+ resolve([...this.cachedViews]);
+ });
+ },
+ delAllViews(view) {
+ return new Promise((resolve) => {
+ this.delAllVisitedViews(view);
+ this.delAllCachedViews(view);
+ resolve({
+ visitedViews: [...this.visitedViews],
+ cachedViews: [...this.cachedViews],
+ });
+ });
+ },
+ delAllVisitedViews(view) {
+ return new Promise((resolve) => {
+ const affixTags = this.visitedViews.filter((tag) => tag.meta.affix);
+ this.visitedViews = affixTags;
+ this.iframeViews = [];
+ resolve([...this.visitedViews]);
+ });
+ },
+ delAllCachedViews(view) {
+ return new Promise((resolve) => {
+ this.cachedViews = [];
+ resolve([...this.cachedViews]);
+ });
+ },
+ updateVisitedView(view) {
+ for (let v of this.visitedViews) {
+ if (v.path === view.path) {
+ v = Object.assign(v, view);
+ break;
+ }
+ }
+ },
+ delRightTags(view) {
+ return new Promise((resolve) => {
+ const index = this.visitedViews.findIndex((v) => v.path === view.path);
+ if (index === -1) {
+ return;
+ }
+ this.visitedViews = this.visitedViews.filter((item, idx) => {
+ if (idx <= index || (item.meta && item.meta.affix)) {
+ return true;
+ }
+ const i = this.cachedViews.indexOf(item.name);
+ if (i > -1) {
+ this.cachedViews.splice(i, 1);
+ }
+ if (item.meta.link) {
+ const fi = this.iframeViews.findIndex((v) => v.path === item.path);
+ this.iframeViews.splice(fi, 1);
+ }
+ return false;
+ });
+ resolve([...this.visitedViews]);
+ });
+ },
+ delLeftTags(view) {
+ return new Promise((resolve) => {
+ const index = this.visitedViews.findIndex((v) => v.path === view.path);
+ if (index === -1) {
+ return;
+ }
+ this.visitedViews = this.visitedViews.filter((item, idx) => {
+ if (idx >= index || (item.meta && item.meta.affix)) {
+ return true;
+ }
+ const i = this.cachedViews.indexOf(item.name);
+ if (i > -1) {
+ this.cachedViews.splice(i, 1);
+ }
+ if (item.meta.link) {
+ const fi = this.iframeViews.findIndex((v) => v.path === item.path);
+ this.iframeViews.splice(fi, 1);
+ }
+ return false;
+ });
+ resolve([...this.visitedViews]);
+ });
+ },
+ },
+});
-export default useTagsViewStore
+export default useTagsViewStore;
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3bba168..11346b7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,86 +1,91 @@
-import {getInfo, login, logout} from '@/api/login'
-import {getToken, removeToken, setToken} from '@/utils/auth'
-import defAva from '@/assets/images/profile.jpg'
-import {cloneDeep} from "lodash-es";
+import { getInfo, login, logout } from "@/api/login";
+import { getToken, removeToken, setToken } from "@/utils/auth";
+import defAva from "@/assets/images/profile.jpg";
+import { cloneDeep } from "lodash-es";
-const useUserStore = defineStore(
- 'user',
- {
- state: () => ({
- token: getToken(),
- name: '',
- avatar: '',
- roles: [],
- tenant: '',
- permissions: [],
- userInfoRes: null
- }),
- actions: {
- setUserInfoRes(res) {
- this.userInfoRes = cloneDeep(res)
- },
- // 登录
- login(userInfo) {
- const username = userInfo.username.trim()
- const password = userInfo.password
- const tenant = userInfo.tenant
- const code = userInfo.code
- const uuid = userInfo.uuid
- return new Promise((resolve, reject) => {
- this.tenant = tenant
- login(username, password, code, uuid).then(res => {
- setToken(res.token)
- this.token = res.token
- resolve()
- }).catch(error => {
- reject(error)
- })
- })
- },
- // 获取用户信息
- getInfo() {
- return new Promise((resolve, reject) => {
- getInfo().then(res => {
- if (!this.userInfoRes) {
- this.setUserInfoRes(res)
- }
- const user = res.user
- const avatar = (user.avatar == "" || user.avatar == null) ? defAva : import.meta.env.VITE_APP_BASE_API + user.avatar;
-
- if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
- this.roles = res.roles
- this.permissions = res.permissions
- } else {
- this.roles = ['ROLE_DEFAULT']
- }
- this.name = user.userName
- this.avatar = avatar;
- resolve(res)
- }).catch(error => {
- reject(error)
- })
- })
- },
- // 退出系统
- logOut() {
- return new Promise((resolve, reject) => {
- logout(this.token).then(() => {
- this.token = ''
- this.roles = []
- this.permissions = []
- this.userInfoRes = null
- removeToken()
- resolve()
- }).catch(error => {
- reject(error)
- })
- })
- }
- },
- persist: [
- {paths: ['tenant', 'userInfoRes'], storage: localStorage}
- ]
+const useUserStore = defineStore("user", {
+ state: () => ({
+ token: getToken(),
+ name: "",
+ avatar: "",
+ roles: [],
+ tenant: "",
+ permissions: [],
+ userInfoRes: null,
+ }),
+ actions: {
+ setUserInfoRes(res) {
+ this.userInfoRes = cloneDeep(res);
},
-)
+ // 登录
+ login(userInfo) {
+ const username = userInfo.username.trim();
+ const password = userInfo.password;
+ const tenant = userInfo.tenant;
+ const code = userInfo.code;
+ const uuid = userInfo.uuid;
+ return new Promise((resolve, reject) => {
+ this.tenant = tenant;
+ login(username, password, code, uuid)
+ .then((res) => {
+ setToken(res.token);
+ this.token = res.token;
+ resolve();
+ })
+ .catch((error) => {
+ reject(error);
+ });
+ });
+ },
+ // 获取用户信息
+ getInfo() {
+ return new Promise((resolve, reject) => {
+ getInfo()
+ .then((res) => {
+ if (!this.userInfoRes) {
+ this.setUserInfoRes(res);
+ }
+ const user = res.user;
+ const avatar =
+ user.avatar == "" || user.avatar == null
+ ? defAva
+ : import.meta.env.VITE_APP_BASE_API + user.avatar;
-export default useUserStore
+ if (res.roles && res.roles.length > 0) {
+ // 验证返回的roles是否是一个非空数组
+ this.roles = res.roles;
+ this.permissions = res.permissions;
+ } else {
+ this.roles = ["ROLE_DEFAULT"];
+ }
+ this.name = user.userName;
+ this.avatar = avatar;
+ resolve(res);
+ })
+ .catch((error) => {
+ reject(error);
+ });
+ });
+ },
+ // 退出系统
+ logOut() {
+ return new Promise((resolve, reject) => {
+ logout(this.token)
+ .then(() => {
+ this.token = "";
+ this.roles = [];
+ this.permissions = [];
+ this.userInfoRes = null;
+ removeToken();
+ resolve();
+ })
+ .catch((error) => {
+ reject(error);
+ });
+ });
+ },
+ },
+ persist: [{ paths: ["tenant", "userInfoRes"], storage: localStorage }],
+});
+
+export default useUserStore;
diff --git a/src/utils/auth.js b/src/utils/auth.js
index 08a43d6..785a25d 100644
--- a/src/utils/auth.js
+++ b/src/utils/auth.js
@@ -1,15 +1,15 @@
-import Cookies from 'js-cookie'
+import Cookies from "js-cookie";
-const TokenKey = 'Admin-Token'
+const TokenKey = "Admin-Token";
export function getToken() {
- return Cookies.get(TokenKey)
+ return Cookies.get(TokenKey);
}
export function setToken(token) {
- return Cookies.set(TokenKey, token)
+ return Cookies.set(TokenKey, token);
}
export function removeToken() {
- return Cookies.remove(TokenKey)
+ return Cookies.remove(TokenKey);
}
diff --git a/src/utils/dynamicTitle.js b/src/utils/dynamicTitle.js
index 64404b2..85144a4 100644
--- a/src/utils/dynamicTitle.js
+++ b/src/utils/dynamicTitle.js
@@ -1,6 +1,6 @@
-import store from '@/store'
-import defaultSettings from '@/settings'
-import useSettingsStore from '@/store/modules/settings'
+import store from "@/store";
+import defaultSettings from "@/settings";
+import useSettingsStore from "@/store/modules/settings";
/**
* 动态修改标题
@@ -8,8 +8,8 @@ import useSettingsStore from '@/store/modules/settings'
export function useDynamicTitle() {
const settingsStore = useSettingsStore();
if (settingsStore.dynamicTitle) {
- document.title = settingsStore.title + ' - ' + defaultSettings.title;
+ document.title = settingsStore.title + " - " + defaultSettings.title;
} else {
document.title = defaultSettings.title;
}
-}
\ No newline at end of file
+}
diff --git a/src/utils/errorCode.js b/src/utils/errorCode.js
index d2111ee..984fded 100644
--- a/src/utils/errorCode.js
+++ b/src/utils/errorCode.js
@@ -1,6 +1,6 @@
export default {
- '401': '认证失败，无法访问系统资源',
- '403': '当前操作没有权限',
- '404': '访问资源不存在',
- 'default': '系统未知错误，请反馈给管理员'
-}
+ 401: "认证失败，无法访问系统资源",
+ 403: "当前操作没有权限",
+ 404: "访问资源不存在",
+ default: "系统未知错误，请反馈给管理员",
+};
diff --git a/src/utils/index.js b/src/utils/index.js
index 4e65504..4490f41 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -1,18 +1,25 @@
-import { parseTime } from './ruoyi'
+import { parseTime } from "./ruoyi";
/**
* 表格时间格式化
*/
export function formatDate(cellValue) {
if (cellValue == null || cellValue == "") return "";
- var date = new Date(cellValue)
- var year = date.getFullYear()
- var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
- var day = date.getDate() < 10 ? '0' + date.getDate() : date.getDate()
- var hours = date.getHours() < 10 ? '0' + date.getHours() : date.getHours()
- var minutes = date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()
- var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
- return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
+ var date = new Date(cellValue);
+ var year = date.getFullYear();
+ var month =
+ date.getMonth() + 1 < 10
+ ? "0" + (date.getMonth() + 1)
+ : date.getMonth() + 1;
+ var day = date.getDate() < 10 ? "0" + date.getDate() : date.getDate();
+ var hours = date.getHours() < 10 ? "0" + date.getHours() : date.getHours();
+ var minutes =
+ date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
+ var seconds =
+ date.getSeconds() < 10 ? "0" + date.getSeconds() : date.getSeconds();
+ return (
+ year + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + seconds
+ );
}
/**
@@ -21,40 +28,40 @@ export function formatDate(cellValue) {
* @returns {string}
*/
export function formatTime(time, option) {
- if (('' + time).length === 10) {
- time = parseInt(time) * 1000
+ if (("" + time).length === 10) {
+ time = parseInt(time) * 1000;
} else {
- time = +time
+ time = +time;
}
- const d = new Date(time)
- const now = Date.now()
+ const d = new Date(time);
+ const now = Date.now();
- const diff = (now - d) / 1000
+ const diff = (now - d) / 1000;
if (diff < 30) {
- return '刚刚'
+ return "刚刚";
} else if (diff < 3600) {
// less 1 hour
- return Math.ceil(diff / 60) + '分钟前'
+ return Math.ceil(diff / 60) + "分钟前";
} else if (diff < 3600 * 24) {
- return Math.ceil(diff / 3600) + '小时前'
+ return Math.ceil(diff / 3600) + "小时前";
} else if (diff < 3600 * 24 * 2) {
- return '1天前'
+ return "1天前";
}
if (option) {
- return parseTime(time, option)
+ return parseTime(time, option);
} else {
return (
d.getMonth() +
1 +
- '月' +
+ "月" +
d.getDate() +
- '日' +
+ "日" +
d.getHours() +
- '时' +
+ "时" +
d.getMinutes() +
- '分'
- )
+ "分"
+ );
}
}
@@ -63,18 +70,18 @@ export function formatTime(time, option) {
* @returns {Object}
*/
export function getQueryObject(url) {
- url = url == null ? window.location.href : url
- const search = url.substring(url.lastIndexOf('?') + 1)
- const obj = {}
- const reg = /([^?&=]+)=([^?&=]*)/g
+ url = url == null ? window.location.href : url;
+ const search = url.substring(url.lastIndexOf("?") + 1);
+ const obj = {};
+ const reg = /([^?&=]+)=([^?&=]*)/g;
search.replace(reg, (rs, $1, $2) => {
- const name = decodeURIComponent($1)
- let val = decodeURIComponent($2)
- val = String(val)
- obj[name] = val
- return rs
- })
- return obj
+ const name = decodeURIComponent($1);
+ let val = decodeURIComponent($2);
+ val = String(val);
+ obj[name] = val;
+ return rs;
+ });
+ return obj;
}
/**
@@ -83,14 +90,14 @@ export function getQueryObject(url) {
*/
export function byteLength(str) {
// returns the byte length of an utf8 string
- let s = str.length
+ let s = str.length;
for (var i = str.length - 1; i >= 0; i--) {
- const code = str.charCodeAt(i)
- if (code > 0x7f && code <= 0x7ff) s++
- else if (code > 0x7ff && code <= 0xffff) s += 2
- if (code >= 0xDC00 && code <= 0xDFFF) i--
+ const code = str.charCodeAt(i);
+ if (code > 0x7f && code <= 0x7ff) s++;
+ else if (code > 0x7ff && code <= 0xffff) s += 2;
+ if (code >= 0xdc00 && code <= 0xdfff) i--;
}
- return s
+ return s;
}
/**
@@ -98,13 +105,13 @@ export function byteLength(str) {
* @returns {Array}
*/
export function cleanArray(actual) {
- const newArray = []
+ const newArray = [];
for (let i = 0; i < actual.length; i++) {
if (actual[i]) {
- newArray.push(actual[i])
+ newArray.push(actual[i]);
}
}
- return newArray
+ return newArray;
}
/**
@@ -112,13 +119,13 @@ export function cleanArray(actual) {
* @returns {Array}
*/
export function param(json) {
- if (!json) return ''
+ if (!json) return "";
return cleanArray(
- Object.keys(json).map(key => {
- if (json[key] === undefined) return ''
- return encodeURIComponent(key) + '=' + encodeURIComponent(json[key])
+ Object.keys(json).map((key) => {
+ if (json[key] === undefined) return "";
+ return encodeURIComponent(key) + "=" + encodeURIComponent(json[key]);
})
- ).join('&')
+ ).join("&");
}
/**
@@ -126,21 +133,21 @@ export function param(json) {
* @returns {Object}
*/
export function param2Obj(url) {
- const search = decodeURIComponent(url.split('?')[1]).replace(/\+/g, ' ')
+ const search = decodeURIComponent(url.split("?")[1]).replace(/\+/g, " ");
if (!search) {
- return {}
+ return {};
}
- const obj = {}
- const searchArr = search.split('&')
- searchArr.forEach(v => {
- const index = v.indexOf('=')
+ const obj = {};
+ const searchArr = search.split("&");
+ searchArr.forEach((v) => {
+ const index = v.indexOf("=");
if (index !== -1) {
- const name = v.substring(0, index)
- const val = v.substring(index + 1, v.length)
- obj[name] = val
+ const name = v.substring(0, index);
+ const val = v.substring(index + 1, v.length);
+ obj[name] = val;
}
- })
- return obj
+ });
+ return obj;
}
/**
@@ -148,9 +155,9 @@ export function param2Obj(url) {
* @returns {string}
*/
export function html2Text(val) {
- const div = document.createElement('div')
- div.innerHTML = val
- return div.textContent || div.innerText
+ const div = document.createElement("div");
+ div.innerHTML = val;
+ return div.textContent || div.innerText;
}
/**
@@ -160,21 +167,21 @@ export function html2Text(val) {
* @returns {Object}
*/
export function objectMerge(target, source) {
- if (typeof target !== 'object') {
- target = {}
+ if (typeof target !== "object") {
+ target = {};
}
if (Array.isArray(source)) {
- return source.slice()
+ return source.slice();
}
- Object.keys(source).forEach(property => {
- const sourceProperty = source[property]
- if (typeof sourceProperty === 'object') {
- target[property] = objectMerge(target[property], sourceProperty)
+ Object.keys(source).forEach((property) => {
+ const sourceProperty = source[property];
+ if (typeof sourceProperty === "object") {
+ target[property] = objectMerge(target[property], sourceProperty);
} else {
- target[property] = sourceProperty
+ target[property] = sourceProperty;
}
- })
- return target
+ });
+ return target;
}
/**
@@ -183,18 +190,18 @@ export function objectMerge(target, source) {
*/
export function toggleClass(element, className) {
if (!element || !className) {
- return
+ return;
}
- let classString = element.className
- const nameIndex = classString.indexOf(className)
+ let classString = element.className;
+ const nameIndex = classString.indexOf(className);
if (nameIndex === -1) {
- classString += '' + className
+ classString += "" + className;
} else {
classString =
classString.substr(0, nameIndex) +
- classString.substr(nameIndex + className.length)
+ classString.substr(nameIndex + className.length);
}
- element.className = classString
+ element.className = classString;
}
/**
@@ -202,10 +209,10 @@ export function toggleClass(element, className) {
* @returns {Date}
*/
export function getTime(type) {
- if (type === 'start') {
- return new Date().getTime() - 3600 * 1000 * 24 * 90
+ if (type === "start") {
+ return new Date().getTime() - 3600 * 1000 * 24 * 90;
} else {
- return new Date(new Date().toDateString())
+ return new Date(new Date().toDateString());
}
}
@@ -216,38 +223,38 @@ export function getTime(type) {
* @return {*}
*/
export function debounce(func, wait, immediate) {
- let timeout, args, context, timestamp, result
+ let timeout, args, context, timestamp, result;
- const later = function() {
+ const later = function () {
// 据上一次触发时间间隔
- const last = +new Date() - timestamp
+ const last = +new Date() - timestamp;
// 上次被包装函数被调用时间间隔 last 小于设定时间间隔 wait
if (last < wait && last > 0) {
- timeout = setTimeout(later, wait - last)
+ timeout = setTimeout(later, wait - last);
} else {
- timeout = null
+ timeout = null;
// 如果设定为immediate===true，因为开始边界已经调用过了此处无需调用
if (!immediate) {
- result = func.apply(context, args)
- if (!timeout) context = args = null
+ result = func.apply(context, args);
+ if (!timeout) context = args = null;
}
}
- }
+ };
- return function(...args) {
- context = this
- timestamp = +new Date()
- const callNow = immediate && !timeout
+ return function (...args) {
+ context = this;
+ timestamp = +new Date();
+ const callNow = immediate && !timeout;
// 如果延时不存在，重新设定延时
- if (!timeout) timeout = setTimeout(later, wait)
+ if (!timeout) timeout = setTimeout(later, wait);
if (callNow) {
- result = func.apply(context, args)
- context = args = null
+ result = func.apply(context, args);
+ context = args = null;
}
- return result
- }
+ return result;
+ };
}
/**
@@ -258,18 +265,18 @@ export function debounce(func, wait, immediate) {
* @returns {Object}
*/
export function deepClone(source) {
- if (!source && typeof source !== 'object') {
- throw new Error('error arguments', 'deepClone')
+ if (!source && typeof source !== "object") {
+ throw new Error("error arguments", "deepClone");
}
- const targetObj = source.constructor === Array ? [] : {}
- Object.keys(source).forEach(keys => {
- if (source[keys] && typeof source[keys] === 'object') {
- targetObj[keys] = deepClone(source[keys])
+ const targetObj = source.constructor === Array ? [] : {};
+ Object.keys(source).forEach((keys) => {
+ if (source[keys] && typeof source[keys] === "object") {
+ targetObj[keys] = deepClone(source[keys]);
} else {
- targetObj[keys] = source[keys]
+ targetObj[keys] = source[keys];
}
- })
- return targetObj
+ });
+ return targetObj;
}
/**
@@ -277,16 +284,16 @@ export function deepClone(source) {
* @returns {Array}
*/
export function uniqueArr(arr) {
- return Array.from(new Set(arr))
+ return Array.from(new Set(arr));
}
/**
* @returns {string}
*/
export function createUniqueString() {
- const timestamp = +new Date() + ''
- const randomNum = parseInt((1 + Math.random()) * 65536) + ''
- return (+(randomNum + timestamp)).toString(32)
+ const timestamp = +new Date() + "";
+ const randomNum = parseInt((1 + Math.random()) * 65536) + "";
+ return (+(randomNum + timestamp)).toString(32);
}
/**
@@ -296,7 +303,7 @@ export function createUniqueString() {
* @returns {boolean}
*/
export function hasClass(ele, cls) {
- return !!ele.className.match(new RegExp('(\\s|^)' + cls + '(\\s|$)'))
+ return !!ele.className.match(new RegExp("(\\s|^)" + cls + "(\\s|$)"));
}
/**
@@ -305,7 +312,7 @@ export function hasClass(ele, cls) {
* @param {string} cls
*/
export function addClass(ele, cls) {
- if (!hasClass(ele, cls)) ele.className += ' ' + cls
+ if (!hasClass(ele, cls)) ele.className += " " + cls;
}
/**
@@ -315,76 +322,73 @@ export function addClass(ele, cls) {
*/
export function removeClass(ele, cls) {
if (hasClass(ele, cls)) {
- const reg = new RegExp('(\\s|^)' + cls + '(\\s|$)')
- ele.className = ele.className.replace(reg, ' ')
+ const reg = new RegExp("(\\s|^)" + cls + "(\\s|$)");
+ ele.className = ele.className.replace(reg, " ");
}
}
export function makeMap(str, expectsLowerCase) {
- const map = Object.create(null)
- const list = str.split(',')
+ const map = Object.create(null);
+ const list = str.split(",");
for (let i = 0; i < list.length; i++) {
- map[list[i]] = true
+ map[list[i]] = true;
}
- return expectsLowerCase
- ? val => map[val.toLowerCase()]
- : val => map[val]
+ return expectsLowerCase ? (val) => map[val.toLowerCase()] : (val) => map[val];
}
-
-export const exportDefault = 'export default '
+
+export const exportDefault = "export default ";
export const beautifierConf = {
html: {
- indent_size: '2',
- indent_char: ' ',
- max_preserve_newlines: '-1',
+ indent_size: "2",
+ indent_char: " ",
+ max_preserve_newlines: "-1",
preserve_newlines: false,
keep_array_indentation: false,
break_chained_methods: false,
- indent_scripts: 'separate',
- brace_style: 'end-expand',
+ indent_scripts: "separate",
+ brace_style: "end-expand",
space_before_conditional: true,
unescape_strings: false,
jslint_happy: false,
end_with_newline: true,
- wrap_line_length: '110',
+ wrap_line_length: "110",
indent_inner_html: true,
comma_first: false,
e4x: true,
- indent_empty_lines: true
+ indent_empty_lines: true,
},
js: {
- indent_size: '2',
- indent_char: ' ',
- max_preserve_newlines: '-1',
+ indent_size: "2",
+ indent_char: " ",
+ max_preserve_newlines: "-1",
preserve_newlines: false,
keep_array_indentation: false,
break_chained_methods: false,
- indent_scripts: 'normal',
- brace_style: 'end-expand',
+ indent_scripts: "normal",
+ brace_style: "end-expand",
space_before_conditional: true,
unescape_strings: false,
jslint_happy: true,
end_with_newline: true,
- wrap_line_length: '110',
+ wrap_line_length: "110",
indent_inner_html: true,
comma_first: false,
e4x: true,
- indent_empty_lines: true
- }
-}
+ indent_empty_lines: true,
+ },
+};
// 首字母大小
export function titleCase(str) {
- return str.replace(/( |^)[a-z]/g, L => L.toUpperCase())
+ return str.replace(/( |^)[a-z]/g, (L) => L.toUpperCase());
}
// 下划转驼峰
export function camelCase(str) {
- return str.replace(/_[a-z]/g, str1 => str1.substr(-1).toUpperCase())
+ return str.replace(/_[a-z]/g, (str1) => str1.substr(-1).toUpperCase());
}
export function isNumberStr(str) {
- return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str)
+ return /^[+-]?(0|([1-9]\d*))(\.\d+)?$/g.test(str);
}
-
diff --git a/src/utils/jsencrypt.js b/src/utils/jsencrypt.js
index 78d9523..a8ecdc9 100644
--- a/src/utils/jsencrypt.js
+++ b/src/utils/jsencrypt.js
@@ -1,30 +1,31 @@
-import JSEncrypt from 'jsencrypt/bin/jsencrypt.min'
+import JSEncrypt from "jsencrypt/bin/jsencrypt.min";
// 密钥对生成 http://web.chacuo.net/netrsakeypair
-const publicKey = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n' +
- 'nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
+const publicKey =
+ "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdH\n" +
+ "nzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==";
-const privateKey = 'MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n' +
- '7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n' +
- 'PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n' +
- 'kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n' +
- 'cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n' +
- 'DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n' +
- 'YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n' +
- 'UP8iWi1Qw0Y='
+const privateKey =
+ "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY\n" +
+ "7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKN\n" +
+ "PuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gA\n" +
+ "kM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWow\n" +
+ "cSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99Ecv\n" +
+ "DQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthh\n" +
+ "YhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3\n" +
+ "UP8iWi1Qw0Y=";
// 加密
export function encrypt(txt) {
- const encryptor = new JSEncrypt()
- encryptor.setPublicKey(publicKey) // 设置公钥
- return encryptor.encrypt(txt) // 对数据进行加密
+ const encryptor = new JSEncrypt();
+ encryptor.setPublicKey(publicKey); // 设置公钥
+ return encryptor.encrypt(txt); // 对数据进行加密
}
// 解密
export function decrypt(txt) {
- const encryptor = new JSEncrypt()
- encryptor.setPrivateKey(privateKey) // 设置私钥
- return encryptor.decrypt(txt) // 对数据进行解密
+ const encryptor = new JSEncrypt();
+ encryptor.setPrivateKey(privateKey); // 设置私钥
+ return encryptor.decrypt(txt); // 对数据进行解密
}
-
diff --git a/src/utils/permission.js b/src/utils/permission.js
index 93fee87..e72724a 100644
--- a/src/utils/permission.js
+++ b/src/utils/permission.js
@@ -1,4 +1,4 @@
-import useUserStore from '@/store/modules/user'
+import useUserStore from "@/store/modules/user";
/**
* 字符权限校验
@@ -7,21 +7,25 @@ import useUserStore from '@/store/modules/user'
*/
export function checkPermi(value) {
if (value && value instanceof Array && value.length > 0) {
- const permissions = useUserStore().permissions
- const permissionDatas = value
+ const permissions = useUserStore().permissions;
+ const permissionDatas = value;
const all_permission = "*:*:*";
- const hasPermission = permissions.some(permission => {
- return all_permission === permission || permissionDatas.includes(permission)
- })
+ const hasPermission = permissions.some((permission) => {
+ return (
+ all_permission === permission || permissionDatas.includes(permission)
+ );
+ });
if (!hasPermission) {
- return false
+ return false;
}
- return true
+ return true;
} else {
- console.error(`need roles! Like checkPermi="['system:user:add','system:user:edit']"`)
- return false
+ console.error(
+ `need roles! Like checkPermi="['system:user:add','system:user:edit']"`
+ );
+ return false;
}
}
@@ -32,20 +36,20 @@ export function checkPermi(value) {
*/
export function checkRole(value) {
if (value && value instanceof Array && value.length > 0) {
- const roles = useUserStore().roles
- const permissionRoles = value
+ const roles = useUserStore().roles;
+ const permissionRoles = value;
const super_admin = "admin";
- const hasRole = roles.some(role => {
- return super_admin === role || permissionRoles.includes(role)
- })
+ const hasRole = roles.some((role) => {
+ return super_admin === role || permissionRoles.includes(role);
+ });
if (!hasRole) {
- return false
+ return false;
}
- return true
+ return true;
} else {
- console.error(`need roles! Like checkRole="['admin','editor']"`)
- return false
+ console.error(`need roles! Like checkRole="['admin','editor']"`);
+ return false;
}
-}
\ No newline at end of file
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index 2fddda1..8b3f092 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,111 +1,149 @@
-import axios from 'axios'
-import { ElNotification , ElMessageBox, ElMessage, ElLoading } from 'element-plus'
-import { getToken } from '@/utils/auth'
-import errorCode from '@/utils/errorCode'
-import { tansParams, blobValidate } from '@/utils/ruoyi'
-import cache from '@/plugins/cache'
-import { saveAs } from 'file-saver'
-import useUserStore from '@/store/modules/user'
+import axios from "axios";
+import {
+ ElNotification,
+ ElMessageBox,
+ ElMessage,
+ ElLoading,
+} from "element-plus";
+import { getToken } from "@/utils/auth";
+import errorCode from "@/utils/errorCode";
+import { tansParams, blobValidate } from "@/utils/ruoyi";
+import cache from "@/plugins/cache";
+import { saveAs } from "file-saver";
+import useUserStore from "@/store/modules/user";
let downloadLoadingInstance;
// 是否显示重新登录
export let isRelogin = { show: false };
-axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
+axios.defaults.headers["Content-Type"] = "application/json;charset=utf-8";
// 创建axios实例
const service = axios.create({
// axios中请求配置有baseURL选项，表示请求URL公共部分
baseURL: import.meta.env.VITE_APP_BASE_API,
// 超时
- timeout: 10000
-})
+ timeout: 10000,
+});
// request拦截器
-service.interceptors.request.use(config => {
- // 是否需要设置 token
- const isToken = (config.headers || {}).isToken === false
- // 是否需要防止数据重复提交
- const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
- if (getToken() && !isToken) {
- config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
- }
- if(useUserStore().tenant){
- config.headers['tenant'] = useUserStore().tenant
- }
- // get请求映射params参数
- if (config.method === 'get' && config.params) {
- let url = config.url + '?' + tansParams(config.params);
- url = url.slice(0, -1);
- config.params = {};
- config.url = url;
- }
- if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
- const requestObj = {
- url: config.url,
- data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
- time: new Date().getTime()
+service.interceptors.request.use(
+ (config) => {
+ // 是否需要设置 token
+ const isToken = (config.headers || {}).isToken === false;
+ // 是否需要防止数据重复提交
+ const isRepeatSubmit = (config.headers || {}).repeatSubmit === false;
+ if (getToken() && !isToken) {
+ config.headers["Authorization"] = "Bearer " + getToken(); // 让每个请求携带自定义token 请根据实际情况自行修改
}
- const sessionObj = cache.session.getJSON('sessionObj')
- if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
- cache.session.setJSON('sessionObj', requestObj)
- } else {
- const s_url = sessionObj.url; // 请求地址
- const s_data = sessionObj.data; // 请求数据
- const s_time = sessionObj.time; // 请求时间
- const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
- if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
- const message = '数据正在处理，请勿重复提交';
- console.warn(`[${s_url}]: ` + message)
- return Promise.reject(new Error(message))
+ if (useUserStore().tenant) {
+ config.headers["tenant"] = useUserStore().tenant;
+ }
+ // get请求映射params参数
+ if (config.method === "get" && config.params) {
+ let url = config.url + "?" + tansParams(config.params);
+ url = url.slice(0, -1);
+ config.params = {};
+ config.url = url;
+ }
+ if (
+ !isRepeatSubmit &&
+ (config.method === "post" || config.method === "put")
+ ) {
+ const requestObj = {
+ url: config.url,
+ data:
+ typeof config.data === "object"
+ ? JSON.stringify(config.data)
+ : config.data,
+ time: new Date().getTime(),
+ };
+ const sessionObj = cache.session.getJSON("sessionObj");
+ if (
+ sessionObj === undefined ||
+ sessionObj === null ||
+ sessionObj === ""
+ ) {
+ cache.session.setJSON("sessionObj", requestObj);
} else {
- cache.session.setJSON('sessionObj', requestObj)
+ const s_url = sessionObj.url; // 请求地址
+ const s_data = sessionObj.data; // 请求数据
+ const s_time = sessionObj.time; // 请求时间
+ const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
+ if (
+ s_data === requestObj.data &&
+ requestObj.time - s_time < interval &&
+ s_url === requestObj.url
+ ) {
+ const message = "数据正在处理，请勿重复提交";
+ console.warn(`[${s_url}]: ` + message);
+ return Promise.reject(new Error(message));
+ } else {
+ cache.session.setJSON("sessionObj", requestObj);
+ }
}
}
+ return config;
+ },
+ (error) => {
+ console.log(error);
+ Promise.reject(error);
}
- return config
-}, error => {
- console.log(error)
- Promise.reject(error)
-})
+);
// 响应拦截器
-service.interceptors.response.use(res => {
+service.interceptors.response.use(
+ (res) => {
// 未设置状态码则默认成功状态
const code = res.data.code || 200;
// 获取错误信息
- const msg = errorCode[code] || res.data.msg || errorCode['default']
+ const msg = errorCode[code] || res.data.msg || errorCode["default"];
// 二进制数据则直接返回
- if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
- return res.data
+ if (
+ res.request.responseType === "blob" ||
+ res.request.responseType === "arraybuffer"
+ ) {
+ return res.data;
}
if (code === 401) {
if (!isRelogin.show) {
isRelogin.show = true;
- ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
- isRelogin.show = false;
- useUserStore().logOut().then(() => {
- location.href = '/index';
+ ElMessageBox.confirm(
+ "登录状态已过期，您可以继续留在该页面，或者重新登录",
+ "系统提示",
+ {
+ confirmButtonText: "重新登录",
+ cancelButtonText: "取消",
+ type: "warning",
+ }
+ )
+ .then(() => {
+ isRelogin.show = false;
+ useUserStore()
+ .logOut()
+ .then(() => {
+ location.href = "/index";
+ });
})
- }).catch(() => {
- isRelogin.show = false;
- });
- }
- return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
+ .catch(() => {
+ isRelogin.show = false;
+ });
+ }
+ return Promise.reject("无效的会话，或者会话已过期，请重新登录。");
} else if (code === 500) {
- ElMessage({ message: msg, type: 'error' })
- return Promise.reject(new Error(msg))
+ ElMessage({ message: msg, type: "error" });
+ return Promise.reject(new Error(msg));
} else if (code === 601) {
- ElMessage({ message: msg, type: 'warning' })
- return Promise.reject(new Error(msg))
+ ElMessage({ message: msg, type: "warning" });
+ return Promise.reject(new Error(msg));
} else if (code !== 200) {
- ElNotification.error({ title: msg })
- return Promise.reject('error')
+ ElNotification.error({ title: msg });
+ return Promise.reject("error");
} else {
- return Promise.resolve(res.data)
+ return Promise.resolve(res.data);
}
},
- error => {
- console.log('err' + error)
+ (error) => {
+ console.log("err" + error);
let { message } = error;
if (message == "Network Error") {
message = "后端接口连接异常";
@@ -114,36 +152,47 @@ service.interceptors.response.use(res => {
} else if (message.includes("Request failed with status code")) {
message = "系统接口" + message.substr(message.length - 3) + "异常";
}
- ElMessage({ message: message, type: 'error', duration: 5 * 1000 })
- return Promise.reject(error)
+ ElMessage({ message: message, type: "error", duration: 5 * 1000 });
+ return Promise.reject(error);
}
-)
+);
// 通用下载方法
export function download(url, params, filename, config) {
- downloadLoadingInstance = ElLoading.service({ text: "正在下载数据，请稍候", background: "rgba(0, 0, 0, 0.7)", })
- return service.post(url, params, {
- transformRequest: [(params) => { return tansParams(params) }],
- headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
- responseType: 'blob',
- ...config
- }).then(async (data) => {
- const isBlob = blobValidate(data);
- if (isBlob) {
- const blob = new Blob([data])
- saveAs(blob, filename)
- } else {
- const resText = await data.text();
- const rspObj = JSON.parse(resText);
- const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
- ElMessage.error(errMsg);
- }
- downloadLoadingInstance.close();
- }).catch((r) => {
- console.error(r)
- ElMessage.error('下载文件出现错误，请联系管理员！')
- downloadLoadingInstance.close();
- })
+ downloadLoadingInstance = ElLoading.service({
+ text: "正在下载数据，请稍候",
+ background: "rgba(0, 0, 0, 0.7)",
+ });
+ return service
+ .post(url, params, {
+ transformRequest: [
+ (params) => {
+ return tansParams(params);
+ },
+ ],
+ headers: { "Content-Type": "application/x-www-form-urlencoded" },
+ responseType: "blob",
+ ...config,
+ })
+ .then(async (data) => {
+ const isBlob = blobValidate(data);
+ if (isBlob) {
+ const blob = new Blob([data]);
+ saveAs(blob, filename);
+ } else {
+ const resText = await data.text();
+ const rspObj = JSON.parse(resText);
+ const errMsg =
+ errorCode[rspObj.code] || rspObj.msg || errorCode["default"];
+ ElMessage.error(errMsg);
+ }
+ downloadLoadingInstance.close();
+ })
+ .catch((r) => {
+ console.error(r);
+ ElMessage.error("下载文件出现错误，请联系管理员！");
+ downloadLoadingInstance.close();
+ });
}
-export default service
+export default service;
diff --git a/src/utils/ruoyi.js b/src/utils/ruoyi.js
index 598f374..3339ccb 100644
--- a/src/utils/ruoyi.js
+++ b/src/utils/ruoyi.js
@@ -1,5 +1,3 @@
-
-
/**
* 通用js方法封装处理
* Copyright (c) 2019 ruoyi
@@ -8,22 +6,25 @@
// 日期格式化
export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) {
- return null
+ return null;
}
- const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
- let date
- if (typeof time === 'object') {
- date = time
+ const format = pattern || "{y}-{m}-{d} {h}:{i}:{s}";
+ let date;
+ if (typeof time === "object") {
+ date = time;
} else {
- if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
- time = parseInt(time)
- } else if (typeof time === 'string') {
- time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+ if (typeof time === "string" && /^[0-9]+$/.test(time)) {
+ time = parseInt(time);
+ } else if (typeof time === "string") {
+ time = time
+ .replace(new RegExp(/-/gm), "/")
+ .replace("T", " ")
+ .replace(new RegExp(/\.[\d]{3}/gm), "");
}
- if ((typeof time === 'number') && (time.toString().length === 10)) {
- time = time * 1000
+ if (typeof time === "number" && time.toString().length === 10) {
+ time = time * 1000;
}
- date = new Date(time)
+ date = new Date(time);
}
const formatObj = {
y: date.getFullYear(),
@@ -32,18 +33,20 @@ export function parseTime(time, pattern) {
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
- a: date.getDay()
- }
+ a: date.getDay(),
+ };
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
- let value = formatObj[key]
+ let value = formatObj[key];
// Note: getDay() returns 0 on Sunday
- if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
- if (result.length > 0 && value < 10) {
- value = '0' + value
+ if (key === "a") {
+ return ["日", "一", "二", "三", "四", "五", "六"][value];
}
- return value || 0
- })
- return time_str
+ if (result.length > 0 && value < 10) {
+ value = "0" + value;
+ }
+ return value || 0;
+ });
+ return time_str;
}
// 表单重置
@@ -57,15 +60,15 @@ export function resetForm(refName) {
export function addDateRange(params, dateRange, propName) {
let search = JSON.parse(JSON.stringify(params));
dateRange = Array.isArray(dateRange) ? dateRange : [];
- if(dateRange.length < 2){
+ if (dateRange.length < 2) {
return search;
}
- if (typeof (propName) === 'undefined') {
- search['beginTime'] = dateRange[0] + ' 00:00:00';
- search['endTime'] = dateRange[1] + ' 23:59:59';
+ if (typeof propName === "undefined") {
+ search["beginTime"] = dateRange[0] + " 00:00:00";
+ search["endTime"] = dateRange[1] + " 23:59:59";
} else {
- search['begin' + propName] = dateRange[0] + ' 00:00:00';
- search['end' + propName] = dateRange[1] + ' 23:59:59';
+ search["begin" + propName] = dateRange[0] + " 00:00:00";
+ search["end" + propName] = dateRange[1] + " 23:59:59";
}
return search;
}
@@ -77,20 +80,20 @@ export function selectDictLabel(datas, value) {
}
var actions = [];
Object.keys(datas).some((key) => {
- if (datas[key].value == ('' + value)) {
+ if (datas[key].value == "" + value) {
actions.push(datas[key].label);
return true;
}
- })
+ });
if (actions.length === 0) {
actions.push(value);
}
- return actions.join('');
+ return actions.join("");
}
// 回显数据字典（字符串数组）
export function selectDictLabels(datas, value, separator) {
- if (value === undefined || value.length ===0) {
+ if (value === undefined || value.length === 0) {
return "";
}
if (Array.isArray(value)) {
@@ -102,30 +105,32 @@ export function selectDictLabels(datas, value, separator) {
Object.keys(value.split(currentSeparator)).some((val) => {
var match = false;
Object.keys(datas).some((key) => {
- if (datas[key].value == ('' + temp[val])) {
+ if (datas[key].value == "" + temp[val]) {
actions.push(datas[key].label + currentSeparator);
match = true;
}
- })
+ });
if (!match) {
actions.push(temp[val] + currentSeparator);
}
- })
- return actions.join('').substring(0, actions.join('').length - 1);
+ });
+ return actions.join("").substring(0, actions.join("").length - 1);
}
// 字符串格式化(%s )
export function sprintf(str) {
- var args = arguments, flag = true, i = 1;
+ var args = arguments,
+ flag = true,
+ i = 1;
str = str.replace(/%s/g, function () {
var arg = args[i++];
- if (typeof arg === 'undefined') {
+ if (typeof arg === "undefined") {
flag = false;
- return '';
+ return "";
}
return arg;
});
- return flag ? str : '';
+ return flag ? str : "";
}
// 转换字符串，undefined,null等转化为""
@@ -150,7 +155,7 @@ export function mergeRecursive(source, target) {
}
}
return source;
-};
+}
/**
* 构造树型结构数据
@@ -161,9 +166,9 @@ export function mergeRecursive(source, target) {
*/
export function handleTree(data, id, parentId, children) {
let config = {
- id: id || 'id',
- parentId: parentId || 'parentId',
- childrenList: children || 'children'
+ id: id || "id",
+ parentId: parentId || "parentId",
+ childrenList: children || "children",
};
var childrenListMap = {};
@@ -204,19 +209,23 @@ export function handleTree(data, id, parentId, children) {
}
/**
-* 参数处理
-* @param {*} params 参数
-*/
+ * 参数处理
+ * @param {*} params 参数
+ */
export function tansParams(params) {
- let result = ''
+ let result = "";
for (const propName of Object.keys(params)) {
const value = params[propName];
var part = encodeURIComponent(propName) + "=";
- if (value !== null && value !== "" && typeof (value) !== "undefined") {
- if (typeof value === 'object') {
+ if (value !== null && value !== "" && typeof value !== "undefined") {
+ if (typeof value === "object") {
for (const key of Object.keys(value)) {
- if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
- let params = propName + '[' + key + ']';
+ if (
+ value[key] !== null &&
+ value[key] !== "" &&
+ typeof value[key] !== "undefined"
+ ) {
+ let params = propName + "[" + key + "]";
var subPart = encodeURIComponent(params) + "=";
result += subPart + encodeURIComponent(value[key]) + "&";
}
@@ -226,23 +235,22 @@ export function tansParams(params) {
}
}
}
- return result
+ return result;
}
-
// 返回项目路径
export function getNormalPath(p) {
- if (p.length === 0 || !p || p == 'undefined') {
- return p
- };
- let res = p.replace('//', '/')
- if (res[res.length - 1] === '/') {
- return res.slice(0, res.length - 1)
+ if (p.length === 0 || !p || p == "undefined") {
+ return p;
+ }
+ let res = p.replace("//", "/");
+ if (res[res.length - 1] === "/") {
+ return res.slice(0, res.length - 1);
}
return res;
}
// 验证是否为blob格式
export function blobValidate(data) {
- return data.type !== 'application/json'
+ return data.type !== "application/json";
}
diff --git a/src/utils/scroll-to.js b/src/utils/scroll-to.js
index c5d8e04..28d96c0 100644
--- a/src/utils/scroll-to.js
+++ b/src/utils/scroll-to.js
@@ -1,29 +1,40 @@
-Math.easeInOutQuad = function(t, b, c, d) {
- t /= d / 2
+Math.easeInOutQuad = function (t, b, c, d) {
+ t /= d / 2;
if (t < 1) {
- return c / 2 * t * t + b
+ return (c / 2) * t * t + b;
}
- t--
- return -c / 2 * (t * (t - 2) - 1) + b
-}
+ t--;
+ return (-c / 2) * (t * (t - 2) - 1) + b;
+};
// requestAnimationFrame for Smart Animating http://goo.gl/sx5sts
-var requestAnimFrame = (function() {
- return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || function(callback) { window.setTimeout(callback, 1000 / 60) }
-})()
+var requestAnimFrame = (function () {
+ return (
+ window.requestAnimationFrame ||
+ window.webkitRequestAnimationFrame ||
+ window.mozRequestAnimationFrame ||
+ function (callback) {
+ window.setTimeout(callback, 1000 / 60);
+ }
+ );
+})();
/**
* Because it's so fucking difficult to detect the scrolling element, just move them all
* @param {number} amount
*/
function move(amount) {
- document.documentElement.scrollTop = amount
- document.body.parentNode.scrollTop = amount
- document.body.scrollTop = amount
+ document.documentElement.scrollTop = amount;
+ document.body.parentNode.scrollTop = amount;
+ document.body.scrollTop = amount;
}
function position() {
- return document.documentElement.scrollTop || document.body.parentNode.scrollTop || document.body.scrollTop
+ return (
+ document.documentElement.scrollTop ||
+ document.body.parentNode.scrollTop ||
+ document.body.scrollTop
+ );
}
/**
@@ -32,27 +43,27 @@ function position() {
* @param {Function} callback
*/
export function scrollTo(to, duration, callback) {
- const start = position()
- const change = to - start
- const increment = 20
- let currentTime = 0
- duration = (typeof (duration) === 'undefined') ? 500 : duration
- var animateScroll = function() {
+ const start = position();
+ const change = to - start;
+ const increment = 20;
+ let currentTime = 0;
+ duration = typeof duration === "undefined" ? 500 : duration;
+ var animateScroll = function () {
// increment the time
- currentTime += increment
+ currentTime += increment;
// find the value with the quadratic in-out easing function
- var val = Math.easeInOutQuad(currentTime, start, change, duration)
+ var val = Math.easeInOutQuad(currentTime, start, change, duration);
// move the document.body
- move(val)
+ move(val);
// do the animation unless its over
if (currentTime < duration) {
- requestAnimFrame(animateScroll)
+ requestAnimFrame(animateScroll);
} else {
- if (callback && typeof (callback) === 'function') {
+ if (callback && typeof callback === "function") {
// the animation is done so lets callback
- callback()
+ callback();
}
}
- }
- animateScroll()
+ };
+ animateScroll();
}
diff --git a/src/utils/theme.js b/src/utils/theme.js
index f4badc6..cf9091c 100644
--- a/src/utils/theme.js
+++ b/src/utils/theme.js
@@ -1,49 +1,55 @@
// 处理主题样式
export function handleThemeStyle(theme) {
- document.documentElement.style.setProperty('--el-color-primary', theme)
- for (let i = 1; i <= 9; i++) {
- document.documentElement.style.setProperty(`--el-color-primary-light-${i}`, `${getLightColor(theme, i / 10)}`)
- }
- for (let i = 1; i <= 9; i++) {
- document.documentElement.style.setProperty(`--el-color-primary-dark-${i}`, `${getDarkColor(theme, i / 10)}`)
- }
+ document.documentElement.style.setProperty("--el-color-primary", theme);
+ for (let i = 1; i <= 9; i++) {
+ document.documentElement.style.setProperty(
+ `--el-color-primary-light-${i}`,
+ `${getLightColor(theme, i / 10)}`
+ );
+ }
+ for (let i = 1; i <= 9; i++) {
+ document.documentElement.style.setProperty(
+ `--el-color-primary-dark-${i}`,
+ `${getDarkColor(theme, i / 10)}`
+ );
+ }
}
// hex颜色转rgb颜色
export function hexToRgb(str) {
- str = str.replace('#', '')
- let hexs = str.match(/../g)
- for (let i = 0; i < 3; i++) {
- hexs[i] = parseInt(hexs[i], 16)
- }
- return hexs
+ str = str.replace("#", "");
+ let hexs = str.match(/../g);
+ for (let i = 0; i < 3; i++) {
+ hexs[i] = parseInt(hexs[i], 16);
+ }
+ return hexs;
}
// rgb颜色转Hex颜色
export function rgbToHex(r, g, b) {
- let hexs = [r.toString(16), g.toString(16), b.toString(16)]
- for (let i = 0; i < 3; i++) {
- if (hexs[i].length == 1) {
- hexs[i] = `0${hexs[i]}`
- }
- }
- return `#${hexs.join('')}`
+ let hexs = [r.toString(16), g.toString(16), b.toString(16)];
+ for (let i = 0; i < 3; i++) {
+ if (hexs[i].length == 1) {
+ hexs[i] = `0${hexs[i]}`;
+ }
+ }
+ return `#${hexs.join("")}`;
}
// 变浅颜色值
export function getLightColor(color, level) {
- let rgb = hexToRgb(color)
- for (let i = 0; i < 3; i++) {
- rgb[i] = Math.floor((255 - rgb[i]) * level + rgb[i])
- }
- return rgbToHex(rgb[0], rgb[1], rgb[2])
+ let rgb = hexToRgb(color);
+ for (let i = 0; i < 3; i++) {
+ rgb[i] = Math.floor((255 - rgb[i]) * level + rgb[i]);
+ }
+ return rgbToHex(rgb[0], rgb[1], rgb[2]);
}
// 变深颜色值
export function getDarkColor(color, level) {
- let rgb = hexToRgb(color)
- for (let i = 0; i < 3; i++) {
- rgb[i] = Math.floor(rgb[i] * (1 - level))
- }
- return rgbToHex(rgb[0], rgb[1], rgb[2])
+ let rgb = hexToRgb(color);
+ for (let i = 0; i < 3; i++) {
+ rgb[i] = Math.floor(rgb[i] * (1 - level));
+ }
+ return rgbToHex(rgb[0], rgb[1], rgb[2]);
}
diff --git a/src/utils/validate.js b/src/utils/validate.js
index 702add4..c5967db 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,10 +1,10 @@
/**
- * 判断url是否是http或https
+ * 判断url是否是http或https
* @param {string} path
* @returns {Boolean}
*/
- export function isHttp(url) {
- return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
+export function isHttp(url) {
+ return url.indexOf("http://") !== -1 || url.indexOf("https://") !== -1;
}
/**
@@ -12,8 +12,8 @@
* @param {string} path
* @returns {Boolean}
*/
- export function isExternal(path) {
- return /^(https?:|mailto:|tel:)/.test(path)
+export function isExternal(path) {
+ return /^(https?:|mailto:|tel:)/.test(path);
}
/**
@@ -21,8 +21,8 @@
* @returns {Boolean}
*/
export function validUsername(str) {
- const valid_map = ['admin', 'editor']
- return valid_map.indexOf(str.trim()) >= 0
+ const valid_map = ["admin", "editor"];
+ return valid_map.indexOf(str.trim()) >= 0;
}
/**
@@ -30,8 +30,9 @@ export function validUsername(str) {
* @returns {Boolean}
*/
export function validURL(url) {
- const reg = /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/
- return reg.test(url)
+ const reg =
+ /^(https?|ftp):\/\/([a-zA-Z0-9.-]+(:[a-zA-Z0-9.&%$-]+)*@)*((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9][0-9]?)(\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])){3}|([a-zA-Z0-9-]+\.)*[a-zA-Z0-9-]+\.(com|edu|gov|int|mil|net|org|biz|arpa|info|name|pro|aero|coop|museum|[a-zA-Z]{2}))(:[0-9]+)*(\/($|[a-zA-Z0-9.,?'\\+&%$#=~_-]+))*$/;
+ return reg.test(url);
}
/**
@@ -39,8 +40,8 @@ export function validURL(url) {
* @returns {Boolean}
*/
export function validLowerCase(str) {
- const reg = /^[a-z]+$/
- return reg.test(str)
+ const reg = /^[a-z]+$/;
+ return reg.test(str);
}
/**
@@ -48,8 +49,8 @@ export function validLowerCase(str) {
* @returns {Boolean}
*/
export function validUpperCase(str) {
- const reg = /^[A-Z]+$/
- return reg.test(str)
+ const reg = /^[A-Z]+$/;
+ return reg.test(str);
}
/**
@@ -57,8 +58,8 @@ export function validUpperCase(str) {
* @returns {Boolean}
*/
export function validAlphabets(str) {
- const reg = /^[A-Za-z]+$/
- return reg.test(str)
+ const reg = /^[A-Za-z]+$/;
+ return reg.test(str);
}
/**
@@ -66,8 +67,9 @@ export function validAlphabets(str) {
* @returns {Boolean}
*/
export function validEmail(email) {
- const reg = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/
- return reg.test(email)
+ const reg =
+ /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+ return reg.test(email);
}
/**
@@ -75,10 +77,10 @@ export function validEmail(email) {
* @returns {Boolean}
*/
export function isString(str) {
- if (typeof str === 'string' || str instanceof String) {
- return true
+ if (typeof str === "string" || str instanceof String) {
+ return true;
}
- return false
+ return false;
}
/**
@@ -86,8 +88,8 @@ export function isString(str) {
* @returns {Boolean}
*/
export function isArray(arg) {
- if (typeof Array.isArray === 'undefined') {
- return Object.prototype.toString.call(arg) === '[object Array]'
+ if (typeof Array.isArray === "undefined") {
+ return Object.prototype.toString.call(arg) === "[object Array]";
}
- return Array.isArray(arg)
+ return Array.isArray(arg);
}
diff --git a/src/views/error/401.vue b/src/views/error/401.vue
index 1ba3792..bfb1936 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -5,21 +5,22 @@
+
- 401错误! -
+401错误!
您没有访问权限！
对不起，您没有访问权限，请不要进行非法操作！您可以返回主页面
-
-
- 回首页 - +回首页
- 
- 
-
-
+
+
+
+
-
-
-
+
+
+
+
-
- 404错误!
-
+ 404错误!
{{ message }}
@@ -27,13 +41,13 @@
-
diff --git a/src/views/login.vue b/src/views/login.vue
index 1bb64a7..a7505d3 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,112 +1,126 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 记住密码
-
-
- 登 录
- 登 录 中...
-
-
-
-
-
若依后台管理系统
-
- ![]()
-
-
- 立即注册
-
-
- Copyright © 2018-2023 ruoyi.vip All Rights Reserved.
+
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index eaff778..4375ce3 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -1,336 +1,509 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
保存
关闭
-
-
+
+
diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue
index 2cae2ac..28a24c2 100644
--- a/src/views/system/user/profile/userAvatar.vue
+++ b/src/views/system/user/profile/userAvatar.vue
@@ -1,7 +1,14 @@
![]( "点击上传头像")
-
+
{
+ proxy.$refs.cropper.getCropBlob((data) => {
let formData = new FormData();
formData.append("avatarfile", data);
- uploadAvatar(formData).then(response => {
+ uploadAvatar(formData).then((response) => {
open.value = false;
options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
userStore.avatar = options.img;
@@ -142,7 +151,7 @@ function closeDialog() {
}
-
\ No newline at end of file
+
diff --git a/src/views/system/user/profile/userInfo.vue b/src/views/system/user/profile/userInfo.vue
index a5d4083..ec217ee 100644
--- a/src/views/system/user/profile/userInfo.vue
+++ b/src/views/system/user/profile/userInfo.vue
@@ -1,25 +1,25 @@
-
-
-
-
-
-
-
-
-
- 男
- 女
-
-
-
+
+
+
+
+
+
+
+
+
+ 男
+ 女
+
+
+
保存
关闭
-
-
+
+
diff --git a/vite.config.js b/vite.config.js
index 3d27ed2..a7db419 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,27 +1,27 @@
-import { defineConfig, loadEnv } from 'vite'
-import path from 'path'
-import createVitePlugins from './vite/plugins'
+import { defineConfig, loadEnv } from "vite";
+import path from "path";
+import createVitePlugins from "./vite/plugins";
// https://vitejs.dev/config/
export default defineConfig(({ mode, command }) => {
- const env = loadEnv(mode, process.cwd())
- const { VITE_APP_ENV } = env
+ const env = loadEnv(mode, process.cwd());
+ const { VITE_APP_ENV } = env;
return {
// 部署生产环境和开发环境下的URL。
// 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
- base: VITE_APP_ENV === 'production' ? '/' : '/',
- plugins: createVitePlugins(env, command === 'build'),
+ base: VITE_APP_ENV === "production" ? "/" : "/",
+ plugins: createVitePlugins(env, command === "build"),
resolve: {
// https://cn.vitejs.dev/config/#resolve-alias
alias: {
// 设置路径
- '~': path.resolve(__dirname, './'),
+ "~": path.resolve(__dirname, "./"),
// 设置别名
- '@': path.resolve(__dirname, './src')
+ "@": path.resolve(__dirname, "./src"),
},
// https://cn.vitejs.dev/config/#resolve-extensions
- extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
+ extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"],
},
// vite 相关配置
server: {
@@ -30,29 +30,29 @@ export default defineConfig(({ mode, command }) => {
open: true,
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
- '/dev-api': {
- target: 'http://192.168.1.201:8080',
+ "/dev-api": {
+ target: "http://192.168.1.201:8080",
changeOrigin: true,
- rewrite: (p) => p.replace(/^\/dev-api/, '')
- }
- }
+ rewrite: (p) => p.replace(/^\/dev-api/, ""),
+ },
+ },
},
//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
css: {
postcss: {
plugins: [
{
- postcssPlugin: 'internal:charset-removal',
+ postcssPlugin: "internal:charset-removal",
AtRule: {
charset: (atRule) => {
- if (atRule.name === 'charset') {
+ if (atRule.name === "charset") {
atRule.remove();
}
- }
- }
- }
- ]
- }
- }
- }
-})
+ },
+ },
+ },
+ ],
+ },
+ },
+ };
+});
diff --git a/vite/plugins/auto-import.js b/vite/plugins/auto-import.js
index a5d3576..911d162 100644
--- a/vite/plugins/auto-import.js
+++ b/vite/plugins/auto-import.js
@@ -1,12 +1,8 @@
-import autoImport from 'unplugin-auto-import/vite'
+import autoImport from "unplugin-auto-import/vite";
export default function createAutoImport() {
- return autoImport({
- imports: [
- 'vue',
- 'vue-router',
- 'pinia'
- ],
- dts: false
- })
+ return autoImport({
+ imports: ["vue", "vue-router", "pinia"],
+ dts: false,
+ });
}
diff --git a/vite/plugins/compression.js b/vite/plugins/compression.js
index e90aaec..12f0a15 100644
--- a/vite/plugins/compression.js
+++ b/vite/plugins/compression.js
@@ -1,28 +1,28 @@
-import compression from 'vite-plugin-compression'
+import compression from "vite-plugin-compression";
export default function createCompression(env) {
- const { VITE_BUILD_COMPRESS } = env
- const plugin = []
- if (VITE_BUILD_COMPRESS) {
- const compressList = VITE_BUILD_COMPRESS.split(',')
- if (compressList.includes('gzip')) {
- // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
- plugin.push(
- compression({
- ext: '.gz',
- deleteOriginFile: false
- })
- )
- }
- if (compressList.includes('brotli')) {
- plugin.push(
- compression({
- ext: '.br',
- algorithm: 'brotliCompress',
- deleteOriginFile: false
- })
- )
- }
+ const { VITE_BUILD_COMPRESS } = env;
+ const plugin = [];
+ if (VITE_BUILD_COMPRESS) {
+ const compressList = VITE_BUILD_COMPRESS.split(",");
+ if (compressList.includes("gzip")) {
+ // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
+ plugin.push(
+ compression({
+ ext: ".gz",
+ deleteOriginFile: false,
+ })
+ );
}
- return plugin
+ if (compressList.includes("brotli")) {
+ plugin.push(
+ compression({
+ ext: ".br",
+ algorithm: "brotliCompress",
+ deleteOriginFile: false,
+ })
+ );
+ }
+ }
+ return plugin;
}
diff --git a/vite/plugins/index.js b/vite/plugins/index.js
index 699ef99..94c6540 100644
--- a/vite/plugins/index.js
+++ b/vite/plugins/index.js
@@ -1,15 +1,15 @@
-import vue from '@vitejs/plugin-vue'
-import vueJsx from '@vitejs/plugin-vue-jsx'
-import createAutoImport from './auto-import'
-import createSvgIcon from './svg-icon'
-import createCompression from './compression'
-import createSetupExtend from './setup-extend'
+import vue from "@vitejs/plugin-vue";
+import vueJsx from "@vitejs/plugin-vue-jsx";
+import createAutoImport from "./auto-import";
+import createSvgIcon from "./svg-icon";
+import createCompression from "./compression";
+import createSetupExtend from "./setup-extend";
export default function createVitePlugins(viteEnv, isBuild = false) {
- const vitePlugins = [vue(), vueJsx()]
- vitePlugins.push(createAutoImport())
- vitePlugins.push(createSetupExtend())
- vitePlugins.push(createSvgIcon(isBuild))
- isBuild && vitePlugins.push(...createCompression(viteEnv))
- return vitePlugins
+ const vitePlugins = [vue(), vueJsx()];
+ vitePlugins.push(createAutoImport());
+ vitePlugins.push(createSetupExtend());
+ vitePlugins.push(createSvgIcon(isBuild));
+ isBuild && vitePlugins.push(...createCompression(viteEnv));
+ return vitePlugins;
}
diff --git a/vite/plugins/setup-extend.js b/vite/plugins/setup-extend.js
index a4980f3..5ae54b1 100644
--- a/vite/plugins/setup-extend.js
+++ b/vite/plugins/setup-extend.js
@@ -1,5 +1,5 @@
-import setupExtend from 'vite-plugin-vue-setup-extend'
+import setupExtend from "vite-plugin-vue-setup-extend";
export default function createSetupExtend() {
- return setupExtend()
+ return setupExtend();
}
diff --git a/vite/plugins/svg-icon.js b/vite/plugins/svg-icon.js
index 30a4140..962f78d 100644
--- a/vite/plugins/svg-icon.js
+++ b/vite/plugins/svg-icon.js
@@ -1,10 +1,10 @@
-import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'
-import path from 'path'
+import { createSvgIconsPlugin } from "vite-plugin-svg-icons";
+import path from "path";
export default function createSvgIcon(isBuild) {
- return createSvgIconsPlugin({
- iconDirs: [path.resolve(process.cwd(), 'src/assets/icons/svg')],
- symbolId: 'icon-[dir]-[name]',
- svgoOptions: isBuild
- })
+ return createSvgIconsPlugin({
+ iconDirs: [path.resolve(process.cwd(), "src/assets/icons/svg")],
+ symbolId: "icon-[dir]-[name]",
+ svgoOptions: isBuild,
+ });
}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 记住密码
+
+
+ 登 录
+ 登 录 中...
+
+
+
+
+
+
-
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index 86e9db1..bdd20da 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -1,73 +1,109 @@
-
- 若依后台管理系统
+
+ ![]()
+
+ 立即注册
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 搜索
- 重置
-
-
-
-
-
- 新增
-
-
- 修改
-
-
- 删除
-
-
- 导入
-
-
- 导出
-
-
-
-
-
-
-
-
-
- {{ parseTime(scope.row.createTime) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导入
+
+
+
+ 导出
+
+
+
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
-
diff --git a/src/views/system/user/profile/resetPwd.vue b/src/views/system/user/profile/resetPwd.vue
index dec2d79..b5c59c2 100644
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
@@ -1,19 +1,34 @@
-
-
-
-
-
+
+
+
+ 将文件拖到此处，或点击上传
-
-
- 下载模板
-
+
-
- 仅允许导入xls、xlsx格式文件。
-