jeo
|
e54eb9283a
|
Merge branch 'release/10.0' into final/10.0
# Conflicts:
# designer-base/src/main/java/com/fr/design/gui/icombocheckbox/UIComboCheckBox.java
|
5 years ago |
zheng
|
b8b23a0b87
|
Merge pull request #1338 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '676ce66802fa0da8c42e868f1812858755848d92':
国际化
tooltip
CHART-11779 远程设计 地图资源增加刷新按钮
|
5 years ago |
shine
|
676ce66802
|
国际化
|
5 years ago |
shine
|
c0f2fc6b88
|
tooltip
|
5 years ago |
shine
|
af082fd6d5
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
e69f6ecc6b
|
CHART-11779 远程设计 地图资源增加刷新按钮
|
5 years ago |
pengda
|
602375cab4
|
Merge pull request #1335 in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '28110a0d54c426b8f5a05833bbc5cbab7ade3f43':
REPORT-19946 linux设计器
|
5 years ago |
zheng
|
3e9116faeb
|
Merge pull request #1336 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '76b7e9882a208eb90bea9a43a93dbe347ad90ffa':
CHART-11852 CHART-11634改出来的问题,条件属性的标签没有parentPane
|
5 years ago |
shine
|
76b7e9882a
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
2059abaa7b
|
CHART-11852 CHART-11634改出来的问题,条件属性的标签没有parentPane
|
5 years ago |
pengda
|
28110a0d54
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
5 years ago |
pengda
|
2d9bb546cc
|
REPORT-19946 linux设计器
|
5 years ago |
zheng
|
3226f06e65
|
Merge pull request #1333 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '5a3fe79d16b06a837ad657a47a036505ac545dfe':
CHART-11634 bug退回:值标签没有位置 报npe
|
5 years ago |
Hades
|
125de3c8d6
|
Merge pull request #1331 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '9278f6e3b1bde55e9e16d4280e5341ba5cb31238':
MOBILE-24394 组件冻结选项操作后,进行保存失败
|
5 years ago |
shine
|
5a3fe79d16
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
f65f770a12
|
CHART-11634 bug退回:值标签没有位置 报npe
|
5 years ago |
hades
|
9278f6e3b1
|
MOBILE-24394 组件冻结选项操作后,进行保存失败
|
5 years ago |
zheng
|
4fe9bff622
|
Merge pull request #1326 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'fc20b97c2db2e6903085f07595f184c6730ac228':
CHART-11634 试管仪表盘从横向变成纵向 标签位置应该从上下变成左右
|
5 years ago |
shine
|
fc20b97c2d
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0
|
5 years ago |
shine
|
72a50125db
|
CHART-11634 试管仪表盘从横向变成纵向 标签位置应该从上下变成左右
|
5 years ago |
Jinbokai
|
206afa9f9b
|
Merge pull request #1325 in DESIGN/design from ~JINBOKAI/design:release/10.0 to release/10.0
* commit 'b3f60132b9cc1fc29110c043f2faf8ff50c9ba73':
REPORT-20328 sonar问题修复
|
5 years ago |
Lucian.Chen
|
dbe7be9682
|
Merge pull request #1324 in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit 'c66568f7785e7cd02945c262d773c996466fd52d':
REPORT-24455 切换远程工作目录,新建模板保存,保存的特别慢
|
5 years ago |
jinbokai
|
b3f60132b9
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
5 years ago |
jinbokai
|
8db3817862
|
REPORT-20328 sonar问题修复
|
5 years ago |
lucian
|
c66568f778
|
REPORT-24455 切换远程工作目录,新建模板保存,保存的特别慢
|
5 years ago |
Hades
|
66cdc4947b
|
Merge pull request #1320 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '867012b3b1c16abeb4d2641ed5968bd9cd837c6f':
REPORT-24085 稳定共创:在文件树二级目录下删除模板,会直接跳到上一级目录 by joe.jiang
|
5 years ago |
hades
|
867012b3b1
|
REPORT-24085 稳定共创:在文件树二级目录下删除模板,会直接跳到上一级目录 by joe.jiang
|
5 years ago |
neil
|
bf92fe055f
|
Merge pull request #1316 in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0
* commit '0825dc9abef1fa0e23ad4ca3f40fe0846e486776':
无jira任务 适配一些老插件的属性监听界面
|
5 years ago |
Bryant
|
0825dc9abe
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
5 years ago |
Bryant
|
b809dd6662
|
无jira任务 适配一些老插件的属性监听界面
|
5 years ago |
neil
|
f0a0e6a219
|
Merge pull request #1312 in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '1b936122d0bd92763e207a70250635f2a116b2c2':
REPORT-23943 进入参数面板,点击预定义控件,弹框无法缩回
REPORT-23960 linux设计器-rhel系统,超级链接问题
REPORT-23954 linux设计器-rhel系统,条件属性问题
|
5 years ago |
Hades
|
05c1465b08
|
Merge pull request #1314 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'ffa155d0108bee325988142e5789b6352d46c90d':
REPORT-24357 [冒烟]条件属性中缩进属性,设置完毕不点击原来的焦点,缩进距离无法保存 10.0同步
|
5 years ago |
hades
|
ffa155d010
|
REPORT-24357 [冒烟]条件属性中缩进属性,设置完毕不点击原来的焦点,缩进距离无法保存 10.0同步
|
5 years ago |
Hades
|
8062ea94f4
|
Merge pull request #1306 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '9daf000d59be72c07c6431d800079dbe0def7925':
fix
REPORT-24176 设计器 数据字典问题
|
5 years ago |
pengda
|
1b936122d0
|
REPORT-23943 进入参数面板,点击预定义控件,弹框无法缩回
|
5 years ago |
pengda
|
b8177b3b48
|
REPORT-23960 linux设计器-rhel系统,超级链接问题
|
5 years ago |
pengda
|
2927a00a09
|
REPORT-23954 linux设计器-rhel系统,条件属性问题
|
5 years ago |
hades
|
9daf000d59
|
fix
|
5 years ago |
Kara
|
64570fd666
|
Merge pull request #1307 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'c6807c1291f158f00667492e02d2cb49116a4f44':
REPORT-24098 稳定共创:设计器一打开模板就触发保存操作,未做任何修改
|
5 years ago |
hades
|
c6807c1291
|
REPORT-24098 稳定共创:设计器一打开模板就触发保存操作,未做任何修改
|
5 years ago |
hades
|
7c5e9cc3cc
|
REPORT-24176 设计器 数据字典问题
|
5 years ago |
rinoux
|
01a5d7fca0
|
Merge pull request #1302 in DESIGN/design from ~RINOUX/design:release/10.0 to release/10.0
* commit 'bc561230078d7f398ac75103029b66bb30f19314':
REPORT-22877 远程环境判断是否集群
|
5 years ago |
Bryant
|
9ddc4d496f
|
Merge pull request #1303 in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0
* commit '1dde2b5e1f5ddaa0ca2956f6ac38e8b6fe7a53c7':
REPORT-24070 控件属性界面监听事件
|
5 years ago |
Hades
|
76f7df3a5c
|
Merge pull request #1301 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'd00ddff1c60726421440382592a4b350bd17d059':
REPORT-22046 cpt模板设置冻结的时候有个错误的引导.
REPORT-17192 模板Web属性中,分页预览设置,采用服务器设置双击置灰工具栏可弹出编辑框
REPORT-23627 设计器颜色设置自定义页面中RGB和HSL互相转换有问题
REPORT-22046 cpt模板设置冻结的时候有个错误的引导.
|
5 years ago |
Bryant
|
1dde2b5e1f
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
5 years ago |
Bryant
|
5107f9a0b3
|
REPORT-24070 控件属性界面监听事件
|
5 years ago |
rinoux
|
bc56123007
|
REPORT-22877 远程环境判断是否集群
|
5 years ago |
Hades
|
d00ddff1c6
|
Merge pull request #9 in ~HADES/design from ~JOE.JIANG/design:REPORT-23627 to release/10.0
* commit 'b7d2d199ec1c4da5f06c7f41aa9fe98a2ee447cd':
REPORT-23627 设计器颜色设置自定义页面中RGB和HSL互相转换有问题
|
5 years ago |
Hades
|
e612e46ecf
|
Merge pull request #10 in ~HADES/design from ~JOE.JIANG/design:REPORT-17192 to release/10.0
* commit '514f3e64081b9cee67dee5c11bac5878fbd42e48':
REPORT-17192 模板Web属性中,分页预览设置,采用服务器设置双击置灰工具栏可弹出编辑框
|
5 years ago |
Hades
|
b0379362cc
|
Merge pull request #7 in ~HADES/design from ~JOE.JIANG/design:REPORT-22046 to release/10.0
* commit '03e9ea5e795a9f50ebf318dba90666fbe1bddd87':
REPORT-22046 cpt模板设置冻结的时候有个错误的引导.
REPORT-22046 cpt模板设置冻结的时候有个错误的引导.
|
5 years ago |