Tree: 3a43ecc44b

10.0

bugfix/10.0

bugfix/11.0

fbp-1.0

fbp/feature

fbp/master

fbp/release

feature/10.0

feature/big-screen

feature/x

final/10.0

final/11.0

fix-lag

master

mss/2.0

new-design

newui

persist/10.0

persist/11.0

persist/11.0-arabic

release/10.0

release/11.0

research/10.0

research/11.0

security/10.0

zheng-1641779399395

设计器

10.0.10.2020.10.20

10.0.11.2020.11.25

10.0.12.2020.12.17

10.0.13.2021.01.19

10.0.14.2021.03.02

10.0.15.2021.04.02

10.0.15.2021.04.20

10.0.15.2021.05.07

10.0.16.2021.05.19

10.0.16.2021.06.10

10.0.17.2021.06.24

10.0.17.2021.07.12

10.0.18

10.0.18.2021.07.26

10.0.18.2021.07.30

10.0.18.2021.08.13

10.0.18.2021.08.19

10.0.18.2021.08.25

10.0.19.10.2022.4.3

10.0.19.2021.01.13

10.0.19.2021.08.30

10.0.19.2021.09.02

10.0.19.2021.09.07

10.0.19.2021.09.18

10.0.19.2021.10.12

10.0.19.2021.10.13

10.0.19.2021.10.27

10.0.19.2021.11.11

10.0.19.2021.11.25

10.0.19.2021.12.03

10.0.19.2021.12.13

10.0.19.2021.12.28

10.0.19.2022.01.18

10.0.19.2022.02.14

10.0.19.2022.02.16

10.0.19.2022.03.01

10.0.19.2022.03.18

10.0.19.2022.03.25

10.0.19.2022.04.15

10.0.19.2022.04.18

10.0.19.2022.04.20

10.0.19.2022.04.21

10.0.19.2022.04.27

10.0.19.2022.04.29

10.0.19.2022.05.06

10.0.19.2022.05.07

10.0.19.2022.05.20

10.0.19.2022.06.10

10.0.19.2022.07.01

10.0.19.2022.07.05

10.0.19.2022.07.16

10.0.19.2022.08.03

10.0.19.2022.08.22

10.0.19.2022.08.23

10.0.19.2022.08.26

10.0.19.2022.09.07

10.0.19.2022.09.23

10.0.19.2022.09.27

10.0.19.2022.10.21

10.0.19.2022.11.10

10.0.19.2022.11.11

10.0.19.2022.11.17

10.0.7.2020.06.25

10.0.8.2020.07.16

10.0.8.2020.07.23

10.0.9.2020.08.20

10.0.9.2020.09.27

20170315

20170420

20170516

20170605

20170619

20170705

20170718

20170807

FR10.0.6

bugfix-210728

bugfix-210728-2

stable20180202_115424

stable20180202_141700

stable20180202_145821

stable20180202_150532

stable20180206_090434

stable20180206_184315

stable20180207_155703

stable20180207_162245

stable20180208_094747

stable20180208_135622

stable20180208_141532

stable20180208_152958

stable20180208_164904

stable20180208_174644

stable20180209_032849

stable20180209_151737

stable20180210_032935

stable20180211_033136

stable20180212_033412

stable20180213_033154

stable20180214_033059

stable20180215_033025

stable20180216_033037

stable20180223_033635

stable20180224_033419

stable20180225_033053

stable20180226_033202

stable20180226_155101

stable20180227_033503

stable20180228_033324

stable20180228_164937

stable20180301_032727

stable20180301_124213

stable20180306_190751

stable20180313_164145

stable20180314_104125

stable20180314_133605

stable20180314_145021

stable20180314_151106

stable20180314_200407

stable20180315_092409

stable20180315_155607

stable20180316_105610

stable20180316_134244

stable20180316_152905

stable20180316_163041

stable20180316_172746

stable20180319_113940

stable20180323_142938

stable20180329_164149

stable20180329_180317

stable20180402_153937

