superman
4357b60c04
Merge pull request #6374 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '9cfa15f44486f9842d18ddcf02fbe2a02064e523':
3 years ago
superman
9cfa15f444
Merge pull request #6373 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'eab5df090e15c3448ac02be4e9c9f9b4802e4ed8':
3 years ago
superman
eab5df090e
Merge pull request #6364 in DESIGN/design from release/10.0 to final/10.0
...
* commit '413f9331cdee8d720c5b248dec6d448c65c933ea': (24 commits)
REPORT-60356 设计器11.0适配-10.0打不开11.0提示弹窗和其他弹窗(提示自定义样式已丢失)同时打开了,没有设置弹窗优先级
REPORT-55377 升级 tomcat 版本修复公开漏洞
for duchamp mode
CHART-21376 fix:大屏模板组合图新增类型 默认样式
CHART-21357 fix:新增坐标轴样式
CHART-21391 fix:大屏模板 组合图切换到自定义组合图 类型面板没有出来
REPORT-61356 fix 统一api使用入口
REPORT-60253 安装大数据集导出插件后,模板从本地切换到远程,再切换到本地,触发保存模板会弹窗 保存失败,有npe报错
REPORT-61356 设计器启动加载完成后,停留的空白时间变长
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
BI-95654 拷贝数据连接时复制了identity
CHART-21219 特殊形状柱形图触发保存
REPORT-60752 【10.0】tab组件,移动端属性设置样式模板,从默认切换到自定义后不保存关闭窗口,再次进入后,选项会显示自定义,应该还是默认才对
REPORT-60561 全局自适应-样式细节优化
REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题
REPORT-59476 文本控件校验规则支持国际化
REPORT-60528 决策报表,给一个高度较小的tab内拖入报表块,会触发弹窗提示“超出或者小于tablayout边界,不能调整大小”;客户模板的弹窗不断触发导致设计器无法操作使用
REPORT-56437 & REPORT-58955 国际化问题调整
...
3 years ago
superman
b3174b2676
Merge pull request #6363 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '413f9331cdee8d720c5b248dec6d448c65c933ea':
3 years ago
superman
413f9331cd
Merge pull request #6358 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'd48dc7e0d53bdb5610d38eb6edea9dc2118159ff':
REPORT-60253 安装大数据集导出插件后,模板从本地切换到远程,再切换到本地,触发保存模板会弹窗 保存失败,有npe报错
3 years ago
superman
d48dc7e0d5
Merge pull request #6351 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c19080c43cda20d7b28b841e050a75b5f773ce24':
REPORT-60356 设计器11.0适配-10.0打不开11.0提示弹窗和其他弹窗(提示自定义样式已丢失)同时打开了,没有设置弹窗优先级
REPORT-55377 升级 tomcat 版本修复公开漏洞
for duchamp mode
CHART-21376 fix:大屏模板组合图新增类型 默认样式
CHART-21357 fix:新增坐标轴样式
CHART-21391 fix:大屏模板 组合图切换到自定义组合图 类型面板没有出来
3 years ago
zheng
c19080c43c
Pull request #6341 : CHART-21391 fix bugs
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'ceb102c39a7ab9dd07b216a3e99d8a132c138a85':
for duchamp mode
CHART-21376 fix:大屏模板组合图新增类型 默认样式
CHART-21357 fix:新增坐标轴样式
CHART-21391 fix:大屏模板 组合图切换到自定义组合图 类型面板没有出来
3 years ago
Hades
57accd526d
Pull request #6340 : REPORT-60356 设计器11.0适配-10.0打不开11.0提示弹窗和其他弹窗(提示自定义样式已丢失)同时打开了,没有设置弹窗优先级
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '3c7aed8fc59b62cd0a40539af9ae7470173e40f9':
REPORT-60356 设计器11.0适配-10.0打不开11.0提示弹窗和其他弹窗(提示自定义样式已丢失)同时打开了,没有设置弹窗优先级
3 years ago
zheng
ceb102c39a
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
...
* commit '61fff1acd7826a8c2d664882cfa607e3ebcf980a':
REPORT-55377 升级 tomcat 版本修复公开漏洞
3 years ago
hades
3c7aed8fc5
REPORT-60356 设计器11.0适配-10.0打不开11.0提示弹窗和其他弹窗(提示自定义样式已丢失)同时打开了,没有设置弹窗优先级
3 years ago
vito
61fff1acd7
Pull request #6335 : REPORT-61379 升级 tomcat 版本修复公开漏洞
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit '7651eb4a229ae0a2d47abaa61e21e5fc332e0946':
REPORT-55377 升级 tomcat 版本修复公开漏洞
3 years ago
vito
7651eb4a22
REPORT-55377 升级 tomcat 版本修复公开漏洞
3 years ago
superman
a1f49d2108
Merge pull request #6330 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c65d4b1b6b8033d075852648d053e654294d88af':
REPORT-61356 fix 统一api使用入口
REPORT-61356 设计器启动加载完成后,停留的空白时间变长
3 years ago
shine
283fddcfb2
for duchamp mode
3 years ago
shine
bef04fd4df
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
19bdeeacc3
CHART-21376 fix:大屏模板组合图新增类型 默认样式
3 years ago
shine
ba77f3016e
CHART-21357 fix:新增坐标轴样式
3 years ago
shine
35e7d2d23f
CHART-21391 fix:大屏模板 组合图切换到自定义组合图 类型面板没有出来
3 years ago
Hades
8cb2c2562f
Pull request #6305 : REPORT-60253 安装大数据集导出插件后,模板从本地切换到远程,再切换到本地,触发保存模板会弹窗 保存失败,有npe报错
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '793caec8900b40ee63f4c9c597273d2c3b050090':
REPORT-60253 安装大数据集导出插件后,模板从本地切换到远程,再切换到本地,触发保存模板会弹窗 保存失败,有npe报错
3 years ago
Hades
c65d4b1b6b
Pull request #6303 : REPORT-61356 设计器启动加载完成后,停留的空白时间变长
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'c43a01c40c3b87a17c868aa157d4bfd112727566':
REPORT-61356 fix 统一api使用入口
REPORT-61356 设计器启动加载完成后,停留的空白时间变长
3 years ago
hades
c43a01c40c
REPORT-61356 fix 统一api使用入口
3 years ago
hades
793caec890
REPORT-60253 安装大数据集导出插件后,模板从本地切换到远程,再切换到本地,触发保存模板会弹窗 保存失败,有npe报错
3 years ago
hades
47b0051133
REPORT-61356 设计器启动加载完成后,停留的空白时间变长
3 years ago
superman
d3f29188a3
Merge pull request #6290 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd8275c70125ecd5bfa515e2c417bf7f4a203567d':
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
BI-95654 拷贝数据连接时复制了identity
3 years ago
Henry.Wang
d8275c7012
Pull request #6277 : REPORT-60661 国际化url适配
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'a931c0d0525376546169595cc3dcf2f63a49e409':
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
3 years ago
Xiqiu
4133df91d0
Pull request #6261 : BI-95654 拷贝数据连接时复制了identity
...
Merge in DESIGN/design from ~XIQIU/design:release/10.0 to release/10.0
* commit '57deff1ff4f635db6ce2f81cd9cc67b7a3bc3fdb':
BI-95654 拷贝数据连接时复制了identity
3 years ago
Henry.Wang
a931c0d052
REPORT-60661 国际化url适配
3 years ago
Henry.Wang
4da049f96b
REPORT-60661 国际化url适配
3 years ago
Henry.Wang
689adf8a38
REPORT-60661 国际化url适配
3 years ago
superman
35745378c8
Merge pull request #6268 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '027ebd0c937ce5c240255b8edcac3971de7e39ab':
CHART-21219 特殊形状柱形图触发保存
REPORT-60752 【10.0】tab组件,移动端属性设置样式模板,从默认切换到自定义后不保存关闭窗口,再次进入后,选项会显示自定义,应该还是默认才对
REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题
3 years ago
xiqiu
57deff1ff4
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
xiqiu
051cf46214
BI-95654 拷贝数据连接时复制了identity
3 years ago
Hades
027ebd0c93
Pull request #6243 : REPORT-60752 【10.0】tab组件,移动端属性设置样式模板,从默认切换到自定义后不保存关闭窗口,再次进入后,选项会显示自定义,应该还是默认才对
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'f0442da478781daf7b736f7172328e09c5c7c720':
REPORT-60752 【10.0】tab组件,移动端属性设置样式模板,从默认切换到自定义后不保存关闭窗口,再次进入后,选项会显示自定义,应该还是默认才对
3 years ago
zheng
92237bb2a5
Pull request #6244 : CHART-21219 fix:特殊形状柱形图触发保存
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '8cca88818c98ffd772410c6b665c870622911b99':
CHART-21219 特殊形状柱形图触发保存
3 years ago
shine
8cca88818c
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
3cefa616a2
CHART-21219 特殊形状柱形图触发保存
3 years ago
hades
f0442da478
REPORT-60752 【10.0】tab组件,移动端属性设置样式模板,从默认切换到自定义后不保存关闭窗口,再次进入后,选项会显示自定义,应该还是默认才对
3 years ago
kerry
53c8c47bf4
Pull request #6210 : REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'db98d5412d61f470b92be970311ad6c14439a6fc':
REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题
3 years ago
superman
d59ef43683
Merge pull request #6228 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'ef165426357a163715ad5c6a556dbe2aa75c5a40':
REPORT-60561 全局自适应-样式细节优化
3 years ago
Henry.Wang
ef16542635
Pull request #6213 : REPORT-60561 全局自适应-样式细节优化
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'fde1a587e2248dab3d19a5275e0b65d9302ae7d1':
REPORT-60561 全局自适应-样式细节优化
3 years ago
superman
93935144d5
Merge pull request #6217 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'ad47baa25e1197a6745d5b7617e528a16e9f9e39':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
superman
ad47baa25e
Merge pull request #6216 in DESIGN/design from final/10.0 to release/10.0
...
* commit '8b648061e73619a296362de9c61f636471f0dd8a':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
superman
8b648061e7
Merge pull request #6215 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '9aee7403b3b3b2eef445bbec6245190cad8c48d4':
3 years ago
Henry.Wang
fde1a587e2
REPORT-60561 全局自适应-样式细节优化
3 years ago
kerry
db98d5412d
REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题
3 years ago
superman
9aee7403b3
Merge pull request #6209 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '9508a0985ddb118050e8536dd746bf4a5c8fde15':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
Yuan.Wang
9508a0985d
Pull request #6190 : REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
...
Merge in DESIGN/design from ~YUAN.WANG/design:final/10.0 to final/10.0
* commit '4a5ff5cd8ee1bfa707448c7f43285fa358aa83a9':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
superman
87d60d14c3
Merge pull request #6193 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '2d108f9745e71f69687538bce10698ac23560776':
REPORT-59476 文本控件校验规则支持国际化
REPORT-56437 & REPORT-58955 国际化问题调整
REPORT-60683 设计器-设计器操作-10设计器刚启动好,打开11制作的模板,模板会长时间处在加载中状态,除非打开其它模板,刚才的11模板才会弹出REPORT-59959中添加的提示文本
REPORT-60528 决策报表,给一个高度较小的tab内拖入报表块,会触发弹窗提示“超出或者小于tablayout边界,不能调整大小”;客户模板的弹窗不断触发导致设计器无法操作使用
3 years ago
superman
2d108f9745
Merge pull request #6192 in DESIGN/design from final/10.0 to release/10.0
...
* commit '9b6b81af08488b1a8eed28eb25f106b30533307a':
REPORT-56437 & REPORT-58955 国际化问题调整
REPORT-60683 设计器-设计器操作-10设计器刚启动好,打开11制作的模板,模板会长时间处在加载中状态,除非打开其它模板,刚才的11模板才会弹出REPORT-59959中添加的提示文本
3 years ago
superman
9b6b81af08
Merge pull request #6191 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'b34e65692226f448bb2a0039e03b4c384a581486':
3 years ago