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
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
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
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
a7cb467603
Merge pull request #2771 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'afb5037ce5240c8071581f2d0a8657cba3f41f2e':
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
4 years ago
9bd8c96e80
去掉空行
4 years ago
1723211841
CHART-16126 预定义样式预览界面修改
4 years ago
9d402045f6
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
4 years ago
9ba4fe8874
REPORT-39772 提示控件/组件名称不能为空
4 years ago
baf535ee1c
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
f45634e3bb
REPORT-39772 提示控件/组件名称不能为空
4 years ago
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
683503e4c9
REPORT-42470 调整下位置 保证原顺序不变
4 years ago
9b35e799d5
Merge pull request #2764 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '7ef09d184cc0503f2c7456906d573265b33fdd5a':
REPORT-42577 日文更新升级屏蔽回退
REPORT-42577 日文更新升级屏蔽回退
4 years ago
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
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
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
a93f3057be
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
3094a14a66
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
4 years ago
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
64771ff47e
REPORT-42577 日文更新升级屏蔽回退
4 years ago
5632a9b78c
REPORT-42577 日文更新升级屏蔽回退
4 years ago
0245039aa3
Merge pull request #2756 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd0c15ceb2e58d0e3e91c983bbd3ec2afa629c482':
CHART-16481 增加空判断
REPORT-40971 添加条件属性选择数据列，选项中的模板数据集会是别的模板的
CHART-16369 甘特图数据点条件属性
4 years ago
7a04697613
REPORT-42470 假保存
4 years ago
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
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
c63e6468ec
REPORT-40971 添加条件属性选择数据列，选项中的模板数据集会是别的模板的
4 years ago
d89f170fdd
Merge pull request #2748 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'f08b6bba733b9616bb065373203da50bbe9a598a':
4 years ago
f08b6bba73
Merge pull request #2747 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c518ecb966f68839dc812aaac968b2b68be88cb9':
4 years ago
c518ecb966
Merge pull request #2746 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'e0306a5aaf1d1e7e157ed73aa70a4df7e7437378':
4 years ago
e0306a5aaf
Merge pull request #2745 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'fbb33890b0824e46d82d674bb424df26527851e3':
4 years ago
29177fb1fe
Merge pull request #2743 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '2c2c66549ca5c3c40f4cb7416d7b334ca4117457':
修改：换一种方式获取参数面板高度
修改
删除多余导包
REPORT-34739 自适应布局下调整绝对画布块高度,绝对画布块乱跳并导致撤销功能失效 【问题原因】在调整绝对画布块的高度时，因为前面对绝对画布块的backupBounds做了处理，忽略了参数面板块高度带来的偏移量，所以会导致其乱跳并且撤销出错 【改动方案】在com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter.fix(com.fr.design.designer.creator.XCreator)方法中加个判断，如果是绝对画布块，就将漏算的偏移量加上
REPORT-40515 jar包更新到最新后普通用户切换远程目录失败
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
REPORT-40027 NPE
REPORT-40027 代码修改
REPORT-40646 去掉无用的代码
REPORT-40646 远程设计对接平台密码策略
REPORT-40027 缓存模板的组件树展开路径，在切换模板的时候保证组件树的展开
4 years ago
2c2c66549c
Merge pull request #2742 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e7be389f97308a1026107e47c3e405d6b8fc1c36':
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
REPORT-40027 NPE
REPORT-40027 代码修改
REPORT-40646 去掉无用的代码
REPORT-40646 远程设计对接平台密码策略
REPORT-40027 缓存模板的组件树展开路径，在切换模板的时候保证组件树的展开
4 years ago
e7be389f97
Merge pull request #2739 in DESIGN/design from final/10.0 to release/10.0
...
* commit '587386f883bd95cc9a9f6236f46f3ff4fc0db852':
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
4 years ago
fbb33890b0
Merge pull request #2740 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '587386f883bd95cc9a9f6236f46f3ff4fc0db852':
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
REPORT-38688 设计器在双屏下拖动会有卡屏的现象
修改魔法值问题
更新
REPORT-41503 修改代码错误
REPORT-41503 【JDK11】设计器启动页面图标不清晰 【问题原因】Windows环境下，jdk11的缩放会造成绘制启动图片模糊 【改动思路】使用2倍图，然后用1倍图的尺寸绘制图片，再经过jdk11的缩放之后显示效果会好一些
4 years ago
d1c3efd6a3
CHART-16369 甘特图数据点条件属性
4 years ago
fdafab794b
Pull request #2719 : REPORT-40646 远程设计对接平台密码策略
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '358d972dee8097028365832a103cd98d85d94abd':
REPORT-40646 去掉无用的代码
REPORT-40646 远程设计对接平台密码策略
4 years ago
Yvan
6fd8ebe4eb
Pull request #2737 : REPORT-34739 自适应布局下调整绝对画布块高度,绝对画布块乱跳并导致撤销功能失效
...
Merge in DESIGN/design from ~YVAN/design:bugfix/10.0 to bugfix/10.0
* commit '4852af659e399f4cdaff6902c9f8db41b99b28d6':
修改：换一种方式获取参数面板高度
修改
删除多余导包
REPORT-34739 自适应布局下调整绝对画布块高度,绝对画布块乱跳并导致撤销功能失效 【问题原因】在调整绝对画布块的高度时，因为前面对绝对画布块的backupBounds做了处理，忽略了参数面板块高度带来的偏移量，所以会导致其乱跳并且撤销出错 【改动方案】在com.fr.design.designer.beans.adapters.layout.FRFitLayoutAdapter.fix(com.fr.design.designer.creator.XCreator)方法中加个判断，如果是绝对画布块，就将漏算的偏移量加上
4 years ago
白岳
Yvan
bryant
Qinghui.Liu
pengda
Bjorn
superman
Hades
hades
Kara
ju.ju