Commit Graph

4299 Commits

Author SHA1 Message Date
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
dec74f9e4e fix(国际飞书): 国际飞书英文简称为INT Lark 2022-10-31 20:47:00 +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
王嘉豪
fb0aacda5a
Merge pull request #3561 from dataease/pr@dev@perf_bubble_map_base_color
perf(气泡地图): 深色主题默认底图颜色
2022-10-31 18:48:43 +08:00
fit2cloud-chenyw
e1725b3b0e
Merge pull request #3560 from dataease/pr@dev@fix_app-export
fix(应用管理): 修复应用管理无法删除分类问题,国际化错误问题
2022-10-31 18:47:01 +08:00
fit2cloud-chenyw
d422223aef perf(气泡地图): 深色主题默认底图颜色 2022-10-31 18:39:55 +08:00
wangjiahao
a10ef0df75 fix(应用管理): 修复应用管理无法删除分类问题,国际化错误问题 2022-10-31 18:29:29 +08:00
fit2cloud-chenyw
6124bc30a1
Merge pull request #3558 from dataease/pr@dev@refactor_tab-font-size
refactor(组件): Tab组件支持设置字体大小
2022-10-31 18:18:40 +08:00
wangjiahao
4d43af735b refactor(组件): Tab组件支持设置字体大小 2022-10-31 18:10:00 +08:00
xuwei-fit2cloud
0aafefb3d8
Merge pull request #3554 from dataease/pr@dev@refactor_i18n
refactor: 国际化修改
2022-10-31 17:35:11 +08:00
wangjiahao
25a3a03df1 refactor: 国际化修改 2022-10-31 17:26:27 +08:00
dataeaseShu
87beaa5445 Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-31 17:19:57 +08:00
dataeaseShu
03c25ec248 fix: 应用导出 国际化 2022-10-31 17:19:30 +08:00
dataeaseShu
eab8fbbd57
Merge pull request #3551 from dataease/pr@dev@refactor_default-subject
refactor: 修改默认主题选项卡配色
2022-10-31 17:14:44 +08:00
wangjiahao
f91ad37e76 refactor: 修改默认主题选项卡配色 2022-10-31 17:13:40 +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
dataeaseShu
f4848b68f9
Merge pull request #3543 from dataease/pr@dev@refactor_chart-split-color
refactor(视图): 优化横纵轴网格线深色背景下的颜色
2022-10-31 16:52:30 +08:00
王嘉豪
781da028e7
Merge pull request #3549 from dataease/pr@dev_eslint_auto_fix
Pr@dev eslint auto fix
2022-10-31 16:49:31 +08:00
dataeaseShu
a9171859fe Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-31 16:44:07 +08:00
dataeaseShu
c082f515cc fix: 仪表板组件title更改 checkbox改成开关 2022-10-31 16:41:22 +08:00
junjun
0a2b75ea2c refactor(视图): 视图备注与标题对齐 2022-10-31 16:26:38 +08:00
wangjiahao
6e1b76bba5 refactor(视图): 优化横纵轴网格线深色背景下的颜色 2022-10-31 16:06:22 +08:00
Junjun
f95af4d9c4
Merge pull request #3540 from dataease/pr@dev@refactor_chart-view-remark
refactor(视图): 视图标题备注编辑时显示填充背景,主题色切换保留备注的显示设置
2022-10-31 15:29:19 +08:00
wangjiahao
533c485587 refactor(视图): 视图标题备注编辑时显示填充背景,主题色切换保留备注的显示设置 2022-10-31 15:26:16 +08:00
dataeaseShu
c839f16d79 Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-31 15:19:00 +08:00
dataeaseShu
c6011186da fix: 仪表板 title 修改相关bug修复 2022-10-31 15:18:11 +08:00
Junjun
6596ca9d71
Merge pull request #3534 from dataease/pr@dev@feat_tab-head-sort
feat(组件): Tab组件支持排序
2022-10-31 14:25:14 +08:00
wangjiahao
5914e62869 feat(组件): Tab组件支持排序 2022-10-31 13:55:15 +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
junjun
bfe74e6264 fix(视图): 修复组合图不显示的问题 2022-10-31 11:57:11 +08:00
xuwei-fit2cloud
5df8554e22
Merge pull request #3529 from dataease/pr@dev@feat_tab-head-position
feat(组件): Tab组件支持设置头部位置
2022-10-31 11:39:38 +08:00
wangjiahao
2b37f7832e feat(组件): Tab组件支持设置头部位置 2022-10-31 11:35:50 +08:00
junjun
3f2fe9aaca fix(视图): 修复透视表列表头受序列号影响的问题 2022-10-31 11:30:05 +08:00
taojinlong
e7d6ae9719 fix(数据集): sql执行记录中,去掉打印;建表语句指定编码格式 2022-10-31 11:04:46 +08:00
wangjiahao
7d3a6cb0a2 feat(组件): Tab组件支持设置头部位置 2022-10-31 11:01:54 +08:00
xuwei-fit2cloud
c3ce2beb2e
Merge pull request #3527 from dataease/pr@dev@refactor_view-title-remark
refactor(视图): 优化标题备注编辑框背景,使用仪表板加视图的复合颜色作为背景
2022-10-31 09:45:39 +08:00
xuwei-fit2cloud
9a54d696a9
Merge pull request #3526 from dataease/pr@dev@refactor_panel-drag-tab
refactor(仪表板): 当检测到组件想要移入Tab中的画布时,被拖拽组件图层设置为最高防止被tab组件遮挡
2022-10-31 09:44:47 +08:00
xuwei-fit2cloud
76021e1635
Merge pull request #3525 from dataease/pr@dev@refactor_app-loading
refactor(应用): 优化应用管理界面Loading状态防止误触
2022-10-31 09:44:06 +08:00
wangjiahao
fbfa943b04 refactor(视图): 优化标题备注编辑框背景,使用仪表板加视图的复合颜色作为背景 2022-10-30 21:58:19 +08:00
wangjiahao
09e96d725b refactor(仪表板): 当检测到组件想要移入Tab中的画布时,被拖拽组件图层设置为最高防止被tab组件遮挡 2022-10-30 21:28:45 +08:00
wangjiahao
c492a4650d refactor(仪表板): 当检测到组件想要移入Tab中的画布时,被拖拽组件图层设置为最高防止被tab组件遮挡 2022-10-30 21:27:49 +08:00
wangjiahao
d6769a142e refactor(应用): 优化应用管理界面Loading状态防止误触 2022-10-30 21:06:55 +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
taojinlong
c59585ac5b feat(数据集): 【SQL数据集】增加执行记录 2022-10-28 18:22:01 +08:00
dataeaseShu
4cbba5af43 Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-28 17:52:09 +08:00
dataeaseShu
9932fe95a8 fix: hive数据源报错信息统一 2022-10-28 17:50:58 +08:00
dataeaseShu
92aae449db
Merge pull request #3518 from dataease/pr@dev@refactor_app-export
refactor(应用): 应用导出增加设置应用信息,并导出为zip文件
2022-10-28 17:46:45 +08:00
junjun
0706077c4d refactor(视图): 阈值设置界面UI优化 2022-10-28 17:41:00 +08:00
wangjiahao
7fb148c7e8 refactor(应用): 应用导出增加设置应用信息,并导出为zip文件 2022-10-28 17:40:40 +08:00
dataeaseShu
1b59101292 Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-28 16:59:27 +08:00
dataeaseShu
8fe512cdf3 fix: 角色添加用户多选打勾 数据集名称重复国际化 数据源加载数据loading 2022-10-28 16:58:25 +08:00
fit2cloud-chenyw
88c5f6993f fix(定时报告): echarts视图截图不完整 2022-10-28 14:37:23 +08:00
dataeaseShu
f9f5e3a2e5
Merge pull request #3512 from dataease/pr@dev@fix_gradient_color
fix(地图): 渐变色设置不可清除
2022-10-28 12:29:10 +08:00
fit2cloud-chenyw
ce0243e339 fix(地图): 渐变色设置不可清除 2022-10-28 11:38:13 +08:00
dataeaseShu
3a1701051f fix: S2报错修复 2022-10-28 10:45:11 +08:00
dataeaseShu
8f4ef3226e Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-28 10:20:55 +08:00
dataeaseShu
980f3a11de fix: 全屏预览 移动端模式下 图表标题禁止修改 2022-10-28 10:19:28 +08:00
maninhill
19a6bd6058
Merge pull request #3507 from dataease/pr@dev@perf_larksuite
fix(登录): 登录选项Larksuite改为Lark
2022-10-27 23:28:39 +08:00
fit2cloud-chenyw
f7ce8fc3f3
Merge pull request #3508 from dataease/pr@dev@fix_panel-rename
fix(仪表板): 仪表板修改名称后没有自动修改顶部名称 #3445
2022-10-27 21:35:45 +08:00
wangjiahao
b4bf37b063 fix(仪表板): 仪表板修改名称后没有自动修改顶部名称 #3445 2022-10-27 21:20:13 +08:00
fit2cloud-chenyw
15f9e4e659 fix(登录): 登录选项Larksuite改为Lark 2022-10-27 21:12:04 +08:00
fit2cloud-chenyw
b52bbbe493
Merge pull request #3506 from dataease/pr@dev@fix_panel-backgroup
fix(仪表板): 修复新画布编辑状态仪表板背景未生效问题
2022-10-27 21:10:10 +08:00
wangjiahao
89828c7f8d fix(仪表板): 修复新画布编辑状态仪表板背景未生效问题 2022-10-27 21:02:54 +08:00
王嘉豪
0480a98d79
Merge pull request #3504 from dataease/pr@dev@fix_map_label
fix(地图): 未开启标签但开启了提示二者会被同时触发
2022-10-27 20:59:46 +08:00
wangjiahao
05c220c5d3 refactor: 复制组件后将焦点定位到新视图 2022-10-27 20:46:55 +08:00
fit2cloud-chenyw
60205b25ed fix(地图): 未开启标签但开启了提示二者会被同时触发 2022-10-27 19:22:45 +08:00
王嘉豪
9ceb017d2a
Merge pull request #3502 from dataease/pr@dev@fix_console-problem
fix: 处理控制台报错
2022-10-27 18:31:12 +08:00
wangjiahao
0d67927756 fix: 处理控制台报错 2022-10-27 18:29:56 +08:00
xuwei-fit2cloud
4204b1f4d8
Merge pull request #3497 from dataease/pr@dev@perf_gradient_color
perf(地图): 地图配色方案
2022-10-27 17:45:16 +08:00
dataeaseShu
3733759f17 Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-27 17:42:36 +08:00
dataeaseShu
722fc88059 fix: css穿透 2022-10-27 17:41:46 +08:00
fit2cloud-chenyw
065177188a perf(地图): 地图配色方案 2022-10-27 17:36:30 +08:00
xuwei-fit2cloud
177bcf4437
Merge pull request #3495 from dataease/pr@dev@fix_new-view
fix(视图): 修复新建视图控制台有异常打印问题
2022-10-27 17:33:56 +08:00
xuwei-fit2cloud
1850d0b59d
Merge pull request #3494 from dataease/pr@dev@fix_report_task_invlid_view
fix(定时报告): 隐藏已被删除的视图
2022-10-27 17:33:24 +08:00
xuwei-fit2cloud
f8da3733f3
Merge pull request #3496 from dataease/pr@dev@dataset
feat: 【首页】新增培训班二维码
2022-10-27 17:32:49 +08:00
wangjiahao
6f3dd126f5 fix(视图): 修复新建视图控制台有异常打印问题 2022-10-27 17:15:37 +08:00
fit2cloud-chenyw
a78fb8cf2b fix(定时报告): 隐藏已被删除的视图 2022-10-27 17:08:49 +08:00
wisonic-s
fd60670cc2 Merge branch 'dev' into pr@dev@feat_antv_group_stack_bar 2022-10-27 16:50:07 +08:00
wisonic-s
73700dbe59 feat(视图): 支持分组堆叠柱状图
视图类型增加分组堆叠柱状图
https://www.tapd.cn/55578866/prong/stories/view/1155578866001008801
2022-10-27 16:49:01 +08:00
fit2cloud-chenyw
dd09bd554e
Merge pull request #3491 from dataease/pr@dev@refactor_rich-text
refactor(仪表板): 富文本组件和富文本视图支持自适应缩放
2022-10-27 16:40:25 +08:00
dataeaseShu
3c7121ceb3 Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-27 16:35:27 +08:00
dataeaseShu
1659235637 fix: 时间选择组件限制宽度 2022-10-27 16:34:56 +08:00
wangjiahao
9cfb88fa40 refactor(富文本): 富文本组件和富文本视图 2022-10-27 16:31:40 +08:00
wangjiahao
b72c2681dc refactor(仪表板): 富文本组件和富文本视图支持自适应缩放 2022-10-27 16:28:54 +08:00
fit2cloud-chenyw
b3a96336f9 fix(国际化): 代码冲突 2022-10-27 16:25:48 +08:00
xuwei-fit2cloud
3b5b4a3bb9
Merge pull request #3489 from dataease/pr@dev@fix_cas_logout
fix(登出): 对接cas后退出系统没有跳转到cas登录页面issues/2909
2022-10-27 16:19:18 +08:00
fit2cloud-chenyw
d12875eb01
Merge branch 'dev' into pr@dev@fix_oidc_exit_error 2022-10-27 16:15:23 +08:00
fit2cloud-chenyw
b19914ce6b fix(登出): 对接cas后退出系统没有跳转到cas登录页面issues/2909 2022-10-27 16:08:21 +08:00
fit2cloud-chenyw
2443b0177d
fix: cas服务异常英文文案 2022-10-27 16:04:53 +08:00
dataeaseShu
41e419611d
Merge pull request #3487 from dataease/pr@dev@refactor_assist
refactor(视图): 辅助线、阈值设置界面UI优化
2022-10-27 16:04:09 +08:00
fit2cloud-chenyw
7f882b1159
fix: cas服务异常中文文案 2022-10-27 16:04:08 +08:00
dataeaseShu
cd6407b9db
Merge pull request #3488 from dataease/pr@dev@refactor_panel-canvas-mobile
refactor(仪表板): 移动端设计新画布适配
2022-10-27 16:03:34 +08:00
wangjiahao
1c64abd5d1 refactor(仪表板): 移动端设计新画布适配 2022-10-27 16:00:45 +08:00
junjun
f70bc9152a refactor(视图): 辅助线、阈值设置界面UI优化 2022-10-27 15:56:38 +08:00
dataeaseShu
7957bab60d Merge branch 'dev' into pr@dev_eslint_auto_fix 2022-10-27 15:38:52 +08:00
dataeaseShu
3ba920ca52 fix: pg图片更换 用户管理模糊搜索 2022-10-27 15:38:23 +08:00
xuwei-fit2cloud
1d1d55063e
Merge pull request #3485 from dataease/pr@dev@refactor_panel-canvas-toolbar
refactor(仪表板): 文本矩形等悬浮工具栏适配新画布
2022-10-27 15:36:24 +08:00