Yyming
49c2630bfb
REPORT-36624 新的解决方案
4 years ago
白岳
f10c5432c9
CHART-12124 图例形态和系列色合并
4 years ago
白岳
d3058022af
CHART-12124 代码质量
4 years ago
白岳
627b27266b
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0
4 years ago
白岳
807adb2b9d
CHART-12124 图例形态和系列色合并
4 years ago
Harrison
1846b76cb7
Pull request #2001 : REPORT-24268 增强公式编辑器插件问题
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'b7c618b4c5d5bddb8f81113a54953b8279ddc195':
REPORT-24268 增强公式编辑器插件问题 手滑,删多了,恢复一下
4 years ago
Harrison
b7c618b4c5
Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0
4 years ago
Harrison
4e2c8e2d9b
REPORT-24268 增强公式编辑器插件问题
...
手滑,删多了,恢复一下
4 years ago
Harrison
3804ce1342
Pull request #1982 : REPORT-24268 增强公式编辑器插件问题
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '2886d3b5d9d73eb90601f593510d25b68daebfde':
1、更新注释 2、优化一下代码结构
REPORT-24268 增强公式编辑器插件问题 [reason] 由于数据集相关没有保存公式的具体类,导致重新打开时, 都是默认的公式形态。 [solution] 直接保存公式形态,而不是字符串
4 years ago
Qinghui.Liu
81cfdf7c0f
CHART-14924 更换icon
4 years ago
superman
f9b071851f
Merge pull request #2000 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'ceffb48a087147a55679eaf55a1ff5fcb9d75a52':
无jira任务,打包失败
4 years ago
superman
ceffb48a08
Merge pull request #1999 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '750843c85313ab7efebe74c6ee13a24c16f9b232':
无jira任务,打包失败
4 years ago
Lucian.Chen
750843c853
Pull request #1996 : 无jira任务,打包失败
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit '7e7bd9b950b2e3c1aaf4da2f71fe33ff0c71075f':
无jira任务,打包失败
4 years ago
lucian
7e7bd9b950
无jira任务,打包失败
4 years ago
Henry.Wang
e00e0c1b09
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
4 years ago
Henry.Wang
405197fcb4
REPORT-35569 参数面板,添加一个参数控件,撤销之后,再次添加的控件会空一个位置添加
4 years ago
kerry
707810a4f8
REPORT-31758 决策报表设计面板允许进行缩放
4 years ago
Harrison
2886d3b5d9
1、更新注释
...
2、优化一下代码结构
4 years ago
Yyming
4e7a60c4d8
Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0
4 years ago
Yyming
0eb1ea0211
REPORT-36624 自定义控件在参数面板的可见可用设置保存无效
4 years ago
superman
1389a2cdf4
Merge pull request #1988 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '65519408407190371a02452a2e2fa77878b6f54e':
CHART-11549 箱型图埋点
删除全路径
CHART-11549 修改箱型图条件属性界面
REPORT-31986 服务器数据集默认命名显示缩略名
主要修改: 1.FRGUIPanelFactory中增加了一种垂直布局,水平居左,竖直顶对齐,用以满足bug提出者的需求 2.对VerticalFlowLayout中一些注释错误(原本的注释中是左对齐居中对齐和右对齐,命名却为top,center和bottom,经过调试发现这几个变量实则代表了竖直方向上的顶对齐,居中对齐和底对齐)和命名错误(dealWith写成了dialWith)进行了修改 3.为VerticalFlowLayout中重写的几个方法添加了@Override注解
4 years ago
superman
6551940840
Merge pull request #1987 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '0dfdc2e68285b2d92514c0c935c66f15407a459c':
CHART-11549 箱型图埋点
删除全路径
CHART-11549 修改箱型图条件属性界面
REPORT-31986 服务器数据集默认命名显示缩略名
主要修改: 1.FRGUIPanelFactory中增加了一种垂直布局,水平居左,竖直顶对齐,用以满足bug提出者的需求 2.对VerticalFlowLayout中一些注释错误(原本的注释中是左对齐居中对齐和右对齐,命名却为top,center和bottom,经过调试发现这几个变量实则代表了竖直方向上的顶对齐,居中对齐和底对齐)和命名错误(dealWith写成了dialWith)进行了修改 3.为VerticalFlowLayout中重写的几个方法添加了@Override注解
4 years ago
Qinghui.Liu
0dfdc2e682
Pull request #1984 : CHART-11549 数据点提示国际化
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '0a18c249eebd2381f8807f033b7825cc6114c9fb':
CHART-11549 箱型图埋点
4 years ago
Qinghui.Liu
0a18c249ee
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
4 years ago
Qinghui.Liu
0ac0a2e411
CHART-11549 箱型图埋点
4 years ago
Henry.Wang
a1b8a928f8
Pull request #1981 : REPORT-31986 服务器数据集默认命名显示缩略名
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'c5773e35f494a516ad44ae7b28e8a6a97e26f0c8':
REPORT-31986 服务器数据集默认命名显示缩略名
4 years ago
Yvan
2c08e9b403
Pull request #1976 : REPORT-34134 设计器选项里,版本管理与里面内容的间距不合理
...
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '02663026250b10953c7a2156ad6d5975e9bed821':
主要修改: 1.FRGUIPanelFactory中增加了一种垂直布局,水平居左,竖直顶对齐,用以满足bug提出者的需求 2.对VerticalFlowLayout中一些注释错误(原本的注释中是左对齐居中对齐和右对齐,命名却为top,center和bottom,经过调试发现这几个变量实则代表了竖直方向上的顶对齐,居中对齐和底对齐)和命名错误(dealWith写成了dialWith)进行了修改 3.为VerticalFlowLayout中重写的几个方法添加了@Override注解
4 years ago
Qinghui.Liu
6bd3b6ce98
Pull request #1983 : CHART-11549 修改箱型图条件属性界面
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'a1e2338e01a0bac442f9438e459f374f2e250974':
删除全路径
CHART-11549 修改箱型图条件属性界面
4 years ago
Qinghui.Liu
a1e2338e01
删除全路径
4 years ago
Qinghui.Liu
d6c8b1b50b
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
4 years ago
Qinghui.Liu
1d2507a471
CHART-11549 修改箱型图条件属性界面
4 years ago
Harrison
91fa55de6f
REPORT-24268 增强公式编辑器插件问题
...
[reason]
由于数据集相关没有保存公式的具体类,导致重新打开时,
都是默认的公式形态。
[solution]
直接保存公式形态,而不是字符串
4 years ago
Henry.Wang
c5773e35f4
REPORT-31986 服务器数据集默认命名显示缩略名
4 years ago
superman
724598426b
Merge pull request #1980 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'a27006cd88c899bb0a00bfa27c6e3f84fa34f4c2':
REPORT-35569 参数面板,添加一个参数控件,撤销之后,再次添加的控件会空一个位置添加
CHART-11708 插入图表国际化
CHART-9760 系列默认为空
CHART-14744 结果数据使用可编辑标签
回退代码
解决冲突
CHART-14744 箱型图单元格数据集
REPORT-30352 删除不需要的import
REPORT-30352 直接将RTextAreaBase的border的值改为0,以和8.0版本外观保持一致
4 years ago
superman
a27006cd88
Merge pull request #1979 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '153a93cd6ad810a64b3fc5e083e55b4908ee471d':
REPORT-35569 参数面板,添加一个参数控件,撤销之后,再次添加的控件会空一个位置添加
CHART-11708 插入图表国际化
CHART-9760 系列默认为空
CHART-14744 结果数据使用可编辑标签
回退代码
解决冲突
CHART-14744 箱型图单元格数据集
4 years ago
Henry.Wang
153a93cd6a
Pull request #1975 : REPORT-35569 参数面板,添加一个参数控件,撤销之后,再次添加的控件会空一个位置添加
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '9b28bc70284034753fba2e9884b477e19ab5c26e':
REPORT-35569 参数面板,添加一个参数控件,撤销之后,再次添加的控件会空一个位置添加
4 years ago
Yuan.Wang
5fab0de3fe
Pull request #1963 : REPORT-30352 直接将RTextAreaBase的border的值改为0,以和8.0版本外观保持一致
...
Merge in DESIGN/design from ~YUAN.WANG/design:bugfix/10.0 to bugfix/10.0
* commit 'af1a3184ca257795f1acad72f411820a15aab963':
REPORT-30352 删除不需要的import
REPORT-30352 直接将RTextAreaBase的border的值改为0,以和8.0版本外观保持一致
4 years ago
Yvan
0266302625
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yvan
9fa7771d6e
主要修改:
...
1.FRGUIPanelFactory中增加了一种垂直布局,水平居左,竖直顶对齐,用以满足bug提出者的需求
2.对VerticalFlowLayout中一些注释错误(原本的注释中是左对齐居中对齐和右对齐,命名却为top,center和bottom,经过调试发现这几个变量实则代表了竖直方向上的顶对齐,居中对齐和底对齐)和命名错误(dealWith写成了dialWith)进行了修改
3.为VerticalFlowLayout中重写的几个方法添加了@Override注解
4 years ago
Henry.Wang
9b28bc7028
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
4 years ago
Henry.Wang
957d89eed5
REPORT-35569 参数面板,添加一个参数控件,撤销之后,再次添加的控件会空一个位置添加
4 years ago
Bjorn
0e208491f8
Pull request #1974 : CHART-9760 系列默认为空 && CHART-11708 插入图表国际化
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '18cf8fc5ed544b3ad161ce404fb94e4656ecd635':
CHART-11708 插入图表国际化
CHART-9760 系列默认为空
4 years ago
白岳
18cf8fc5ed
CHART-11708 插入图表国际化
4 years ago
白岳
cf73ed52b0
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0
4 years ago
白岳
c1b0d6e9b6
CHART-9760 系列默认为空
4 years ago
Qinghui.Liu
55fb28553d
Pull request #1965 : CHART-14744 箱型图单元格数据集
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '879cf2f2fdccab27ae1db0dc876114fb26375ba5':
CHART-14744 结果数据使用可编辑标签
回退代码
解决冲突
CHART-14744 箱型图单元格数据集
4 years ago
Qinghui.Liu
879cf2f2fd
CHART-14744 结果数据使用可编辑标签
4 years ago
superman
72b3f5f985
Merge pull request #1969 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'dc47f908900569c4d6e3fac7f19b27932096c826':
REPORT-30708 单元格配置框不跟随右侧配置按钮 npe问题修改
4 years ago
superman
dc47f90890
Merge pull request #1968 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '1a8c25a3ed01430948a5b3a7ff7bf8b51496efe3':
REPORT-30708 单元格配置框不跟随右侧配置按钮 npe问题修改
4 years ago
superman
1a8c25a3ed
Merge pull request #1967 in DESIGN/design from final/10.0 to release/10.0
...
* commit '5ba8f10b4424220901584133abbf4c860cf06d70':
4 years ago