Tree: 99d3def5be

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 '99d3def5be'

${ noResults }

Commit Graph

15171 Commits (99d3def5be0c07bb4d8cba03f2c6f25c92ed9c28)

 

All Branches   

Search

Author	SHA1	Message	Date
xiqiu	27b2c177b0	REPORT-53615 调整下combox的展示顺序	3 years ago
kerry	fe1665cfd5	Pull request #5406: REPORT-56548 主题切换-主题色 ... Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x * commit '6f38809306f5c74529ee067a80acdf19a5e389fa': REPORT-56548 主题切换-主题色	3 years ago
Hoky.He	175063ba89	Pull request #5382: REPORT-54887 公式编辑器优化一期 ... Merge in DESIGN/design from ~HOKY.HE/design-hoky:feature/x to feature/x * commit 'b24ab29cd62d587fe00af701b358340424a71dff': REPORT-54887 公式编辑器优化一期 1.国际化； 2.修改一些提示逻辑。 REPORT-54887 公式编辑器优化一期 1.修改一些规范； 2.补充condition逻辑 REPORT-54887 公式编辑器优化一期 1.添加了公式的参数个数和参数类型的校验； 2.添加了实时计算的功能。	3 years ago
Heyman	d5cd331596	MOBILE-32704 11.0部分插件内置	3 years ago
fanglei	1b0436191e	Pull request #5410: REPORT-57317 修改间距提示文字的大小 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit '5b524fefbd317b63c60890434898ef71d97c8e9e': REPORT-57317 修改间距提示文字的大小	3 years ago
starryi	b3be611504	Pull request #5378: REPORT-51919 主题切换 ... Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit '14fb652f1263dd7e2196b3e7832c58d697ef3e21': REPORT-51919 主题切换	3 years ago
方磊	5b524fefbd	REPORT-57317 修改间距提示文字的大小	3 years ago
Xiqiu	2e960b9762	Pull request #5404: REPORT-55468 内置启动时打开空文件 ... Merge in DESIGN/design from ~XIQIU/design:release/11.0 to release/11.0 * commit '621aa0b143a59f4b3b4c4996c1e1885283626554': REPORT-55468 内置启动时打开空文件	3 years ago
fanglei	48a1f1487e	Pull request #5409: REPORT-57333 还原代码 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit '2589d26e3cacefad175150200e615c15823315e8': REPORT-57333 还原代码	3 years ago
方磊	2589d26e3c	REPORT-57333 还原代码	3 years ago
Hades	5d9bca3161	Pull request #5392: REPORT-56049 组件复用-组件目录树选中控件，如果选中后不移动鼠标的话，控件没有出现工具栏 ... Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0 * commit '52d9dfdf35449753a4e3f2f83a69408545264007': REPORT-56049 组件复用-组件目录树选中控件，如果选中后不移动鼠标的话，控件没有出现工具栏	3 years ago
loy	92c0050a80	Pull request #5403: REPORT-57251 修复设计器无法打开环境之外cptx的问题 ... Merge in DESIGN/design from ~LOY/design:release/11.0 to release/11.0 * commit '6c4cb1c89b5d3774d10366cd880a1be1dbf6e438': REPORT-57251 修复设计器无法打开环境之外cptx的问题	3 years ago
superman	4971b9e5cf	Merge pull request #5408 in DESIGN/design from final/10.0 to persist/10.0 ... * commit '81574ad360d11ba9f0c84712a9fa9e3ec3cf2615':	3 years ago
Starryi	14fb652f12	REPORT-51919 主题切换 ... 【问题原因】 新增模版主题功能 【改动思路】 同上	3 years ago
fanglei	82afebccf9	Pull request #5407: REPORT-57181 【FRM布局推荐】组件复用-自动间距目前么有把小数处理成整数 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit '2018937ad70336f88d8efda4b55afc1570e325c2': REPORT-57181 【FRM布局推荐】组件复用-自动间距目前么有把小数处理成整数	3 years ago
方磊	2018937ad7	REPORT-57181 【FRM布局推荐】组件复用-自动间距目前么有把小数处理成整数	3 years ago
kerry	6f38809306	REPORT-56548 主题切换-主题色	3 years ago
fanglei	008392d2a0	Pull request #5405: REPORT-57333 【FRM布局推荐】组件复用-现在还不能实现绝对画布块上重叠放置组件 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit 'e77b612aa7af2156c0cae01dd0836deb20ae13a5': REPORT-57333 【FRM布局推荐】组件复用-现在还不能实现绝对画布块上重叠放置组件	3 years ago
方磊	e77b612aa7	REPORT-57333 【FRM布局推荐】组件复用-现在还不能实现绝对画布块上重叠放置组件	3 years ago
xiqiu	621aa0b143	REPORT-55468 内置启动时打开空文件	3 years ago
fanglei	946db2fdd3	Pull request #5402: REPORT-56895 还是计算间距线相对位置的问题 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit '69bfee3359ca16974c8c82b9a2b68cd881ad4abe': REPORT-56895 还是计算间距线相对位置的问题	3 years ago
Hoky	b24ab29cd6	REPORT-54887 公式编辑器优化一期 ... 1.国际化； 2.修改一些提示逻辑。	3 years ago
loy	6c4cb1c89b	REPORT-57251 修复设计器无法打开环境之外cptx的问题	3 years ago
方磊	69bfee3359	REPORT-56895 还是计算间距线相对位置的问题	3 years ago
fanglei	cd2e849824	Pull request #5393: REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit '768b74b87b32dfeff62658b2f5307c76a7f537b0': REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题	3 years ago
superman	0ae9827a9a	Merge pull request #5401 in DESIGN/design from feature/10.0 to feature/big-screen ... * commit 'fba20ae59545fb5d8e14bb9eb7961eed052f0809': REPORT-57238 解决自动间距计算不正确的问题 REPORT-55756 设计器界面移动时，工具栏保持停留原位置，没有随着移动，这个看下要不要优化下。鼠标再回到设计画布就好了	3 years ago
方磊	768b74b87b	REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题	3 years ago
fanglei	fba20ae595	Pull request #5391: REPORT-57238 解决自动间距计算不正确的问题 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit 'ff116685b16d6d906840c777c04a7b5d250934ba': REPORT-57238 解决自动间距计算不正确的问题	3 years ago
hades	52d9dfdf35	REPORT-56049 组件复用-组件目录树选中控件，如果选中后不移动鼠标的话，控件没有出现工具栏	3 years ago
方磊	ff116685b1	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-55756 设计器界面移动时，工具栏保持停留原位置，没有随着移动，这个看下要不要优化下。鼠标再回到设计画布就好了 REPORT-56532 文件选择器弹窗 && REPORT-56683 文件选择器弹窗-图片压缩功能入口迁移的初次提示问题	3 years ago
方磊	842f4c621e	REPORT-57238 解决自动间距计算不正确的问题	3 years ago
Hades	829fa083f5	Pull request #5379: REPORT-55756 设计器界面移动时，工具栏保持停留原位置，没有随着移动，这个看下要不要优化下。鼠标再回到设计画布就好了 ... Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0 * commit '42f24c5bcf1f09c2421cad431eac7d087bb396b6': REPORT-55756 设计器界面移动时，工具栏保持停留原位置，没有随着移动，这个看下要不要优化下。鼠标再回到设计画布就好了	3 years ago
Hoky	508d9d7cfb	REPORT-54887 公式编辑器优化一期 ... 1.修改一些规范； 2.补充condition逻辑	3 years ago
superman	913c8e5bed	Merge pull request #5390 in DESIGN/design from feature/10.0 to feature/big-screen ... * commit '7dc14fe8c559d2b9bbf4b28ae5f356db09bcc83d': REPORT-57326&EPORT-57324&REPORT-57330&REPORT-56895 布局推荐若干间距线的bug REPORT-56925 【FRM布局推荐】组件复用-手动间距输入框没有显示水印 REPORT-56532 文件选择器弹窗 && REPORT-56683 文件选择器弹窗-图片压缩功能入口迁移的初次提示问题 REPORT-56926 【FRM布局推荐】组件复用-手动间距目前不支持输入小数（允许输入小数，但自动取整处理） REPORT-57233 修正本地调试的修改 REPORT-57233 【FRM布局推荐】组件复用-对齐、自动间距、手动间距，调整后没有触发模板的保存和还原按钮，导致关闭再打开此模板还是调整前的效果 REPORT-57057 远程设计报错规范-启动远程状态下的设计器时，报错弹窗被 切换工作目录的弹窗覆盖 REPORT-53615 调整代码格式 REPORT-53615 驱动管理的设计器适配 KERNEL-7634 jxbrowser 小版本再升级下 REPORT-56929 【FRM布局推荐】组件复用-手动间距输入框目前不支持回车触发生效 CHART-20229 图表控件修改 REPORT-56906 由于UIIntNumberField被引用的地方太多了，所以还原这个类的重命名 REPORT-56134js提交事件报错中添加定位信息 REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时，顶部工具栏被底部工具栏覆盖 REPORT-56595 数据集预览时可复制-表头复制问题 REPORT-56906&REPORT-56926 修正一个笔误 REPORT-56906&REPORT-56926 自定义一个输入框，只支持输入整数	3 years ago
superman	677ae1a706	Merge pull request #5389 in DESIGN/design from release/11.0 to feature/x ... * commit 'f0b2070a45c0522c75f5436b0897ea5cf5984bf4': REPORT-56686 远程设计权限管理看不到cptx 加上.后缀 REPORT-56686 远程设计权限管理看不到cptx 撤销 REPORT-57147 设计器模版默认预览方式不生效 REPORT-57209 共享数据集显示配置兼容 REPORT-51472 平台开启的模版读不到状态的问题 REPORT-56128【开发者预览支持调整模板布局】新自适应-设计画布里拖拽调整组件A大小，挤压绝对画布块，绝对画布块内组件会保持尺寸不变且超出绝对画布块；但开发者调试下，此场景，绝对画布块内组件尺寸适应区域调整。这里要不要统一一下效果啊@kerry REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时，顶部工具栏被底部工具栏覆盖	3 years ago
superman	f0b2070a45	Merge pull request #5388 in DESIGN/design from release/10.0 to release/11.0 ... * commit '8ae02ad6f95dfe5ffa6b687ba461e79d843b39fb':	3 years ago
superman	7dc14fe8c5	Merge pull request #5386 in DESIGN/design from bugfix/10.0 to feature/10.0 ... * commit '03ae05f97df139aba03a3bd14bd0f68510ef0c2a':	3 years ago
superman	03ae05f97d	Merge pull request #5385 in DESIGN/design from release/10.0 to bugfix/10.0 ... * commit '8ae02ad6f95dfe5ffa6b687ba461e79d843b39fb':	3 years ago
superman	8ae02ad6f9	Merge pull request #5384 in DESIGN/design from final/10.0 to release/10.0 ... * commit '81574ad360d11ba9f0c84712a9fa9e3ec3cf2615':	3 years ago
superman	81574ad360	Merge pull request #5383 in DESIGN/design from persist/10.0 to final/10.0 ... * commit 'fdb9cacf4e256fc3f227749ab3616bb89b26c573':	3 years ago
fanglei	53d6eb1a16	Pull request #5381: REPORT-57326&REPORT-57324&REPORT-57330&REPORT-56895 布局推荐若干间距线的bug ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit 'ea2a93476e2fc297c30f8d5f000b4b26fd384e65': REPORT-57326&EPORT-57324&REPORT-57330&REPORT-56895 布局推荐若干间距线的bug	3 years ago
方磊	ea2a93476e	REPORT-57326&EPORT-57324&REPORT-57330&REPORT-56895 布局推荐若干间距线的bug	3 years ago
Hoky	da7f1638ae	REPORT-54887 公式编辑器优化一期 ... 1.添加了公式的参数个数和参数类型的校验； 2.添加了实时计算的功能。	3 years ago
Hoky	9209ecf0e8	Merge remote-tracking branch 'origin/release/11.0' into release/11.0	3 years ago
Hoky	4df79d29b2	REPORT-54887 公式编辑器优化一期 ... 1.添加了公式的参数个数和参数类型的校验； 2.添加了实时计算的功能。	3 years ago
fanglei	3c311a0237	Pull request #5380: REPORT-56925 【FRM布局推荐】组件复用-手动间距输入框没有显示水印 ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit 'bccc08590de08ae3b4f386c52b93cafaca6e33e0': REPORT-56925 【FRM布局推荐】组件复用-手动间距输入框没有显示水印	3 years ago
方磊	bccc08590d	REPORT-56925 【FRM布局推荐】组件复用-手动间距输入框没有显示水印	3 years ago
hades	42f24c5bcf	REPORT-55756 设计器界面移动时，工具栏保持停留原位置，没有随着移动，这个看下要不要优化下。鼠标再回到设计画布就好了	3 years ago
fanglei	40db5f77ee	Pull request #5376: REPORT-56926 【FRM布局推荐】组件复用-手动间距目前不支持输入小数（允许输入小数，但自动取整处理） ... Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0 * commit '92825af427883c4e7b7e84c67ce37741d25a4f70': REPORT-56926 【FRM布局推荐】组件复用-手动间距目前不支持输入小数（允许输入小数，但自动取整处理）	3 years ago
Henry.Wang	6ff19e4696	Pull request #5377: REPORT-56532 文件选择器弹窗 && REPORT-56683 文件选择器弹窗-图片压缩功能入口迁移的初次提示问题 ... Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0 * commit '2502b232a93886df2b1c96387a4ae48786a54099': REPORT-56532 文件选择器弹窗 && REPORT-56683 文件选择器弹窗-图片压缩功能入口迁移的初次提示问题	3 years ago