Tree: 15e6d0f197

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 '15e6d0f197'

${ noResults }

Commit Graph

14729 Commits (15e6d0f197892e8e1997926d9ed0ee2f44961d0e)

 

All Branches   

Search

Author	SHA1	Message	Date
hades	aadc1a145a	无jira 解决冲突 错误提交回退	3 years ago
hades	f0558e4e3f	无jira 解决冲突 错误提交回退	3 years ago
superman	056e376cac	Merge pull request #5304 in DESIGN/design from release/11.0 to feature/x ... * commit '3b47f8baac3dbaff1d85067cbe18e7cd44a51efb': REPORT-48135 修复线程池调用方式 REPORT-48167 修复本地性能分析页面链接错误问题	3 years ago
hades	6931c7827b	无jira 解决冲突	3 years ago
hades	3d5a088abf	REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分	3 years ago
loy	3b47f8baac	Pull request #5273: REPORT-48167 & REPORT-48135 修复新引擎内置bug ... Merge in DESIGN/design from ~LOY/design:release/11.0 to release/11.0 * commit '1a0fc19d1a054c1f4698f1d0cf9cef8bac40089a': REPORT-48135 修复线程池调用方式 REPORT-48167 修复本地性能分析页面链接错误问题	3 years ago
superman	55d62298aa	Merge pull request #5281 in DESIGN/design from feature/10.0 to feature/big-screen ... * commit 'd25d4c246118f2153bd36ec48e59fc229487500d': REPORT-54885 添加注释，便于理解 REPORT-54885 优化获取延长线方法的实现 REPORT-54885 优化方法命名 REPORT-54885 优化api命名 REPORT-54885 优化重复代码 REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分 REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分	3 years ago
loy	1a0fc19d1a	REPORT-48135 修复线程池调用方式	3 years ago
loy	771d1456cc	REPORT-48167 修复本地性能分析页面链接错误问题	3 years ago
fanglei	d25d4c2461	Pull request #5250: REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit '897230cfaa4f3156df586bb5436cac407f07f09a': REPORT-54885 添加注释，便于理解 REPORT-54885 优化获取延长线方法的实现 REPORT-54885 优化方法命名 REPORT-54885 优化api命名 REPORT-54885 优化重复代码 REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分 REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分	3 years ago
方磊	897230cfaa	REPORT-54885 添加注释，便于理解	3 years ago
superman	94a0f734aa	Merge pull request #5272 in DESIGN/design from feature/10.0 to feature/big-screen ... * commit '35ed2c50d10775494462b928d2153c747bc8c1ad':	3 years ago
superman	94ff52feb4	Merge pull request #5271 in DESIGN/design from release/11.0 to feature/x ... * commit '9e96755af5259f69d8a89936add1a4d5770f9ba8': REPORT-50665【FRX】挂载新决策报表模板时，应该无须添加&op=form_adaptive参数	3 years ago
方磊	122fa10b8c	REPORT-54885 优化获取延长线方法的实现	3 years ago
方磊	3e65344d93	REPORT-54885 优化方法命名	3 years ago
方磊	0c59cab942	REPORT-54885 优化api命名	3 years ago
方磊	3c5a53d2a2	REPORT-54885 优化重复代码	3 years ago
zheng	35ed2c50d1	Pull request #5256: CHART-20142 design feature/big-screen to feature/10.0 ... Merge in DESIGN/design from feature/big-screen to feature/10.0 * commit 'e1b2cbb455f19beaeed841685525c52587fadab0': (29 commits) CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到 CHART-18786 feat:表格组件 解决冲突 无jira 解决冲突 update feat:其他组合图不需要类型界面，自定义组合图需要 refactor:plugin use 10.0 not compatible xxx copy from 10.0 code feat:类型和特性面板如果没有其他设置项 则拿掉 merge merge:REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix merge:REPORT-51958 远程环境检测及同步 merge:REPORT-53626 设计器启动异常 merge:REPORT-53229 补上空格 merge:REPORT-53229 设计器顶部版本号信息改为小版本信息 merge:REPORT-51442 菜单栏和数据集面板灰化问题 merge:先把我自己的改回去 feat:对接扩展图表 api level feat:编辑器模式 没有单元格数据源 图表切换 监控刷新等配置项 REPORT-52490 图表配置界面 添加属性改变事件接口 omport ...	3 years ago
kerry	9e96755af5	Pull request #5253: REPORT-50665【FRX】挂载新决策报表模板时，应该无须添加&op=form_adaptive参数 ... Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0 * commit '21e4bc1f77853efd1a023d13dd8df36fcba0f9d2': REPORT-50665【FRX】挂载新决策报表模板时，应该无须添加&op=form_adaptive参数	3 years ago
superman	e1b2cbb455	Merge pull request #5264 in DESIGN/design from feature/10.0 to feature/big-screen ... * commit '6f6d1959ac6bb3eb517e8e6c3d389c2cb9a6499a': REPORT-56080 图表双击无法进入图表编辑页 REPORT-55060 数据集预览支持复制 REPORT-55060 数据集预览支持复制 REPORT-55060 数据集预览支持复制 REPORT-55072 设计器内文件选择器替换为原生的 REPORT-55072 设计器内文件选择器替换为原生的 REPORT-55072 设计器内文件选择器替换为原生的	3 years ago
superman	9e756163b3	Merge pull request #5263 in DESIGN/design from release/11.0 to feature/x ... * commit 'b428f495ff857ccf8790677188d36d5b7d6a637d': REPORT-51472 设计器启动缓存配置读写模块	3 years ago
rinoux	b428f495ff	Pull request #5254: REPORT-51472 设计器启动缓存配置读写模块 ... Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0 * commit 'b41a6ed7b37da6fb64953a73c7e342e9c364002b': REPORT-51472 设计器启动缓存配置读写模块	3 years ago
方磊	6ecdf5a8d9	REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分	3 years ago
zheng	e215a59f7b	Pull request #5255: CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到 ... Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/big-screen * commit '330dff7c009e06060d8f3c47d3f5141f1678d4e3': CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到	3 years ago
shine	330dff7c00	Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen	3 years ago
rinoux	b41a6ed7b3	REPORT-51472 设计器启动缓存配置读写模块	3 years ago
shine	2fe05ed614	CHART-20142 所有抽出去的protected public方法 都保留 因为可能被插件或者oem什么的用到	3 years ago
Tommy	6f6d1959ac	Pull request #5252: REPORT-56080 图表双击无法进入图表编辑页 ... Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0 * commit '4dfa89b1371429d79f7a7d26e06bc185fcb0c811': REPORT-56080 图表双击无法进入图表编辑页	3 years ago
kerry	21e4bc1f77	REPORT-50665【FRX】挂载新决策报表模板时，应该无须添加&op=form_adaptive参数	3 years ago
Henry.Wang	2693a17f21	Pull request #5251: REPORT-55060 数据集预览支持复制 ... Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0 * commit 'ebf44c29a8bf51664783a0aeab79bb890931d68e': REPORT-55060 数据集预览支持复制 REPORT-55060 数据集预览支持复制 REPORT-55060 数据集预览支持复制	3 years ago
kuangshuai	4dfa89b137	Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0	3 years ago
kuangshuai	705d28949b	REPORT-56080 图表双击无法进入图表编辑页	3 years ago
Henry.Wang	ebf44c29a8	REPORT-55060 数据集预览支持复制	3 years ago
Henry.Wang	bd6817a976	REPORT-55060 数据集预览支持复制	3 years ago
Henry.Wang	d5b2289874	REPORT-55060 数据集预览支持复制	3 years ago
方磊	ab3a2b7f77	Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~fanglei/design10.0 into feature/10.0 ... * 'feature/10.0' of ssh://code.fineres.com:7999/~fanglei/design10.0: REPORT-55072 设计器内文件选择器替换为原生的 REPORT-55072 设计器内文件选择器替换为原生的 REPORT-55072 设计器内文件选择器替换为原生的 CHART-20134 图表接口判断增加对新接口的判断 KERNEL-8304 连接池逻辑重构 KERNEL-8608 解决控件组件在创建组件过程中丢失配置的问题 REPORT-56010 【组件背景分离】组件复用-组件不显示 标题，设置边框后设计期内边框不显示 REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效 设计器外双击模板打开，设计器内会额外打开一个空白的cpt REPORT-55839 组件复用-禁用tab块的自定义图片边框入口，预期是只面向图表块与报表块 REPORT-55757 【组件背景分离】组件复用-标题图案预览图，悬浮时出现的遮罩和删除图标，鼠标如果从左边/上边滑出，则删除图标消失；但从右边/下边滑出，删除图标还在 REPORT-55757 【组件背景分离】组件复用-标题图案预览图，悬浮时出现的遮罩和删除图标，鼠标如果从左边/上边滑出，则删除图标消失；但从右边/下边滑出，删除图标还在 REPORT-55757 【组件背景分离】组件复用-标题图案预览图，悬浮时出现的遮罩和删除图标，鼠标如果从左边/上边滑出，则删除图标消失；但从右边/下边滑出，删除图标还在 REPORT-55091 只有一个非超管用户的目录文件无法另存或新建	3 years ago
方磊	2331aa149e	REPORT-54885 【10.0.19】FRM布局推荐之布局优化部分	3 years ago
ju|剧浩宇	56c8931a70	Pull request #5240: REPORT-55072 设计器内文件选择器替换为原生的 ... Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0 * commit '468b6600e872e10b1604618a9edbf2469d9afcf4': REPORT-55072 设计器内文件选择器替换为原生的 REPORT-55072 设计器内文件选择器替换为原生的 REPORT-55072 设计器内文件选择器替换为原生的	3 years ago
superman	279d472fb6	Merge pull request #5248 in DESIGN/design from release/11.0 to feature/x ... * commit '0d15e520fd19e9060685acb32aee440b83b41b56': KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中	3 years ago
loy	0d15e520fd	Pull request #5241: KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中 ... Merge in DESIGN/design from ~LOY/design:release/11.0 to release/11.0 * commit '808783b8b502fb6b965efad61046e7e025ff4616': KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中	3 years ago
loy	808783b8b5	KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中	3 years ago
Henry.Wang	468b6600e8	REPORT-55072 设计器内文件选择器替换为原生的	3 years ago
Henry.Wang	623edcaf91	REPORT-55072 设计器内文件选择器替换为原生的	3 years ago
Henry.Wang	1e8a3098cb	REPORT-55072 设计器内文件选择器替换为原生的	3 years ago
superman	a2fbd07e62	Merge pull request #5207 in DESIGN/design from feature/10.0 to feature/big-screen ... * commit '486c70356eb961c5fef32b7775db0ecee3cfadfe': CHART-20134 图表接口判断增加对新接口的判断 KERNEL-8304 连接池逻辑重构	3 years ago
superman	a1d1b53e1c	Merge pull request #5206 in DESIGN/design from release/11.0 to feature/x ... * commit '284b6e92fbf1f2c538cae50f466f91b58231e7f2': CHART-20134 图表接口判断增加对新接口的判断 KERNEL-8304 连接池逻辑重构	3 years ago
superman	284b6e92fb	Merge pull request #5205 in DESIGN/design from feature/10.0 to release/11.0 ... * commit '486c70356eb961c5fef32b7775db0ecee3cfadfe': CHART-20134 图表接口判断增加对新接口的判断 KERNEL-8304 连接池逻辑重构	3 years ago
Bjorn	486c70356e	Pull request #5199: CHART-20134 图表接口判断增加对新接口的判断 ... Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0 * commit '3383679b7c13d09a99b5018bed60299bba55849d': CHART-20134 图表接口判断增加对新接口的判断	3 years ago
白岳	3383679b7c	CHART-20134 图表接口判断增加对新接口的判断	3 years ago
Xiqiu	b78513d6cb	Pull request #5165: KERNEL-8304 连接池逻辑重构 ... Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0 * commit '95eb275a6cefaf9c96a2fe9ab7d97259eb9d039a': KERNEL-8304 连接池逻辑重构	3 years ago