Commit Graph

8495 Commits

Author SHA1 Message Date
Junjun
13c11acc96
Merge pull request #4061 from dataease/pr@v1.17@fix_table_page
fix(视图): 修复明细表总数
2022-12-12 10:55:18 +08:00
junjun
24fef55902 fix(视图): 修复明细表总数 2022-12-12 10:43:53 +08:00
fit2cloudrd
20a2e76cd1
Merge pull request #3978 from dataease/dev
merge dev
2022-11-30 19:44:24 +08:00
xuwei-fit2cloud
b2a5cfaae4
Merge pull request #3977 from dataease/pr@dev@fix_i18n
Pr@dev@fix i18n
2022-11-30 19:42:53 +08:00
wisonic-s
22323141bc fix(typo): typo 2022-11-30 19:38:57 +08:00
wisonic-s
1f827b0a07 Merge branch 'dev' into pr@dev@fix_i18n
# Conflicts:
#	frontend/src/views/chart/view/CalcChartFieldEdit.vue
#	frontend/src/views/dataset/data/CalcFieldEdit.vue
2022-11-30 19:30:18 +08:00
wisonic-s
4c5a938238 fix(视图-横向百分比条形图): 修复横向百分比条形图提示隐藏不生效
修复横向百分比条形图提示隐藏不生效,去除无用的配置项
2022-11-30 19:27:27 +08:00
wisonic-s
6e38a0b0eb fix(国际化): 完善国际化
完善国际化,修改部分提示样式
2022-11-30 19:25:51 +08:00
taojinlong
acf36f0d23 Merge branch 'dev' into v1.17 2022-11-30 19:07:43 +08:00
taojinlong
02300203c9
Merge pull request #3976 from dataease/pr@dev@fix_dataset
fix: 分页条数为0
2022-11-30 19:07:12 +08:00
taojinlong
a22eb627c3 fix: 分页条数为0 2022-11-30 19:06:04 +08:00
fit2cloudrd
a97315bdea
Merge pull request #3975 from dataease/dev
merge
2022-11-30 19:05:27 +08:00
fit2cloud-chenyw
9164c4c3f0 style(tabs): 选项卡头部水平位置设置失效 2022-11-30 18:54:25 +08:00
fit2cloud-chenyw
75b826ca8f fix(查询按钮): 绑定过滤器未能及时生效 2022-11-30 18:54:14 +08:00
王嘉豪
41ddd05c1a
Merge pull request #3974 from dataease/pr@dev@style_de_tabs_justify
style(tabs): 选项卡头部水平位置设置失效
2022-11-30 18:52:54 +08:00
taojinlong
3fe29f2dff
Merge pull request #3972 from dataease/pr@dev@fix_filter_button_bind
fix(查询按钮): 绑定过滤器未能及时生效
2022-11-30 18:52:01 +08:00
fit2cloud-chenyw
03f9c8c547 style(tabs): 选项卡头部水平位置设置失效 2022-11-30 18:51:53 +08:00
taojinlong
58b68ce700 Merge branch 'dev' into v1.17 2022-11-30 18:41:52 +08:00
taojinlong
6d55ea4e0c
Merge pull request #3973 from dataease/pr@dev@fix_dataset
Pr@dev@fix dataset
2022-11-30 18:40:45 +08:00
taojinlong
4e25a992c7 Merge branch 'dev' into pr@dev@fix_dataset 2022-11-30 18:39:17 +08:00
taojinlong
ba36f9d74d fix: 时间格式化 2022-11-30 18:38:40 +08:00
fit2cloud-chenyw
a746a95151 fix(查询按钮): 绑定过滤器未能及时生效 2022-11-30 18:30:26 +08:00
taojinlong
5373651856 Merge branch 'dev' into v1.17 2022-11-30 18:22:41 +08:00
taojinlong
57dd9bc27a Merge branch 'v1.17' of github.com:dataease/dataease into v1.17 2022-11-30 18:22:35 +08:00
xuwei-fit2cloud
fa4f50e41e
Merge pull request #3971 from dataease/pr@dev@refactor_chart
refactor(视图): 统一视图标题的内边距
2022-11-30 17:44:45 +08:00
junjun
1f7d8cfa91 refactor(视图): 统一视图标题的内边距 2022-11-30 17:35:10 +08:00
junjun
e719c97092 Merge remote-tracking branch 'origin/dev' into dev 2022-11-30 17:23:12 +08:00
Junjun
51bdf115ae
Merge pull request #3968 from dataease/pr@dev@fix_pdf-export
fix(仪表板): 缩小pdf图片尺寸,防止超长仪表板超出pdf最大长度出现截断情况
2022-11-30 17:00:34 +08:00
wangjiahao
ed2cea8a6d fix(仪表板): 缩小pdf图片尺寸,防止超长仪表板超出pdf最大长度出现截断情况 2022-11-30 16:53:43 +08:00
junjun
5b27978c47 Merge remote-tracking branch 'origin/dev' into dev 2022-11-30 16:21:23 +08:00
xuwei-fit2cloud
b7765d262f
Merge pull request #3964 from dataease/pr@dev@fix_lost_current_domain_name
fix(富文本): 链接丢失当前域名
2022-11-30 16:15:52 +08:00
fit2cloud-chenyw
de723408bd fix(富文本): 链接丢失当前域名 2022-11-30 16:09:42 +08:00
junjun
4d6f182c1f Merge remote-tracking branch 'origin/dev' into dev 2022-11-30 16:05:20 +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
176fe8af48 Merge remote-tracking branch 'origin/dev' into dev 2022-11-30 15:48:33 +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
xuwei-fit2cloud
a5d41c31c9
Merge pull request #3960 from dataease/pr@dev@fix_tab-switch
fix(仪表板): 修复一个 tab 下加入多个视图,公共链接打开后,饼图的图示里折叠切换按钮不可用 #3761
2022-11-30 15:19:32 +08:00
taojinlong
39266ea6d1 Merge branch 'pr@dev@fix_dataset' of github.com:dataease/dataease into pr@dev@fix_dataset 2022-11-30 15:18:45 +08:00
xuwei-fit2cloud
719748f360
Merge pull request #3959 from dataease/pr@dev@fix_i18n
refactor(i18n): 文案修改
2022-11-30 15:18:13 +08:00
taojinlong
4e3b2a7ae2 fix: 上传excel限制文件大小 2022-11-30 15:18:12 +08:00
taojinlong
df692fc00a fix: 上传excel限制文件大小 2022-11-30 15:17:37 +08:00
wangjiahao
4c5141e79b fix(仪表板): 修复一个 tab 下加入多个视图,公共链接打开后,饼图的图示里折叠切换按钮不可用 #3761 2022-11-30 15:15:20 +08:00
wangjiahao
8b9f5ff5be refactor(i18n): 文案修改 2022-11-30 14:56:43 +08:00
dataeaseShu
96afec967d
Merge pull request #3958 from dataease/pr@dev@fix_gauge
fix(数据集): 修复仪表盘阈值不支持小数的问题
2022-11-30 14:31:00 +08:00
junjun
4022bc1bc7 fix(数据集): 修复仪表盘阈值不支持小数的问题 2022-11-30 14:27:25 +08:00
Junjun
57570d1742
Merge pull request #3957 from dataease/pr@dev@fix_position-adjust
refactor(视图): 视图精确位置调整限值设置
2022-11-30 14:07:58 +08:00
wangjiahao
773f54d282 refactor(视图): 视图精确位置调整限值设置 2022-11-30 14:05:51 +08:00