center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
4,774 Commits 1 Branch 86 Tags 417 MiB
7d91962d3b
Commit Graph

2534 Commits

Author SHA1 Message Date
fit2cloud-chenyw
7d248904d3 feat: 合并仪表板代码 2021-03-22 19:05:35 +08:00
junjie
4ab6a15c93 refactor(视图): 拖拽bug fix；标题编辑、图形属性编辑优化； 2021-03-22 18:27:53 +08:00
wangjiahao
7a529b29d5 Merge remote-tracking branch 'origin/main' into main 2021-03-22 17:27:38 +08:00
wangjiahao
8a6b75eb97 feat:保存已经设计的面板 2021-03-22 17:27:16 +08:00
junjie
e891798af7 refactor(视图): css调整 2021-03-22 17:17:04 +08:00
junjie
6a8568673b feat(视图): 1.增加 雷达图、面积堆叠图；2.iconfont样式调整；3.echarts组件配置调整 2021-03-22 15:55:39 +08:00
junjie
d6e07577c0 feat(视图): 组件样式，增加标题、图例的样式设置 2021-03-22 14:04:43 +08:00
junjie
2fad127615 feat(视图): 组件样式，增加标题、图例的样式设置 2021-03-22 13:44:07 +08:00
fit2cloud-chenyw
7cd71cd601 feat: 仪表板布局 2021-03-19 18:01:45 +08:00
junjie
811840da86 feat(视图): 添加平滑折线 2021-03-19 17:57:26 +08:00
wangjiahao
69ae877b0a feat:格式化代码 2021-03-19 17:06:52 +08:00
junjie
da17802f94 feat(frontend): 前端调整 2021-03-19 16:59:57 +08:00
junjie
be13e864ea feat(frontend): 前端调整 2021-03-19 16:57:52 +08:00
fit2cloud-chenyw
2fc15a5a33 feat: 删除不必要全局依赖 2021-03-19 16:49:38 +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
junjie
d24d103f4a feat(视图): 组件属性调整 2021-03-19 15:53:58 +08:00
junjie
7b24b457e9 feat(视图): 视图echarts 支持 大小 调整 2021-03-19 14:28:38 +08:00
fit2cloud-chenyw
f0b34763d4 feat: 获取用户信息ehcache缓存机制 2021-03-19 13:05:14 +08:00
fit2cloud-chenyw
670a640606 feat: 分享面板懒加载且动态刷新 2021-03-19 10:00:41 +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
junjie
a83864e13d feat(视图): 漏斗图配置调整 2021-03-18 17:55:28 +08:00
junjie
f891dc5aca feat(视图): 1.丰富chart种类；2.echarts option封装；3.增加一些不太好看的svg作为图表类型icon-font 2021-03-18 17:20:59 +08:00
fit2cloud-chenyw
760b05e277 feat: 分享页面api 2021-03-18 16:56:24 +08:00
fit2cloud-chenyw
9e9fb73892 feat: 仪表盘分享页面完善 2021-03-18 16:55:31 +08:00
junjie
3f5d2bee53 feat(视图): 视图组件临时封装 2021-03-18 11:05:14 +08:00
junjie
d50fbd21ca feat(视图): 视图编辑调整 2021-03-18 10:08:12 +08:00
fit2cloud-chenyw
6440804d93 feat: 仪表盘分享页面 2021-03-17 18:50:29 +08:00
fit2cloud-chenyw
cdbc7ea9ee Merge remote-tracking branch 'origin/main' into main 2021-03-17 18:38:40 +08:00
wangjiahao
464d42a4ec Merge remote-tracking branch 'origin/main' into main 2021-03-17 16:30:53 +08:00
wangjiahao
1f6f8503b4 feat:增加仪表盘设计组件及设计 增加面板中 view 删除功能 2021-03-17 16:30:40 +08:00
junjie
63fe122209 refactor(视图): 图形属性，增加 配色方案 功能 2021-03-17 16:12:30 +08:00
fit2cloud-chenyw
8367033bb4 feat: 仪表盘分享tab 2021-03-17 11:22:18 +08:00
fit2cloud-chenyw
7f4a9d6bd2 feat: 仪表盘分享首次提交 2021-03-16 18:28:19 +08:00
fit2cloud-chenyw
46d24a17bc feat: 删除前端工程中meterSphere组件 2021-03-16 17:53:43 +08:00
fit2cloud-chenyw
f775dc8c87 Merge remote-tracking branch 'origin/main' into main 2021-03-16 16:35:33 +08:00
junjie
016654cf74 refactor(frontend): 视图 指标下拉菜单扩展 2021-03-16 14:48:06 +08:00
fit2cloud-chenyw
05500fffdf Merge remote-tracking branch 'origin/main' into main 2021-03-16 13:42:53 +08:00
junjie
cdf50243c9 refactor(frontend): 视图 指标下拉菜单扩展 2021-03-16 13:32:35 +08:00
fit2cloud-chenyw
2441edd166 feat: ESLint插件格式化前端代码 2021-03-16 12:02:30 +08:00
junjie
221227e710 refactor(css): css 调整 2021-03-16 11:55:22 +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
bad0bf003a feat: 格式化 2021-03-15 18:24:38 +08:00
fit2cloud-chenyw
a05fb2db52 fix: 处理token过期错误 2021-03-15 18:23:12 +08:00
junjie
1ae2d00621 refactor(css): css 调整 2021-03-15 18:18:11 +08:00
fit2cloud-chenyw
0bf906779e feat: 完善权限管理 2021-03-15 17:23:21 +08:00
junjie
d565385aca feat(数据集): css调整，el-table替换umy-ui 2021-03-15 15:51:34 +08:00
junjie
c8f9ba00dd feat(数据集): 数据集添加SQL保存，数据预览展示等功能 2021-03-15 15:24:10 +08:00
fit2cloud-chenyw
ac8f8271ae feat: 新增树表格 2021-03-15 14:56:01 +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
a0ee5d636f fix: 修复打包部署前端刷新被拦截的bu 2021-03-15 10:29:39 +08:00
fit2cloud-chenyw
19fa6975eb feat: 前段代码遵循ESLint规范 2021-03-12 21:51:37 +08:00
junjie
573641b426 feat(数据集): 添加SQL，UI初步 2021-03-12 18:18:51 +08:00
junjie
47c39acb8d feat(数据集): 添加SQL，UI初步 2021-03-12 17:49:41 +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
junjie
59a10a2786 feat(数据集): 数据集 2021-03-12 14:17:26 +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
taojinlong
ccb37e9ee8 build: 打包 2021-03-11 16:29:53 +08:00
taojinlong
c0f3ec646f Merge branch 'main' of github.com:dataease/dataease into main 2021-03-11 16:24:55 +08:00
junjie
b0e42fd75c feat(视图): chart调整 2021-03-11 16:02:28 +08:00
taojinlong
2ddfedb52c build: 打包 2021-03-11 16:00:10 +08:00
junjie
9ae93df8fb feat(视图): css调整 2021-03-11 15:57:54 +08:00
junjie
7ced290c00 feat(视图): echarts组件封装，初步实现 2021-03-11 15:24:25 +08:00
junjie
6c28ec072e feat(视图): echarts组件封装，初步实现 2021-03-11 15:19:44 +08:00
junjie
00bce0ee7e feat(视图): echarts组件封装，初步实现 2021-03-11 15:06:13 +08:00
junjie
faeedeb1e9 refactor(frontend): ESLint vue code 2021-03-11 14:36:02 +08:00
junjie
d8c66325a9 feat(视图): 视图 指标 增加sum min等常用汇总方式 2021-03-11 14:33:24 +08:00
fit2cloud-chenyw
1fe79ec4e4 feat: 系统管理列表使用fit2cloud-ui 2021-03-11 14:09:38 +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
1992e84b59 feat:用户列表完善 2021-03-10 18:26:53 +08:00
junjie
afec128fc6 feat(视图): 视图编辑UI调整 2021-03-10 18:23:25 +08:00
junjie
27ea12ed88 feat(视图): 视图编辑UI调整 2021-03-10 16:01:29 +08:00
fit2cloud-chenyw
0c9e679ef4 feat: 循环中不用index作为key 2021-03-10 14:31:21 +08:00
fit2cloud-chenyw
e5941ee58b feat: 长时间无操作则token自动失效 2021-03-10 14:25:26 +08:00
fit2cloud-chenyw
fec733f262 feat: 使用fit2cloud-ui改造系统管理 2021-03-09 18:52:27 +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
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
fit2cloud-chenyw
e64013b23f feat:删除不必要依赖 2021-03-08 13:45:22 +08:00
fit2cloud-chenyw
8d553314fa feat:注释demo 2021-03-08 13:15:52 +08:00
fit2cloud-chenyw
d16cd853ca feat:eslint格式 scss样式 2021-03-08 12:29:11 +08:00
fit2cloud-chenyw
8b71b94b6c Merge remote-tracking branch 'origin/main' into main 2021-03-08 11:57:41 +08:00
fit2cloud-chenyw
3df90648a1 feat:样式调整 2021-03-08 11:57:18 +08:00
junjie
9d3a5bc39e feat:功能优化 2021-03-08 11:35:28 +08:00
fit2cloud-chenyw
708208d6d1 feat:修改主题样式 2021-03-08 11:09:46 +08:00
junjie
64f78e9b9e feat(frontend): 数据集 定时任务 管理 2021-03-08 10:05:09 +08:00
fit2cloud-chenyw
7965552518 feat: 样式调整 2021-03-07 21:29:41 +08:00
fit2cloud-chenyw
c1158932fa feat: 修复角色分页 2021-03-05 17:20:45 +08:00
fit2cloud-chenyw
09854fac6d feat: 修复ESLint格式 2021-03-05 16:16:47 +08:00
fit2cloud-chenyw
a647c66b8a feat: 增加权限设置 2021-03-05 16:07:44 +08:00
junjie
4c75b5b410 feat(backend): Quartz框架初步实现 2021-03-05 14:19:23 +08:00
junjie
7bb6a63ab2 feat(frontend): ui 调整 2021-03-04 18:11:30 +08:00
junjie
3de8579e11 feat(数据集): 数据集 定时任务 2021-03-04 15:38:37 +08:00
fit2cloud-chenyw
7254b65bd9 feat: 添加loading说明 2021-03-04 15:05:05 +08:00
fit2cloud-chenyw
02230d5e51 feat: 增加全局loading 2021-03-04 14:58:52 +08:00
junjie
2b104fa0f6 feat(frontend): 代码调整 2021-03-04 10:26:04 +08:00
xiajunjie
eae9d7ac8b feat(frontend):代码调整 2021-03-03 21:45:30 +08:00
xiajunjie
38e23864d2 feat(视图):升级ECharts版本 4.x -> 5.x，用新的，新的好看 2021-03-03 21:08:39 +08:00
junjie
f6ec2fb235 feat(frontend): 前端 数据集，视图 调整,echarts调整 2021-03-03 18:50:04 +08:00
junjie
b2f1926918 feat(frontend): 前端 数据集，视图 调整 2021-03-03 18:35:51 +08:00
fit2cloud-chenyw
71195722f8 feat: 调整response返回值 2021-03-03 18:20:59 +08:00
fit2cloud-chenyw
60d0146518 feat: 用户管理完善 2021-03-03 17:38:41 +08:00
fit2cloud-chenyw
b989f32770 feat: 删除xpack引用 2021-03-03 15:14:56 +08:00
fit2cloud-chenyw
f04809c638 feat: 新前端 2021-03-03 15:06:52 +08:00
fit2cloud-chenyw
f5cc065301 feat: 删除metersphere前端 2021-03-03 14:54:18 +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
wangjiahao
1fa5518566 feat:恢复勿删文件 2021-03-01 11:37:04 +08:00
xiajunjie
4506951d5d feat(fronted): fix 2021-02-26 21:10:11 +08:00
junjie
1c254669f0 feat(视图): 视图组件编辑界面，echarts 2021-02-26 18:14:24 +08:00
fit2cloud-chenyw
f62ca6b588 Merge remote-tracking branch 'origin/main' into main 2021-02-26 15:38:50 +08:00
fit2cloud-chenyw
ee6e220b01 feat: 前端调整 2021-02-26 15:37:44 +08:00
junjie
43b3d4d466 feat(fronted): 创建视图，选择数据集 2021-02-26 12:25:38 +08:00
junjie
941fe1fb23 fix(fronted): 恢复前端被误删代码 2021-02-26 12:24:51 +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
xiajunjie
b2b8814ee5 feat(fronted): 大半夜的 临时提交 明天再搞 2021-02-25 22:46:00 +08:00
junjie
43e7567fc0 feat(视图): 临时提交，视图编辑 2021-02-25 18:16:31 +08:00
junjie
201cc6f4a6 feat(数据集): 字段类型抽象转换 2021-02-25 18:15:10 +08:00
junjie
b642ba1c78 feat(frontend): chart 2021-02-25 16:43:32 +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
junjie
0db99298f4 refactor: 代码调整 2021-02-25 12:36:08 +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
xiajunjie
7de87b6672 feat(数据集): 表字段抽象，字段编辑、选择 2021-02-24 21:19:31 +08:00
fit2cloud-chenyw
b6503809b1 feat: 用户列表 2021-02-24 19:29:17 +08:00
fit2cloud-chenyw
2934e3cbc0 feat: 用户状态 2021-02-24 19:08:05 +08:00
fit2cloud-chenyw
7199172c61 feat: 用户管理 2021-02-24 18:52:09 +08:00
junjie
49195e266a feat(数据集): i18n fix... 2021-02-24 18:12:58 +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
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
fit2cloud-chenyw
6f3f98b1e6 feat: 新增图表选择组件 2021-02-23 15:06:38 +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
fit2cloud-chenyw
638ecb9bb2 feat: 解决组织机构树懒加载回显问题 2021-02-23 10:32:53 +08:00
junjie
edeba4bb6a feat(frontend): 数据集 2021-02-22 18:22:27 +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
taojinlong
112460af5a fix: 冲突 2021-02-22 15:40:38 +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
d3b15391e1 datasource 2021-02-20 18:35:09 +08:00
junjie
dd2ed93bfa feat: Dataset 分组 场景 2021-02-20 18:13:46 +08:00
junjie
2890e29e9b feat(frontend): 临时提交--数据集->分组，场景ui 2021-02-20 15:17:09 +08:00
fit2cloud-chenyw
a0773f11c0 Merge branch 'main' of fit2cloud:dataease/dataease into main 2021-02-20 11:53:53 +08:00
fit2cloud-chenyw
145a96fa3e feat: 注释非必要代码 2021-02-20 11:51:26 +08:00
taojinlong
15e3fc0c54 feat: 初始化 2021-02-20 10:41:52 +08:00
taojinlong
3a141cad25 feat: 初始化 2021-02-20 10:23:37 +08:00
junjie
fad0d937e6 fix: file move 2021-02-19 17:49:45 +08:00
fit2cloud-chenyw
96463b09e0 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	dataease-commons/dataease-common-auth/src/main/java/io/dataease/commons/auth/config/F2cRealm.java
#	frontend/src/api/user-token.js
#	frontend/src/store/modules/user-token.js
 2021-02-19 17:08:56 +08:00
taojinlong
41c53b451b feat: 修改包名 2021-02-19 16:34:02 +08:00