neil
55bfb305d9
合代码冲突
5 years ago
neil
28548fe174
合代码冲突
5 years ago
neil
d36959825e
合代码冲突
5 years ago
neil
3c949f68a2
Pull request #2 : Final/10.0
...
Merge in ~NEIL/design from final/10.0 to feature/10.0
* commit 'c4d9d5213862f1acef4b738380025af8d42cc81c': (375 commits)
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
合代码冲突
REPORT-32162 替换 ui 的时候,需要在事件分发线程中
CHART-14022 所有可以设置通用格式的面板排布都不对
CHART-13962 为趋势线条件属性设置默认值
删除多余代码
REPORT-32043 10.0冒烟:设计器启动经常白屏,卡住
MOBILE-27000 移动端控件图标支持自定义颜色
REPORT-32105 表单关闭后 JForm对象未释放 导致设计器最终发生oom
REPORT-32073 fix 换个好名字
REPORT-32073【冒烟测试】模板web属性-工具栏编辑之后,点确定,弹窗无法缩回
REPORT-32088【组件加密】@harrison集群安装出现初始化失败 插件接口的位置有点问题, 不能放到 form 下, 要放到 design 下
...
5 years ago
neil
c4d9d52138
合代码冲突
5 years ago
neil
2e1f43c2a0
合代码冲突
5 years ago
neil
031b17b3db
合代码冲突
5 years ago
neil
231b41f01a
合代码冲突
5 years ago
neil
7df731ed52
合代码冲突
5 years ago
neil
05dc598bf9
合代码冲突
5 years ago
neil
80c2341650
合代码冲突
5 years ago
neil
7483d9d7c6
合代码冲突
5 years ago
neil
711cbd62f1
合代码冲突
5 years ago
neil
9c03a0c208
合代码冲突
5 years ago
Kara
9c06381d4a
Pull request #1698 : REPORT-32162 替换 ui 的时候,需要在事件分发线程中
...
Merge in DESIGN/design from ~HARRISON/design:final/10.0 to final/10.0
* commit '6ae8ef494ef9e6d8fac1c5730d22b3327baaffd6':
REPORT-32162 替换 ui 的时候,需要在事件分发线程中
5 years ago
Harrison
6ae8ef494e
REPORT-32162 替换 ui 的时候,需要在事件分发线程中
5 years ago
Harrison
e55f087900
Pull request #1696 : REPORT-32162 替换 ui 的时候,需要在事件分发线程中
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'f139a0b8d60b0c7daacc1912e862bdf28af95314':
REPORT-32162 替换 ui 的时候,需要在事件分发线程中
5 years ago
Kara
f228099b43
Pull request #1697 : Final/10.0
...
Merge in DESIGN/design from ~JEO/report-design:final/10.0 to final/10.0
* commit 'fd99ea1eca208df863d2e9d8d0169859f68d4773': (111 commits)
CHART-14022 所有可以设置通用格式的面板排布都不对
CHART-13962 为趋势线条件属性设置默认值
删除多余代码
REPORT-32043 10.0冒烟:设计器启动经常白屏,卡住
MOBILE-27000 移动端控件图标支持自定义颜色
REPORT-32105 表单关闭后 JForm对象未释放 导致设计器最终发生oom
REPORT-32073 fix 换个好名字
REPORT-32073【冒烟测试】模板web属性-工具栏编辑之后,点确定,弹窗无法缩回
REPORT-32088【组件加密】@harrison集群安装出现初始化失败 插件接口的位置有点问题, 不能放到 form 下, 要放到 design 下
REPORT-32068 设计器启动黑屏,出现一次,重启后正常
REPORT-31866【冒烟测试】切换远程目录,新建模板的数据集展示异常 && REPORT-28701 同步release
REPORT-31784 程序数据集默认命名显示缩略名
REPORT-31834 && REPORT-31874
CHART-13988 散点图大数据模式下标记点特殊处理
REPORT-31236 && REPORT-31801
REPORT-31836 && REPORT-31874
REPORT-29912 组件加密 1、复制过滤的 support 判断条件 2、XCreator 的创建条件
REPORT-29815 && REPORT-29815 之前添加到final的同步到release
CHART-13926 FR语言环境适配
REPORT-29409 表格和图表百分比格式化近似结果不同
...
5 years ago
jeo
fd99ea1eca
Merge branch 'release/10.0' into final/10.0
...
# Conflicts:
# designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java
5 years ago
白岳
18483728b0
还原
5 years ago
Harrison
f139a0b8d6
REPORT-32162 替换 ui 的时候,需要在事件分发线程中
5 years ago
Lanlan
d8f38eb999
Pull request #1694 : CHART-14022 所有可以设置通用格式的面板排布都不对
...
Merge in DESIGN/design from ~LANLAN/design:release/10.0 to release/10.0
* commit 'a66f27f9866161c0ac4b10eac4808da38c7367fd':
CHART-14022 所有可以设置通用格式的面板排布都不对
5 years ago
Lanlan
a66f27f986
CHART-14022 所有可以设置通用格式的面板排布都不对
5 years ago
白岳
1c96cd163a
还原
5 years ago
白岳
1e5f8d36f1
CHART-14022 父类方法改变,子类增加参数
5 years ago
Tommy
0181f0109a
Pull request #1690 : MOBILE-27000 移动端控件图标支持自定义颜色
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit '3be3844d98a062b5a52650814566faf3796dfa72':
删除多余代码
MOBILE-27000 移动端控件图标支持自定义颜色
5 years ago
eason
1d2c097be8
Pull request #1692 : CHART-13962 为趋势线条件属性设置默认值
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '325488f0368dc19411b2b80a19a402fe8c8eac2e':
CHART-13962 为趋势线条件属性设置默认值
5 years ago
Qinghui.Liu
325488f036
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
5 years ago
Qinghui.Liu
d11a8cd9ba
CHART-13962 为趋势线条件属性设置默认值
5 years ago
Hades
6bedb7539e
Pull request #1691 : REPORT-32043 10.0冒烟:设计器启动经常白屏,卡住
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '492800655568b999a1af945435dda4585e07199f':
REPORT-32043 10.0冒烟:设计器启动经常白屏,卡住
5 years ago
kuangshuai
3be3844d98
删除多余代码
5 years ago
hades
4928006555
REPORT-32043 10.0冒烟:设计器启动经常白屏,卡住
5 years ago
Hades
ad3741146f
Pull request #1689 : REPORT-32073【冒烟测试】模板web属性-工具栏编辑之后,点确定,弹窗无法缩回 && REPORT-32105 表单关闭后 JForm对象未释放 导致设计器最终发生oom
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '6a6469cb357c61865ae0df11e0e5c2d97bfbb6b1':
REPORT-32105 表单关闭后 JForm对象未释放 导致设计器最终发生oom
REPORT-32073 fix 换个好名字
REPORT-32073【冒烟测试】模板web属性-工具栏编辑之后,点确定,弹窗无法缩回
5 years ago
kuangshuai
f5c55d8f02
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~tommy/design into release/10.0
5 years ago
kuangshuai
ef832d90a1
MOBILE-27000 移动端控件图标支持自定义颜色
5 years ago
hades
6a6469cb35
REPORT-32105 表单关闭后 JForm对象未释放 导致设计器最终发生oom
5 years ago
hades
9870bc907f
REPORT-32073 fix 换个好名字
5 years ago
hades
6232ef5651
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
5 years ago
hades
9e55fcdc50
REPORT-32073【冒烟测试】模板web属性-工具栏编辑之后,点确定,弹窗无法缩回
5 years ago
Harrison
d33f40767e
Pull request #1688 : REPORT-32088【组件加密】@harrison集群安装出现初始化失败
...
Merge in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '5eadee7e22fc2a4e27869baa9d84007cd8b2a2f6':
REPORT-32088【组件加密】@harrison集群安装出现初始化失败 插件接口的位置有点问题, 不能放到 form 下, 要放到 design 下
5 years ago
Harrison
5eadee7e22
Merge branch 'release/10.0' of http://code.fineres.com/scm/~harrison/design into release/10.0
5 years ago
Harrison
ae745082eb
REPORT-32088【组件加密】@harrison集群安装出现初始化失败
...
插件接口的位置有点问题, 不能放到 form 下, 要放到 design 下
5 years ago
Hades
579ceabeb2
Pull request #1687 : REPORT-32068 设计器启动黑屏,出现一次,重启后正常
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a3bdecfbec98b0c101da38f5b3aab6e1c461093c':
REPORT-32068 设计器启动黑屏,出现一次,重启后正常
5 years ago
hades
a3bdecfbec
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
5 years ago
hades
ba5c403f7a
REPORT-32068 设计器启动黑屏,出现一次,重启后正常
5 years ago
Java.Edge
0ba5702e13
Pull request #1685 : REPORT-31784 程序数据集默认命名显示缩略名
...
Merge in DESIGN/design from ~JAVA.EDGE/design:release/10.0 to release/10.0
* commit '3328cf659495c0b0b1ce9a55d0c6816289512d68':
REPORT-31784 程序数据集默认命名显示缩略名
5 years ago
Hades
10e11253b8
Pull request #1686 : REPORT-31866【冒烟测试】切换远程目录,新建模板的数据集展示异常 && REPORT-28701 同步release
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'e04740e1cfc85be5085daa11059649faa2421a1c':
REPORT-31866【冒烟测试】切换远程目录,新建模板的数据集展示异常 && REPORT-28701 同步release
5 years ago
hades
e04740e1cf
REPORT-31866【冒烟测试】切换远程目录,新建模板的数据集展示异常 && REPORT-28701 同步release
5 years ago
Java.Edge
3328cf6594
REPORT-31784 程序数据集默认命名显示缩略名
5 years ago
Java.Edge
4abaeff920
Merge branch 'release/10.0' of https://code.fineres.com/scm/~java.edge/design into localsss
5 years ago