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

3210 Commits

Author SHA1 Message Date
wangjiahao
7b30f1271d fix: 修复默认双碳及能源情况概览内置仪表板部分图例显示不正确问题 2023-01-09 18:49:51 +08:00
taojinlong
655cbed9d2
Merge pull request #4325 from dataease/pr@dev@pages 
Pr@dev@pages
 2023-01-09 18:32:43 +08:00
fit2cloud-chenyw
fe6333d302 feat(lic): 升级许可验证器 2023-01-09 18:05:27 +08:00
taojinlong
70073bba39 fix: 启动时，清理引擎缓存 2023-01-09 17:42:23 +08:00
taojinlong
c1bd98eccb fix(数据集): 创建join语句参数化无法保存 2023-01-09 16:33:52 +08:00
taojinlong
ef9db3c5c6 fix: 大小写导致指标和维度无法切换 2023-01-09 16:24:17 +08:00
taojinlong
6619997f6e
Merge pull request #4318 from dataease/pr@dev@pages 
Pr@dev@pages
 2023-01-09 15:48:45 +08:00
taojinlong
1c8efe9f5c fix: 精简模式日期视图显示与数据集数据不一致 2023-01-09 15:48:00 +08:00
fit2cloud-chenyw
d98c64e518 feat(插件管理): 升级1.18.1相关插件sql 2023-01-09 10:30:14 +08:00
王嘉豪
6cfc4bb8e9
Merge pull request #4311 from dataease/feat_app-class-move 
feat(应用): 应用支持移动到其他分类
 2023-01-06 18:45:28 +08:00
wangjiahao
25e76defb5 feat(应用): 应用支持移动到其他分类 2023-01-06 18:32:15 +08:00
taojinlong
e35770e504 feat: 自定义参数接口 2023-01-06 17:11:08 +08:00
taojinlong
98039fc5b2 refactor: 升级版本号 2023-01-06 16:04:39 +08:00
fit2cloud-chenyw
ee8b461992 fix(ldap): 测试连接以表单信息为准 2023-01-05 16:43:29 +08:00
taojinlong
25659d0d0e
Merge pull request #4285 from OlderBabyML/dev 
fix: 修复join子查询下的sql变量无法识别的问题
 2023-01-04 17:19:52 +08:00
taojinlong
f6144d01c4 fix: excel 展示1000条数据 2023-01-04 17:15:55 +08:00
taojinlong
0b625daefa fix: 同步doris数据不分页 2023-01-04 17:01:24 +08:00
taojinlong
f08042998e fix: 处理sql中的分号 2023-01-04 17:01:22 +08:00
taojinlong
43ffde295d fix: DB2 分页 2023-01-04 17:01:19 +08:00
taojinlong
561bf05883 fix: 数据源复制 2023-01-04 17:01:17 +08:00
marcus@micous.com
80acd7be41 fix: 修复join子查询下的sql变量无法识别的问题 2023-01-04 16:53:15 +08:00
taojinlong
35812f30ca
Merge pull request #4277 from dataease/pr@dev@fixds 
Pr@dev@fixds
 2023-01-04 15:19:54 +08:00
taojinlong
588603ba5f fix: PG同步出错 2023-01-04 15:18:26 +08:00
王嘉豪
55cff4638b
Merge pull request #4269 from dataease/pr@dev@refactor_flyway-update 
refactor: 更新flyway
 2023-01-04 12:46:48 +08:00
wangjiahao
92067b7536 refactor: 更新flyway 2023-01-04 12:43:54 +08:00
王嘉豪
b5f8e2cd71
Merge pull request #4266 from dataease/pr@dev@refactor_start 
refactor: 取消发布的仪表板在收藏里隐藏菜单
 2023-01-04 11:10:16 +08:00
wangjiahao
cf8c4eca46 refactor: 取消发布的仪表板在收藏里隐藏菜单 2023-01-04 11:05:45 +08:00
fit2cloud-chenyw
eb0976f4b0 fix(定时报告): cron表达式错误文案 2023-01-04 10:50:53 +08:00
fit2cloud-chenyw
cd3122f9e0 fix(api): 恢复错误提交 2023-01-04 09:48:50 +08:00
taojinlong
f2c0cbc48c fix: 替换Excel时，判断字段变更 2023-01-03 16:48:25 +08:00
wangjiahao
6c1cf41828 refactor: 优化仪表板主题样式 2023-01-03 14:52:14 +08:00
wangjiahao
6ca72d0ba8 refactor(应用): 复用数据源的应用记录允许编辑 2023-01-03 12:46:26 +08:00
王嘉豪
7fe50fa920
Merge pull request #4255 from dataease/pr@dev@fix_app-datasource 
fix(应用): 复用历史数据源记录名称，数据源删除时在应用日志中也进行显示
 2023-01-03 11:51:58 +08:00
wangjiahao
219af08ee3 fix(应用): 复用历史数据源记录名称，数据源删除时在应用日志中也进行显示 2023-01-03 11:49:31 +08:00
fit2cloud-chenyw
b56b2f94ec
Merge pull request #4250 from dataease/pr@dev@fix_api 
fix(api): api文档token无法续命
 2022-12-30 17:20:04 +08:00
fit2cloud-chenyw
4a68c0fcbc fix(api): api文档token无法续命 2022-12-30 16:51:51 +08:00
王嘉豪
719c3f197b
Merge pull request #4247 from dataease/pr@dev@refactor_subject 
refactor(仪表板): 默认主题背景更新为高清
 2022-12-30 12:15:46 +08:00
wangjiahao
b60f78fd56 refactor(仪表板): 默认主题背景更新为高清 2022-12-30 12:09:56 +08:00
xuwei-fit2cloud
a629af0c4e
Merge pull request #4246 from dataease/pr@dev@fix_mark_map_copy 
fix(地图): 跟随仪表板复制后丢失经纬度以及标记字段
 2022-12-30 10:59:01 +08:00
