Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: 支持多标签页打开已经登录的系统后无需再登录并添加7天内免登录功能 #747

Merged
merged 2 commits into from
Oct 7, 2023
Merged

feat: 支持多标签页打开已经登录的系统后无需再登录并添加7天内免登录功能 #747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21c3ab8
feat: 支持多标签页打开已经登录的系统后无需再登录
xiaoxian521 Oct 6, 2023
b42ee50
feat: 添加`7`天内免登录功能
xiaoxian521 Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion locales/en.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ login:
username: Username
password: Password
verifyCode: VerifyCode
remember: Remember Password
remember: No need to login for 7 days
rememberInfo: After checking and logging in, you will automatically log in to the system without entering your username and password within 7 days
sure: Sure Password
forget: Forget Password?
login: Login
Expand Down
3 changes: 2 additions & 1 deletion locales/zh-CN.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ login:
username: 账号
password: 密码
verifyCode: 验证码
remember: 记住密码
remember: 7天内免登录
rememberInfo: 勾选并登录后，7天内无需输入用户名和密码会自动登入系统
sure: 确认密码
forget: 忘记密码?
login: 登录
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
"prettier": "^3.0.3",
"rimraf": "^5.0.5",
"rollup-plugin-visualizer": "^5.9.2",
"sass": "^1.68.0",
"sass": "^1.69.0",
"sass-loader": "^13.3.2",
"stylelint": "^15.10.3",
"stylelint-config-html": "^1.1.0",
Expand All @@ -157,7 +157,7 @@
"tailwindcss": "^3.3.3",
"terser": "^5.21.0",
"typescript": "^5.2.2",
"vite": "^4.4.10",
"vite": "^4.4.11",
"vite-plugin-cdn-import": "^0.3.5",
"vite-plugin-compression": "^0.5.1",
"vite-plugin-mock": "2.9.6",
Expand Down
80 changes: 40 additions & 40 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions src/layout/components/setting/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,6 @@ import {
nextTick,
onBeforeMount
} from "vue";
import {
useDark,
debounce,
useGlobal,
storageLocal,
storageSession
} from "@pureadmin/utils";
import { getConfig } from "@/config";
import { useRouter } from "vue-router";
import panel from "../panel/index.vue";
Expand All @@ -27,6 +20,7 @@ import { useAppStoreHook } from "@/store/modules/app";
import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
import { useDark, debounce, useGlobal, storageLocal } from "@pureadmin/utils";

import dayIcon from "@/assets/svg/day.svg?component";
import darkIcon from "@/assets/svg/dark.svg?component";
Expand Down Expand Up @@ -133,7 +127,6 @@ const multiTagsCacheChange = () => {
function onReset() {
removeToken();
storageLocal().clear();
storageSession().clear();
const { Grey, Weak, MultiTagsCache, EpThemeColor, Layout } = getConfig();
useAppStoreHook().setLayout(Layout);
setEpThemeColor(EpThemeColor);
Expand Down
Loading