center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity
3,445 Commits 1 Branch 86 Tags 417 MiB
f6548e7cc8
Commit Graph

1987 Commits

Author SHA1 Message Date
fit2cloud-chenyw
73f45d9d09 fix: 修复个人信息、修改密码刷新后左侧留白；表单过大。 2021-06-25 16:52:40 +08:00
wangjiahao
c5fc275c77 Merge remote-tracking branch 'origin/main' into main 2021-06-25 14:41:00 +08:00
wangjiahao
8926ecbebc fix: 新建仪表板时，来回切换新建仪表板和复用仪表板再保存报错问题 2021-06-25 14:28:27 +08:00
fit2cloud-chenyw
b717b406b2 fix: 仪表盘分享公共连接地址为localhost，无法访问 2021-06-25 14:05:36 +08:00
taojinlong
0142ec49e5 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-25 12:44:17 +08:00
taojinlong
47600403a8 feat: 取掉sqlserver 2021-06-25 12:44:05 +08:00
junjie
898062ae9b fix: 前端tree搜索,高度调整 2021-06-24 18:53:47 +08:00
fit2cloud-chenyw
256c0efe6b fix: 用户管理删除组织会闪现0(null) 2021-06-24 18:34:05 +08:00
junjie
99bd4727ed fix: 前端tree搜索；name修复 2021-06-24 18:21:59 +08:00
wangjiahao
ff6baf8a93 Merge remote-tracking branch 'origin/main' into main 2021-06-24 18:20:51 +08:00
wangjiahao
068a24060e fix: 切换收藏 仪表板依然高亮问题 2021-06-24 18:20:41 +08:00
junjie
765ca37015 Merge remote-tracking branch 'origin/main' into main 2021-06-24 17:51:55 +08:00
junjie
abdf3ab28b fix: 数据源类型保持一致 2021-06-24 17:51:45 +08:00
fit2cloud-chenyw
214f3db8fd feat: 个人信息、修改密码、关于风格统一 2021-06-24 17:51:24 +08:00
fit2cloud-chenyw
3bab0574e2 fix: 日期组件样式修复 2021-06-24 17:19:40 +08:00
junjie
1ea046b637 fix: 数据集tree高度支持参数控制 2021-06-24 17:13:46 +08:00
taojinlong
7be1cde788 feat: 提示字体大小 2021-06-24 16:49:01 +08:00
junjie
39cfec5080 fix:login logo图片fix 2021-06-24 16:32:23 +08:00
taojinlong
61b31f5733 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-24 16:28:15 +08:00
taojinlong
d5bdeab740 feat: 登陆提示 2021-06-24 16:28:07 +08:00
fit2cloud-chenyw
138efc9713 fix: 替换logo后弹出登录框 2021-06-24 16:21:39 +08:00
fit2cloud-chenyw
15349817b6 fix: 修复仪表板查询组件是日期样式 2021-06-24 16:08:21 +08:00
taojinlong
70898bddb8 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-24 15:20:50 +08:00
taojinlong
c46ab5fd95 feat: 文档地址 2021-06-24 15:20:41 +08:00
junjie
2ae993c07d fix:折线图默认tooltip提示触发修改 2021-06-24 15:18:19 +08:00
fit2cloud-chenyw
f01bca3315 fix: 修复仪表板文字搜索过滤组件bug 2021-06-24 15:07:25 +08:00
fit2cloud-chenyw
a5c7458904 feat: 修改eslint验证规则 2021-06-24 14:43:52 +08:00
fit2cloud-chenyw
74006adc20 feat: 增加忽略eslient扫描注释 2021-06-24 14:31:01 +08:00
junjie
7399b5eb2c fix:frontend css缩进 2021-06-24 14:30:02 +08:00
junjie
ce4d20b8b1 fix:代码规范 2021-06-24 13:57:36 +08:00
junjie
09aaaedeb4 fix:代码规范 2021-06-24 13:54:58 +08:00
junjie
820a91b71a fix:代码规范 2021-06-24 13:48:48 +08:00
junjie
49d2899177 fix:代码规范 2021-06-24 13:44:26 +08:00
fit2cloud-chenyw
70e9850968 fix: 公共链接分享密码页面增加表单验证 2021-06-24 12:35:26 +08:00
wangjiahao
66cb80c5fc feat: 增加默认主题 2021-06-24 12:21:34 +08:00
wangjiahao
2580dab0a8 Merge remote-tracking branch 'origin/main' into main 2021-06-24 12:08:54 +08:00
wangjiahao
4f589600e6 fix: 清空仪表板 会导致样式错误问题 2021-06-24 12:08:42 +08:00
fit2cloud-chenyw
a7c66485eb feat:用户管理 设置admin的状态不可修改 2021-06-24 11:14:45 +08:00
junjie
9321291c6b Merge remote-tracking branch 'origin/main' into main 2021-06-24 11:10:06 +08:00
junjie
060bb7621b fix:颜色选择器弹出位置优化 2021-06-24 11:09:53 +08:00
fit2cloud-chenyw
4cfa5e9bea feat: 数据源新增按类型添加 2021-06-24 11:09:07 +08:00
fit2cloud-chenyw
35780b47bb fix: 修复登录以及首页logo图片闪烁 2021-06-24 11:08:28 +08:00
taojinlong
c027f32482 feat: 版本号 2021-06-24 10:08:10 +08:00
fit2cloud-chenyw
fe13a2e542 fix: 用户管理刷新页面后未选中系统管理菜单 2021-06-24 09:47:59 +08:00
junjie
17a6983924 fix:数据源分组名称保持统一 2021-06-23 18:59:14 +08:00
fit2cloud-chenyw
5514c2e77e fix: 【ID1004561】 
【系统管理】新建/编辑用户、角色、组织时，左侧的菜单没高亮显示
 2021-06-23 18:52:05 +08:00
wangjiahao
874fd25a7f feat: 国际化信息添加 2021-06-23 18:26:07 +08:00
wangjiahao
a19bbf0f8f Merge remote-tracking branch 'origin/main' into main 2021-06-23 18:03:32 +08:00
wangjiahao
474ae7bf04 fix: 调整主题设置顺序 2021-06-23 18:03:20 +08:00
junjie
1663560f90 fix:视图结果过滤器条件增加容错；数据集tree重命名、删除后，右侧界面优化 2021-06-23 17:44:47 +08:00
wangjiahao
d8983a9547 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	backend/src/main/java/io/dataease/auth/service/impl/AuthUserServiceImpl.java
 2021-06-23 17:40:41 +08:00
wangjiahao
c07462bd55 fix: 修复更新xpack菜单 事务失效问题 2021-06-23 17:40:21 +08:00
taojinlong
1b73e41063 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-23 17:19:47 +08:00
taojinlong
06ad50d0d4 feat: 几处国际化问题 2021-06-23 17:19:26 +08:00
fit2cloud-chenyw
83d0bad930 feat: 数据源树删除类型上的新增操作 2021-06-23 17:17:50 +08:00
junjie
849ee614be fix:添加数据源，form表单中校验、保存不做权限控制，权限是在创建按钮上控制 2021-06-23 16:29:31 +08:00
wangjiahao
5ba240b781 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-23 16:17:57 +08:00
wangjiahao
9bb24a13c2 fix: 修复主题变更 图形属性不联动问题 2021-06-23 16:17:37 +08:00
junjie
5cb0267304 fix:创建用户表单，性别、状态、组织支持重置 2021-06-23 15:56:04 +08:00
junjie
33a221dc30 fix:模版分类名称长度限制50 2021-06-23 15:43:54 +08:00
fit2cloud-chenyw
22e87971e1 fix: 【ID1004560】 
【组织管理】新建/编辑组织页面点选择组织会出现滚动条，组织下拉框展示不全
 2021-06-23 15:41:18 +08:00
