design

Commit Graph

Author	SHA1	Message	Date
shine	9e8e2ea32b	CHART-21570 fix:fvs.cpt.chart 默认自动	3 years ago
shine	1cecadcf28	CHART-21570 fix:fvs.cpt.chart 默认自动	3 years ago
shine	a701fec3ee	Merge branch 'final/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into final/11.0	3 years ago
shine	53ec440234	CHART-21805 fix:cpt组件中的图表主题中有的属性不跟随属性全部设置成自定义	3 years ago
shine	fc40344d1d	update	3 years ago
shine	cf0ae930be	CHART-21570 大屏模板中的图表默认自定义	3 years ago
shine	83f0dd7f00	CHART-21570 大屏模板 cpt组件中的图表也不支持跟随主题	3 years ago
shine	eeac554bd4	CHART-21570 适配11.0 大屏模板中的cpt组件不支持跟随主题	3 years ago
shine	18865d49d7	CHART-21737 fix:大屏模板中的图表组件设置第一个配色不生效	3 years ago
Henry.Wang	1f46429744	Pull request #6595 : REPORT-61736 release/11.0->final/11.0 Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0 * commit '8cfdbf10c842431b46465ffb38f75a49fe52c660': REPORT-61736 release/11.0->final/11.0	3 years ago
Henry.Wang	8cfdbf10c8	Merge branch 'final/11.0' of https://code.fineres.com/scm/~henry.wang/design into final/11.0	3 years ago
Henry.Wang	290226dbfc	REPORT-61736 release/11.0->final/11.0	3 years ago
Henry.Wang	612bc0d55b	Pull request #6594 : REPORT-61410 数据集预览时可复制-表头复制问题 && REPORT-61409 数据集预览时可复制-赋值空值时显示成Null Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0 * commit '18c54e860643006865d3ea19690577b17a6bc502': REPORT-61410 数据集预览时可复制-表头复制问题 && REPORT-61409 数据集预览时可复制-赋值空值时显示成Null	3 years ago
Henry.Wang	18c54e8606	REPORT-61410 数据集预览时可复制-表头复制问题 && REPORT-61409 数据集预览时可复制-赋值空值时显示成Null	3 years ago
superman	7212fe30fb	Merge pull request #6593 in DESIGN/design from release/11.0 to feature/x * commit 'daf133a7242e210789a65073ec27ec7beb4b9020': CHART-21805 fix:cpt组件中的图表主题中有的属性不跟随属性全部设置成自定义	3 years ago
Hoky	bcb8ad4693	REPORT-60163 公式编辑器优化2.0 1.修改一下键入值	3 years ago
Hoky	425f081cb2	Merge remote-tracking branch 'origin/feature/x' into feature/x	3 years ago
Hoky	1c33d91f1a	REPORT-60163 公式编辑器优化2.0 1.添加了输入提示； 2.优化了搜索框； 3.优化了出错提示以及添加了关闭前检测。	3 years ago
zheng	daf133a724	Pull request #6572 : CHART-21805 fix:cpt组件中的图表主题中有的属性不跟随属性全部设置成自定义 Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0 * commit '6150090535fa3afe3def329d36f8021d97f08cfe': CHART-21805 fix:cpt组件中的图表主题中有的属性不跟随属性全部设置成自定义	3 years ago
shine	6150090535	Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0	3 years ago
shine	6181bd0226	CHART-21805 fix:cpt组件中的图表主题中有的属性不跟随属性全部设置成自定义	3 years ago
superman	625c7f8695	Merge pull request #6571 in DESIGN/design from release/11.0 to feature/x * commit '9609d6a0473fab7cce8e95715d00fe99b3afdf78': REPORT-62133 mac设计器安装包起不来 CHART-21786:不限制图片标记点大小	3 years ago
superman	9609d6a047	Merge pull request #6565 in DESIGN/design from release/10.0 to release/11.0 * commit '98458e1da4042847caeb4a689e6589f0ff575260': REPORT-62133 mac设计器安装包起不来 CHART-21786:不限制图片标记点大小	3 years ago
superman	98458e1da4	Merge pull request #6563 in DESIGN/design from final/10.0 to release/10.0 * commit '0c66a297d764936d91b77dcc25420ca834680528': CHART-21786:不限制图片标记点大小	3 years ago
ju\|剧浩宇	746a2e84ce	Pull request #6561 : 无jira 解决冲突 Merge in DESIGN/design from ~HADES/design:feature/x to feature/x * commit '9a4db7c91314d3348980a4982c1152324f8231da': 无任务解决冲突 update CHART-21570 大屏模板中的图表默认自定义 CHART-21570 大屏模板 cpt组件中的图表也不支持跟随主题 CHART-21570 适配11.0 大屏模板中的cpt组件不支持跟随主题 REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化 REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化 CHART-21737 fix:大屏模板中的图表组件设置第一个配色不生效	3 years ago
hades	9a4db7c913	无jira 解决冲突	3 years ago
Lanlan	1e26cc1fa0	Pull request #6558 : REPORT-62133 mac设计器安装包起不来 Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0 * commit '3137f71571d4c9f58ffe2be3d8fb6a08a6ee2cd1': REPORT-62133 mac设计器安装包起不来	3 years ago
ju\|剧浩宇	42c8089a6a	Pull request #6559 : 无JIRA任务解决冲突 Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit '843b118cce801a3300c0598768ab2dda7c29772e': REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化	3 years ago
方磊	843b118cce	Merge branch 'final/11.0' into release/11.0 * final/11.0: REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化 # Conflicts: # designer-base/src/main/java/com/fr/design/mainframe/toast/DesignerToastMsgUtil.java # designer-base/src/main/java/com/fr/design/mainframe/toast/ToastMsgDialog.java	3 years ago
Lanlan	3137f71571	REPORT-62133 mac设计器安装包起不来	3 years ago
eason	0c66a297d7	Pull request #6557 : CHART-21786:不限制图片标记点大小 Merge in DESIGN/design from ~EASON/design:persist/10.0 to final/10.0 * commit 'bcbe3ea85658dd44f9768582befb1e61901e00e6': CHART-21786:不限制图片标记点大小	3 years ago
eason	bcbe3ea856	CHART-21786:不限制图片标记点大小	3 years ago
zheng	c2cc724de4	Pull request #6550 : CHART-21737 fix bugs Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0 * commit '6c9a8425334a71b7e8ab88df6779aefd273a8a3d': update CHART-21570 大屏模板中的图表默认自定义 CHART-21570 大屏模板 cpt组件中的图表也不支持跟随主题 CHART-21570 适配11.0 大屏模板中的cpt组件不支持跟随主题 CHART-21737 fix:大屏模板中的图表组件设置第一个配色不生效	3 years ago
ju\|剧浩宇	074c9753be	Pull request #6551 : 无任务 release/10->release/11解决冲突 Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0 * commit '05a116c13ff1a341de5f838d5b20181b560e6cf8': (48 commits) 无任务解决冲突 REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候，判断处理逻辑不正确的问题 REPORT-61654 弹窗内容显示不全 REPORT-61610 fix:回退最开始关于相同的图表类型，不会新建图表配置界面的逻辑改动 REPORT-62179 数字控件的最大最小值校验需支持公式 REPORT-62016 BI插件匹配检测 REPORT-61410 数据集预览时可复制-表头复制问题 && REPORT-61409 数据集预览时可复制-赋值空值时显示成Null update 代码质量：每个实例各自监听插件事件 REPORT-61695 REPORT-61618 复用组件生成时带“-”，导致部分公式失效@Jaimme REPORT-61695 决策报表-自适应布局下组件右侧设置面板显示“组件大小”，绝对布局下显示的是“控件位置”“控件大小” REPORT-61610 fix:插件重新加载图表配置界面报错 A.class can not cast to A.class CHART-21418 fix:第二次修改区分弹框在上面还是下面如果在上面则是从displayComponent下面离开隐藏弹框 REPORT-59744 聚合报表块手动修改位置以后，点击空白处位置偏移 REPORT-61306 设计器缩放时，显示通知的弹窗未跟随设计器内部界面，而是固定显示在右侧 REPORT-60887 MAC OS x电脑上编辑按钮飘移 REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全 REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全 REPORT-59614 远程设计下无推送日志 ...	3 years ago
Henry.Wang	05a116c13f	无任务解决冲突	3 years ago
shine	6c9a842533	update	3 years ago
shine	4f16102dc2	Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/11.0	3 years ago
shine	23d23642c3	CHART-21570 大屏模板中的图表默认自定义	3 years ago
Henry.Wang	71fa1c8dc0	Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0	3 years ago
Henry.Wang	9f6def9871	无任务解决冲突	3 years ago
starryi	aa75c9046d	Pull request #6543 : REPORT-61788 创建组件时，弹窗出来的非常慢 Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x * commit 'e8e61428e07b0ed71ea07b847a1b61e9e774833d': REPORT-61788 创建组件时，弹窗出来的非常慢	3 years ago
shine	ee2191b929	CHART-21570 大屏模板 cpt组件中的图表也不支持跟随主题	3 years ago
shine	ea5a6fc9bb	CHART-21570 适配11.0 大屏模板中的cpt组件不支持跟随主题	3 years ago
fanglei	ac824ad96a	Pull request #6545 : REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化 Merge in DESIGN/design from ~FANGLEI/design:final/11.0 to final/11.0 * commit '6635b86a64401b2557244a3a36c2dc2d9a3d7840': REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化	3 years ago
方磊	6635b86a64	REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化	3 years ago
fanglei	bd0f6678f9	Pull request #6544 : REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化 Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0 * commit 'aae3cc9d40238533d10446bd1de48a02006e06fa': REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化	3 years ago
方磊	aae3cc9d40	REPORT-57521 回退代码-远程设计时websocket断开情况下的提示优化	3 years ago
Starryi	e8e61428e0	REPORT-61788 创建组件时，弹窗出来的非常慢【问题原因】创建组件的面板里需要获取组件样式风格列表，列表数据来自商城服务器端，需要网络请求。在创建面板的时候，进行了同步请求，阻塞了EDT线程. 【改动思路】使用 LazyComboBox 替换 UIComboBox	3 years ago
superman	acacd8c7dc	Merge pull request #6542 in DESIGN/design from release/11.0 to feature/x * commit '07889aa13a65a99d399808927e8db34d99edd9ef': REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候，判断处理逻辑不正确的问题	3 years ago
superman	07889aa13a	Merge pull request #6541 in DESIGN/design from final/11.0 to release/11.0 * commit '2aeb2bdbbfa2f240095ab709f224f890da20efe7':	3 years ago

1 2 3 4 5 ...

16386 Commits (582ba968e6832c4c0ae676f5ce4b92947a180e24) All Branches Search

16386 Commits (582ba968e6832c4c0ae676f5ce4b92947a180e24)

All Branches