Tree: cdf4faaea7

10.0

bugfix/10.0

bugfix/11.0

feature/10.0

feature/big-screen

feature/x

final/10.0

final/11.0

master

persist/10.0

persist/11.0

release/10.0

release/11.0

research/10.0

research/11.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

Branches Tags

${ item.name }

Create tag ${ searchTerm }

Create branch ${ searchTerm }

from 'cdf4faaea7'

${ noResults }

Commit Graph

15746 Commits (cdf4faaea7ae8e489b36475c805da6262aaabaa3)

 

All Branches   

Search

Author	SHA1	Message	Date
kerry	f88caa05f1	REPORT-59948 && REPORT-59948	3 years ago
superman	0a98e919fb	Merge pull request #5973 in DESIGN/design from release/10.0 to release/11.0 ... * commit '37244ffdf28063263b772d5e3f44723fdfa35e99': REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景	3 years ago
superman	ddb83185d8	Merge pull request #5969 in DESIGN/design from bugfix/10.0 to feature/10.0 ... * commit '2ec5de4bb1ec7e794d54c2cd1ac1f216b8e1a143': REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景	3 years ago
kerry	6a28016370	命名修改	3 years ago
starryi	d019c73e66	Pull request #5962: REPORT-59756 & REPORT-59078 & REPORT-59423 & REPORT-59674 & REPORT-59351 ... Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit '9239e90287e2f7b42127d6d9a100a3244755c96e': REPORT-59351 【主题切换】国际化显示问题 REPORT-59674 FR11新主题，单元格样式跟随主题时，样式选择中的字体看不清 REPORT-59423 【主题切换】高分辨率下主题管理页面显示不全 REPORT-59756 【主题切换】新建主题时，输入主题名称的时候会卡顿 & REPORT-59078 【主题切换】主题编辑界面 保存按钮交互优化	3 years ago
kerry	5d7f2db6a7	REPORT-59932 【固定布局-原布局推荐4.1】剪切问题	3 years ago
zheng	0f5d60f75f	Pull request #5970: CHART-20686 fix bugs ... Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0 * commit '2adee772b27b5092297900c75b180bfe9215f80e': CHART-20686 大屏模板中的图表不支持导出 CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了	3 years ago
kerry	6899994bc9	Pull request #5960: REPORT-59844 && REPORT-59908 && REPORT-59906 && REPORT-59907 布局推荐 bug 修复；视觉微调 ... Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x * commit '0757ed358e0c727f2d2f09f5f44ab2f304790737': REPORT-59908 && REPORT-59906 && REPORT-59907 REPORT-59844 视觉微调	3 years ago
zheng	d15b1510df	Pull request #5963: CHART-21014 fix: 大屏模板中的cpt组件里面还是要有全部图表类型的 ... Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0 * commit '8c8873de3d238fe76eac21cbbf88138a77a5fe45': CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的	3 years ago
shine	2adee772b2	CHART-20686 大屏模板中的图表不支持导出	3 years ago
kerry	0757ed358e	REPORT-59908 && REPORT-59906 && REPORT-59907	3 years ago
superman	2ec5de4bb1	Merge pull request #5968 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '37244ffdf28063263b772d5e3f44723fdfa35e99': REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景	3 years ago
superman	37244ffdf2	Merge pull request #5967 in DESIGN/design from final/10.0 to release/10.0 ... * commit 'e8abf8cc271c58fd17f1c36e66bcbc68b2c9d17a': REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景	3 years ago
shine	026ecab6ad	CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了	3 years ago
superman	279507fb90	Merge pull request #5961 in DESIGN/design from release/11.0 to feature/x ... * commit '069506d2f8613787f215fee3dbf4cf720f1c4ff3': REPORT-57298【回归测试】控件事件名显示完全，但出现横向滚动条	3 years ago
shine	8c8873de3d	Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0	3 years ago
shine	0c327207bc	CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的	3 years ago
starryi	e8abf8cc27	Pull request #5952: REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 ... Merge in DESIGN/design from ~STARRYI/design:final/10.0 to final/10.0 * commit '8ba459584771f729665f0246ec84c437a1cc9e40': REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景	3 years ago
kerry	f50b7a725f	REPORT-59844 视觉微调	3 years ago
Starryi	9239e90287	REPORT-59351 【主题切换】国际化显示问题 ... 【问题原因】 视觉变动，修改主题编辑面板中控件的尺寸和布局 【改动思路】 同上	3 years ago
Starryi	5e8142342c	REPORT-59674 FR11新主题，单元格样式跟随主题时，样式选择中的字体看不清 ... 【问题原因】 修改单元格样式阅览面板中透明图片的透明度规则，根据文字颜色 自动调整图片透明度 【改动思路】 同上	3 years ago
Starryi	727d7f96e5	REPORT-59423 【主题切换】高分辨率下主题管理页面显示不全 ... 【问题原因】 视觉变动，修改主题列表页面高度 【改动思路】 同上	3 years ago
Starryi	6c4716aff9	REPORT-59756 【主题切换】新建主题时，输入主题名称的时候会卡顿 & ... REPORT-59078 【主题切换】主题编辑界面 保存按钮交互优化 【问题原因】 1. 整理拆分主题编辑面板实现 2. 添加保存成功提示 3. 仅在修改主题配置且主题名称有效且自定义主题时，保存按钮可点击 【改动思路】 同上	3 years ago
zheng	78a929ddb1	Pull request #5942: CHART-20939 design fix: 三维组合地图有类型界面 ... Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0 * commit '79dbdc48eba1d71d0fe4ebe90eb459ba7741eaa0': CHART-20939 design fix: 三维组合地图有类型界面	3 years ago
Starryi	8ba4595847	REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 ... 【问题原因】 10.0恢复原先删除的旧方法，避免插件失效 【改动思路】 同标题	3 years ago
kerry	069506d2f8	Pull request #5941: REPORT-57298【回归测试】控件事件名显示完全，但出现横向滚动条 ... Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit '633a29dc48a4d7f8b4f1baf171518910d45e95e8': REPORT-57298【回归测试】控件事件名显示完全，但出现横向滚动条	3 years ago
shine	79dbdc48eb	CHART-20939 design fix: 三维组合地图有类型界面	3 years ago
kerry	633a29dc48	REPORT-57298【回归测试】控件事件名显示完全，但出现横向滚动条	3 years ago
kerry	ae431461ce	Pull request #5930: REPORT-58525 布局的管理和应用 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x * commit '98fee785ceed321579df4890bdfabba608a4e29f': REPORT-58525 将打开内置布局模板所用的NewForm对象换成BaseForm对象，删除内置布局模板里面的NewFormAttrMark标识 REPORT-58525 解决pr中的问题 REPORT-58525 更新设计切图 REPORT-58525 布局的管理和应用	3 years ago
方磊	98fee785ce	REPORT-58525 将打开内置布局模板所用的NewForm对象换成BaseForm对象，删除内置布局模板里面的NewFormAttrMark标识	3 years ago
superman	dadf7326b1	Merge pull request #5939 in DESIGN/design from release/11.0 to feature/x ... * commit '54f789aa078f119e3659f984a9efd8e844b3668f': REPORT-59719 fix加个判断 REPORT-59719 下拉框效果还有点问题 fix REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动 REPORT-59719 下拉框效果还有点问题 REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白	3 years ago
superman	54f789aa07	Merge pull request #5938 in DESIGN/design from release/10.0 to release/11.0 ... * commit '3f443a11b519585025358d9be64f871236905adc': REPORT-59719 fix加个判断 REPORT-59719 下拉框效果还有点问题 fix REPORT-59719 下拉框效果还有点问题 REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白	3 years ago
superman	ddc4716561	Merge pull request #5936 in DESIGN/design from bugfix/10.0 to feature/10.0 ... * commit '0bd973e7ec38485cfda674763405507a5ec24d11': REPORT-59719 fix加个判断 REPORT-59719 下拉框效果还有点问题 fix REPORT-59719 下拉框效果还有点问题 REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白	3 years ago
方磊	df1bfa9478	REPORT-58525 解决pr中的问题	3 years ago
kerry	1f354f35fb	Pull request #5929: REPORT-57810 固定布局-原布局推荐4.1 ... Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x * commit '1abc3ecb3ddae47de528922c112d8a3149212028': 代码修改 REPORT-57810 固定布局-原布局推荐4.1	3 years ago
superman	0bd973e7ec	Merge pull request #5935 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '3f443a11b519585025358d9be64f871236905adc': REPORT-59719 fix加个判断 REPORT-59719 下拉框效果还有点问题 fix REPORT-59719 下拉框效果还有点问题	3 years ago
superman	3f443a11b5	Merge pull request #5934 in DESIGN/design from final/10.0 to release/10.0 ... * commit '7d77acf05460c78e14d7fc106e8d7089084f2f60': REPORT-59719 fix加个判断 REPORT-59719 下拉框效果还有点问题 fix REPORT-59719 下拉框效果还有点问题	3 years ago
superman	7d77acf054	Merge pull request #5933 in DESIGN/design from persist/10.0 to final/10.0 ... * commit 'ec941e397b3db99c48219f0b8ae0a37d39459378':	3 years ago
ju|剧浩宇	de53744add	Pull request #5931: 无jira任务 合代码 ... Merge in DESIGN/design from final/11.0 to persist/11.0 * commit '4a4db7bb4492642492cd5848978f6e84018efe11': REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动	3 years ago
方磊	6f46357af5	REPORT-58525 更新设计切图	3 years ago
方磊	eb9671adbf	Merge branch 'feature/x' of ssh://code.fineres.com:7999/~fanglei/design10.0 into feature/x ... * 'feature/x' of ssh://code.fineres.com:7999/~fanglei/design10.0: (83 commits) REPORT-58697 【主题切换】frm主题body背景设置默认图片，缩略图变黑 REPORT-55744 【组件背景分离】【下个版本】组件复用-frm中拖入报表块设置单元格背景色后，缩略图背景没有及时修改 REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图，如果线重叠了的话，web端显示有问题 REPORT-57810 - 固定布局-原布局推荐4.1 REPORT-55377 升级tomcat到8.5.69 REPORT-56220 数据连接越权漏洞修复 REPORT-56220 数据连接越权漏洞修复 REPORT-56220 数据连接越权漏洞修复 国际化 REPORT-57810 - 固定布局-原布局推荐4.1 REPORT-56220 数据连接越权漏洞修复 REPORT-55377 更新Tomcat版本到8.5.69 无JIRA任务 去除重复方法 CHART-20642 图表预定义配色避免重名和空字符串名 无JIRA任务，打包报错 REPORT-59523 【主题切换】拖入的新组件没有跟随主题 CHART-20522 && REPORT-59010 final传一份 REPORT-59450 创建组件封面图背景是黑的 REPORT-59189 导出-导出事件-导出模板选cptx会出问题 REPORT-59166 韩文设计器设置条件属性 条件属性框体标题显示不全 ...	3 years ago
方磊	cda66e098c	REPORT-58525 布局的管理和应用	3 years ago
starryi	831a0df2f9	Pull request #5922: REPORT-58697 【主题切换】frm主题body背景设置默认图片，缩略图变黑 ... Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit '82319138ee7918b26e4583f54842b1374b68bef2': REPORT-58697 【主题切换】frm主题body背景设置默认图片，缩略图变黑	3 years ago
kerry	1abc3ecb3d	代码修改	3 years ago
kerry	f13287a467	REPORT-57810 固定布局-原布局推荐4.1	3 years ago
superman	ec941e397b	Merge pull request #5928 in DESIGN/design from final/10.0 to persist/10.0 ... * commit 'fe51aad700c5ce34caa0717146ada2f90c1aed75': (43 commits) REPORT-59719 fix加个判断 REPORT-59719 下拉框效果还有点问题 fix REPORT-59719 下拉框效果还有点问题 REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白 REPORT-55377 更新Tomcat版本到8.5.69 CHART-20642 图表预定义配色避免重名和空字符串名 REPORT-59189 导出-导出事件-导出模板选cptx会出问题 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景 REPORT-58301 【决策报表】布局切换以后，body背景样式不保留 REPORT-58252 报表块单元格行列标识去掉后的弥补方案 REPORT-58626 新自适应-报表块-旧模板设为横向自适应，切换成新模板后图片背景不见了 REPORT-58252 报表块单元格行列标识去掉后的弥补方案 CHART-20568 [产品验收]设计器预览页面图表组件鬼畜 & CHART-20627 图表块组件，鼠标双击，会出现图形重影 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理，再回到原模板，无法退出权限编辑状态 REPORT-58991 设计器内-模板画布可滚动-点击组件编辑-不在视线内的组件，编辑锁定位置有问题 REPORT-58207 系统原生文件选择器弹窗-mac插入图片弹窗时会出现文件选择器弹窗被遮盖的情况 ...	3 years ago
Hades	fe51aad700	Pull request #5919: REPORT-59719 下拉框效果还有点问题 ... Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0 * commit '54a51dcfd729221d59c6d23f288f2a77b297055e': REPORT-59719 fix加个判断 REPORT-59719 下拉框效果还有点问题 fix REPORT-59719 下拉框效果还有点问题	3 years ago
superman	23363bde86	Merge pull request #5926 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '1ed410b320505c5b7e5ffe29177d0c2f5f131399': REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白	3 years ago
superman	1ed410b320	Merge pull request #5925 in DESIGN/design from final/10.0 to release/10.0 ... * commit '40486a3e46cae6147927e9761d0cf0b78f953d6e': REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白	3 years ago
superman	efcf118fe9	Merge pull request #5923 in DESIGN/design from final/11.0 to release/11.0 ... * commit '4a4db7bb4492642492cd5848978f6e84018efe11': REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动	3 years ago