stable20180403_115124

stable20180403_173005

stable20180403_180140

stable20180404_100315

stable20180404_165442

stable20180408_095809

stable20180409_162235

stable20180410_143033

stable20180410_164546

stable20180410_171116

stable20180410_171523

stable20180411_150019

stable20180411_154530

stable20180411_162301

stable20180412_111613

stable20180413_142810

stable20180416_145225

stable20180416_182848

stable20180416_183048

stable20180417_102857

stable20180418_170918

stable20180419_111827

stable20180419_114738

stable20180419_120658

stable20180419_150013

stable20180419_155633

stable20180420_093921

stable20180420_104208

stable20180423_130822

stable20180423_174820

stable20180423_194019

stable20180424_093428

stable20180424_105947

stable20180424_161600

stable20180427_133955

stable20180427_135412

stable20180427_152811

stable20180427_172318

stable20180427_173759

stable20180427_183411

stable20180502_152355

stable20180502_180039

stable20180503_115327

stable20180503_140224

stable20180503_170620

stable20180503_173516

stable20180503_175451

stable20180507_151636

stable20180510_094318

stable20180510_175433

stable20180511_150457

stable20180515_143324

stable20180515_171649

stable20180515_204358

stable20180516_170759

stable20180516_175420

stable20180517_102755

stable20180522_110019

stable20180523_101613

stable20180530_182754

stable20180530_193826

stable20180531_100001

stable20180531_103158

stable20180531_120815

stable20180531_170754

stable20180604_122312

stable20180604_164659

stable20180605_165742

stable20180606_135802

stable20180606_142448

stable20180611_155548

stable20180613_103750

stable20180614_170911

stable20180622_210326

stable20180628_091213

stable20180628_112008

stable20180628_150626

stable20180628_153756

stable20180629_175223

stable20180702_094036

stable20180702_171500

stable20180703_094150

stable20180703_101927

stable20180703_113515

stable20180703_122633

stable20180703_141756

stable20180704_162608

stable20180710_101442

stable20180727_215110

stable20180731_184948

stable20180731_233541

stable20180801_112147

stable20180802_091552

stable20180802_093156

stable20180802_105957

stable20180802_152136

stable20180807_112412

stable20180807_180309

stable20180807_181802

stable20180808_160038

stable20180831_161405

stable20180831_174504

stable20180905_094447

stable20180905_110512

stable20180905_135747

stable20180905_143638

stable20180905_204128

stable20180906_170439

stable20180907_091408

v10.5.20

v11.0.71

v11.0.75

v11.0.895

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from '3a43ecc44b'

${ noResults }

Commit Graph

15840 Commits (3a43ecc44b76a27721b9f02da827bf2369adf5db)

 

All Branches   

Search

