8226b0d95a
Merge pull request #6399 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'c73dd20885961a8fbfbd36378ace96fdb38d41af':
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
3 years ago
shine
0210104f7c
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
3 years ago
Hades
c73dd20885
Pull request #6395 : REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '56df61ca0a6abf5bfe38522b7bbfbe9355008b0a':
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
3 years ago
56df61ca0a
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
3 years ago
3d9fd412f0
Merge pull request #6388 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '405bf679140aead1ed53f17d250000ec628d8b33':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
405bf67914
Merge pull request #6387 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '43cd077fb0b4ce17fa7f1126163d4001f5ec09e6':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
43cd077fb0
Merge pull request #6386 in DESIGN/design from final/10.0 to release/10.0
...
* commit '7cdd87460a05baa97cec111a8f604e62a009577f':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
7cdd87460a
Pull request #6384 : REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/10.0 to final/10.0
* commit '0dfea644723e97c69c6f9e35daedba21f757dece':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
0dfea64472
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
shine
0a6bbd3517
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的，隐藏弹出界面。
3 years ago
5f490a52a3
Merge pull request #6375 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '4357b60c04c33ba67662d00b178f1d834b3d68fe':
3 years ago
4357b60c04
Merge pull request #6374 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '9cfa15f44486f9842d18ddcf02fbe2a02064e523':
3 years ago
9cfa15f444
Merge pull request #6373 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'eab5df090e15c3448ac02be4e9c9f9b4802e4ed8':
3 years ago
75ab5faab3
Merge pull request #6365 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'b3174b267610bb3085620a4b2c168f854abb8daa':
3 years ago
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
b3174b2676
Merge pull request #6363 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '413f9331cdee8d720c5b248dec6d448c65c933ea':
3 years ago
413f9331cd
Merge pull request #6358 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'd48dc7e0d53bdb5610d38eb6edea9dc2118159ff':
REPORT-60253 安装大数据集导出插件后，模板从本地切换到远程，再切换到本地，触发保存模板会弹窗 保存失败，有npe报错
3 years ago
52a5a951f5
Merge pull request #6352 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd48dc7e0d53bdb5610d38eb6edea9dc2118159ff':
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
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
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
fae1d888f5
Merge pull request #6331 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'a1f49d2108966028460c4722e7fbb8d1932fcec7':
REPORT-61356 fix 统一api使用入口
REPORT-60253 安装大数据集导出插件后，模板从本地切换到远程，再切换到本地，触发保存模板会弹窗 保存失败，有npe报错
REPORT-61356 设计器启动加载完成后，停留的空白时间变长
3 years ago
7651eb4a22
REPORT-55377 升级 tomcat 版本修复公开漏洞
3 years ago
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
c43a01c40c
REPORT-61356 fix 统一api使用入口
3 years ago
793caec890
REPORT-60253 安装大数据集导出插件后，模板从本地切换到远程，再切换到本地，触发保存模板会弹窗 保存失败，有npe报错
3 years ago
47b0051133
REPORT-61356 设计器启动加载完成后，停留的空白时间变长
3 years ago
4f0eb4e91c
Merge pull request #6291 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd3f29188a39a4cb4903520fa33271e2c41d0dec9':
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
BI-95654 拷贝数据连接时复制了identity
3 years ago
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
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
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
a931c0d052
REPORT-60661 国际化url适配
3 years ago
4da049f96b
REPORT-60661 国际化url适配
3 years ago
689adf8a38
REPORT-60661 国际化url适配
3 years ago
236d4210f0
Merge pull request #6269 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '35745378c81edd48ae1f34e13259f708a6bc5dfb':
CHART-21219 特殊形状柱形图触发保存
REPORT-60752 【10.0】tab组件，移动端属性设置样式模板，从默认切换到自定义后不保存关闭窗口，再次进入后，选项会显示自定义，应该还是默认才对
REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题
3 years ago
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
57deff1ff4
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
051cf46214
BI-95654 拷贝数据连接时复制了identity
3 years ago
8e8fb6a8d2
Pull request #6256 : REPORT-59814 组件埋点 groupingDetail 返回概率是空数据
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit 'bd4d66f66cb73fe01206c9916ae902672a027756':
REPORT-59814 代码优化
REPORT-59814 组件埋点 groupingDetail 返回概率是空数据
3 years ago
bd4d66f66c
REPORT-59814 代码优化
3 years ago
superman
shine
Hades
hades
Henry.Wang
vito
vito
Xiqiu
Tommy
kuangshuai