Bryant
|
7304495a2b
|
Merge pull request #1620 in DESIGN/design from ~BRYANT/design:bugfix/10.0 to bugfix/10.0
* commit '58d48fa902510038086c4e4578e5e42ed08267d4':
REPORT-28922 正如zack所说,列数较少的情况没有测试过
|
4 years ago |
Bryant
|
58d48fa902
|
Merge remote-tracking branch 'origin/bugfix/10.0' into bugfix/10.0
|
4 years ago |
Bryant
|
cd3447b80e
|
REPORT-28922 正如zack所说,列数较少的情况没有测试过
|
4 years ago |
Hades
|
33cc0a2d60
|
Merge pull request #1617 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'bde8a6bf5f8cd59ea5572d70b112b42b485b75f9':
REPORT-29864 服务器数据集重命名问题
|
4 years ago |
hades
|
bde8a6bf5f
|
REPORT-29864 服务器数据集重命名问题
|
4 years ago |
neil
|
82364d767f
|
Merge pull request #1571 in DESIGN/design from final/10.0 to bugfix/10.0
* commit '9843263ea817202e2971a657ed9b7ee7019a7425': (386 commits)
REPORT-28351 强转问题 同步到final
REPORT-29003 错误报告问题
REPORT-28830 提示优化
REPORT-28894 多次切换远程的问题 && xml不可读处理
fix mac下不用awt的库读写
REPORT-28873
REPORT-28792 表单添加tab块问题
fix dock name
fix 遗漏
REPORT-28846 && REPORT-28830 && REPORT-27109
REPORT-27106 && REPORT-28229
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
CHART-13064 修改含有自动button的颜色选择器高度
fix import
REPORT-27106 && REPORT-27144
CHART-13065 调整字符间距
CHART-13063 修改试管仪表盘布局文案
REPORT-28186 mac出现短暂原生java图标问题
REPORT-28368 死锁问题 常量不需要每次读取
REPORT-28257 && REPORT-28257
...
|
4 years ago |
Hugh.C
|
17d527e239
|
Merge pull request #1558 in DESIGN/design from ~HUGH.C/design:bugfix/10.0 to bugfix/10.0
* commit 'e610b4f3303dadd36f4e37e7dcf460f7770faca5':
REPORT-28697 边框设置为透明色,无法保存
|
4 years ago |
Hugh.C
|
e610b4f330
|
Merge branch 'bugfix/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/design into bugfix/10.0
|
4 years ago |
Hugh.C
|
74f3b0957a
|
REPORT-28697 边框设置为透明色,无法保存
|
4 years ago |
Kara
|
9843263ea8
|
Merge pull request #1551 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '51b8d222cd1bd525eef8c2a36369e6eef8973e6b':
REPORT-28351 强转问题 同步到final
|
4 years ago |
hades
|
51b8d222cd
|
REPORT-28351 强转问题 同步到final
|
4 years ago |
Hades
|
70452bee41
|
Merge pull request #1547 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'd2713dced7d238913526a90fab781f1c40f5955e':
REPORT-28351 强转问题
|
4 years ago |
hades
|
d2713dced7
|
REPORT-28351 强转问题
|
4 years ago |
Kara
|
5245903fcc
|
Merge pull request #1544 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '57115393825ba779904ec9f52c7a8f84da3ff3f5':
REPORT-29003 错误报告问题
|
4 years ago |
hades
|
5711539382
|
REPORT-29003 错误报告问题
|
4 years ago |
Kara
|
0a1982c324
|
Merge pull request #1543 in DESIGN/design from ~JEO/report-design:final/10.0 to final/10.0
* commit '4ab79ba72139765353af1df014af0e325b2b9806': (316 commits)
REPORT-28830 提示优化
REPORT-28894 多次切换远程的问题 && xml不可读处理
fix mac下不用awt的库读写
REPORT-28873
REPORT-28792 表单添加tab块问题
fix dock name
fix 遗漏
REPORT-28846 && REPORT-28830 && REPORT-27109
REPORT-27106 && REPORT-28229
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
CHART-13064 修改含有自动button的颜色选择器高度
fix import
REPORT-27106 && REPORT-27144
CHART-13065 调整字符间距
CHART-13063 修改试管仪表盘布局文案
REPORT-28186 mac出现短暂原生java图标问题
REPORT-28368 死锁问题 常量不需要每次读取
REPORT-28257 && REPORT-28257
合代码冲突
REPORT-28368 死锁问题 常量不需要每次读取
...
|
4 years ago |
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
|
4 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 提示优化
|
4 years ago |
hades
|
630e28c147
|
REPORT-28830 提示优化
|
4 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不可读处理
|
4 years ago |
hades
|
8dd916387b
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
4 years ago |
hades
|
ef9e7cf130
|
REPORT-28894 多次切换远程的问题 && xml不可读处理
|
4 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块问题
|
4 years ago |
hades
|
3b042ad1d8
|
fix mac下不用awt的库读写
|
4 years ago |
hades
|
48f0d92f78
|
REPORT-28873
|
4 years ago |
hades
|
1a8bf02e6c
|
REPORT-28792 表单添加tab块问题
|
4 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
|
4 years ago |
hades
|
a691ce2f76
|
fix dock name
|
4 years ago |
hades
|
c2a9b82806
|
fix 遗漏
|
4 years ago |
hades
|
0a5213bd15
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
4 years ago |
hades
|
0107dc1f7d
|
REPORT-28846 && REPORT-28830 && REPORT-27109
|
4 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
|
4 years ago |
hades
|
81b36cdd41
|
REPORT-27106 && REPORT-28229
|
4 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
|
4 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 修改试管仪表盘布局文案
|
4 years ago |
Qinghui.Liu
|
76f3423349
|
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
|
4 years ago |
Qinghui.Liu
|
235422b755
|
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
|
4 years ago |
Qinghui.Liu
|
c4e900ef74
|
CHART-13064 修改含有自动button的颜色选择器高度
|
4 years ago |
hades
|
91c9b0535d
|
fix import
|
4 years ago |
hades
|
4c89737094
|
REPORT-27106 && REPORT-27144
|
4 years ago |
Qinghui.Liu
|
29c32eaee5
|
CHART-13065 调整字符间距
|
4 years ago |
Qinghui.Liu
|
d5e6daeff9
|
CHART-13063 修改试管仪表盘布局文案
|
4 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 死锁问题 常量不需要每次读取
|
4 years ago |
hades
|
a4584870bd
|
REPORT-28186 mac出现短暂原生java图标问题
|
4 years ago |
hades
|
fc9c029ec7
|
REPORT-28368 死锁问题 常量不需要每次读取
|
4 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
|
4 years ago |
hades
|
e215b36f5e
|
REPORT-28257 && REPORT-28257
|
4 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 高度重置问题
|
4 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 高度重置问题
|
4 years ago |
neil
|
2ac41d22f7
|
合代码冲突
|
4 years ago |