Branch: feature/x

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 'feature/x'

${ noResults }

Commit Graph

17876 Commits (feature/x)

 

All Branches   

Search

Author	SHA1	Message	Date
hades	8fea3f3218	REPORT-70206 处理异常情况 手动删除prop设计器启动失败	3 years ago
Hades	34c5592826	Pull request #8679: REPORT-67417 运营产品v1.0 补充一些内容 ... Merge in DESIGN/design from ~HADES/design:feature/x to feature/x * commit '6b3f2f46f58a2fb0360f0569f72e3200025da2b8': REPORT-67417 运营产品v1.0 补充一些内容	3 years ago
hades	6b3f2f46f5	REPORT-67417 运营产品v1.0 补充一些内容	3 years ago
superman	f706094c2d	Merge pull request #8678 in DESIGN/design from release/11.0 to feature/x ... * commit '0ead804fd83a824c87ccdfb888978c3df23caeb9':	3 years ago
superman	0ead804fd8	Merge pull request #8677 in DESIGN/design from final/11.0 to release/11.0 ... * commit 'd38b24450a99d5fa99684938463b6631678ada4f':	3 years ago
ju	925cb37c21	Pull request #8669: REPORT-68363 条件属性系列间值的比较 ... Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x * commit 'a6238d0f61454d40b9affbcbe2794ff4fe052e72': REPORT-68363 条件属性系列间值的比较 REPORT-68363 条件属性系列间值的比较	3 years ago
pengda	a6238d0f61	REPORT-68363 条件属性系列间值的比较	3 years ago
pengda	7926bcf413	Merge remote-tracking branch 'origin/feature/x' into feature/x	3 years ago
pengda	714994940d	REPORT-68363 条件属性系列间值的比较	3 years ago
superman	d38b24450a	Merge pull request #8668 in DESIGN/design from release/11.0 to final/11.0 ... * commit '17bfa59afdaafc62287b47fce13ea98860f50a18': REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 update REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题 REPORT-69776 切换在线组件的排序，会加载很久 REPORT-68638 design fix:没有配色的时候渲染和配置界面配色不一致，统一成配置界面的 REPORT-68357 fix:namestyle导致fvs.cpt中单元格样式中有主题相关配置 REPORT-69575 设计器在线组件刷不出来	3 years ago
Hades	a0ecf11a4f	Pull request #8656: REPORT-67417 运营产品v1.0 ... Merge in DESIGN/design from ~HADES/design:feature/x to feature/x * commit '936249f207dad39ea376f5feae0ddd1d72232c12': REPORT-67417 运营产品v1.0 add漏交类 REPORT-67417 运营产品v1.0	3 years ago
hades	936249f207	REPORT-67417 运营产品v1.0 add漏交类	3 years ago
hades	a1cb79707e	REPORT-67417 运营产品v1.0	3 years ago
Hades	23a995afe0	Pull request #8625: REPORT-70092 重定向报错，帮助文档跳转异常 ... Merge in DESIGN/design from ~HADES/design:feature/x to feature/x * commit 'c387c9909fc15f6ff12bc88d5f3c977c2bad01e3': REPORT-70092 重定向报错，帮助文档跳转异常	3 years ago
vito	29d82f109c	Pull request #8645: KERNEL-10665 图片导出优化 ... Merge in DESIGN/design from ~VITO/c-design:feature/x to feature/x * commit '1b1a2e88965fb517aeebdec0c4eaf1ae7ee21a4e': KERNEL-10665 图片导出优化	3 years ago
vito	1b1a2e8896	KERNEL-10665 图片导出优化	3 years ago
vito	150b050a3e	Pull request #8635: KERNEL-10665 图片导出优化 ... Merge in DESIGN/design from ~VITO/c-design:feature/x to feature/x * commit 'fd32268176d2c78b6b24fbfa9eeead2ce4d55625': KERNEL-10665 图片导出优化	3 years ago
vito	fd32268176	KERNEL-10665 图片导出优化	3 years ago
hades	c387c9909f	REPORT-70092 重定向报错，帮助文档跳转异常	3 years ago
Yuan.Wang	38f70ece22	Pull request #8606: REPORT-68346 常用参数组合支持触发联动与事件 ... Merge in DESIGN/design from ~YUAN.WANG/design:feature/x to feature/x * commit '52cd8e88d1b6efe316b7a89c532fc3251a7fb969': REPORT-68346 常用参数组合支持触发联动与事件	3 years ago
superman	5984edb1f8	Merge pull request #8615 in DESIGN/design from release/11.0 to feature/x ... * commit '17bfa59afdaafc62287b47fce13ea98860f50a18': REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 REPORT-69842 修改边框颜色单元格背景颜色会变统一 update REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题	3 years ago
superman	17bfa59afd	Merge pull request #8614 in DESIGN/design from final/11.0 to release/11.0 ... * commit 'f27a22348ef02b09c5143566828bfffb8ed9ab1a': REPORT-69842 修改边框颜色单元格背景颜色会变统一	3 years ago
Lucian.Chen	a270c81dfc	Pull request #8604: REPORT-69887【日期控件专项优化】日期控件的格式设置为yyMMdd或yyMM时，前端显示不对 ... Merge in DESIGN/design from ~LUCIAN.CHEN/design:feature/x to feature/x * commit 'b99e8ac96520e6e53ca09d02990a14edd924952e': REPORT-69887【日期控件专项优化】日期控件的格式设置为yyMMdd或yyMM时，前端显示不对	3 years ago
Lucian.Chen	2993e30721	Pull request #8603: REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 ... Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/11.0 to release/11.0 * commit '7baae38c8582d1953805bb3a97e733ff86a28eb4': REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来 REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来	3 years ago
Yuan.Wang	52cd8e88d1	REPORT-68346 常用参数组合支持触发联动与事件	3 years ago
lucian	b99e8ac965	REPORT-69887【日期控件专项优化】日期控件的格式设置为yyMMdd或yyMM时，前端显示不对	3 years ago
starryi	f27a22348e	Pull request #8574: REPORT-69842 修改边框颜色单元格背景颜色会变统一 ... Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0 * commit '2534fffebd90bef2533416b2aaece153fd2355af': REPORT-69842 修改边框颜色单元格背景颜色会变统一	3 years ago
ju	624c27c3eb	Pull request #8573: REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题 ... Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0 * commit '4a7146db1fdc5411b1aceb8f682875df408ba232': update REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题	3 years ago
lucian	7baae38c85	REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来	3 years ago
lucian	cf19dcee7a	REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来	3 years ago
lucian	7bd8d5b613	REPORT-68949 控件-预定义控件-预定义控件新建后控件列表中没有刷新出来	3 years ago
superman	32da067abb	Merge pull request #8584 in DESIGN/design from release/11.0 to feature/x ... * commit '6575585922a71aa326a896ffcc2695ab6c810f81':	3 years ago
superman	6575585922	Merge pull request #8583 in DESIGN/design from final/11.0 to release/11.0 ... * commit '70b31e02d337f0bdfa472d4a5977e91c39d9d5d1':	3 years ago
superman	70b31e02d3	Merge pull request #8582 in DESIGN/design from persist/11.0 to final/11.0 ... * commit '8c69f68a9ffcfdcd106a30fe9151ac751e63c396':	3 years ago
superman	8c69f68a9f	Merge pull request #8575 in DESIGN/design from final/11.0 to persist/11.0 ... * commit '9caad83fa41e3b6390ee73f277928e7e542604fa':	3 years ago
Starryi	2534fffebd	REPORT-69842 修改边框颜色单元格背景颜色会变统一 ... 【问题原因】 错误的逻辑是 使用单元格样式面板的updateBean方法，获取单元格样式面板的所有配置，并将其设置 到指定单元格上。这个逻辑会导致在选中多个单元格时，用户没有修改的样式配置项也 被覆盖掉.（单元格样式面板的配置项并不可靠，在某些情况下比如单元格多选时，不能 反应实际的单元格样式） 正确的逻辑 用户在编辑自定义单元格样式时，仅修改发生了更改的配置，其余保持不变，也就是将原 有的单元格样式配置，与用户修改的部分配置进行merge，得到新的样式，并设置到指定 单元格上。 注意：这里的样式配置更改存在的情况有三种： 1. 单于昂样式跟随主题切换到自定义样式。样式细节未发生变动，但不再跟随主题了，代码逻辑中对应 switchCellStylesToCustom，样式对象类型从NameStyle变为Style 2. 在跟随主题样式面板，切换主题单元格样式。全量更新，放弃单元格所有原来样式，因此需要使用updateBean. 3. 在自定义样式面板，修改部分配置项。增量更新，保持其他配置项不变，因此需要使用mergeBean. 【改动思路】 同上 【review建议】	3 years ago
shine	4a7146db1f	update	3 years ago
shine	75fe3039de	Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0	3 years ago
shine	833c4b5872	REPORT-68638 fix:删除所有图表配色 重新读fvs.cpt.chart会被兼容成跟随主题	3 years ago
superman	2e382eb9bc	Merge pull request #8572 in DESIGN/design from release/11.0 to feature/x ... * commit '4171b54b27c0caef3f369c71e97f4311f212abbe': REPORT-69776 切换在线组件的排序，会加载很久 REPORT-69575 设计器在线组件刷不出来 REPORT-69776 切换在线组件的排序，会加载很久	3 years ago
superman	4171b54b27	Merge pull request #8571 in DESIGN/design from final/11.0 to release/11.0 ... * commit '9caad83fa41e3b6390ee73f277928e7e542604fa': REPORT-69776 切换在线组件的排序，会加载很久 REPORT-69575 设计器在线组件刷不出来	3 years ago
superman	9caad83fa4	Merge pull request #8570 in DESIGN/design from persist/11.0 to final/11.0 ... * commit 'ddeda7db01ae80f6a326e1027aa1b499200393b3':	3 years ago
superman	ddeda7db01	Merge pull request #8563 in DESIGN/design from final/11.0 to persist/11.0 ... * commit 'a88acb64898b2310575a0d0f75e57860f98a7bff': (103 commits) REPORT-69776 切换在线组件的排序，会加载很久 REPORT-69575 设计器在线组件刷不出来 CHART-22994 图表背景色控件需要更换为支持透明色的控件 REPORT-68726 【迭代】【数据集管理优化】多张模板切换触发搜索，设计器概率卡住 【问题原因】之前没修改好，可能出现搜索框文字不清空的情况 【改动思路】修改为每次离开搜索模式时，情况搜索框 【review建议】无 无jira任务，屏蔽部分功能入口 无jira任务，屏蔽部分功能入口 REPORT-69422 产品调整部分UI && 删除数据集没反应 【问题原因】1.搜索匹配文字高亮调整为匹配文字加粗；2.UIList获取选中对象的方法返回为空 【改动思路】1.改UI；2.自己写一下获取选中对象的逻辑 【review建议】无 REPORT-68987 把高级编辑当作可选的 REPORT-69422 产品调整部分UI 【问题原因】有些小细节还需要调整下 【改动思路】调整 【review建议】无 Update designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java 无jira任务，屏蔽部分功能入口 REPORT-69324 插件-新插件管理-设计器内插件管理版本号显示异常 REPORT-69422 && REPORT-69426 产品调整部分UI && 复制单元格会影响数据集的展开/收起状态 【问题原因】1.产品验收功能的时候改了一些UI；2.因为粘贴单元格的时候会获取当前数据集面板，getInstance方法里会refresh一次整个数据集树，然后将所有节点重置到收起状态 【改动思路】1.调整UI；2.提供一个获取数据集树面板单例不刷新自己的方法，粘贴时使用 【review建议】无 BI-103979 【6.0回归】fr连接bi闪退 REPORT-69213 函数在公式编辑器内不标蓝显示 REPORT-69213 函数在公式编辑器内不标蓝显示 REPORT-68212 表头排序功能-国际化-交互问题 && REPORT-68931 表头排序图标配置颜色后大小发生变化 REPORT-67790;修改开启新引擎的逻辑（原来的以第一个sheet设置为准，改为只要有一个sheet设置了新引擎，就走新引擎逻辑） REPORT-69289 【设计器】大屏编辑器-繁体设计器-远程服务器，打开本地设计器工作目录下的模板，提示我备份 REPORT-68455 && REPORT-69108 【问题原因】 1.工具栏面板与其他面板(设计器菜单栏-模板或远程设计-切换工作目录)重叠时会显示异常是因为之前的这个工具栏面板手误写成了继承Panel 2.搜索结果显示不正确是因为之前改卡死问题没改好，把搜索计数放到了处理UI的外面，会优先于数据集树的刷新而变化，导致搜索计数完成了，但是结果没更新的问题 【改动思路】1.改成继承JPanel；2.搜索计数放到处理UI中，确定处理UI完成才算是一次计数完成；3.添加部分debug日志，方便以后排查问题 【review建议】无 ...	3 years ago
starryi	a88acb6489	Pull request #8562: REPORT-69776 切换在线组件的排序，会加载很久 ... Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0 * commit '61fdc8f64d13dd9a349584e595c12c1a03cb6c73': REPORT-69776 切换在线组件的排序，会加载很久	3 years ago
Starryi	61fdc8f64d	REPORT-69776 切换在线组件的排序，会加载很久 ... 【问题原因】 使用了固定容量阻塞列表，导致资源加载阻塞 【改动思路】 使用LinkedBlockingQueue 【review建议】	3 years ago
starryi	1223ca14b9	Pull request #8561: REPORT-69575 设计器在线组件刷不出来 ... Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0 * commit '73df50d5254ea3ec81d97595de66f4bc41312f8e': REPORT-69575 设计器在线组件刷不出来	3 years ago
Starryi	73df50d525	REPORT-69575 设计器在线组件刷不出来 ... 【问题原因】 oss服务器上缺少部分组件的封面图且读取文件时因为异常类型不匹配， 导致没有捕获到对应的异常，进而影响到组件面板的初始化，最终导致 子进程运行失败，没有切出加载界面。 【改动思路】 1. 组件面板延迟加载，不要影响组件包面板，以及整个在线组件库面板的展示 2. 使用Exception捕获封面图的读取异常 【review建议】	3 years ago
starryi	6eafc08e7a	Pull request #8560: REPORT-69776 切换在线组件的排序，会加载很久 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit 'd51c4665337eab2df6cd32386352e8a91741f857': REPORT-69776 切换在线组件的排序，会加载很久	3 years ago
Starryi	d51c466533	REPORT-69776 切换在线组件的排序，会加载很久 ... 【问题原因】 使用了固定容量阻塞列表，导致资源加载阻塞 【改动思路】 使用LinkedBlockingQueue 【review建议】	3 years ago
Lucian.Chen	8d79bf8e1d	Pull request #8547: REPORT-68277 日期控件专项优化 ... Merge in DESIGN/design from ~LUCIAN.CHEN/design:feature/x to feature/x * commit '3237ffbb37022d462715174389cf4f959d215327': REPORT-68277 日期控件专项优化	3 years ago