fit2cloud-chenyw
0230fbb7c0 fix(地图): 跟随仪表板复制后丢失经纬度以及标记字段 2022-12-30 10:52:53 +08:00
taojinlong
f5af838dfc
Merge pull request #4245 from dataease/pr@dev@fixds 
fix: 同步数据分页错误
 2022-12-29 22:29:41 +08:00
taojinlong
14a85cbcc6 fix: 同步数据分页错误 2022-12-29 22:28:10 +08:00
wisonic-s
d0418edd8d fix(血源关系): 修复存在多个 Excel 数据集依赖时的报错 2022-12-29 19:26:32 +08:00
王嘉豪
e3bacf0d57
Merge pull request #4241 from dataease/pr@dev@refactor_manager-auth 
refactor: 更新默认管理员权限
 2022-12-29 17:51:55 +08:00
wangjiahao
686edb3456 refactor: 更新默认管理员权限 2022-12-29 17:49:20 +08:00
taojinlong
6fe95c008c
Merge pull request #4233 from dataease/pr@dev@fixds 
fix: 同步数据分页错误
 2022-12-29 14:32:55 +08:00
taojinlong
442b76c013 fix: 同步数据分页错误 2022-12-29 14:27:59 +08:00
wangjiahao
de3452893a fix(应用): 修复更新应用时缩略图可能未更新的情况 2022-12-29 14:15:12 +08:00
taojinlong
90bb64aa07
Merge pull request #4229 from dataease/pr@dev@fixds 
fix: 解析sql错误
 2022-12-29 10:14:41 +08:00
taojinlong
f73ef989bc fix: 解析sql错误 2022-12-28 15:21:18 +08:00
wisonic-s
efcbe1681e refactor(血源分析-数据集): 调整数据集血缘关系查询结果 
返回值修改为数据源和仪表板
 2022-12-28 15:14:24 +08:00
taojinlong
12f1e358fa fix: 解析csv文件异常 2022-12-27 19:35:26 +08:00
wisonic-s
e262c93ae2 fix(血源分析): 优化血源关系查询结果 
修复 Excel 数据集的引用未正确显示，去除查询结果中重复的部分。
 2022-12-27 12:17:55 +08:00
fit2cloud-chenyw
9dd6906fcb fix(过滤器): sqlserver查询精确到毫秒的源数据有误差 2022-12-26 16:31:48 +08:00
fit2cloud-chenyw
4859bec112 fix: 定时任务状态 2022-12-26 15:15:32 +08:00
junjun
33d2651385 feat(视图): MySQL时间字段支持按季度、周统计 2022-12-26 10:04:26 +08:00
junjun
669f2aa235 feat(视图): MySQL时间字段支持按季度、周统计 2022-12-24 18:28:54 +08:00
fit2cloud-chenyw
8e1ec9f308 fix(视图): 复制视图缺少view_fields字段 2022-12-23 17:20:51 +08:00
fit2cloud-chenyw
2694bc0bca perf(地图): 导出excel合并单元格 2022-12-23 15:10:17 +08:00
taojinlong
17390e7396
Merge pull request #4171 from dataease/pr@dev@fixds 
fix: SQL参数在过滤组件中按表选择字段时出现重复的情况
 2022-12-22 22:56:47 +08:00
taojinlong
4ce8baf309 fix: 解析sql，抛出错误信息 2022-12-22 22:53:58 +08:00
taojinlong
d696d36727 fix: 空指针异常 2022-12-22 22:53:12 +08:00
taojinlong
0898186db2 fix: doris 明细表分页 2022-12-22 22:52:06 +08:00
taojinlong
70098fbbd1 fix: Where条件包含IN查询以及，多个AND 动态SQL参数时，会导致IN查询条件丢失 2022-12-22 21:29:12 +08:00
taojinlong
62eb13d731 fix: API 数据源信息加密 2022-12-22 19:15:46 +08:00
wangjiahao
4483b65b12 feat(仪表板): s2表格支持点击行头列头跳转并在跳转是带入其他相关字段匹配 2022-12-22 18:40:07 +08:00
fit2cloud-chenyw
6d73890902 perf(插件): 限制官方插件更新卸载 2022-12-22 11:14:59 +08:00
fit2cloud-chenyw
5188b99995 fix(插件): 兼容已安装的第三方插件版本号 2022-12-21 20:51:23 +08:00
taojinlong
dd05399e47 Merge branch 'dev' of github.com:dataease/dataease into dev 2022-12-21 20:01:28 +08:00
taojinlong
b6798c6fee feat: 定时任务采用分页的方式拉取数据 2022-12-21 20:01:15 +08:00
wisonic-s
ff7a1c659d Merge branch 'dev' into pr@dev@feat_relationship_analyze 2022-12-21 17:58:38 +08:00
wisonic-s
54d9f5d5f1 feat(仪表板): 增加获取仪表板列表的接口 2022-12-21 17:58:03 +08:00
junjun
f216b25c7b feat(视图): 柱状图、折线图支持结果隐藏空数据 2022-12-21 13:12:48 +08:00
junjun
615b1edfb2 Merge remote-tracking branch 'origin/dev' into dev 2022-12-21 12:50:09 +08:00
junjun
4f35f5acb5 fix(视图): 修复明细表结果展示条数与分页模式冲突的问题 2022-12-21 12:49:29 +08:00
wisonic-s
dbceeac4ff Merge branch 'dev' into pr@dev@feat_relationship_analyze 2022-12-21 12:15:02 +08:00
wisonic-s
53d46f9d0c feat(血源分析): 支持数据库，数据集，仪表板的血源分析 
支持查看数据库，数据集，仪表板被引用的情况
 2022-12-21 12:12:44 +08:00
王嘉豪
4cb5752f03
Merge pull request #4145 from dataease/pr@dev@feat_view-refresh 
feat(视图): 视图可以单独设置刷新频率
 2022-12-21 12:08:32 +08:00
