Merge branch 'main' into feature/multi-packages
merge main to feature/multi-packages
This commit is contained in:
10
index.html
10
index.html
@@ -4,16 +4,6 @@
|
|||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" href="/favicon.svg" />
|
<link rel="icon" href="/favicon.svg" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<script src="/vconsole.min.js"></script>
|
|
||||||
<script>
|
|
||||||
var vConsole = new VConsole({
|
|
||||||
// defaultPlugins: ['SYSTEM', 'CONSOLE', 'NETWORK']
|
|
||||||
});
|
|
||||||
// 如果需要在页面加载完成后才显示 vConsole,可以监听 DOMContentLoaded 事件
|
|
||||||
document.addEventListener('DOMContentLoaded', function () {
|
|
||||||
vConsole.show();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
<title>%VITE_APP_TITLE%</title>
|
<title>%VITE_APP_TITLE%</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|||||||
@@ -1 +1,10 @@
|
|||||||
<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 35.999 35.999 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.211 83.211 0 01-5.23 36.74 102.983 102.983 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.37 54.37 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.903 7.903 0 01-6.7 9 64.744 64.744 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.628 93.628 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.744 72.744 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.134 10.134 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.324 60.324 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.085 85.085 0 0173.07 87c.524.015 1-.307 1.18-.8a76.06 76.06 0 006.53-22.3c.351-2.652.518-5.325.5-8z" fill="#646cff"/><path d="M136.26 108.34a44.742 44.742 0 01-11.13-2.87 46.108 46.108 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75c1.546.155 3.058.553 4.48 1.18a8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zm-80.6-75.02a7.61 7.61 0 016.64 5 49.139 49.139 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.679 31.679 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zm22.26 93.25a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.043 51.043 0 0154 123.81a45.842 45.842 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="#646cff"/></svg>
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1742355837219" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2674" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200">
|
||||||
|
<path d="M512 794.666667m-58.666667 0a58.666667 58.666667 0 1 0 117.333334 0 58.666667 58.666667 0 1 0-117.333334 0Z" p-id="2675" fill="#646cff" >
|
||||||
|
</path>
|
||||||
|
<path d="M512 170.666667A622.56 622.56 0 0 0 46.24 379.413333a5.333333 5.333333 0 0 0 0.533333 7.626667l48.266667 42.346667a5.333333 5.333333 0 0 0 7.466667-0.48 548.533333 548.533333 0 0 1 818.986666 0 5.333333 5.333333 0 0 0 7.466667 0.48l48-42.346667a5.333333 5.333333 0 0 0 0.48-7.626667A622.186667 622.186667 0 0 0 512 170.666667z" p-id="2676" fill="#646cff" >
|
||||||
|
</path>
|
||||||
|
<path d="M512 371.946667A421.6 421.6 0 0 0 197.76 512a5.333333 5.333333 0 0 0 0.48 7.68l48 42.24a5.333333 5.333333 0 0 0 7.466667-0.48 347.2 347.2 0 0 1 516.16 0 5.333333 5.333333 0 0 0 7.466666 0.48l48-42.24a5.333333 5.333333 0 0 0 0.48-7.68A421.6 421.6 0 0 0 512 371.946667z" p-id="2677" fill="#646cff" >
|
||||||
|
</path>
|
||||||
|
<path d="M512 555.733333a238.293333 238.293333 0 0 0-176 77.44 5.333333 5.333333 0 0 0 0.48 7.68l48 42.186667a5.333333 5.333333 0 0 0 7.466667-0.426667 163.893333 163.893333 0 0 1 240 0 5.333333 5.333333 0 0 0 7.466666 0.426667l48-42.186667a5.333333 5.333333 0 0 0 0.48-7.68A238.293333 238.293333 0 0 0 512 555.733333z" p-id="2678" fill="#646cff" >
|
||||||
|
</path>
|
||||||
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
1
public/favicon2.svg
Normal file
1
public/favicon2.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 35.999 35.999 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.211 83.211 0 01-5.23 36.74 102.983 102.983 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.37 54.37 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.903 7.903 0 01-6.7 9 64.744 64.744 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.628 93.628 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.744 72.744 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.134 10.134 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.324 60.324 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.085 85.085 0 0173.07 87c.524.015 1-.307 1.18-.8a76.06 76.06 0 006.53-22.3c.351-2.652.518-5.325.5-8z" fill="#646cff"/><path d="M136.26 108.34a44.742 44.742 0 01-11.13-2.87 46.108 46.108 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75c1.546.155 3.058.553 4.48 1.18a8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zm-80.6-75.02a7.61 7.61 0 016.64 5 49.139 49.139 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.679 31.679 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zm22.26 93.25a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.043 51.043 0 0154 123.81a45.842 45.842 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="#646cff"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
10
public/vconsole.min.js
vendored
10
public/vconsole.min.js
vendored
File diff suppressed because one or more lines are too long
@@ -1 +1,10 @@
|
|||||||
<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 35.999 35.999 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.211 83.211 0 01-5.23 36.74 102.983 102.983 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.37 54.37 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.903 7.903 0 01-6.7 9 64.744 64.744 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.628 93.628 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.744 72.744 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.134 10.134 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.324 60.324 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.085 85.085 0 0173.07 87c.524.015 1-.307 1.18-.8a76.06 76.06 0 006.53-22.3c.351-2.652.518-5.325.5-8z" fill="currentColor"/><path d="M136.26 108.34a44.742 44.742 0 01-11.13-2.87 46.108 46.108 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75c1.546.155 3.058.553 4.48 1.18a8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zm-80.6-75.02a7.61 7.61 0 016.64 5 49.139 49.139 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.679 31.679 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zm22.26 93.25a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.043 51.043 0 0154 123.81a45.842 45.842 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="currentColor"/></svg>
|
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1742355837219" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2674" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200">
|
||||||
|
<path d="M512 794.666667m-58.666667 0a58.666667 58.666667 0 1 0 117.333334 0 58.666667 58.666667 0 1 0-117.333334 0Z" p-id="2675" fill="currentColor" >
|
||||||
|
</path>
|
||||||
|
<path d="M512 170.666667A622.56 622.56 0 0 0 46.24 379.413333a5.333333 5.333333 0 0 0 0.533333 7.626667l48.266667 42.346667a5.333333 5.333333 0 0 0 7.466667-0.48 548.533333 548.533333 0 0 1 818.986666 0 5.333333 5.333333 0 0 0 7.466667 0.48l48-42.346667a5.333333 5.333333 0 0 0 0.48-7.626667A622.186667 622.186667 0 0 0 512 170.666667z" p-id="2676" fill="currentColor" >
|
||||||
|
</path>
|
||||||
|
<path d="M512 371.946667A421.6 421.6 0 0 0 197.76 512a5.333333 5.333333 0 0 0 0.48 7.68l48 42.24a5.333333 5.333333 0 0 0 7.466667-0.48 347.2 347.2 0 0 1 516.16 0 5.333333 5.333333 0 0 0 7.466666 0.48l48-42.24a5.333333 5.333333 0 0 0 0.48-7.68A421.6 421.6 0 0 0 512 371.946667z" p-id="2677" fill="currentColor" >
|
||||||
|
</path>
|
||||||
|
<path d="M512 555.733333a238.293333 238.293333 0 0 0-176 77.44 5.333333 5.333333 0 0 0 0.48 7.68l48 42.186667a5.333333 5.333333 0 0 0 7.466667-0.426667 163.893333 163.893333 0 0 1 240 0 5.333333 5.333333 0 0 0 7.466666 0.426667l48-42.186667a5.333333 5.333333 0 0 0 0.48-7.68A238.293333 238.293333 0 0 0 512 555.733333z" p-id="2678" fill="currentColor" >
|
||||||
|
</path>
|
||||||
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
1
src/assets/svg-icon/logo2.svg
Normal file
1
src/assets/svg-icon/logo2.svg
Normal file
@@ -0,0 +1 @@
|
|||||||
|
<svg viewBox="0 0 160 160" xmlns="http://www.w3.org/2000/svg"><path d="M81.28 55.9c-.1-11.67-2.93-22.55-9.37-32.38-1-1.5-2.14-2.86-2.5-4.71a8.1 8.1 0 014-8.61 7.89 7.89 0 019.3 1.23 35.999 35.999 0 015.9 8.83 75.18 75.18 0 018.44 28.58 83.211 83.211 0 01-5.23 36.74 102.983 102.983 0 01-3 7.28 1.2 1.2 0 000 1.41c9.58 13.3 21.76 23 37.85 27.24a54.37 54.37 0 0019.68 1.57 7.72 7.72 0 018.36 6.9 7.903 7.903 0 01-6.7 9 64.744 64.744 0 01-23-1.33 77.68 77.68 0 01-36.93-19.88 93.628 93.628 0 01-11.91-13.71 2.18 2.18 0 00-2.3-1.06 72.744 72.744 0 00-27.38 7.55c-11.6 6-20.67 14.58-26.4 26.45a10.134 10.134 0 01-3.7 4.7 8 8 0 01-9.19-.7 7.86 7.86 0 01-2.36-9.28 60.324 60.324 0 018.72-14.52c12.2-15.43 28.21-24.59 47.32-28.57A85.085 85.085 0 0173.07 87c.524.015 1-.307 1.18-.8a76.06 76.06 0 006.53-22.3c.351-2.652.518-5.325.5-8z" fill="currentColor"/><path d="M136.26 108.34a44.742 44.742 0 01-11.13-2.87 46.108 46.108 0 01-19.66-13.76 8 8 0 015.72-13.22 7.93 7.93 0 016.54 2.93 33.27 33.27 0 0018.87 10.75c1.546.155 3.058.553 4.48 1.18a8.08 8.08 0 013.84 9.21c-.92 3.52-4.13 5.81-8.66 5.78zm-80.6-75.02a7.61 7.61 0 016.64 5 49.139 49.139 0 013.64 17 46.33 46.33 0 01-2.46 17.28c-2 5.77-8.24 7.79-12.89 4.15a8.1 8.1 0 01-2.39-9 31.679 31.679 0 001.68-12.36 35.77 35.77 0 00-2.43-11c-2.1-5.45 1.75-11.07 8.21-11.07zm22.26 93.25a8 8 0 01-6.68 7.86 32.88 32.88 0 00-19.7 12.19 8.13 8.13 0 01-11.21 1.62 8 8 0 01-1.41-11.58A51.043 51.043 0 0154 123.81a45.842 45.842 0 0114-5.1c5.35-1.04 9.91 2.56 9.92 7.86z" fill="currentColor"/></svg>
|
||||||
|
After Width: | Height: | Size: 1.5 KiB |
@@ -8,13 +8,13 @@ import { localStg } from '@/utils/storage';
|
|||||||
*
|
*
|
||||||
* @param lang
|
* @param lang
|
||||||
*/
|
*/
|
||||||
export function setDayjsLocale(lang: App.I18n.LangType = 'zh-CN') {
|
export function setDayjsLocale(lang: App.I18n.LangType = 'en-US') {
|
||||||
const localMap = {
|
const localMap = {
|
||||||
'zh-CN': 'zh-cn',
|
'zh-CN': 'zh-cn',
|
||||||
'en-US': 'en'
|
'en-US': 'en'
|
||||||
} satisfies Record<App.I18n.LangType, string>;
|
} satisfies Record<App.I18n.LangType, string>;
|
||||||
|
|
||||||
const l = lang || localStg.get('lang') || 'zh-CN';
|
const l = lang || localStg.get('lang') || 'en-US';
|
||||||
|
|
||||||
locale(localMap[l]);
|
locale(localMap[l]);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { localStg } from '@/utils/storage';
|
|||||||
import messages from './locale';
|
import messages from './locale';
|
||||||
|
|
||||||
const i18n = createI18n({
|
const i18n = createI18n({
|
||||||
locale: localStg.get('lang') || 'zh-CN',
|
locale: localStg.get('lang') || 'en-US',
|
||||||
fallbackLocale: 'en',
|
fallbackLocale: 'en',
|
||||||
messages,
|
messages,
|
||||||
legacy: false
|
legacy: false
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ export const request = createFlatRequest<App.Service.Response, InstanceState>(
|
|||||||
const Authorization = token ? `Bearer ${token}` : null;
|
const Authorization = token ? `Bearer ${token}` : null;
|
||||||
|
|
||||||
// set language
|
// set language
|
||||||
const ContentLanguage = localStg.get('lang') || 'zh-CN';
|
const ContentLanguage = localStg.get('lang') || 'en-US';
|
||||||
Object.assign(headers, { Authorization, "Content-Language": ContentLanguage });
|
Object.assign(headers, { Authorization, "Content-Language": ContentLanguage });
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
@@ -148,7 +148,7 @@ export const rawRequest = createRequest(
|
|||||||
const Authorization = token ? `Bearer ${token}` : null;
|
const Authorization = token ? `Bearer ${token}` : null;
|
||||||
|
|
||||||
// set language
|
// set language
|
||||||
const ContentLanguage = localStg.get('lang') || 'zh-CN';
|
const ContentLanguage = localStg.get('lang') || 'en-US';
|
||||||
Object.assign(headers, { Authorization, "Content-Language": ContentLanguage });
|
Object.assign(headers, { Authorization, "Content-Language": ContentLanguage });
|
||||||
|
|
||||||
return config;
|
return config;
|
||||||
|
|||||||
1
src/typings/components.d.ts
vendored
1
src/typings/components.d.ts
vendored
@@ -34,6 +34,7 @@ declare module 'vue' {
|
|||||||
AMenu: typeof import('ant-design-vue/es')['Menu']
|
AMenu: typeof import('ant-design-vue/es')['Menu']
|
||||||
AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
|
AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
|
||||||
AModal: typeof import('ant-design-vue/es')['Modal']
|
AModal: typeof import('ant-design-vue/es')['Modal']
|
||||||
|
APagination: typeof import('ant-design-vue/es')['Pagination']
|
||||||
APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
|
APopconfirm: typeof import('ant-design-vue/es')['Popconfirm']
|
||||||
APopover: typeof import('ant-design-vue/es')['Popover']
|
APopover: typeof import('ant-design-vue/es')['Popover']
|
||||||
AppLoading: typeof import('./../components/common/app-loading.vue')['default']
|
AppLoading: typeof import('./../components/common/app-loading.vue')['default']
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ async function getCheckCode() {
|
|||||||
</div>
|
</div>
|
||||||
</AFormItem>
|
</AFormItem>
|
||||||
|
|
||||||
<ASpace direction="vertical" size="large" class="w-full">
|
<ASpace direction="vertical" class="w-full">
|
||||||
<div class="flex-y-center justify-between">
|
<div class="flex-y-center justify-between">
|
||||||
<!-- <ACheckbox>{{ $t('page.login.pwdLogin.rememberMe') }}</ACheckbox>-->
|
<!-- <ACheckbox>{{ $t('page.login.pwdLogin.rememberMe') }}</ACheckbox>-->
|
||||||
<AButton type="text" @click="toggleLoginModule('reset-pwd')">{{ t('page.login.pwdLogin.forgetPassword') }}</AButton>
|
<AButton type="text" @click="toggleLoginModule('reset-pwd')">{{ t('page.login.pwdLogin.forgetPassword') }}</AButton>
|
||||||
@@ -124,15 +124,12 @@ async function getCheckCode() {
|
|||||||
<AButton type="primary" block size="large" shape="round" :loading="authStore.loginLoading" @click="handleSubmit">
|
<AButton type="primary" block size="large" shape="round" :loading="authStore.loginLoading" @click="handleSubmit">
|
||||||
{{ $t('common.confirm') }}
|
{{ $t('common.confirm') }}
|
||||||
</AButton>
|
</AButton>
|
||||||
<div class="flex-y-center justify-between">
|
|
||||||
<!-- <AButton class="h-34px flex-1" block @click="toggleLoginModule('code-login')">-->
|
<!-- <AButton class="h-34px flex-1" block @click="toggleLoginModule('code-login')">-->
|
||||||
<!-- {{ t(loginModuleRecord['code-login']) }}-->
|
<!-- {{ t(loginModuleRecord['code-login']) }}-->
|
||||||
<!-- </AButton>-->
|
<!-- </AButton>-->
|
||||||
<div class="w-12px"></div>
|
<AButton class="h-34px flex-1" block size="large" shape="round" @click="toggleLoginModule('register')">
|
||||||
<AButton class="h-34px flex-1" block @click="toggleLoginModule('register')">
|
|
||||||
{{ t(loginModuleRecord.register) }}
|
{{ t(loginModuleRecord.register) }}
|
||||||
</AButton>
|
</AButton>
|
||||||
</div>
|
|
||||||
</ASpace>
|
</ASpace>
|
||||||
</AForm>
|
</AForm>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user