update: convert js to ts

2023-03-10 18:22:34 +08:00 · 2023-03-10 18:22:34 +08:00 · 71605b426d
commit 71605b426d
parent 80f9a724df
14 changed files with 17 additions and 12 deletions
--- a/index.html
+++ b/index.html
@ -8,6 +8,6 @@
  </head>
  <body>
    <div id="app"></div>
-    <script type="module" src="/src/main.js"></script>
+    <script type="module" src="/src/main.ts"></script>
  </body>
 </html>
--- a/src/directive/clipboard/clipboard.ts
+++ b/src/directive/clipboard/clipboard.ts
--- a/src/directive/clipboard/index.ts
+++ b/src/directive/clipboard/index.ts
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
--- a/src/directive/permission/permission.ts
+++ b/src/directive/permission/permission.ts
--- a/src/directive/waves/index.ts
+++ b/src/directive/waves/index.ts
--- a/src/directive/waves/waves.ts
+++ b/src/directive/waves/waves.ts
--- a/src/icons/index.js
+++ b/src/icons/index.js
@ -1,5 +0,0 @@
-import SvgIcon from '@/components/SvgIcon';// svg component
-
-import.meta.globEager('./svg/*.svg');
-
-export default SvgIcon;
--- a/src/icons/index.ts
+++ b/src/icons/index.ts
@ -0,0 +1,5 @@
+import SvgIcon from '@/components/SvgIcon/index.vue';// svg component
+
+import.meta.glob('./svg/*.svg', { eager: true });
+
+export default SvgIcon;
--- a/src/main.ts
+++ b/src/main.ts
@ -7,7 +7,7 @@ import { setupStore } from './store';
 import '@/styles/index.scss';
 import SvgIcon from './icons'; // icon
 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);
 setupStore(app);
--- a/src/permission.ts
+++ b/src/permission.ts
@ -37,7 +37,12 @@ router.beforeEach(async (to, from, next) => {
        try {
          // get user info
          // 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
          const accessRoutes = await permissionStore().generateRoutes(roles);
@ -53,7 +58,8 @@ router.beforeEach(async (to, from, next) => {
          // hack method to ensure that addRoutes is complete
          // set the replace: true, so the navigation will not leave a history record
          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
          await userStore().resetToken();
          ElMessage.error(error.message || 'Has Error');
--- a/src/settings.ts
+++ b/src/settings.ts
--- a/src/store/index.ts
+++ b/src/store/index.ts
@ -1,8 +1,7 @@
 import { createPinia, acceptHMRUpdate } from 'pinia';
 import type { StoreDefinition } from 'pinia';
 // 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);

 // you do not need `import app from './modules/app'`
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@ -5,7 +5,7 @@ import router, { resetRouter } from '@/router';
 import tagsViewStore from './tagsView';
 import permissionStore from './permission';

-interface IUserState {
+export interface IUserState {
  token: string;
  name: string;
  avatar: string;