wangjiahao
ab85825fc9 feat(视图): 视图可以单独设置刷新频率 2022-12-21 12:05:46 +08:00
王嘉豪
3f2e7aca4e
Merge pull request #4135 from dataease/pr@dev@refactor_template-type 
refactor(模板市场): 模板市场优化去掉应用系列分类
 2022-12-20 16:16:26 +08:00
wangjiahao
f009996a95 refactor(模板市场): 模板市场优化去掉应用系列分类 2022-12-20 16:08:56 +08:00
fit2cloud-chenyw
13c995eac5 fix(登录): 登录过期失效 2022-12-20 14:18:13 +08:00
fit2cloud-chenyw
81f30ac555 fix(地图): 地图下钻报错 2022-12-20 11:16:35 +08:00
fit2cloud-chenyw
afd225270b perf(版本号): 规范发布版本号 2022-12-19 20:23:23 +08:00
fit2cloud-chenyw
2baddc18ba fix(血缘关系): sql中删除数据库名称 2022-12-19 17:26:21 +08:00
fit2cloud-chenyw
e4fe60da53
Merge pull request #4125 from dataease/pr@dev@feat_blood_relationship 
feat(系统管理): 增加血缘关系菜单路由
 2022-12-19 17:11:04 +08:00
fit2cloud-chenyw
aa6536aa31 feat(系统管理): 增加血缘关系菜单路由 2022-12-19 17:09:40 +08:00
taojinlong
aa334f962c
Merge pull request #4124 from dataease/pr@dev@copyds 
feat: 支持复制数据源
 2022-12-19 17:08:00 +08:00
taojinlong
572a42c86e feat: 支持复制数据源 2022-12-19 17:05:45 +08:00
fit2cloud-chenyw
4dd805cf05 perf(地图): 优化地图后台逻辑 2022-12-19 16:43:48 +08:00
fit2cloud-chenyw
52d96c0cfb
Merge pull request #4118 from dataease/pr@dev@feat_distribute_plugin_operate 
feat(插件管理): 集群环境依赖redis的插件操作功能
 2022-12-16 16:36:43 +08:00
fit2cloud-chenyw
e8eee03422 feat(插件管理): 集群环境依赖redis的插件操作功能 2022-12-16 16:33:19 +08:00
taojinlong
34857162e8
Merge pull request #4117 from dataease/pr@dev@params 
feat: 过滤组件绑定参数优化,可直接展示数据集中的参数
 2022-12-16 16:24:18 +08:00
taojinlong
5eb4abe5ae feat: 过滤组件绑定参数优化,可直接展示数据集中的参数 2022-12-16 16:22:52 +08:00
fit2cloud-chenyw
4a240340d1 perf(定时报告): 增加任务状态字段 2022-12-16 13:47:40 +08:00
fit2cloud-chenyw
44ae960c52 feat(过滤器): 文本下拉组件选项可按照中文排序 2022-12-15 19:03:50 +08:00
fit2cloud-chenyw
6ec988e509
Merge pull request #4102 from dataease/pr@dev@perf_auto_login 
perf(登录): 第三方平台内免登进入DE隐藏登录以及修改密码按钮
 2022-12-15 16:07:01 +08:00
fit2cloud-chenyw
f59fbed46f perf(登录): 第三方平台内免登进入DE隐藏登录以及修改密码按钮 2022-12-15 16:05:02 +08:00
xuwei-fit2cloud
e7f04e8326
Merge pull request #4098 from dataease/pr@dev@refactor_new-subject 
refactor(仪表板): 新增默认仪表板主题
 2022-12-15 14:56:32 +08:00
wangjiahao
301d7be798 refactor(仪表板): 新增默认仪表板主题 2022-12-15 14:48:27 +08:00
fit2cloud-chenyw
a516023ea3
Merge pull request #4095 from dataease/pr@dev@feat_map_mark 
feat(视图): 色彩地图增加标记功能
 2022-12-15 14:27:31 +08:00
fit2cloud-chenyw
4fa41d8676 feat(视图): 色彩地图增加标记功能 2022-12-15 14:01:28 +08:00
wangjiahao
1c92558161 refactor(仪表板): 更新仪表板默认主题设置 2022-12-13 17:07:08 +08:00
wangjiahao
68c50614a5 refactor: 调整flyway 2022-12-13 11:42:05 +08:00
taojinlong
513ae189a4
Merge pull request #4072 from dataease/pr@dev@datasource 
feat(数据源): 数据源敏感信息加密
 2022-12-12 17:38:27 +08:00
taojinlong
214c5f1a84 feat(数据源): 数据源敏感信息加密 2022-12-12 17:17:55 +08:00
junjun
5a04c47b4b fix(视图): 修复复制仪表板后视图计算字段表达式为空的问题 #4062 2022-12-12 17:16:30 +08:00
wangjiahao
b85fb8938b feat(应用): 应用模板支持选择存量数据源 2022-12-07 18:21:15 +08:00
wangjiahao
5fc59d7801 Merge remote-tracking branch 'origin/dev' into dev 2022-12-06 17:22:04 +08:00
wangjiahao
1099b00d34 build: 更新版本号至1.18.0 2022-12-06 17:21:22 +08:00
fit2cloud-chenyw
62242d67cc feat(飞书): 工作台免登进入DataEase 2022-12-06 16:36:28 +08:00
fit2cloud-chenyw
4d4807b821 feat(xpack): 钉钉工作台免登进入DataEase 2022-12-05 13:44:59 +08:00
fit2cloud-chenyw
0aabb23165
Merge pull request #3994 from dataease/pr@dev@feat_report_img_down_api 
feat(定时报告): 下载定时报告图片api
 2022-12-02 09:04:18 +08:00
fit2cloud-chenyw
a3a064b486 perf(定时报告): 删除测试代码 2022-12-01 17:20:58 +08:00
fit2cloud-chenyw
904d2c95a2 feat(定时报告): 下载定时报告图片api 2022-12-01 17:13:21 +08:00
王嘉豪
951c0003f7
Merge pull request #3988 from dataease/pr@devrefactor_template-data-change 
refactor: 更新默认模板数据
 2022-12-01 14:58:42 +08:00
