jeo
|
6fabbd17b5
|
Merge branch 'release/10.0' into final/10.0
# Conflicts:
# designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/MobileAdvanceDefinePane.java
|
5 years ago |
Hugh.C
|
5f9263f3af
|
Merge pull request #1428 in DESIGN/design from ~HUGH.C/design:release/10.0 to release/10.0
* commit '806392a3cddb4dd59f15c3e9ad2a12d05c61d227':
REPORT-26672 review 改进
REPORT-26672 设计器和服务器都注册的lic都没有勾选远程设计功能点,还是可以远程连接
|
5 years ago |
Hades
|
6c34dddb73
|
Merge pull request #1429 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '37ce54d077bfee7346dbcd33cedbd88ed89083fd':
fix import
MOBILE-25475 && MOBILE-25477
|
5 years ago |
Hades
|
37ce54d077
|
fix import
|
5 years ago |
Hades
|
defb4f37df
|
MOBILE-25475 && MOBILE-25477
|
5 years ago |
Hugh.C
|
806392a3cd
|
REPORT-26672 review 改进
|
5 years ago |
Hugh.C
|
f79198c2d7
|
REPORT-26672 设计器和服务器都注册的lic都没有勾选远程设计功能点,还是可以远程连接
|
5 years ago |
Hades
|
08cbd95154
|
Merge pull request #1427 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'b24d3a2fdd9f3bda262a0f63038d2c60242ce036':
fix 国际化
MOBILE-25397 折叠展开样式设计器部分
|
5 years ago |
Hades
|
b24d3a2fdd
|
fix 国际化
|
5 years ago |
Hades
|
6d96de4b77
|
MOBILE-25397 折叠展开样式设计器部分
|
5 years ago |
neil
|
88040609b2
|
Merge pull request #1426 in DESIGN/design from bugfix/10.0 to release/10.0
* commit 'f95f38e751d6ff317839b05818b763e4a66a6411':
REPORT-26492 二维码显示不对
REPORT-26432 10.0.4设计器中没有sheet可见
|
5 years ago |
Hades
|
5750edf894
|
Merge pull request #1425 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '790e2b4dbb42d00b7a194c10f3e319d85fa3b177':
fix 初始化
fix
MOBILE-25111 默认UI调整
|
5 years ago |
Hades
|
790e2b4dbb
|
fix 初始化
|
5 years ago |
Hades
|
415097149f
|
fix
|
5 years ago |
Hades
|
e362e333fe
|
MOBILE-25111 默认UI调整
|
5 years ago |
Hades
|
ad65d2228b
|
Merge pull request #1422 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '1bb3fb7c073f5b3dd54d8ff58d26ad2d9599aabb':
CHART-12645 默认值被覆盖
|
5 years ago |
Hades
|
1bb3fb7c07
|
CHART-12645 默认值被覆盖
|
5 years ago |
Hades
|
bacf92e6e7
|
Merge pull request #1421 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '1ee4bfc3bf63eb857dcf00efc69fe8476c58b136':
fix
REPORT-25003 && REPORT-24491
|
5 years ago |
hades
|
1ee4bfc3bf
|
fix
|
5 years ago |
kerry
|
3b9b679b93
|
Merge pull request #1420 in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'b69b0bcad8c7a8bf2039fce97b4ec8f84264a5aa':
REPORT-24174【新引擎】批量转换及检测
|
5 years ago |
zheng
|
80b49c6edd
|
Merge pull request #1419 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'f9e58113c1001e09ca11966949a8653ccbeb42f7':
update
CHART-12406 弹出图片文件选择框时,条件属性弹框不应该隐藏
|
5 years ago |
hades
|
531c7ba284
|
REPORT-25003 && REPORT-24491
|
5 years ago |
kerry
|
b69b0bcad8
|
REPORT-24174【新引擎】批量转换及检测
|
5 years ago |
shine
|
f9e58113c1
|
update
|
5 years ago |
shine
|
f63aca1624
|
CHART-12406 弹出图片文件选择框时,条件属性弹框不应该隐藏
|
5 years ago |
Harrison
|
7740e3e2e5
|
Merge pull request #1417 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit 'e7584b8ea03180039b73d3fab9ba9cb51f8e177b':
REPORT-25778 json数据集,设计器重启之后消失 换一种处理方式,刷新面板会导致各种诡异的问题
|
5 years ago |
Hades
|
f95f38e751
|
Merge pull request #1415 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '96630f3992f63734f363b81e87a62b9aca39b2c3':
REPORT-26492 二维码显示不对
|
5 years ago |
Kara
|
2228f0de9c
|
Merge pull request #1416 in DESIGN/design from ~HARRISON/design:final/10.0 to final/10.0
* commit '03a8dd09dd24eb727912110c9d1b357a56641673':
REPORT-25778 json数据集,设计器重启之后消失 换一种处理方式,刷新面板会导致各种诡异的问题
|
5 years ago |
Harrison
|
03a8dd09dd
|
REPORT-25778 json数据集,设计器重启之后消失
换一种处理方式,刷新面板会导致各种诡异的问题
|
5 years ago |
Harrison
|
e7584b8ea0
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/design into release/10.0
|
5 years ago |
Harrison
|
504de4f64d
|
REPORT-25778 json数据集,设计器重启之后消失
换一种处理方式,刷新面板会导致各种诡异的问题
|
5 years ago |
hades
|
96630f3992
|
REPORT-26492 二维码显示不对
|
5 years ago |
Hades
|
e07f0be56d
|
Merge pull request #1412 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '42d5374cf057c5ad2a572527622ff401e7531642':
MOBILE-24587 防止不必要的提示 && 取消勾选时更新
|
5 years ago |
Lucian.Chen
|
dca9e55916
|
Merge pull request #1409 in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0
* commit '2db22ea09bef4069b4d972f88ce076f77d4bd5b4':
REPORT-26432 10.0.4设计器中没有sheet可见
|
5 years ago |
Kara
|
65bb82da35
|
Merge pull request #1413 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '4d56944006ef9e650d568c69e1671b7eed5822a9':
MOBILE-24587 同步到final
|
5 years ago |
hades
|
4d56944006
|
MOBILE-24587 同步到final
|
5 years ago |
hades
|
42d5374cf0
|
MOBILE-24587 防止不必要的提示 && 取消勾选时更新
|
5 years ago |
Kara
|
de8eaf3b5a
|
Merge pull request #1410 in DESIGN/design from ~HARRISON/design:final/10.0 to final/10.0
* commit 'e5fd1dc1d1d3aaa5da43b434edcc55845f2153c2':
REPORT-26263 切换远程目录到tomcat,放置一段时间切回本地,出现切换失败的弹窗,实际切换成功 修复 npe 。
|
5 years ago |
Kara
|
20fdc2fa24
|
Merge pull request #1411 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '95200e200aeb9b54c5beb81d64e3a8198600fa4d':
fix
REPORT-26085 同步到final
|
5 years ago |
hades
|
95200e200a
|
fix
|
5 years ago |
hades
|
c50ff81c15
|
REPORT-26085 同步到final
|
5 years ago |
Harrison
|
e5fd1dc1d1
|
REPORT-26263 切换远程目录到tomcat,放置一段时间切回本地,出现切换失败的弹窗,实际切换成功
修复 npe 。
|
5 years ago |
lucian
|
2db22ea09b
|
REPORT-26432 10.0.4设计器中没有sheet可见
|
5 years ago |
Harrison
|
18aed834f6
|
Merge pull request #1407 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0
* commit '5433e90036069c4d51d2e6fd2098edfaac5d27e7':
REPORT-26263 切换远程目录到tomcat,放置一段时间切回本地,出现切换失败的弹窗,实际切换成功 修复 npe 。
|
5 years ago |
Hades
|
ccf17a474d
|
Merge pull request #1406 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '268d569545c12dcf6612045e1148105ad1993f34':
REPORT-26085 在参数面板添加定义的全局参数,两个参数控件会重叠
|
5 years ago |
Harrison
|
5433e90036
|
REPORT-26263 切换远程目录到tomcat,放置一段时间切回本地,出现切换失败的弹窗,实际切换成功
修复 npe 。
|
5 years ago |
hades
|
268d569545
|
REPORT-26085 在参数面板添加定义的全局参数,两个参数控件会重叠
|
5 years ago |
Kara
|
ce96f17a09
|
Merge pull request #1405 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '6ef9b8cdaf4d4614ba7ece787d02c660afafefa3':
MOBILE-24962 && MOBILE-24940 合到final
|
5 years ago |
rinoux
|
93177f5ed7
|
Merge pull request #1403 in DESIGN/design from ~RINOUX/design:release/10.0 to release/10.0
* commit '293d1e96755afcd5066acc63ba852dda1cad442e':
REPORT-25986 设置一下资源根目录,否则无法通过ServletContext.getResource读到工程文件
|
5 years ago |
hades
|
6ef9b8cdaf
|
MOBILE-24962 && MOBILE-24940 合到final
|
5 years ago |