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

920 Commits

Author SHA1 Message Date
taojinlong
8b176bda6f fix: doris varchar 中文 占三个字节 2021-06-24 12:09:31 +08:00
taojinlong
2d749d76a0 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-24 10:03:30 +08:00
taojinlong
21b98098ea feat: 默认主题 2021-06-24 10:03:19 +08:00
xiajunjie
2a2de5f829 fix:视图结果过滤器容错 2021-06-23 20:54:01 +08:00
wangjiahao
874fd25a7f feat: 国际化信息添加 2021-06-23 18:26:07 +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
aa68694f9f feat: 测试插件菜单bug 2021-06-23 17:11:42 +08:00
wangjiahao
4d26122532 feat(fix): 增加删除目录权限校验 增加数据源权限控制 2021-06-23 15:28:06 +08:00
junjie
35a9a8f390 feat(fix):数据集、视图分组权限返回修复 2021-06-22 11:48:39 +08:00
taojinlong
97c90910a1 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-21 16:00:22 +08:00
taojinlong
17dcc57963 feat: 示例数据 2021-06-21 16:00:09 +08:00
junjie
c536ab7666 feat(fix):定时任务修复 2021-06-21 15:59:32 +08:00
junjie
f6593d2360 feat(fix):视图移动功能 2021-06-21 11:18:38 +08:00
junjie
9bc0ec95da feat(feat):数据集，视图分组树优化，去除场景 2021-06-19 11:58:19 +08:00
junjie
cdaba0eb03 feat(feat):数据集，视图分组树优化，去除场景 2021-06-19 11:42:14 +08:00
taojinlong
976db21091 fix: 处理数据换行 2021-06-18 18:20:44 +08:00
junjie
060c41380c feat(fix):cron修复 2021-06-18 11:19:55 +08:00
taojinlong
54cc69278d fix: 校驗增量sql 2021-06-17 11:39:52 +08:00
taojinlong
43e1c198a3 fix: 校驗增量sql 2021-06-17 11:11:24 +08:00
taojinlong
4d03ce78d2 fix: 抽取數據錯誤 2021-06-17 10:43:28 +08:00
taojinlong
74df70866d fix：抽取数据 2021-06-16 19:28:02 +08:00
taojinlong
946c84ecaf Merge branch 'main' of github.com:dataease/dataease into main 2021-06-16 19:08:25 +08:00
taojinlong
a16f133706 fix：校验增量sql 2021-06-16 19:08:15 +08:00
fit2cloud-chenyw
f3cbed1f0c fix: 修复分享列表查询逻辑错误 2021-06-16 18:51:47 +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
6bce1414c6 Merge branch 'main' of fit2cloud:dataease/dataease into main 2021-06-16 18:04:17 +08:00
fit2cloud-chenyw
a8b9a4fbb2 feat: 删除不等于 不包含 2021-06-16 18:03:59 +08:00
taojinlong
7e4ead4830 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-16 18:03:25 +08:00
taojinlong
ec4dcf93a9 feat: 清理临时文件 2021-06-16 18:03:07 +08:00
wangjiahao
216f722a99 Merge remote-tracking branch 'origin/main' into main 2021-06-16 15:31:48 +08:00
wangjiahao
a8ce990a4d feat: 默认仪表盘直接关联源仪表盘 2021-06-16 15:31:27 +08:00
taojinlong
064b0fe835 Merge branch 'main' of github.com:dataease/dataease into main 2021-06-16 15:00:37 +08:00
taojinlong
8a39eeee9c feat: Doris table KEY 类型：UNIQUE 2021-06-16 14:42:02 +08:00
junjie
b622ee8ae7 feat(fix):定时任务修复 2021-06-16 14:09:37 +08:00
fit2cloud-chenyw
4dff1f4d96 fix: 修复'不包含'查询逻辑 2021-06-16 11:09:20 +08:00
junjie
93d380673e feat(fix):数据集预览分页优化 2021-06-16 10:38:33 +08:00
wangjiahao
0b1d5a07c9 Merge remote-tracking branch 'origin/main' into main 2021-06-16 10:24:38 +08:00
wangjiahao
d13c69496f fix: 修复因放开管理员权限而导致的权限问题 2021-06-16 10:24:25 +08:00
fit2cloud-chenyw
1881b60f71 fix: 修改用户管理查询条件label 2021-06-16 10:09:50 +08:00
junjie
137ddafd7e feat(fix):自定义数据集错误提示优化 2021-06-16 09:22:48 +08:00
junjie
1c4d9fe371 feat(fix):自定义数据集字段顺序优化 2021-06-15 18:26:01 +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
junjie
f261acb72f feat(fix):视图字段变化优化；过滤组件优化；返回数据优化 2021-06-15 17:11:47 +08:00
junjie
c084ac68cf feat(fix):直连数据集限制预览数目；数据源文字替换 2021-06-15 16:01:30 +08:00
taojinlong
07f520698c feat: 更改 doris key 类型 2021-06-15 14:41:02 +08:00
junjie
139952b110 feat(fix):自定义数据集选择字段顺序优化，按照用户点击顺序 2021-06-11 17:36:25 +08:00
junjie
d8830e1753 feat(fix):删除数据集，自定义数据集报错；添加视图数据预览滚动条优化；关联数据表名优化；切换视图，不清空维度 2021-06-11 17:11:13 +08:00
taojinlong
0011bae39c fix: sql 数据集 抽取 2021-06-11 16:59:10 +08:00
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
taojinlong
7f48bf4fe4 fix: 检测同步任务 2021-05-28 12:48:16 +08:00
junjie
6db08e50e9 feat(数据源):数据源名字校验 2021-05-28 12:47:18 +08:00
junjie
e955d2bfff feat(frontend):user列表增加角色字段；数据源添加报错fix 2021-05-28 12:40:19 +08:00
taojinlong
92549c13d4 fix: 检测同步任务 2021-05-28 12:19:14 +08:00
taojinlong
8f88821be4 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-28 12:18:01 +08:00
junjie
8d39ec1b48 feat(datasource):desc字段非必填 2021-05-28 12:08:44 +08:00
junjie
3075f93c84 feat(user):用户ID重复校验fix 2021-05-28 12:05:09 +08:00
wangjiahao
837b6d24d3 feat: 仪表盘改为仪表板 2021-05-28 11:46:54 +08:00
wangjiahao
1ce02bf403 feat: 仪表盘命名出现多个仪表盘问题,仪表盘改为仪表板 2021-05-28 11:21:54 +08:00
taojinlong
bb76675ec1 fix: 同步任务 2021-05-27 18:14:43 +08:00
wangjiahao
47608dd732 Merge remote-tracking branch 'origin/main' into main 2021-05-27 17:06:54 +08:00
wangjiahao
36a327f81c fix: UI 调整 2021-05-27 17:06:38 +08:00
junjie
b0cf90babe feat(数据集):定时任务fix 2021-05-27 16:01:45 +08:00
junjie
fac1cdf5d6 feat(user):查询bug fix 2021-05-27 14:45:20 +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
8e6d5436bc feat(cron):cron time fix 2021-05-26 19:17:06 +08:00
junjie
83555f9830 feat(cron):cron fix 2021-05-26 18:46:19 +08:00
wangjiahao
070ff39641 feat: 样式修改 2021-05-26 16:41:52 +08:00
junjie
dadf7bd1f6 feat(数据集):关联视图：两个数据集之间，不能有同一关联字段出现多次 2021-05-26 14:03:44 +08:00
taojinlong
56ad6efc61 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-26 12:33:02 +08:00
taojinlong
911a4e0885 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-26 12:32:48 +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
taojinlong
e522d3935d fix: 限制数据集只有一个同步任务 2021-05-26 12:05:16 +08:00
taojinlong
6602da80a6 fix: 数据源加密 2021-05-26 10:30:39 +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
cebbc87e6e Merge branch 'main' of github.com:dataease/dataease into main 2021-05-25 17:53:59 +08:00
junjie
9bac8c22b0 feat(backend):后端fix 2021-05-25 17:50:41 +08:00
taojinlong
11226a99a0 fix: 预览数据错误 2021-05-25 17:48:29 +08:00
taojinlong
5da9df542b fix: 点击查看分享页，页面报错 2021-05-25 15:52:28 +08:00
taojinlong
f151d6a293 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-25 15:32:42 +08:00
taojinlong
abb8dcf3c3 fix: 识别 Excel 字段类型 2021-05-25 15:32:07 +08:00
junjie
e3d2b4ccfc feat:1.自助数据集优化；2.数据集list fix 2021-05-25 15:22:33 +08:00
wangjiahao
58b8c7afc7 Merge remote-tracking branch 'origin/main' into main 2021-05-25 14:44:26 +08:00
wangjiahao
8c33b8e346 feat: 1.替换权限样式开关图标 2021-05-25 14:44:16 +08:00
taojinlong
982a7579c8 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-25 12:48:15 +08:00
taojinlong
d5c99e6ec9 fix: 识别 Excel 字段类型 2021-05-25 12:48:06 +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
junjie
ee3c99e177 feat(backend):关联视图表、字段重复关联校验 测试 2021-05-25 11:03:55 +08:00
xiajunjie
3e6caadf16 feat(backend):tree delete fix 2021-05-24 23:01:09 +08:00
taojinlong
ead3efcef9 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-24 18:45:11 +08:00
taojinlong
a48249c8db fix: 预览 excel数据集时，给出提示信息：处理中/处理失败 2021-05-24 18:44:49 +08:00
wangjiahao
bf52d4ec03 fix: 1.用户添加多个角色 查询报错问题 2021-05-24 18:26:51 +08:00
wangjiahao
432459a062 fix: 1.视图 数据集 默认查询所有数据 2021-05-24 17:55:53 +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
dcafd50b2b feat(i18n):后端国际化；cron 组件国际化 2021-05-24 11:03:57 +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
taojinlong
49bb1f18d6 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 17:33:56 +08:00
taojinlong
20d9f5ef9c feat: 默认语言为中文 2021-05-21 17:33:47 +08:00
junjie
1833ca5399 feat(视图):视图增加 过滤器，直接对数据集字段进行过滤 2021-05-21 16:45:21 +08:00
junjie
0129af6652 feat(backend):仪表盘过滤组件 field fix 2021-05-21 13:47:19 +08:00
junjie
c5b7a766f3 feat(backend):仪表盘支持日期过滤；doris过滤 test 2021-05-21 12:35:24 +08:00
fit2cloud-chenyw
42b1599043 fix: 菜单权限标识错误 2021-05-21 12:30:07 +08:00
taojinlong
a6a427de18 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 12:26:25 +08:00
taojinlong
2f06a0178e Merge branch 'main' of github.com:dataease/dataease into main 2021-05-21 10:59:03 +08:00
taojinlong
14ea0f17a1 fix: 删除仪表盘时，同步删除相关的收藏，分享数据 2021-05-21 10:52:19 +08:00
fit2cloud-chenyw
834e6a7f48 fix: 菜单管理bug 2021-05-21 10:36:06 +08:00
wangjiahao
c7cf7505b8 fix: 移动导入模板位置 2021-05-21 10:23:56 +08:00
junjie
f9f384d030 feat(backend):fix 2021-05-20 18:11:32 +08:00
junjie
fef63c50ea feat(backend):数据源连接参数 2021-05-20 15:01:59 +08:00
taojinlong
a369122ce4 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-20 11:47:18 +08:00
taojinlong
514b41dd55 fix: 默认抽取 excel 第一个 sheet 页 2021-05-20 11:12:18 +08:00
taojinlong
bc5cbad7bd feat: 支持sqlserver 2021-05-19 23:28:08 +08:00
xiajunjie
1b3f739f26 feat(backend):获取数据源Mapper SQL bug fix 2021-05-19 22:31:26 +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
b55c065554 fix: 菜单管理搜索 2021-05-19 17:25:07 +08:00
junjie
f525d9154a feat:fontsize fix;仪表板视图过滤组件 2021-05-19 16:21:20 +08:00
wangjiahao
b176e4a14a fix: bug 视图设置跟随样式 2021-05-19 15:45:37 +08:00
wangjiahao
d828901dac fix: bug fxt 2021-05-19 15:13:05 +08:00
junjie
a5ebc48b99 feat(backend):分组 场景 sql fix 2021-05-19 14:13:14 +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
e9dc99526e fix: 删除菜单中目录 2021-05-19 11:42:09 +08:00
junjie
7a4488bbcc feat(数据集):数据集通过授权给普通用户 2021-05-19 11:16:21 +08:00
fit2cloud-chenyw
851d8edb86 fix: 修复flyway中菜单配置 2021-05-19 10:47:38 +08:00
taojinlong
144fb84535 fix: 国际化 2021-05-19 10:17:36 +08:00
wangjiahao
36d5a80190 feat: 授权flayway 2021-05-18 19:05:03 +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
taojinlong
901710b9b1 fix: license 产品名称 2021-05-18 18:35:54 +08:00
taojinlong
97c879f94d fix: 更改初始密码 2021-05-18 18:10:53 +08:00
taojinlong
e9c6f43aa6 fix: sqlserver 2021-05-18 18:05:56 +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
taojinlong
f56889e957 fix: sql 2021-05-18 17:09:55 +08:00
taojinlong
aea71643dc Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 16:58:46 +08:00
taojinlong
e44081d1a6 fix: 证书产品名称 2021-05-18 16:58:35 +08:00
junjie
5884487e2e feat(backend):flyway 2021-05-18 16:44:26 +08:00
junjie
c0e0e617f4 Merge remote-tracking branch 'origin/main' into main 2021-05-18 16:38:38 +08:00
junjie
ad0c75eacf feat(dashboard):仪表盘 Table Label支持，大小自适应；收藏取消bug fix 2021-05-18 16:38:24 +08:00
taojinlong
f024af48aa Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 16:35:37 +08:00
wangjiahao
533d466ca2 Merge remote-tracking branch 'origin/main' into main 2021-05-18 16:34:32 +08:00
wangjiahao
025feaa057 feat: 授权flayway 2021-05-18 16:34:16 +08:00
taojinlong
254444fccf fix: 保存 excel 数据集的字段出错 2021-05-18 16:33:41 +08:00
junjie
708752a6ac feat(backend):flyway 2021-05-18 16:31:59 +08:00
fit2cloud-chenyw
32ebc596a0 fix: 删除非必要代码 2021-05-18 16:19:27 +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
taojinlong
19de8a5837 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-18 15:57:21 +08:00
taojinlong
314d886b2c fix: 保存 excel 数据集的字段出错 2021-05-18 15:56:15 +08:00
fit2cloud-chenyw
31e5cca439 feat:前端增加国际化切换 2021-05-18 15:46:14 +08:00
junjie
c3092ca38e feat(数据集):sql数据集最后支持加1个分号结束 2021-05-18 15:32:12 +08:00
taojinlong
8893d06d49 fix: 保存 excel 数据集的字段出错 2021-05-18 15:17:57 +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
9a768d9e8d feat: 菜单增加关于 2021-05-18 14:09:42 +08:00
fit2cloud-chenyw
f988c74beb feat : 删除非必要代码 2021-05-18 12:23:50 +08:00
fit2cloud-chenyw
5fc32d6bba feat: 新增关于页面 以及 lic更新功能 2021-05-18 12:23:21 +08:00
junjie
afc6563a32 feat:非直连数据集做校验；前端登陆样式fix 测试；不同用户创建db类型数据集可以选择相同表 2021-05-18 11:24:52 +08:00
taojinlong
29d275f2f7 feat: 国际化 2021-05-18 09:57:57 +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
e8e8a9c3af feat(backend):jdbc add doris 2021-05-17 17:54:38 +08:00
junjie
e98f95604e feat(backend):数据集 视图，sql重新整理 2021-05-17 16:43:02 +08:00
taojinlong
c96ae8caf2 feat: 去掉暫未支持的按鈕 2021-05-17 15:18:47 +08:00
junjie
2e0a4e2ee7 feat(视图):时间条件过滤做处理 2021-05-14 17:47:34 +08:00
junjie
69fa5d838d feat(视图):doris sql 2021-05-13 16:31:16 +08:00
junjie
dd79f663e3 feat(视图):doris sql 2021-05-13 16:25:31 +08:00
fit2cloud-chenyw
8b0ac926f8 feat: 右上角功能菜单数据 2021-05-13 16:03:35 +08:00
fit2cloud-chenyw
fe29511e38 feat: 右上角功能菜单调整 2021-05-13 16:00:15 +08:00
junjie
2f4842d410 feat(视图):过滤fix 2021-05-13 15:48:26 +08:00
junjie
d6f4d43b0e feat(数据集):时间转换 2021-05-13 15:17:27 +08:00
taojinlong
e963e586f5 feat: 数据集字段类型：type(原始类型)，de_type(dataease 计算使用)、de_extract_type(往 doris 抽取数据使用) 2021-05-13 14:45:01 +08:00
junjie
9e5bde6df3 feat(数据集):时间转换 2021-05-13 13:55:14 +08:00
taojinlong
695d22a288 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-13 13:46:40 +08:00
taojinlong
479e4aea29 fix: kettle 抽取布尔类型数据 2021-05-13 13:46:17 +08:00
junjie
3c1241d765 feat(数据集):数据集优化 2021-05-12 17:19:33 +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
taojinlong
5c26b5986d Merge branch 'main' of github.com:dataease/dataease into main 2021-05-12 15:18:06 +08:00
taojinlong
e89c8ac439 feat: 删掉数据集时，同步删掉 doris 里的表 2021-05-12 15:17:51 +08:00