wangjiahao
9cf6919b2e Merge remote-tracking branch 'origin/main' into main 2021-06-23 15:28:22 +08:00
wangjiahao
4d26122532 feat(fix): 增加删除目录权限校验 增加数据源权限控制 2021-06-23 15:28:06 +08:00
junjie
c48a0760ce feat(fix):前端去掉控制台打印 2021-06-23 11:31:33 +08:00
fit2cloud-chenyw
d2459b4408 fix: 【ID1004552】【用户管理】编辑用户无法删除组织 2021-06-23 11:30:03 +08:00
wangjiahao
21bdf84fdf fix: 移除前端日志 2021-06-22 18:38:57 +08:00
wangjiahao
410ac96f57 Merge remote-tracking branch 'origin/main' into main 2021-06-22 18:21:06 +08:00
wangjiahao
aa8317b15a feat: 仪表板窗口变化 重置边界 2021-06-22 18:20:55 +08:00
junjie
9b0f9b21bd feat(fix):数据集、视图优化 2021-06-22 17:21:50 +08:00
fit2cloud-chenyw
d73f55e6e6 feat: 仪表板查询组件增加快速检索功能 2021-06-22 16:29:43 +08:00
fit2cloud-chenyw
63ff02c462 feat: 删除强制debugger 2021-06-22 14:41:47 +08:00
fit2cloud-chenyw
4b055dc2fc feat: 仪表板查询组件适配 ‘删除场景’ 2021-06-22 14:40:00 +08:00
wangjiahao
aa38a4be51 feat: 合并重复样式数据 2021-06-22 14:14:31 +08:00
wangjiahao
d9d1b3a21e feat: 统一新页面预览仪表板内部组件 2021-06-22 13:45:21 +08:00
wangjiahao
2487aa9fba feat: 仪表盘默认刷新时间调整为5分钟 2021-06-22 13:33:36 +08:00
wangjiahao
ac1eec76c9 Merge remote-tracking branch 'origin/main' into main 2021-06-22 12:40:40 +08:00
wangjiahao
b85bd443e5 feat: 增加默认刷新时间 2021-06-22 12:40:29 +08:00
fit2cloud-chenyw
dfaa7e089d feat: 修改收藏列表的删除按钮图标 2021-06-22 12:01:46 +08:00
fit2cloud-chenyw
a60bc5c056 feat: 【ID1001685】【数据源】预览数据源信息的时候，点击预览页下方的编辑按钮进行编辑 2021-06-22 11:54:53 +08:00
wangjiahao
a205bf46f5 Merge remote-tracking branch 'origin/main' into main 2021-06-22 11:26:35 +08:00
wangjiahao
76162f1461 fix: 仪表盘样式设置 回显不准确问题 2021-06-22 11:25:59 +08:00
fit2cloud-chenyw
ada29f7194 feat: 数据源样式与数据集统一 2021-06-22 11:19:58 +08:00
wangjiahao
85a7b1fdbe Merge remote-tracking branch 'origin/main' into main 2021-06-21 18:44:00 +08:00
wangjiahao
394fb46b3c feat: 优化拖拽效果 防止多次请求后台数据 2021-06-21 18:43:41 +08:00
junjie
56b5206984 feat(fix):数据集、视图分组增加搜索 2021-06-21 17:28:12 +08:00
wangjiahao
f155f3d799 Merge remote-tracking branch 'origin/main' into main 2021-06-21 17:17:51 +08:00
wangjiahao
a80e5d9e72 fix: 拖拽问题回退 2021-06-21 17:17:39 +08:00
junjie
a53b557359 feat(fix):数据集、视图分组增加搜索 2021-06-21 16:24:16 +08:00
wangjiahao
55f4e2244a fix: 拖拽问题回退 2021-06-21 15:33:52 +08:00
wangjiahao
66eb1c2b3d fix: 拖拽问题回退 2021-06-21 15:33:10 +08:00
wangjiahao
f88d0f5eaa fix: 拖拽问题回退 2021-06-21 14:00:03 +08:00
wangjiahao
b8d07ce00b Merge remote-tracking branch 'origin/main' into main 2021-06-21 12:39:34 +08:00
wangjiahao
a7b67c5c64 feat: 修改文字组件样式 2021-06-21 12:39:24 +08:00
junjie
40c76c7fb8 feat(fix):tree图标替换 2021-06-21 12:38:04 +08:00
junjie
959879f465 feat(fix):创建视图，选择数据集增加判断 2021-06-21 12:23:26 +08:00
junjie
f6593d2360 feat(fix):视图移动功能 2021-06-21 11:18:38 +08:00
junjie
86fd042ebd feat(fix):视图table优化 2021-06-21 10:54:59 +08:00
junjie
ffefb6032d feat(fix):视图、数据集界面优化 2021-06-20 11:38:12 +08:00
junjie
a33bf12037 feat(feat):数据集，视图分组树优化，去除场景 2021-06-19 12:07:16 +08:00
junjie
cdaba0eb03 feat(feat):数据集，视图分组树优化，去除场景 2021-06-19 11:42:14 +08:00
junjie
1758bf4904 feat(fix):视图表格底部遮挡修复 2021-06-19 11:11:58 +08:00
taojinlong
38013f98fa feat: 更换文档链接 2021-06-18 18:23:09 +08:00
wangjiahao
8aaf2aa0b6 Merge remote-tracking branch 'origin/main' into main 2021-06-18 11:10:23 +08:00
wangjiahao
602c002e21 feat: 调整图标位置 2021-06-18 11:10:09 +08:00
junjie
70f8082916 Merge remote-tracking branch 'origin/main' into main 2021-06-18 11:07:25 +08:00
junjie
d77d6197ca feat(fix):cron设置增加week说明；cron数字修复 2021-06-18 11:07:12 +08:00
fit2cloud-chenyw
25da337d3e feat: 数据源增加搜索功能 2021-06-18 10:59:51 +08:00
wangjiahao
3e0933d823 Merge remote-tracking branch 'origin/main' into main 2021-06-18 10:58:44 +08:00
wangjiahao
17dd2dbe59 feat: 更换其他组件图标 将上传图片组件 移动到侧边栏中 2021-06-18 10:58:26 +08:00
fit2cloud-chenyw
54057d5dab feat: 完善数据源基本功能 2021-06-17 19:34:46 +08:00
fit2cloud-chenyw
fb0d195aa3 feat: 数据源展示方式改为统一风格树 2021-06-17 18:58:46 +08:00
wangjiahao
f2f698b2d1 fix: 主题设置 表格样式跟随问题 2021-06-17 18:21:13 +08:00
wangjiahao
73d311e99f fix: 去掉锁定按钮 2021-06-17 14:29:59 +08:00
wangjiahao
9a8c0d1356 fix: 重做是 刷新CurComponent 2021-06-17 11:56:05 +08:00
wangjiahao
4ecb283020 Merge remote-tracking branch 'origin/main' into main 2021-06-17 11:46:27 +08:00
wangjiahao
eeb15f9aa2 feat: 编辑仪表盘 辅助栏显示调整 2021-06-17 11:46:15 +08:00
fit2cloud-chenyw
9b638f0a1a feat: 系统管理只有一个子菜单也显示左侧菜单 2021-06-17 11:08:04 +08:00
junjie
4207e13738 feat(fix):右上角UI调整，icon替换 2021-06-17 11:02:54 +08:00
fit2cloud-chenyw
52fe4687b0 fix: 修复系统管理左侧菜单滚动条 2021-06-17 10:35:01 +08:00
fit2cloud-chenyw
e1ee9a4f7b fix: 表单增加回车保存事件 2021-06-17 10:25:34 +08:00
taojinlong
8ebaf7cfeb feat：國際化 2021-06-17 10:09:40 +08:00
fit2cloud-chenyw
2bead0a66e fix: 系统管理表单增加回车保存事件 2021-06-16 19:30:26 +08:00
junjie
8ea018059d feat(fix):关联视图，去除必须同步的限制 2021-06-16 19:25:33 +08:00
wangjiahao
07bc218172 feat: 去掉组件复制的功能 2021-06-16 19:11:54 +08:00
wangjiahao
71abcc37a3 Merge remote-tracking branch 'origin/main' into main 2021-06-16 19:06:46 +08:00
wangjiahao
20d91ee4db feat(fix): 【仪表板】文本，选中后无法取消 2021-06-16 19:06:31 +08:00
junjie
8852fba90f feat(fix):关联视图限制，非直连数据库统一完成一次同步后才能关联 2021-06-16 18:29:00 +08:00
wangjiahao
1dcdff500f Merge remote-tracking branch 'origin/main' into main 2021-06-16 18:05:59 +08:00
wangjiahao
2d35f27ee3 feat: 默认仪表盘指向源仪表盘 2021-06-16 18:05:47 +08:00
fit2cloud-chenyw
a8b9a4fbb2 feat: 删除不等于 不包含 2021-06-16 18:03:59 +08:00
wangjiahao
c9518c2e4e feat: 编辑仪表盘选择视图时 group也显示文件夹 2021-06-16 17:53:02 +08:00
wangjiahao
63ef5ab3f6 fix: 【仪表板】非自适应仪表板中，视图操作菜单出现的位置不对 2021-06-16 17:28:16 +08:00
junjie
7feb74d249 Merge remote-tracking branch 'origin/main' into main 2021-06-16 16:58:32 +08:00
junjie
92ab280817 feat(fix):定时任务弹框的title文案修改 2021-06-16 16:55:36 +08:00
wangjiahao
d89efc707d fix: 仪表盘 背景显示不全问题 2021-06-16 16:55:22 +08:00
wangjiahao
74f2a515ea Merge remote-tracking branch 'origin/main' into main 2021-06-16 15:50:16 +08:00
wangjiahao
6bf2a4f8ae fix: 切换一级目录 清理原有仪表板信息 2021-06-16 15:50:01 +08:00
junjie
e80092e92b feat(fix):数据源名称类型显示修复 2021-06-16 15:41:58 +08:00
wangjiahao
a8ce990a4d feat: 默认仪表盘直接关联源仪表盘 2021-06-16 15:31:27 +08:00
fit2cloud-chenyw
1881b60f71 fix: 修改用户管理查询条件label 2021-06-16 10:09:50 +08:00
fit2cloud-chenyw
ef47cde35b feat: 调整头部菜单悬浮样式 2021-06-16 09:56:57 +08:00
wangjiahao
2cd4eef984 feat: 去掉非矩阵设计吸附效果 2021-06-16 09:47:19 +08:00
wangjiahao
fbb44672ef Merge remote-tracking branch 'origin/main' into main 2021-06-16 09:38:53 +08:00
wangjiahao
dd53dc28d9 feat: 更换全屏地税 2021-06-16 09:38:40 +08:00
fit2cloud-chenyw
dce12e6057 feat: 设置头部样式对齐 2021-06-15 18:52:33 +08:00
wangjiahao
1e03bd347a Merge remote-tracking branch 'origin/main' into main 2021-06-15 18:18:27 +08:00
wangjiahao
b8f95eefab feat: 预览和编辑相同的gap效果 2021-06-15 18:17:38 +08:00
taojinlong
ef6385d529 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-15 17:51:28 +08:00
taojinlong
a75734b948 feat: 增量更新的sql，增加校验 2021-06-15 17:51:18 +08:00
fit2cloud-chenyw
bbfb242b8b feat: 系统管理左侧菜单栏采用统一可拖拽组件 2021-06-15 17:38:28 +08:00
junjie
f261acb72f feat(fix):视图字段变化优化；过滤组件优化；返回数据优化 2021-06-15 17:11:47 +08:00
wangjiahao
314a100fc5 Merge remote-tracking branch 'origin/main' into main 2021-06-15 16:47:51 +08:00
wangjiahao
5dc6c5923f feat: 编辑大屏，显示不全问题 2021-06-15 16:47:35 +08:00
junjie
c084ac68cf feat(fix):直连数据集限制预览数目；数据源文字替换 2021-06-15 16:01:30 +08:00
wangjiahao
21a4073d85 Merge remote-tracking branch 'origin/main' into main 2021-06-11 17:44:57 +08:00
wangjiahao
34c81b07fd feat(fix): 非自适应画布的 仪表盘展示时 超高显示滚动条,修复间隙不准问题 2021-06-11 17:44:47 +08:00
junjie
d8830e1753 feat(fix):删除数据集，自定义数据集报错；添加视图数据预览滚动条优化；关联数据表名优化；切换视图，不清空维度 2021-06-11 17:11:13 +08:00
wangjiahao
a31b783ab0 Merge remote-tracking branch 'origin/main' into main 2021-06-11 16:53:40 +08:00
wangjiahao
698f12fcad feat: 非自适应画布的 仪表盘展示时 超高显示滚动条 2021-06-11 16:53:26 +08:00
fit2cloud-chenyw
2a7685c274 fix: 修复vue空对象导致判断布尔条件错误 2021-06-11 15:44:11 +08:00
junjie
66b3bf4ed5 Merge remote-tracking branch 'origin/main' into main 2021-06-11 14:05:09 +08:00
junjie
4e54c152ad feat(视图):指标卡位置调整 2021-06-11 14:04:57 +08:00
wangjiahao
0c4f54bb6f Merge remote-tracking branch 'origin/main' into main 2021-06-11 14:04:40 +08:00
wangjiahao
cfa88996b7 feat: admin 等默认管理员权限全开 2021-06-11 14:04:30 +08:00
junjie
d6c0fdfdaf feat(视图):指标卡名称修改 2021-06-11 12:41:42 +08:00
junjie
7eae8df3f2 Merge remote-tracking branch 'origin/main' into main 2021-06-11 12:24:29 +08:00
junjie
fd916cb8ad feat(视图):暂时隐藏快速计算；增加新的计算汇总方式，适应指标卡、指针仪表盘等汇总统计类图表，仅支持一个指标字段 2021-06-11 12:24:19 +08:00
fit2cloud-chenyw
e20b77b003 fix:【ID1004237】权限管理-菜单权限-普通用户可以禁用任何用户 2021-06-11 12:23:10 +08:00
wangjiahao
9fede2852c feat: 标题样式控制范围太广-不在仪表盘中控制-改为视图自己控制 2021-06-11 12:09:11 +08:00
wangjiahao
1b880d194b feat: 标题样式控制范围太广-不在仪表盘中控制-改为视图自己控制 2021-06-11 12:03:13 +08:00
wangjiahao
dad80f19bb feat: 默认隐藏仪表盘操作列 2021-06-11 11:49:59 +08:00
wangjiahao
7ffb2209ec Merge remote-tracking branch 'origin/main' into main 2021-06-11 11:36:18 +08:00
wangjiahao
f185cbcb33 feat: 优化主题滚动 2021-06-11 11:35:35 +08:00
junjie
d946e7525f feat(frontend):视图添加、标题优化 2021-06-11 10:59:18 +08:00
wangjiahao
97457de0b5 fix:权限表头显示不正确问题 2021-06-11 10:53:21 +08:00
wangjiahao
24869fb70c Merge remote-tracking branch 'origin/main' into main 2021-06-11 10:04:28 +08:00
wangjiahao
eaee41334d fix:权限表头显示不正确问题 2021-06-11 09:58:24 +08:00
fit2cloud-chenyw
1c7fde3f5a fix: 【ID1004278】【仪表板】时间过滤组件-日期，选择日期没反应 2021-06-11 09:51:17 +08:00
wangjiahao
a12a670383 Merge remote-tracking branch 'origin/main' into main 2021-06-10 17:46:30 +08:00
wangjiahao
5dd942348a feat: 去掉一些日志 2021-06-10 17:46:16 +08:00
junjie
a8c3d11451 Merge remote-tracking branch 'origin/main' into main 2021-06-10 17:37:43 +08:00
junjie
711428705b feat(frontend):分组、场景pid修改为0 2021-06-10 17:37:33 +08:00
fit2cloud-chenyw
7bf65480ac feat: 下拉框多选样式适配新画布 2021-06-10 17:33:20 +08:00
wangjiahao
38dea1ad1d feat: 画布升级 增加矩阵 边界 对齐 吸附等功能 2021-06-10 17:15:30 +08:00
wangjiahao
a06297a73a Merge remote-tracking branch 'origin/main' into main 2021-06-10 17:12:45 +08:00
wangjiahao
dba5eeb571 feat: 画布升级 增加矩阵 边界 对齐 吸附等功能 2021-06-10 17:12:31 +08:00
junjie
7cc2e1a160 feat(frontend):代码修改 2021-06-10 16:47:30 +08:00
fit2cloud-chenyw
89c3e6fe04 fix: 【ID1003951】【仪表盘】文本多选下拉框组件显示错位 2021-06-10 16:39:48 +08:00
junjie
c3a929345b feat(frontend):echarts修改 2021-06-10 16:25:31 +08:00
junjie
1eeebf58e1 feat(frontend):自定义数据集UI样式调整 2021-06-10 15:41:02 +08:00
junjie
6dc0b8d875 feat(frontend):一级分组、场景pid修复 2021-06-10 15:13:37 +08:00
junjie
7e7dc06838 feat(frontend):表格列宽调整 2021-06-10 12:46:18 +08:00
junjie
9daf498192 feat(frontend):表格斑马纹跟随视图背景色 2021-06-10 12:36:28 +08:00
junjie
957d2af7c2 feat(frontend):饼图不继承玫瑰图圆角；sql数据集代码修复 2021-06-10 11:48:30 +08:00
junjie
306b046ded feat(frontend):代码优化 2021-06-10 11:04:58 +08:00
fit2cloud-chenyw
16e9029830 Merge remote-tracking branch 'origin/main' into main 2021-06-10 10:54:22 +08:00
fit2cloud-chenyw
26b9994d14 feat : 保留mock 2021-06-10 10:53:56 +08:00
fit2cloud-chenyw
a0d718c5de fix: 保留mock但不在线上使用 2021-06-10 10:53:19 +08:00
junjie
dd8e622958 feat(数据集):自定义数据集不能再制作自定义数据集 2021-06-10 10:48:05 +08:00
fit2cloud-chenyw
113d04b5a1 fix: 正式环境禁用moke；尝试修复视图加载阻塞导致浏览器无响应 2021-06-10 09:46:06 +08:00
junjie
9975287b75 feat(frontend):表格合计样式fix 2021-06-09 17:21:17 +08:00
taojinlong
3733b869fd Merge branch 'main' of github.com:dataease/dataease into main 2021-06-09 16:26:22 +08:00
taojinlong
6e01bb6f47 fix: 國際化 2021-06-09 16:26:15 +08:00
fit2cloud-chenyw
35d01fd106 fix: 超时取消遮罩并提示报错 2021-06-09 16:19:14 +08:00
junjie
ef59ad96bf feat(frontend):数据集添加bug修复 2021-06-09 16:05:15 +08:00
fit2cloud-chenyw
2557402d95 fix: 【ID1004196】【系统管理-参数管理】展示的登陆页面标题和设置的不一致 2021-06-09 15:02:38 +08:00
fit2cloud-chenyw
4defc8490a feat: 前端axios超时时间设置为10s 2021-06-09 14:35:38 +08:00
junjie
6e60a265d5 feat(frontend):数据集名称长度限制提示修改；视图名称和标题统一，保存按钮优化 2021-06-09 10:54:16 +08:00
fit2cloud-chenyw
a6e9dd3465 feat: 插件第一次加载较慢增加loading 2021-06-09 10:47:22 +08:00
junjie
d585fd469f feat(数据集):数据集 分组、场景、数据集移动功能 2021-06-09 10:16:58 +08:00
fit2cloud-chenyw
584a5499ad fix: 初次编辑仪表板 条件失效 2021-06-09 09:46:56 +08:00
fit2cloud-chenyw
8e4e4a9d01 fix: 新建仪表板报错 2021-06-08 18:33:28 +08:00
fit2cloud-chenyw
9e93a8b215 fix: 修复新增查询组件错误 2021-06-08 16:35:27 +08:00
junjie
a2fa6771fa feat(frontend):数据集UI文字调整 2021-06-08 16:30:20 +08:00
fit2cloud-chenyw
880a26cd0a feat: 仪表板过滤 局部刷新 基本功能完善 2021-06-08 16:03:49 +08:00
junjie
1b1f3e056c feat(frontend):分组场景菜单控制优化，默认隐藏，鼠标移上后显示 2021-06-08 15:00:13 +08:00
taojinlong
d44bbddbcb feat: 【UI】系统中名称修改 2021-06-08 14:52:26 +08:00
fit2cloud-chenyw
8ac634fbb3 feat: 优化仪表板查询使用局部请求 2021-06-08 12:39:04 +08:00
junjie
6246a4532c feat(数据集):编辑excel 2021-06-08 12:30:26 +08:00
junjie
d4bb57de61 Merge remote-tracking branch 'origin/main' into main 2021-06-08 12:17:05 +08:00
junjie
ebe6f306c6 feat(数据集):编辑数据集修改 2021-06-08 12:16:55 +08:00
taojinlong
d04500f3a7 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-08 12:16:37 +08:00
taojinlong
a196430d85 feat: 替换svg logo图片 2021-06-08 12:16:25 +08:00
junjie
c839b3cba4 feat(数据集):编辑excel前端 2021-06-08 11:30:26 +08:00
junjie
0195edea45 feat(数据集):编辑excel前端 2021-06-08 11:12:40 +08:00
fit2cloud-chenyw
198208fc8c feat: 删除debugger和console.log 2021-06-07 17:11:33 +08:00
fit2cloud-chenyw
e520101af1 feat: 格式化前端报错代码 2021-06-07 17:08:57 +08:00
fit2cloud-chenyw
f297fd7aa2 feat: 优化 授权、安装插件、更新lic、lic到期 不需要重新登录(需要刷新浏览器)才能刷新权限数据 2021-06-07 16:11:06 +08:00
junjie
f1c552ff44 feat(chart):表格chart增加id 2021-06-07 15:42:24 +08:00
wangjiahao
704d86adf4 feat: 数据源管理权限 控制到数据 2021-06-07 14:47:27 +08:00
wangjiahao
c16d531483 feat: 模板导入增加模板标识 2021-06-07 11:41:25 +08:00
wangjiahao
cbc76cf2c9 feat: 去掉不必要的log 和初始化数据 2021-06-07 11:15:03 +08:00
wangjiahao
36ec45baf7 Merge remote-tracking branch 'origin/main' into main 2021-06-07 11:10:27 +08:00
wangjiahao
32223f4c57 fix: 新建仪表盘样式为空的问题 2021-06-07 11:10:04 +08:00
junjie
2b85822794 feat(提示):视图提示优化 2021-06-07 11:01:21 +08:00
fit2cloud-chenyw
1b7ae16fa6 fix: 【ID1004125】【仪表板】添加 文本搜索组件，搜索框不显示输入的内容 2021-06-07 10:53:57 +08:00
fit2cloud-chenyw
ee6138d297 fix：设置弹出组件样式 2021-06-06 11:09:52 +08:00
fit2cloud-chenyw
b30564568c fix: 【ID1004126】【仪表板】添加文本下拉组件，未开启多选实际可以拖动多个字段 2021-06-06 08:50:34 +08:00
fit2cloud-chenyw
45e304f132 fix: 【ID1004132】【仪表板】添加组件时数据列表建议加个加载中的提示 2021-06-06 07:53:48 +08:00
wangjiahao
59fa7e0c20 Merge remote-tracking branch 'origin/main' into main 2021-06-04 23:22:00 +08:00
wangjiahao
0b56ae1b3c feat(fix): 1.权限查询效率优化 2.替换权限开启图标，3.授权对象类型切换 授权资源权限依旧保留问题,4.开放普通用户 组织对菜单的授权 2021-06-04 23:21:47 +08:00
junjie
5cdfd72807 feat(视图):生成视图错误样式优化 2021-06-04 18:50:49 +08:00
fit2cloud-chenyw
14bf48137d fix: 【ID1003939】角色管理-修改自定义表格字段-刷新页面/添加/编辑角色后又自动恢复默认值 2021-06-04 18:01:51 +08:00
junjie
88e8cf1cd7 feat(视图):统一风格 2021-06-04 17:27:14 +08:00
junjie
133e883786 feat(frontend):文本过长，显示优化以及tooltip 2021-06-04 17:16:50 +08:00
fit2cloud-chenyw
03f43fde95 fix: 【ID1004129】【仪表板】一个用户取消收藏后其他收藏的用户也没有了 2021-06-04 16:58:50 +08:00
wangjiahao
63fa24fcb4 fix: 修复仪表盘视图查不出来的问题 2021-06-04 16:23:17 +08:00
wangjiahao
264032f9a4 Merge remote-tracking branch 'origin/main' into main 2021-06-04 15:47:48 +08:00
wangjiahao
e0136d7530 fix: 画布切换背景图片 图片是空依然显示颜色的问题 2021-06-04 15:45:41 +08:00
junjie
4db81f9d85 feat(数据集):数据集字段编辑展示原始类型 2021-06-04 15:34:11 +08:00
junjie
8e272cf85a feat(视图):先强制展示echarts y轴 2021-06-04 15:14:29 +08:00
junjie
fb07c111c5 feat(fix):模版管理form校验fix 2021-06-04 15:11:06 +08:00
fit2cloud-chenyw
72e30a8c93 feat: 优化查询组件默认样式 2021-06-04 14:43:05 +08:00
wangjiahao
aefa3cb302 Merge remote-tracking branch 'origin/main' into main 2021-06-04 14:36:56 +08:00
wangjiahao
fa70a33de1 feat: 去掉不必要的前段日志 2021-06-04 14:35:32 +08:00
fit2cloud-chenyw
588521194c feat: 优化token错误提醒 2021-06-04 13:47:06 +08:00
wangjiahao
fccd7d8f29 feat: 优化仪表盘页面loading 2021-06-04 12:33:08 +08:00
wangjiahao
3fd5e678d6 Merge remote-tracking branch 'origin/main' into main 2021-06-04 12:22:45 +08:00
wangjiahao
0f2f3983bb feat: 优化仪表盘页面loading 2021-06-04 12:22:34 +08:00
fit2cloud-chenyw
ef769da27d fix: 优化token错误提醒 2021-06-04 12:20:03 +08:00
wangjiahao
df0d2a9b22 Merge remote-tracking branch 'origin/main' into main 2021-06-04 11:20:07 +08:00
wangjiahao
ccf13b9e50 feat: 1.编辑界面调整 预览自动全屏预览 2.仪表盘主界面调整，增加全屏预览，新tab页预览 2021-06-04 11:19:50 +08:00
fit2cloud-chenyw
a51ec3e2eb fix: 去除无用代码 2021-06-04 11:11:21 +08:00
junjie
c3e9157761 feat(fix):登陆校验优化 2021-06-04 10:57:58 +08:00
fit2cloud-chenyw
fc4bb32331 feat: 优化下拉查询组件 2021-06-03 18:49:59 +08:00
wangjiahao
62ca8a2dd5 feat: 优化仪表板和模板的默认排序 2021-06-03 18:47:36 +08:00
wangjiahao
dc742d1b36 Merge remote-tracking branch 'origin/main' into main 2021-06-03 18:40:58 +08:00
wangjiahao
b69920675f fix: 仪表板目录无法重命名问题 2021-06-03 18:40:46 +08:00
junjie
071cafcd26 feat(fix):自动刷新不需要loading，解决界面拉伸后自动恢复 2021-06-03 17:02:12 +08:00
wangjiahao
73dc5c7e99 fix: 修改没有权限菜单全部打开的情况 2021-06-03 16:23:56 +08:00
fit2cloud-chenyw
a62dedb981 feat: 优化下拉框多选组件 2021-06-03 15:39:17 +08:00
taojinlong
48069f563f fix: 判断导入数据执行结果 2021-06-03 15:10:54 +08:00
junjie
3f17e3c31a feat(fix):前端样式调整 2021-06-03 11:28:44 +08:00
fit2cloud-chenyw
31a59021cc fix: 仪表板首页tabs样式 使用>>> 误伤分享tabs样式 2021-06-03 09:47:10 +08:00
junjie
4108e68927 feat(fix):前端样式调整 2021-06-02 19:22:04 +08:00
junjie
fb02dd6160 feat(fix):前端样式调整 2021-06-02 18:49:14 +08:00
wangjiahao
974d7549f6 Merge remote-tracking branch 'origin/main' into main 2021-06-02 17:45:49 +08:00
wangjiahao
bd15937f09 fix: 优化模板查询方式，改为异步查询；修复能长传空模板问题 2021-06-02 17:45:37 +08:00
junjie
7198971263 Merge remote-tracking branch 'origin/main' into main 2021-06-02 17:36:02 +08:00
junjie
ec24cf3d39 feat(fix):前端请求，loading配置 2021-06-02 17:35:50 +08:00
fit2cloud-chenyw
5b29f93eff feat: 禁止修改admin的Id、状态以及角色 2021-06-02 17:34:56 +08:00
fit2cloud-chenyw
fad49bd4bf fix: admin用户设置无法删除 2021-06-02 17:23:27 +08:00
junjie
e20f4c23ed feat(fix):前端样式冲突修复；doris ddl修复 2021-06-02 17:08:12 +08:00
fit2cloud-chenyw
94ae241403 fix: 用户列表按状态排序报错 2021-06-02 16:36:36 +08:00
fit2cloud-chenyw
d6a421109e fix: 过滤组件弹框样式修改 2021-06-02 16:21:56 +08:00
junjie
47392eead8 feat(fix):定时任务重启执行修复；前端form校验优化 2021-06-02 16:16:20 +08:00
fit2cloud-chenyw
5871e15387 fix: 组件树显示不完整 2021-06-02 15:23:06 +08:00
fit2cloud-chenyw
af4e85e10c fix: 仪表盘 组件树状结构不正确 2021-06-02 15:14:29 +08:00
fit2cloud-chenyw
db71599447 feat: 删除非必要注释 2021-06-02 14:27:47 +08:00
fit2cloud-chenyw
24d1c35d0f feat: 用户列表增加排序功能 2021-06-02 13:52:01 +08:00
taojinlong
4f031ad99d Merge branch 'main' of github.com:dataease/dataease into main 2021-06-02 13:05:34 +08:00
taojinlong
eb39fb744d fix: 刷新token时，校验用户；国际化问题 2021-06-02 13:05:26 +08:00
junjie
c2cb12c73b feat(fix):添加db数据集，默认加上数据源名称 2021-06-02 11:59:33 +08:00
junjie
cf62ecefbd feat(frontend):icon修改 2021-06-02 11:31:25 +08:00
junjie
c3fce40038 feat(frontend):logo等尺寸调整限制 2021-06-02 11:03:43 +08:00
taojinlong
32a9980178 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-02 10:46:14 +08:00
fit2cloud-chenyw
52179d814c fix: 【ID1003566】【仪表盘】仪表盘编辑页面的组件页，滚动条应该在列表框内侧 2021-06-02 10:23:21 +08:00
junjie
98f69d4eaf feat(数据源):数据源校验提示优化 2021-06-02 10:20:03 +08:00
wangjiahao
eeb331d522 fix: 仪表盘编辑时清除临时数据缓存 去除不必要的debugger和日志 2021-06-01 23:02:00 +08:00
wangjiahao
837c4cd34f Merge remote-tracking branch 'origin/main' into main 2021-06-01 22:46:26 +08:00
wangjiahao
039f3832a8 feat(仪表盘): 增加文字组件 矩形组件等，统一归类为样式组件 增加仪表盘侧边 '其他' 按钮 用来存放其他类型的组件 2021-06-01 22:46:08 +08:00
junjie
858c7f27e6 feat(视图):添加视图增加默认名称 2021-06-01 18:56:26 +08:00
fit2cloud-chenyw
fd411ca7af fix:【ID1003581】仪表盘 组件树状结构不正确 2021-06-01 18:35:18 +08:00
taojinlong
0613ed385d fix: 刪除組織國際化提示信息 2021-06-01 16:26:35 +08:00
fit2cloud-chenyw
b5e91fcc2d feat: 普通员工默认权限设置 2021-06-01 16:24:54 +08:00
fit2cloud-chenyw
1fe11b9a95 Merge remote-tracking branch 'origin/main' into main 2021-06-01 16:15:04 +08:00
taojinlong
9ec595a158 feat: 更新任务列表页 自动刷新（5s） 2021-06-01 16:10:47 +08:00
junjie
196c003445 feat(视图):添加视图增加loading 2021-06-01 15:58:03 +08:00
junjie
4cbe01ca16 feat(视图):为日期维度，增加日期显示与格式转换功能 2021-06-01 15:44:33 +08:00
fit2cloud-chenyw
64cac2a9b3 feat: 使用lic结果过滤xpack插件菜单 2021-06-01 15:20:26 +08:00
wangjiahao
e05dd9f681 feat: 编辑仪表盘同时支持自适应画布区域和实际画布大小两种编辑模式 2021-06-01 14:01:34 +08:00
wangjiahao
b281eaf031 Merge remote-tracking branch 'origin/main' into main 2021-06-01 13:40:36 +08:00
wangjiahao
5ef299dfcf feat: 编辑仪表盘同时支持自适应画布区域和实际画布大小两种编辑模式 2021-06-01 13:40:26 +08:00
fit2cloud-chenyw
d1687d5d4c feat: xpack插件默认安装表记录 2021-06-01 13:29:54 +08:00
fit2cloud-chenyw
35796108c7 feat: 初步整合xpack功能完毕 2021-06-01 11:13:40 +08:00
taojinlong
331fda059a Merge branch 'main' of github.com:dataease/dataease into main 2021-05-31 17:13:04 +08:00
taojinlong
b4376a079e feat: license 提醒: 无license，不提醒；过期以及无效，提醒 2021-05-31 17:12:27 +08:00
junjie
10b0e87f62 feat(视图):图表类型鼠标放上后，显示提示 2021-05-31 16:46:23 +08:00
taojinlong
688a59d597 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-31 16:36:05 +08:00
taojinlong
001f6b46fd feat: 链接到帮助文档 2021-05-31 16:35:52 +08:00
junjie
7838dface2 feat(视图):属性、样式中，是否显示放到外面控制，不显示则禁用属性编辑；外侧标题移入到标题的样式中 2021-05-31 16:20:28 +08:00
wangjiahao
ac44119ab2 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-31 14:26:31 +08:00
wangjiahao
13da216816 feat: 增加菜单授权管理 2021-05-31 14:26:19 +08:00
fit2cloud-chenyw
1ffbe36c3c feat: 整合xpack'组织管理' 2021-05-31 14:07:12 +08:00
taojinlong
dccfd6ec27 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-31 12:50:23 +08:00
taojinlong
99bae93fb5 feat: 限制数据集只有一个同步任务;数据源支持修改密码和端口号 2021-05-31 12:49:55 +08:00
wangjiahao
cfd8e6eb2b Merge remote-tracking branch 'origin/main' into main 2021-05-31 11:20:43 +08:00
wangjiahao
ceb1805083 feat: 新增组件辅助设计 可以精确定位组件坐标 宽高透明度 2021-05-31 11:20:32 +08:00
junjie
8481fec921 feat(frontend):弹框选择数据集增加loading 2021-05-31 10:49:10 +08:00
junjie
58299c74fb feat(frontend):部分地方主题色修改；弹框选择数据集增加loading 2021-05-31 10:44:44 +08:00
fit2cloud-chenyw
5f267e7723 feat: 前端远程异步动态组件，渲染插件模块用 2021-05-30 20:25:58 +08:00
fit2cloud-chenyw
ae733b0776 fix: 删除原有菜单'系统参数'、'角色管理'，初步整合xpack插件模块 2021-05-30 20:24:54 +08:00
junjie
30fc9c5e73 feat(视图):创建视图名称覆盖bug 2021-05-28 18:41:07 +08:00
junjie
10c6ca4b98 feat(role):内置角色增加创建时间，并无法编辑 删除 2021-05-28 18:19:19 +08:00
junjie
440dd28fbb feat(frontend):1.角色分页相关bug修复；2.内置角色禁止编辑和删除；3.右上角下拉菜单文案修改 2021-05-28 17:48:05 +08:00
taojinlong
c262914b60 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-28 17:24:52 +08:00
taojinlong
f99865cf8d feat: 更新任务立即执行时， 2021-05-28 16:37:37 +08:00
junjie
1965ff3eab feat(frontend):成功、警告、错误等色值修改与element-ui，fit2cloud-ui一致，原先的太亮；角色i18n修复 2021-05-28 16:31:07 +08:00
junjie
b4e503612a feat(视图):添加视图，预览数据表头增加字段类型icon显示 2021-05-28 16:12:37 +08:00
junjie
1361ac02b1 feat(视图):添加视图，选择数据集预览前100条数据增加文字提示 2021-05-28 16:04:59 +08:00
junjie
be7a7fb2dc feat(视图):面积堆叠图进入默认显示面积 2021-05-28 15:45:47 +08:00
taojinlong
edfb017066 fix: 冲突 2021-05-28 12:51:26 +08:00
taojinlong
7f48bf4fe4 fix: 检测同步任务 2021-05-28 12:48:16 +08:00
junjie
e955d2bfff feat(frontend):user列表增加角色字段；数据源添加报错fix 2021-05-28 12:40:19 +08:00
wangjiahao
8ebb35976a Merge remote-tracking branch 'origin/main' into main 2021-05-28 11:47:06 +08:00
wangjiahao
837b6d24d3 feat: 仪表盘改为仪表板 2021-05-28 11:46:54 +08:00
junjie
d86080ffc8 feat(chart):radar max fix 2021-05-28 11:38:16 +08:00
wangjiahao
1ce02bf403 feat: 仪表盘命名出现多个仪表盘问题,仪表盘改为仪表板 2021-05-28 11:21:54 +08:00
wangjiahao
81dece8fa5 feat: 上传图片 增加尺寸控制 2021-05-28 10:37:29 +08:00
wangjiahao
ba3117fbad fix: UI 调整 2021-05-28 10:18:21 +08:00
wangjiahao
f25cbc9fd1 fix: UI 调整 2021-05-28 00:12:55 +08:00
wangjiahao
71bafb628c fix: UI 调整 2021-05-28 00:04:39 +08:00
wangjiahao
7d16420f35 Merge remote-tracking branch 'origin/main' into main 2021-05-27 18:54:24 +08:00
wangjiahao
836fde170c fix: UI 调整 2021-05-27 18:54:06 +08:00
junjie
0f4efa8c2e feat(仪表板):UI fix 2021-05-27 17:49:14 +08:00
junjie
07a8b82914 feat(仪表板):UI fix 2021-05-27 17:34:46 +08:00
wangjiahao
36a327f81c fix: UI 调整 2021-05-27 17:06:38 +08:00
wangjiahao
1537c8d2f5 Merge remote-tracking branch 'origin/main' into main 2021-05-27 14:17:55 +08:00
wangjiahao
1be642aeca feat: 用户权限可被收回 2021-05-27 14:17:27 +08:00
junjie
d4daade0d3 feat(frontend):1.操作button样式修改；2.数据源文字fix；3.仪表盘样式fix，先看看，再调整 2021-05-27 12:04:11 +08:00
junjie
5cfc7b0cac feat(frontend):仪表板分享报错fix 2021-05-27 10:50:27 +08:00
wangjiahao
83a243e193 Merge remote-tracking branch 'origin/main' into main 2021-05-26 18:48:06 +08:00
wangjiahao
ca31ea2021 feat: 画布自适应 2021-05-26 18:47:55 +08:00
junjie
83555f9830 feat(cron):cron fix 2021-05-26 18:46:19 +08:00
wangjiahao
77a919c60d feat: 画布样式修改 也记录镜像 2021-05-26 18:12:22 +08:00
wangjiahao
070ff39641 feat: 样式修改 2021-05-26 16:41:52 +08:00
wangjiahao
9351e48be2 feat: 全局样式修改 2021-05-26 16:33:52 +08:00
wangjiahao
44921cb6a5 Merge remote-tracking branch 'origin/main' into main 2021-05-26 16:16:07 +08:00
wangjiahao
22248e521a fix: 编辑仪表盘时 卡顿导致视图大小不变的问题 2021-05-26 16:15:54 +08:00
junjie
6502f7213b feat(frontend):UI fix 2021-05-26 15:54:00 +08:00
junjie
eedc3076a0 feat(仪表盘):分享filter切换保留是否已分享状态 2021-05-26 15:36:41 +08:00
junjie
7b069ffe26 feat(仪表盘):分享用户，去除当前用户 2021-05-26 14:40:09 +08:00
wangjiahao
a2d83b2d61 feat: UI调整 2021-05-26 14:09:28 +08:00
wangjiahao
cb1c4c0ba7 Merge remote-tracking branch 'origin/main' into main 2021-05-26 12:27:06 +08:00
wangjiahao
7854f36dce fix: UI调整 2021-05-26 12:26:30 +08:00
junjie
c1b20e0f9f feat(frontend):登录页UI调整 2021-05-26 11:59:28 +08:00
junjie
af6dd2557b feat(frontend):登陆页UI fix；文字提示修改 2021-05-26 11:32:07 +08:00
junjie
592e8c9c5e feat(frontend):UI fix 2021-05-26 11:00:41 +08:00
junjie
e6bb1895ac feat(frontend):UI fix 2021-05-26 10:33:05 +08:00
junjie
946b1e52b8 feat(frontend):UI fix 2021-05-26 10:18:25 +08:00
taojinlong
cc2abfa06f Merge branch 'main' of github.com:dataease/dataease into main 2021-05-25 21:26:53 +08:00
taojinlong
1eb8c97238 fix: 國際化 2021-05-25 19:26:39 +08:00
wangjiahao
91fdee6e49 Merge remote-tracking branch 'origin/main' into main 2021-05-25 19:11:12 +08:00
wangjiahao
a83ba94054 fix: UI调整 2021-05-25 19:11:00 +08:00
junjie
d0f564d429 feat(user):创建用户支持设置密码；用户表单UI字段名fix 2021-05-25 19:10:30 +08:00
wangjiahao
9bf1c52824 Merge remote-tracking branch 'origin/main' into main 2021-05-25 18:59:59 +08:00
wangjiahao
00b8e2d4a5 fix: 模板不允许重名 但是可以允许覆盖 2021-05-25 18:58:47 +08:00
taojinlong
cfc65b9dcb fix: 预览数据错误 2021-05-25 17:51:35 +08:00
taojinlong
11226a99a0 fix: 预览数据错误 2021-05-25 17:48:29 +08:00
junjie
5ffe5d98eb feat(frontend):数据集fix 2021-05-25 17:41:23 +08:00
junjie
8dc219bbf4 feat(frontend):系统管理左侧菜单不收缩，显示跟topbar的分割线 2021-05-25 17:28:55 +08:00
junjie
bf8c1a9882 feat(frontend):UI fix ；关于 fix 2021-05-25 16:01:04 +08:00
wangjiahao
45eb0acbfa Merge remote-tracking branch 'origin/main' into main 2021-05-25 15:25:06 +08:00
wangjiahao
b316df0991 feat: 1.替换权限样式开关图标 2021-05-25 15:24:54 +08:00
junjie
e3d2b4ccfc feat:1.自助数据集优化；2.数据集list fix 2021-05-25 15:22:33 +08:00
wangjiahao
9ff42a43a8 feat: 1.替换权限样式开关图标 2021-05-25 15:18:56 +08:00
wangjiahao
8c33b8e346 feat: 1.替换权限样式开关图标 2021-05-25 14:44:16 +08:00
wangjiahao
c61f294e01 Merge remote-tracking branch 'origin/main' into main 2021-05-25 12:36:49 +08:00
wangjiahao
133f5dcae9 feat: 1.仪表盘页面动态添加目录，新建仪表盘无需刷新直接展开，2.新建仪表盘直接进入编辑界面，3.【【仪表盘】右键点开的功能顺序调整】4.【【仪表盘】仪表盘画板中，视图层级操作的文案调整】 2021-05-25 12:36:35 +08:00
junjie
f85ac96e9f feat(backend):关联视图表、字段重复关联校验 2021-05-25 11:53:19 +08:00
xiajunjie
d922fe1175 feat(frontend):UI fix 2021-05-24 21:38:00 +08:00
taojinlong
de3ec60cad Merge branch 'main' of github.com:dataease/dataease into main 2021-05-24 18:07:21 +08:00
taojinlong
98a3aa0094 feat: 升级 fit2cloud-ui -> 1.2.0； 替换ico、logo 2021-05-24 18:03:07 +08:00
wangjiahao
746e6c49c3 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	backend/src/main/resources/i18n/messages_en_US.properties
#	backend/src/main/resources/i18n/messages_zh_CN.properties
#	backend/src/main/resources/i18n/messages_zh_TW.properties
#	frontend/src/components/canvas/components/Toolbar.vue
 2021-05-24 17:30:13 +08:00
