Commit Graph

202 Commits

Author SHA1 Message Date
tttclz
65ae253683
Merge branch 'cool-team-official:5.x' into 5.x 2022-06-06 08:52:17 +08:00
icssoa
55cbb1d7bb 调整 useBaseStore 为 useBase 2022-06-01 22:26:54 +08:00
tttclz
c68ef782e9
Merge branch 'cool-team-official:5.x' into 5.x 2022-06-01 08:34:52 +08:00
icssoa
eaee792bf5 移除cron选择器 2022-05-31 14:39:55 +08:00
tttclz
fddfac1beb
Merge branch 'cool-team-official:5.x' into 5.x 2022-05-24 18:46:48 +08:00
icssoa
beb5cc2ed0 解决 request code不存在问题 2022-05-23 14:38:42 +08:00
tonglx
93d2daf573 feat:
1、兼容svgBuilder的配置路径为单个路径或数组;
2022-05-21 09:03:08 +08:00
tonglx
45f4750eb8 feat:
1、可从每个模块里的icons/svg文件夹加载svg文件;
2、屏蔽相同名称的svg文件;
3、查找icons/svg结构的文件夹;
2022-05-21 08:39:30 +08:00
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
6491b62623 Merge branch 'cool-team-official-5.x' into 5.x 2022-05-20 10:32:58 +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
c63d374565 添加分割打包 2022-05-19 16:17:56 +08:00
icssoa
2c4d12f3ce 配置代理 2022-05-18 15:38:27 +08:00
icssoa
0684086f6d 添加 router.href 2022-05-18 15:33:33 +08:00
icssoa
94ae17dee4 调整 config 配置方式 2022-05-18 15:09:13 +08:00
icssoa
9572a73791 优化用户页面 2022-05-17 15:00:06 +08:00
icssoa
fdfd2d8ea5 调整 el-popover 显示方式 2022-05-17 11:02:02 +08:00
icssoa
39946cd784
Update quick.vue
修改权限拼接符
2022-05-17 09:59:48 +08:00
icssoa
856db94524
Merge pull request #45 from tttclz/vue3-ts-vite
target.prototype.url 赋值问题
2022-05-17 09:39:25 +08:00
icssoa
5945fb80ba 调整图片上传样式 2022-05-17 01:11:33 +08:00
icssoa
e622e50f22 解决 eps 解析异常 2022-05-16 20:56:45 +08:00
icssoa
bc30b0d891 添加组件示例 2022-05-16 14:02:44 +08:00
icssoa
537cd2f708 优化 2022-05-16 02:14:44 +08:00
icssoa
13c74533bd 解决logo不显示 2022-05-16 02:14:36 +08:00
icssoa
d3f6a06289 Merge branch '5.x' of https://e.coding.net/shancool/cool-admin/front-next into 5.x 2022-05-11 16:38:46 +08:00
icssoa
0937e96ad6 更新依赖,优化 2022-05-11 16:38:45 +08:00
icssoa
ff9b1b8d55 更新依赖,优化 2022-05-11 16:36:52 +08:00
icssoa
974d8f152a 修改上传路径 2022-05-08 12:26:26 +08:00
icssoa
624b1ece67 优化 2022-05-08 12:20:32 +08:00
icssoa
c14fccd7d9 优化插件 2022-04-21 12:54:31 +08:00
icssoa
644bce8cfe 移除 transition 2022-04-13 09:46:32 +08:00
icssoa
f5ca761ed1 优化 2022-04-13 01:57:36 +08:00
icssoa
112cb37802 添加主题模块 2022-04-13 01:42:46 +08:00
icssoa
c3b382f654 添加主题 2022-04-12 19:36:11 +08:00
icssoa
a1fc571dcd 优化快速创建菜单功能 2022-04-08 13:19:55 +08:00
icssoa
d79a771fd2 图片上传绑定值异常 2022-04-08 13:19:21 +08:00
icssoa
f6741e3de6 解决权限问题 2022-04-07 17:37:09 +08:00
icssoa
1967e8a53d eps 首次加载成功自动刷新 2022-04-07 17:36:53 +08:00
icssoa
22e2844047 修改默认代理 2022-04-07 15:08:40 +08:00
icssoa
49ea26ddbf 更新 crud 2022-04-06 09:55:02 +08:00
icssoa
e4f7f54b71 优化 2022-04-06 02:36:20 +08:00
icssoa
19d5e741ea test 1 2022-04-02 22:50:51 +08:00
ap
9ccf42489a 升级依赖 2022-02-25 14:01:30 +08:00
ap
0c95adbd2f 任务 2022-02-25 09:08:07 +08:00
icssoa
54dbf63b82 更新 task 2022-02-24 10:05:39 +08:00
icssoa
1b972df412 更新 crud 2022-02-24 09:46:19 +08:00
icssoa
70c585e0a9 Merge branch 'vue3-ts-vite' of https://e.coding.net/shancool/cool-admin/front-next into vue3-ts-vite 2022-02-24 09:42:09 +08:00
icssoa
bff76769b0 解决 task 数据显示异常 2022-02-24 09:42:07 +08:00