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

348 Commits

Author SHA1 Message Date
taojinlong
7ea80cd633 Merge branch 'dev' of github.com:dataease/dataease into dev 2021-07-28 12:09:35 +08:00
taojinlong
67d66c5481 fix: 判断excel 第一行不为空并且不能有空单元格 2021-07-28 12:09:16 +08:00
wangjiahao
180020c75b fix:不参与授权的菜单授权页面不再显示 2021-07-27 18:57:07 +08:00
taojinlong
fa00806f4d fix: 定时任务权限标识 2021-07-27 18:54:49 +08:00
taojinlong
d324ff8c6e fix: 更新任务状态 2021-07-23 18:37:56 +08:00
fit2cloud-chenyw
f1e3621fac fix: 合并v1.1fix 2021-07-23 12:18:05 +08:00
taojinlong
0415c14c51 feat: 更改历史任务状态 2021-07-23 11:32:09 +08:00
taojinlong
4b2f68b484 feat: 调整定时任务 2021-07-23 10:54:44 +08:00
junjie
b7936b91f9 fix: 视图中数据集权限校验 2021-07-22 18:59:36 +08:00
junjie
6825383d9a feat: 过滤器兼容flyway 2021-07-21 18:30:13 +08:00
fit2cloud-chenyw
0620d58313 feat: 行政区划代码表 2021-07-21 17:51:03 +08:00
junjie
a8e6e2d0e1 feat: 堆叠图支持堆叠项 2021-07-21 17:36:50 +08:00
taojinlong
f9f74f072c feat: 适配oracle 11g 2021-07-15 18:32:39 +08:00
fit2cloud-chenyw
090d00534b
Merge pull request #233 from dataease/pr@dev@fix_flyway版本 
fix: flyway版本号
 2021-07-13 19:01:38 +08:00
fit2cloud-chenyw
9425ef38ec fix: flyway版本号 2021-07-13 19:00:03 +08:00
fit2cloud-chenyw
84808a6e96 feat: 添加测试地图 2021-07-13 18:44:33 +08:00
王嘉豪
5a2a5830b1
Merge pull request #222 from dataease/pr@dev@panel 
feat:编辑保存，放大效果等文案修改
 2021-07-13 12:13:48 +08:00
wangjiahao
ab7c33c82a feat:编辑保存，放大效果等文案修改 2021-07-13 12:13:17 +08:00
王嘉豪
bf29a9bc1c
Merge pull request #220 from dataease/pr@dev@panel 
fix:仪表板复制视图时特殊情况出现重名的问题
 2021-07-13 10:35:39 +08:00
wangjiahao
15ce253f4c fix:仪表板复制视图时特殊情况出现重名的问题 2021-07-13 10:34:44 +08:00
taojinlong
48ed621854 feat: 追加/更新 excel 数据集时，列名与原数据集保持一致 2021-07-12 17:24:35 +08:00
fit2cloud-chenyw
8a5ccbb26b
Merge pull request #203 from dataease/pr@dev@feat_消息设置 
feat: 增加消息接收设置
 2021-07-12 11:42:59 +08:00
fit2cloud-chenyw
b329f894d1 feat: 完善消息接收设置 2021-07-12 11:30:57 +08:00
junjie
d58b06928e feat: 数据集视图底层sql拼接使用stg重构(mysql部分) 2021-07-10 10:47:47 +08:00
fit2cloud-chenyw
ff82cffff4 feat: 增加消息接收设置 2021-07-09 18:37:07 +08:00
taojinlong
d1174fed5c feat(數據集): 数据集任务，增加简单重复执行的功能 2021-07-09 10:52:20 +08:00
junjie
8e08808b83 feat: 视图返回sql 2021-07-08 14:27:34 +08:00
taojinlong
83b56beeb4
Merge branch 'dev' into pr@dev@taskmgm 2021-07-08 14:17:00 +08:00
taojinlong
4ee8896a4f feat: 任务管理 2021-07-08 14:12:30 +08:00
taojinlong
00202fa718 feat: 任务管理 2021-07-08 14:11:59 +08:00
taojinlong
3af3e5798c feat: 任务管理 2021-07-08 14:00:06 +08:00
junjie
acaf405131 feat: 数据集编辑字段，增加维度指标选项，而非老版本中通过字段类型判定 2021-07-08 13:50:22 +08:00
taojinlong
3707ca5adb feat(国际化): 任务管理 2021-07-08 09:14:55 +08:00
wangjiahao
c05e4b842d Merge remote-tracking branch 'origin/dev' into pr@dev@panel 
# Conflicts:
#	frontend/src/views/chart/view/ChartEdit.vue
 2021-07-06 18:46:54 +08:00
wangjiahao
4b11bfeb72 feat: 仪表板编辑增加新建视图功能，可以直接在仪表板新建视图 2021-07-06 18:34:01 +08:00
junjie
77f5414125 feat: 同步数据集预览数据从doris中取 2021-07-06 16:32:38 +08:00
fit2cloud-chenyw
0fc1c742a5 feat: 继续完善消息提醒 2021-07-06 15:24:34 +08:00
fit2cloud-chenyw
09f4c3d88a feat: 添加站内消息sql 2021-07-06 09:51:16 +08:00
taojinlong
f055d97488
Merge pull request #142 from dataease/pr@dev@oracle 
feat(数据源): 添加oracle 数据源时，指定schema
 2021-07-05 12:18:07 +08:00
