superman
ef8e7ac156
Merge pull request #11390 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'd75ca7e2c55eaf266d9c36be31cf1df6a4355977':
REPORT-88307 控件-标签控件-将设计器中的“字体大小”改为“字体” 同步10
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
REPORT-87787 10.0新增启动报错,File not exists:/com/fr/design/images/platform/platform
2 years ago
superman
d75ca7e2c5
Merge pull request #11347 in DESIGN/design from release/10.0 to final/10.0
...
* commit '6dbfe8a081f0871590b49af67148c15088765fa3':
REPORT-88307 控件-标签控件-将设计器中的“字体大小”改为“字体” 同步10
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
REPORT-87787 10.0新增启动报错,File not exists:/com/fr/design/images/platform/platform
2 years ago
superman
6dbfe8a081
Merge pull request #11346 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '59e52323d65eb52eff80f1b1cb98daabad22e272':
2 years ago
superman
59e52323d6
Merge pull request #11256 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '1f961c941712aebeb943105b0584eef4b3833f62':
2 years ago
superman
1f961c9417
Merge pull request #11255 in DESIGN/design from final/10.0 to release/10.0
...
* commit '849cefb5b725d26fb68f5419c10198703d84e9df':
2 years ago
superman
849cefb5b7
Merge pull request #11254 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '6ab6970159752f7f8d77a7466dab302e1764cc75':
2 years ago
superman
6ab6970159
Merge pull request #11250 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '3e10e9645d631cd760cedc2f52929dc105fff609':
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
2 years ago
superman
6900026acc
Merge pull request #11219 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '02438abb6f51bca3f2509cb8ea6467a3d0869c1b':
REPORT-88307 控件-标签控件-将设计器中的“字体大小”改为“字体” 同步10
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
2 years ago
superman
02438abb6f
Merge pull request #11218 in DESIGN/design from final/10.0 to release/10.0
...
* commit '3e10e9645d631cd760cedc2f52929dc105fff609':
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
2 years ago
Destiny.Lin-林锦龙
3ac800d7ea
Pull request #11216 : REPORT-88307 控件-标签控件-将设计器中的“字体大小”改为“字体” 同步10
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/10.0 to release/10.0
* commit '8cfaf17553e09ae27fc8c4c0a52bea767a21740a':
REPORT-88307 控件-标签控件-将设计器中的“字体大小”改为“字体” 同步10
2 years ago
Destiny.Lin
8cfaf17553
REPORT-88307 控件-标签控件-将设计器中的“字体大小”改为“字体” 同步10
2 years ago
kerry-王周勇
3e10e9645d
Pull request #11205 : REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/10.0 to final/10.0
* commit '55a184af524ac8fac53904a551250160466691a7':
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
2 years ago
kerry
55a184af52
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
2 years ago
superman
f1534c0873
Merge pull request #11125 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '5fd7ef58e0f4a16c3e6427a2506a08c18193e46d':
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
REPORT-87787 10.0新增启动报错,File not exists:/com/fr/design/images/platform/platform
2 years ago
superman
5fd7ef58e0
Merge pull request #11124 in DESIGN/design from final/10.0 to release/10.0
...
* commit '2ad1ff8c89faba8446e47187e086109917074488':
2 years ago
superman
2ad1ff8c89
Merge pull request #11123 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '0c3dd42f078bbc3ce5cae2b0387a2ca9f887b756':
2 years ago
kerry-王周勇
cd19e07a64
Pull request #11122 : REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'c03397291792dbd1ab65b68f6ee24388b7692346':
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
2 years ago
kerry
c033972917
REPORT-87779 FR10决策报表:不同tablayout会存在同名tab
2 years ago
John.Ying-应志浩
9a63acd2c5
Pull request #11121 : REPORT-87787 10.0新增启动报错,File not exists:/com/fr/design/images/platform/platform
...
Merge in DESIGN/design from ~JOHN.YING/design:release/10.0 to release/10.0
* commit '8dff071b0ad4a72dcdb62056da391b50dd127fd3':
REPORT-87787 10.0新增启动报错,File not exists:/com/fr/design/images/platform/platform
2 years ago
John.Ying-应志浩
8dff071b0a
REPORT-87787 10.0新增启动报错,File not exists:/com/fr/design/images/platform/platform
2 years ago
superman
0c3dd42f07
Merge pull request #11119 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '2379599733f9d472a060b10a74988293089da734':
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
REPORT-86364 服务平台设计器适配
REPORT-85708 FR10决策报表-设计画布内的报表块的内容显示
REPORT-85611 FR10组件复用-多组件生成的复用组件,绝对画布块缩小到500*260的尺寸限制了,但内部组件没等比例缩小
2 years ago
superman
715bb58e6a
Merge pull request #11064 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '47475a37d99ceb61e383162b79bf2238408e5e8b':
2 years ago
superman
47475a37d9
Merge pull request #11063 in DESIGN/design from final/10.0 to release/10.0
...
* commit '2379599733f9d472a060b10a74988293089da734':
2 years ago
superman
2379599733
Merge pull request #11060 in DESIGN/design from release/10.0 to final/10.0
...
* commit '38fa22a6906075558ab22cc0db8bfa94ef16c59a':
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
REPORT-86364 服务平台设计器适配
REPORT-85708 FR10决策报表-设计画布内的报表块的内容显示
REPORT-85611 FR10组件复用-多组件生成的复用组件,绝对画布块缩小到500*260的尺寸限制了,但内部组件没等比例缩小
2 years ago
superman
38fa22a690
Merge pull request #11059 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '86e8b8caa6dae90e0174e41b4b6803b1b64d157c':
REPORT-85611 FR10组件复用-多组件生成的复用组件,绝对画布块缩小到500*260的尺寸限制了,但内部组件没等比例缩小
2 years ago
superman
86e8b8caa6
Merge pull request #11041 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'ace147077561314543b80c790a5cffd1d4a280fc':
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87124 国际化设计器需要对服务平台做下隐藏
2 years ago
Destiny.Lin-林锦龙
ace1470775
Pull request #11036 : REPORT-87124 国际化设计器需要对服务平台做下隐藏
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/10.0 to release/10.0
* commit '45854c56cd5391b8e1f23ea5cd5430a15c7110c4':
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87124 国际化设计器需要对服务平台做下隐藏
REPORT-87124 国际化设计器需要对服务平台做下隐藏
2 years ago
Destiny.Lin
45854c56cd
REPORT-87124 国际化设计器需要对服务平台做下隐藏
2 years ago
Destiny.Lin
8cfb07b0ae
REPORT-87124 国际化设计器需要对服务平台做下隐藏
2 years ago
Destiny.Lin
207b76b885
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
2 years ago
Destiny.Lin
7b1f67a10a
REPORT-87124 国际化设计器需要对服务平台做下隐藏
2 years ago
superman
88b8032a83
Merge pull request #11028 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '98100d429123de33c96f8b736bf2a78c509dc6fc':
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
2 years ago
Destiny.Lin-林锦龙
98100d4291
Pull request #11023 : REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/10.0 to release/10.0
* commit 'cb3b80a6508d546586e7c707f9f2be8d2987c933':
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
2 years ago
Destiny.Lin
cb3b80a650
REPORT-85618 【FR设计器-移动端】组件顺序-frm模板,组件修改名称后,body-移动端-组件顺序会排到最后一位
2 years ago
superman
bde62d8744
Merge pull request #10961 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'bb6d93825d377995e6f2e56ef95f9b5308b478fd':
REPORT-86364 服务平台设计器适配
2 years ago
Destiny.Lin-林锦龙
bb6d93825d
Pull request #10958 : REPORT-86364 服务平台设计器适配
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/10.0 to release/10.0
* commit 'f9e44623518994bf4cc7f29b11fdc7b0ae84e1d0':
REPORT-86364 服务平台设计器适配
2 years ago
Destiny.Lin
f9e4462351
REPORT-86364 服务平台设计器适配
2 years ago
superman
c9f4fd74a5
Merge pull request #10849 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c711b4a6afe4503c27dd60b6a626ac66b17bd320':
REPORT-85708 FR10决策报表-设计画布内的报表块的内容显示
2 years ago
starryi-关昆
c711b4a6af
Pull request #10832 : REPORT-85708 FR10决策报表-设计画布内的报表块的内容显示
...
Merge in DESIGN/design from ~STARRYI/design:release/10.0 to release/10.0
* commit 'afc565d2e10d7636a8fca32f2ce0ff0c4bba29a0':
REPORT-85708 FR10决策报表-设计画布内的报表块的内容显示
2 years ago
Starryi
afc565d2e1
REPORT-85708 FR10决策报表-设计画布内的报表块的内容显示
...
【问题原因】
问题产生的原因有两点:
1. 生成的截图内容不全,只包含了表格可见部分内容
2. 使用报表块的尺寸对原始截图裁切时,裁切的尺寸不对
10.0/11.0都有此问题
【改动思路】
1. 对表格进行截图时,要使得表格可以绘制所有有内容的单元格
2. 当报表块创建或尺寸改变时,在handleSizeChange方法中通知修改裁切尺寸
2 years ago
superman
4c62d942d4
Merge pull request #10820 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'a4bcef5cd1d3c2a955d6e42120a1b27ae86f784b':
2 years ago
superman
a4bcef5cd1
Merge pull request #10819 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f1f6d96ec04cef637d4ed4dbb7f76f60ae31583b':
2 years ago
superman
f1f6d96ec0
Merge pull request #10818 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'e5b6d9eb0e8d505ba3eab50567ffcb35b256a351':
2 years ago
superman
e5b6d9eb0e
Merge pull request #10817 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '694e40032d06dfab5c69ad6289320af46c6608e7':
REPORT-84031 填报-增加删除行-&A1+_、_公式在插入行后无法重计算
2 years ago
kerry-王周勇
fb5587f8b5
Pull request #10802 : REPORT-85611 FR10组件复用-多组件生成的复用组件,绝对画布块缩小到500*260的尺寸限制了,但内部组件没等比例缩小
...
Merge in DESIGN/design from ~KERRY/design_10.0:bugfix/10.0 to bugfix/10.0
* commit '54f2e87006bd6df4018fc09b157634ed5b1af5a0':
REPORT-85611 FR10组件复用-多组件生成的复用组件,绝对画布块缩小到500*260的尺寸限制了,但内部组件没等比例缩小
2 years ago
kerry
54f2e87006
REPORT-85611 FR10组件复用-多组件生成的复用组件,绝对画布块缩小到500*260的尺寸限制了,但内部组件没等比例缩小
2 years ago
superman
7ecf440e6d
Merge pull request #10794 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8f9c93f0097f34fdef0807ecd74b65d86f5ee259':
2 years ago
superman
8f9c93f009
Merge pull request #10793 in DESIGN/design from final/10.0 to release/10.0
...
* commit '694e40032d06dfab5c69ad6289320af46c6608e7':
2 years ago
superman
694e40032d
Merge pull request #10791 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'a18bf57c3e68fa116841cebdec478fba27e64e05':
REPORT-84031 填报-增加删除行-&A1+_、_公式在插入行后无法重计算
2 years ago
superman
a18bf57c3e
Merge pull request #10790 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '481e5c5aca75916ae3d2cbc4bad74c1e1f45dbcd':
2 years ago