Commit Graph

671 Commits

Author SHA1 Message Date
taojinlong
dbf671c4f7 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-11 16:47:54 +08:00
taojinlong
6c62ff00a6 fix: sql 数据集 抽取 2021-06-11 16:47:42 +08:00
fit2cloud-chenyw
ec0a1f9524 fix: 【ID1004304】全新安装的环境,添加license的时候页面报错 2021-06-11 16:06:15 +08:00
junjie
e53363d828 feat(同步任务):定时任务开始时间修复 2021-06-11 14:23:53 +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
26bc2b605e feat(backend):数据计算sql修复 2021-06-11 13:35:11 +08:00
taojinlong
f89c0819f4 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-11 12:47:52 +08:00
taojinlong
77303963e6 fix: sql 数据集 抽取 2021-06-11 12:47:27 +08:00
junjie
fd916cb8ad feat(视图):暂时隐藏快速计算;增加新的计算汇总方式,适应指标卡、指针仪表盘等汇总统计类图表,仅支持一个指标字段 2021-06-11 12:24:19 +08:00
taojinlong
e40bf35a37 fix: sql 数据集 抽取 2021-06-11 11:38:19 +08:00
junjie
09d60f7fd9 feat(frontend):分组、场景pid修改为0 2021-06-10 18:20:17 +08:00
fit2cloud-chenyw
1fcdaa4d0c feat : 编辑链接删除链接移到数据授权,菜单中删除 2021-06-10 18:16:40 +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
f891f3b7b6 feat(frontend):数据集删除优化 2021-06-10 15:57:58 +08:00
junjie
dd8e622958 feat(数据集):自定义数据集不能再制作自定义数据集 2021-06-10 10:48:05 +08:00
junjie
f3dadc8ffe feat(backend):excel解析优化 2021-06-09 18:57:32 +08:00
junjie
e2d6cd240c feat(backend):视图结果过滤,空 非空bug修复 2021-06-09 18:12:47 +08:00
taojinlong
351a5763e0 fix: 增量更新 2021-06-09 17:36:40 +08:00
taojinlong
91eef92098 fix: 处理连接池为空的情况 2021-06-09 16:42:12 +08:00
taojinlong
dcfbe5a69a fix: excel date 2021-06-09 14:53:09 +08:00
junjie
94aba8af70 feat(backend):定时任务优化 2021-06-09 13:53:10 +08:00
taojinlong
6fe0f5f178 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-09 13:24:24 +08:00
taojinlong
08a193d4ee feat: 收取数据后,删掉 kettle 文件 2021-06-09 13:24:10 +08:00
junjie
9de3b8fc1a feat(backend):excel上传解析容错修复 2021-06-09 11:22:32 +08:00
fit2cloud-chenyw
ed068553db fix: flyway调整 2021-06-08 17:24:38 +08:00
fit2cloud-chenyw
fdad509593 Merge remote-tracking branch 'origin/main' into main 2021-06-08 17:22:14 +08:00
fit2cloud-chenyw
69d11c00f1 fix: 普通角色默认权限 2021-06-08 17:21:54 +08:00
taojinlong
2f26f8bb71 feat: excel 數據集 替換、追加 2021-06-08 16:39:09 +08:00
taojinlong
6b3c44fb07 feat: excel 數據集 替換、追加 2021-06-08 16:09:37 +08:00
taojinlong
2863583971 feat: excel 數據集 替換、追加 2021-06-08 15:39:29 +08:00
taojinlong
d44bbddbcb feat: 【UI】系统中名称修改 2021-06-08 14:52:26 +08:00
junjie
ebe6f306c6 feat(数据集):编辑数据集修改 2021-06-08 12:16:55 +08:00
junjie
c839b3cba4 feat(数据集):编辑excel前端 2021-06-08 11:30:26 +08:00
fit2cloud-chenyw
f297fd7aa2 feat: 优化 授权、安装插件、更新lic、lic到期 不需要重新登录(需要刷新浏览器)才能刷新权限数据 2021-06-07 16:11:06 +08:00
taojinlong
d43f6b0d4a Merge branch 'main' of github.com:dataease/dataease into main 2021-06-07 15:00:07 +08:00
taojinlong
c3e8ae4d41 fix: 抽取数据 2021-06-07 14:58:56 +08:00
wangjiahao
bd124aa7c5 Merge remote-tracking branch 'origin/main' into main 2021-06-07 13:48:35 +08:00
wangjiahao
21e6201d1f feat: 权限查询优化 2021-06-07 13:48:22 +08:00
taojinlong
7e40ea46dd <proxy>
<id>optional</id>
      <active>true</active>
      <protocol>http</protocol>
      <username></username>
      <password></password>
      <host>127.0.0.1</host>
      <port>7890</port>
      <nonProxyHosts>local.net|some.host.com</nonProxyHosts>
    </proxy>
