Commit Graph

13 Commits

Author SHA1 Message Date
tonglx
59b6a2f73b merge from cool-admin-vue-5.x 2022-05-20 10:36:51 +08:00
tonglx
0c1bd6a824 clear 2022-05-20 10:35:27 +08:00
tonglx
4f34e9f5cf Merge branch '5.x' of https://github.com/cool-team-official/cool-admin-vue into cool-team-official-5.x
# Conflicts:
#	.eslintrc.js
#	.vscode/crud.code-snippets
#	build/cool/lib/menu/index.ts
#	build/cool/lib/menu/rules.ts
#	build/svg/index.ts
#	index.html
#	package.json
#	src/App.vue
#	src/assets/css/index.scss
#	src/assets/logo-text.png
#	src/assets/logo.png
#	src/cool/hook/index.ts
#	src/cool/index.ts
#	src/cool/utils/index.ts
#	src/cool/utils/storage.ts
#	src/main.ts
#	src/mock/index.ts
#	src/modules/base/common/theme.ts
#	src/modules/base/components/avatar/index.vue
#	src/modules/base/components/codemirror/index.vue
#	src/modules/base/components/date/text.vue
#	src/modules/base/components/editor-quill/index.vue
#	src/modules/base/components/icon/svg.vue
#	src/modules/base/components/image/index.vue
#	src/modules/base/components/link/index.vue
#	src/modules/base/components/scrollbar/index.vue
#	src/modules/base/pages/error-page/403.vue
#	src/modules/base/pages/error-page/404.vue
#	src/modules/base/pages/error-page/500.vue
#	src/modules/base/pages/error-page/502.vue
#	src/modules/base/pages/error-page/components/error-page.vue
#	src/modules/base/pages/iframe/index.vue
#	src/modules/base/pages/layout/components/route-nav.vue
#	src/modules/base/pages/login/components/captcha.vue
#	src/modules/base/static/css/index.scss
#	src/modules/base/static/css/theme.scss
#	src/modules/base/views/components/dept-move.tsx
#	src/modules/base/views/components/dept-tree.vue
#	src/modules/base/views/components/menu-check.vue
#	src/modules/base/views/components/menu-create.vue
#	src/modules/base/views/components/menu-file.vue
#	src/modules/base/views/components/menu-perms.vue
#	src/modules/demo/components/demo/crud.vue
#	src/modules/demo/components/demo/editor-quill.vue
#	src/modules/demo/components/demo/svg.vue
#	src/modules/demo/components/demo/upload.vue
#	src/modules/demo/views/demo.vue
#	src/modules/demo/views/editor-quill.vue
#	src/modules/excel/components/export-btn.vue
#	src/modules/excel/utils/export2excel.ts
#	src/modules/excel/utils/index.ts
#	src/modules/index.ts
#	src/modules/task/components/cron/cn.ts
#	src/modules/task/components/cron/cron.vue
#	src/modules/task/views/task.vue
#	src/shims-vue.d.ts
#	src/views/home/components/category-ratio.vue
#	src/views/home/components/count-effect.vue
#	src/views/home/components/count-paid.vue
#	src/views/home/components/count-sales.vue
#	src/views/home/components/count-views.vue
#	src/views/home/components/hot-search.vue
#	src/views/home/components/sales-rank.vue
#	src/views/home/components/tab-chart.vue
#	src/views/home/index.vue
#	tsconfig.json
#	vite.config.ts
#	yarn.lock
2022-05-20 10:30:48 +08:00
tonglx
2d3e219f26 clear 2022-05-20 10:11:56 +08:00
icssoa
a1fc571dcd 优化快速创建菜单功能 2022-04-08 13:19:55 +08:00
icssoa
19d5e741ea test 1 2022-04-02 22:50:51 +08:00
icssoa
8e741ffa41 v4 测试 2021-12-05 23:09:33 +08:00
icssoa
db2a2d71c9 添加 useCool 2021-10-27 19:15:39 +08:00
icssoa
450c232c0a 添加 export 模块,添加 crud 依赖 2021-04-20 14:49:07 +08:00
icssoa
3862f9d382 调整结构,添加 /$ 2021-04-03 13:37:52 +08:00
icssoa
a6b3e9118e 添加 lint,解决 /@/ 找不到路径问题 2021-03-31 16:48:59 +08:00
icssoa
5b016fe92c 添加代码片段 2021-03-29 11:59:09 +08:00
icssoa
17d37d2462 初始化 2021-02-28 01:55:04 +08:00