Author	SHA1	Message	Date
Starryi	3945a9f763	REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动 ... 【问题原因】 修复刷新界面时，触发fireChange导致数据改变的问题 【改动思路】 同上	3 years ago
hades	0f7eea4bc6	REPORT-59719 下拉框效果还有点问题	3 years ago
Henry.Wang	f4b5217241	REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全	3 years ago
Hades	40486a3e46	Pull request #5918: REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白 ... Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0 * commit 'faa69e6c42789dd6325e18efd83e645bf4882177': REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白	3 years ago
hades	faa69e6c42	REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白	3 years ago
starryi	246ce2fc93	Pull request #5906: REPORT-56014 & REPORT-56015 & REPORT-55744 ... Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit '52e91bc6eef77697ba13ad01bbf1b4e031e5299d': REPORT-55744 【组件背景分离】【下个版本】组件复用-frm中拖入报表块设置单元格背景色后，缩略图背景没有及时修改 REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图，如果线重叠了的话，web端显示有问题	3 years ago
kerry	6cab40a121	Pull request #5914: REPORT-57810 - 固定布局-原布局推荐4.1 ... Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x * commit 'e4404356c5ef493d01a77c87b65590556511acd8': REPORT-57810 - 固定布局-原布局推荐4.1	3 years ago
Starryi	52e91bc6ee	REPORT-55744 【组件背景分离】【下个版本】组件复用-frm中拖入报表块设置单元格背景色后，缩略图背景没有及时修改 ... 【问题原因】 拖拽报表块组件到布局中，之后报表块编辑状态，再退出，此时报表块的网格缩略图正常 生成，但是之后对网格缩略图进行优化裁剪时，使用到的裁剪尺寸为默认值0，因为裁剪尺寸 只在报表块尺寸拖动改变后才会发生修改，从而导致裁剪后缩略图是尺寸为0的无效 缩略图，以及最终的缩略图是默认缩略图（默认缩略图没有对应的表格编辑后的内容） 【改动思路】 在表单报表块实例化时，就设置好裁剪尺寸.	3 years ago
Starryi	4675f61730	REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图，如果线重叠了的话，web端显示有问题 ... 【问题原因】 点九图小而组件大，且中间不可缩放的尺寸为0时，就会出现空白。从点九图的 使用机制上看无法避免上上述情况，需要在生成点九图的时候，强制中间缩放 区域的尺寸最小为1才行，即两条平行线之间的最小间距为1. 【改动思路】 同上	3 years ago
superman	90e8ea7a66	Merge pull request #5916 in DESIGN/design from release/11.0 to feature/x ... * commit 'a58c0754d76b91e4454aedb213a49d63da8b6b77': (25 commits) REPORT-55377 升级tomcat到8.5.69 REPORT-56220 数据连接越权漏洞修复 REPORT-56220 数据连接越权漏洞修复 REPORT-56220 数据连接越权漏洞修复 REPORT-56220 数据连接越权漏洞修复 REPORT-55377 更新Tomcat版本到8.5.69 add executeJavaScriptAndReturnValue function CHART-20662 fix:数据集字段拖入单元格 白色文字 CHART-19792 大屏模板屏蔽全局参数菜单项 v7打开调试窗口失败的问题 还原范围 CHART-20642 图表预定义配色避免重名和空字符串名 新接口 新接口 CHART-20402 增加几个接口 CHART-20402 增加几个接口 CHART-20402 增加几个接口 ignore 根据最新视觉调整单元格边框颜色 POM-2302 cpt组件默认样式 ...	3 years ago
ju|剧浩宇	a58c0754d7	Pull request #5915: 无JIRA任务 解决冲突 release/10.0 to release/11.0 ... Merge in DESIGN/design from zheng-1631876890305 to release/11.0 * commit 'c98265cb7bf67d4ce67770f5aabc2ffeb8b7c227': REPORT-55377 更新Tomcat版本到8.5.69 add executeJavaScriptAndReturnValue function CHART-20662 fix:数据集字段拖入单元格 白色文字 CHART-19792 大屏模板屏蔽全局参数菜单项 v7打开调试窗口失败的问题 还原范围 CHART-20642 图表预定义配色避免重名和空字符串名 新接口 新接口 CHART-20402 增加几个接口 CHART-20402 增加几个接口 CHART-20402 增加几个接口 ignore 根据最新视觉调整单元格边框颜色 POM-2302 cpt组件默认样式 REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的 CHART-20299 fix:大屏模板重命名 CHART-20319 fix:大屏模板图表没有超链等界面引起npe REPORT-57643 改个布局 REPORT-57643 调整combobox的大小	3 years ago
zheng	c98265cb7b	confilicts	3 years ago
kerry	e4404356c5	REPORT-57810 - 固定布局-原布局推荐4.1	3 years ago
superman	cf8e083592	Merge pull request #5911 in DESIGN/design from bugfix/10.0 to feature/10.0 ... * commit 'fb79c982334724544b2742318a88b0b9bc68fafc': REPORT-55377 更新Tomcat版本到8.5.69	3 years ago
superman	fb79c98233	Merge pull request #5910 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '49d4306bc7ffc427b868cedf7837123c8811971e': REPORT-55377 更新Tomcat版本到8.5.69 add executeJavaScriptAndReturnValue function CHART-20662 fix:数据集字段拖入单元格 白色文字 CHART-19792 大屏模板屏蔽全局参数菜单项 v7打开调试窗口失败的问题 还原范围 CHART-20642 图表预定义配色避免重名和空字符串名 新接口 新接口 CHART-20402 增加几个接口 CHART-20402 增加几个接口 CHART-20402 增加几个接口 ignore 根据最新视觉调整单元格边框颜色 POM-2302 cpt组件默认样式 REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的 CHART-20299 fix:大屏模板重命名 CHART-20319 fix:大屏模板图表没有超链等界面引起npe REPORT-57643 改个布局 REPORT-57643 调整combobox的大小	3 years ago
superman	49d4306bc7	Merge pull request #5909 in DESIGN/design from final/10.0 to release/10.0 ... * commit '6d0a22add7c9673f7dbae4f53ee65cb5a35a83b0': REPORT-55377 更新Tomcat版本到8.5.69	3 years ago
vito	a86f3f433e	Pull request #5905: REPORT-55377 升级tomcat到8.5.69 ... Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0 * commit 'debf13688c36fa55ee3ce300d50854d5b3fa7c17': REPORT-55377 升级tomcat到8.5.69	3 years ago
Henry.Wang	a8916acc65	Pull request #5893: REPORT-56220 数据连接越权漏洞修复 ... Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0 * commit '83aa0647da69837fb1bf688599d99a0a840b2ef2': REPORT-56220 数据连接越权漏洞修复 REPORT-56220 数据连接越权漏洞修复 REPORT-56220 数据连接越权漏洞修复 REPORT-56220 数据连接越权漏洞修复	3 years ago
vito	debf13688c	REPORT-55377 升级tomcat到8.5.69	3 years ago
Henry.Wang	83aa0647da	REPORT-56220 数据连接越权漏洞修复	3 years ago
superman	e97d4e797d	Merge pull request #5904 in DESIGN/design from feature/10.0 to release/10.0 ... * commit '25f14525198c5c81989d164830b128310878c413': add executeJavaScriptAndReturnValue function CHART-20662 fix:数据集字段拖入单元格 白色文字 CHART-19792 大屏模板屏蔽全局参数菜单项 v7打开调试窗口失败的问题 还原范围 CHART-20642 图表预定义配色避免重名和空字符串名 新接口 新接口 CHART-20402 增加几个接口 CHART-20402 增加几个接口 CHART-20402 增加几个接口 ignore 根据最新视觉调整单元格边框颜色 POM-2302 cpt组件默认样式 REPORT-58394 fix:不安装旧版本图表插件 只是不能新建 图表配置面板也是要出来的 CHART-20299 fix:大屏模板重命名 CHART-20319 fix:大屏模板图表没有超链等界面引起npe REPORT-57643 改个布局 REPORT-57643 调整combobox的大小	3 years ago
kerry	0dc6e0b012	Pull request #5894: REPORT-57810 - 固定布局-原布局推荐4.1 ... Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x * commit 'b90c00059d84bb1120044da894b8a4d9d280663e': 国际化 REPORT-57810 - 固定布局-原布局推荐4.1	3 years ago
Henry.Wang	19a83f8cb5	REPORT-56220 数据连接越权漏洞修复	3 years ago
Henry.Wang	69d6de2bcd	REPORT-56220 数据连接越权漏洞修复	3 years ago
vito	6d0a22add7	Pull request #5892: REPORT-55377 更新Tomcat版本到8.5.69 ... Merge in DESIGN/design from ~VITO/c-design:final/10.0 to final/10.0 * commit 'a63b2989ce65a5f993068c4d6bfc9c1b2ac0150a': REPORT-55377 更新Tomcat版本到8.5.69	3 years ago
superman	f6142ba899	Merge pull request #5902 in DESIGN/design from release/11.0 to feature/x ... * commit '0f0682409e0c5c5c67010b45c1168cb7edfe4476': 无JIRA任务 去除重复方法	3 years ago
kerry	b90c00059d	国际化	3 years ago
kerry	163f00790a	REPORT-57810 - 固定布局-原布局推荐4.1	3 years ago
Henry.Wang	5c372857cf	REPORT-56220 数据连接越权漏洞修复	3 years ago
vito	a63b2989ce	REPORT-55377 更新Tomcat版本到8.5.69	3 years ago
fanglei	0f0682409e	Pull request #5891: 无JIRA任务 去除重复方法 ... Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0 * commit 'bf3e51812097d8a68371fbb17da45299c0f6fd06': 无JIRA任务 去除重复方法	3 years ago
方磊	bf3e518120	无JIRA任务 去除重复方法	3 years ago
superman	f94f6bea4d	Merge pull request #5889 in DESIGN/design from release/11.0 to feature/x ... * commit 'bc5db8ffae3f3a5302892b1e8404f5a85afa3a57': 无JIRA任务，打包报错 REPORT-59523 【主题切换】拖入的新组件没有跟随主题 CHART-20522 && REPORT-59010 final传一份 REPORT-59450 创建组件封面图背景是黑的 REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全 REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换 REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换 REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换 REPORT-59411 【FR11.beta.1冒烟】新自适应-body布局方式是绝对布局时，显示有缩放逻辑设置项 REPORT-59647 视觉启动图要再换一下 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 还原范围 fix conflict REPORT-59440 【主题切换】合并单元格以后，单元格样式都变成了自定义 REPORT-59322 【主题切换】国际化配色方案-主题颜色内容截断 CHART-20568 [产品验收]设计器预览页面图表组件鬼畜 & CHART-20627 图表块组件，鼠标双击，会出现图形重影 REPORT-58984 服务器数据集兼容共享数据集final	3 years ago
superman	bc5db8ffae	Merge pull request #5888 in DESIGN/design from release/10.0 to release/11.0 ... * commit '55842236260a003bf494ad80ab5ec89eafddfa02': REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全	3 years ago
superman	25f1452519	Merge pull request #5886 in DESIGN/design from bugfix/10.0 to feature/10.0 ... * commit '56b8725c3f37686ece97665ec288d561238b0019': REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全	3 years ago
superman	56b8725c3f	Merge pull request #5885 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '55842236260a003bf494ad80ab5ec89eafddfa02': REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全	3 years ago
ju|剧浩宇	82a4b203b2	Pull request #5882: 无 jira 任务，合并 冲突 ... Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit 'c11e4f02da21c41f97d2ecf01ccbd990edccbc30': 无JIRA任务，打包报错 REPORT-59523 【主题切换】拖入的新组件没有跟随主题 CHART-20522 && REPORT-59010 final传一份 REPORT-59450 创建组件封面图背景是黑的 REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换 REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换 REPORT-59143 【设计器适配】模版设置为移动端模版也要支持新旧表单切换 REPORT-59411 【FR11.beta.1冒烟】新自适应-body布局方式是绝对布局时，显示有缩放逻辑设置项 REPORT-59647 视觉启动图要再换一下 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 还原范围 fix conflict REPORT-59440 【主题切换】合并单元格以后，单元格样式都变成了自定义 REPORT-59322 【主题切换】国际化配色方案-主题颜色内容截断 CHART-20568 [产品验收]设计器预览页面图表组件鬼畜 & CHART-20627 图表块组件，鼠标双击，会出现图形重影 REPORT-58984 服务器数据集兼容共享数据集final	3 years ago
kerry	c11e4f02da	Merge branch 'final/11.0' of ssh://code.fineres.com:7999/~kerry/design_10.0 into release/11.0 ... # Conflicts: # designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeProfilePane.java # designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java # designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java	3 years ago
Henry.Wang	5584223626	Pull request #5853: REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全 ... Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0 * commit '443505c8131eca7502a8f15b15c8c999afeacd94': REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全	3 years ago
superman	9a64b9de2b	Merge pull request #5879 in DESIGN/design from release/11.0 to feature/x ... * commit '51e327880bd6a77348121f278be53201107acdce':	3 years ago
superman	51e327880b	Merge pull request #5878 in DESIGN/design from release/10.0 to release/11.0 ... * commit 'e27650a187f1df0c34f7e895e9f35024a4024248':	3 years ago
superman	478e9ce003	Merge pull request #5876 in DESIGN/design from bugfix/10.0 to feature/10.0 ... * commit 'f9e8a437321aa7b779ad85e674a8d95e261113a5': CHART-20642 图表预定义配色避免重名和空字符串名	3 years ago
superman	f9e8a43732	Merge pull request #5875 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit 'e27650a187f1df0c34f7e895e9f35024a4024248': CHART-20642 图表预定义配色避免重名和空字符串名	3 years ago
superman	e27650a187	Merge pull request #5874 in DESIGN/design from final/10.0 to release/10.0 ... * commit '3b63b102b02e35cc1bc0e17fcfbd9aecc6e52b90':	3 years ago
ju|剧浩宇	a2c54f4811	Pull request #5871: 无JIRA任务 冲突 ... Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit '6f3d99216680c96737fdaac2668dda71cb59ab57': CHART-20642 图表预定义配色避免重名和空字符串名 REPORT-59189 导出-导出事件-导出模板选cptx会出问题 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-58301 【决策报表】布局切换以后，body背景样式不保留 REPORT-58252 报表块单元格行列标识去掉后的弥补方案 REPORT-59099 给帮助文档的网址补上默认值 REPORT-58227 远程设计 设计器切换已经打开的模板卡顿 REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确 REPORT-58200 初次安装的10.0设计器，用户目录下会生成.finereport80缓存文件 REPORT-56602 页面设置的纸张大小与实际分页精度不符 REPORT-56602 页面设置的纸张大小与实际分页精度不符 REPORT-55048 https远程连接时，设计器上无法获取服务器推送过来的eventhread线程日志	3 years ago
Starryi	6f3d992166	Merge branch 'release/11.0' into feature/x ... # Conflicts: # designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java	3 years ago
ju|剧浩宇	8f7f1f624b	Pull request #5869: 无 jira 任务，解决冲突 ... Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit '732ce2249337fad1a593e57e69532839be5c98fb': CHART-20642 图表预定义配色避免重名和空字符串名 REPORT-59189 导出-导出事件-导出模板选cptx会出问题 REPORT-58252 报表块单元格行列标识去掉后的弥补方案 REPORT-59099 给帮助文档的网址补上默认值 REPORT-58227 远程设计 设计器切换已经打开的模板卡顿 REPORT-58588 FR11-二轮回归-设计器菜单栏-社区-帮助文档跳转地址的首页面不正确 REPORT-58200 初次安装的10.0设计器，用户目录下会生成.finereport80缓存文件 REPORT-56602 页面设置的纸张大小与实际分页精度不符 REPORT-56602 页面设置的纸张大小与实际分页精度不符 REPORT-55048 https远程连接时，设计器上无法获取服务器推送过来的eventhread线程日志	3 years ago
kerry	732ce22493	Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~kerry/design_10.0 into release/11.0 ... # Conflicts: # designer-chart/src/main/java/com/fr/design/module/ChartPreStyleListPane.java # designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java	3 years ago
ju|剧浩宇	a998918b26	Pull request #5868: 无JIRA任务 冲突 ... Merge in DESIGN/design from ~STARRYI/design:merge10t011 to release/11.0 * commit '278687d10f8d5c9252f53cb093ac3bf45ce113df': REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-58301 【决策报表】布局切换以后，body背景样式不保留	3 years ago
Starryi	278687d10f	无JIRA任务 冲突 ... # Conflicts: # designer-form/src/main/java/com/fr/design/designer/creator/XBorderStyleWidgetCreator.java # designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java # designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java	3 years ago