WxxyDeveloper/Jsl-OA-Web-Re
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update: convert js to ts

Browse Source
This commit is contained in:
midfar 2023-03-10 18:22:34 +08:00
parent 80f9a724df
commit 71605b426d
14 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -8,6 +8,6 @@
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>
<script type="module" src="/src/main.js"></script> <script type="module" src="/src/main.ts"></script>
</body> </body>
</html> </html>

0
src/directive/clipboard/clipboard.js → src/directive/clipboard/clipboard.ts
View File

0
src/directive/clipboard/index.js → src/directive/clipboard/index.ts
View File

0
src/directive/permission/index.js → src/directive/permission/index.ts
View File

0
src/directive/permission/permission.js → src/directive/permission/permission.ts
View File

0
src/directive/waves/index.js → src/directive/waves/index.ts
View File

0
src/directive/waves/waves.js → src/directive/waves/waves.ts
View File

5
src/icons/index.js
View File

@ -1,5 +0,0 @@
import SvgIcon from '@/components/SvgIcon';// svg component
import.meta.globEager('./svg/*.svg');
export default SvgIcon;

5
src/icons/index.ts Normal file
View File

@ -0,0 +1,5 @@
import SvgIcon from '@/components/SvgIcon/index.vue';// svg component
import.meta.glob('./svg/*.svg', { eager: true });
export default SvgIcon;

2
src/main.js → src/main.ts
View File

@ -7,7 +7,7 @@ import { setupStore } from './store';
import '@/styles/index.scss'; import '@/styles/index.scss';
import SvgIcon from './icons'; // icon import SvgIcon from './icons'; // icon
import './permission'; // permission control import './permission'; // permission control
import vPermission from './directive/permission/index.js'; // permission control import vPermission from './directive/permission/index'; // permission control
const app = createApp(App); const app = createApp(App);
setupStore(app); setupStore(app);

10
src/permission.js → src/permission.ts
View File

@ -37,7 +37,12 @@ router.beforeEach(async (to, from, next) => {
try { try {
// get user info // get user info
// note: roles must be a object array! such as: ['admin'] or ,['developer','editor'] // note: roles must be a object array! such as: ['admin'] or ,['developer','editor']
const { roles } = await userStore().getInfo(); // eslint-disable-next-line @typescript-eslint/no-explicit-any
const infoRes = await userStore().getInfo() as any;
let roles = [];
if (infoRes.roles) {
roles = infoRes.roles;
}
// generate accessible routes map based on roles // generate accessible routes map based on roles
const accessRoutes = await permissionStore().generateRoutes(roles); const accessRoutes = await permissionStore().generateRoutes(roles);
@ -53,7 +58,8 @@ router.beforeEach(async (to, from, next) => {
// hack method to ensure that addRoutes is complete // hack method to ensure that addRoutes is complete
// set the replace: true, so the navigation will not leave a history record // set the replace: true, so the navigation will not leave a history record
next({ ...to, replace: true }); next({ ...to, replace: true });
} catch (error) { // eslint-disable-next-line @typescript-eslint/no-explicit-any
} catch (error: any) {
// remove token and go to login page to re-login // remove token and go to login page to re-login
await userStore().resetToken(); await userStore().resetToken();
ElMessage.error(error.message || 'Has Error'); ElMessage.error(error.message || 'Has Error');

0
src/settings.js → src/settings.ts
View File

3
src/store/index.ts
View File

@ -1,8 +1,7 @@
import { createPinia, acceptHMRUpdate } from 'pinia'; import { createPinia, acceptHMRUpdate } from 'pinia';
import type { StoreDefinition } from 'pinia'; import type { StoreDefinition } from 'pinia';
// https://webpack.js.org/guides/dependency-management/#requirecontext // https://webpack.js.org/guides/dependency-management/#requirecontext
const modulesFiles = import.meta.globEager('./modules/*.ts'); const modulesFiles = import.meta.glob('./modules/*.ts', { eager: true });
// console.log('modulesFiles=', modulesFiles); // console.log('modulesFiles=', modulesFiles);
// you do not need `import app from './modules/app'` // you do not need `import app from './modules/app'`

2
src/store/modules/user.ts
View File

@ -5,7 +5,7 @@ import router, { resetRouter } from '@/router';
import tagsViewStore from './tagsView'; import tagsViewStore from './tagsView';
import permissionStore from './permission'; import permissionStore from './permission';
interface IUserState { export interface IUserState {
token: string; token: string;
name: string; name: string;
avatar: string; avatar: string;