center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
5,535 Commits 1 Branch 86 Tags 417 MiB
215d262bbf
Commit Graph

2035 Commits

Author SHA1 Message Date
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
fit2cloud-chenyw
1eae5f2e37 feat: 创建公共链接 2021-03-25 18:58:05 +08:00
junjie
a664a79e5f feat(数据集): fix 2021-03-25 18:18:44 +08:00
junjie
6b51090887 feat(数据集): 1.删除分组，场景将同时删除dataset和chart；2.数据集SQL模式可以重新编辑SQL 2021-03-25 18:09:44 +08:00
junjie
586b3ef24f feat(视图): fix sql 2021-03-25 11:58:13 +08:00
junjie
b3a53f9a64 feat(视图): 1.初步增加结果过滤，条件之间暂时只支持'且'逻辑；2.fix设置显示名bug；3.一些样式调整 2021-03-25 11:34:46 +08:00
junjie
7e2da332e4 feat(视图): UI调整，汇总结果增加升、降序 2021-03-23 18:08:56 +08:00
junjie
1c6b6336fb feat(backend): 数据集sql修改 2021-03-23 15:41:45 +08:00
fit2cloud-chenyw
3b87239aa2 feat: 仪表板选择视图 2021-03-23 13:58:49 +08:00
wangjiahao
8a6b75eb97 feat:保存已经设计的面板 2021-03-22 17:27:16 +08:00
wangjiahao
9e02503328 feat:增加仪表盘设计组件及设计 增加默认数据 2021-03-19 16:39:42 +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
f88e8ec777 fix: 分享列表数据重复 2021-03-19 13:59:45 +08:00
fit2cloud-chenyw
f0b34763d4 feat: 获取用户信息ehcache缓存机制 2021-03-19 13:05:14 +08:00
fit2cloud-chenyw
9d1a7e4e0f feat: 完善分享列表 2021-03-18 18:30:10 +08:00
TaoJinlong
d171a6ccfa Merge branch 'main' of https://github.com/dataease/dataease into main 2021-03-18 18:00:23 +08:00
TaoJinlong
e97297fd84 feat: 增量更新数据 2021-03-18 17:59:52 +08:00
fit2cloud-chenyw
9e9fb73892 feat: 仪表盘分享页面完善 2021-03-18 16:55:31 +08:00
fit2cloud-chenyw
6440804d93 feat: 仪表盘分享页面 2021-03-17 18:50:29 +08:00
TaoJinlong
5f823af95a fix: sql 2021-03-17 13:17:47 +08:00
fit2cloud-chenyw
5781da135a feat: 仪表板收藏分享 后台接口 2021-03-16 16:59:49 +08:00
TaoJinlong
029eb33e8c Merge branch 'main' of https://github.com/dataease/dataease into main 2021-03-15 21:50:05 +08:00
fit2cloud-chenyw
a05fb2db52 fix: 处理token过期错误 2021-03-15 18:23:12 +08:00
TaoJinlong
52e4155a08 feat: 对接spark 2021-03-15 18:21:37 +08:00
TaoJinlong
bacabf8422 Merge branch 'main' of https://github.com/dataease/dataease into main 2021-03-15 17:44:32 +08:00
junjie
2756e73609 feat(SQL): SQL模式下，datasetTableField的原字段名，取select field as new_field ...as后边的值 2021-03-15 17:36:52 +08:00
fit2cloud-chenyw
0bf906779e feat: 完善权限管理 2021-03-15 17:23:21 +08:00
junjie
3a5921377f feat(SQL): 用户自己写SQL，将用户输入的SQL作为内部临时表处理 2021-03-15 17:08:54 +08:00
TaoJinlong
1aed2355c2 fix: 打包 2021-03-15 17:03:38 +08:00
junjie
c8f9ba00dd feat(数据集): 数据集添加SQL保存，数据预览展示等功能 2021-03-15 15:24:10 +08:00
junjie
8d911cd463 feat(数据集): 完成添加SQL的UI。使用umy-ui替换element-ui中el-table，支持超多行、列（上万数据）的table虚拟，grid虚拟，table不会卡顿 2021-03-15 12:25:11 +08:00
fit2cloud-chenyw
105d8a2a5f feat: datasource采用新的列表 2021-03-15 12:12:14 +08:00
fit2cloud-chenyw
19fa6975eb feat: 前段代码遵循ESLint规范 2021-03-12 21:51:37 +08:00
wangjiahao
1e0ebd8c59 feat:增加仪表盘设计组件及设计 2021-03-12 16:19:09 +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
e64d66bd58 feat: 在dataease.properties中增加白名单配置 2021-03-12 13:18:24 +08:00
fit2cloud-chenyw
311cc48341 feat: 组织机构按名称检索 2021-03-12 11:31:55 +08:00
fit2cloud-chenyw
390eb53d1e feat: 使用fit2cloud-ui查询条件 2021-03-11 22:58:05 +08:00
junjie
b0e42fd75c feat(视图): chart调整 2021-03-11 16:02:28 +08:00
taojinlong
c77b36864f build: 打包 2021-03-11 15:48:05 +08:00
junjie
d8c66325a9 feat(视图): 视图 指标 增加sum min等常用汇总方式 2021-03-11 14:33:24 +08:00
fit2cloud-chenyw
bab168f83d feat: 前后端一起打包 2021-03-11 13:30:04 +08:00
taojinlong
2c95a3c600 build: 打包 2021-03-11 11:44:59 +08:00
taojinlong
1eeacc2948 build: 打包 2021-03-11 11:41:29 +08:00
junjie
c330ff95a8 feat(数据集): 数据集调整 2021-03-11 10:37:58 +08:00
fit2cloud-chenyw
aae5fc59e0 fix: 合并 2021-03-10 18:34:43 +08:00
fit2cloud-chenyw
1992e84b59 feat:用户列表完善 2021-03-10 18:26:53 +08:00
taojinlong
d449e41cc1 feat: 抽取数据到hbase 2021-03-10 18:24:13 +08:00
taojinlong
c72d79999d feat: 抽取数据到hbase 2021-03-10 18:13:27 +08:00
fit2cloud-chenyw
e5941ee58b feat: 长时间无操作则token自动失效 2021-03-10 14:25:26 +08:00
fit2cloud-chenyw
2a766461ca fix: 修复token续命bug 2021-03-10 11:49:18 +08:00
junjie
9cda37b56c feat(数据集): 定时更新：更新日志列表展示 2021-03-09 16:04:16 +08:00
fit2cloud-chenyw
2fe3e8100d feat: 修改用户密码 2021-03-09 15:38:36 +08:00
taojinlong
fd1ddccfaa fix: sql 2021-03-09 13:35:34 +08:00
fit2cloud-chenyw
7a61cc7494 feat: 系统初始化参数 2021-03-09 10:10:56 +08:00
fit2cloud-chenyw
c34ad9a026 feat: ESlint格式化前端代码 2021-03-08 21:10:16 +08:00
wangjiahao
0d3e1d093f Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/views/panel/index.vue
 2021-03-08 18:44:13 +08:00