wangjiahao
dbad8857ba refactor: 更新默认模板数据 2022-12-01 11:47:29 +08:00
wisonic-s
22323141bc fix(typo): typo 2022-11-30 19:38:57 +08:00
taojinlong
a22eb627c3 fix: 分页条数为0 2022-11-30 19:06:04 +08:00
taojinlong
4e25a992c7 Merge branch 'dev' into pr@dev@fix_dataset 2022-11-30 18:39:17 +08:00
xuwei-fit2cloud
5b5072dfb2
Merge pull request #3962 from dataease/pr@dev@fix_table_field 
fix(视图): 修复doris明细表字段类型转换报错的问题
 2022-11-30 15:50:48 +08:00
junjun
d21b38c443 fix(视图): 修复doris明细表字段类型转换报错的问题 2022-11-30 15:47:55 +08:00
xuwei-fit2cloud
1700a8696a
Merge pull request #3961 from dataease/pr@dev@fix_system_i18n 
fix(系统管理): 国际化缺失
 2022-11-30 15:45:51 +08:00
taojinlong
d1e09c33ca fix: sqlserver 时间格式 2022-11-30 15:42:08 +08:00
fit2cloud-chenyw
29e4296034 fix(系统管理): 国际化缺失 2022-11-30 15:37:10 +08:00
taojinlong
4e3b2a7ae2 fix: 上传excel限制文件大小 2022-11-30 15:18:12 +08:00
Junjun
84952f3c87
Merge pull request #3953 from dataease/pr@dev@fix_app-custom-doris 
fix(应用): 修复应用创建非直连数据集因doris表创建延迟而导致的报错问题
 2022-11-30 13:42:27 +08:00
wangjiahao
c1509be15b fix(应用): 修复应用创建非直连数据集因doris表创建延迟而导致的报错问题 2022-11-30 13:36:23 +08:00
taojinlong
b259e30460 fix(数据集): doris数据集不支持分页 2022-11-30 00:12:07 +08:00
taojinlong
2ea1bbe6f6
Merge pull request #3943 from dataease/pr@dev@fix_dataset 
fix(数据集): 数据集时间格式化问题
 2022-11-30 00:05:19 +08:00
taojinlong
ab923a29c2 fix(数据集): 数据集时间格式化问题 2022-11-29 23:58:51 +08:00
xuwei-fit2cloud
a378126e13
Merge pull request #3938 from dataease/pr@dev@fix_dataset 
fix(数据集): 日期格式化
 2022-11-29 20:43:28 +08:00
taojinlong
73cc64d914 fix(数据集): 日期格式化 2022-11-29 18:14:57 +08:00
xuwei-fit2cloud
a8e9d5d4f3 chore: 添加typos文件 2022-11-29 15:16:20 +08:00
taojinlong
4d06267df2 fix(数据集): API 数据集更新失败 2022-11-29 15:04:33 +08:00
fit2cloud-chenyw
5c3b5add4d
Merge pull request #3915 from dataease/pr@dev@fix_app-clear-cache 
refactor(应用): 删除应用日志勾选删除相关资源时，清理掉浏览器相关资源的缓存
 2022-11-29 10:48:30 +08:00
wangjiahao
822de40487 refactor(应用): 删除应用日志勾选删除相关资源时，清理掉浏览器相关资源的缓存 2022-11-29 10:33:53 +08:00
xuwei-fit2cloud
80093dba16
Merge pull request #3912 from dataease/pr@dev@fix_app-union-dataset 
fix(应用): 修复含有关联数据集的仪表板应用导入后关联数据集报错问题
 2022-11-29 08:58:12 +08:00
taojinlong
72026e9a6a fix(数据集): 数据集脱敏规则 2022-11-28 22:31:26 +08:00
wangjiahao
1d08506f0c fix(应用): 修复含有关联数据集的仪表板应用导入后关联数据集报错问题 2022-11-28 22:23:30 +08:00
Junjun
c7ce770914
Merge pull request #3906 from dataease/pr@dev@fix_login_error_msg 
fix(登录): 登录失败提示信息
 2022-11-28 17:06:31 +08:00
junjun
e12d31be12 fix(视图): 修复明细表分页错误 2022-11-28 16:23:11 +08:00
fit2cloud-chenyw
38c3986ba4 fix(登录): 登录失败提示信息 2022-11-28 16:18:37 +08:00
junjun
a86e93ef4e Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	backend/src/main/resources/db/migration/V44__1.17.sql
 2022-11-28 16:04:28 +08:00
Junjun
c2b2bf7036
Merge pull request #3903 from dataease/pr@dev@fix_app-rename 
fix(应用): 修复应用重命名、控制台报错相关问题
 2022-11-28 15:25:46 +08:00
junjun
858203106d refactor(插件): 优化插件显示 2022-11-28 15:19:48 +08:00
wangjiahao
b4a47f6569 fix(应用): 修复应用重命名、控制台报错相关问题 2022-11-28 14:56:30 +08:00
fit2cloud-chenyw
794e017a7c fix(过滤器): 日期范围过滤器参数设置单个结束时间有效 2022-11-28 13:23:35 +08:00
taojinlong
2ec594f1f7 fix(数据集): 自定义脱敏规则 2022-11-28 10:23:46 +08:00
junjun
cc6edeae9e fix(数据集): 修复es数据集导出报错 2022-11-25 17:19:11 +08:00
junjun
a4b2ec8250 feat(视图): 部分数据源不支持直连分页，使用前端分页 2022-11-25 16:50:03 +08:00
junjun
1308aa1d73 feat(视图): 部分数据源不支持直连分页，使用前端分页 2022-11-25 16:31:26 +08:00
fit2cloud-chenyw
27a9cb95e7
Merge pull request #3873 from dataease/pr@dev@refactor_spell 
refactor: 单词拼写优化
 2022-11-25 15:12:51 +08:00