taojinlong
6ce1adf57a feat(数据源): 添加oracle 数据源时，指定schema 2021-07-05 12:17:16 +08:00
fit2cloud-chenyw
25203a6bb8 feat: 消息中心 2021-07-02 19:19:38 +08:00
wangjiahao
2fc2bb1f88 feat: 仪表板编辑时可以进行视图的复制，复制后的视图样式等改变不影响原有视图 2021-06-29 13:44:30 +08:00
fit2cloud-chenyw
d840266320 feat: 增加 抽取模式视图 后台缓存 2021-06-28 16:47:16 +08:00
junjie
d264ed636e fix: 增加excel字段重复错误提示 2021-06-28 13:51:43 +08:00
taojinlong
a056afe236 feat: 优化默认仪表板 2021-06-24 17:37:56 +08:00
taojinlong
66d36d05a5 feat: 更新默认仪表板 2021-06-24 16:38:21 +08:00
wangjiahao
66cb80c5fc feat: 增加默认主题 2021-06-24 12:21:34 +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
wangjiahao
874fd25a7f feat: 国际化信息添加 2021-06-23 18:26:07 +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
wangjiahao
4d26122532 feat(fix): 增加删除目录权限校验 增加数据源权限控制 2021-06-23 15:28:06 +08:00
taojinlong
17dcc57963 feat: 示例数据 2021-06-21 16:00:09 +08:00
taojinlong
ec4dcf93a9 feat: 清理临时文件 2021-06-16 18:03:07 +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
taojinlong
a75734b948 feat: 增量更新的sql，增加校验 2021-06-15 17:51:18 +08:00
junjie
d8830e1753 feat(fix):删除数据集，自定义数据集报错；添加视图数据预览滚动条优化；关联数据表名优化；切换视图，不清空维度 2021-06-11 17:11:13 +08:00
wangjiahao
cfa88996b7 feat: admin 等默认管理员权限全开 2021-06-11 14:04:30 +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
f3dadc8ffe feat(backend):excel解析优化 2021-06-09 18:57:32 +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
fit2cloud-chenyw
ed068553db fix: flyway调整 2021-06-08 17:24:38 +08:00
fit2cloud-chenyw
69d11c00f1 fix: 普通角色默认权限 2021-06-08 17:21:54 +08:00
fit2cloud-chenyw
f297fd7aa2 feat: 优化 授权、安装插件、更新lic、lic到期 不需要重新登录(需要刷新浏览器)才能刷新权限数据 2021-06-07 16:11:06 +08:00
wangjiahao
21e6201d1f feat: 权限查询优化 2021-06-07 13:48:22 +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
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
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
wangjiahao
5771ec190e fix: 授权视图修改 2021-06-03 15:45:03 +08:00
wangjiahao
09891ad18d feat: 去掉panel 的授权 2021-06-03 15:37:35 +08:00
wangjiahao
5e589cf71a feat: 菜单授权管理整合到权限管理中 增加flyway 2021-06-03 14:51:08 +08:00
fit2cloud-chenyw
ca8b10bc13 fix: 解决由于缓存过期导致登录超时失效的bug 2021-06-03 13:07:44 +08:00
taojinlong
047abdde1c feat: 添加sql数据集时，非空校验 2021-06-02 16:58:37 +08:00
junjie
b9b57dd878 feat(fix):文案修改 2021-06-02 16:31:41 +08:00
taojinlong
eb39fb744d fix: 刷新token时，校验用户；国际化问题 2021-06-02 13:05:26 +08:00
junjie
98f69d4eaf feat(数据源):数据源校验提示优化 2021-06-02 10:20:03 +08:00
fit2cloud-chenyw
b5e91fcc2d feat: 普通员工默认权限设置 2021-06-01 16:24:54 +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
wangjiahao
4ae8488274 Merge remote-tracking branch 'origin/main' into main 2021-06-01 10:21:50 +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
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
junjie
10c6ca4b98 feat(role):内置角色增加创建时间，并无法编辑 删除 2021-05-28 18:19:19 +08:00
taojinlong
f99865cf8d feat: 更新任务立即执行时， 2021-05-28 16:37:37 +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
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
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
8e6d5436bc feat(cron):cron time fix 2021-05-26 19:17:06 +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
911a4e0885 Merge branch 'main' of github.com:dataease/dataease into main 2021-05-26 12:32:48 +08:00
taojinlong
e522d3935d fix: 限制数据集只有一个同步任务 2021-05-26 12:05: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
ee3c99e177 feat(backend):关联视图表、字段重复关联校验 测试 2021-05-25 11:03:55 +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
junjie
dcafd50b2b feat(i18n):后端国际化；cron 组件国际化 2021-05-24 11:03:57 +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
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
wangjiahao
c7cf7505b8 fix: 移动导入模板位置 2021-05-21 10:23:56 +08:00
wangjiahao
f6f668cad7 fix: 修改权限查询效率问题等 2021-05-19 19:47:49 +08:00
wangjiahao
d828901dac fix: bug fxt 2021-05-19 15:13:05 +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
fit2cloud-chenyw
851d8edb86 fix: 修复flyway中菜单配置 2021-05-19 10:47:38 +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
97c879f94d fix: 更改初始密码 2021-05-18 18:10:53 +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
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
junjie
708752a6ac feat(backend):flyway 2021-05-18 16:31:59 +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