Compare commits

..

26 Commits

Author SHA1 Message Date
xiaoxian521
8d2e121eef Merge branch 'main' into perf/tailwindcss-class 2026-01-17 06:30:19 +08:00
xiaoming
ff007fbc03 refactor: stylelint升级至v17版本 (#1261) 2026-01-17 06:21:24 +08:00
xiaoxian521
82ecbb8ab4 Merge branch 'main' into perf/tailwindcss-class 2026-01-16 11:36:01 +08:00
xiaoxian521
593739cf77 style: 优化国际化图标样式 2026-01-16 11:23:34 +08:00
xiaoxian521
8119144205 Merge branch 'main' into perf/tailwindcss-class 2026-01-16 09:59:20 +08:00
xiaoxian521
add85a8a56 chore: update 2026-01-16 09:31:24 +08:00
xiaoxian521
d7c049d821 chore: 升级依赖,相关兼容处理 2026-01-15 13:13:00 +08:00
xiaoxian521
debe617664 chore: update 2026-01-15 12:58:46 +08:00
xiaoxian521
9f707170e8 chore: update 2026-01-15 12:33:39 +08:00
xiaoxian521
4c3ad7acce fix: 修复this.$storage类型报错 2026-01-15 09:12:55 +08:00
xiaoxian521
ee4ec7d944 chore: update 2026-01-14 15:35:11 +08:00
xiaoxian521
18ae47a569 chore: update 2026-01-14 07:06:24 +08:00
xiaoxian521
bc1469d330 Merge branch 'main' into perf/tailwindcss-class 2026-01-13 15:22:38 +08:00
xiaoxian521
4c805b3668 chore: update 2026-01-13 14:37:38 +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
xiaoxian521
b7a9cb0755 Merge branch 'main' into perf/tailwindcss-class 2026-01-07 11:09:43 +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
xiaoxian521
97bd47efca chore: add better-tailwindcss/enforce-canonical-classes 2025-12-09 09:59:08 +08:00
xiaoxian521
d794c7965c perf: 根据tailwindcss推荐优化类名 2025-12-08 15:44:00 +08:00
133 changed files with 2611 additions and 2097 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

@@ -5,6 +5,7 @@ import * as parserVue from "vue-eslint-parser";
import configPrettier from "eslint-config-prettier";
import pluginPrettier from "eslint-plugin-prettier";
import { defineConfig, globalIgnores } from "eslint/config";
import eslintPluginBetterTailwindcss from "eslint-plugin-better-tailwindcss";
export default defineConfig([
globalIgnores([
@@ -172,5 +173,21 @@ export default defineConfig([
}
]
}
},
{
files: ["**/*.vue", "**/*.tsx"],
plugins: {
"better-tailwindcss": eslintPluginBetterTailwindcss
},
rules: {
"better-tailwindcss/enforce-consistent-variable-syntax": "warn",
"better-tailwindcss/enforce-canonical-classes": "warn"
},
settings: {
"better-tailwindcss": {
entryPoint: "src/style/tailwind.css",
rootFontSize: 16
}
}
}
]);

View File

@@ -55,9 +55,6 @@ panel:
pureTagsStyleCardTip: Card tags for efficient browsing
pureTagsStyleChrome: Chrome
pureTagsStyleChromeTip: Chrome style is classic and elegant
pureFullScreenWatermark: FullScreen Watermark
pureEnableWatermark: Watermark
pureWatermarkText: Text
pureInterfaceDisplay: Interface Display
pureGreyModel: Grey Model
pureWeakModel: Weak Model
@@ -241,4 +238,19 @@ login:
purePassWordRuleReg: The password format should be any combination of 8-18 digits
purePassWordSureReg: Please enter confirm password
purePassWordDifferentReg: The two passwords do not match!
purePassWordUpdateReg: Password has been updated
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

@@ -55,9 +55,6 @@ panel:
pureTagsStyleCardTip: 卡片标签,高效浏览
pureTagsStyleChrome: 谷歌
pureTagsStyleChromeTip: 谷歌风格,经典美观
pureFullScreenWatermark: 全屏水印
pureEnableWatermark: 水印
pureWatermarkText: 文本
pureInterfaceDisplay: 界面显示
pureGreyModel: 灰色模式
pureWeakModel: 色弱模式
@@ -241,4 +238,19 @@ login:
purePassWordRuleReg: 密码格式应为8-18位数字、字母、符号的任意两种组合
purePassWordSureReg: 请输入确认密码
purePassWordDifferentReg: 两次密码不一致!
purePassWordUpdateReg: 修改密码成功
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

@@ -56,7 +56,7 @@
"@pureadmin/table": "^3.3.0",
"@pureadmin/utils": "^2.6.3",
"@vue-flow/background": "^1.3.2",
"@vue-flow/core": "^1.48.0",
"@vue-flow/core": "^1.48.1",
"@vueuse/core": "^14.1.0",
"@vueuse/motion": "^3.0.3",
"@wangeditor/editor": "^5.1.23",
@@ -69,14 +69,14 @@
"codemirror-editor-vue3": "^2.8.0",
"cropperjs": "^1.6.2",
"dayjs": "^1.11.19",
"deep-chat": "^2.3.0",
"deep-chat": "^2.4.1",
"echarts": "^6.0.0",
"el-table-infinite-scroll": "^3.0.8",
"element-plus": "^2.12.0",
"element-plus": "^2.13.1",
"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",
@@ -87,7 +87,7 @@
"pinyin-pro": "^3.27.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",
@@ -96,16 +96,16 @@
"v3-infinite-loading": "^1.3.2",
"vditor": "^3.11.2",
"version-rocket": "^1.7.4",
"vue": "^3.5.25",
"vue-i18n": "^11.2.2",
"vue": "^3.5.26",
"vue-i18n": "^11.2.8",
"vue-json-pretty": "^2.6.0",
"vue-pdf-embed": "^2.1.3",
"vue-router": "^4.6.3",
"vue-router": "^4.6.4",
"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,57 +114,58 @@
"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",
"@faker-js/faker": "^10.1.0",
"@iconify/json": "^2.2.416",
"@commitlint/cli": "^20.3.1",
"@commitlint/config-conventional": "^20.3.1",
"@commitlint/types": "^20.3.1",
"@eslint/js": "^9.39.2",
"@faker-js/faker": "^10.2.0",
"@iconify/json": "^2.2.428",
"@iconify/vue": "4.2.0",
"@intlify/unplugin-vue-i18n": "^11.0.1",
"@tailwindcss/vite": "^4.1.17",
"@intlify/unplugin-vue-i18n": "^11.0.3",
"@tailwindcss/vite": "^4.1.18",
"@types/codemirror": "^5.60.17",
"@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.30",
"@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.2",
"@vitejs/plugin-vue-jsx": "^5.1.2",
"@vitejs/plugin-vue": "^6.0.3",
"@vitejs/plugin-vue-jsx": "^5.1.3",
"boxen": "^8.0.1",
"code-inspector-plugin": "^1.3.0",
"code-inspector-plugin": "^1.3.4",
"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-better-tailwindcss": "^4.0.1",
"eslint-plugin-prettier": "^5.5.5",
"eslint-plugin-vue": "^10.6.2",
"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.0",
"rimraf": "^6.1.2",
"rollup-plugin-visualizer": "^6.0.5",
"sass": "^1.95.1",
"stylelint": "^16.26.1",
"sass": "^1.97.2",
"stylelint": "^17.0.0",
"stylelint-config-recess-order": "^7.4.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": "^7.2.7",
"typescript-eslint": "^8.53.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 +173,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.2"
},
"engines": {
"node": "^20.19.0 || >=22.13.0",

3243
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff

View File

@@ -7,8 +7,9 @@
</template>
<script lang="ts">
import { defineComponent } from "vue";
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";
@@ -24,12 +25,16 @@ export default defineComponent({
ReDialog,
ReDrawer
},
computed: {
currentLocale() {
return this.$storage.locale?.locale === "zh"
setup() {
const { $storage } = useGlobal<GlobalPropertiesApi>();
const currentLocale = computed(() => {
return $storage.locale?.locale === "zh"
? { ...zhCn, ...plusZhCn }
: { ...en, ...plusEn };
}
});
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

@@ -23,17 +23,15 @@ const copyAnimatesList = cloneDeep(animatesList);
const animateClass = computed(() => {
return [
"mt-1",
"flex",
"flex-c",
"border",
"w-[130px]",
"h-[100px]",
"items-center",
"w-32.5",
"h-25",
"cursor-pointer",
"transition-all",
"justify-center",
"border-[#e5e7eb]",
"hover:text-primary",
"hover:duration-[700ms]"
"hover:duration-700"
];
});
@@ -88,7 +86,7 @@ function onMouseleave() {
@clear="onClear"
>
<template #empty>
<div class="w-[280px]">
<div class="w-70">
<el-scrollbar
noresize
height="212px"

View File

@@ -116,11 +116,10 @@ export default defineComponent({
const iconClass = computed(() => {
return [
"p-[6px]",
"h-[30px]",
"w-[30px]",
"p-1.5",
"size-7.5",
"rounded-sm",
"outline-hidden",
"rounded-[4px]",
"cursor-pointer",
"hover:bg-[rgba(0,0,0,0.06)]"
];
@@ -252,7 +251,7 @@ export default defineComponent({
},
setup() {
return () => (
<div class="flex flex-wrap w-[60px] justify-between">
<div class="flex flex-wrap w-15 justify-between">
<ElUpload
accept="image/*"
show-file-list={false}

View File

@@ -54,7 +54,7 @@ defineExpose({ hidePopover });
</p>
</div>
</template>
<div class="flex flex-wrap justify-center items-center text-center">
<div class="flex-c flex-wrap text-center">
<el-image
v-if="cropperImg"
:src="cropperImg"

View File

@@ -123,10 +123,7 @@ function handleClose(
v-if="options?.fullscreenIcon || options?.headerRenderer"
#header="{ close, titleId, titleClass }"
>
<div
v-if="options?.fullscreenIcon"
class="flex items-center justify-between"
>
<div v-if="options?.fullscreenIcon" class="flex-bc">
<span :id="titleId" :class="titleClass">{{ options?.title }}</span>
<i
v-if="!options?.fullscreen"

View File

@@ -135,9 +135,7 @@ watch(
@after-leave="onAfterLeave"
>
<template #reference>
<div
class="w-[40px] h-[32px] cursor-pointer flex justify-center items-center"
>
<div class="w-10 h-8 cursor-pointer flex-c">
<IconifyIconOffline v-if="!icon" :icon="Search" />
<IconifyIconOnline v-else :icon="inputValue" />
</div>
@@ -163,7 +161,7 @@ watch(
v-for="(item, key) in pageList"
:key="key"
:title="item"
class="icon-item p-2 cursor-pointer mr-2 mt-1 flex justify-center items-center border border-[#e5e7eb]"
class="icon-item p-2 cursor-pointer mr-2 mt-1 flex-c border border-[#e5e7eb]"
:style="iconItemStyle(item)"
@click="onChangeIcon(item)"
>

View File

@@ -92,14 +92,16 @@ onBeforeMount(() => {
// 获取模拟车辆信息
mapJson()
.then(({ data }) => {
const points: object = data.map(v => {
return {
lnglat: [v.lng, v.lat],
...v
};
});
if (MarkerCluster) MarkerCluster.setData(points);
.then(({ code, data }) => {
if (code === 0) {
const points: object = data.map(v => {
return {
lnglat: [v.lng, v.lat],
...v
};
});
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: {
@@ -97,9 +97,9 @@ export default defineComponent({
return [
"flex",
"justify-between",
"pt-[3px]",
"px-[11px]",
"border-b-[1px]",
"pt-0.75",
"px-2.75",
"border-b",
"border-b-solid",
"border-[#dcdfe6]",
"dark:border-[#303030]"
@@ -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>
)
@@ -244,8 +244,10 @@ export default defineComponent({
const reference = {
reference: () => (
<SettingIcon
class={["w-[16px]", iconClass.value]}
v-tippy={rendTippyProps("列设置")}
class={["w-4", iconClass.value]}
v-tippy={rendTippyProps(
transformI18n($t("tableBar.pureColumnSettings"))
)}
/>
)
};
@@ -264,25 +266,27 @@ export default defineComponent({
: "mt-2"
]}
>
<div class="flex justify-between w-full h-[60px] p-4">
<div class="flex justify-between w-full h-15 p-4">
{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">
<div class="flex-ac">
{slots?.buttons ? (
<div class="flex mr-4">{slots.buttons()}</div>
) : null}
{props.tableRef?.size ? (
<>
<ExpandIcon
class={["w-[16px]", iconClass.value]}
class={["w-4", iconClass.value]}
style={{
transform: isExpandAll.value ? "none" : "rotate(-90deg)"
}}
v-tippy={rendTippyProps(
isExpandAll.value ? "折叠" : "展开"
isExpandAll.value
? transformI18n($t("tableBar.pureCollapse"))
: transformI18n($t("tableBar.pureExpand"))
)}
onClick={() => onExpand()}
/>
@@ -291,20 +295,24 @@ export default defineComponent({
) : null}
<RefreshIcon
class={[
"w-[16px]",
"w-4",
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]} />
<CollapseIcon class={["w-4", iconClass.value]} />
</el-dropdown>
<el-divider direction="vertical" />
@@ -318,17 +326,17 @@ 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>
<div class="pt-[6px] pl-[11px]">
<div class="pt-1.5 pl-2.75">
<el-scrollbar max-height="36vh">
<el-checkbox-group
ref={`GroupRef${unref(props.tableKey)}`}
@@ -345,7 +353,7 @@ export default defineComponent({
<div class="flex items-center">
<DragIcon
class={[
"drag-btn w-[16px] mr-2",
"drag-btn w-4 mr-2",
isFixedColumn(item)
? "cursor-no-drop!"
: "cursor-grab!"
@@ -364,7 +372,7 @@ export default defineComponent({
>
<span
title={transformI18n(item)}
class="inline-block w-[120px] truncate hover:text-text_color_primary"
class="inline-block w-30 truncate hover:text-text_color_primary"
>
{transformI18n(item)}
</span>
@@ -380,9 +388,13 @@ export default defineComponent({
<el-divider direction="vertical" />
<iconifyIconOffline
class={["w-[16px]", iconClass.value]}
class={["w-4", 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

@@ -240,7 +240,7 @@ export default defineComponent({
)}
{props.disabled && (
<div
class="qrcode--disabled absolute top-0 left-0 flex w-full h-full items-center justify-center"
class="qrcode--disabled absolute top-0 left-0 flex-c size-full"
onClick={disabledClick}
>
<div class="absolute top-[50%] left-[50%] font-bold">

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>
@@ -90,9 +90,9 @@ export default defineComponent({
return [
"flex",
"justify-between",
"pt-[3px]",
"px-[11px]",
"border-b-[1px]",
"pt-0.75",
"px-2.75",
"border-b",
"border-b-solid",
"border-[#dcdfe6]",
"dark:border-[#303030]"
@@ -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>
)
@@ -237,8 +237,10 @@ export default defineComponent({
const reference = {
reference: () => (
<SettingIcon
class={["w-[16px]", iconClass.value]}
v-tippy={rendTippyProps("列设置")}
class={["w-4", iconClass.value]}
v-tippy={rendTippyProps(
transformI18n($t("tableBar.pureColumnSettings"))
)}
/>
)
};
@@ -257,25 +259,27 @@ export default defineComponent({
: "mt-2"
]}
>
<div class="flex justify-between w-full h-[60px] p-4">
<div class="flex justify-between w-full h-15 p-4">
{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">
<div class="flex-ac">
{slots?.buttons ? (
<div class="flex mr-4">{slots.buttons()}</div>
) : null}
{props.tree ? (
<>
<ExpandIcon
class={["w-[16px]", iconClass.value]}
class={["w-4", iconClass.value]}
style={{
transform: isExpandAll.value ? "none" : "rotate(-90deg)"
}}
v-tippy={rendTippyProps(
isExpandAll.value ? "折叠" : "展开"
isExpandAll.value
? transformI18n($t("tableBar.pureCollapse"))
: transformI18n($t("tableBar.pureExpand"))
)}
onClick={() => onExpand()}
/>
@@ -284,20 +288,24 @@ export default defineComponent({
) : null}
<RefreshIcon
class={[
"w-[16px]",
"w-4",
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]} />
<CollapseIcon class={["w-4", iconClass.value]} />
</el-dropdown>
<el-divider direction="vertical" />
@@ -311,17 +319,17 @@ 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>
<div class="pt-[6px] pl-[11px]">
<div class="pt-1.5 pl-2.75">
<el-scrollbar max-height="36vh">
<el-checkbox-group
ref={`VxeGroupRef${unref(props.tableKey)}`}
@@ -338,7 +346,7 @@ export default defineComponent({
<div class="flex items-center">
<DragIcon
class={[
"drag-btn w-[16px] mr-2",
"drag-btn w-4 mr-2",
isFixedColumn(item)
? "cursor-no-drop!"
: "cursor-grab!"
@@ -355,7 +363,7 @@ export default defineComponent({
>
<span
title={transformI18n(item)}
class="inline-block w-[120px] truncate hover:text-text_color_primary"
class="inline-block w-30 truncate hover:text-text_color_primary"
>
{transformI18n(item)}
</span>
@@ -371,9 +379,13 @@ export default defineComponent({
<el-divider direction="vertical" />
<iconifyIconOffline
class={["w-[16px]", iconClass.value]}
class={["w-4", 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

@@ -65,7 +65,7 @@ watch(
</script>
<template>
<template v-for="[fullPath, Comp] in compList" :key="fullPath">
<div v-show="fullPath === currRoute.fullPath" class="w-full h-full">
<div v-show="fullPath === currRoute.fullPath" class="size-full">
<slot
:fullPath="fullPath"
:Comp="Comp"
@@ -73,7 +73,7 @@ watch(
/>
</div>
</template>
<div v-show="!keep" class="w-full h-full">
<div v-show="!keep" class="size-full">
<slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo />
</div>
</template>

View File

@@ -33,7 +33,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
</script>
<template>
<div class="navbar bg-[#fff] shadow-xs shadow-[rgba(0,21,41,0.08)]">
<div class="navbar bg-white shadow-xs shadow-[rgba(0,21,41,0.08)]">
<LaySidebarTopCollapse
v-if="device === 'mobile'"
class="hamburger-container"
@@ -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

@@ -49,7 +49,7 @@ 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-b border-solid border-[#f0f0f0] dark:border-[#303030]"
>
<el-avatar
v-if="noticeItem.avatar"

View File

@@ -3,15 +3,12 @@ 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";
const { t } = useI18n();
const noticesNum = ref(0);
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})` : "")
@@ -21,14 +18,9 @@ const getLabel = computed(
<template>
<el-dropdown 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-1.75']"
>
<el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
<el-badge is-dot>
<span class="header-notice-icon">
<IconifyIconOffline :icon="BellIcon" />
</span>
@@ -65,6 +57,34 @@ const getLabel = computed(
</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 +94,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

@@ -11,13 +11,10 @@ const show = ref<Boolean>(false);
const iconClass = computed(() => {
return [
"w-[22px]",
"h-[22px]",
"flex",
"justify-center",
"items-center",
"size-5.5",
"flex-c",
"outline-hidden",
"rounded-[4px]",
"rounded-sm",
"cursor-pointer",
"transition-colors",
"hover:bg-[#0000000f]",
@@ -51,7 +48,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 +70,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 +98,6 @@ onBeforeUnmount(() => {
</template>
<style lang="scss" scoped>
:deep(.el-scrollbar) {
height: calc(100vh - 110px);
}
.right-panel-background {
position: fixed;
top: 0;
@@ -139,11 +134,4 @@ onBeforeUnmount(() => {
transform: translate(0);
}
}
.project-configuration {
display: flex;
align-items: center;
justify-content: space-between;
padding: 14px 20px;
}
</style>

View File

@@ -34,12 +34,12 @@ function handleDelete(item) {
<IconifyIconOffline
v-show="item.type === 'history'"
:icon="StarIcon"
class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
class="size-4.5 mr-2 hover:text-[#d7d5d4]"
@click.stop="handleCollect(item)"
/>
<IconifyIconOffline
:icon="CloseIcon"
class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
class="size-4.5 hover:text-[#d7d5d4] cursor-pointer"
@click.stop="handleDelete(item)"
/>
</template>

View File

@@ -297,10 +297,7 @@ onKeyStroke("ArrowDown", handleDown);
@input="handleSearch"
>
<template #prefix>
<IconifyIconOffline
:icon="SearchIcon"
class="text-primary w-[24px] h-[24px]"
/>
<IconifyIconOffline :icon="SearchIcon" class="text-primary size-6" />
</template>
</el-input>
<div class="search-content">

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-10 h-12 flex-c cursor-pointer navbar-bg-hover hover:[&>svg]:animate-scale-bounce"
@click="handleSearch"
>
<IconifyIconOffline icon="ri/search-line" />

View File

@@ -9,14 +9,6 @@ import {
onUnmounted,
onBeforeMount
} from "vue";
import {
useDark,
debounce,
isNumber,
useGlobal,
isAllEmpty,
useWatermark
} from "@pureadmin/utils";
import { useI18n } from "vue-i18n";
import { emitter } from "@/utils/mitt";
import LayPanel from "../lay-panel/index.vue";
@@ -25,6 +17,7 @@ import { useAppStoreHook } from "@/store/modules/app";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
import Segmented, { type OptionsType } from "@/components/ReSegmented";
import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
import { useDark, useGlobal, debounce, isNumber } from "@pureadmin/utils";
import Check from "~icons/ep/check";
import LeftArrow from "~icons/ri/arrow-left-s-line?width=20&height=20";
@@ -34,9 +27,8 @@ import DarkIcon from "@/assets/svg/dark.svg?component";
import SystemIcon from "@/assets/svg/system.svg?component";
const { t } = useI18n();
const { device } = useNav();
const { isDark } = useDark();
const { device, title } = useNav();
const { setWatermark, clear } = useWatermark();
const { $storage } = useGlobal<GlobalPropertiesApi>();
const mixRef = ref();
@@ -66,12 +58,6 @@ const markValue = ref($storage.configure?.showModel ?? "smart");
const logoVal = ref($storage.configure?.showLogo ?? true);
/** WIP... */
const watermarkConfigs = reactive({
enable: false,
text: null
});
const settings = reactive({
greyVal: $storage.configure.grey,
weakVal: $storage.configure.weak,
@@ -143,21 +129,6 @@ function onChange({ option }) {
emitter.emit("tagViewsShowModel", value);
}
function onWatermarkSwitchChange(value) {
const text = isAllEmpty(watermarkConfigs.text)
? title.value
: watermarkConfigs.text;
if (value) {
setWatermark(text);
} else {
clear();
}
}
function onWatermarkInputChange(value) {
setWatermark(value);
}
/** 侧边栏Logo */
function logoChange() {
unref(logoVal)
@@ -218,7 +189,7 @@ const getThemeColor = computed(() => {
});
const pClass = computed(() => {
return ["mb-[12px]!", "font-medium", "text-sm", "dark:text-white"];
return ["mb-3!", "font-medium", "text-sm", "dark:text-white"];
});
const themeOptions = computed<Array<OptionsType>>(() => {
@@ -374,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" />
@@ -445,7 +416,7 @@ onUnmounted(() => removeMatchMedia);
<button
v-else
v-ripple="{ class: 'text-gray-300' }"
class="bg-transparent flex-c w-full h-20 rounded-md border border-[var(--pure-border-color)]"
class="bg-transparent flex-c w-full h-20 rounded-md border border-(--pure-border-color)"
@click="setStretch(!settings.stretch)"
>
<div
@@ -476,39 +447,30 @@ onUnmounted(() => removeMatchMedia);
@change="onChange"
/>
<p class="mt-5! font-medium text-sm dark:text-white">
{{ t("panel.pureFullScreenWatermark") }}
</p>
<ul class="setting">
<li>
<span class="dark:text-white">
{{ t("panel.pureEnableWatermark") }}
</span>
<el-switch
v-model="watermarkConfigs.enable"
inline-prompt
:active-text="t('buttons.pureOpenText')"
:inactive-text="t('buttons.pureCloseText')"
@change="onWatermarkSwitchChange"
/>
</li>
<li>
<span class="dark:text-white">
{{ t("panel.pureWatermarkText") }}
</span>
<el-input
v-model="watermarkConfigs.text"
class="w-[100px]!"
:placeholder="title"
@input="onWatermarkInputChange"
/>
</li>
</ul>
<p class="mt-5! font-medium text-sm dark:text-white">
{{ t("panel.pureInterfaceDisplay") }}
</p>
<ul class="setting">
<li>
<span class="dark:text-white">{{ t("panel.pureGreyModel") }}</span>
<el-switch
v-model="settings.greyVal"
inline-prompt
:active-text="t('buttons.pureOpenText')"
:inactive-text="t('buttons.pureCloseText')"
@change="greyChange"
/>
</li>
<li>
<span class="dark:text-white">{{ t("panel.pureWeakModel") }}</span>
<el-switch
v-model="settings.weakVal"
inline-prompt
:active-text="t('buttons.pureOpenText')"
:inactive-text="t('buttons.pureCloseText')"
@change="weekChange"
/>
</li>
<li>
<span class="dark:text-white">{{ t("panel.pureHiddenTags") }}</span>
<el-switch
@@ -529,18 +491,6 @@ onUnmounted(() => removeMatchMedia);
@change="hideFooterChange"
/>
</li>
<li>
<span class="dark:text-white">
{{ t("panel.pureMultiTagsCache") }}
</span>
<el-switch
v-model="settings.multiTagsCache"
inline-prompt
:active-text="t('buttons.pureOpenText')"
:inactive-text="t('buttons.pureCloseText')"
@change="multiTagsCacheChange"
/>
</li>
<li>
<span class="dark:text-white">Logo</span>
<el-switch
@@ -554,23 +504,15 @@ onUnmounted(() => removeMatchMedia);
/>
</li>
<li>
<span class="dark:text-white">{{ t("panel.pureGreyModel") }}</span>
<span class="dark:text-white">
{{ t("panel.pureMultiTagsCache") }}
</span>
<el-switch
v-model="settings.greyVal"
v-model="settings.multiTagsCache"
inline-prompt
:active-text="t('buttons.pureOpenText')"
:inactive-text="t('buttons.pureCloseText')"
@change="greyChange"
/>
</li>
<li>
<span class="dark:text-white">{{ t("panel.pureWeakModel") }}</span>
<el-switch
v-model="settings.weakVal"
inline-prompt
:active-text="t('buttons.pureOpenText')"
:inactive-text="t('buttons.pureCloseText')"
@change="weekChange"
@change="multiTagsCacheChange"
/>
</li>
</ul>
@@ -596,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

@@ -105,7 +105,7 @@ watch(
</script>
<template>
<el-breadcrumb class="leading-[50px]! select-none" separator="/">
<el-breadcrumb class="leading-12.5! select-none" separator="/">
<transition-group name="breadcrumb">
<el-breadcrumb-item
v-for="item in levelList"

View File

@@ -18,7 +18,7 @@ const { t } = useI18n();
const { tooltipEffect } = useNav();
const iconClass = computed(() => {
return ["w-[16px]", "h-[16px]"];
return ["size-4"];
});
const { $storage } = useGlobal<GlobalPropertiesApi>();

View File

@@ -11,10 +11,7 @@ defineProps({
</script>
<template>
<div v-if="extraIcon" class="flex justify-center items-center">
<component
:is="useRenderIcon(toRaw(extraIcon))"
class="w-[30px] h-[30px]"
/>
<div v-if="extraIcon" class="flex-c">
<component :is="useRenderIcon(toRaw(extraIcon))" class="size-7.5" />
</div>
</template>

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

@@ -71,7 +71,7 @@ const textClass = computed(() => {
((layout.value === "vertical" && item.parentId === null) ||
(layout.value === "mix" && item.pathList.length === 2))
) {
return `${baseClass} min-w-[54px]! text-center! px-3!`;
return `${baseClass} min-w-13.5! text-center! px-3!`;
}
return baseClass;
});
@@ -159,7 +159,7 @@ function resolvePath(routePath) {
item?.pathList?.length === 2)
"
truncated
class="w-full! px-3! min-w-[54px]! text-center! text-inherit!"
class="w-full! px-3! min-w-13.5! text-center! text-inherit!"
>
{{ transformI18n(onlyOneChild.meta.title) }}
</el-text>

View File

@@ -21,12 +21,11 @@ const iconClass = computed(() => {
return [
"ml-4",
"mb-1",
"w-[16px]",
"h-[16px]",
"size-4",
"inline-block!",
"align-middle",
"cursor-pointer",
"duration-[100ms]"
"duration-100"
];
});

View File

@@ -1,5 +1,5 @@
<template>
<svg class="w-full h-full">
<svg class="size-full">
<defs>
<symbol id="geometry-left" viewBox="0 0 214 36">
<path d="M17 0h197v36H0v-2c4.5 0 9-3.5 9-8V8c0-4.5 3.5-8 8-8z" />

View File

@@ -209,18 +209,26 @@ function initRouter() {
});
} else {
return new Promise(resolve => {
getAsyncRoutes().then(({ data }) => {
handleAsyncRoutes(cloneDeep(data));
storageLocal().setItem(key, data);
resolve(router);
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 }) => {
handleAsyncRoutes(cloneDeep(data));
resolve(router);
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);
resolve(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

@@ -76,7 +76,7 @@ function onReset() {
immediate: true,
timeout: 1000
}"
class="w-[200px]!"
class="w-50!"
clearable
@clear="onInput"
/>
@@ -86,7 +86,7 @@ function onReset() {
<el-input
v-model="searchTwo"
v-optimize="{ event: 'input', fn: onInputTwo, timeout: 400 }"
class="w-[200px]!"
class="w-50!"
clearable
/>
</div>
@@ -100,7 +100,7 @@ function onReset() {
timeout: 400,
params: { name: '小明', sex: '男' }
}"
class="w-[200px]!"
class="w-50!"
clearable
/>
</div>
@@ -112,7 +112,7 @@ function onReset() {
<el-input
v-model="searchFour"
v-optimize:throttle="{ event: 'input', fn: onInputFour, timeout: 1000 }"
class="w-[200px]!"
class="w-50!"
clearable
/>
</div>
@@ -125,7 +125,7 @@ function onReset() {
fn: onInputFive,
params: { name: '小明', sex: '男' }
}"
class="w-[200px]!"
class="w-50!"
clearable
/>
</div>
@@ -134,7 +134,7 @@ function onReset() {
<div class="mb-2">
文本复制指令(双击输入框内容即可复制)
<el-input v-model="searchSix" v-copy="searchSix" class="w-[200px]!" />
<el-input v-model="searchSix" v-copy="searchSix" class="w-50!" />
</div>
<div>
文本复制指令(自定义触发事件,单击复制)

View File

@@ -89,7 +89,7 @@ const exportExcel = () => {
</el-link>
</template>
<el-button type="primary" @click="exportExcel">导出Excel</el-button>
<div class="h-[25rem] mt-3">
<div class="h-100 mt-3">
<el-auto-resizer>
<template #default="{ height, width }">
<el-table-v2

View File

@@ -39,12 +39,12 @@ const dataProps = {
</template>
<el-row :gutter="24">
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" class="mb-[20px]">
<el-col :xs="24" :sm="24" :md="12" :lg="12" :xl="12" class="mb-5">
<el-card shadow="never">
<template #header>
<div class="card-header">普通树结构</div>
</template>
<div class="max-h-[550px] overflow-y-auto">
<div class="max-h-137.5 overflow-y-auto">
<el-tree
:data="menusData"
:props="dataProps"
@@ -71,7 +71,7 @@ const dataProps = {
<template #header>
<div class="card-header">虚拟树结构</div>
</template>
<div class="max-h-[550px] overflow-y-auto">
<div class="max-h-137.5 overflow-y-auto">
<el-tree-v2
:data="menusData"
:props="dataProps"

View File

@@ -59,7 +59,7 @@ const onPrint = () => {
class="h-[calc(100vh-295px)]"
:element-loading-text="t('status.pureLoad')"
>
<div class="flex justify-between items-center h-9">
<div class="flex-bc h-9">
<div v-if="showAllPages" class="font-medium ml-1.25 text-xl">
{{ pageCount }}
</div>
@@ -74,7 +74,7 @@ const onPrint = () => {
{{ currentPage }} / {{ pageCount }}
</el-pagination>
</div>
<div class="w-[170px] flex-bc">
<div class="w-42.5 flex-bc">
<el-checkbox v-model="showAllPages" @change="showAllPagesChange">
显示所有页面
</el-checkbox>

View File

@@ -83,7 +83,7 @@ const tableData: User[] = [
<span class="font-medium">打印功能报表图表图片</span>
<el-select
v-model="value"
class="w-[100px]! mr-2"
class="w-25! mr-2"
placeholder="Select"
size="small"
>
@@ -131,7 +131,7 @@ const tableData: User[] = [
border
:data="tableData"
:row-class-name="tableRowClassName"
class="el-table w-full mt-[10px]"
class="el-table w-full mt-2.5"
>
<el-table-column prop="date" label="Date" />
<el-table-column prop="name" label="Name" />
@@ -160,7 +160,7 @@ const tableData: User[] = [
}"
>
<p class="font-medium text-lg text-center">Echart</p>
<pieChart class="echart mt-[10px]" />
<pieChart class="echart mt-2.5" />
</el-col>
<el-col
@@ -186,7 +186,7 @@ const tableData: User[] = [
<img
src="https://pure-admin-utils.netlify.app/logo.png"
alt="avatars"
class="img mt-[10px] m-auto"
class="img mt-2.5 m-auto"
/>
</el-col>
</el-row>

View File

@@ -46,19 +46,19 @@ const disabledClick = () => {
</template>
<el-row :gutter="20" justify="space-between">
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">基础用法</div>
<ReQrcode :text="qrcodeText" />
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">img标签</div>
<ReQrcode :text="qrcodeText" tag="img" />
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">样式配置</div>
<ReQrcode
:text="qrcodeText"
@@ -72,19 +72,19 @@ const disabledClick = () => {
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">点击事件</div>
<ReQrcode :text="qrcodeText" @click="codeClick" />
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">异步内容</div>
<ReQrcode :text="asyncTitle" />
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">失效</div>
<ReQrcode
:text="qrcodeText"
@@ -94,7 +94,7 @@ const disabledClick = () => {
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">logo配置</div>
<ReQrcode
:text="qrcodeText"
@@ -103,7 +103,7 @@ const disabledClick = () => {
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">logo样式</div>
<ReQrcode
:text="qrcodeText"
@@ -118,7 +118,7 @@ const disabledClick = () => {
</el-card>
</el-col>
<el-col :xl="6" :lg="6" :md="12" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-[10px] text-center">
<el-card shadow="hover" class="mb-2.5 text-center">
<div class="font-bold">大小配置</div>
<ReQrcode :text="qrcodeText" :width="100" />
</el-card>

View File

@@ -30,7 +30,7 @@ defineOptions({
<el-button v-ripple type="warning">Warning</el-button>
<el-button v-ripple type="danger">Danger</el-button>
</el-space>
<el-card v-ripple class="mb-5 w-[510px] select-none" shadow="hover">
<el-card v-ripple class="mb-5 w-127.5 select-none" shadow="hover">
卡片
</el-card>

View File

@@ -33,7 +33,7 @@ function onFail() {
代码位置 src/views/able/verify.vue
</el-link>
</template>
<div class="bg-[rgba(15,23,42,0.2)] p-6 w-[360px]">
<div class="bg-[rgba(15,23,42,0.2)] p-6 w-90">
<Vcode :show="isShow" type="inside" @fail="onFail" @success="onSuccess" />
</div>
</el-card>

View File

@@ -158,20 +158,20 @@ onBeforeUnmount(() => {
v-if="curImg"
:src="curImg"
:preview-src-list="Array.of(curImg)"
class="w-[180px] h-[180px] ml-2 rounded-[6px]"
class="size-45 ml-2 rounded-md"
/>
</div>
<div
id="canvas-container"
v-loading="loading"
element-loading-text="温馨提示可左右拖拽图片并单击选取所需的帧图片"
class="w-full h-[200px] overflow-hidden mt-6"
class="w-full h-50 overflow-hidden mt-6"
/>
</el-card>
</template>
<style lang="scss" scoped>
::v-deep(.el-upload-dragger) {
:deep(.el-upload-dragger) {
display: flex;
align-items: center;
height: 180px;

View File

@@ -126,7 +126,7 @@ onBeforeUnmount(() => {
<el-button plain @click="clear">清除整页水印</el-button>
</el-space>
<div ref="local" class="w-1/2 h-[200px] border border-sky-500 mt-4" />
<div ref="local" class="w-1/2 h-50 border border-sky-500 mt-4" />
<el-space wrap class="mt-6">
<el-button
@@ -194,9 +194,6 @@ onBeforeUnmount(() => {
<el-button plain @click="clearLocal">清除局部水印</el-button>
</el-space>
<div
ref="preventLocal"
class="w-1/2 h-[200px] border border-indigo-500 mt-4"
/>
<div ref="preventLocal" class="w-1/2 h-50 border border-indigo-500 mt-4" />
</el-card>
</template>

View File

@@ -103,7 +103,7 @@ onBeforeUnmount(() => {
</template>
<div
v-loading="loading"
class="w-8/12 m-auto! mt-[20px]!"
class="w-8/12 m-auto! mt-5!"
element-loading-background="transparent"
>
<div ref="wavesurferRef" />
@@ -112,7 +112,7 @@ onBeforeUnmount(() => {
<h1 class="text-4xl mt-2!">{{ curTime }}</h1>
<span class="text-[#81888f]">{{ totalTime }}</span>
</div>
<div v-show="totalTime" class="flex mt-2 w-[180px] justify-around m-auto">
<div v-show="totalTime" class="flex mt-2 w-45 justify-around m-auto">
<Rewind
v-tippy="{
content: '快退(可长按)',

View File

@@ -37,12 +37,7 @@ function onClick(item) {
</script>
<template>
<div
:class="[
'min-w-[180px]',
deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
]"
>
<div :class="['min-w-45', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']">
<h3 class="my-8!">账户管理</h3>
<div v-for="(item, index) in list" :key="index">
<div class="flex items-center">

View File

@@ -32,12 +32,7 @@ function onChange(val, item) {
</script>
<template>
<div
:class="[
'min-w-[180px]',
deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
]"
>
<div :class="['min-w-45', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']">
<h3 class="my-8!">偏好设置</h3>
<div v-for="(item, index) in list" :key="index">
<div class="flex items-center">

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,18 +98,16 @@ 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>
<template>
<div
:class="[
'min-w-[180px]',
deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
]"
>
<div :class="['min-w-45', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']">
<h3 class="my-8!">个人信息</h3>
<el-form
ref="userInfoFormRef"

View File

@@ -55,11 +55,13 @@ const columns: TableColumnList = [
async function onSearch() {
loading.value = true;
const { data } = await getMineLogs();
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
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;
@@ -72,12 +74,7 @@ onMounted(() => {
</script>
<template>
<div
:class="[
'min-w-[180px]',
deviceDetection() ? 'max-w-[100%]' : 'max-w-[70%]'
]"
>
<div :class="['min-w-45', deviceDetection() ? 'max-w-full' : 'max-w-[70%]']">
<h3 class="my-8!">安全日志</h3>
<pure-table
row-key="id"

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>
@@ -70,24 +73,24 @@ getMine().then(res => {
<el-container class="h-full">
<el-aside
v-if="isOpen"
class="pure-account-settings overflow-hidden px-2 dark:bg-(--el-bg-color)! border-r-[1px] border-[var(--pure-border-color)]"
class="pure-account-settings overflow-hidden px-2 dark:bg-(--el-bg-color)! border-r border-(--pure-border-color)"
:width="deviceDetection() ? '180px' : '240px'"
>
<el-menu :default-active="witchPane" class="pure-account-settings-menu">
<div
class="h-[50px]! text-[var(--pure-theme-menu-text)] cursor-pointer text-sm transition-all duration-300 ease-in-out hover:scale-105 will-change-transform transform-gpu origin-center hover:text-base! hover:text-[var(--pure-theme-menu-title-hover)]!"
class="h-12.5! text-(--pure-theme-menu-text) cursor-pointer text-sm transition-all duration-300 ease-in-out hover:scale-105 will-change-transform transform-gpu origin-center hover:text-base! hover:text-(--pure-theme-menu-title-hover)!"
@click="router.go(-1)"
>
<div
class="h-full flex items-center px-[var(--el-menu-base-level-padding)]"
class="h-full flex items-center px-(--el-menu-base-level-padding)"
>
<IconifyIconOffline :icon="leftLine" />
<span class="ml-2">返回</span>
</div>
</div>
<div class="flex items-center ml-8 mt-4 mb-4">
<div class="flex items-center ml-8 my-4">
<el-avatar :size="48" :src="userInfo.avatar" />
<div class="ml-4 flex flex-col max-w-[130px]">
<div class="ml-4 flex flex-col max-w-32.5">
<ReText class="font-bold self-baseline!">
{{ userInfo.nickname }}
</ReText>
@@ -125,7 +128,7 @@ getMine().then(res => {
/>
<component
:is="panes.find(item => item.key === witchPane).component"
:class="[!deviceDetection() && 'ml-[120px]']"
:class="[!deviceDetection() && 'ml-30']"
/>
</el-main>
</el-container>

View File

@@ -36,6 +36,6 @@ watch(animate, () => {
代码位置 src/views/components/animatecss.vue
</el-link>
</template>
<ReAnimateSelector v-model="animate" class="w-[200px]!" />
<ReAnimateSelector v-model="animate" class="w-50!" />
</el-card>
</template>

View File

@@ -37,8 +37,8 @@ const handleChange = value => {
</template>
<el-row :gutter="24">
<el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
<div class="flex flex-col items-center justify-center">
<span class="text-[var(--el-color-primary)]">
<div class="flex-c flex-col">
<span class="text-(--el-color-primary)">
1. 二级联动不带全部选项
<el-cascader
v-model="selectedOptions1"
@@ -66,8 +66,8 @@ const handleChange = value => {
</div>
</el-col>
<el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
<div class="flex flex-col items-center justify-center mt-3">
<span class="text-[var(--el-color-primary)]">
<div class="flex-c flex-col mt-3">
<span class="text-(--el-color-primary)">
2. 二级联动带有全部选项
<el-cascader
v-model="selectedOptions3"
@@ -95,8 +95,8 @@ const handleChange = value => {
</div>
</el-col>
<el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
<div class="flex flex-col items-center justify-center mt-3">
<span class="text-[var(--el-color-primary)]">
<div class="flex-c flex-col mt-3">
<span class="text-(--el-color-primary)">
3. 三级联动不带全部选项
<el-cascader
v-model="selectedOptions2"
@@ -126,8 +126,8 @@ const handleChange = value => {
</div>
</el-col>
<el-col :xl="12" :lg="12" :md="24" :sm="24" :xs="24">
<div class="flex flex-col items-center justify-center mt-3">
<span class="text-[var(--el-color-primary)]">
<div class="flex-c flex-col mt-3">
<span class="text-(--el-color-primary)">
4. 三级联动"全部选项"
<el-cascader
v-model="selectedOptions4"

View File

@@ -221,7 +221,7 @@ watch(size, val =>
<div>可控制间距的按钮样式</div>
<el-slider
v-model="spaceSize"
class="mb-2 w-[300px]!"
class="mb-2 w-75!"
:show-tooltip="false"
:disabled="size === 'disabled'"
/>

View File

@@ -61,7 +61,7 @@ const handleChange = (val: string[]) => {
<el-collapse
ref="collapseRef"
v-model="activeNames"
class="w-[360px]"
class="w-90"
:accordion="radio === 'accordion' ? true : false"
@change="handleChange"
>

View File

@@ -164,7 +164,7 @@ watch(size, val =>
<el-date-picker
v-model="value"
type="date"
class="w-[160px]!"
class="w-40!"
placeholder="请选择"
:disabled-date="disabledDate"
:shortcuts="shortcuts"
@@ -180,7 +180,7 @@ watch(size, val =>
<el-date-picker
v-model="value1"
type="week"
class="w-[160px]!"
class="w-40!"
format="YYYY年第ww周"
placeholder="选择某年中的某周"
:size="dynamicSize"
@@ -189,7 +189,7 @@ watch(size, val =>
<el-date-picker
v-model="value2"
type="month"
class="w-[160px]!"
class="w-40!"
placeholder="选择某月"
:size="dynamicSize"
:disabled="size === 'disabled'"
@@ -197,7 +197,7 @@ watch(size, val =>
<el-date-picker
v-model="value3"
type="year"
class="w-[160px]!"
class="w-40!"
placeholder="选择某年"
:size="dynamicSize"
:disabled="size === 'disabled'"
@@ -205,7 +205,7 @@ watch(size, val =>
<el-date-picker
v-model="value4"
type="dates"
class="w-[160px]!"
class="w-40!"
placeholder="选择多个日期"
:size="dynamicSize"
:disabled="size === 'disabled'"
@@ -216,7 +216,7 @@ watch(size, val =>
<el-date-picker
v-model="value5"
type="daterange"
class="w-[240px]!"
class="w-60!"
unlink-panels
range-separator="至"
start-placeholder="开始时间"
@@ -261,7 +261,7 @@ watch(size, val =>
<el-date-picker
v-model="value7"
type="date"
class="w-[160px]!"
class="w-40!"
placeholder="请选择日期"
format="YYYY/MM/DD"
:value-format="dateFormat"
@@ -275,7 +275,7 @@ watch(size, val =>
<el-date-picker
v-model="value8"
type="date"
class="w-[160px]!"
class="w-40!"
placeholder="请选择日期"
:prefix-icon="useRenderIcon('twemoji:spiral-calendar')"
:size="dynamicSize"

View File

@@ -190,7 +190,7 @@ watch(size, val =>
<el-date-picker
v-model="value"
type="datetime"
class="w-[200px]!"
class="w-50!"
placeholder="请选择日期时间"
:shortcuts="shortcuts"
:size="dynamicSize"
@@ -213,7 +213,7 @@ watch(size, val =>
<el-date-picker
v-model="value1"
type="datetime"
class="w-[200px]!"
class="w-50!"
placeholder="请选择日期时间"
format="YYYY/MM/DD hh:mm:ss"
:value-format="datetimeFormat"
@@ -241,7 +241,7 @@ watch(size, val =>
<div class="mb-2 mt-4">
弹出面板位置可控(如果弹出位置不足以完整展示面板会自动调整位置)
</div>
<el-space wrap class="w-[400px]">
<el-space wrap class="w-100">
<el-check-tag
v-for="(tag, index) in checkTag"
:key="index"

View File

@@ -28,14 +28,14 @@ const newFormInline = ref(props.formInline);
<el-form-item label="姓名">
<el-input
v-model="newFormInline.user"
class="w-[220px]!"
class="w-55!"
placeholder="请输入姓名"
/>
</el-form-item>
<el-form-item label="城市">
<el-select
v-model="newFormInline.region"
class="w-[220px]!"
class="w-55!"
placeholder="请选择城市"
>
<el-option label="上海" value="上海" />

View File

@@ -18,5 +18,5 @@ const data = useVModel(props, "data", emit);
</script>
<template>
<el-input v-model="data" class="w-[220px]!" placeholder="请输入内容" />
<el-input v-model="data" class="w-55!" placeholder="请输入内容" />
</template>

View File

@@ -28,14 +28,14 @@ const newFormInline = ref(props.formInline);
<el-form-item label="姓名">
<el-input
v-model="newFormInline.user"
class="w-[220px]!"
class="w-55!"
placeholder="请输入姓名"
/>
</el-form-item>
<el-form-item label="城市">
<el-select
v-model="newFormInline.region"
class="w-[220px]!"
class="w-55!"
placeholder="请选择城市"
>
<el-option label="上海" value="上海" />

View File

@@ -18,5 +18,5 @@ const data = useVModel(props, "data", emit);
</script>
<template>
<el-input v-model="data" class="w-[220px]!" placeholder="请输入内容" />
<el-input v-model="data" class="w-55!" placeholder="请输入内容" />
</template>

View File

@@ -23,6 +23,6 @@ const icon = ref("ep:add-location");
代码位置 src/views/components/icon-select.vue
</el-link>
</template>
<IconSelect v-model="icon" class="w-[200px]" />
<IconSelect v-model="icon" class="w-50" />
</el-card>
</template>

View File

@@ -5,7 +5,7 @@ const value = ref(0);
</script>
<template>
<div class="max-w-[600px] ml-4">
<div class="max-w-150 ml-4">
<el-slider v-model="value" show-input size="large" />
<el-slider v-model="value" show-input />
<el-slider v-model="value" show-input size="small" />

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

@@ -106,11 +106,11 @@ const swiperExample: any[] = [
</template>
<el-row :gutter="10">
<el-col v-for="item in swiperExample" :key="item.id" :span="12">
<h6 class="py-[16px]! text-base">{{ item.label }}</h6>
<h6 class="py-4! text-base">{{ item.label }}</h6>
<swiper v-bind="item.options">
<swiper-slide v-for="i in 5" :key="i">
<div
class="flex justify-center items-center h-[240px] border border-[#999]"
class="flex justify-center items-center h-60 border border-[#999]"
>
Slide{{ i }}
</div>

View File

@@ -91,7 +91,7 @@ const endTime = ref("");
<el-time-picker
v-model="value"
placeholder="请选择时间"
class="w-[140px]!"
class="w-35!"
:size="dynamicSize"
:disabled="size === 'disabled'"
/>
@@ -100,7 +100,7 @@ const endTime = ref("");
v-model="value1"
arrow-control
placeholder="请选择时间"
class="w-[140px]!"
class="w-35!"
:size="dynamicSize"
:disabled="size === 'disabled'"
/>
@@ -110,7 +110,7 @@ const endTime = ref("");
<div class="mb-2">限制时间选择范围</div>
<el-time-picker
v-model="value2"
class="w-[140px]!"
class="w-35!"
:disabled-hours="disabledHours"
:disabled-minutes="disabledMinutes"
:disabled-seconds="disabledSeconds"
@@ -123,7 +123,7 @@ const endTime = ref("");
<div class="mb-2">任意时间范围</div>
<el-time-picker
v-model="value3"
class="w-[220px]!"
class="w-55!"
is-range
range-separator="至"
start-placeholder="开始时间"
@@ -153,7 +153,7 @@ const endTime = ref("");
<el-time-select
v-model="value4"
placeholder="请选择时间"
class="w-[140px]!"
class="w-35!"
start="08:30"
step="00:15"
end="18:30"
@@ -165,7 +165,7 @@ const endTime = ref("");
<el-time-select
v-model="value5"
placeholder="请选择时间"
class="w-[140px]!"
class="w-35!"
start="00:00"
step="00:30"
end="23:59"
@@ -179,7 +179,7 @@ const endTime = ref("");
<el-time-select
v-model="startTime"
placeholder="开始时间"
class="w-[140px]!"
class="w-35!"
:max-time="endTime"
start="08:30"
step="00:15"
@@ -190,7 +190,7 @@ const endTime = ref("");
<el-time-select
v-model="endTime"
placeholder="结束时间"
class="w-[140px]!"
class="w-35!"
:min-time="startTime"
start="08:30"
step="00:15"

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("提交失败");
@@ -58,7 +58,7 @@ const resetForm = formEl => {
drag
multiple
action="#"
class="w-[200px]!"
class="w-50!"
:auto-upload="false"
>
<div class="el-upload__text">
@@ -75,7 +75,7 @@ const resetForm = formEl => {
<el-date-picker
v-model="validateForm.date"
type="datetime"
class="w-[200px]!"
class="w-50!"
placeholder="请选择日期时间"
value-format="YYYY-MM-DD HH:mm:ss"
/>

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"
@@ -190,7 +190,7 @@ const onDownload = () => {
class="el-upload-list__item-delete"
@click="handleRemove(file)"
>
<span title="移除" class="hover:text-[var(--el-color-danger)]">
<span title="移除" class="hover:text-(--el-color-danger)">
<IconifyIconOffline
:icon="Delete"
class="hover:scale-125 duration-100"
@@ -222,7 +222,7 @@ const onDownload = () => {
type="info"
class="img-name"
>
<p class="text-[#fff] dark:text-black">
<p class="text-white dark:text-black">
{{ fileList[curOpenImgIndex].name }}
</p>
</div>
@@ -243,7 +243,7 @@ const onDownload = () => {
<div>
<p class="text-center">上传接口相关截图</p>
<el-image
class="w-[200px] rounded-md"
class="w-50 rounded-md"
:src="srcList[0]"
:preview-src-list="srcList"
fit="cover"
@@ -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

@@ -29,8 +29,8 @@ defineOptions({
</el-link>
</template>
<div class="w-full flex justify-around flex-wrap">
<vertical-list class="h-[500px] w-[500px]" />
<horizontal-list class="h-[500px] w-[500px]" />
<vertical-list class="size-125" />
<horizontal-list class="size-125" />
</div>
</el-card>
</template>

View File

@@ -24,7 +24,7 @@ const filteredItems = computed(() => {
垂直模式 vertical
<el-input
v-model="search"
class="w-[350px]!"
class="w-87.5!"
clearable
placeholder="Filter..."
/>

View File

@@ -14,7 +14,7 @@ const router = useRouter();
<h1>业务内容模块</h1>
<p>使用场景需要外嵌平台某个页面不需要展示菜单导航以及额外模块</p>
<div class="back" title="返回上一页" @click="router.go(-1)">
<back class="w-[80px] h-[80px]" />
<back class="size-20" />
</div>
</div>
</template>

View File

@@ -38,12 +38,14 @@ const dataLoading = ref(true);
const getCardListData = async () => {
try {
const { data } = await getCardList();
productList.value = data.list;
pagination.value = {
...pagination.value,
total: data.list.length
};
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

@@ -8,7 +8,7 @@ const { t } = useI18n();
</script>
<template>
<Motion class="-mt-2 -mb-2">
<Motion class="-my-2">
<ReQrcode :text="t('login.pureTest')" />
</Motion>
<Motion :delay="100">

View File

@@ -73,23 +73,21 @@ const onLogin = async (formEl: FormInstance | undefined) => {
username: ruleForm.username,
password: ruleForm.password
})
.then(res => {
if (res.success) {
// 获取后端路由
return initRouter().then(() => {
disabled.value = true;
router
.push(getTopMenu(true).path)
.then(() => {
message(t("login.pureLoginSuccess"), { type: "success" });
})
.finally(() => (disabled.value = false));
});
} else {
message(t("login.pureLoginFail"), { type: "error" });
}
.then(async () => {
// 获取后端路由
await initRouter();
disabled.value = true;
router.push(getTopMenu(true).path).then(() => {
message(t("login.pureLoginSuccess"), { type: "success" });
});
})
.finally(() => (loading.value = false));
.catch(_err => {
message(t("login.pureLoginFail"), { type: "error" });
})
.finally(() => {
disabled.value = false;
loading.value = false;
});
}
});
};
@@ -135,7 +133,7 @@ watch(loginDay, value => {
<!-- 国际化 -->
<el-dropdown trigger="click">
<globalization
class="hover:text-primary hover:bg-[transparent]! w-[20px] h-[20px] ml-1.5 cursor-pointer outline-hidden duration-300"
class="hover:text-primary hover:bg-transparent! size-5 ml-1.5 cursor-pointer outline-hidden duration-300"
/>
<template #dropdown>
<el-dropdown-menu class="translation">
@@ -236,7 +234,7 @@ watch(loginDay, value => {
<Motion :delay="250">
<el-form-item>
<div class="w-full h-[20px] flex justify-between items-center">
<div class="w-full h-5 flex-bc">
<el-checkbox v-model="checked">
<span class="flex">
<select
@@ -287,7 +285,7 @@ watch(loginDay, value => {
<Motion :delay="300">
<el-form-item>
<div class="w-full h-[20px] flex justify-between items-center">
<div class="w-full h-5 flex-bc">
<el-button
v-for="(item, index) in operates"
:key="index"
@@ -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));
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
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

@@ -39,14 +39,14 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-full pl-8 pt-[12px] overflow-auto"
class="search-form bg-bg_color w-full pl-8 pt-3 overflow-auto"
>
<el-form-item label="用户名" prop="username">
<el-input
v-model="form.username"
placeholder="请输入用户名"
clearable
class="w-[150px]!"
class="w-37.5!"
/>
</el-form-item>
<el-form-item label="登录状态" prop="status">
@@ -54,7 +54,7 @@ const {
v-model="form.status"
placeholder="请选择"
clearable
class="w-[150px]!"
class="w-37.5!"
>
<el-option label="成功" value="1" />
<el-option label="失败" value="0" />
@@ -103,7 +103,7 @@ const {
<div
v-if="selectedNum > 0"
v-motion-fade
class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
class="bg-(--el-fill-color-light) w-full h-11.5 mb-2 pl-4 flex items-center"
>
<div class="flex-auto">
<span

View File

@@ -134,11 +134,13 @@ export function useRole(tableRef: Ref) {
async function onSearch() {
loading.value = true;
const { data } = await getOperationLogsList(toRaw(form));
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
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

@@ -39,14 +39,14 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-full pl-8 pt-[12px] overflow-auto"
class="search-form bg-bg_color w-full pl-8 pt-3 overflow-auto"
>
<el-form-item label="所属模块" prop="module">
<el-input
v-model="form.module"
placeholder="请输入所属模块"
clearable
class="w-[170px]!"
class="w-42.5!"
/>
</el-form-item>
<el-form-item label="操作状态" prop="status">
@@ -54,7 +54,7 @@ const {
v-model="form.status"
placeholder="请选择"
clearable
class="w-[150px]!"
class="w-37.5!"
>
<el-option label="成功" value="1" />
<el-option label="失败" value="0" />
@@ -103,7 +103,7 @@ const {
<div
v-if="selectedNum > 0"
v-motion-fade
class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
class="bg-(--el-fill-color-light) w-full h-11.5 mb-2 pl-4 flex items-center"
>
<div class="flex-auto">
<span

View File

@@ -204,11 +204,13 @@ export function useRole(tableRef: Ref) {
async function onSearch() {
loading.value = true;
const { data } = await getSystemLogsList(toRaw(form));
dataList.value = data.list;
pagination.total = data.total;
pagination.pageSize = data.pageSize;
pagination.currentPage = data.currentPage;
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

@@ -42,14 +42,14 @@ const {
ref="formRef"
:inline="true"
:model="form"
class="search-form bg-bg_color w-full pl-8 pt-[12px] overflow-auto"
class="search-form bg-bg_color w-full pl-8 pt-3 overflow-auto"
>
<el-form-item label="所属模块" prop="module">
<el-input
v-model="form.module"
placeholder="请输入所属模块"
clearable
class="w-[170px]!"
class="w-42.5!"
/>
</el-form-item>
<el-form-item label="请求时间" prop="requestTime">
@@ -95,7 +95,7 @@ const {
<div
v-if="selectedNum > 0"
v-motion-fade
class="bg-[var(--el-fill-color-light)] w-full h-[46px] mb-2 pl-4 flex items-center"
class="bg-(--el-fill-color-light) w-full h-11.5 mb-2 pl-4 flex items-center"
>
<div class="flex-auto">
<span

Some files were not shown because too many files have changed in this diff Show More