Merge branch 'main' of github.com:dataease/dataease into main
2021-06-07 12:35:17 +08:00
taojinlong
b2f1469869 feat: column separator: |DE| 2021-06-07 12:35:06 +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
taojinlong
b42e1e2855 feat: 设置 Excel 字段长度 2021-06-07 10:17:55 +08:00
wangjiahao
0b56ae1b3c feat(fix): 1.权限查询效率优化 2.替换权限开启图标,3.授权对象类型切换 授权资源权限依旧保留问题,4.开放普通用户 组织对菜单的授权 2021-06-04 23:21:47 +08:00
fit2cloud-chenyw
03f43fde95 fix: 【ID1004129】【仪表板】一个用户取消收藏后其他收藏的用户也没有了 2021-06-04 16:58:50 +08:00
fit2cloud-chenyw
d2ac09d60e fix: 菜单排序 2021-06-04 16:29:10 +08:00
wangjiahao
f751485496 Merge remote-tracking branch 'origin/main' into main 2021-06-04 16:23:33 +08:00
wangjiahao
63fa24fcb4 fix: 修复仪表盘视图查不出来的问题 2021-06-04 16:23:17 +08:00
junjie
819def5c23 feat(数据集):文本转数值问题修复 2021-06-04 15:49:41 +08:00
junjie
ea74a2639a feat(数据集):文本转数值问题修复 2021-06-04 15:47:44 +08:00
fit2cloud-chenyw
ef769da27d fix: 优化token错误提醒 2021-06-04 12:20:03 +08:00
junjie
535b7b104e Merge remote-tracking branch 'origin/main' into main 2021-06-04 11:09:02 +08:00
junjie
f011ca7a68 feat(fix):登陆校验优化 2021-06-04 11:08:50 +08:00
fit2cloud-chenyw
152c621054 fix: 【ID1003561】登录有效时间似乎不正确 2021-06-04 11:03:42 +08:00
junjie
c3e9157761 feat(fix):登陆校验优化 2021-06-04 10:57:58 +08:00
fit2cloud-chenyw
3b8f971796 feat: 插件错误日志提醒 2021-06-04 09:49:02 +08:00
fit2cloud-chenyw
2d1b646a07 feat: 插件路径缺失错误日志提醒 2021-06-04 09:35:35 +08:00
wangjiahao
62ca8a2dd5 feat: 优化仪表板和模板的默认排序 2021-06-03 18:47:36 +08:00
junjie
f889d5f78f feat(fix):db表报错修复 2021-06-03 18:01:28 +08:00
junjie
2d6c22190f feat(fix):数据源、数据集、视图以及分组场景等,同一级下名称全局唯一,修改提示文案;同一数据集下相同定时任务同名校验 2021-06-03 17:32:05 +08:00
fit2cloud-chenyw
63002eefff rollback: 登录超时bug 2021-06-03 16:26:16 +08:00
taojinlong
9bcf6f49c9 feat: 使用中的数据源不允许删除 2021-06-03 16:25:36 +08:00
fit2cloud-chenyw
0e010b85cd feat: logout免登录 2021-06-03 15:53:47 +08:00
junjie
f87d4017ac feat(fix):返回值类型修复 2021-06-03 15:50:01 +08:00
wangjiahao
5771ec190e fix: 授权视图修改 2021-06-03 15:45:03 +08:00
wangjiahao
5c17df3c6a Merge remote-tracking branch 'origin/main' into main 2021-06-03 15:37:51 +08:00
wangjiahao
09891ad18d feat: 去掉panel 的授权 2021-06-03 15:37:35 +08:00
taojinlong
7eb0c473bf Merge branch 'main' of github.com:dataease/dataease into main 2021-06-03 15:11:34 +08:00
taojinlong
48069f563f fix: 判断导入数据执行结果 2021-06-03 15:10:54 +08:00
wangjiahao
6aa2ee6076 Merge remote-tracking branch 'origin/main' into main 2021-06-03 14:51:19 +08:00
wangjiahao
5e589cf71a feat: 菜单授权管理整合到权限管理中 增加flyway 2021-06-03 14:51:08 +08:00
fit2cloud-chenyw
23a003787e fix: 解决token刷新导致登录超时bug 2021-06-03 14:18:15 +08:00
wangjiahao
0a99716b09 Merge remote-tracking branch 'origin/main' into main 2021-06-03 14:01:33 +08:00
wangjiahao
8e61d2eaee feat: 菜单授权管理整合到权限管理中 2021-06-03 14:01:18 +08:00
fit2cloud-chenyw
140daca102 fix: 解决用户列表分页错误 2021-06-03 13:38:30 +08:00
fit2cloud-chenyw
ca8b10bc13 fix: 解决由于缓存过期导致登录超时失效的bug 2021-06-03 13:07:44 +08:00
junjie
180c56f293 feat(fix):rollback 2021-06-03 12:40:54 +08:00
junjie
ee5e4ac055 feat(fix):删除数据集,同时删除关联视图的关联关系 2021-06-03 12:30:50 +08:00
taojinlong
9d142bcfc8 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-03 12:17:19 +08:00
taojinlong
018b657f1a feat: 处理增量同步 2021-06-03 12:17:05 +08:00
junjie
01bd2b165c feat(fix):定时任务修复 2021-06-03 12:04:27 +08:00
taojinlong
7c429d9662 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-03 10:29:11 +08:00
taojinlong
101a8a24e1 feat: 处理 LONGTEXT 类型 2021-06-03 10:29:04 +08:00
fit2cloud-chenyw
7185f815e9 fix: 仪表板分享过滤当前用户 2021-06-02 21:49:51 +08:00
taojinlong
4fb3652486 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-02 18:27:34 +08:00
taojinlong
4c36090094 feat: kettle抽取数据时,字符集默认utf-8 2021-06-02 18:26:56 +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
taojinlong
c627f44e6e Merge branch 'main' of github.com:dataease/dataease into main 2021-06-02 17:11:44 +08:00
junjie
fa10f46a75 feat(fix):定时任务修复 2021-06-02 17:10:43 +08:00
junjie
e20f4c23ed feat(fix):前端样式冲突修复;doris ddl修复 2021-06-02 17:08:12 +08:00
taojinlong
047abdde1c feat: 添加sql数据集时,非空校验 2021-06-02 16:58:37 +08:00
wangjiahao
1255d33d35 Merge remote-tracking branch 'origin/main' into main 2021-06-02 16:46:53 +08:00
wangjiahao
ff57d0fb9c feat: 编辑仪表板时 由查询自建视图 修改为查询有权限的视图 2021-06-02 16:46:41 +08:00
taojinlong
11956c8745 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-02 16:40:22 +08:00
taojinlong
b3fec2c72d fix: 预览数据出错 2021-06-02 16:40:14 +08:00
junjie
a58c485c6a Merge remote-tracking branch 'origin/main' into main 2021-06-02 16:31:52 +08:00
junjie
b9b57dd878 feat(fix):文案修改 2021-06-02 16:31:41 +08:00
wangjiahao
bfe902d371 Merge remote-tracking branch 'origin/main' into main 2021-06-02 16:30:19 +08:00
wangjiahao
5e277bfd3a feat: 编辑仪表板时 由查询自建视图 修改为查询有权限的视图 2021-06-02 16:30:09 +08:00
junjie
47392eead8 feat(fix):定时任务重启执行修复;前端form校验优化 2021-06-02 16:16:20 +08:00
taojinlong
183c867452 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-02 15:35:12 +08:00
taojinlong
34d58277ab feat: 抽取数据,支持数据源表的 column name 为中文 2021-06-02 15:35:03 +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
fit2cloud-chenyw
f837c0edf4 fix: 【ID1004028】访问公共链接总是提示页面无效,跳转到登录页面 2021-06-02 11:35:38 +08:00
junjie
3825be261c feat(backend):提示修改 2021-06-02 11:06:03 +08:00
taojinlong
32a9980178 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-02 10:46:14 +08:00
taojinlong
82b66cb263 fix: 校验数据源连接 2021-06-02 10:46:06 +08:00
junjie
98f69d4eaf feat(数据源):数据源校验提示优化 2021-06-02 10:20:03 +08:00
junjie
5a565f3fa5 feat(视图):为日期维度,增加日期显示与格式转换功能 2021-06-01 17:39:11 +08:00
junjie
784f6fbf63 feat(视图):为日期维度,增加日期显示与格式转换功能 2021-06-01 17:14:55 +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
junjie
3a49628b62 feat(视图):为日期维度,增加日期显示与格式转换功能 2021-06-01 16:09:51 +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
taojinlong
89c758a50a feat: 识别excel 时间类型 2021-06-01 14:18:24 +08:00
taojinlong
c699ebeed4 feat: 识别excel data 类型 2021-06-01 14:05:45 +08:00
junjie
87c5a44016 feat(数据集):excel解析date数据,默认存日期类型 2021-06-01 14:03:06 +08:00
junjie
48f9a400f1 feat(flyway):去掉重复ddl 2021-06-01 13:38:31 +08:00
fit2cloud-chenyw
d1687d5d4c feat: xpack插件默认安装表记录 2021-06-01 13:29:54 +08:00
fit2cloud-chenyw
e677788ac5 feat: 删除不需要的菜单 2021-06-01 11:36:07 +08:00
fit2cloud-chenyw
35796108c7 feat: 初步整合xpack功能完毕 2021-06-01 11:13:40 +08:00
wangjiahao
4ae8488274 Merge remote-tracking branch 'origin/main' into main 2021-06-01 10:21:50 +08:00
wangjiahao
8786ff095b Merge remote-tracking branch 'origin/main' into main 2021-06-01 10:21:42 +08:00
junjie
208e5e3339 feat(flyway):初始化数据修改 2021-06-01 10:21:34 +08:00
wangjiahao
8c543c3233 fix: flyway 调整表创建顺序 2021-06-01 10:21:27 +08:00
taojinlong
b4376a079e feat: license 提醒: 无license,不提醒;过期以及无效,提醒 2021-05-31 17:12:27 +08:00
taojinlong
ca67be9426 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-31 16:02:07 +08:00
taojinlong
7fc6296bc1 feat: 检测同步状态 2021-05-31 16:01:51 +08:00
fit2cloud-chenyw
ce833626ce feat: 查询插件菜单过滤按钮类型 2021-05-31 14:44:23 +08:00
fit2cloud-chenyw
1ffbe36c3c feat: 整合xpack'组织管理' 2021-05-31 14:07:12 +08:00
taojinlong
99bae93fb5 feat: 限制数据集只有一个同步任务;数据源支持修改密码和端口号 2021-05-31 12:49:55 +08:00
taojinlong
b8a64a3fc5 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-31 10:17:31 +08:00
taojinlong
92718d1678 feat: 限制数据集只有一个同步任务 2021-05-31 10:17:24 +08:00
fit2cloud-chenyw
2d5fe4f8ba feat: 删除'菜单管理'、'组织管理' 2021-05-31 09:14:16 +08:00
fit2cloud-chenyw
ae733b0776 fix: 删除原有菜单'系统参数'、'角色管理',初步整合xpack插件模块 2021-05-30 20:24:54 +08:00
taojinlong
d6d6dcda18 feat: 限制数据集只有一个同步任务 2021-05-29 12:36:20 +08:00
taojinlong
f83f4fb12f Merge branch 'main' of github.com:dataease/dataease into main 2021-05-29 12:07:49 +08:00
junjie
10c6ca4b98 feat(role):内置角色增加创建时间,并无法编辑 删除 2021-05-28 18:19:19 +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
taojinlong
edfb017066 fix: 冲突 2021-05-28 12:51:26 +08:00