wangjiahao
4a0e4503ba refactor: 单词拼写优化 2022-11-25 13:24:03 +08:00
taojinlong
da4485a300
Merge pull request #3870 from dataease/pr@dev@fix_panel_rename 
fix(仪表板): 重命名报错无权限
 2022-11-25 12:22:10 +08:00
fit2cloud-chenyw
49cdd6b224
Merge pull request #3868 from dataease/pr@dev@fix_background-style 
chore: 变更flyway配置，不检查sql文件中的el变量
 2022-11-25 12:19:26 +08:00
fit2cloud-chenyw
6e6228a7fa fix(仪表板): 重命名报错无权限 2022-11-25 11:30:54 +08:00
wangjiahao
3fe49d2750 chore: 变更flyway配置，不检查sql文件中的el变量 2022-11-25 10:52:04 +08:00
taojinlong
f91566de06 fix: 表格分页 2022-11-24 19:20:08 +08:00
taojinlong
2b5fba0fe8 refactor: 去掉打印 2022-11-24 19:08:19 +08:00
taojinlong
07ed991283 Merge branch 'dev' into pr@dev@dataset 2022-11-24 19:07:14 +08:00
taojinlong
59a8dc4544 feat: 数据集脱敏规则 2022-11-24 19:06:38 +08:00
fit2cloud-chenyw
ce1651fa82 feat(过滤器): 时间范围过滤器支持动态参数 2022-11-24 12:09:56 +08:00
fit2cloud-chenyw
a61e6b684c fix(过滤器): 选择名为count的字段排序会被sql注入拦截 2022-11-23 14:01:34 +08:00
fit2cloud-chenyw
2990887854
Merge branch 'dev' into pr@dev@feat_report_task_editor 2022-11-23 11:34:35 +08:00
fit2cloud-chenyw
164d398ca5 feat(定时报告): 富文本编辑器 2022-11-23 11:32:47 +08:00
xuwei-fit2cloud
9eba57819f
Merge pull request #3830 from dataease/pr@dev@dateformat 
feat: 日期格式的支持
 2022-11-23 09:10:03 +08:00
taojinlong
0764e477bf refactor: 删除注释 2022-11-22 18:56:38 +08:00
taojinlong
8dca4400c1 feat: 日期格式的支持 2022-11-22 18:55:25 +08:00
taojinlong
1cbec36a2d Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-22 16:05:15 +08:00
taojinlong
4fbf4626cb feat: 单次执行的任务，可以手动触发执行一次同步数据的任务 2022-11-22 16:04:54 +08:00
xuwei-fit2cloud
b1041b7fb3
Merge pull request #3824 from dataease/pr@dev@excel 
feat: Excel空单元格不参与类型判断
 2022-11-22 15:02:00 +08:00
taojinlong
98acbb10d3 feat: Excel空单元格不参与类型判断 2022-11-22 14:00:11 +08:00
taojinlong
d89ebba748 feat: 日期格式的支持 2022-11-22 10:52:17 +08:00
xuwei-fit2cloud
ef1774c730
Merge pull request #3795 from dataease/pr@dev@feat_line_hide_empty_data 
Pr@dev@feat line hide empty data
 2022-11-18 16:10:01 +08:00
wisonic-s
50938eb702 Merge branch 'dev' into pr@dev@feat_line_hide_empty_data 
# Conflicts:
#	frontend/src/lang/en.js
#	frontend/src/lang/tw.js
#	frontend/src/lang/zh.js
 2022-11-18 15:47:37 +08:00
王嘉豪
9e608844a6
Merge branch 'dev' into pr@dev@feat_panel-default 2022-11-18 15:43:37 +08:00
wisonic-s
d32043ef8b feat(视图-AntV折线图): 折线图支持隐藏无数据的点 
AntV折线图支持对空数据进行处理，可选线条断开，置0或者跳过空值
https://www.tapd.cn/55578866/prong/stories/view/1155578866001009888
 2022-11-18 15:43:32 +08:00
wangjiahao
9875240437 feat(仪表板): 进入仪表板菜单默认打开第一个默认仪表板且默认仪表板增加置顶功能 2022-11-18 15:37:08 +08:00
xuwei-fit2cloud
58d0220119
Merge pull request #3785 from dataease/pr@dev@refactor_ui 
Merge remote-tracking branch 'origin/dev' into dev
 2022-11-18 10:58:50 +08:00
xuwei-fit2cloud
0bb3da598b
Merge pull request #3783 from dataease/pr@dev@dateformat2 
feat(数据集): 日期格式支持
 2022-11-18 10:57:33 +08:00
junjun
ab59dfdda1 refactor: 优化数据源类型展示 2022-11-18 10:52:21 +08:00
taojinlong
6cf8943a06 feat(数据集): 日期格式支持 2022-11-18 00:56:44 +08:00
junjun
eee3c25d63 refactor(视图): 优化视图计算字段交互 2022-11-17 19:59:51 +08:00
fit2cloud-chenyw
c6c629fbd9
Merge branch 'dev' into pr@dev@perf_public_link_style 2022-11-17 16:18:51 +08:00
fit2cloud-chenyw
1be57a2f1c perf(公共链接): 交互区域样式 2022-11-17 16:03:00 +08:00
xuwei-fit2cloud
60f6ced036
Merge pull request #3775 from dataease/pr@dev@perf_api_doc 
perf(api文档): 企业用户登录后才可以查看api
 2022-11-17 13:07:03 +08:00
fit2cloud-chenyw
bdc8ff58d0 perf(api文档): 企业用户登录后才可以查看api 2022-11-17 12:45:27 +08:00
junjun
8e5d4572da fix(视图): 修复明细表分页导致的视图异常 2022-11-16 18:05:29 +08:00
Junjun
3ef38df2b6
Merge pull request #3765 from dataease/pr@dev@refactor_panel-watermark-link 
refactor(仪表板): 优化仪表板公共链接水印展示逻辑，用户信息取分享人
 2022-11-16 14:02:50 +08:00
