Tree: d964c7e7d5

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 'd964c7e7d5'

${ noResults }

Commit Graph

16804 Commits (d964c7e7d51d4d65f01d34f8e2046b7811c4dfba)

 

All Branches   

Search

Author	SHA1	Message	Date
Hoky	3a751c0122	Merge remote-tracking branch 'origin/release/11.0' into release/11.0	3 years ago
Hoky	f8c570a3f1	REPORT-62175 && REPORT-63204 ... 1.埋点适配 2.针对sum(1,)等此类公式进行合法性判断	3 years ago
kerry	22bf2d8ce5	Pull request #6849: REPORT-63190 && REPORT-63257【接触点优化】轮播过程中切换组件包，再回来发现显示有问题 ... Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit '6aa636185daf0bf2a471b433891590b4195ff47b': REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据 REPORT-63190【接触点优化】轮播过程中切换组件包，再回来发现显示有问题	3 years ago
Hades	78862fcb1d	Pull request #6863: CHART-22038 决策报表，安装ECharts后，图表块插入图表区域不显示echarts的图标 ... Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0 * commit '8de9339eceaf774fe0f497b6845a82daa8b98762': CHART-22038 决策报表，安装ECharts后，图表块插入图表区域不显示echarts的图标	3 years ago
hades	8de9339ece	CHART-22038 决策报表，安装ECharts后，图表块插入图表区域不显示echarts的图标	3 years ago
Hades	326c9bff7f	Pull request #6862: REPORT-63305 设计器获取父容器，需要对拓展的布局插件兼容处理下 ... Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0 * commit '568cf34dc65fa13e4efe4d2f2ab8c377732c7827': REPORT-63305 设计器获取父容器，需要对拓展的布局插件兼容处理下	3 years ago
Hoky.He	382f8ce03b	Pull request #6861: REPORT-63196 && REPORT-63186 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:release/11.0 to release/11.0 * commit '0803bd975194c985bcd866a3b5f70172911cd367': REPORT-63196 && REPORT-63186 1.在双击之后使搜索框消失； 2.模拟计算在计算错误的时候提示计算异常	3 years ago
hades	568cf34dc6	REPORT-63305 设计器获取父容器，需要对拓展的布局插件兼容处理下	3 years ago
starryi	bd9cb088ca	Pull request #6850: REPORT-63250 组件可更新视觉验收 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit '23ece8197e7460b3d0b94a774b8f391bdfafdf02': REPORT-63250 组件可更新视觉验收	3 years ago
superman	9acbd6bea7	Merge pull request #6860 in DESIGN/design from release/11.0 to feature/x ... * commit 'c3d03b9e47232f081afc54b38fc9ad89be72221f': REPORT-63194 【组件可更新提醒】组件复用-适配设计器字段输入框输入时会出现字符消失的情况 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填	3 years ago
Hoky	0803bd9751	Merge remote-tracking branch 'origin/release/11.0' into release/11.0	3 years ago
Hoky	0c77e8cdf3	REPORT-63196 && REPORT-63186 ... 1.在双击之后使搜索框消失； 2.模拟计算在计算错误的时候提示计算异常	3 years ago
kerry	6aa636185d	REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据	3 years ago
Starryi	23ece8197e	REPORT-63250 组件可更新视觉验收 ... 【问题原因】 修改设计器组件商城面板上一些控件的展示效果 【改动思路】 同上	3 years ago
starryi	c3d03b9e47	Pull request #6842: REPORT-63192 & REPORT-63194 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit 'fb67c0901c388166ee42b530c792ed3fb38ee769': REPORT-63194 【组件可更新提醒】组件复用-适配设计器字段输入框输入时会出现字符消失的情况 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填	3 years ago
kerry	1a8a38a889	REPORT-63190【接触点优化】轮播过程中切换组件包，再回来发现显示有问题	3 years ago
superman	3b63555682	Merge pull request #6848 in DESIGN/design from release/11.0 to feature/x ... * commit '192229cbd393cb1da025e57aa0dda2c4366839a7': REPORT-63102 公式编辑器优化，多行函数错误返回值异常 1.定制一个没有newline的frformulalexer REPORT-62477 组件复用-10设计器在线组件预期不能看到11组件	3 years ago
superman	7c54fb326c	Merge pull request #6843 in DESIGN/design from bugfix/10.0 to feature/10.0 ... * commit '11b2419281f4186136d43ce260fbd9544491eea5':	3 years ago
superman	192229cbd3	Merge pull request #6841 in DESIGN/design from release/10.0 to release/11.0 ... * commit '126044156244bbb8983cd222280858e4d1a18fe6':	3 years ago
starryi	7741b00c2d	Pull request #6836: REPORT-62477 组件复用-10设计器在线组件预期不能看到11组件 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit '5ca264ee8b2e59360b66273e301977bde00cd49e': REPORT-62477 组件复用-10设计器在线组件预期不能看到11组件	3 years ago
Starryi	fb67c0901c	REPORT-63194 【组件可更新提醒】组件复用-适配设计器字段输入框输入时会出现字符消失的情况 ... 【问题原因】 合成文本，如中文等存在输入-删除-替换的机制，参考JTextComponent#replaceInputMethodText() 所以insertString中不能直接return，而应该抛出异常中断后续字符处理，否则在处理中文等合成文本时 会导致原有字符被删除 【改动思路】 同上	3 years ago
superman	11b2419281	Merge pull request #6840 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '126044156244bbb8983cd222280858e4d1a18fe6':	3 years ago
superman	1260441562	Merge pull request #6839 in DESIGN/design from final/10.0 to release/10.0 ... * commit '36bb7d425e18e0a372be3a15a62a5912743b8e55':	3 years ago
Starryi	88cfa15c84	REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填 ... 【问题原因】 1. 整理下目前组件生成面板中必填项的校验规则 2. 将组件类型设置渐入到必填项的校验规则中 【改动思路】 同上	3 years ago
Hoky.He	b97258a588	Pull request #6837: REPORT-63102 公式编辑器优化，多行函数错误返回值异常 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:release/11.0 to release/11.0 * commit 'f356dee37578b8ffbe1838429656d8b6a005cd29': REPORT-63102 公式编辑器优化，多行函数错误返回值异常 1.定制一个没有newline的frformulalexer	3 years ago
Hoky	f356dee375	REPORT-63102 公式编辑器优化，多行函数错误返回值异常 ... 1.定制一个没有newline的frformulalexer	3 years ago
Starryi	5ca264ee8b	REPORT-62477 组件复用-10设计器在线组件预期不能看到11组件 ... 【问题原因】 10.0设计器代码不做改动，因此需要修改商城相关接口，修改后原商城的 filter接口将不再返回设计器版本过滤条件，因此11.0的设计器需使用 新的接口以获取包含设计器版本的过滤条件 【改动思路】 11.0设计器上使用新接口获取过滤条件	3 years ago
Hades	cd279aecbc	Pull request #6709: KERNEL-9542 优化插件对设计器启动带来的影响 ... Merge in DESIGN/design from ~HADES/design:feature/x to feature/x * commit '9bb89eee1dbb02e8cdaae6c0e4484dc4c2bb6994': KERNEL-9542 优化插件对设计器启动带来的影响 Revert "KERNEL-9542 优化插件对设计器启动带来的影响" KERNEL-9542 优化插件对设计器启动带来的影响	3 years ago
Hoky.He	851419416f	Pull request #6826: REPORT-63102 公式编辑器优化，多行函数错误返回值异常 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:feature/x to feature/x * commit '02261982da9eed0e8a1cff0aff7e8217dd9e4c4b': REPORT-63102 公式编辑器优化，多行函数错误返回值异常 1.定制一个没有newLine的FRFormulaLexer	3 years ago
superman	5ca0868146	Merge pull request #6835 in DESIGN/design from feature/x to release/11.0 ... * commit 'a0bdf7d7ec70b37cf3ffd681c60a2bf80aeb7335': (44 commits) REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。 REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。 REPORT-62964【接触点优化】视觉调整 REPORT-60163 公式编辑器优化2.0 1.修改一些测试问题 REPORT-62398 【接触点优化】筛选面板存在时，上下滑动鼠标显示异常 REPORT-62984 设计器触摸板问题-双指向右滑动时，设计器界面同时向右下滑动 REPORT-62970【接触点优化】筛选动效问题，交互看下 REPORT-62926 && REPORT-62920 && REPORT-62967 && REPORT-62964 REPORT-62972 【接触点优化】跟组件可更新的交互提示问题 REPORT-62809 && REPORT-62814 && REPORT-62815 && REPORT-62816 && REPORT-62817 1.修改布局与一些错误 REPORT-62780【阻塞】【接触点优化】收起筛选面板，开始轮播加载时，最新版本会提示网络连接失败导致无法正常轮播 REPORT-60154【来源于迭代任务】【V3.1.0】【无需适配】复用组件接触点优化二期 REPORT-62596 远程设计websocket断开提示优化-远程正常状态下启动设计器时出现toast弹窗 REPORT-62398 && REPORT-62397【接触点优化】查看推荐组件按钮，显示不全;【接触点优化】筛选面板存在时，上下滑动鼠标显示异常 REPORT-62653 【组件可更新提醒】组件复用-组件上“版本不兼容”提示文字不明显 REPORT-62677 组件复用-在线组件页面数据加载失败 REPORT-62576 【组件可更新提醒】组件复用-更新过程中取消更新失败 REPORT-62652 【组件可更新提醒】组件复用-不兼容弹窗图标应该是红色标识 REPORT-62647 组件更新成功后可更新标志应该消失 REPORT-62623 && REPORT-62399 && REPORT-62547 && REPORT-62626 && REPORT-62400 && REPORT-62542 && REPORT-62544 ...	3 years ago
superman	36bb7d425e	Merge pull request #6834 in DESIGN/design from release/10.0 to final/10.0 ... * commit 'b994b8bb8b935eae310a398ba2dea704d73a5799': REPORT-62275 tab高度弹窗撤销问题 CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后，reportlets根目录显示不了FVS模板，只有点击工具栏的刷新按钮才能出现 REPORT-62275 tab高度弹窗撤销问题 CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design REPORT-62554 再打开设计器模板会空白 REPORT-60748 决策报表-属性-坐标尺寸交互问题 CHART-21951 第三方图表插件无法创建复用组件 REPORT-62088 来回切换两个单元格及其的排序按钮，几十次后，排序按钮点击 CHART-21665 design fix:仪表盘刻度配色保存异常处理 REPORT-62142 fix 解密条件 关注内置的两种模板类型即可 REPORT-62142 加密模板在json数据集插件禁用启用后的模板数据集无法正常显示 REPORT-62133 mac设计器安装包起不来	3 years ago
superman	b994b8bb8b	Merge pull request #6833 in DESIGN/design from bugfix/10.0 to release/10.0 ... * commit '52177afe711e2ef709ff4c28cb4d3c0bec4c8de0':	3 years ago
Hoky	02261982da	Merge remote-tracking branch 'origin/feature/x' into feature/x	3 years ago
Hoky	8ac5e7ac7e	REPORT-63102 公式编辑器优化，多行函数错误返回值异常 ... 1.定制一个没有newLine的FRFormulaLexer	3 years ago
Hoky.He	a0bdf7d7ec	Pull request #6820: REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:feature/x to feature/x * commit 'b5945c31493d6d654b0eb2f33ad850be92d76f90': REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。 REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。	3 years ago
Hoky	b5945c3149	REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 ... 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。	3 years ago
Hoky	a19aeab6a4	Merge remote-tracking branch 'origin/feature/x' into feature/x	3 years ago
Hoky	68a18ce3a2	REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 ... 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。	3 years ago
kerry	ffa536ec87	Pull request #6809: REPORT-62964【接触点优化】视觉调整 ... Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x * commit '786914be821bdb414bbf8040c6fb6d154fa16e5b': REPORT-62964【接触点优化】视觉调整	3 years ago
kerry	786914be82	REPORT-62964【接触点优化】视觉调整	3 years ago
Hoky.He	6ab425b929	Pull request #6807: REPORT-60163 公式编辑器优化2.0 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:feature/x to feature/x * commit 'f2422340509c14b44594851e826052547653fa70': REPORT-60163 公式编辑器优化2.0 1.修改一些测试问题	3 years ago
Hoky	f242234050	Merge remote-tracking branch 'origin/feature/x' into feature/x	3 years ago
superman	582d4325d5	Merge pull request #6806 in DESIGN/design from release/11.0 to feature/x ... * commit 'a7615ca613c8b9d4534d8a4b82ab32f121d627e8': REPORT-62961 11内置组件没有安装	3 years ago
Hoky	d8140ae8c2	REPORT-60163 公式编辑器优化2.0 ... 1.修改一些测试问题	3 years ago
Tommy	a7615ca613	Pull request #6776: REPORT-62961 11内置组件没有安装 ... Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0 * commit '15f0d94c21e9ab285530b6f098c101cea760cf26': REPORT-62961 11内置组件没有安装	3 years ago
superman	25ba5e7d5b	Merge pull request #6781 in DESIGN/design from bugfix/10.0 to feature/10.0 ... * commit '52177afe711e2ef709ff4c28cb4d3c0bec4c8de0': REPORT-62275 tab高度弹窗撤销问题	3 years ago
superman	52177afe71	Merge pull request #6779 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '92d1d8b90c3d309f670a8693f3b4bf9b77b7e665': REPORT-62275 tab高度弹窗撤销问题	3 years ago
Tommy	15f0d94c21	REPORT-62961 11内置组件没有安装	3 years ago
ju|剧浩宇	8593e0794a	Pull request #6775: 无jira任务， release/11.0 合 feature/x ... Merge in DESIGN/design from ~TOMMY/design:feature/x to feature/x * commit '29a0b2f500d4fc172d654b2f4c5fe4c30613f033': REPORT-62275 tab高度弹窗撤销问题 REPORT-62974 引导提示文字与按钮实际文字不一致 REPORT-62275 tab高度弹窗撤销问题 CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后，reportlets根目录显示不了FVS模板，只有点击工具栏的刷新按钮才能出现 REPORT-62275 tab高度弹窗撤销问题 REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 代码质量问题 REPORT-62896 替换常量 REPORT-62896 下载主题引导过程中概率性退出引导问题 REPORT-62275&REPORT-61827 REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 【问题原因】设计器里没适配 【改动思路】1. 适配下弹窗提示；2. 之前把forbid-reminder放到PluginView里还是不合适，换成通过xml获取的方式 【review建议】无 REPORT-62275 CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design REPORT-62554 再打开设计器模板会空白 REPORT-61827 REPORT-62275 表单拖入失败-自动撤销	3 years ago
Tommy	29a0b2f500	Merge branch 'release/11.0' into feature/x ... # Conflicts: # designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java # designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java	3 years ago