center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
983 Commits 1 Branch 86 Tags 417 MiB
34d58277ab
Commit Graph

150 Commits

Author SHA1 Message Date
wangjiahao
c9b206ccd8 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
#	backend/src/main/java/io/dataease/base/mapper/ext/AuthMapper.xml
#	backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
#	backend/src/main/resources/generatorConfig.xml
#	frontend/src/views/panel/list/PanelViewShow.vue
 2021-05-18 16:14:46 +08:00
wangjiahao
79e93655ec feat: 数据权限配置 2021-05-18 16:07:19 +08:00
fit2cloud-chenyw
31e5cca439 feat:前端增加国际化切换 2021-05-18 15:46:14 +08:00
junjie
a9201c794e feat(frontend):i18n fix;run build 样式冲突 fix后测试 2021-05-17 19:11:07 +08:00
junjie
83fa095052 feat(frontend):i8n fix；top-bar 右上角个人信息 i18n样式优化 2021-05-17 17:23:29 +08:00
taojinlong
c96ae8caf2 feat: 去掉暫未支持的按鈕 2021-05-17 15:18:47 +08:00
taojinlong
e2e2b09fee feat: 国际化 2021-05-17 14:19:46 +08:00
taojinlong
622169a33e refactor: 去掉调试信息 2021-05-12 11:53:50 +08:00
fit2cloud-chenyw
9d6680ad31 feat: 插件管理v0.01 2021-05-11 16:32:21 +08:00
wangjiahao
0959535093 fix: 背景图片空url 问题 2021-05-08 10:42:23 +08:00
wangjiahao
33a93b8916 feat:主题 2021-05-07 19:20:47 +08:00
wangjiahao
53b021bbf7 feat:样式修改 2021-05-06 23:40:34 +08:00
wangjiahao
01eb4abca6 feat:增加预览背景设置 解决改变窗口大小 echart 有滚动条的问题 2021-05-06 10:58:46 +08:00
wangjiahao
9ba7aeaedc feat:仪表盘支持表格 2021-05-05 23:48:05 +08:00
wangjiahao
cd5f1af773 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/canvas/components/Editor/ContextMenu.vue
 2021-05-05 22:14:47 +08:00
wangjiahao
2cd2365770 feat:主题设置 2021-05-05 22:14:23 +08:00
fit2cloud-chenyw
1285ba494d feat: 系统管理弹框改为隐藏路由 2021-04-29 12:46:51 +08:00
fit2cloud-chenyw
e32be3b5a5 feat: 用户管理弹窗修改 2021-04-28 17:09:05 +08:00
fit2cloud-chenyw
52d31b504e fix: 表格按照最新fit2cloud-ui样式 2021-04-28 14:54:55 +08:00
junjie
86d87d7b47 fix(frontend): 视图 表格合计fix；仪表盘跳转视图编辑fix 2021-04-27 18:10:05 +08:00
wangjiahao
0f644e7842 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/canvas/components/Toolbar.vue
#	frontend/src/views/panel/edit/index.vue
 2021-04-27 10:30:04 +08:00
wangjiahao
43489d63f1 feat:恢复显示设置，仪表盘样式设置等 2021-04-27 10:28:55 +08:00
fit2cloud-chenyw
d28a69e056 feat: 调整一级菜单 2021-04-22 17:59:16 +08:00
fit2cloud-chenyw
69f5a09cdc feat: 解决关闭编辑页面但是没有关闭左侧面板 2021-04-22 13:46:59 +08:00
fit2cloud-chenyw
5327d5170b Merge remote-tracking branch 'origin/main' into main 2021-04-20 10:24:54 +08:00
fit2cloud-chenyw
d8239381cc feat: 修复重复查询条件 2021-04-20 10:24:39 +08:00
wangjiahao
7cdc0c220f Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/canvas/custom-component/UserView.vue
 2021-04-19 18:21:07 +08:00