wangjiahao
65b6e88203 refactor(仪表板): 优化仪表板公共链接水印展示逻辑，用户信息取分享人 2022-11-16 13:54:50 +08:00
王嘉豪
1c54cc5af6
Merge pull request #3763 from zxyle/dev 
fix: 修复系统登录后密码被返回
 2022-11-16 10:13:27 +08:00
xuwei-fit2cloud
32ab0b7f76
Merge pull request #3762 from dataease/pr@dev@feat_report_task_fire_now 
feat(定时报告): 立即执行后台
 2022-11-16 09:55:56 +08:00
Xiang Zheng
7c84b6a68b
fix(应用): 修复应用登录后密码被返回 2022-11-15 20:26:33 +08:00
fit2cloud-chenyw
6acf341fe0 feat(定时报告): 立即执行后台 2022-11-15 19:05:03 +08:00
Junjun
99842f957d
Merge pull request #3756 from dataease/pr@dev@TablePagination 
Pr@dev@table pagination
 2022-11-15 16:59:58 +08:00
taojinlong
c27ea60118 feat: 系统的默认超时时间设置为100 2022-11-15 16:44:01 +08:00
taojinlong
fa06823e44 refactor: 冲突 2022-11-15 16:07:12 +08:00
taojinlong
32178e4ce3 feat: 表格支持分页 2022-11-15 16:00:23 +08:00
wangjiahao
57e5ea7aef fix: 修复公共链接水印显示问题 2022-11-15 14:07:42 +08:00
xuwei-fit2cloud
f86d0c729c
Merge pull request #3749 from dataease/pr@dev@perf_user_grid 
perf: 查询用户列表过滤废弃角色
 2022-11-15 13:01:35 +08:00
wangjiahao
aa4e5689b9 feat: 支持水印设置 2022-11-15 11:58:14 +08:00
fit2cloud-chenyw
700b13c3aa perf: 查询用户列表过滤废弃角色 2022-11-15 11:33:32 +08:00
wangjiahao
66c473eaf6 feat: 支持水印设置 2022-11-14 14:54:27 +08:00
wisonic-s
017bb8e252 Merge branch 'dev' into pr@dv@feat_group_line 2022-11-11 15:54:19 +08:00
wisonic-s
28bfd773a8 feat(视图-AntV折线图): AntV 折线图支持分组 
AntV 折线图支持设置子维度快速分组
https://www.tapd.cn/55578866/prong/stories/view/1155578866001010004
 2022-11-11 15:53:34 +08:00
Junjun
76a59c2d5c
Merge pull request #3721 from zhantiao/dev 
perf:数据集功能模块的代码优化
 2022-11-11 11:04:44 +08:00
zhantiao
589cf235cf
Update DataSetTableService.java 
在review中，我发现我遗漏了一行代码
 2022-11-11 10:33:33 +08:00
zhantiao@tiduyun.com
9354dc92ea perf:数据集功能模块的代码优化 2022-11-11 10:11:21 +08:00
zhantiao@tiduyun.com
7c126041ed Revert "perf:优化了一些代码" 
This reverts commit aaca041e
 2022-11-11 10:10:34 +08:00
fit2cloud-chenyw
0a5c9de4c4 perf(消息中心): 消息组件命名规范化 2022-11-11 10:00:42 +08:00
zhantiao@tiduyun.com
aaca041e0a perf:优化了一些代码 2022-11-10 17:32:45 +08:00
zhantiao@tiduyun.com
897782c26e fix:优化了查询授权树模型的代码 2022-11-10 16:14:49 +08:00
fit2cloud-chenyw
17c42f7159 perf(系统): 每天00:00:00定时清理废弃数据 2022-11-10 09:55:54 +08:00
junjun
b41a52080f feat(视图): 支持表格分页 2022-11-09 16:02:11 +08:00
taojinlong
0057ff13dd feat: 表格支持分页 2022-11-09 11:37:49 +08:00
fit2cloud-chenyw
2e7a268d55 perf(数据集): 优化数据集表单路由驼峰命名 2022-11-09 10:50:42 +08:00
junjun
d2f9d59af4 feat(数据集): 数据集导出Excel 2022-11-08 20:19:49 +08:00
taojinlong
b91a14d417 feat: 表格支持分页 2022-11-08 17:05:36 +08:00
taojinlong
aedae12348 feat: 表格支持分页 2022-11-08 16:58:51 +08:00
xuwei-fit2cloud
31d304122b
Merge pull request #3673 from dataease/pr@dev@_link_log 
feat(日志): 公共链接增加日志
 2022-11-08 12:55:45 +08:00
fit2cloud-chenyw
a41cf922d4 feat(日志): 公共链接增加日志 2022-11-08 12:47:31 +08:00
xuwei-fit2cloud
5d3a4a1828
Merge pull request #3669 from dataease/pr@dev@feat_log_ip 
feat(日志管理): 客户端IP地址
 2022-11-08 10:41:28 +08:00
fit2cloud-chenyw
097b4eb45f feat(日志管理): 客户端IP地址 2022-11-07 18:29:50 +08:00
王嘉豪
4f3a17178f
Merge pull request #3662 from dataease/pr@dev@feat_dataset_export 
feat(数据集): 数据集导出Excel
 2022-11-07 16:16:53 +08:00
junjun
432b2f50ec feat(数据集): 数据集导出Excel 2022-11-07 16:03:08 +08:00
fit2cloud-chenyw
398d413e0b feat(登录): 禁止扫码创建用户配置 2022-11-07 15:50:32 +08:00
Junjun
542da44515
Merge pull request #3657 from dataease/pr@dev@feat_log_retention_time_setting 
feat(日志管理): 日志保留期限机制
 2022-11-07 14:26:55 +08:00
fit2cloud-chenyw
5910dd1175 feat(日志管理): 日志保留期限机制 2022-11-07 14:22:49 +08:00
xuwei-fit2cloud
53dacdfdaf
Merge pull request #3654 from dataease/pr@dev@feat_log_retention_time_setting 
feat(基础设置): 日志保留时间
 2022-11-07 13:31:33 +08:00
