jeo
|
4ab79ba721
|
Merge branch 'release/10.0' into final/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java
# designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java
|
5 years ago |
Hades
|
55d062d235
|
Merge pull request #1541 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '630e28c14701ed8ea2bf808c455b4443ef2c7483':
REPORT-28830 提示优化
|
5 years ago |
hades
|
630e28c147
|
REPORT-28830 提示优化
|
5 years ago |
Hades
|
74ddb8790e
|
Merge pull request #1540 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '8dd916387bbd87b8a36b6bc919ecc246b0696bf9':
REPORT-28894 多次切换远程的问题 && xml不可读处理
|
5 years ago |
hades
|
8dd916387b
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
5 years ago |
hades
|
ef9e7cf130
|
REPORT-28894 多次切换远程的问题 && xml不可读处理
|
5 years ago |
Hades
|
a79377fb4a
|
Merge pull request #1539 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '3b042ad1d84b525c5f90324f53bf392b96dc6621':
fix mac下不用awt的库读写
REPORT-28873
REPORT-28792 表单添加tab块问题
|
5 years ago |
hades
|
3b042ad1d8
|
fix mac下不用awt的库读写
|
5 years ago |
hades
|
48f0d92f78
|
REPORT-28873
|
5 years ago |
hades
|
1a8bf02e6c
|
REPORT-28792 表单添加tab块问题
|
5 years ago |
Hades
|
76967f3c0a
|
Merge pull request #1538 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a691ce2f76d823aba88a97fc1cfe290c30690e34':
fix dock name
fix 遗漏
REPORT-28846 && REPORT-28830 && REPORT-27109
|
5 years ago |
hades
|
a691ce2f76
|
fix dock name
|
5 years ago |
hades
|
c2a9b82806
|
fix 遗漏
|
5 years ago |
hades
|
0a5213bd15
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
5 years ago |
hades
|
0107dc1f7d
|
REPORT-28846 && REPORT-28830 && REPORT-27109
|
5 years ago |
Hades
|
391898c918
|
Merge pull request #1537 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '81b36cdd4185f3e883626d6cd56471821859ad94':
REPORT-27106 && REPORT-28229
|
5 years ago |
hades
|
81b36cdd41
|
REPORT-27106 && REPORT-28229
|
5 years ago |
Hades
|
0bb39046f5
|
Merge pull request #1535 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '91c9b0535d35dbdb087e44c7052e9b450659412f':
fix import
REPORT-27106 && REPORT-27144
|
5 years ago |
Qinghui.Liu
|
3877a21cf4
|
Merge pull request #1536 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '76f3423349e4b955828404c771221b77e6926a37':
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
CHART-13064 修改含有自动button的颜色选择器高度
CHART-13065 调整字符间距
CHART-13063 修改试管仪表盘布局文案
|
5 years ago |
Qinghui.Liu
|
76f3423349
|
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
|
5 years ago |
Qinghui.Liu
|
235422b755
|
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
|
5 years ago |
Qinghui.Liu
|
c4e900ef74
|
CHART-13064 修改含有自动button的颜色选择器高度
|
5 years ago |
hades
|
91c9b0535d
|
fix import
|
5 years ago |
hades
|
4c89737094
|
REPORT-27106 && REPORT-27144
|
5 years ago |
Qinghui.Liu
|
29c32eaee5
|
CHART-13065 调整字符间距
|
5 years ago |
Qinghui.Liu
|
d5e6daeff9
|
CHART-13063 修改试管仪表盘布局文案
|
5 years ago |
Hades
|
6877b95101
|
Merge pull request #1531 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a4584870bd2fa7b88e18d18c7233ffbd7e341208':
REPORT-28186 mac出现短暂原生java图标问题
REPORT-28368 死锁问题 常量不需要每次读取
|
5 years ago |
hades
|
a4584870bd
|
REPORT-28186 mac出现短暂原生java图标问题
|
5 years ago |
hades
|
fc9c029ec7
|
REPORT-28368 死锁问题 常量不需要每次读取
|
5 years ago |
Hades
|
015e1d15e0
|
Merge pull request #1529 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'e215b36f5e43ef1fce974ab9cf33f0b36ce3a9c5':
REPORT-28257 && REPORT-28257
|
5 years ago |
hades
|
e215b36f5e
|
REPORT-28257 && REPORT-28257
|
5 years ago |
neil
|
9761955059
|
Merge pull request #1528 in DESIGN/design from ~NEIL/design:release/10.0 to release/10.0
* commit '883240b8bd904c15cf32a12463b8fc86c7e3eba8':
合代码冲突
REPORT-27985 frm里报表块单元格超链设置缺少选项
REPORT-26915 疫情大屏模板导出内置模板为空
fix
MOBILE-25615 高度重置问题
|
5 years ago |
neil
|
883240b8bd
|
Merge pull request #1 in ~NEIL/design from bugfix/10.0 to release/10.0
* commit '2ac41d22f71d91eab15690a4f156a9cea9491409':
合代码冲突
REPORT-27985 frm里报表块单元格超链设置缺少选项
REPORT-26915 疫情大屏模板导出内置模板为空
fix
MOBILE-25615 高度重置问题
|
5 years ago |
neil
|
2ac41d22f7
|
合代码冲突
|
5 years ago |
Hades
|
ca9f0123ec
|
Merge pull request #1523 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '2f42c6c52ae82ed619f0ea861041047db79b7898':
REPORT-28368 死锁问题 常量不需要每次读取
CHART-13168 && REPORT-27122
|
5 years ago |
Bjorn
|
266aa99fa7
|
Merge pull request #1525 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'fe01323af02935a217b9781c82d6c33063d39a28':
CHART-13072 设计器中查询数据集数据的时候替换为FR预览数据的接口查询
|
5 years ago |
hades
|
2f42c6c52a
|
REPORT-28368 死锁问题 常量不需要每次读取
|
5 years ago |
白岳
|
fe01323af0
|
CHART-13072 设计器中查询数据集数据的时候替换为FR预览数据的接口查询
|
5 years ago |
hades
|
7364fd157b
|
CHART-13168 && REPORT-27122
|
5 years ago |
Hades
|
619d35c0bd
|
Merge pull request #1522 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'b5c6415475c407b49c1cabf048c07f9a96915ec3':
REPORT-28202 && REPORT-28259 && REPORT-27271 && REPORT-28036
|
5 years ago |
Bjorn
|
4a521d73bb
|
Merge pull request #1519 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '76aa8a08d36f5f07e9fe91941e9533b2c5e30064':
CHART-13116 自定义匹配时把匹配数据转换为String
|
5 years ago |
Kara
|
b5c6415475
|
REPORT-28202 && REPORT-28259 && REPORT-27271 && REPORT-28036
|
5 years ago |
Kara
|
60b07cfef3
|
Merge pull request #1521 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '63d019cb6e6903e8fb26fd48705f3267ea29e5cd':
REPORT-28459 JWorkBook 未释放 同步到final
|
5 years ago |
Hades
|
b29797e789
|
Merge pull request #1520 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '567c127a12662fb0336f20f5b9c9ac23508ae961':
REPORT-28459 JWorkBook 未释放
|
5 years ago |
hades
|
63d019cb6e
|
REPORT-28459 JWorkBook 未释放 同步到final
|
5 years ago |
hades
|
567c127a12
|
REPORT-28459 JWorkBook 未释放
|
5 years ago |
白岳
|
76aa8a08d3
|
CHART-13116 自定义匹配时把匹配数据转换为String
|
5 years ago |
Bjorn
|
f4eeb01c34
|
Merge pull request #1515 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '38c8770933d676ff6ddfc164f29dfc51f9d586ef':
CHART-12820 地图边界内缺少数据
CHART-13049 英文环境下布局的问题
|
5 years ago |
白岳
|
38c8770933
|
CHART-12820 地图边界内缺少数据
|
5 years ago |
Hades
|
8f99925abc
|
Merge pull request #1517 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '047b1a2b44db871c4a76ced8bf1099fd99c27eaf':
REPORT-28459 JWorkBook未释放 场景补充
|
5 years ago |