wangjiahao
5405332dc2 feat:仪表盘模板导入导出 2021-04-19 18:20:15 +08:00
fit2cloud-chenyw
149eb535bb feat: 增加数字下拉 2021-04-19 18:10:46 +08:00
fit2cloud-chenyw
b87766adce feat: 设置必须绑定数据集字段 2021-04-19 17:40:15 +08:00
fit2cloud-chenyw
5ec60144e8 feat: 过滤条件 2021-04-19 16:50:31 +08:00
fit2cloud-chenyw
fb53686109 feat: 下拉框样式 2021-04-19 15:53:26 +08:00
fit2cloud-chenyw
5af4158dc4 feat:设置条件绑定视图 2021-04-19 15:31:03 +08:00
fit2cloud-chenyw
e2a5a2f440 feat: 过滤条件格式修改 2021-04-19 11:51:12 +08:00
fit2cloud-chenyw
9de0749200 feat: 查询条件编辑 2021-04-19 10:47:07 +08:00
fit2cloud-chenyw
ee63e0be73 feat: 定义操作符 2021-04-16 17:42:29 +08:00
fit2cloud-chenyw
e5715d6898 feat:优化查询条件 2021-04-16 17:26:13 +08:00
fit2cloud-chenyw
fea7ceec9b feat: 优化过滤组件 2021-04-15 10:33:22 +08:00
junjie
1276109f47 feat(frontend):仪表板样式微调 2021-04-14 15:18:53 +08:00
wangjiahao
91a7696615 feat:合并bug修复 2021-04-09 18:19:45 +08:00
wangjiahao
53c1d36c4f Merge remote-tracking branch 'origin/main' into main 2021-04-09 13:53:21 +08:00
wangjiahao
57fe2bc62f feat:样式修改 2021-04-09 13:53:04 +08:00
fit2cloud-chenyw
acdfd5015f feat: 大改前存档 2021-04-09 11:58:03 +08:00
fit2cloud-chenyw
8f2c2fbc30 feat: 条件过滤组件公共功能 2021-04-08 18:18:08 +08:00
wangjiahao
ff02cb9a1f fix:禁用localstorage存储仪表盘数据 容易导致浏览器本地存储越界 2021-04-08 17:46:02 +08:00
wangjiahao
8d61299f3e Merge remote-tracking branch 'origin/main' into main 2021-04-08 16:54:53 +08:00
wangjiahao
dfde1da4f4 feat:仪表盘样式适配 2021-04-08 16:54:37 +08:00
fit2cloud-chenyw
dc6419302f feat: 过滤组件年份页面 2021-04-08 11:39:00 +08:00
fit2cloud-chenyw
4ee166e86c feat: 过滤组件 2021-04-07 17:54:37 +08:00
wangjiahao
09b772bc18 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/canvas/components/Editor/PreviewEject.vue
 2021-04-07 11:15:32 +08:00
wangjiahao
547801ceeb feat:预览增加自适应屏幕尺寸功能 2021-04-07 11:12:02 +08:00
fit2cloud-chenyw
26a25d0338 feat: 删除debugger 2021-04-07 09:49:07 +08:00
fit2cloud-chenyw
a783be2556 feat: 过滤组件弹框选择数据 2021-04-06 19:10:16 +08:00
wangjiahao
1538ff6406 feat:增加预览连接功能 2021-04-06 15:07:13 +08:00
wangjiahao
ea7efe5608 feat:预览弹出 2021-04-06 10:16:11 +08:00
wangjiahao
c4cea61e5e feat:修复编辑视图后 原有画布样式还原问题 2021-04-01 18:54:14 +08:00
wangjiahao
334638adf4 feat:画布增加视图编辑功能 2021-04-01 18:36:51 +08:00
wangjiahao
2d7ad3224b feat:画布切换修改 2021-04-01 17:40:12 +08:00
wangjiahao
10feea18a9 Merge remote-tracking branch 'origin/main' into main 2021-04-01 14:42:57 +08:00
wangjiahao
31b291a3ec feat:增加画布鼠标悬停虚线边框 2021-04-01 14:42:46 +08:00
wangjiahao
33468cf39b feat:增加画布鼠标悬停虚线边框 2021-04-01 14:31:45 +08:00
fit2cloud-chenyw
7fe40040a2 Merge remote-tracking branch 'origin/main' into main 2021-04-01 13:34:06 +08:00
fit2cloud-chenyw
f89f1726cc feat: 过滤组件样式调整 2021-04-01 13:33:40 +08:00
wangjiahao
eaa4cf9a7f feat:恢复合并冲突 2021-04-01 11:56:46 +08:00
wangjiahao
d7d4c77b66 Merge branch 'main' of github.com:dataease/dataease into main 2021-04-01 11:50:27 +08:00
wangjiahao
c87a6f132c feat:仪表盘预览 2021-04-01 11:38:30 +08:00
fit2cloud-chenyw
ebf90fb02a feat: 组件解偶 使用继承 2021-03-31 18:23:43 +08:00
fit2cloud-chenyw
8bbb8c7e9b feat: 封装条件组件类 2021-03-30 19:01:46 +08:00
wangjiahao
af24ba2733 feat:封装画布组件 2021-03-30 16:11:59 +08:00
wangjiahao
8016aba46a feat:将画布整合在组件中 2021-03-30 15:38:32 +08:00
fit2cloud-chenyw
ab2a840bd5 feat: 封装条件组件 2021-03-29 21:24:33 +08:00
wangjiahao
50c692fefb feat:恢复冲突 2021-03-29 15:49:29 +08:00
wangjiahao
873a03065c feat:增加仪表盘预览等功能 2021-03-29 14:57:04 +08:00
wangjiahao
208878c062 feat:恢复样式 2021-03-26 12:26:48 +08:00
wangjiahao
fcb579d439 feat:增加背景图片 2021-03-26 11:37:32 +08:00
wangjiahao
0a75df5838 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/main.js
 2021-03-25 19:17:25 +08:00
