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
|
086ab38806
|
Merge remote-tracking branch 'origin/main' into main
|
2021-03-12 14:17:39 +08:00 |
|
junjie
|
59a10a2786
|
feat(数据集): 数据集
|
2021-03-12 14:17:26 +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
|
a708919f70
|
feat: 排除不需要提交文件
|
2021-03-12 09:53:28 +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 |
|
taojinlong
|
c77b36864f
|
build: 打包
|
2021-03-11 15:48:05 +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
|
b1194fd843
|
feat: 增加gitignore忽略node文件夹和lock文件
|
2021-03-11 14:14:57 +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
|
09bbf1f521
|
fix: 合并
|
2021-03-11 09:47:28 +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
|
f414a37e05
|
Merge branch 'main' of github.com:dataease/dataease into main
|
2021-03-10 18:24:33 +08:00 |
|
taojinlong
|
d449e41cc1
|
feat: 抽取数据到hbase
|
2021-03-10 18:24:13 +08:00 |
|
junjie
|
afec128fc6
|
feat(视图): 视图编辑UI调整
|
2021-03-10 18:23:25 +08:00 |
|
taojinlong
|
c72d79999d
|
feat: 抽取数据到hbase
|
2021-03-10 18:13:27 +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
|
2a766461ca
|
fix: 修复token续命bug
|
2021-03-10 11:49:18 +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 |
|
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 |
|
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 |
|