xuwei-fit2cloud
3ca88cd72f
Merge pull request #3650 from dataease/pr@dev@fix_app-union 
fix(应用): 修复应用新建自定义数据集可能无效的问题
 2022-11-07 13:30:28 +08:00
fit2cloud-chenyw
a2275b5502 feat(基础设置): 日志保留时间 2022-11-07 11:35:38 +08:00
wangjiahao
b783cf42c8 fix(应用): 修复应用新建自定义数据集可能无效的问题 2022-11-07 11:06:00 +08:00
taojinlong
a9cca87c7f Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-07 10:43:15 +08:00
taojinlong
aa208e4e50 refactor: 升级版本号 2022-11-07 10:43:04 +08:00
wangjiahao
a446ac999b fix(应用): 修复应用新建自定义数据集可能无效的问题 2022-11-07 10:09:26 +08:00
xuwei-fit2cloud
77fac8f684
Merge pull request #3635 from dataease/pr@dev@fix_user_import 
feat(用户管理): 导入用户使用xlsx
 2022-11-03 17:06:07 +08:00
fit2cloud-chenyw
8eff2f492c feat(用户管理): 导入用户使用xlsx 2022-11-03 17:04:07 +08:00
xuwei-fit2cloud
c937bbd9ed
Merge pull request #3633 from dataease/pr@dev@refactor_template-market-sort 
refactor(模板市场): 增加模板市场分类排序
 2022-11-03 16:53:00 +08:00
wangjiahao
df0b4b2a6e refactor(模板市场): 增加模板市场分类排序 2022-11-03 16:50:22 +08:00
王嘉豪
2234a82f0f
Merge pull request #3627 from dataease/pr@dev@refactor_app-replace 
fix(应用): 修复数据集字段未替换问题
 2022-11-03 08:58:32 +08:00
wangjiahao
e471784e4e fix(应用): 修复数据集字段未替换问题 2022-11-03 08:57:13 +08:00
王嘉豪
3b45e35025
Merge pull request #3625 from dataease/pr@dev@refactor_app-sort 
fix(应用): 解决无法创建应用分类问题
 2022-11-03 08:09:29 +08:00
wangjiahao
5b82da6e8b fix(应用): 解决无法创建应用分类问题 2022-11-03 08:07:28 +08:00
fit2cloud-chenyw
9f40cbd30f
Merge pull request #3623 from dataease/pr@dev@refactor_app-update 
refactor(应用): 优化默认应用模板
 2022-11-02 21:50:50 +08:00
wangjiahao
75b6e9d26f refactor(应用): 优化默认应用模板 2022-11-02 21:48:45 +08:00
fit2cloud-chenyw
d75b4de2be
Merge pull request #3618 from dataease/pr@dev@fix_app-new 
refactor(应用): 增加默认JMS应用模板
 2022-11-02 18:55:19 +08:00
wangjiahao
4fdccff8fe refactor(应用): 增加默认JMS应用模板 2022-11-02 18:53:21 +08:00
xuwei-fit2cloud
aa2f13c1fa
Merge pull request #3616 from dataease/pr@dev@dataset 
Pr@dev@dataset
 2022-11-02 17:37:46 +08:00
xuwei-fit2cloud
561168aa21
Merge pull request #3615 from dataease/pr@dev@fix_app-save 
fix(应用): 应用保存增加判断，防止保存为空
 2022-11-02 17:34:29 +08:00
Junjun
bc60514d3a
Merge pull request #3614 from dataease/pr@dev@refactor_flyway 
refactor: 修改Mysql相关字符集排序
 2022-11-02 17:30:46 +08:00
wangjiahao
cbca61f0b5 fix(应用): 应用保存增加判断，防止保存为空 2022-11-02 17:30:03 +08:00
taojinlong
51e8d309ff Merge branch 'dev' of github.com:dataease/dataease into dev 2022-11-02 17:21:14 +08:00
taojinlong
ffba26de67 fix(数据源): 解析API数据源出错 2022-11-02 17:21:05 +08:00
wangjiahao
53c43967e3 refactor: 修改Mysql相关字符集排序 2022-11-02 17:17:33 +08:00
王嘉豪
77de07b9d6
Merge pull request #3612 from dataease/pr@dev@fix_mobile_share_error 
fix(移动端): 没有角色的用户无法查看分享仪表板
 2022-11-02 16:41:02 +08:00
fit2cloud-chenyw
fce9905c23 fix(移动端): 没有角色的用户无法查看分享仪表板 2022-11-02 16:29:02 +08:00
xuwei-fit2cloud
7f4beede72
Merge pull request #3609 from dataease/pr@dev@fix_app-import 
refactor(应用): 优化应用的静态文件存储方式，静态文件直接存放在服务器
 2022-11-02 15:31:24 +08:00
wangjiahao
08b90af58c refactor(应用): 优化应用的静态文件存储方式，静态文件直接存放在服务器 2022-11-02 15:27:22 +08:00
Junjun
481ae86b2d
Merge pull request #3605 from dataease/pr@dev@fix_template-market 
fix(模板市场): 修复历史模板数据应用后视图无法显示问题
 2022-11-02 14:06:57 +08:00
wangjiahao
b8a33d3836 fix(模板市场): 修复历史模板数据应用后视图无法显示问题 2022-11-02 14:02:59 +08:00
taojinlong
9b37a875d8 fix(数据源): 获取 sqlserver 表字段错误 2022-11-01 22:52:14 +08:00
wangjiahao
78957eac22 fix(视图): 修复导出视图xlsx文件在mac上的Excel无法打开问题 2022-11-01 18:44:21 +08:00
taojinlong
c2c1fdf7ca fix(系统参数): 数据集详情-更新信息，查看同步失败的原因 2022-11-01 16:26:45 +08:00
Junjun
38af75c1ef
Merge pull request #3575 from dataease/pr@dev@dataset 
fix(数据集): 行列权限白名单用户列表
 2022-11-01 13:00:59 +08:00