wangjiahao
5db39b5855 feat:更换画布 2021-03-25 19:16:32 +08:00
junjie
c7351ac742 style(视图): css 2021-03-25 15:48:20 +08:00
fit2cloud-chenyw
7d248904d3 feat: 合并仪表板代码 2021-03-22 19:05:35 +08:00
wangjiahao
8a6b75eb97 feat:保存已经设计的面板 2021-03-22 17:27:16 +08:00
wangjiahao
3937624c57 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/vue-drag-resize-rotate/index.vue
#	frontend/src/store/modules/panel.js
#	frontend/src/views/panel/list/PanelViewShow.vue
 2021-03-19 15:57:29 +08:00
wangjiahao
592f08ac7b feat:增加仪表盘设计组件及设计 自适应view 组件 2021-03-19 15:54:35 +08:00
fit2cloud-chenyw
6440804d93 feat: 仪表盘分享页面 2021-03-17 18:50:29 +08:00
wangjiahao
1f6f8503b4 feat:增加仪表盘设计组件及设计 增加面板中 view 删除功能 2021-03-17 16:30:40 +08:00
fit2cloud-chenyw
46d24a17bc feat: 删除前端工程中meterSphere组件 2021-03-16 17:53:43 +08:00
fit2cloud-chenyw
2441edd166 feat: ESLint插件格式化前端代码 2021-03-16 12:02:30 +08:00
wangjiahao
d7e0eb64ef Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/components/vue-drag-resize-rotate/index.vue
 2021-03-16 11:39:04 +08:00
wangjiahao
915ccf326e feat:增加仪表盘设计组件及设计 2021-03-16 11:38:20 +08:00
fit2cloud-chenyw
ac8f8271ae feat: 新增树表格 2021-03-15 14:56:01 +08:00
fit2cloud-chenyw
19fa6975eb feat: 前段代码遵循ESLint规范 2021-03-12 21:51:37 +08:00
wangjiahao
13bb7663f8 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
 2021-03-12 16:10:18 +08:00
wangjiahao
8b80d8fa72 feat:增加仪表盘设计组件及设计 2021-03-12 16:08:55 +08:00
fit2cloud-chenyw
1992e84b59 feat:用户列表完善 2021-03-10 18:26:53 +08:00
fit2cloud-chenyw
fec733f262 feat: 使用fit2cloud-ui改造系统管理 2021-03-09 18:52:27 +08:00
fit2cloud-chenyw
d16cd853ca feat:eslint格式 scss样式 2021-03-08 12:29:11 +08:00
fit2cloud-chenyw
3df90648a1 feat:样式调整 2021-03-08 11:57:18 +08:00
fit2cloud-chenyw
7965552518 feat: 样式调整 2021-03-07 21:29:41 +08:00
fit2cloud-chenyw
f04809c638 feat: 新前端 2021-03-03 15:06:52 +08:00
taojinlong
3a141cad25 feat: 初始化 2021-02-20 10:23:37 +08:00
taojinlong
41c53b451b feat: 修改包名 2021-02-19 16:34:02 +08:00