design

Commit Graph

Author	SHA1	Message	Date
kerry	8f733e588b	Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x	3 years ago
kerry	bb391c1135	REPORT-62424 【模板主题】见附件截图，windows的主题配置中的整体预览图显示有点问题	3 years ago
Xiqiu	1377e8a639	Pull request #7079 : REPORT-62735 连接池配置优化 Merge in DESIGN/design from ~XIQIU/design:feature/x to feature/x * commit '8dbfeaf0c7c851de680b8781524ec86a493bf69d': REPORT-62735 连接池配置优化	3 years ago
fanglei	80c3ea2388	Pull request #7080 : CHART-22039 为图表标签字体颜色按钮新增自动选项 Merge in DESIGN/design from ~FANGLEI/design:feature/x to feature/x * commit 'ce085cedd58d847785427d840ad2243e73ab24e1': CHART-22039 为图表标签字体颜色按钮新增自动选项	3 years ago
方磊	ce085cedd5	CHART-22039 为图表标签字体颜色按钮新增自动选项	3 years ago
xiqiu	8dbfeaf0c7	REPORT-62735 连接池配置优化	3 years ago
Hades	fb3f6b9ff6	Pull request #7073 : REPORT-62438 远程模板锁定优化改一个交互细节 Merge in DESIGN/design from ~HADES/design:feature/x to feature/x * commit 'b0112cb1303ee82caa65e87fea494b975da0d532': REPORT-62438 远程模板锁定优化改一个交互细节	3 years ago
superman	cdc9a2f8b0	Merge pull request #7072 in DESIGN/design from release/11.0 to feature/x * commit '0fb21350d9f6aef10d2eaf8e0e5e79f393efb380': REPORT-62804 设计器工具栏的链接改动(社区url改动需求) REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
hades	b0112cb130	REPORT-62438 远程模板锁定优化改一个交互细节	3 years ago
Hades	fc34f7f16a	Pull request #7058 : REPORT-62438 远程模板锁定优化 Merge in DESIGN/design from ~HADES/design:feature/x to feature/x * commit '81a4154c7cf173b66b00d7e879081191180bf023': REPORT-62438 远程模板锁定优化修复门槛测试用例的bug REPORT-62438 远程模板锁定优化更新部分业务逻辑 REPORT-62438 远程模板锁定优化更新下国际化和一个展示相关业务逻辑 REPORT-62438 远程模板锁定优化	3 years ago
superman	0fb21350d9	Merge pull request #7064 in DESIGN/design from release/10.0 to release/11.0 * commit '39cd7f04342a3f900f3fb67643d4eb13a87f55d5':	3 years ago
hades	81a4154c7c	REPORT-62438 远程模板锁定优化修复门槛测试用例的bug	3 years ago
ju\|剧浩宇	90c23893ff	Pull request #7066 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求) Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit '9c49620859f0c9cbf2f30b503e780092f77180a0': REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
方磊	9c49620859	Merge branch 'release/10.0' into release/11.0 * release/10.0: REPORT-62804 设计器工具栏的链接改动(社区url改动需求) # Conflicts: # designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java	3 years ago
starryi	8a1542c808	Pull request #7045 : REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项 Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit '9abcb9db6d2bb308c7c1922cf234af1ad49dc356': REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项	3 years ago
Fly.Li	1e027ca039	Pull request #7060 : REPORT-55240:修改一下设计器关于报表引擎的设置界面 Merge in DESIGN/design from ~FLY.LI/design:feature/x to feature/x * commit '30748629ae0ff4a7cfad07e0d090bfc669c81062': REPORT-55240:修改一下设计器关于报表引擎的设置界面	3 years ago
hades	b2fce2875d	REPORT-62438 远程模板锁定优化更新部分业务逻辑	3 years ago
hades	42c68b1832	REPORT-62438 远程模板锁定优化更新下国际化和一个展示相关业务逻辑	3 years ago
fanglei	39cd7f0434	Pull request #7056 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求) Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0 * commit '123b0ce7e144e9952abf6aac425c657f9fafc70e': REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
fanglei	c5d3fc981a	Pull request #7057 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求) Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit 'e691b1a8ac5e9733ca4bc2a8b9521f9aade23507': REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
hades	d8650de421	REPORT-62438 远程模板锁定优化	3 years ago
方磊	e691b1a8ac	REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
方磊	123b0ce7e1	REPORT-62804 设计器工具栏的链接改动(社区url改动需求)	3 years ago
superman	dd1cc91c1a	Merge pull request #7055 in DESIGN/design from release/11.0 to feature/x * commit '8d837c1be641355b6d7003a6030c4f39860039d4': REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置	3 years ago
superman	8d837c1be6	Merge pull request #7049 in DESIGN/design from release/10.0 to release/11.0 * commit '861c84c4aec091b57e850d89fbf73a1dbd4e133d': REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置	3 years ago
Starryi	9abcb9db6d	REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项【问题原因】格式设置项从样式中分离出来后，数据列的弹窗中需要增加格式设置【改动思路】同上	3 years ago
fanglei	861c84c4ae	Pull request #7032 : REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置 Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0 * commit 'a0798b48218e0f93de6a42859ff3504c4e22d5ce': REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置	3 years ago
Hades	e658b38a8b	Pull request #7030 : REPORT-62882 websocket攻坚落地（远程设计适配） Merge in DESIGN/design from ~HADES/design:feature/x to feature/x * commit '596486c056cf80434832ea98532658dcdd6158b8': REPORT-62882 websocket攻坚落地（远程设计适配）	3 years ago
starryi	f86beb794c	Pull request #7028 : REPORT-63760 【主题切换】撤销以后，样式设置有问题 Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit 'fafd3b57bd8294525a4310c7b90ba0ba1c2ed789': REPORT-63760 【主题切换】撤销以后，样式设置有问题 REPORT-63760 【主题切换】撤销以后，样式设置有问题	3 years ago
superman	944f30b51c	Merge pull request #7044 in DESIGN/design from release/11.0 to feature/x * commit 'c3f92ba83877ae5a2e53af8416e4f32e2006e69e': REPORT-63092 漏传了import语句 REPORT-63499 REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题 update CHART-21584 feat:fvs.chart.font 单位px 范围6-200 REPORT-62743 服务器启动模态框位置异常	3 years ago
superman	c3f92ba838	Merge pull request #7043 in DESIGN/design from final/11.0 to release/11.0 * commit 'fbe67c0078e40d21dc66f6bd228371c8abe2be4e':	3 years ago
superman	fbe67c0078	Merge pull request #7042 in DESIGN/design from persist/11.0 to final/11.0 * commit 'fa53222ff9d5a23d6fc99f0df0144ca10d324d72':	3 years ago
ju\|剧浩宇	fe7868a7a0	Pull request #7038 : 无JIRA 代码合并 Merge in DESIGN/design from ~EASON/design:release/11.0 to release/11.0 * commit '0497bd25f5fb74eacca507ac66ac7ecf02f6e57c': REPORT-63092 漏传了import语句 REPORT-63499 REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题 update CHART-21584 feat:fvs.chart.font 单位px 范围6-200	3 years ago
eason	0497bd25f5	conflict resolve	3 years ago
方磊	a0798b4821	REPORT-63106 决策报表-两个组件选中时拖拽到其他位置，然后点击对齐任意一个，两个组件会跳回刚才的位置	3 years ago
superman	fa53222ff9	Merge pull request #7031 in DESIGN/design from final/11.0 to persist/11.0 * commit '7b3aafba5ec2389cf15bbd0971697ee6a440e090':	3 years ago
fanglei	13f832ef78	Pull request #7029 : REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题 Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0 * commit 'ca2fcb358e038e9564ac0f5edc6aad48c554316d': REPORT-63092 漏传了import语句 REPORT-63499 REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题	3 years ago
方磊	ca2fcb358e	REPORT-63092 漏传了import语句	3 years ago
方磊	72b7bdacae	REPORT-63499	3 years ago
hades	596486c056	REPORT-62882 websocket攻坚落地（远程设计适配）	3 years ago
方磊	c19bb8edeb	REPORT-63499 按钮控件树节点配置控件事件，设计器上显示有问题	3 years ago
zheng	11bdd55efc	Pull request #7027 : CHART-21584 feat:fvs.chart.font 单位px 范围6-200 Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0 * commit 'adf49bfded20a12f7fc261119314b1fc582069f4': update CHART-21584 feat:fvs.chart.font 单位px 范围6-200	3 years ago
Starryi	fafd3b57bd	REPORT-63760 【主题切换】撤销以后，样式设置有问题【问题原因】背景色控件中父组件ColorBackgroundQuickPane 和子组件NewColorSelectBox内部实现，都给 NewColorSelectBox添加了监听器，导致颜色值发生一次更改后，调用了两次回调，产生了两个UndoState 【改动思路】 ColorBackgroundQuickPane的UIObserver实现置空	3 years ago
Starryi	59b84da228	REPORT-63760 【主题切换】撤销以后，样式设置有问题【问题原因】撤销和重做时都需要重置模版主题样式【改动思路】同上	3 years ago
shine	adf49bfded	update	3 years ago
shine	043a81042d	Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0	3 years ago
shine	a74ef15eb8	CHART-21584 feat:fvs.chart.font 单位px 范围6-200	3 years ago
Tommy	2313fa818d	Pull request #6992 : REPORT-62743 服务器启动模态框位置异常 Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0 * commit 'fa6eb6a145eb4f20442fefd4b25311fe4ebd85a8': REPORT-62743 服务器启动模态框位置异常	3 years ago
fly.li	30748629ae	Merge branch 'feature/x' of https://code.fineres.com/scm/~fly.li/design into feature/x	3 years ago
fly.li	9d4d8e8097	REPORT-55240:修改一下设计器关于报表引擎的设置界面	3 years ago

1 2 3 4 5 ...

16639 Commits (8f733e588b7a225e67bed61c07c22cb24a9a6a82) All Branches Search

16639 Commits (8f733e588b7a225e67bed61c07c22cb24a9a6a82)

All Branches