Tree: 3bab59843a

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 '3bab59843a'

${ noResults }

Commit Graph

16789 Commits (3bab59843af0182ffbfbc7fd2b7970f8d48ff43e)

 

All Branches   

Search

Author	SHA1	Message	Date
superman	c60528cff2	Merge pull request #7006 in DESIGN/design from final/10.0 to persist/10.0 ... * commit 'b5ae394a59595d62ef2acfd102773d84b0a55f2e':	3 years ago
superman	e99eb7e160	Merge pull request #7005 in DESIGN/design from final/11.0 to persist/11.0 ... * commit '5c79b710d270d8bf0409ac2b22765b59b50594a7': REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉 CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色	3 years ago
fanglei	93e04b27fc	Pull request #7004: REPORT-63092 组件复用-拖入带数据集的复用组件，删除设计画布中的组件后，数据集没有被删除 ... Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0 * commit '69ed61a95692120a21f786ce5c837cb4730ba374': REPORT-63092 组件复用-拖入带数据集的复用组件，删除设计画布中的组件后，数据集没有被删除	3 years ago
方磊	69ed61a956	Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design into release/10.0 ... * 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design: REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后，自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置 CHART-22038 决策报表，安装ECharts后，图表块插入图表区域不显示echarts的图标 REPORT-63305 设计器获取父容器，需要对拓展的布局插件兼容处理下	3 years ago
方磊	dceeb24569	REPORT-63092 组件复用-拖入带数据集的复用组件，删除设计画布中的组件后，数据集没有被删除	3 years ago
fanglei	5c79b710d2	Pull request #7003: REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉 ... Merge in DESIGN/design from ~FANGLEI/design:final/11.0 to final/11.0 * commit 'f7b1fd6f1945bb6f55ab23f3a83ae2e61d4d6cd0': REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉	3 years ago
fanglei	1644f79c97	Pull request #6991: REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉 ... Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit 'f0e6bc120b0ab04a5f206ed7a827a676d5ba91be': REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉	3 years ago
方磊	f7b1fd6f19	REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉	3 years ago
superman	fa62be832b	Merge pull request #7002 in DESIGN/design from release/11.0 to feature/x ... * commit 'd58018f922fc036e0f49fe5ef24fec46a5ba3fd6': REPORT-63675 REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化	3 years ago
Tommy	fa6eb6a145	Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.0	3 years ago
Tommy	6c1cd3471f	REPORT-62743 服务器启动模态框位置异常	3 years ago
fanglei	d58018f922	Pull request #6989: REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化 ... Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit 'ea39f1b4473c4659c7578b0bd79dd610ce2a98b9': REPORT-63675 REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化	3 years ago
方磊	f0e6bc120b	REPORT-63729 填报-控件-控件数据字典设置显示值为公式时，公式界面关几次才关得掉	3 years ago
Starryi	84b3103890	REPORT-60161 【组件背景分离】设置九点图的线在边界上后，其他操作回来发现恢复成默认井字型 ... 【问题原因】 点九图边界线值为0也是有效值 【改动思路	3 years ago
Starryi	6621921d0d	REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图，如果线重叠了的话，web端显示有问题 ... 【问题原因】 点九图小而组件大，且中间不可缩放的尺寸为0时，就会出现空白。从点九图的 使用机制上看无法避免上上述情况，需要在生成点九图的时候，强制中间缩放 区域的尺寸最小为1才行，即两条平行线之间的最小间距为1. 【改动思路】 同上	3 years ago
方磊	ea39f1b447	REPORT-63675	3 years ago
方磊	401a9a8de3	REPORT-63675 自动构建的下拉树数据字典点击后数据集字段会变化	3 years ago
fanglei	dd1aa8a8ba	Pull request #6978: CHART-22039 设计器增加自动的逻辑 ... Merge in DESIGN/design from ~FANGLEI/design:feature/x to feature/x * commit '4619bec0de9ea0c1c44acd85f3d94520b4377629': CHART-22039 设计器增加自动的逻辑	3 years ago
starryi	5e73cad221	Pull request #6961: REPORT-62689 主题编辑的边框配置完善 ... Merge in DESIGN/design from ~STARRYI/design:REPORT-62689/feature/x to feature/x * commit '0113bf2e89ab9aa2095337b201a4dfa9ed509271': REPORT-62689 主题编辑的边框配置完善	3 years ago
superman	deee9c29fb	Merge pull request #6988 in DESIGN/design from release/11.0 to feature/x ... * commit '09d02ba5723eb610d1cf98c7cb2dbf8798e122f7': 无JIRA任务 处理合并后冲突	3 years ago
方磊	4619bec0de	CHART-22039 设计器增加自动的逻辑	3 years ago
ju|剧浩宇	09d02ba572	Pull request #6977: 无JIRA任务 处理合并后冲突 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit 'f583dd99584d785393aae3a3aee7b9db6b94868f': 无JIRA任务 处理合并后冲突	3 years ago
Starryi	f583dd9958	无JIRA任务 处理合并后冲突 ... bugfix/10.0和feature/x修复了两个不同但 原因一致的bug，分别独立提交，导致 release/10.0自动合并到release/11.0时， 该文件内代码出现重复。 需要删除合并进来的重复的代码	3 years ago
superman	daa03c8561	Merge pull request #6976 in DESIGN/design from release/11.0 to feature/x ... * commit 'f9f5997fc165278666f3e60f4f4172338528ee9b': CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色 REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑 REPORT-63524 【组件可更新提醒】组件复用-埋点，现在设计器端弹出可更新弹窗时没有触发埋点记录 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填 REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后，自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置	3 years ago
superman	f9f5997fc1	Merge pull request #6975 in DESIGN/design from final/11.0 to release/11.0 ... * commit 'ef026e964fb09db867b206a1ad1a736ab412235a': CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色 REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑 REPORT-63524 【组件可更新提醒】组件复用-埋点，现在设计器端弹出可更新弹窗时没有触发埋点记录 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填	3 years ago
superman	ef026e964f	Merge pull request #6974 in DESIGN/design from persist/11.0 to final/11.0 ... * commit '4049aa887c6175a7b0903738e52c6e36033dd8c8':	3 years ago
superman	ac7a0078d5	Merge pull request #6970 in DESIGN/design from release/10.0 to release/11.0 ... * commit '22d1824127fe2296171820d6feb24bf133f1833d': REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后，自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置	3 years ago
superman	bd533afa9b	Merge pull request #6965 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '22d1824127fe2296171820d6feb24bf133f1833d':	3 years ago
zheng	32b52cab30	Pull request #6962: CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色 ... Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to final/11.0 * commit '6775e1b88230c37a98bd265b6a7d9dbe9553d026': CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色	3 years ago
shine	6775e1b882	Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0	3 years ago
shine	922fa090ad	CHART-22060 fix:fvs.cpt.chart 渲染使用的默认配色和配置界面默认不同 同fvs.chart指定配色	3 years ago
superman	4049aa887c	Merge pull request #6960 in DESIGN/design from final/11.0 to persist/11.0 ... * commit '857bc45f43fdd8b686202eb260f2d0a97961a1ec': (152 commits) REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑 REPORT-63524 【组件可更新提醒】组件复用-埋点，现在设计器端弹出可更新弹窗时没有触发埋点记录 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填 REPORT-63311【接触点优化】轮播期间切换组件设置页面，轮播停住了 REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据 CHART-22060 fix:fvs图表第一个不是跟随主题default 是normal REPORT-63308【接触点优化】轮播期间在组件上右键的交互问题 REPORT-62175 && REPORT-63204 1.埋点适配 2.针对sum(1,)等此类公式进行合法性判断 CHART-22038 决策报表，安装ECharts后，图表块插入图表区域不显示echarts的图标 REPORT-63305 设计器获取父容器，需要对拓展的布局插件兼容处理下 REPORT-63196 && REPORT-63186 1.在双击之后使搜索框消失； 2.模拟计算在计算错误的时候提示计算异常 REPORT-62672【接触点优化】部分埋点无法模拟对应埋点数据 REPORT-63250 组件可更新视觉验收 REPORT-63190【接触点优化】轮播过程中切换组件包，再回来发现显示有问题 REPORT-63194 【组件可更新提醒】组件复用-适配设计器字段输入框输入时会出现字符消失的情况 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填 REPORT-63102 公式编辑器优化，多行函数错误返回值异常 1.定制一个没有newline的frformulalexer REPORT-62477 组件复用-10设计器在线组件预期不能看到11组件 REPORT-62808 公式编辑器优化，辅助框内选择函数后，函数名没有正确跳转 1.修复单击实现偶然失效的bug； 2.修复上下键不生效的bug。 ...	3 years ago
Starryi	0113bf2e89	REPORT-62689 主题编辑的边框配置完善 ... 【问题原因】 实现主题单元格样式支持内边框配置 【改动思路】 同上	3 years ago
starryi	bec217b675	Pull request #6957: REPORT-63322 决策报表及聚合报表，无法拖动组件 ... Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit '99762bf62231dc01547e9481f870db8ac833393a': REPORT-63322 决策报表及聚合报表，无法拖动组件	3 years ago
starryi	fbf5178447	Pull request #6945: REPORT-62691 & REPORT-63322 ... Merge in DESIGN/design from ~STARRYI/design:bugfix/10.0 to bugfix/10.0 * commit 'afe4c1e5b59c02838ee3ca871eb5ee6b9ca84fa6': REPORT-63322 决策报表及聚合报表，无法拖动组件 REPORT-62691 11.0版本产出的组件，在10.0下正常安装，但复用时模板保存失败	3 years ago
starryi	857bc45f43	Pull request #6944: REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填 ... Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0 * commit '6f797af38e5dbc2aaf20b8d3e160258043cefdaf': REPORT-63524 【组件可更新提醒】组件复用-埋点，现在设计器端弹出可更新弹窗时没有触发埋点记录 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填	3 years ago
Hoky.He	9e03927238	Pull request #6959: REPORT-60163 公式编辑器优化2.0 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:final/11.0 to final/11.0 * commit '0aa8d2dc39a1040c7c19599a0b4e8c51df1f6727': REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填	3 years ago
Hoky.He	0aa8d2dc39	Pull request #1: Release/11.0 ... Merge in ~HOKY.HE/design-hoky from release/11.0 to final/11.0 * commit 'f6247b4f040f91488de70c20ccae7f7362321018': REPORT-60163 公式编辑器优化2.0 1.优化错误提示 2.修改埋点逻辑 REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填	3 years ago
Hoky	f6247b4f04	Merge remote-tracking branch 'origin/release/11.0' into release/11.0	3 years ago
Hoky	5a407a4491	REPORT-60163 公式编辑器优化2.0 ... 1.优化错误提示 2.修改埋点逻辑	3 years ago
Starryi	afe4c1e5b5	REPORT-63322 决策报表及聚合报表，无法拖动组件 ... 【问题原因】 在某些场景下，组件可能会被破坏或无法被当前设计器解析，从而出现 异常。若拖拽时的异常不被处理，会导致无法完成整个swing拖拽过程， 从而影响后续其他所有的组件拖拽。 【改动思路】 同产品以及交互讨论，新增了一个错误提示信息，当拖拽组件出现 异常时，提示用户，同时终结当前的拖拽。	3 years ago
superman	40d97ffe0c	Merge pull request #6956 in DESIGN/design from release/11.0 to feature/x ... * commit '231788f2466df7a7871967bc7d5cdd7412147b17': REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填	3 years ago
Starryi	99762bf622	REPORT-63322 决策报表及聚合报表，无法拖动组件 ... 【问题原因】 在某些场景下，组件可能会被破坏或无法被当前设计器解析，从而出现 异常。若拖拽时的异常不被处理，会导致无法完成整个swing拖拽过程， 从而影响后续其他所有的组件拖拽。 【改动思路】 同产品以及交互讨论，新增了一个错误提示信息，当拖拽组件出现 异常时，提示用户，同时终结当前的拖拽。	3 years ago
superman	22d1824127	Merge pull request #6946 in DESIGN/design from feature/10.0 to release/10.0 ... * commit '18ca498021f3533d538491f9f223f2ff10903d6a': REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后，自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置	3 years ago
Starryi	0ce53a60b4	REPORT-62691 11.0版本产出的组件，在10.0下正常安装，但复用时模板保存失败 ... 【问题原因】 10.0设计器上对组件版本进行检测，并限制使用不兼容的组件 【改动思路】 同上	3 years ago
Starryi	6f797af38e	REPORT-63524 【组件可更新提醒】组件复用-埋点，现在设计器端弹出可更新弹窗时没有触发埋点记录 ... 【问题原因】 将响应获取组件更新信息结果的动作抽离出来 【改动思路】 同上	3 years ago
Starryi	18d681ac36	REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填 ... 【问题原因】 监听下必填项设置：组件分类 【改动思路】 同上	3 years ago
starryi	231788f246	Pull request #6902: REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填 ... Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0 * commit 'cc7e2b8fdb49c324f0d06c1dfcadedc123fae67f': REPORT-63192 【组件可更新提醒】组件复用-设计器端生成组件弹窗的类型改为必填	3 years ago
fanglei	01943b232b	Pull request #6901: REPORT-62439 国际化-屏蔽海外设计器内登录入口 ... Merge in DESIGN/design from ~FANGLEI/design:feature/x to feature/x * commit '76430cddae7f9d578acf572c3a2a05ed29d0a104': CHART-22040 设计器增加排序的按钮 REPORT-62439 还原 REPORT-62439 国际化-屏蔽海外设计器内登录入口	3 years ago
superman	8faab392d9	Merge pull request #6923 in DESIGN/design from release/11.0 to feature/x ... * commit '381af631573eeb4a45b7890d124cb0c5908cd9cc':	3 years ago