wangjiahao
b59c4967f7 fix: 1.普通仪表盘可转为默认仪表盘同时增加默认仪表盘全新 2.仪表盘，视图，数据集加载慢的问题 3.上传大图片不成功的问题，4.仪表盘页面整体加上loading 5.编辑仪表盘预览改为全屏弹框模式 2021-05-24 17:28:03 +08:00
taojinlong
44dcb71cf1 fix: 国际化 2021-05-24 17:15:32 +08:00
taojinlong
f9bb4b3142 fix: 抽取excel数据格式问题； 2021-05-24 17:06:35 +08:00
junjie
f64122b7af feat(frontend):UI fix 2021-05-24 15:46:55 +08:00
junjie
aa89ae3060 feat(frontend):UI fix 2021-05-24 14:59:41 +08:00
taojinlong
6c3a595339 feat: 保存按钮作为“文字按钮”放在关闭按钮的左边 2021-05-24 14:07:21 +08:00
taojinlong
a17d7cc1e7 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-24 13:46:11 +08:00
taojinlong
8c6b60ff17 feat: 字段处默认给出提示信息“请将左侧字段拖至此处” 2021-05-24 13:46:00 +08:00
junjie
d205e75730 feat(frontend):UI fix 2021-05-24 12:42:37 +08:00
junjie
dcafd50b2b feat(i18n):后端国际化；cron 组件国际化 2021-05-24 11:03:57 +08:00
junjie
054cf38976 feat(frontend):code format 2021-05-24 10:44:10 +08:00
wangjiahao
f4b4dac8ef Merge remote-tracking branch 'origin/main' into main 2021-05-24 10:28:20 +08:00
wangjiahao
872067ce97 fix: 仪表盘列表中的仪表盘可转为默认仪表盘 2021-05-24 10:28:11 +08:00
xiajunjie
5b3962e934 feat(frontend):vue cron组件 2021-05-23 11:04:45 +08:00
xiajunjie
0468039333 feat(frontend):关于logo css fix 2021-05-21 22:03:57 +08:00
junjie
744c9a2dd4 feat(视图):视图增加 过滤器，直接对数据集字段进行过滤 2021-05-21 16:58:39 +08:00
junjie
1833ca5399 feat(视图):视图增加 过滤器，直接对数据集字段进行过滤 2021-05-21 16:45:21 +08:00
fit2cloud-chenyw
27109824f2 fix: 取消收藏后主页不显示当前仪表板 2021-05-21 15:54:20 +08:00
wangjiahao
04abe0c182 Merge remote-tracking branch 'origin/main' into main 2021-05-21 15:19:13 +08:00
wangjiahao
2cbdf52611 fix: 去掉缩略图 2021-05-21 15:18:54 +08:00
fit2cloud-chenyw
f3fa01de1b feat: 外部链接国际化 2021-05-21 15:13:16 +08:00
fit2cloud-chenyw
4f19867823 feat: 仪表板取消收藏实时展示 2021-05-21 14:25:00 +08:00
wangjiahao
a588e9e29a fix: 国际化问题 2021-05-21 13:55:55 +08:00
wangjiahao
fd37b3e331 Merge remote-tracking branch 'origin/main' into main 2021-05-21 13:51:14 +08:00
wangjiahao
70b947200e fix: 保存模板 2021-05-21 13:50:34 +08:00
fit2cloud-chenyw
efe1830d88 feat: 下拉选择组件报错 2021-05-21 12:44:23 +08:00
wangjiahao
5770ee9a42 Merge remote-tracking branch 'origin/main' into main 2021-05-21 12:42:52 +08:00
wangjiahao
2222eda12f fix: 编辑仪表盘 全屏预览问题 2021-05-21 12:42:40 +08:00
taojinlong
ad29a59583 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 12:26:55 +08:00
taojinlong
a6a427de18 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 12:26:25 +08:00
fit2cloud-chenyw
2261323af5 feat: 时间组件全部用between 2021-05-21 12:23:30 +08:00
fit2cloud-chenyw
955a0ec6bc feat: 时间组件参数改为时间戳 2021-05-21 12:19:32 +08:00
wangjiahao
c38bc7f3d8 fix: 预览大屏无法显示问题 2021-05-21 11:19:15 +08:00
wangjiahao
7e6749e9fb fix: 仪表盘编辑 点击事件问题 2021-05-21 11:04:41 +08:00
wangjiahao
9721a406dc Merge remote-tracking branch 'origin/main' into main 2021-05-21 10:24:55 +08:00
wangjiahao
c7cf7505b8 fix: 移动导入模板位置 2021-05-21 10:23:56 +08:00
taojinlong
ff24ab3d6e fix: license 更新提示國際化 2021-05-21 10:22:08 +08:00
fit2cloud-chenyw
4f8f9080cf feat: 绑定日期过滤组件 2021-05-20 22:14:07 +08:00
fit2cloud-chenyw
20c0b4b68d feat: 过滤组件绑定 2021-05-20 18:38:28 +08:00
fit2cloud-chenyw
6aab309741 feat: 查询条件绑定视图 2021-05-20 17:44:31 +08:00
fit2cloud-chenyw
3d7a65aa93 feat: 下拉框查询组件非空过滤 2021-05-20 17:07:19 +08:00
junjie
d908467028 feat(仪表盘):仪表盘 过滤组件 2021-05-20 16:56:44 +08:00
fit2cloud-chenyw
df8413731e fix: 修复画布中组件加载多次 2021-05-20 16:45:27 +08:00
junjie
39a282dd65 feat(frontend):菜单管理 i18n fix 2021-05-20 15:33:07 +08:00
junjie
a7da52ef01 feat(backend):数据源form描述非必填；i18n fix 2021-05-20 15:19:49 +08:00
fit2cloud-chenyw
2102c11b16 fix: 外部链接新增umy依赖 2021-05-20 13:41:39 +08:00
fit2cloud-chenyw
75d7d4e35e Merge remote-tracking branch 'origin/main' into main 2021-05-20 12:02:39 +08:00
fit2cloud-chenyw
3f33dc38db feat: 查询组件数据存储到store 2021-05-20 12:02:12 +08:00
wangjiahao
33f6aa36f2 Merge remote-tracking branch 'origin/main' into main 2021-05-20 12:01:34 +08:00
wangjiahao
8f42b81cb6 fix: 保存缩略图 2021-05-20 12:01:19 +08:00
taojinlong
6659beae03 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-20 11:47:27 +08:00
taojinlong
a369122ce4 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-20 11:47:18 +08:00
junjie
38ad68518d feat(frontend):logo 2021-05-20 11:42:20 +08:00
wangjiahao
8618c23814 fix: 仪表盘编辑 做出菜单不关闭问题 2021-05-20 11:20:48 +08:00
wangjiahao
bbba7a34e5 Merge remote-tracking branch 'origin/main' into main 2021-05-20 11:19:02 +08:00
wangjiahao
d56fc014c4 fix: 仪表盘编辑 做出菜单不关闭问题 2021-05-20 11:18:31 +08:00
junjie
afb24d7b07 feat(视图):button name fix 2021-05-20 10:37:43 +08:00
wangjiahao
e09484a22f fix: BUG FIX 2021-05-20 00:33:07 +08:00
wangjiahao
f6f668cad7 fix: 修改权限查询效率问题等 2021-05-19 19:47:49 +08:00
wangjiahao
7ebb015bd6 Merge remote-tracking branch 'origin/main' into main 2021-05-19 19:16:49 +08:00
wangjiahao
50be91cc7e fix: 顶级目录权限错误问题 2021-05-19 19:16:34 +08:00
fit2cloud-chenyw
f7cc4599cc fix: 外部链接预览 2021-05-19 19:03:50 +08:00
junjie
d06d8cfedc feat(视图):title样式 bug fix 2021-05-19 18:53:35 +08:00
junjie
c2cb2d125c feat(视图):维度、指标 显示名，错误提示 2021-05-19 18:21:07 +08:00
fit2cloud-chenyw
a092244066 feat: 公共链接页面样式 2021-05-19 18:19:30 +08:00
junjie
bf338aaa0a feat(frontend):视图关联数据集被删除时，友好提示 2021-05-19 18:10:25 +08:00
junjie
53b115f07d feat(frontend):视图关联数据集被删除时，友好提示 2021-05-19 18:03:53 +08:00
fit2cloud-chenyw
abf0f7560c fix: 过滤组件在没有视图时报错 2021-05-19 18:00:39 +08:00
fit2cloud-chenyw
1bf8fe5dff fix: 组织管理查询功能 2021-05-19 17:50:10 +08:00
junjie
d6f799aea2 feat(frontend):Echarts tooltip限制在图表区域内 2021-05-19 17:37:07 +08:00
fit2cloud-chenyw
b55c065554 fix: 菜单管理搜索 2021-05-19 17:25:07 +08:00
junjie
eebb2f0f36 feat(dashboard):UI fix 2021-05-19 17:23:46 +08:00
taojinlong
12e0310256 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 17:16:35 +08:00
taojinlong
bfeaabf510 fix: 国际化 2021-05-19 17:09:35 +08:00
wangjiahao
8b4753d9af Merge remote-tracking branch 'origin/main' into main 2021-05-19 16:58:35 +08:00
wangjiahao
a1c4c61d95 fix: 样式修改 2021-05-19 16:58:21 +08:00
junjie
7ee8e07691 feat(视图):视图title fix 2021-05-19 16:42:39 +08:00
wangjiahao
f615e9fda8 fix: 主题滚动条的问题 2021-05-19 16:37:15 +08:00
wangjiahao
a1923219dd Merge remote-tracking branch 'origin/main' into main 2021-05-19 16:29:33 +08:00
wangjiahao
c0ccf23a20 fix: 仪表板滚动条的问题 2021-05-19 16:29:19 +08:00
junjie
f525d9154a feat:fontsize fix;仪表板视图过滤组件 2021-05-19 16:21:20 +08:00
taojinlong
1d2e5d846d Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 15:46:50 +08:00
taojinlong
1249c6f91a fix: 国际化 2021-05-19 15:42:43 +08:00
junjie
dc4482dcaa feat(frontend):UI fix 2021-05-19 15:20:48 +08:00
taojinlong
492dd99188 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 15:14:08 +08:00
taojinlong
6b5d27aa72 fix: 限制標題長度 2021-05-19 15:13:59 +08:00
wangjiahao
71da8bb205 Merge remote-tracking branch 'origin/main' into main 2021-05-19 15:13:18 +08:00
wangjiahao
d828901dac fix: bug fxt 2021-05-19 15:13:05 +08:00
junjie
fee4f9a63f feat(frontend):UI fix 2021-05-19 14:58:21 +08:00
taojinlong
1fb3f2ee3b Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 13:50:31 +08:00
taojinlong
638b8c10cc fix: 国际化 2021-05-19 13:41:25 +08:00
fit2cloud-chenyw
58072f1b13 fix: 过滤组件国际化bug 2021-05-19 12:50:42 +08:00
junjie
a5f088c1ed Merge remote-tracking branch 'origin/main' into main 2021-05-19 11:59:18 +08:00
junjie
72ea246cdc feat(dashboard):UI fix;i18n fix 2021-05-19 11:59:04 +08:00
taojinlong
4399978965 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 11:56:09 +08:00
taojinlong
d1d9596624 fix: 国际化 2021-05-19 11:56:00 +08:00
fit2cloud-chenyw
f15253368f feat: <关于>中按钮使用user.isAdmin过滤 2021-05-19 11:52:01 +08:00
fit2cloud-chenyw
e9dc99526e fix: 删除菜单中目录 2021-05-19 11:42:09 +08:00
junjie
27b0ea6df2 feat(dashboard):新建一级目录 按钮fix 2021-05-19 10:52:46 +08:00
fit2cloud-chenyw
5f8a0126d5 feat: 路由名称改为英文 2021-05-19 10:30:51 +08:00
taojinlong
14a5d7f667 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-19 10:18:12 +08:00
taojinlong
144fb84535 fix: 国际化 2021-05-19 10:17:36 +08:00
fit2cloud-chenyw
1107529dc1 fix: 修复线上国际化切换无效问题 2021-05-19 10:03:00 +08:00
wangjiahao
8a88c0bca9 Merge remote-tracking branch 'origin/main' into main 2021-05-18 18:39:32 +08:00
wangjiahao
1c48fc8848 feat: 授权国际化等 2021-05-18 18:39:18 +08:00
fit2cloud-chenyw
a0b6661c5f fix: 国际化头部参数错误 2021-05-18 18:33:52 +08:00
fit2cloud-chenyw
3970913f43 fix: 新加了组织后，编辑已有用户时，无法选择看见新加的组织 2021-05-18 18:16:04 +08:00
junjie
ff37b43bdf feat(dashboard):UI fix 2021-05-18 17:48:33 +08:00
junjie
8a82c4687e Merge remote-tracking branch 'origin/main' into main 2021-05-18 17:31:42 +08:00
junjie
ec58faeee6 feat(dashboard):UI fix 2021-05-18 17:31:28 +08:00
fit2cloud-chenyw
0185c0c4af feat: 前端适配后台国际化 2021-05-18 17:30:36 +08:00
taojinlong
41deddbbfa fix: excel 数据集 2021-05-18 17:28:12 +08:00
junjie
9124a9213d feat(backend):fix 2021-05-18 17:18:47 +08:00
junjie
ad0c75eacf feat(dashboard):仪表盘 Table Label支持，大小自适应；收藏取消bug fix 2021-05-18 16:38:24 +08:00
fit2cloud-chenyw
2d3eb9050c fix: lic错误信息翻译 2021-05-18 16:17:07 +08:00
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
6d54dcece4 feat(frontend):UI fix 2021-05-18 15:33:39 +08:00
junjie
4535dd2a5e feat(dashboard):ui fix;创建一级目录 2021-05-18 15:20:48 +08:00
taojinlong
f07065b6f2 Merge branch 'main' of github.com:dataease/dataease into main 
# Conflicts:
#	backend/src/main/resources/db/migration/V8__system.sql
 2021-05-18 15:00:31 +08:00
