diff --git a/composer.json b/composer.json index cfe7c99..ef41f4b 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,8 @@ "guzzlehttp/guzzle": "^7.2", "laravel/framework": "^9.44", "laravel/tinker": "^2.7", - "tymon/jwt-auth": "dev-develop" + "tymon/jwt-auth": "dev-develop", + "catchadmin/core": "^0.1.0" }, "require-dev": { "fakerphp/faker": "^1.9.1", diff --git a/modules/Permissions/views/router.ts b/modules/Permissions/views/router.ts deleted file mode 100644 index 4590ba2..0000000 --- a/modules/Permissions/views/router.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { RouteRecordRaw } from 'vue-router' - -// @ts-ignore -const router: RouteRecordRaw[] = [ - { - path: '/permission', - component: () => import('/admin/layout/index.vue'), - meta: { title: '权限管理', icon: 'user' }, - children: [ - { - path: 'roles', - name: 'roles', - meta: { title: '角色管理', icon: 'home' }, - component: () => import('./roles/index.vue'), - }, - { - path: 'permissions', - name: 'permissions', - meta: { title: '菜单管理', icon: 'home' }, - component: () => import('./permissions/index.vue'), - }, - { - path: 'jobs', - name: 'jobs', - meta: { title: '岗位管理', icon: 'home' }, - component: () => import('./jobs/index.vue'), - }, - { - path: 'departments', - name: 'departments', - meta: { title: '部门管理', icon: 'home' }, - component: () => import('./departments/index.vue'), - }, - ], - }, -] - -export default router diff --git a/package.json b/package.json index 45ede83..c7bdffc 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,10 @@ "@heroicons/vue": "^2.0.13", "@vueuse/core": "^9.7.0", "autoprefixer": "^10.4.13", - "element-plus": "^2.2.27", + "element-plus": "^2.2.28", "nprogress": "^0.2.0", "pinia": "^2.0.28", - "postcss": "^8.4.20", + "postcss": "^8.4.21", "tailwindcss": "^3.2.2", "terser": "^5.15.1", "vue": "^3.2.44", @@ -23,30 +23,30 @@ "vuedraggable": "^4.1.0" }, "devDependencies": { - "@iconify-json/logos": "^1.1.19", + "@iconify-json/logos": "^1.1.22", "@rollup/plugin-alias": "^4.0.2", "@types/mockjs": "^1.0.7", - "@types/node": "^18.11.16", + "@types/node": "^18.11.18", "@types/nprogress": "^0.2.0", - "@typescript-eslint/eslint-plugin": "^5.46.1", - "@typescript-eslint/parser": "^5.46.1", + "@typescript-eslint/eslint-plugin": "^5.48.1", + "@typescript-eslint/parser": "^5.48.1", "@vitejs/plugin-vue": "^4.0.0", "@vitejs/plugin-vue-jsx": "^3.0.0", - "axios": "^1.2.1", - "eslint": "^8.30.0", + "axios": "^1.2.2", + "eslint": "^8.31.0", "eslint-config-standard": "^17.0.0", "eslint-plugin-import": "^2.25.2", "eslint-plugin-n": "^15.6.0", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-vue": "^9.8.0", "prettier": "2.8.1", - "sass": "^1.57.0", + "sass": "^1.57.1", "typescript": "^4.9.4", "unplugin-auto-import": "^0.12.1", "unplugin-icons": "^0.14.15", "unplugin-vue-components": "^0.22.12", - "vite": "^4.0.2", + "vite": "^4.0.4", "vite-plugin-html": "^3.2.0", - "vue-tsc": "^1.0.13" + "vue-tsc": "^1.0.24" } } diff --git a/resources/admin/types/menu.ts b/resources/admin/types/Menu.ts similarity index 100% rename from resources/admin/types/menu.ts rename to resources/admin/types/Menu.ts diff --git a/resources/admin/types/Role.ts b/resources/admin/types/Role.ts deleted file mode 100644 index 336ce12..0000000 --- a/resources/admin/types/Role.ts +++ /dev/null @@ -1 +0,0 @@ -export {}