Junjun
8278270119
Merge pull request #3576 from dataease/pr@dev@feat_cleaning_rebot 
feat(清理机器人): 启动时执行清理
 2022-11-01 13:00:33 +08:00
fit2cloud-chenyw
de41484364 feat(清理机器人): 启动时执行清理 2022-11-01 12:56:24 +08:00
taojinlong
024ce68021 fix(数据集): 行列权限白名单用户列表 2022-11-01 12:47:16 +08:00
junjun
0c904bd660 fix(数据集): 修复计算字段中引用函数错误 2022-11-01 11:42:08 +08:00
fit2cloud-chenyw
45929f8d10 fix(分享): 分享目标重复 2022-11-01 09:58:37 +08:00
fit2cloud-chenyw
818d064370 Merge remote-tracking branch 'origin/dev' into dev 2022-11-01 09:30:08 +08:00
fit2cloud-chenyw
8d2d7c2144 fix(api): api简写"详息"替换为"详细信息" 2022-11-01 09:28:46 +08:00
xuwei-fit2cloud
42949a30c1
Merge pull request #3567 from dataease/pr@dev@dataset 
Merge branch 'dev' into pr@dev@dataset
 2022-11-01 09:28:23 +08:00
fit2cloud-chenyw
a9c73c1372 fix(我的分享): 我分享的列表数据重复 2022-10-31 23:33:42 +08:00
taojinlong
79b37c0196 Merge branch 'dev' into pr@dev@dataset 2022-10-31 23:07:55 +08:00
taojinlong
6a2c9ffa48 fix(数据集): 格式化时间 2022-10-31 23:07:18 +08:00
xuwei-fit2cloud
12724a054a
Merge pull request #3564 from dataease/pr@dev@fix_table_wrong_index_number 
Pr@dev@fix table wrong index number
 2022-10-31 22:17:41 +08:00
fit2cloud-chenyw
c6728a263c fix(我的分享): 过滤对已被删除的目标分享 2022-10-31 21:57:52 +08:00
wisonic-s
49c61f6a42 Merge branch 'dev' into pr@dev@fix_table_wrong_index_number 
# Conflicts:
#	frontend/src/views/chart/chart/common/common_table.js
#	frontend/src/views/chart/chart/table/table-info.js
#	frontend/src/views/chart/components/ChartComponentS2.vue
 2022-10-31 19:33:44 +08:00
wisonic-s
78cc8130be fix(视图): 修复表格序号错误 
修复表格序号未按照实际数据排序
https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001019105
 2022-10-31 19:12:30 +08:00
fit2cloud-chenyw
dc92b6740b
Merge pull request #3562 from dataease/pr@dev@fix_app-export-i18n 
fix: 修复应用导出后端国际化问题
 2022-10-31 18:54:06 +08:00
wangjiahao
fecc805f93 fix: 修复应用导出后端国际化问题 2022-10-31 18:47:57 +08:00
王嘉豪
25950fc4e7
Merge pull request #3559 from dataease/pr@dev@fix_msg_channel_block 
fix(消息管理): 单一渠道异常阻塞全部消息渠道
 2022-10-31 18:21:21 +08:00
fit2cloud-chenyw
4b2ca88276 fix(消息管理): 单一渠道异常阻塞全部消息渠道 2022-10-31 18:16:57 +08:00
xuwei-fit2cloud
721f3bba63
Merge pull request #3555 from dataease/pr@dev@dataset 
fix(数据集): sql 数据集编辑后，如果选择立即更新，创建一个全量更新任务
 2022-10-31 17:46:58 +08:00
taojinlong
008d79adb2 fix(数据集): sql 数据集编辑后，如果选择立即更新，创建一个全量更新任务 2022-10-31 17:44:01 +08:00
dataeaseShu
04a7806880
Merge pull request #3550 from dataease/pr@dev@refactor_panel-subject 
refactor(仪表板): 仪表板主题默认配色、文案优化
 2022-10-31 16:55:05 +08:00
wangjiahao
64b0b91fe3 refactor(仪表板): 仪表板主题默认配色、文案优化 2022-10-31 16:53:34 +08:00
fit2cloud-chenyw
527ec29bf8 fix(定时报告): 数字区间过滤器报错 2022-10-31 16:40:30 +08:00
fit2cloud-chenyw
d7fd0471ee fix(定时报告): 两个任务选同一个仪表板不同视图数据覆盖 2022-10-31 15:37:03 +08:00
fit2cloud-chenyw
fc8b215ea6 fix(定时报告): resultMode增加非空判断 2022-10-31 15:28:13 +08:00
fit2cloud-chenyw
47bb7d29ce perf(定时报告): 发送完消息删除临时文件 2022-10-31 14:27:07 +08:00
xuwei-fit2cloud
93522fc79e
Merge pull request #3521 from dataease/pr@dev@dataset 
Pr@dev@dataset
 2022-10-31 13:47:10 +08:00
taojinlong
faff7d6d16
Merge pull request #3531 from dataease/pr@dev@perf_report_task_view_file 
perf(定时报告): 视图文件格式改为xlsx
 2022-10-31 13:45:30 +08:00
fit2cloud-chenyw
6b0d48df1a fix(拼写错误): 消息相关sql中拼写错误 2022-10-31 12:13:26 +08:00
fit2cloud-chenyw
539000d8ba perf(定时报告): 视图文件格式改为xlsx 2022-10-31 11:49:31 +08:00
taojinlong
e7d6ae9719 fix(数据集): sql执行记录中，去掉打印；建表语句指定编码格式 2022-10-31 11:04:46 +08:00
taojinlong
1d88ee85e6 fix(数据集): 添加数据库数据集时数据预览出错 2022-10-31 10:50:38 +08:00
wangjiahao
7486653ce0 refactror(应用): 应用编辑权限控制优化 2022-10-30 09:29:22 +08:00
taojinlong
beb946f0d6 Merge branch 'dev' into pr@dev@dataset 
# Conflicts:
#	backend/src/main/resources/db/migration/V42__1.16.sql
 2022-10-28 18:30:34 +08:00