taojinlong
b28e2494fb refactor: 整理sql 2021-05-18 14:44:41 +08:00
fit2cloud-chenyw
f8078b0196 fix: topBar头部现实lic错误信息 2021-05-18 14:33:48 +08:00
junjie
78d65f032a feat(dashboard):ui fix 2021-05-18 14:09:51 +08:00
junjie
08153b1f1d feat(frontend):数据集 视图 名称长度限制 2021-05-18 13:55:00 +08:00
taojinlong
4e7d0173fc fix: 限制輸入長度 2021-05-18 13:47:17 +08:00
taojinlong
27d1083d26 fix 2021-05-18 12:46:31 +08:00
taojinlong
c637344575 resolve conflict 2021-05-18 12:45:45 +08:00
taojinlong
776fa22c57 feat: 暂时去掉国际化切换 2021-05-18 12:42:27 +08:00
taojinlong
b65835a7b9 feat: 暂时去掉国际化切换 2021-05-18 12:40:47 +08:00
fit2cloud-chenyw
867ae7cb37 fix: 链接分享label文字修改 2021-05-18 12:30:17 +08:00
junjie
58620d20e3 feat(frontend):登陆页调整 2021-05-18 12:25:48 +08:00
fit2cloud-chenyw
5fc32d6bba feat: 新增关于页面 以及 lic更新功能 2021-05-18 12:23:21 +08:00
junjie
120dd256aa feat(frontend):fix 2021-05-18 12:02:04 +08:00
fit2cloud-chenyw
893d5c68e6 feat: 用户不选组织报错 2021-05-18 11:47:54 +08:00
junjie
afc6563a32 feat:非直连数据集做校验；前端登陆样式fix 测试；不同用户创建db类型数据集可以选择相同表 2021-05-18 11:24:52 +08:00
taojinlong
dcf8fe751b Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 09:39:13 +08:00
taojinlong
21e38a0ffd feat: 国际化 2021-05-18 09:39:00 +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
8fadc27a29 feat: 去掉角色代碼； 2021-05-17 15:37:06 +08:00
taojinlong
38c0aa90bc feat: 去掉角色代碼； 2021-05-17 15:36:11 +08:00
taojinlong
c96ae8caf2 feat: 去掉暫未支持的按鈕 2021-05-17 15:18:47 +08:00
taojinlong
1bdc6454c7 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-17 14:20:00 +08:00
taojinlong
e2e2b09fee feat: 国际化 2021-05-17 14:19:46 +08:00
junjie
944b1bbfec feat(视图):图表->label类型fix 2021-05-17 12:47:45 +08:00
junjie
e27baac6fd feat(视图):增加标题文字图标 2021-05-17 12:14:27 +08:00
junjie
f8e1a1a7a3 feat(视图):fix 2021-05-14 18:55:53 +08:00
taojinlong
da8e447349 feat: 国际化 2021-05-14 18:51:35 +08:00
junjie
9def83bfed feat(视图):line 面积bug fix 2021-05-14 18:30:22 +08:00
junjie
c55b7dfe01 feat(视图):图表类型新增：gauge 2021-05-14 18:21:03 +08:00
junjie
422fbbfccc feat(视图):bug fix 2021-05-14 12:39:30 +08:00
junjie
52373e01c8 feat(数据集):自助数据集编辑 2021-05-13 17:41:05 +08:00
junjie
4d24485939 feat(视图):视图表格调整 2021-05-13 17:15:07 +08:00
fit2cloud-chenyw
fe29511e38 feat: 右上角功能菜单调整 2021-05-13 16:00:15 +08:00
fit2cloud-chenyw
4b6ed5b064 feat: 头部样式 2021-05-12 18:54:21 +08:00
fit2cloud-chenyw
acb4757ba8 fix: 新用户404 2021-05-12 18:33:09 +08:00
fit2cloud-chenyw
5ef6db9dc2 feat: 新建用户登录404 2021-05-12 18:26:18 +08:00
fit2cloud-chenyw
b637b77812 Merge remote-tracking branch 'origin/main' into main 2021-05-12 16:59:00 +08:00
fit2cloud-chenyw
f62f3e635c feat: 获取标题非空判断 2021-05-12 16:58:36 +08:00
junjie
75337adf7c feat(数据集):数据集优化 2021-05-12 16:39:53 +08:00
fit2cloud-chenyw
469aa684fc feat: xpack功能初版 2021-05-12 16:19:41 +08:00
taojinlong
53b1e6a600 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-12 16:13:22 +08:00
taojinlong
a77fb3c7ae fix: 同步日志按时间排序；修复添加定时任务失败 2021-05-12 16:13:13 +08:00
junjie
ef36e73948 feat(数据集):编辑自助数据集 2021-05-12 15:53:53 +08:00
junjie
602e375071 feat(frontend):编辑自助数据集 2021-05-12 14:45:13 +08:00
junjie
ced0f3477c feat(frontend):code 格式化 2021-05-12 12:25:49 +08:00
junjie
46f8f49709 feat(视图):表格 fix 2021-05-12 12:19:24 +08:00
taojinlong
622169a33e refactor: 去掉调试信息 2021-05-12 11:53:50 +08:00
taojinlong
e3bcf81bc2 refactor: 去掉调试信息 2021-05-12 11:49:07 +08:00
taojinlong
defdc1123c Merge branch 'main' of github.com:dataease/dataease into main 2021-05-11 19:10:03 +08:00
taojinlong
0404536a20 fix: Kettle 状态 2021-05-11 19:09:32 +08:00
junjie
516ce8142e feat(frontend):UI->数据集 字段编辑支持修改字段类型 2021-05-11 17:35:48 +08:00
fit2cloud-chenyw
9d6680ad31 feat: 插件管理v0.01 2021-05-11 16:32:21 +08:00
fit2cloud-chenyw
0bda4eb062 feat: 插件管理v0.01 2021-05-11 16:30:37 +08:00
fit2cloud-chenyw
2703e881eb feat: 插件管理v0.01 2021-05-11 16:30:21 +08:00
junjie
ba6782663b feat(数据集):直连模式 暂时 不支持关联视图 和 制作自助数据集 2021-05-11 14:07:35 +08:00
junjie
ee2956caa9 feat(视图):视图fix 2021-05-11 12:40:12 +08:00
junjie
7a5037068e feat(数据集):自助数据集 优化 2021-05-11 10:48:59 +08:00
junjie
7edaa48a7d feat(frontend):login 后路由fix 2021-05-11 10:11:12 +08:00
junjie
c3f45f5794 feat(数据集):自助数据集 2021-05-10 18:54:08 +08:00
junjie
6d1110bb1b Merge remote-tracking branch 'origin/main' into main 2021-05-10 18:42:06 +08:00
junjie
20ca335a4a feat(数据集):自助数据集 2021-05-10 18:41:49 +08:00
taojinlong
a5d78ab6b1 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-10 18:19:51 +08:00
taojinlong
e46644534d fix: 处理doris 字段长度 2021-05-10 18:19:29 +08:00
junjie
dd0096922d feat(数据集):自助数据集 2021-05-10 18:11:57 +08:00
junjie
ad71308564 feat(数据集):自助数据集 2021-05-10 17:57:31 +08:00
taojinlong
4891c38a8e Merge branch 'main' of github.com:dataease/dataease into main 
# Conflicts:
#	frontend/src/lang/zh.js
#	frontend/src/views/dataset/common/DatasetGroupSelector.vue
 2021-05-10 16:07:54 +08:00
