Compare commits

..

19 Commits

Author SHA1 Message Date
xiaoxian521
ebe1826492 fix: 修复标签页操作示例在切换国际化时报错 2026-02-06 10:46:21 +08:00
xiaoxian521
7b2dcdddca chore: 升级依赖,相关兼容处理 2026-02-05 10:31:12 +08:00
Yorlg
986e6e5104 perf(layout): 优化消息通知小红点显示逻辑 (#1265) 2026-02-03 19:00:23 +08:00
xiaoming
3ce26d614d feat: 在layout的消息下拉框中,新增“查看更多”和“标为已读”功能 (#1263) 2026-01-30 10:35:26 +08:00
xiaoxian521
a6a07e340f chore: 升级依赖,相关兼容处理 2026-01-29 12:55:58 +08:00
xiaoxian521
815f161b17 fix: 修复ReDialogReDrawer组件在打开时切换路由弹出层未关闭的问题 2026-01-28 07:50:52 +08:00
xiaoming
ff007fbc03 refactor: stylelint升级至v17版本 (#1261) 2026-01-17 06:21:24 +08:00
xiaoxian521
593739cf77 style: 优化国际化图标样式 2026-01-16 11:23:34 +08:00
xiaoxian521
d7c049d821 chore: 升级依赖,相关兼容处理 2026-01-15 13:13:00 +08:00
xiaoxian521
4c3ad7acce fix: 修复this.$storage类型报错 2026-01-15 09:12:55 +08:00
Journey
f3756089fd feat: 刷新token接口请求失败后,跳转到登录页面,需重新登录 (#1253) 2026-01-12 10:46:44 +08:00
xiaoxian521
42076a2247 perf: 优化接口处理逻辑 2026-01-12 09:22:26 +08:00
xiaoming
f2616fdfaf refactor: 重构API接口响应格式,带来简洁高效的接口设计 (#1256) 2026-01-10 08:58:20 +08:00
xiaoxian521
ebc92ba61c fix: 修复文件上传演示接口失效问题 2026-01-09 12:17:54 +08:00
xiaoming
fcd28837b2 feat: RePureTableBarReVxeTableBar组件实现全量文本国际化 (#1251) 2026-01-08 11:23:51 +08:00
xiaoming
4c07d84463 perf: 优化主题色选项风格 (#1257) 2026-01-07 10:39:49 +08:00
xiaoming
4f59013b61 feat: layout右上角的操作按钮添加动效 (#1254) 2026-01-06 12:38:52 +08:00
xiaoming
ace4c07590 perf: 优化系统配置面板 (#1255) 2025-12-24 08:10:48 +08:00
xiaoxian521
b20323e627 chore: 升级依赖,相关兼容处理 2025-12-23 06:24:41 +08:00
68 changed files with 2537 additions and 2251 deletions

View File

@@ -5,4 +5,4 @@
PATH="/usr/local/bin:$PATH"
npx --no-install commitlint --edit "$1"
pnpm dlx commitlint --edit "$1"

2
.nvmrc
View File

@@ -1 +1 @@
v22.20.0
v24.12.0

View File

@@ -19,6 +19,8 @@ buttons:
pureBackTop: BackTop
pureOpenText: Open
pureCloseText: Close
pureWatchMore: Watch More
pureMarkAsRead: Mark As Read
search:
pureTotal: Total
pureHistory: History
@@ -239,3 +241,18 @@ login:
purePassWordSureReg: Please enter confirm password
purePassWordDifferentReg: The two passwords do not match!
purePassWordUpdateReg: Password has been updated
pureLoginExpired: Login expired, please login again
tableBar:
pureList: List
pureLarge: Large
pureDefault: Default
pureSmall: Small
pureColumnSettings: ColumnSettings
pureCollapse: Collapse
pureExpand: Expand
pureRefresh: Refresh
pureDensity: Density
pureColumnDisplay: ColumnDisplay
pureReset: Reset
pureExitFullScreen: ExitFullScreen
pureFullScreen: FullScreen

View File

@@ -19,6 +19,8 @@ buttons:
pureBackTop: 回到顶部
pureOpenText:
pureCloseText:
pureWatchMore: 查看更多
pureMarkAsRead: 标为已读
search:
pureTotal:
pureHistory: 搜索历史
@@ -239,3 +241,18 @@ login:
purePassWordSureReg: 请输入确认密码
purePassWordDifferentReg: 两次密码不一致!
purePassWordUpdateReg: 修改密码成功
pureLoginExpired: 登录已过期,请重新登录
tableBar:
pureList: 列表
pureLarge: 宽松
pureDefault: 默认
pureSmall: 紧凑
pureColumnSettings: 列设置
pureCollapse: 折叠
pureExpand: 展开
pureRefresh: 刷新
pureDensity: 密度
pureColumnDisplay: 列展示
pureReset: 重置
pureExitFullScreen: 退出全屏
pureFullScreen: 全屏

View File

@@ -326,7 +326,8 @@ export default defineFakeRoute([
method: "get",
response: () => {
return {
success: true,
code: 0,
message: "操作成功",
data: [
systemManagementRouter,
systemMonitorRouter,

View File

@@ -6,7 +6,8 @@ export default defineFakeRoute([
method: "post",
response: () => {
return {
success: true,
code: 0,
message: "操作成功",
data: {
list: [
{

View File

@@ -8,7 +8,8 @@ export default defineFakeRoute([
response: ({ body }) => {
if (body.username === "admin") {
return {
success: true,
code: 0,
message: "操作成功",
data: {
avatar: "https://avatars.githubusercontent.com/u/44761321",
username: "admin",
@@ -24,7 +25,8 @@ export default defineFakeRoute([
};
} else {
return {
success: true,
code: 0,
message: "操作成功",
data: {
avatar: "https://avatars.githubusercontent.com/u/52823142",
username: "common",

View File

@@ -33,7 +33,8 @@ export default defineFakeRoute([
method: "get",
response: () => {
return {
success: true,
code: 0,
message: "操作成功",
data: mapList()
};
}

View File

@@ -8,7 +8,8 @@ export default defineFakeRoute([
method: "get",
response: () => {
return {
success: true,
code: 0,
message: "操作成功",
data: {
avatar: "https://avatars.githubusercontent.com/u/44761321",
username: "admin",
@@ -46,7 +47,8 @@ export default defineFakeRoute([
}
];
return {
success: true,
code: 0,
message: "操作成功",
data: {
list,
total: list.length, // 总条目数

View File

@@ -8,7 +8,8 @@ export default defineFakeRoute([
response: ({ body }) => {
if (body.refreshToken) {
return {
success: true,
code: 0,
message: "操作成功",
data: {
accessToken: "eyJhbGciOiJIUzUxMiJ9.newAdmin",
refreshToken: "eyJhbGciOiJIUzUxMiJ9.newAdminRefresh",
@@ -18,7 +19,8 @@ export default defineFakeRoute([
};
} else {
return {
success: false,
code: 10001,
message: "请求参数缺失或格式不正确",
data: {}
};
}

View File

@@ -50,7 +50,8 @@ export default defineFakeRoute([
if (body.phone) list = list.filter(item => item.phone === body.phone);
if (body.deptId) list = list.filter(item => item.dept.id === body.deptId);
return {
success: true,
code: 0,
message: "操作成功",
data: {
list,
total: list.length, // 总条目数
@@ -66,7 +67,8 @@ export default defineFakeRoute([
method: "get",
response: () => {
return {
success: true,
code: 0,
message: "操作成功",
data: [
{ id: 1, name: "超级管理员" },
{ id: 2, name: "普通角色" }
@@ -82,18 +84,21 @@ export default defineFakeRoute([
if (body.userId) {
if (body.userId == 1) {
return {
success: true,
code: 0,
message: "操作成功",
data: [1]
};
} else if (body.userId == 2) {
return {
success: true,
code: 0,
message: "操作成功",
data: [2]
};
}
} else {
return {
success: false,
code: 10001,
message: "请求参数缺失或格式不正确",
data: []
};
}
@@ -130,7 +135,8 @@ export default defineFakeRoute([
);
if (body.code) list = list.filter(item => item.code === body.code);
return {
success: true,
code: 0,
message: "操作成功",
data: {
list,
total: list.length, // 总条目数
@@ -146,7 +152,8 @@ export default defineFakeRoute([
method: "post",
response: () => {
return {
success: true,
code: 0,
message: "操作成功",
data: [
// 外部页面
{
@@ -350,7 +357,8 @@ export default defineFakeRoute([
response: ({ body }) => {
if (body.id == 1) {
return {
success: true,
code: 0,
message: "操作成功",
data: [
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 200, 201,
202, 203, 204, 205, 300, 301, 302, 303, 304, 400, 401, 402, 403,
@@ -359,7 +367,8 @@ export default defineFakeRoute([
};
} else if (body.id == 2) {
return {
success: true,
code: 0,
message: "操作成功",
data: [
100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 404, 500,
501, 502, 503
@@ -374,7 +383,8 @@ export default defineFakeRoute([
method: "post",
response: () => {
return {
success: true,
code: 0,
message: "操作成功",
data: [
// 外部页面
{
@@ -1255,7 +1265,8 @@ export default defineFakeRoute([
method: "post",
response: () => {
return {
success: true,
code: 0,
message: "操作成功",
data: [
{
name: "杭州总公司",
@@ -1418,7 +1429,8 @@ export default defineFakeRoute([
];
list = list.filter(item => item.username.includes(body?.username));
return {
success: true,
code: 0,
message: "操作成功",
data: {
list,
total: list.length, // 总条目数
@@ -1462,7 +1474,8 @@ export default defineFakeRoute([
String(item.status).includes(String(body?.status))
);
return {
success: true,
code: 0,
message: "操作成功",
data: {
list,
total: list.length, // 总条目数
@@ -1508,7 +1521,8 @@ export default defineFakeRoute([
String(item.status).includes(String(body?.status))
);
return {
success: true,
code: 0,
message: "操作成功",
data: {
list,
total: list.length, // 总条目数
@@ -1566,7 +1580,8 @@ export default defineFakeRoute([
];
list = list.filter(item => item.module.includes(body?.module));
return {
success: true,
code: 0,
message: "操作成功",
data: {
list,
total: list.length, // 总条目数
@@ -1601,7 +1616,8 @@ export default defineFakeRoute([
"Content-Length": 17019
},
responseBody: {
success: true,
code: 0,
message: "操作成功",
data: [
{
parentId: 0,

View File

@@ -54,29 +54,29 @@
"@logicflow/extension": "^1.2.28",
"@pureadmin/descriptions": "^1.2.1",
"@pureadmin/table": "^3.3.0",
"@pureadmin/utils": "^2.6.3",
"@pureadmin/utils": "^2.6.4",
"@vue-flow/background": "^1.3.2",
"@vue-flow/core": "^1.48.0",
"@vueuse/core": "^14.1.0",
"@vue-flow/core": "^1.48.2",
"@vueuse/core": "^14.2.0",
"@vueuse/motion": "^3.0.3",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "^5.1.12",
"@zxcvbn-ts/core": "^3.0.4",
"animate.css": "^4.1.1",
"axios": "^1.13.2",
"axios": "^1.13.4",
"china-area-data": "^5.0.1",
"codemirror": "^5.65.20",
"codemirror-editor-vue3": "^2.8.0",
"cropperjs": "^1.6.2",
"dayjs": "^1.11.19",
"deep-chat": "^2.3.0",
"deep-chat": "^2.4.2",
"echarts": "^6.0.0",
"el-table-infinite-scroll": "^3.0.8",
"element-plus": "^2.12.0",
"element-plus": "^2.13.2",
"highlight.js": "^11.11.1",
"intro.js": "^7.2.0",
"js-cookie": "^3.0.5",
"jsbarcode": "^3.12.1",
"jsbarcode": "^3.12.3",
"localforage": "^1.10.0",
"mint-filter": "^4.0.3",
"mitt": "^3.0.1",
@@ -84,28 +84,28 @@
"nprogress": "^0.2.0",
"path-browserify": "^1.0.1",
"pinia": "^3.0.4",
"pinyin-pro": "^3.27.0",
"pinyin-pro": "^3.28.0",
"plus-pro-components": "^0.1.30",
"qrcode": "^1.5.4",
"qs": "^6.14.0",
"qs": "^6.14.1",
"responsive-storage": "^2.2.0",
"sortablejs": "^1.15.6",
"swiper": "^12.0.3",
"swiper": "^12.1.0",
"typeit": "^8.8.7",
"v-contextmenu": "^3.2.0",
"v3-infinite-loading": "^1.3.2",
"vditor": "^3.11.2",
"version-rocket": "^1.7.4",
"vue": "^3.5.25",
"vue-i18n": "https://pkg.pr.new/vue-i18n@2337",
"vue": "^3.5.27",
"vue-i18n": "^11.2.8",
"vue-json-pretty": "^2.6.0",
"vue-pdf-embed": "^2.1.3",
"vue-router": "^4.6.3",
"vue-router": "^5.0.2",
"vue-tippy": "^6.7.1",
"vue-types": "^6.0.0",
"vue-virtual-scroller": "2.0.0-beta.8",
"vue-waterfall-plugin-next": "^2.6.9",
"vue3-danmaku": "^1.6.6",
"vue3-danmaku": "^1.6.7",
"vue3-puzzle-vcode": "^1.1.7",
"vuedraggable": "^4.1.0",
"vxe-table": "4.6.25",
@@ -114,12 +114,12 @@
"xlsx": "^0.18.5"
},
"devDependencies": {
"@commitlint/cli": "^20.2.0",
"@commitlint/config-conventional": "^20.2.0",
"@commitlint/types": "^20.2.0",
"@eslint/js": "^9.39.1",
"@commitlint/cli": "^20.4.1",
"@commitlint/config-conventional": "^20.4.1",
"@commitlint/types": "^20.4.0",
"@eslint/js": "^9.39.2",
"@faker-js/faker": "^10.2.0",
"@iconify/json": "^2.2.416",
"@iconify/json": "^2.2.435",
"@iconify/vue": "4.2.0",
"@intlify/unplugin-vue-i18n": "^11.0.3",
"@tailwindcss/vite": "^4.1.18",
@@ -127,44 +127,44 @@
"@types/dagre": "^0.7.53",
"@types/intro.js": "^5.1.5",
"@types/js-cookie": "^3.0.6",
"@types/node": "^20.19.26",
"@types/node": "^20.19.31",
"@types/nprogress": "^0.2.3",
"@types/path-browserify": "^1.0.3",
"@types/qrcode": "^1.5.6",
"@types/qs": "^6.14.0",
"@types/sortablejs": "^1.15.9",
"@vitejs/plugin-vue": "^6.0.3",
"@vitejs/plugin-vue-jsx": "^5.1.3",
"@vitejs/plugin-vue": "^6.0.4",
"@vitejs/plugin-vue-jsx": "^5.1.4",
"boxen": "^8.0.1",
"code-inspector-plugin": "^1.3.0",
"code-inspector-plugin": "^1.4.1",
"cssnano": "^7.1.2",
"dagre": "^0.8.5",
"eslint": "^9.39.1",
"eslint": "^9.39.2",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.4",
"eslint-plugin-vue": "^10.6.2",
"eslint-plugin-prettier": "^5.5.5",
"eslint-plugin-vue": "^10.7.0",
"gradient-string": "^3.0.0",
"husky": "^9.1.7",
"lint-staged": "^16.2.7",
"postcss": "^8.5.6",
"postcss-html": "^1.8.0",
"postcss-html": "^1.8.1",
"postcss-load-config": "^6.0.1",
"postcss-scss": "^4.0.9",
"prettier": "^3.7.4",
"prettier": "^3.8.1",
"rimraf": "^6.1.2",
"rollup-plugin-visualizer": "^6.0.5",
"sass": "^1.95.1",
"stylelint": "^16.26.1",
"stylelint-config-recess-order": "^7.4.0",
"sass": "^1.97.3",
"stylelint": "^17.1.1",
"stylelint-config-recess-order": "^7.6.0",
"stylelint-config-recommended-vue": "^1.6.1",
"stylelint-config-standard-scss": "^14.0.0",
"stylelint-config-standard-scss": "^17.0.0",
"stylelint-prettier": "^5.0.3",
"svgo": "^4.0.0",
"tailwindcss": "^4.1.17",
"tailwindcss": "^4.1.18",
"typescript": "^5.9.3",
"typescript-eslint": "^8.49.0",
"unplugin-icons": "^22.5.0",
"vite": "8.0.0-beta.8",
"typescript-eslint": "^8.54.0",
"unplugin-icons": "^23.0.1",
"vite": "^7.3.1",
"vite-plugin-cdn-import": "^1.0.1",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-fake-server": "^2.2.2",
@@ -172,7 +172,7 @@
"vite-plugin-router-warn": "^2.0.0",
"vite-svg-loader": "^5.1.0",
"vue-eslint-parser": "^10.2.0",
"vue-tsc": "^3.1.8"
"vue-tsc": "^3.2.4"
},
"engines": {
"node": "^20.19.0 || >=22.13.0",

3816
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -7,11 +7,13 @@
</template>
<script lang="ts">
import { defineComponent } from "vue";
import { useRouter } from "vue-router";
import { useGlobal } from "@pureadmin/utils";
import { checkVersion } from "version-rocket";
import { defineComponent, computed } from "vue";
import { ElConfigProvider } from "element-plus";
import { ReDialog } from "@/components/ReDialog";
import { ReDrawer } from "@/components/ReDrawer";
import { ReDialog, closeAllDialog } from "@/components/ReDialog";
import { ReDrawer, closeAllDrawer } from "@/components/ReDrawer";
import en from "element-plus/es/locale/lang/en";
import zhCn from "element-plus/es/locale/lang/zh-cn";
import plusEn from "plus-pro-components/es/locale/lang/en";
@@ -24,12 +26,23 @@ export default defineComponent({
ReDialog,
ReDrawer
},
computed: {
currentLocale() {
return this.$storage.locale?.locale === "zh"
setup() {
const router = useRouter();
const { $storage } = useGlobal<GlobalPropertiesApi>();
const currentLocale = computed(() => {
return $storage.locale?.locale === "zh"
? { ...zhCn, ...plusZhCn }
: { ...en, ...plusEn };
}
});
router.beforeEach(() => {
closeAllDialog();
closeAllDrawer();
});
return {
currentLocale
};
},
beforeCreate() {
const { version, name: title } = __APP_INFO__.pkg;

View File

@@ -1,7 +1,8 @@
import { http } from "@/utils/http";
type Result = {
success: boolean;
code: number;
message: string;
data?: {
/** 列表数据 */
list: Array<any>;

View File

@@ -1,7 +1,8 @@
import { http } from "@/utils/http";
type Result = {
success: boolean;
code: number;
message: string;
data: Array<any>;
};
@@ -14,7 +15,7 @@ export const mapJson = (params?: object) => {
export const formUpload = data => {
return http.request<Result>(
"post",
"https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b",
"https://pureadmin.free.beeceptor.com/images",
{ data },
{
headers: {

View File

@@ -1,7 +1,8 @@
import { http } from "@/utils/http";
type Result = {
success: boolean;
code: number;
message: string;
data: Array<any>;
};

View File

@@ -1,12 +1,14 @@
import { http } from "@/utils/http";
type Result = {
success: boolean;
code: number;
message: string;
data?: Array<any>;
};
type ResultTable = {
success: boolean;
code: number;
message: string;
data?: {
/** 列表数据 */
list: Array<any>;

View File

@@ -1,7 +1,8 @@
import { http } from "@/utils/http";
export type UserResult = {
success: boolean;
code: number;
message: string;
data: {
/** 头像 */
avatar: string;
@@ -23,7 +24,8 @@ export type UserResult = {
};
export type RefreshTokenResult = {
success: boolean;
code: number;
message: string;
data: {
/** `token` */
accessToken: string;
@@ -50,12 +52,14 @@ export type UserInfo = {
};
export type UserInfoResult = {
success: boolean;
code: number;
message: string;
data: UserInfo;
};
type ResultTable = {
success: boolean;
code: number;
message: string;
data?: {
/** 列表数据 */
list: Array<any>;

View File

@@ -92,7 +92,8 @@ onBeforeMount(() => {
// 获取模拟车辆信息
mapJson()
.then(({ data }) => {
.then(({ code, data }) => {
if (code === 0) {
const points: object = data.map(v => {
return {
lnglat: [v.lng, v.lat],
@@ -100,6 +101,7 @@ onBeforeMount(() => {
};
});
if (MarkerCluster) MarkerCluster.setData(points);
}
})
.catch(err => {
console.log("err:", err);

View File

@@ -1,5 +1,5 @@
import Sortable from "sortablejs";
import { transformI18n } from "@/plugins/i18n";
import { $t, transformI18n } from "@/plugins/i18n";
import { useEpThemeStoreHook } from "@/store/modules/epTheme";
import {
type PropType,
@@ -30,7 +30,7 @@ const props = {
/** 头部最左边的标题 */
title: {
type: String,
default: "列表"
default: $t("tableBar.pureList")
},
/** 对于树形表格如果想启用展开和折叠功能传入当前表格的ref即可 */
tableRef: {
@@ -169,19 +169,19 @@ export default defineComponent({
style={getDropdownItemStyle.value("large")}
onClick={() => (size.value = "large")}
>
{transformI18n($t("tableBar.pureLarge"))}
</el-dropdown-item>
<el-dropdown-item
style={getDropdownItemStyle.value("default")}
onClick={() => (size.value = "default")}
>
{transformI18n($t("tableBar.pureDefault"))}
</el-dropdown-item>
<el-dropdown-item
style={getDropdownItemStyle.value("small")}
onClick={() => (size.value = "small")}
>
{transformI18n($t("tableBar.pureSmall"))}
</el-dropdown-item>
</el-dropdown-menu>
)
@@ -245,7 +245,9 @@ export default defineComponent({
reference: () => (
<SettingIcon
class={["w-[16px]", iconClass.value]}
v-tippy={rendTippyProps("列设置")}
v-tippy={rendTippyProps(
transformI18n($t("tableBar.pureColumnSettings"))
)}
/>
)
};
@@ -268,7 +270,7 @@ export default defineComponent({
{slots?.title ? (
slots.title()
) : (
<p class="font-bold truncate">{props.title}</p>
<p class="font-bold truncate">{transformI18n(props.title)}</p>
)}
<div class="flex items-center justify-around">
{slots?.buttons ? (
@@ -282,7 +284,9 @@ export default defineComponent({
transform: isExpandAll.value ? "none" : "rotate(-90deg)"
}}
v-tippy={rendTippyProps(
isExpandAll.value ? "折叠" : "展开"
isExpandAll.value
? transformI18n($t("tableBar.pureCollapse"))
: transformI18n($t("tableBar.pureExpand"))
)}
onClick={() => onExpand()}
/>
@@ -295,14 +299,18 @@ export default defineComponent({
iconClass.value,
loading.value ? "animate-spin" : ""
]}
v-tippy={rendTippyProps("刷新")}
v-tippy={rendTippyProps(
transformI18n($t("tableBar.pureRefresh"))
)}
onClick={() => onReFresh()}
/>
<el-divider direction="vertical" />
<el-dropdown
v-slots={dropdown}
trigger="click"
v-tippy={rendTippyProps("密度")}
v-tippy={rendTippyProps(
transformI18n($t("tableBar.pureDensity"))
)}
>
<CollapseIcon class={["w-[16px]", iconClass.value]} />
</el-dropdown>
@@ -318,13 +326,13 @@ export default defineComponent({
<div class={[topClass.value]}>
<el-checkbox
class="-mr-1!"
label="列展示"
label={transformI18n($t("tableBar.pureColumnDisplay"))}
v-model={checkAll.value}
indeterminate={isIndeterminate.value}
onChange={value => handleCheckAllChange(value)}
/>
<el-button type="primary" link onClick={() => onReset()}>
{transformI18n($t("tableBar.pureReset"))}
</el-button>
</div>
@@ -382,7 +390,11 @@ export default defineComponent({
<iconifyIconOffline
class={["w-[16px]", iconClass.value]}
icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
v-tippy={
isFullscreen.value
? transformI18n($t("tableBar.pureExitFullScreen"))
: transformI18n($t("tableBar.pureFullScreen"))
}
onClick={() => onFullscreen()}
/>
</div>

View File

@@ -5,14 +5,10 @@ import {
ref,
unref,
nextTick,
computed
computed,
useTemplateRef
} from "vue";
import {
tryOnMounted,
tryOnUnmounted,
templateRef,
useDebounceFn
} from "@vueuse/core";
import { tryOnMounted, tryOnUnmounted, useDebounceFn } from "@vueuse/core";
import * as utilsMethods from "./utils";
const { animationFrame, copyObj } = utilsMethods;
animationFrame();
@@ -62,17 +58,14 @@ if (props.classOption["key"] === undefined) {
props.classOption["key"] = 0;
}
const wrap = templateRef<HTMLElement | null>(
`wrap${props.classOption["key"]}`,
null
const wrap = useTemplateRef<HTMLElement | null>(
`wrap${props.classOption["key"]}`
);
const slotList = templateRef<HTMLElement | null>(
`slotList${props.classOption["key"]}`,
null
const slotList = useTemplateRef<HTMLElement | null>(
`slotList${props.classOption["key"]}`
);
const realBox = templateRef<HTMLElement | null>(
`realBox${props.classOption["key"]}`,
null
const realBox = useTemplateRef<HTMLElement | null>(
`realBox${props.classOption["key"]}`
);
const leftSwitchState = computed(() => {

View File

@@ -1,5 +1,5 @@
import Sortable from "sortablejs";
import { transformI18n } from "@/plugins/i18n";
import { $t, transformI18n } from "@/plugins/i18n";
import { useEpThemeStoreHook } from "@/store/modules/epTheme";
import { delay, cloneDeep, getKeyList } from "@pureadmin/utils";
import {
@@ -24,7 +24,7 @@ const props = {
/** 头部最左边的标题 */
title: {
type: String,
default: "列表"
default: $t("tableBar.pureList")
},
vxeTableRef: {
type: Object as PropType<any>
@@ -161,19 +161,19 @@ export default defineComponent({
style={getDropdownItemStyle.value("medium")}
onClick={() => changeSize("medium")}
>
{transformI18n($t("tableBar.pureLarge"))}
</el-dropdown-item>
<el-dropdown-item
style={getDropdownItemStyle.value("small")}
onClick={() => changeSize("small")}
>
{transformI18n($t("tableBar.pureDefault"))}
</el-dropdown-item>
<el-dropdown-item
style={getDropdownItemStyle.value("mini")}
onClick={() => changeSize("mini")}
>
{transformI18n($t("tableBar.pureSmall"))}
</el-dropdown-item>
</el-dropdown-menu>
)
@@ -238,7 +238,9 @@ export default defineComponent({
reference: () => (
<SettingIcon
class={["w-[16px]", iconClass.value]}
v-tippy={rendTippyProps("列设置")}
v-tippy={rendTippyProps(
transformI18n($t("tableBar.pureColumnSettings"))
)}
/>
)
};
@@ -261,7 +263,7 @@ export default defineComponent({
{slots?.title ? (
slots.title()
) : (
<p class="font-bold truncate">{props.title}</p>
<p class="font-bold truncate">{transformI18n(props.title)}</p>
)}
<div class="flex items-center justify-around">
{slots?.buttons ? (
@@ -275,7 +277,9 @@ export default defineComponent({
transform: isExpandAll.value ? "none" : "rotate(-90deg)"
}}
v-tippy={rendTippyProps(
isExpandAll.value ? "折叠" : "展开"
isExpandAll.value
? transformI18n($t("tableBar.pureCollapse"))
: transformI18n($t("tableBar.pureExpand"))
)}
onClick={() => onExpand()}
/>
@@ -288,14 +292,18 @@ export default defineComponent({
iconClass.value,
loading.value ? "animate-spin" : ""
]}
v-tippy={rendTippyProps("刷新")}
v-tippy={rendTippyProps(
transformI18n($t("tableBar.pureRefresh"))
)}
onClick={() => onReFresh()}
/>
<el-divider direction="vertical" />
<el-dropdown
v-slots={dropdown}
trigger="click"
v-tippy={rendTippyProps("密度")}
v-tippy={rendTippyProps(
transformI18n($t("tableBar.pureDensity"))
)}
>
<CollapseIcon class={["w-[16px]", iconClass.value]} />
</el-dropdown>
@@ -311,13 +319,13 @@ export default defineComponent({
<div class={[topClass.value]}>
<el-checkbox
class="-mr-1!"
label="列展示"
label={transformI18n($t("tableBar.pureColumnDisplay"))}
v-model={checkAll.value}
indeterminate={isIndeterminate.value}
onChange={value => handleCheckAllChange(value)}
/>
<el-button type="primary" link onClick={() => onReset()}>
{transformI18n($t("tableBar.pureReset"))}
</el-button>
</div>
@@ -373,7 +381,11 @@ export default defineComponent({
<iconifyIconOffline
class={["w-[16px]", iconClass.value]}
icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
v-tippy={
isFullscreen.value
? transformI18n($t("tableBar.pureExitFullScreen"))
: transformI18n($t("tableBar.pureFullScreen"))
}
onClick={() => onFullscreen()}
/>
</div>

View File

@@ -53,9 +53,11 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
<LaySearch id="header-search" />
<!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click">
<GlobalizationIcon
class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
/>
<div
class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
>
<IconifyIconOffline :icon="GlobalizationIcon" />
</div>
<template #dropdown>
<el-dropdown-menu class="translation">
<el-dropdown-item
@@ -113,7 +115,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
</template>
</el-dropdown>
<span
class="set-icon navbar-bg-hover"
class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
:title="t('buttons.pureOpenSystemSet')"
@click="onPanel"
>
@@ -172,7 +174,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
}
.translation {
::v-deep(.el-dropdown-menu__item) {
:deep(.el-dropdown-menu__item) {
padding: 5px 40px;
}
@@ -190,7 +192,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
.logout {
width: 120px;
::v-deep(.el-dropdown-menu__item) {
:deep(.el-dropdown-menu__item) {
display: inline-flex;
flex-wrap: wrap;
min-width: 100%;

View File

@@ -8,6 +8,10 @@ defineProps({
noticeItem: {
type: Object as PropType<ListItem>,
default: () => {}
},
isLast: {
type: Boolean,
default: false
}
});
@@ -49,7 +53,11 @@ function hoverDescription(event, description) {
<template>
<div
class="notice-container border-0 border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
:class="[
'notice-container',
'border-0 border-solid border-[#f0f0f0] dark:border-[#303030]',
{ 'border-b': !isLast }
]"
>
<el-avatar
v-if="noticeItem.avatar"
@@ -119,8 +127,6 @@ function hoverDescription(event, description) {
justify-content: space-between;
padding: 12px 0;
// border-bottom: 1px solid #f0f0f0;
.notice-container-avatar {
margin-right: 16px;
background: #fff;

View File

@@ -18,7 +18,12 @@ defineProps({
<template>
<div v-if="list.length">
<NoticeItem v-for="(item, index) in list" :key="index" :noticeItem="item" />
<NoticeItem
v-for="(item, index) in list"
:key="index"
:noticeItem="item"
:isLast="index === list.length - 1"
/>
</div>
<el-empty v-else :description="transformI18n(emptyText)" />
</template>

View File

@@ -3,32 +3,53 @@ import { useI18n } from "vue-i18n";
import { ref, computed } from "vue";
import { noticesData } from "./data";
import NoticeList from "./components/NoticeList.vue";
import BellIcon from "~icons/ep/bell";
import BellIcon from "~icons/lucide/bell";
import ArrowRightIcon from "~icons/ri/arrow-right-s-line";
const { t } = useI18n();
const noticesNum = ref(0);
const dropdownRef = ref();
const notices = ref(noticesData);
const activeKey = ref(noticesData[0]?.key);
notices.value.map(v => (noticesNum.value += v.list.length));
const getLabel = computed(
() => item =>
t(item.name) + (item.list.length > 0 ? `(${item.list.length})` : "")
);
const currentNoticeHasData = computed(() => {
const currentNotice = notices.value.find(
item => item.key === activeKey.value
);
return currentNotice && currentNotice.list.length > 0;
});
const hasAnyNoticeData = computed(() => {
return notices.value.some(
item => Array.isArray(item.list) && item.list.length > 0
);
});
const onWatchMore = () => {
dropdownRef.value.handleClose();
};
const onMarkAsRead = () => {
const currentNotice = notices.value.find(
item => item.key === activeKey.value
);
if (currentNotice) {
currentNotice.list = [];
}
};
</script>
<template>
<el-dropdown trigger="click" placement="bottom-end">
<el-dropdown ref="dropdownRef" trigger="click" placement="bottom-end">
<span
:class="[
'dropdown-badge',
'navbar-bg-hover',
'select-none',
Number(noticesNum) !== 0 && 'mr-[10px]'
]"
:class="['dropdown-badge', 'navbar-bg-hover', 'select-none', 'mr-[7px]']"
>
<el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
<el-badge is-dot :hidden="!hasAnyNoticeData">
<span class="header-notice-icon">
<IconifyIconOffline :icon="BellIcon" />
</span>
@@ -50,7 +71,7 @@ const getLabel = computed(
<span v-else>
<template v-for="item in notices" :key="item.key">
<el-tab-pane :label="getLabel(item)" :name="`${item.key}`">
<el-scrollbar max-height="330px">
<el-scrollbar max-height="345px">
<div class="noticeList-container">
<NoticeList :list="item.list" :emptyText="item.emptyText" />
</div>
@@ -59,12 +80,54 @@ const getLabel = computed(
</template>
</span>
</el-tabs>
<div
v-if="currentNoticeHasData"
class="border-t border-t-(--el-border-color-light) text-sm"
>
<div class="flex-bc m-1">
<el-button type="primary" size="small" text @click="onWatchMore">
{{ t("buttons.pureWatchMore") }}
<IconifyIconOffline :icon="ArrowRightIcon" />
</el-button>
<el-button type="primary" size="small" text @click="onMarkAsRead">
{{ t("buttons.pureMarkAsRead") }}
</el-button>
</div>
</div>
</el-dropdown-menu>
</template>
</el-dropdown>
</template>
<style lang="scss" scoped>
/* ”铃铛“摇晃衰减动画 */
@keyframes pure-bell-ring {
0%,
100% {
transform-origin: top;
}
15% {
transform: rotateZ(10deg);
}
30% {
transform: rotateZ(-10deg);
}
45% {
transform: rotateZ(5deg);
}
60% {
transform: rotateZ(-5deg);
}
75% {
transform: rotateZ(2deg);
}
}
.dropdown-badge {
display: flex;
align-items: center;
@@ -74,7 +137,13 @@ const getLabel = computed(
cursor: pointer;
.header-notice-icon {
font-size: 18px;
font-size: 16px;
}
&:hover {
.header-notice-icon svg {
animation: pure-bell-ring 1s both;
}
}
}

View File

@@ -51,7 +51,7 @@ onBeforeUnmount(() => {
<div class="right-panel-background" />
<div ref="target" class="right-panel bg-bg_color">
<div
class="project-configuration border-0 border-b-[1px] border-solid border-[var(--pure-border-color)]"
class="flex-bc py-3 px-5 border-0 border-l border-solid border-(--pure-border-color)"
>
<h4 class="dark:text-white">
{{ t("panel.pureSystemSet") }}
@@ -73,12 +73,14 @@ onBeforeUnmount(() => {
/>
</span>
</div>
<el-scrollbar>
<el-scrollbar
class="border-y border-l border-r-0 border-solid border-(--pure-border-color) h-[calc(100vh-104px)]!"
>
<slot />
</el-scrollbar>
<div
class="flex justify-end p-3 border-0 border-t-[1px] border-solid border-[var(--pure-border-color)]"
class="flex justify-end p-3 border-0 border-l border-solid border-(--pure-border-color)"
>
<el-button
v-tippy="{
@@ -99,10 +101,6 @@ onBeforeUnmount(() => {
</template>
<style lang="scss" scoped>
:deep(.el-scrollbar) {
height: calc(100vh - 110px);
}
.right-panel-background {
position: fixed;
top: 0;
@@ -139,11 +137,4 @@ onBeforeUnmount(() => {
transform: translate(0);
}
}
.project-configuration {
display: flex;
align-items: center;
justify-content: space-between;
padding: 14px 20px;
}
</style>

View File

@@ -11,7 +11,7 @@ function handleSearch() {
<template>
<div>
<div
class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover"
class="search-container w-[40px] h-[48px] flex-c cursor-pointer navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
@click="handleSearch"
>
<IconifyIconOffline icon="ri/search-line" />

View File

@@ -345,8 +345,8 @@ onUnmounted(() => removeMatchMedia);
@click="setLayoutThemeColor(item.themeColor)"
>
<el-icon
style="margin: 0.1em 0.1em 0 0"
:size="17"
class="mt-px"
:size="20"
:color="getThemeColor(item.themeColor)"
>
<IconifyIconOffline :icon="Check" />
@@ -538,17 +538,24 @@ onUnmounted(() => removeMatchMedia);
}
.theme-color {
height: 20px;
display: flex;
gap: 8px;
margin-top: 8px;
li {
float: left;
height: 20px;
margin-right: 8px;
position: relative;
width: 21px;
height: 21px;
cursor: pointer;
border-radius: 4px;
box-shadow: rgb(0 0 0 / 15%) 0 0 0 1px inset;
transition: all 0.2s ease;
&:nth-child(1) {
border: 1px solid #ddd;
&:hover {
box-shadow:
rgb(0 0 0 / 25%) 0 0 0 1px inset,
0 2px 4px rgb(0 0 0 / 15%);
transform: scale(1.1);
}
}
}

View File

@@ -83,9 +83,11 @@ onMounted(() => {
<LaySearch id="header-search" />
<!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click">
<GlobalizationIcon
class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
/>
<div
class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
>
<IconifyIconOffline :icon="GlobalizationIcon" />
</div>
<template #dropdown>
<el-dropdown-menu class="translation">
<el-dropdown-item
@@ -141,7 +143,7 @@ onMounted(() => {
</template>
</el-dropdown>
<span
class="set-icon navbar-bg-hover"
class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
:title="t('buttons.pureOpenSystemSet')"
@click="onPanel"
>
@@ -157,7 +159,7 @@ onMounted(() => {
}
.translation {
::v-deep(.el-dropdown-menu__item) {
:deep(.el-dropdown-menu__item) {
padding: 5px 40px;
}
@@ -175,7 +177,7 @@ onMounted(() => {
.logout {
width: 120px;
::v-deep(.el-dropdown-menu__item) {
:deep(.el-dropdown-menu__item) {
display: inline-flex;
flex-wrap: wrap;
min-width: 100%;

View File

@@ -104,9 +104,11 @@ watch(
<LaySearch id="header-search" />
<!-- 国际化 -->
<el-dropdown id="header-translation" trigger="click">
<GlobalizationIcon
class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-hidden"
/>
<div
class="globalization-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
>
<IconifyIconOffline :icon="GlobalizationIcon" />
</div>
<template #dropdown>
<el-dropdown-menu class="translation">
<el-dropdown-item
@@ -162,7 +164,7 @@ watch(
</template>
</el-dropdown>
<span
class="set-icon navbar-bg-hover"
class="set-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
:title="t('buttons.pureOpenSystemSet')"
@click="onPanel"
>
@@ -178,7 +180,7 @@ watch(
}
.translation {
::v-deep(.el-dropdown-menu__item) {
:deep(.el-dropdown-menu__item) {
padding: 5px 40px;
}
@@ -196,7 +198,7 @@ watch(
.logout {
width: 120px;
::v-deep(.el-dropdown-menu__item) {
:deep(.el-dropdown-menu__item) {
display: inline-flex;
flex-wrap: wrap;
min-width: 100%;

View File

@@ -24,7 +24,10 @@ watch(
</script>
<template>
<span class="fullscreen-icon navbar-bg-hover" @click="toggle">
<span
class="fullscreen-icon navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
@click="toggle"
>
<IconifyIconOffline :icon="screenIcon" />
</span>
</template>

View File

@@ -209,18 +209,26 @@ function initRouter() {
});
} else {
return new Promise(resolve => {
getAsyncRoutes().then(({ data }) => {
getAsyncRoutes().then(({ code, data }) => {
if (code === 0) {
handleAsyncRoutes(cloneDeep(data));
storageLocal().setItem(key, data);
resolve(router);
} else {
resolve(router);
}
});
});
}
} else {
return new Promise(resolve => {
getAsyncRoutes().then(({ data }) => {
getAsyncRoutes().then(({ code, data }) => {
if (code === 0) {
handleAsyncRoutes(cloneDeep(data));
resolve(router);
} else {
resolve(router);
}
});
});
}

View File

@@ -80,8 +80,12 @@ export const useUserStore = defineStore("pure-user", {
return new Promise<UserResult>((resolve, reject) => {
getLogin(data)
.then(data => {
if (data?.success) setToken(data.data);
if (data.code === 0) {
setToken(data.data);
resolve(data);
} else {
reject(data.message);
}
})
.catch(error => {
reject(error);
@@ -103,9 +107,11 @@ export const useUserStore = defineStore("pure-user", {
return new Promise<RefreshTokenResult>((resolve, reject) => {
refreshTokenApi(data)
.then(data => {
if (data) {
if (data.code === 0) {
setToken(data.data);
resolve(data);
} else {
reject(data.message);
}
})
.catch(error => {

View File

@@ -135,17 +135,6 @@ html.dark {
}
}
/* 系统配置面板 */
.right-panel-items {
.el-divider__text {
--el-bg-color: var(--el-bg-color);
}
.el-divider--horizontal {
border-top: none;
}
}
/* 表单设计器 */
.design-form {
.el-main.config-content,

View File

@@ -35,3 +35,18 @@
.html-weakness {
filter: invert(80%);
}
/* 轻微缩小,再恢复原状的平滑缩放动画 */
@keyframes pure-scale-bounce {
0% {
transform: scale(1);
}
50% {
transform: scale(0.9);
}
100% {
transform: scale(1);
}
}

View File

@@ -34,12 +34,14 @@
}
.set-icon,
.fullscreen-icon {
.fullscreen-icon,
.globalization-icon {
display: flex;
align-items: center;
justify-content: center;
width: 40px;
height: 48px;
font-size: 16px;
cursor: pointer;
}
@@ -449,7 +451,7 @@
/* 搜索 */
.search-container,
/* 国际化 */
.globalization,
.globalization-icon,
/* 全屏 */
.fullscreen-icon,
/* 消息通知 */
@@ -468,12 +470,8 @@
color: var(--pure-theme-sub-menu-active-text);
}
.globalization {
width: 40px;
height: 48px;
padding: 11px;
.globalization-icon {
color: var(--pure-theme-sub-menu-active-text);
cursor: pointer;
outline: none;
}
@@ -630,7 +628,7 @@ body[layout="vertical"] {
/* 搜索 */
.search-container,
/* 国际化 */
.globalization,
.globalization-icon,
/* 全屏 */
.fullscreen-icon,
/* 消息通知 */

View File

@@ -42,5 +42,9 @@
}
@utility navbar-bg-hover {
@apply dark:text-white dark:hover:bg-[#242424]!;
@apply select-none dark:text-white dark:hover:bg-[#242424]!;
}
@utility animate-scale-bounce {
animation: pure-scale-bounce 0.3s ease-in-out;
}

View File

@@ -10,6 +10,8 @@ import type {
PureHttpRequestConfig
} from "./types.d";
import { stringify } from "qs";
import { message } from "@/utils/message";
import { $t, transformI18n } from "@/plugins/i18n";
import { getToken, formatToken } from "@/utils/auth";
import { useUserStoreHook } from "@/store/modules/user";
@@ -90,6 +92,13 @@ class PureHttp {
PureHttp.requests.forEach(cb => cb(token));
PureHttp.requests = [];
})
.catch(_err => {
PureHttp.requests = [];
useUserStoreHook().logOut();
message(transformI18n($t("login.pureLoginExpired")), {
type: "warning"
});
})
.finally(() => {
PureHttp.isRefreshing = false;
});

View File

@@ -171,7 +171,7 @@ onBeforeUnmount(() => {
</template>
<style lang="scss" scoped>
::v-deep(.el-upload-dragger) {
:deep(.el-upload-dragger) {
display: flex;
align-items: center;
height: 180px;

View File

@@ -1,7 +1,7 @@
<script setup lang="ts">
import { reactive, ref } from "vue";
import { formUpload } from "@/api/mock";
import { message } from "@/utils/message";
import { onMounted, reactive, ref } from "vue";
import { type UserInfo, getMine } from "@/api/user";
import type { FormInstance, FormRules } from "element-plus";
import ReCropperPreview from "@/components/ReCropperPreview";
@@ -73,8 +73,8 @@ const handleSubmitImage = () => {
files: new File([cropperBlob.value], "avatar")
});
formUpload(formData)
.then(({ success, data }) => {
if (success) {
.then(({ code }) => {
if (code === 0) {
message("更新头像成功", { type: "success" });
handleClose();
} else {
@@ -98,8 +98,11 @@ const onSubmit = async (formEl: FormInstance) => {
});
};
getMine().then(res => {
Object.assign(userInfos, res.data);
onMounted(async () => {
const { code, data } = await getMine();
if (code === 0) {
Object.assign(userInfos, data);
}
});
</script>

View File

@@ -55,11 +55,13 @@ const columns: TableColumnList = [
async function onSearch() {
loading.value = true;
const { data } = await getMineLogs();
const { code, data } = await getMineLogs();
if (code === 0) {
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
}
setTimeout(() => {
loading.value = false;

View File

@@ -1,9 +1,9 @@
<script setup lang="ts">
import { getMine } from "@/api/user";
import { useRouter } from "vue-router";
import { ref, onBeforeMount } from "vue";
import { ReText } from "@/components/ReText";
import Profile from "./components/Profile.vue";
import { ref, onMounted, onBeforeMount } from "vue";
import Preferences from "./components/Preferences.vue";
import SecurityLog from "./components/SecurityLog.vue";
import { useGlobal, deviceDetection } from "@pureadmin/utils";
@@ -61,8 +61,11 @@ const panes = [
];
const witchPane = ref("profile");
getMine().then(res => {
userInfo.value = res.data;
onMounted(async () => {
const { code, data } = await getMine();
if (code === 0) {
userInfo.value = data;
}
});
</script>

View File

@@ -56,13 +56,13 @@ onMounted(() => {
:avatars="{
default: {
styles: {
position: 'left',
position: 'start',
container: { marginLeft: '12px', marginRight: '5px' }
}
},
ai: {
src: 'https://xiaoxian521.github.io/hyperlink/img/vue-pure-admin/chatai/gemini.png',
styles: { position: 'left', avatar: { paddingTop: '6px' } }
styles: { position: 'start', avatar: { paddingTop: '6px' } }
}
}"
:speechToText="{
@@ -80,11 +80,11 @@ onMounted(() => {
},
svg: { styles: { default: { bottom: '0.35em', left: '0.35em' } } }
},
position: 'inside-right'
position: 'inside-end'
}
}"
:submitButtonStyles="{
position: 'outside-right',
position: 'outside-end',
submit: {
container: {
default: {

View File

@@ -89,7 +89,7 @@ onMounted(() => {
}
}"
:submitButtonStyles="{
position: 'outside-right',
position: 'outside-end',
submit: {
container: {
default: {

View File

@@ -46,7 +46,7 @@ onMounted(() => {
}
}"
:avatars="{
default: { styles: { position: 'left' } },
default: { styles: { position: 'start' } },
ai: { src: 'https://xiaoxian521.github.io/hyperlink/svg/openai.svg' }
}"
:submitButtonStyles="{

View File

@@ -22,7 +22,7 @@ onMounted(() => {
style="border-radius: 8px"
:speechToText="{
webSpeech: { language: 'zh-CN' },
button: { position: 'outside-left' }
button: { position: 'outside-start' }
}"
:textInput="{
placeholder: { text: '发送消息' }

View File

@@ -68,7 +68,7 @@ const shortcuts1 = [
const value3 = ref("");
const datePickerRef = ref();
const placement = ref("auto");
const placement = ref("auto") as any;
const checkTag = ref([
{
title: "auto", // https://popper.js.org/docs/v2/constructors/#options

View File

@@ -71,17 +71,17 @@ const settingTB: ContextProps = reactive({
.dv-a {
padding-top: 30vh;
color: rgba($color: dodgerblue, $alpha: 80%);
color: rgb(30 144 255 / 80%);
}
.dv-b {
padding-top: 10vh;
color: rgba($color: #000, $alpha: 80%);
color: rgb(0 0 0 / 80%);
}
.dv-c {
padding-top: 18vh;
color: rgba($color: #ce272d, $alpha: 80%);
color: rgb(206 39 45 / 80%);
}
}
</style>

View File

@@ -23,8 +23,8 @@ const submitForm = formEl => {
date: validateForm.date // 别的字段
});
formUpload(formData)
.then(({ success }) => {
if (success) {
.then(({ code }) => {
if (code === 0) {
message("提交成功", { type: "success" });
} else {
message("提交失败");

View File

@@ -143,7 +143,7 @@ const onDownload = () => {
class="pure-upload"
list-type="picture-card"
accept="image/jpeg,image/png,image/gif"
action="https://run.mocky.io/v3/3aa761d7-b0b3-4a03-96b3-6168d4f7467b"
action="https://pureadmin.free.beeceptor.com/images"
:limit="3"
:headers="{ Authorization: 'eyJhbGciOiJIUzUxMiJ9.admin' }"
:on-exceed="onExceed"
@@ -264,13 +264,13 @@ const onDownload = () => {
表格操作栏中的上传头像功能
</p>
<p class="text-[red] text-[12px] flex flex-auto items-center justify-end">
免责声明:上传接口使用免费开源的
免责声明:上传接口使用
<el-link
href="https://designer.mocky.io/"
href="https://beeceptor.com/"
target="_blank"
style="font-size: 16px; font-weight: 800"
>
&nbsp;Mocky&nbsp;
&nbsp;Beeceptor&nbsp;
</el-link>
<span class="font-bold text-[18x]"> 请不要上传重要信息 </span
>,如果造成任何损失,我们概不负责

View File

@@ -38,12 +38,14 @@ const dataLoading = ref(true);
const getCardListData = async () => {
try {
const { data } = await getCardList();
const { code, data } = await getCardList();
if (code === 0) {
productList.value = data.list;
pagination.value = {
...pagination.value,
total: data.list.length
};
}
} catch (e) {
console.log(e);
} finally {

View File

@@ -73,23 +73,21 @@ const onLogin = async (formEl: FormInstance | undefined) => {
username: ruleForm.username,
password: ruleForm.password
})
.then(res => {
if (res.success) {
.then(async () => {
// 获取后端路由
return initRouter().then(() => {
await initRouter();
disabled.value = true;
router
.push(getTopMenu(true).path)
.then(() => {
router.push(getTopMenu(true).path).then(() => {
message(t("login.pureLoginSuccess"), { type: "success" });
})
.finally(() => (disabled.value = false));
});
} else {
message(t("login.pureLoginFail"), { type: "error" });
}
})
.finally(() => (loading.value = false));
.catch(_err => {
message(t("login.pureLoginFail"), { type: "error" });
})
.finally(() => {
disabled.value = false;
loading.value = false;
});
}
});
};
@@ -360,7 +358,7 @@ watch(loginDay, value => {
}
.translation {
::v-deep(.el-dropdown-menu__item) {
:deep(.el-dropdown-menu__item) {
padding: 5px 40px;
}

View File

@@ -129,11 +129,13 @@ export function useRole(tableRef: Ref) {
async function onSearch() {
loading.value = true;
const { data } = await getLoginLogsList(toRaw(form));
const { code, data } = await getLoginLogsList(toRaw(form));
if (code === 0) {
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
}
setTimeout(() => {
loading.value = false;

View File

@@ -134,11 +134,13 @@ export function useRole(tableRef: Ref) {
async function onSearch() {
loading.value = true;
const { data } = await getOperationLogsList(toRaw(form));
const { code, data } = await getOperationLogsList(toRaw(form));
if (code === 0) {
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
}
setTimeout(() => {
loading.value = false;

View File

@@ -204,11 +204,13 @@ export function useRole(tableRef: Ref) {
async function onSearch() {
loading.value = true;
const { data } = await getSystemLogsList(toRaw(form));
const { code, data } = await getSystemLogsList(toRaw(form));
if (code === 0) {
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
}
setTimeout(() => {
loading.value = false;

View File

@@ -80,11 +80,13 @@ export function useRole() {
async function onSearch() {
loading.value = true;
const { data } = await getOnlineLogsList(toRaw(form));
const { code, data } = await getOnlineLogsList(toRaw(form));
if (code === 0) {
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
}
setTimeout(() => {
loading.value = false;

View File

@@ -1,4 +1,5 @@
<script setup lang="ts">
import { message } from "@/utils/message";
import { initRouter } from "@/router/utils";
import { storageLocal } from "@pureadmin/utils";
import { type CSSProperties, ref, computed } from "vue";
@@ -32,12 +33,13 @@ const options = [
function onChange() {
useUserStoreHook()
.loginByUsername({ username: username.value, password: "admin123" })
.then(res => {
if (res.success) {
.then(() => {
storageLocal().removeItem("async-routes");
usePermissionStoreHook().clearAllCachePage();
initRouter();
}
})
.catch(err => {
message(err, { type: "error" });
});
}
</script>

View File

@@ -74,7 +74,8 @@ export function useDept() {
async function onSearch() {
loading.value = true;
const { data } = await getDeptList(); // 这里是返回一维数组结构前端自行处理成树结构返回格式要求唯一id加父节点parentIdparentId取父节点id
const { code, data } = await getDeptList(); // 这里是返回一维数组结构前端自行处理成树结构返回格式要求唯一id加父节点parentIdparentId取父节点id
if (code === 0) {
let newData = data;
if (!isAllEmpty(form.name)) {
// 前端搜索部门名称
@@ -85,6 +86,8 @@ export function useDept() {
newData = newData.filter(item => item.status === form.status);
}
dataList.value = handleTree(newData); // 处理成树结构
}
setTimeout(() => {
loading.value = false;
}, 500);

View File

@@ -106,7 +106,8 @@ export function useMenu() {
async function onSearch() {
loading.value = true;
const { data } = await getMenuList(); // 这里是返回一维数组结构前端自行处理成树结构返回格式要求唯一id加父节点parentIdparentId取父节点id
const { code, data } = await getMenuList(); // 这里是返回一维数组结构前端自行处理成树结构返回格式要求唯一id加父节点parentIdparentId取父节点id
if (code === 0) {
let newData = data;
if (!isAllEmpty(form.title)) {
// 前端搜索菜单名称
@@ -115,6 +116,8 @@ export function useMenu() {
);
}
dataList.value = handleTree(newData); // 处理成树结构
}
setTimeout(() => {
loading.value = false;
}, 500);

View File

@@ -163,11 +163,13 @@ export function useRole(treeRef: Ref) {
async function onSearch() {
loading.value = true;
const { data } = await getRoleList(toRaw(form));
const { code, data } = await getRoleList(toRaw(form));
if (code === 0) {
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
}
setTimeout(() => {
loading.value = false;
@@ -229,8 +231,10 @@ export function useRole(treeRef: Ref) {
if (id) {
curRow.value = row;
isShow.value = true;
const { data } = await getRoleMenuIds({ id });
const { code, data } = await getRoleMenuIds({ id });
if (code === 0) {
treeRef.value.setCheckedKeys(data);
}
} else {
curRow.value = null;
isShow.value = false;
@@ -268,9 +272,11 @@ export function useRole(treeRef: Ref) {
onMounted(async () => {
onSearch();
const { data } = await getRoleMenu();
const { code, data } = await getRoleMenu();
if (code === 0) {
treeIds.value = getKeyList(data, "id");
treeData.value = handleTree(data);
}
});
watch(isExpandAll, val => {

View File

@@ -272,11 +272,13 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
async function onSearch() {
loading.value = true;
const { data } = await getUserList(toRaw(form));
const { code, data } = await getUserList(toRaw(form));
if (code === 0) {
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
}
setTimeout(() => {
loading.value = false;
@@ -497,13 +499,16 @@ export function useUser(tableRef: Ref, treeRef: Ref) {
onSearch();
// 归属部门
const { data } = await getDeptList();
const { code, data } = await getDeptList();
if (code === 0) {
higherDeptOptions.value = handleTree(data);
treeData.value = handleTree(data);
}
treeLoading.value = false;
// 角色列表
roleOptions.value = (await getAllRoleList()).data;
roleOptions.value = (await getAllRoleList()).data ?? [];
});
return {

View File

@@ -1,7 +1,6 @@
import { ref, computed } from "vue";
import { tableDataDrag } from "../data";
import { message } from "@/utils/message";
import { templateRef } from "@vueuse/core";
import { ref, computed, useTemplateRef } from "vue";
import { clone, useDark, useECharts } from "@pureadmin/utils";
export function useColumns() {
@@ -31,7 +30,7 @@ export function useColumns() {
const theme = computed(() => (isDark.value ? "dark" : "light"));
dataList.value.forEach((_, i) => {
const { setOptions } = useECharts(templateRef(`PieChartRef${i}`), {
const { setOptions } = useECharts(useTemplateRef(`PieChartRef${i}`), {
theme
});

View File

@@ -4,6 +4,7 @@ import {
getNodeByUniqueId,
appendFieldByUniqueId
} from "@/utils/tree";
import { useI18n } from "vue-i18n";
import { useDetail } from "./hooks";
import { ref, computed } from "vue";
import { clone } from "@pureadmin/utils";
@@ -15,6 +16,7 @@ defineOptions({
name: "Tabs"
});
const { locale } = useI18n();
const { toDetail, router } = useDetail();
const menusTree = clone(usePermissionStoreHook().wholeMenus, true);
@@ -30,6 +32,12 @@ const multiTags = computed(() => {
return useMultiTagsStoreHook()?.multiTags;
});
const treeSelectProps = {
label: (data: any) => transformI18n(data.meta.title),
children: "children",
disabled: "disabled"
};
function onCloseTags() {
if (currentValues.value.length === 0) return;
currentValues.value.forEach(uniqueId => {
@@ -92,6 +100,7 @@ function onCloseTags() {
<el-divider />
<el-tree-select
:key="locale"
v-model="currentValues"
class="w-[300px]!"
node-key="uniqueId"
@@ -100,12 +109,7 @@ function onCloseTags() {
multiple
filterable
default-expand-all
:props="{
label: data => transformI18n(data.meta.title),
value: 'uniqueId',
children: 'children',
disabled: 'disabled'
}"
:props="treeSelectProps"
:data="treeData"
>
<template #default="{ data }">

View File

@@ -1,6 +1,6 @@
<script setup lang="ts">
import { computed, nextTick, ref, toRef, watch } from "vue";
import { TransitionPresets, executeTransition } from "@vueuse/core";
import { TransitionPresets, transition } from "@vueuse/core";
import {
Position,
BaseEdge,
@@ -153,7 +153,7 @@ async function runAnimation() {
currentLength.value = totalLength;
}
await executeTransition(edgePoint, from, totalLength, {
await transition(edgePoint, from, totalLength, {
transition: TransitionPresets.easeInOutCubic,
duration: Math.max(1500, totalLength / 2),
abort: () => !isAnimating.value

View File

@@ -185,11 +185,13 @@ const optionsBasis: Array<OptionsType> = [
}
}"
>
<el-card shadow="never" class="h-[580px]">
<el-card shadow="never">
<div class="flex justify-between">
<span class="text-md font-medium">数据统计</span>
</div>
<WelcomeTable class="mt-3" />
<el-scrollbar max-height="504" class="mt-3">
<WelcomeTable />
</el-scrollbar>
</el-card>
</re-col>
@@ -271,6 +273,10 @@ const optionsBasis: Array<OptionsType> = [
}
}
:deep(.el-timeline.is-start) {
padding-left: 0;
}
.main-content {
margin: 20px 20px 0 !important;
}

View File

@@ -42,7 +42,7 @@ export default ({ mode }: ConfigEnv): UserConfigExport => {
sourcemap: false,
// 消除打包大小超过500kb警告
chunkSizeWarningLimit: 4000,
rolldownOptions: {
rollupOptions: {
input: {
index: pathResolve("./index.html", import.meta.url)
},
@@ -51,10 +51,6 @@ export default ({ mode }: ConfigEnv): UserConfigExport => {
chunkFileNames: "static/js/[name]-[hash].js",
entryFileNames: "static/js/[name]-[hash].js",
assetFileNames: "static/[ext]/[name]-[hash].[ext]"
},
checks: {
pluginTimings: false,
toleratedTransform: false
}
}
},