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

525 Commits

Author SHA1 Message Date
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