taojinlong
08f0cd24cb feat: kettle 未运行时，禁用抽取数据 2021-05-10 16:03:56 +08:00
junjie
2ae0b71de5 feat(数据集):自助数据集 测试 2021-05-10 15:30:35 +08:00
junjie
00850c5dd9 feat(数据集):自助数据集 测试 2021-05-10 15:22:36 +08:00
taojinlong
1eb4d7f24b fix: 数据源密码不要明文显示 2021-05-10 10:37:05 +08:00
taojinlong
568288001a fix: 数据集更新 2021-05-10 10:13:00 +08:00
wangjiahao
175f5510c4 feat: 增加flyway 调增模板导入等 2021-05-08 11:49:21 +08:00
wangjiahao
7ff46ff804 fix: 背景图片空url 问题 2021-05-08 11:06:45 +08:00
wangjiahao
104a8a48fa fix: 背景图片空url 问题 2021-05-08 11:04:58 +08:00
wangjiahao
776e1febc1 Merge remote-tracking branch 'origin/main' into main 2021-05-08 10:42:37 +08:00
wangjiahao
0959535093 fix: 背景图片空url 问题 2021-05-08 10:42:23 +08:00
junjie
2adbd392d3 feat(数据集):关联视图 优化 2021-05-08 10:36:06 +08:00
wangjiahao
aec257ef32 fix: 删除仪表盘 2021-05-08 00:18:55 +08:00
wangjiahao
7a27491b53 feat:修改仪表盘编辑侧边弹框样式 2021-05-08 00:04:24 +08:00
wangjiahao
dd17ebe2c5 Merge remote-tracking branch 'origin/main' into main 2021-05-07 19:21:09 +08:00
wangjiahao
33a93b8916 feat:主题 2021-05-07 19:20:47 +08:00
taojinlong
4e8d06e3f7 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-07 19:01:34 +08:00
taojinlong
4e797ff89e feat: excel 数据预览 2021-05-07 19:01:11 +08:00
junjie
7ce09f5b5d feat(frontend):前端一些优化 2021-05-07 18:29:15 +08:00
junjie
ac938c281b feat(数据集):草稿，数据集 关联视图 功能。自助数据集需要关联视图做支撑，先简单做个 数据集 关联视图 的功能，后边再优化 2021-05-07 14:51:40 +08:00
junjie
5a2a5bb368 feat(dialog):dialog 支持拖动位置 2021-05-07 11:04:50 +08:00
wangjiahao
20ce5bbb39 Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/views/chart/view/ChartEdit.vue
 2021-05-06 23:42:18 +08:00
