design

Commit Graph

Author	SHA1	Message	Date
superman	5a40a78d2c	Merge pull request #2782 in DESIGN/design from release/10.0 to bugfix/10.0 * commit 'bb46ae10c7a967235674be15a782a100b8219b37': REPORT-42540 更新一下 REPORT-39772 提示控件/组件名称不能为空 REPORT-39772 提示控件/组件名称不能为空 REPORT-42604 远程对接平台密码-测试连接锁定时无错误日志 REPORT-42551 & REPORT-42552 日文屏蔽更新升级 CHART-16560 仪表盘半径设置 REPORT-42540 设计面板新增sheet的缩放率逻辑确认【问题原因】之前改这个的时候REPORT-37950只关注了缩放条可以单独控制每个sheet，没注意新增sheet的缩放条初值问题【改动思路】与产品确认后，将每个新增sheet的缩放初值设置为100 REPORT-42551 & REPORT-42552 日文屏蔽更新升级 CHART-15436 箱型图结果数据分类增加无 REPORT-39772 提示控件/组件名称不能为空去掉空行 CHART-16126 预定义样式预览界面修改 REPORT-42551 & REPORT-42552 日文屏蔽更新升级 REPORT-39772 提示控件/组件名称不能为空 REPORT-39772 提示控件/组件名称不能为空 REPORT-42551 & REPORT-42552 日文屏蔽更新升级	4 years ago
Yvan	bb46ae10c7	Pull request #2775 : REPORT-42540 设计面板新增sheet的缩放率逻辑确认 Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0 * commit 'd04c3e3bfd4f0a16f220d53377e423399fed2e23': REPORT-42540 更新一下 REPORT-42540 设计面板新增sheet的缩放率逻辑确认【问题原因】之前改这个的时候REPORT-37950只关注了缩放条可以单独控制每个sheet，没注意新增sheet的缩放条初值问题【改动思路】与产品确认后，将每个新增sheet的缩放初值设置为100	4 years ago
ju.ju	9cd2195cac	Pull request #2766 : REPORT-39772 提示控件/组件名称不能为空 Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0 * commit 'f0ba8f9dac7b5faf320c9661e73e6e3d012d0920': REPORT-39772 提示控件/组件名称不能为空 REPORT-39772 提示控件/组件名称不能为空 REPORT-39772 提示控件/组件名称不能为空 REPORT-39772 提示控件/组件名称不能为空 REPORT-39772 提示控件/组件名称不能为空	4 years ago
Yvan	d04c3e3bfd	REPORT-42540 更新一下	4 years ago
pengda	f0ba8f9dac	REPORT-39772 提示控件/组件名称不能为空	4 years ago
Hades	9fa3f949fb	Pull request #2777 : REPORT-42604 远程对接平台密码-测试连接锁定时无错误日志 Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0 * commit '593351d4e77778488baf835a7dfd8235746e8ecf': REPORT-42604 远程对接平台密码-测试连接锁定时无错误日志	4 years ago
Bryant	b2bc36e27a	Pull request #2774 : REPORT-42551 & REPORT-42552 日文屏蔽更新升级 Merge in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0 * commit 'bf833edf75b90c5c4c40542d5802cde4416d1391': REPORT-42551 & REPORT-42552 日文屏蔽更新升级 REPORT-42551 & REPORT-42552 日文屏蔽更新升级	4 years ago
Bjorn	795a3ed18c	Pull request #2776 : CHART-16560 仪表盘半径设置 Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0 * commit 'd514c645abea4f5b0196e55a4ce3452c352d85ee': CHART-16560 仪表盘半径设置	4 years ago
pengda	161e1b7cab	REPORT-39772 提示控件/组件名称不能为空	4 years ago
Qinghui.Liu	22073a5284	Pull request #2773 : CHART-15436 箱型图结果数据分类增加无 Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0 * commit 'ec54ecc4c84663d418746500b7b20e7d86241011': CHART-15436 箱型图结果数据分类增加无	4 years ago
hades	593351d4e7	REPORT-42604 远程对接平台密码-测试连接锁定时无错误日志	4 years ago
bryant	bf833edf75	REPORT-42551 & REPORT-42552 日文屏蔽更新升级	4 years ago
白岳	d514c645ab	Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0	4 years ago
白岳	9f4560e4a9	CHART-16560 仪表盘半径设置	4 years ago
Yvan	fa823fd3f2	Merge remote-tracking branch 'origin/release/10.0' into release/10.0	4 years ago
Yvan	a827dfefaa	REPORT-42540 设计面板新增sheet的缩放率逻辑确认【问题原因】之前改这个的时候REPORT-37950只关注了缩放条可以单独控制每个sheet，没注意新增sheet的缩放条初值问题【改动思路】与产品确认后，将每个新增sheet的缩放初值设置为100	4 years ago
bryant	ce6fab29f4	REPORT-42551 & REPORT-42552 日文屏蔽更新升级	4 years ago
Qinghui.Liu	ec54ecc4c8	Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0	4 years ago
Qinghui.Liu	a39d80ece8	CHART-15436 箱型图结果数据分类增加无	4 years ago
Bryant	08481c53fd	Pull request #2760 : REPORT-42551 & REPORT-42552 日文屏蔽更新升级 Merge in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0 * commit '9d402045f6db0b6e5945474ce264277b17d3b5a0': REPORT-42551 & REPORT-42552 日文屏蔽更新升级 REPORT-42551 & REPORT-42552 日文屏蔽更新升级	4 years ago
pengda	88323745b6	REPORT-39772 提示控件/组件名称不能为空	4 years ago
Bjorn	56eb0cdcdb	Pull request #2767 : CHART-16126 预定义样式预览界面修改 Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0 * commit '9bd8c96e8020223838411d685eff511f7e4cafc7': 去掉空行 CHART-16126 预定义样式预览界面修改	4 years ago
白岳	9bd8c96e80	去掉空行	4 years ago
白岳	1723211841	CHART-16126 预定义样式预览界面修改	4 years ago
bryant	9d402045f6	REPORT-42551 & REPORT-42552 日文屏蔽更新升级	4 years ago
pengda	9ba4fe8874	REPORT-39772 提示控件/组件名称不能为空	4 years ago
pengda	baf535ee1c	Merge remote-tracking branch 'origin/release/10.0' into release/10.0	4 years ago
pengda	f45634e3bb	REPORT-39772 提示控件/组件名称不能为空	4 years ago
Bryant	6552e0793a	Fixed merge conflict	4 years ago
Hades	afb5037ce5	Pull request #2757 : REPORT-42470 假保存 Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0 * commit '683503e4c9e4037492a557e2e428ec0753c31343': REPORT-42470 调整下位置保证原顺序不变 REPORT-42470 假保存	4 years ago
hades	683503e4c9	REPORT-42470 调整下位置保证原顺序不变	4 years ago
superman	7ef09d184c	Merge pull request #2763 in DESIGN/design from release/10.0 to bugfix/10.0 * commit 'd7c2bb6b8a3087984ddd0ed595e3e15fc57e9daf': REPORT-42577 日文更新升级屏蔽回退 REPORT-42577 日文更新升级屏蔽回退	4 years ago
superman	d7c2bb6b8a	Merge pull request #2762 in DESIGN/design from final/10.0 to release/10.0 * commit '5f9a3c566b1bc3e948821d2f5e75bf4ca1fbc6e2': REPORT-42577 日文更新升级屏蔽回退 REPORT-42577 日文更新升级屏蔽回退	4 years ago
superman	5f9a3c566b	Merge pull request #2761 in DESIGN/design from persist/10.0 to final/10.0 * commit '6e3160c74a7a1dfe125b4b2685c6a8c9e6791c4e': REPORT-42577 日文更新升级屏蔽回退 REPORT-42577 日文更新升级屏蔽回退	4 years ago
bryant	a93f3057be	Merge remote-tracking branch 'origin/release/10.0' into release/10.0	4 years ago
bryant	3094a14a66	REPORT-42551 & REPORT-42552 日文屏蔽更新升级	4 years ago
Kara	6e3160c74a	Pull request #2759 : REPORT-42577 日文更新升级屏蔽回退 Merge in DESIGN/design from ~BRYANT/design:persist/10.0 to persist/10.0 * commit '64771ff47e5506a535874ea9a65117cd0b8ea834': REPORT-42577 日文更新升级屏蔽回退 REPORT-42577 日文更新升级屏蔽回退	4 years ago
bryant	64771ff47e	REPORT-42577 日文更新升级屏蔽回退	4 years ago
bryant	5632a9b78c	REPORT-42577 日文更新升级屏蔽回退	4 years ago
hades	7a04697613	REPORT-42470 假保存	4 years ago
superman	d0c15ceb2e	Merge pull request #2755 in DESIGN/design from release/10.0 to bugfix/10.0 * commit '80eb540d018a7792a3f0650dfa01ff209ef37828': (24 commits) CHART-16481 增加空判断 CHART-16369 甘特图数据点条件属性 REPORT-42126 && REPORT-41929 && REPORT-41272【预定义样式】老jar下做的cpt模板，设置了单元格的样式，升级到最新，发现单元格预定义样式丢失了 CHART-16244 警戒线默认字体 CHART-16366 预定义样式标签 CHART-16196 && CHART-16209 钻取地图钻取目录背景增加自动，地图标题背景增加自动无JIRA任务兼容扩展图表国际化 REPORT-41753【预定义样式】如果新设计器远程老jar，显示的默认预定义不是兼容增加一个提示修改网址key 样式调整代码修改 REPORT-35149【10.0.11】预定义样式优化及与图表统一 CHART-15566 预定义边界界面图表预览代码修改代码修改 REPORT-40001 【预定义样式】应该是我们修改某个样式，就显示在样式最前 REPORT-35149 预定义样式优化及与图表统一代码修改 ...	4 years ago
Qinghui.Liu	80eb540d01	Pull request #2752 : CHART-16481 增加空判断 Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0 * commit 'aae35afd3bde8296b8f516e6903bc1cd5f579462': CHART-16481 增加空判断	4 years ago
Qinghui.Liu	aae35afd3b	Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0	4 years ago
Qinghui.Liu	83051ae8c3	CHART-16481 增加空判断	4 years ago
ju.ju	ac12d037b0	Pull request #2751 : REPORT-35149 预定义样式功能feature合到release Merge in DESIGN/design from feature/10.0 to release/10.0 * commit 'd89f170fddff11fe22b1afa1ab1d0605cd4e41b7': (30 commits) 修改：换一种方式获取参数面板高度修改删除多余导包 REPORT-34739 自适应布局下调整绝对画布块高度,绝对画布块乱跳并导致撤销功能失效【问题原因】在调整绝对画布块的高度时，因为前面对绝对画布块的backupBounds做了处理，忽略了参数面板块高度带来的偏移量，所以会导致其乱跳并且撤销出错【改动方案】在com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter.fix(com.fr.design.designer.creator.XCreator)方法中加个判断，如果是绝对画布块，就将漏算的偏移量加上 REPORT-40515 jar包更新到最新后普通用户切换远程目录失败 REPORT-42126 && REPORT-41929 && REPORT-41272【预定义样式】老jar下做的cpt模板，设置了单元格的样式，升级到最新，发现单元格预定义样式丢失了 REPORT-41299 新建错误数据集无法删除-转meiao 【问题原因】如果建立了错误的数据集，并将数据集展开查看列名时，删除其中一个会造成cTreeNode.getFirstChild()产生异常，从而不能更新界面，看起来就是删除不掉【改动思路】增加判断cTreeNode是否是错误数据集并处于展开状态，如果是的，将展开状态置为不展开，并break跳过后面检查子节点的逻辑，避免异常 CHART-16244 警戒线默认字体 CHART-16366 预定义样式标签 CHART-16196 && CHART-16209 钻取地图钻取目录背景增加自动，地图标题背景增加自动无jira任务， bugfix/10.0 合 feature/10.0冲突无JIRA任务兼容扩展图表国际化 REPORT-41753【预定义样式】如果新设计器远程老jar，显示的默认预定义不是兼容增加一个提示修改网址key 样式调整代码修改 REPORT-35149【10.0.11】预定义样式优化及与图表统一 REPORT-40853 提交单元格组多次点击卡死 && REPORT-40843 选中单元格，点击到样式-单元格，最小化设计器后再打开设计器崩溃 ...	4 years ago
Hades	08be33cdb6	Pull request #2750 : REPORT-40971 添加条件属性选择数据列，选项中的模板数据集会是别的模板的 Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0 * commit 'c63e6468ec4e6b9156891d49415d3379328bb251': REPORT-40971 添加条件属性选择数据列，选项中的模板数据集会是别的模板的	4 years ago
Bjorn	3d7eac8f2f	Pull request #2741 : CHART-16369 甘特图数据点条件属性 Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0 * commit 'd1c3efd6a32f8d25880ef3019df2754cf0c9dbbd': CHART-16369 甘特图数据点条件属性	4 years ago
hades	c63e6468ec	REPORT-40971 添加条件属性选择数据列，选项中的模板数据集会是别的模板的	4 years ago
superman	d89f170fdd	Merge pull request #2748 in DESIGN/design from bugfix/10.0 to feature/10.0 * commit 'f08b6bba733b9616bb065373203da50bbe9a598a':	4 years ago
superman	f08b6bba73	Merge pull request #2747 in DESIGN/design from release/10.0 to bugfix/10.0 * commit 'c518ecb966f68839dc812aaac968b2b68be88cb9':	4 years ago

1 2 3 4 5 ...

12066 Commits (5a40a78d2cd5cccd07d2dbeb18575e82a578731e) All Branches Search

12066 Commits (5a40a78d2cd5cccd07d2dbeb18575e82a578731e)

All Branches