wangjiahao
fe9d8a2d44 feat:仪表盘 2021-03-08 18:43:28 +08:00
fit2cloud-chenyw
150b4c3982 feat: 完善token续命刷新机制 2021-03-08 18:19:57 +08:00
wangjiahao
f46912392c feat:仪表盘 2021-03-08 14:31:09 +08:00
junjie
9d3a5bc39e feat:功能优化 2021-03-08 11:35:28 +08:00
fit2cloud-chenyw
c1158932fa feat: 修复角色分页 2021-03-05 17:20:45 +08:00
fit2cloud-chenyw
a647c66b8a feat: 增加权限设置 2021-03-05 16:07:44 +08:00
junjie
a60a243114 feat(backend): Quartz框架初步实现 2021-03-05 14:53:36 +08:00
junjie
4c75b5b410 feat(backend): Quartz框架初步实现 2021-03-05 14:19:23 +08:00
junjie
3de8579e11 feat(数据集): 数据集 定时任务 2021-03-04 15:38:37 +08:00
fit2cloud-chenyw
60d0146518 feat: 用户管理完善 2021-03-03 17:38:41 +08:00
junjie
53b4cd94ce feat(flyway): flyway更新 2021-03-03 16:17:50 +08:00
fit2cloud-chenyw
61dea50701 feat: 适配新前端 2021-03-03 14:44:01 +08:00
junjie
b427e0b95f feat(数据更新): 同步 2021-03-03 14:26:41 +08:00
junjie
8c50976dcd feat(视图): 视图编辑保存，横纵维度指标，EChart展示 2021-03-02 14:37:44 +08:00
junjie
b6117d658a feat(视图): 视图编辑保存，横纵维度指标，EChart展示 2021-03-01 18:03:11 +08:00
fit2cloud-chenyw
8fca61aeb0 feat: 查询权限字段 2021-03-01 17:42:41 +08:00
wangjiahao
1fa5518566 feat:恢复勿删文件 2021-03-01 11:37:04 +08:00
fit2cloud-chenyw
5f6ab3c8fa feat: 恢复误删 2021-02-26 12:03:01 +08:00
fit2cloud-chenyw
6aeaf4aa49 feat: 添加默认admin用户 2021-02-26 11:44:43 +08:00
fit2cloud-chenyw
ccaa6a2774 feat: 恢复误删 2021-02-26 11:40:15 +08:00
fit2cloud-chenyw
b07ea4ab71 feat: 前后端auth模块重构 2021-02-26 11:27:33 +08:00
fit2cloud-chenyw
281caea95f feat: shiro从session模式改为token模式 增加jwt 2021-02-26 11:25:14 +08:00
junjie
201cc6f4a6 feat(数据集): 字段类型抽象转换 2021-02-25 18:15:10 +08:00
wangjiahao
a76cfadb11 Merge remote-tracking branch 'origin/main' into main 2021-02-25 16:31:54 +08:00
wangjiahao
b96f4bb7c5 feat:自定义样式,email 2021-02-25 16:31:09 +08:00
fit2cloud-chenyw
ad60ec2120 Merge remote-tracking branch 'origin/main' into main 2021-02-25 16:21:52 +08:00
fit2cloud-chenyw
624d921364 feat: 禁用alibaba-fastjson 重大安全漏洞 2021-02-25 16:18:50 +08:00
wangjiahao
c5f53f5ff3 Merge remote-tracking branch 'origin/main' into main 2021-02-25 16:04:31 +08:00
wangjiahao
5b1ec9b151 feat:自定义样式,email 2021-02-25 16:04:04 +08:00
taojinlong
9212b73fd7 Merge branch 'main' of github.com:dataease/dataease into main 2021-02-25 15:34:04 +08:00
taojinlong
5427545962 feat: 视图 2021-02-25 15:33:42 +08:00
fit2cloud-chenyw
38df90d341 feat: 删除不必要依赖 禁用alibaba-fastjson 重大安全漏洞 2021-02-25 12:28:55 +08:00
junjie
9085de668f refactor: 代码调整 2021-02-25 10:42:48 +08:00
junjie
dcc522dc05 refactor: 代码调整 2021-02-25 09:59:18 +08:00
fit2cloud-chenyw
2478683b61 feat: 用户更新 2021-02-24 22:04:05 +08:00
fit2cloud-chenyw
b6503809b1 feat: 用户列表 2021-02-24 19:29:17 +08:00
fit2cloud-chenyw
7199172c61 feat: 用户管理 2021-02-24 18:52:09 +08:00
junjie
1e5b97785b feat(数据集): 表字段抽象，字段编辑、选择 2021-02-24 18:20:56 +08:00
junjie
32502591df feat(数据集): 表字段抽象，字段编辑、选择 2021-02-24 18:06:21 +08:00
junjie
ab8d232169 feat(数据集): 表字段抽象，字段编辑、选择 2021-02-24 17:14:37 +08:00
fit2cloud-chenyw
586916a4b7 feat: 用户管理后台接口 2021-02-24 15:44:26 +08:00
fit2cloud-chenyw
bb17350411 feat: 增加用户管理dao层 2021-02-24 14:29:31 +08:00
fit2cloud-chenyw
a3d5a9a50b feat: sql增加用户管理表 2021-02-24 14:27:49 +08:00
fit2cloud-chenyw
2ba005db3d feat: 角色管理完善 2021-02-24 13:41:04 +08:00
junjie
7056db3b53 feat(数据集): 数据库表：mysql直连模式，表字段 类型 数据 读取展示 2021-02-24 11:21:37 +08:00
junjie
9272a0b954 feat(数据集): 数据库表：mysql直连模式，表字段 类型 数据 读取展示 2021-02-23 23:34:52 +08:00
fit2cloud-chenyw
923d7509a2 feat: 角色管理初始化 2021-02-23 22:16:43 +08:00
junjie
73bf229464 feat(数据集): 添加DB，DB curd 2021-02-23 18:23:56 +08:00
fit2cloud-chenyw
318ff15944 feat: 添加角色数据结构 2021-02-23 18:01:54 +08:00
taojinlong
7bfb85a705 Merge branch 'main' of github.com:dataease/dataease into main 2021-02-23 17:51:56 +08:00
taojinlong
1c8399ed26 feat: 支持 SQL Server 2021-02-23 17:50:04 +08:00
fit2cloud-chenyw
12d0d862b9 feat: 菜单初始化提交 2021-02-23 16:21:06 +08:00
junjie
7720debbaf feat(数据集): 连接 数据源，读取 表名 2021-02-23 14:31:56 +08:00
fit2cloud-chenyw
62ba927435 feat: 菜单构建 引入新的前端组件 2021-02-23 14:22:09 +08:00
fit2cloud-chenyw
0afbbf3174 feat: 修改组织创建时间类型 2021-02-23 10:58:03 +08:00
taojinlong
6d8158ffbe feat: 获取表的colume属性 2021-02-23 10:23:22 +08:00
taojinlong
daf441a0c9 Merge branch 'main' of github.com:dataease/dataease into main 2021-02-22 18:07:05 +08:00
taojinlong
a0146d9cfe feat: 获取表的colume属性 2021-02-22 18:06:37 +08:00
fit2cloud-chenyw
fa6c20da68 feat: 组织机构增删改 2021-02-22 17:52:31 +08:00
junjie
99a617e1be feat: flyway调整 2021-02-22 16:04:06 +08:00
taojinlong
593042f1b4 feat: 数据连接 2021-02-22 15:34:42 +08:00
taojinlong
fa58f02611 feat: 数据连接 2021-02-22 15:30:15 +08:00
junjie
75e9537a29 feat: 数据集 分组 场景 2021-02-22 15:23:08 +08:00
junjie
2b909be521 feat: 数据集 2021-02-20 22:07:42 +08:00
fit2cloud-chenyw
8ba0f91e7a feat: 组织机构 2021-02-20 18:40:43 +08:00
taojinlong
91372f77bc Merge branch 'main' of github.com:dataease/dataease into main 2021-02-20 18:35:50 +08:00
taojinlong
d3b15391e1 datasource 2021-02-20 18:35:09 +08:00
taojinlong
ce527d0058 fix: 包名称 2021-02-20 18:33:59 +08:00
junjie
dd2ed93bfa feat: Dataset 分组 场景 2021-02-20 18:13:46 +08:00
fit2cloud-chenyw
3d143c869a feat: 新增组织机构 2021-02-20 14:25:10 +08:00
taojinlong
15e3fc0c54 feat: 初始化 2021-02-20 10:41:52 +08:00
taojinlong
dc08904a81 feat: 初始化 2021-02-20 10:34:44 +08:00
taojinlong
11af9caead feat: 初始化 2021-02-20 10:23:50 +08:00
taojinlong
3a141cad25 feat: 初始化 2021-02-20 10:23:37 +08:00
taojinlong
00da67357a feat: 初始化 2021-02-20 10:07:25 +08:00