wangjiahao
53b021bbf7 feat:样式修改 2021-05-06 23:40:34 +08:00
junjie
6096f85eda feat(视图):表格视图高度优化 2021-05-06 15:44:04 +08:00
junjie
32299104e7 feat(视图):视图优化，样式、属性调整时，不重新计算数据 2021-05-06 15:34:03 +08:00
fit2cloud-chenyw
d1f3d3a7f0 feat: 一级菜单只存一级 2021-05-06 14:43:57 +08:00
junjie
afc46f0c47 fix:请求错误取消loading 2021-05-06 11:14:51 +08:00
wangjiahao
b2182f0b03 fix:table fix 2021-05-06 11:08:57 +08:00
wangjiahao
35e42f0bdd Merge remote-tracking branch 'origin/main' into main 2021-05-06 10:59:04 +08:00
wangjiahao
01eb4abca6 feat:增加预览背景设置 解决改变窗口大小 echart 有滚动条的问题 2021-05-06 10:58:46 +08:00
fit2cloud-chenyw
22a9cc9b21 feat: 系统管理按钮样式 2021-05-06 10:40:08 +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
junjie
9c09d8f8fc feat(数据集): 添加表搜索fix；上传excel增加进度条 2021-04-30 16:18:18 +08:00
junjie
5fd3554a1d feat(数据集): 数据库表不能重复添加到数据集 2021-04-30 12:08:39 +08:00
fit2cloud-chenyw
e0a6ae7962 feat: 角色删除code字段 表单增加重复验证 2021-04-30 11:05:59 +08:00
junjie
53d71998bf fix(UI): fix 2021-04-29 18:03:41 +08:00
junjie
fe82465151 fix(UI): fix选中状态丢失 2021-04-29 18:00:05 +08:00
junjie
d7ccc33954 Merge remote-tracking branch 'origin/main' into main 2021-04-29 16:17:15 +08:00
junjie
d28e652620 fix(UI): fix选中状态丢失 2021-04-29 16:16:56 +08:00
fit2cloud-chenyw
bf6c31c371 Merge remote-tracking branch 'origin/main' into main 2021-04-29 16:15:32 +08:00
fit2cloud-chenyw
389d50a846 feat: 角色api错误 2021-04-29 16:15:11 +08:00
junjie
81ab06c384 feat(数据集): UI调整 2021-04-29 15:47:04 +08:00
junjie
3104588991 feat(数据集): 字段编辑调整 2021-04-29 15:43:15 +08:00
fit2cloud-chenyw
9ed610802c feat: 数据源弹框改为隐藏路由 2021-04-29 15:38:03 +08:00
fit2cloud-chenyw
1285ba494d feat: 系统管理弹框改为隐藏路由 2021-04-29 12:46:51 +08:00
junjie
3526d39e01 feat(数据集): 数据集fix 2021-04-29 12:12:12 +08:00
junjie
098436fa6c fix(视图): 坐标轴，标签等自适应 2021-04-28 18:58:59 +08:00
junjie
f5b3923681 fix(数据集): 预览样式优化；分页展示fix 2021-04-28 18:39:01 +08:00
junjie
794e4651b0 fix: 视图表格样式合计fix；数据集数据预览表格各项优化 2021-04-28 17:30:18 +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
fit2cloud-chenyw
be033a5c66 fix: 顶级组织不能编辑为非顶级组织 2021-04-28 13:27:56 +08:00
fit2cloud-chenyw
e8fa566549 fix: 一级菜单禁用keep-alive缓存组件 2021-04-28 12:23:06 +08:00
fit2cloud-chenyw
2946017dd5 fix: 角色代码必填 2021-04-28 12:16:52 +08:00
junjie
787123ae4a fix(frontend): 视图 bug fix 2021-04-27 18:43:15 +08:00
junjie
86d87d7b47 fix(frontend): 视图 表格合计fix；仪表盘跳转视图编辑fix 2021-04-27 18:10:05 +08:00
wangjiahao
f91661e7fe Merge remote-tracking branch 'origin/main' into main 2021-04-27 16:25:58 +08:00
wangjiahao
d4da4794ef feat:背景图片设置 2021-04-27 16:25:40 +08:00
junjie
d861a4f816 feat(视图):维度过滤与排序 2021-04-27 13:58:25 +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
junjie
2cc91fc188 feat(视图):fix 2021-04-26 17:54:15 +08:00
junjie
807d370346 feat(视图):视图 表格 组件样式，高度自适应 2021-04-26 17:38:33 +08:00
junjie
e6e651e17b feat(视图):视图 表格 组件样式，高度自适应 2021-04-26 16:56:22 +08:00
junjie
a27e61aec2 feat(视图):视图 表格 组件样式，支持'颜色'与'字体'属性修改 2021-04-26 15:20:55 +08:00
junjie
0c477f5bcf feat(视图):视图 表格 组件样式，支持'标题'与'背景'样式修改 2021-04-26 12:35:47 +08:00
junjie
461b0dda24 feat(视图):视图 表格 高度调整，界面变动自适应 2021-04-25 18:49:57 +08:00
junjie
90c406d108 feat(视图):视图增加表格 2021-04-25 18:03:13 +08:00
junjie
e3099e9cb2 feat(视图):视图指标增加数量字段 2021-04-25 15:10:49 +08:00
junjie
9302d0f092 feat(backend):数据抽取，切换Doris 2021-04-23 15:09:43 +08:00
junjie
84f68f1e4a feat(frontend):前端优化 2021-04-23 12:12:37 +08:00
fit2cloud-chenyw
d28a69e056 feat: 调整一级菜单 2021-04-22 17:59:16 +08:00
fit2cloud-chenyw
ef5eab2e19 feat: 修改自定义控制范围样式 2021-04-22 15:36:00 +08:00
fit2cloud-chenyw
89370df958 feat: 登录页面增加用户名验证 2021-04-22 14:53:23 +08:00
fit2cloud-chenyw
69f5a09cdc feat: 解决关闭编辑页面但是没有关闭左侧面板 2021-04-22 13:46:59 +08:00
wangjiahao
70a298025b fix:修改主题样式覆盖问题 2021-04-22 12:16:30 +08:00
wangjiahao
ecdd0ab4df feat:合并冲突 2021-04-22 10:33:51 +08:00
wangjiahao
d6ca7a8b8f Merge remote-tracking branch 'origin/main' into main 2021-04-21 18:49:13 +08:00
wangjiahao
290502b35b feat:新建仪表盘修改 同时支持自建 复用 导入 2021-04-21 18:48:57 +08:00
junjie
e7fd4126ac feat(frontend):全局主题色，logo，favicon等UI初步调整 2021-04-21 12:03:11 +08:00
junjie
4784c1078f feat(数据集):上传excel，保存第一行作为字段 2021-04-20 16:23:47 +08:00
fit2cloud-chenyw
6b285d7391 feat: 分享收藏完善 2021-04-20 14:19:10 +08:00
junjie
5f402b35df feat(数据集):flyway fix；excel数据集创建 2021-04-20 11:48:38 +08:00
wangjiahao
3c17fc57c0 Merge remote-tracking branch 'origin/main' into main 2021-04-20 11:47:03 +08:00
wangjiahao
23729a4c0b feat:仪表盘模板导入导出 2021-04-20 11:46:24 +08:00
fit2cloud-chenyw
46ff744b65 feat: 晚上公共链接 2021-04-20 11:21:53 +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
junjie
109ce64fdd feat(数据集):上传excel并解析预览 2021-04-19 18:33:53 +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
wangjiahao
f4f43a47aa Merge remote-tracking branch 'origin/main' into main 
# Conflicts:
#	frontend/src/views/panel/list/PanelViewShow.vue
 2021-04-19 11:51:43 +08:00
