superman
c3d729b956
Merge pull request #4518 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '6bc3b5c0a0d89704a3a0f55b5ceee1273b076173':
REPORT-53229 补上空格
REPORT-53229 设计器顶部版本号信息改为小版本信息
3 years ago
fanglei
6bc3b5c0a0
Pull request #4508 : REPORT-53229 设计器顶部版本号信息改为小版本信息
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit '6e1c75179cbb8de8ae6aba3d3d0980fe20949802':
REPORT-53229 补上空格
3 years ago
方磊
6e1c75179c
REPORT-53229 补上空格
3 years ago
fanglei
02895b37ef
Pull request #4493 : REPORT-53229 设计器顶部版本号信息改为小版本信息
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit 'd96a9af5531cf3dd8fb2885a65b3c0e33aea502e':
REPORT-53229 设计器顶部版本号信息改为小版本信息
3 years ago
superman
b677a3fc35
Merge pull request #4504 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '2f7bfcf35c70e8de3ad63d97efca22dffd4c2628':
3 years ago
superman
2f7bfcf35c
Merge pull request #4503 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'e550094e84048dc6d215bcd29cc9e3a366094cba':
3 years ago
superman
e550094e84
Merge pull request #4501 in DESIGN/design from release/10.0 to final/10.0
...
* commit '9cf4175e88eff3d534aa18a9ccd00ef60593b70c':
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
REPORT-52987 修复dataoperator的兼容问题;顺带修复发现的引用bug
REPORT-52933 [阻止]修改log导出配置目录后,log一直为空
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52264 模版权限编辑警告弹窗不在页面中间
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-49014 update 修改下国际化key
REPORT-49014 连接同一个远程环境,同时双击打开同一个模板 一人正常打开 一人打开空白
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
代码修改
REPORT-51188 决策报表的tab块,在绝对布局下拖拽存在缩小问题
REPORT-51830 tab里报表块设置图片背景,复制粘贴得到的tab里的报表块预览时没有背景了,设计器里看是有图片背景的。0228也有此现象。
REPORT-51188 决策报表的tab块,在绝对布局下拖拽存在缩小问题
3 years ago
superman
9cf4175e88
Merge pull request #4500 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'b995b6287d800d462e240bb75ae6528dff7c6858':
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-49014 update 修改下国际化key
REPORT-49014 连接同一个远程环境,同时双击打开同一个模板 一人正常打开 一人打开空白
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
代码修改
REPORT-51188 决策报表的tab块,在绝对布局下拖拽存在缩小问题
REPORT-51830 tab里报表块设置图片背景,复制粘贴得到的tab里的报表块预览时没有背景了,设计器里看是有图片背景的。0228也有此现象。
REPORT-51188 决策报表的tab块,在绝对布局下拖拽存在缩小问题
3 years ago
superman
b995b6287d
Merge pull request #4498 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8d9aaaef8a5efcf31f4fd2bffe9922f1fc62ed4a':
REPORT-53019 字体检查国际化显示不全
3 years ago
方磊
d96a9af553
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design10.0 into release/10.0
...
* 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design10.0:
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
3 years ago
方磊
9f96ccac1b
REPORT-53229 设计器顶部版本号信息改为小版本信息
3 years ago
Bruce.Deng
8d9aaaef8a
Pull request #4492 : REPORT-53019 字体检查国际化显示不全
...
Merge in DESIGN/design from ~BRUCE.DENG/design:release/10.0 to release/10.0
* commit '7de187ff092d574937cda40aa508bde9fd5b0afa':
REPORT-53019 字体检查国际化显示不全
3 years ago
Bruce.Deng
7de187ff09
REPORT-53019 字体检查国际化显示不全
3 years ago
superman
4c2d395dc2
Merge pull request #4486 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '78d99b427747ad890791323de1bb44fa9fc12056':
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
3 years ago
Bruce.Deng
78d99b4277
Pull request #4471 : REPORT-53019 字体检查国际化显示不全
...
Merge in DESIGN/design from ~BRUCE.DENG/design:release/10.0 to release/10.0
* commit 'f0b03de062cecc49182128667000d2ef6e35b323':
REPORT-53019 字体检查国际化显示不全
REPORT-53019 字体检查国际化显示不全
4 years ago
Bruce.Deng
f0b03de062
REPORT-53019 字体检查国际化显示不全
4 years ago
Bruce.Deng
fb3a33186e
REPORT-53019 字体检查国际化显示不全
4 years ago
superman
98fe93f050
Merge pull request #4469 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '61c7a7c3a7d451916ec9bc3f1cf8730fc17e8e94':
REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
4 years ago
Xiqiu
61c7a7c3a7
Pull request #4460 : REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
...
Merge in DESIGN/design from ~XIQIU/design:release/10.0 to release/10.0
* commit 'aa72606df7fa7b50af53b20e6bc6b24628a2096e':
REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
4 years ago
xiqiu
aa72606df7
REPORT-52987 修复kerberos认证下暴露的throwable和驱动加载优先级问题
4 years ago
superman
069eba8e03
Merge pull request #4448 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '49f36c06fac9b01bffe467641895977e4e302aa8':
REPORT-52987 修复dataoperator的兼容问题;顺带修复发现的引用bug
4 years ago
Xiqiu
49f36c06fa
Pull request #4434 : REPORT-52987 修复dataoperator的兼容问题;顺带修复发现的引用bug
...
Merge in DESIGN/design from ~XIQIU/design:release/10.0 to release/10.0
* commit '0e1151ae8c94153b27fd04dd4feeb84ecba9da08':
REPORT-52987 修复dataoperator的兼容问题;顺带修复发现的引用bug
4 years ago
superman
860d370cce
Merge pull request #4440 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd8e36ac76f85628b982a3a5dc4343165a1cfb711':
REPORT-52933 [阻止]修改log导出配置目录后,log一直为空
4 years ago
fanglei
d8e36ac76f
Pull request #4433 : REPORT-52933 [阻止]修改log导出配置目录后,log一直为空
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit 'f9c4b5fe4470e1c437fda20c6caee8a124fdc37b':
REPORT-52933 [阻止]修改log导出配置目录后,log一直为空
4 years ago
xiqiu
0e1151ae8c
REPORT-52987 修复dataoperator的兼容问题;顺带修复发现的引用bug
4 years ago
方磊
f9c4b5fe44
REPORT-52933 [阻止]修改log导出配置目录后,log一直为空
4 years ago
superman
bc33528072
Merge pull request #4373 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '5fda617ccc5a8b5f664bb4666074676245933ae0':
4 years ago
superman
5fda617ccc
Merge pull request #4372 in DESIGN/design from final/10.0 to release/10.0
...
* commit '3bc49807b18e15d2778e10e9ccf400e73ce2e554':
4 years ago
superman
3bc49807b1
Merge pull request #4371 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'c7dd50049a7ef769819a15f3d23336ee7ab1146a':
4 years ago
superman
c7dd50049a
Merge pull request #4364 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '1158743e95afea781b9ce2aed2c8772f87bc217a':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
4 years ago
superman
9241e38392
Merge pull request #4359 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd016733842ee8a36ec84ca248ae035fcffc3d06a':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52264 模版权限编辑警告弹窗不在页面中间
4 years ago
superman
d016733842
Merge pull request #4358 in DESIGN/design from final/10.0 to release/10.0
...
* commit '1158743e95afea781b9ce2aed2c8772f87bc217a':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
4 years ago
Kara
1158743e95
Pull request #4356 : REPORT-52824 10.0.16 模板另存不会生成新的模板id
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'd5d6925c5c4ffa1cf79fb49729a3f942b17f09c7':
REPORT-52824 10.0.16 模板另存不会生成新的模板id
4 years ago
hades
d5d6925c5c
REPORT-52824 10.0.16 模板另存不会生成新的模板id
4 years ago
fanglei
62b33713cc
Pull request #4324 : REPORT-52264 模版权限编辑警告弹窗不在页面中间
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit 'cb474f5d121a3873c4eedbb09614e18d37e3bf43':
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
REPORT-52264 模版权限编辑警告弹窗不在页面中间
4 years ago
方磊
cb474f5d12
REPORT-52264 修改弹窗的父窗口为DesignerContext.getDesignerFrame()
4 years ago
superman
22494fd943
Merge pull request #4352 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd8a854a4c926a4de61600df395d3f1dc2b16fe3d':
4 years ago
superman
d8a854a4c9
Merge pull request #4351 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f98a3b98c65e0a5c8d694fc0a462551f26a64017':
4 years ago
superman
f98a3b98c6
Merge pull request #4350 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'a8bd826258edb8f615964d8b2d544f254d2e687a':
4 years ago
superman
a8bd826258
Merge pull request #4346 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '31a8bae6f914c8741cfae5cfc271d5d255cf612b':
CHART-19344 取色器改为点击之后确定颜色
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
4 years ago
superman
1d2605f4ca
Merge pull request #4342 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '231fdee81be05af9e58cbff3e9007479933df134':
CHART-19344 取色器改为点击之后确定颜色
4 years ago
superman
231fdee81b
Merge pull request #4341 in DESIGN/design from final/10.0 to release/10.0
...
* commit '31a8bae6f914c8741cfae5cfc271d5d255cf612b':
CHART-19344 取色器改为点击之后确定颜色
4 years ago
Kara
31a8bae6f9
Pull request #4337 : CHART-19344 系列取色器改为点击之后确定颜色
...
Merge in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit '298fab27bf729127d6669aea6d722342f1dd17b9':
CHART-19344 取色器改为点击之后确定颜色
4 years ago
白岳
298fab27bf
CHART-19344 取色器改为点击之后确定颜色
4 years ago
方磊
41f218bea0
REPORT-52264 模版权限编辑警告弹窗不在页面中间
4 years ago
superman
a25522c2a1
Merge pull request #4310 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '7315d5a9866149a9fc9376a71b17bde6216585f4':
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago
superman
7315d5a986
Merge pull request #4309 in DESIGN/design from final/10.0 to release/10.0
...
* commit '2403e06c154fbd6c8e0188d7e9b10ca526cb890a':
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago
superman
2403e06c15
Merge pull request #4308 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '9b8b8e85f9f5f841bfbe5b821f0d802fed018252':
4 years ago
Kara
431c8999fc
Pull request #4306 : REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功 &&REPORT-52554 安装了抽数缓存插件 存在npe
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'dfa979bd453d9863273a71929f1ad3163881c695':
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
4 years ago
hades
dfa979bd45
REPORT-52554 安装了抽数缓存插件 存在npe
4 years ago