wangjiahao
11e7eb2a88 feat:仪表盘模板导入导出 2021-04-19 11:51:22 +08:00
fit2cloud-chenyw
e2a5a2f440 feat: 过滤条件格式修改 2021-04-19 11:51:12 +08:00
junjie
afca57c459 feat(backend):chart 支持 dashboard传入过滤组件条件 2021-04-19 11:44:21 +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
junjie
65f5644b74 feat(frontend):详情触发事件 hover -> click 2021-04-15 12:06:16 +08:00
junjie
d05892bd4b feat(frontend):数据集、视图名称通过鼠标hover事件，弹出与其关联的数据集 数据源等详情 2021-04-15 11:55:30 +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
junjie
74ccd7d307 feat(视图):结果过滤器暂时隐藏不做... 2021-04-14 11:30:04 +08:00
junjie
97d822796b feat(视图):spark 缓存模式修改；视图创建支持名称编辑，同时将视图名称默认作为chart title 2021-04-14 11:27:44 +08:00
wangjiahao
230ff9e5a5 Merge remote-tracking branch 'origin/main' into main 2021-04-13 18:43:39 +08:00
wangjiahao
73ab098994 feat:仪表盘模板导出功能 2021-04-13 18:43:17 +08:00
junjie
a11eb21c80 feat(frontend):UI fix 2021-04-12 18:43:13 +08:00
junjie
7787aa1c05 feat(frontend):UI fix 2021-04-12 18:24:02 +08:00
junjie
fa4fdd12b5 feat(frontend):UI fix 2021-04-12 17:43:51 +08:00
junjie
58e3e77ea6 feat(frontend):UI fix 2021-04-12 17:32:20 +08:00
junjie
7e51c30d73 feat(frontend):field icon 2021-04-12 17:18:07 +08:00
junjie
0210db82e6 feat(数据集):数据集字段类型扩展，数值区分 整型与浮点型 2021-04-09 22:42:38 +08:00
wangjiahao
5b60ea57b5 Merge remote-tracking branch 'origin/main' into main 2021-04-09 18:19:59 +08:00
wangjiahao
91a7696615 feat:合并bug修复 2021-04-09 18:19:45 +08:00
junjie
ef57580ecc feat:css调整、hbase 表名调整 2021-04-09 14:30:22 +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
396285ad69 feat: 脚手架版本 2021-04-09 10:19:44 +08:00
fit2cloud-chenyw
8f2c2fbc30 feat: 条件过滤组件公共功能 2021-04-08 18:18:08 +08:00
wangjiahao
9b036083a3 Merge remote-tracking branch 'origin/main' into main 2021-04-08 17:46:14 +08:00
wangjiahao
ff02cb9a1f fix:禁用localstorage存储仪表盘数据 容易导致浏览器本地存储越界 2021-04-08 17:46:02 +08:00
taojinlong
076cf35e26 Merge branch 'main' of github.com:dataease/dataease into main 2021-04-08 17:40:53 +08:00
taojinlong
81a802655a feat: kettle 抽取数据到 hbase 2021-04-08 17:40:30 +08:00
junjie
ce1d2035ad feat(frontend):css 2021-04-08 17:22:03 +08:00
taojinlong
8ca893dc56 Merge branch 'main' of github.com:dataease/dataease into main 2021-04-08 17:09:32 +08:00
junjie
e184d7b568 feat(视图):fix 2021-04-08 17:04:14 +08:00
taojinlong
ba34aef58a Merge branch 'main' of github.com:dataease/dataease into main 2021-04-08 16:59:06 +08:00
taojinlong
0056839869 feat: kettle 抽取数据到 hbase 2021-04-08 16:58:48 +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
junjie
8707cec075 feat(视图):增加南丁格尔玫瑰图；spark sql 表名重命名 2021-04-08 13:41:29 +08:00
fit2cloud-chenyw
dc6419302f feat: 过滤组件年份页面 2021-04-08 11:39:00 +08:00
junjie
0b410f9440 feat(数据集):数据集 excel、自助数据集，先创建几个界面 2021-04-07 18:49:01 +08:00
fit2cloud-chenyw
a0ef8e0a4c feat: 过滤组件样式 2021-04-07 18:19:38 +08:00
fit2cloud-chenyw
4ee166e86c feat: 过滤组件 2021-04-07 17:54:37 +08:00
junjie
659608d68a feat(frontend):数据集icon 2021-04-07 14:39:23 +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
f8f504f30a Merge remote-tracking branch 'origin/main' into main 2021-04-06 15:07:31 +08:00
wangjiahao
1538ff6406 feat:增加预览连接功能 2021-04-06 15:07:13 +08:00
junjie
93ce2bbe69 feat(frontend):前端调整 2021-04-06 11:47:26 +08:00
junjie
e6d662afcf feat(frontend):前端调整 2021-04-06 11:43:29 +08:00
wangjiahao
ea7efe5608 feat:预览弹出 2021-04-06 10:16:11 +08:00
junjie
cffd9bb952 feat(frontend):fix 2021-04-02 11:39:24 +08:00
junjie
959a044ef6 feat:数据集数据预览增加自定义行数；视图增加tip提示 2021-04-02 11:36:01 +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
e3c6b951dc feat: 增加视图和组件判断 2021-03-31 16:35:10 +08:00
fit2cloud-chenyw
8bbb8c7e9b feat: 封装条件组件类 2021-03-30 19:01:46 +08:00
junjie
59163995e8 feat(数据集):code fix 2021-03-30 18:11:32 +08:00
wangjiahao
af24ba2733 feat:封装画布组件 2021-03-30 16:11:59 +08:00
wangjiahao
8016aba46a feat:将画布整合在组件中 2021-03-30 15:38:32 +08:00
junjie
5e8af7cf24 feat(frontend): group css search等调整 2021-03-30 12:24:27 +08:00
fit2cloud-chenyw
ab2a840bd5 feat: 封装条件组件 2021-03-29 21:24:33 +08:00
junjie
2e8e9cc8e9 feat(视图): 回退 2021-03-29 16:50:32 +08:00
junjie
eb809c7610 feat(视图): 请求 2021-03-29 16:36:24 +08:00
wangjiahao
19fe2cf68a Merge remote-tracking branch 'origin/main' into main 2021-03-29 15:49:40 +08:00
wangjiahao
50c692fefb feat:恢复冲突 2021-03-29 15:49:29 +08:00
junjie
6fb10cdfff feat(数据集): Spark初步 2021-03-29 15:09:16 +08:00
wangjiahao
c154e642c1 Merge remote-tracking branch 'origin/main' into main 2021-03-29 14:57:19 +08:00
wangjiahao
873a03065c feat:增加仪表盘预览等功能 2021-03-29 14:57:04 +08:00
fit2cloud-chenyw
12a226643c feat: 完善公共链接分享 2021-03-29 14:15:39 +08:00
fit2cloud-chenyw
2f3af28bd3 feat: 回滚脚手架升级 2021-03-29 10:49:10 +08:00
fit2cloud-chenyw
ced8c21e28 feat: 公共链接分享 2021-03-26 18:44:41 +08:00
taojinlong
89f0c5e7aa build: 升级 npm 版本 2021-03-26 17:43:32 +08:00
taojinlong
7dcf5959a8 fix: 去掉默认用户名、密码 2021-03-26 16:06:22 +08:00
junjie
8464e7a709 feat(视图): 视图编辑传参调整 2021-03-26 12:41:39 +08:00
wangjiahao
208878c062 feat:恢复样式 2021-03-26 12:26:48 +08:00
junjie
c7d24c341d style(frontend): css fix 2021-03-26 12:14:18 +08:00
wangjiahao
fcb579d439 feat:增加背景图片 2021-03-26 11:37:32 +08:00
wangjiahao
2ce81bba8c feat:恢复 冲突 2021-03-25 19:19:21 +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
fit2cloud-chenyw
1eae5f2e37 feat: 创建公共链接 2021-03-25 18:58:05 +08:00
junjie
6b51090887 feat(数据集): 1.删除分组，场景将同时删除dataset和chart；2.数据集SQL模式可以重新编辑SQL 2021-03-25 18:09:44 +08:00
junjie
68df03d708 style(数据集): css 2021-03-25 17:09:44 +08:00
junjie
92766de9f9 style(视图): css 2021-03-25 16:41:03 +08:00
junjie
c7351ac742 style(视图): css 2021-03-25 15:48:20 +08:00
junjie
d321be221a style(视图): css 2021-03-25 12:43:19 +08:00
junjie
b3a53f9a64 feat(视图): 1.初步增加结果过滤，条件之间暂时只支持'且'逻辑；2.fix设置显示名bug；3.一些样式调整 2021-03-25 11:34:46 +08:00
junjie
470f8cddae feat(视图): 增加背景设置，样式等调整 2021-03-24 13:32:29 +08:00
junjie
fcd4ca8f2d style(视图): 视图编辑UI css调整 2021-03-24 12:30:48 +08:00
fit2cloud-chenyw
cd41a0684e feat: 仪表板预览 2021-03-23 18:17:31 +08:00
junjie
56ecb45625 feat(视图): UI调整 2021-03-23 18:13:23 +08:00
junjie
7e2da332e4 feat(视图): UI调整，汇总结果增加升、降序 2021-03-23 18:08:56 +08:00
fit2cloud-chenyw
1e21d68157 feat: 仪表板编辑 2021-03-23 17:16:51 +08:00
junjie
c607bb16ad feat(视图): 维度 指标 下拉item增加操作 2021-03-23 15:31:57 +08:00
junjie
4c920bdcd2 refactor(视图): 增加 标签、tooltip、坐标轴 设置 2021-03-23 14:32:39 +08:00
fit2cloud-chenyw
fb23a459dd feat: 去除测试数据 2021-03-23 14:05:32 +08:00
fit2cloud-chenyw
3b87239aa2 feat: 仪表板选择视图 2021-03-23 13:58:49 +08:00
fit2cloud-chenyw
621e92a06d feat: 格式化 2021-03-23 09:44:44 +08:00
fit2cloud-chenyw
2ff11d66f8 feat: 仪表板编辑国际化 2021-03-23 09:37:40 +08:00
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