zheng
|
6504be5660
|
Merge pull request #1300 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '3cbb9f505e58e0fb34c8e005e6ee165513a16671':
代码质量
有些层级可能没配数据
|
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 |
shine
|
3cbb9f505e
|
代码质量
|
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 |
Hades
|
edb48697b4
|
Merge pull request #1298 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '668c96259ec0261f8dae20e176a1bc426a302560':
REPORT-12734 条件属性中的一些属性设置无效 10.0同步
fix
REPORT-7034【报表】设计器》frm》body属性的布局方式切换以后,body的事件以及移动端设置均失效
|
5 years ago |
yaoh.wu
|
52ea291e7a
|
Merge pull request #1299 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '55bb2395ac9a8e22275d2572cbe32dffd43ea4b0':
REPORT-23978 代码合并出错
|
5 years ago |
shine
|
1fa6d92adf
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into feature/10.0
|
5 years ago |
shine
|
aa6c95aef5
|
有些层级可能没配数据
|
5 years ago |
yaoh.wu
|
55bb2395ac
|
REPORT-23978 代码合并出错
|
5 years ago |
hades
|
668c96259e
|
REPORT-12734 条件属性中的一些属性设置无效 10.0同步
|
5 years ago |
hades
|
c26ec30e4b
|
fix
|
5 years ago |
hades
|
1b087b977c
|
REPORT-7034【报表】设计器》frm》body属性的布局方式切换以后,body的事件以及移动端设置均失效
|
5 years ago |
Hades
|
90141cd6fc
|
Merge pull request #1297 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '9651ecbecdc86d220115b226177135a5bc720911':
REPORT-24098 稳定共创:设计器一打开模板就触发保存操作,未做任何修改
|
5 years ago |
hades
|
9651ecbecd
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
5 years ago |
hades
|
b784ae0156
|
REPORT-24098 稳定共创:设计器一打开模板就触发保存操作,未做任何修改
|
5 years ago |
Hades
|
f90bfd0260
|
Merge pull request #1295 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '70ced0541513faf67c3da3c237177fb0dea795e3':
MOBILE-23948 UI调整
|
5 years ago |
Harrison
|
af43464eca
|
Merge pull request #1296 in DESIGN/design from ~HARRISON/design:feature/10.0 to feature/10.0
* commit '8f5675a2679aede9cb909b8024cd65a19ba81052':
REPORT-20330 sonar问题修复 常量放最上面
REPORT-20330 sonar问题修复 修复 sonar 问题
|
5 years ago |
Harrison
|
8f5675a267
|
REPORT-20330 sonar问题修复
常量放最上面
|
5 years ago |
Harrison
|
770abaaba7
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~harrison/design into feature/10.0
|
5 years ago |
Harrison
|
b3e6da93c8
|
REPORT-20330 sonar问题修复
修复 sonar 问题
|
5 years ago |
hades
|
70ced05415
|
MOBILE-23948 UI调整
|
5 years ago |
Hades
|
39da31a925
|
Merge pull request #1293 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '567ce9609c3f818bc351cb77fc6825e3b1dc75dc':
REPORT-23496 英文版设计器链接修改
|
5 years ago |
zheng
|
2b3aa39eaf
|
Merge pull request #1294 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit 'bb72abe56cbed1ba4cf106177241d99c6a89afce':
CHART-10227 地图 钻取地图 热力地图 数据配置界面
|
5 years ago |
Joe.Jiang
|
03e9ea5e79
|
REPORT-22046 cpt模板设置冻结的时候有个错误的引导.
|
5 years ago |
Joe.Jiang
|
514f3e6408
|
REPORT-17192 模板Web属性中,分页预览设置,采用服务器设置双击置灰工具栏可弹出编辑框
|
5 years ago |
shine
|
bb72abe56c
|
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into feature/10.0
|
5 years ago |
shine
|
1b5847da3d
|
CHART-10227 地图 钻取地图 热力地图 数据配置界面
|
5 years ago |
Wim.Zhai
|
d60148b07e
|
Merge pull request #1292 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit '796e7be795ed89911b00ef8fe3a9afaaa90202b8':
CHART-11093 不实例化,类型不同就不populate 验证了没问题
CHART-11093 反射获取相应数据面板对应的数据类型
CHART-11321 fix 坐标轴显示策略面板checkUse
CHART-11093 refactor 数据面板切换
CHART-11093 按特定数据类型切换数据面板
|
5 years ago |
Wim.Zhai
|
796e7be795
|
CHART-11093 不实例化,类型不同就不populate 验证了没问题
|
5 years ago |
Wim.Zhai
|
32008dbdec
|
CHART-11093 反射获取相应数据面板对应的数据类型
|
5 years ago |
hades
|
567ce9609c
|
REPORT-23496 英文版设计器链接修改
|
5 years ago |
Wim.Zhai
|
de1574353b
|
CHART-11321 fix 坐标轴显示策略面板checkUse
|
5 years ago |
Wim.Zhai
|
e93938a18c
|
CHART-11093 refactor 数据面板切换
|
5 years ago |
Wim.Zhai
|
857da582c5
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |
Wim.Zhai
|
dc7a1d2be8
|
CHART-11093 按特定数据类型切换数据面板
|
5 years ago |
Hades
|
9305c1d0b6
|
Merge pull request #1291 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '3a64382ff90794f3e3176b8a04e83cdea2246587':
fix
MOBILE-23952 文本控件支持只能扫码
|
5 years ago |
hades
|
3a64382ff9
|
fix
|
5 years ago |
hades
|
7e5e781651
|
MOBILE-23952 文本控件支持只能扫码
|
5 years ago |
Bjorn
|
2d63c51c0a
|
Merge pull request #1290 in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit 'ae7d051489da2ec27165db125018bad6288960e3':
无JIRA任务 组合图使用新的数据面板
|
5 years ago |
白岳
|
ae7d051489
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into feature/10.0
|
5 years ago |
白岳
|
69656c4e61
|
无JIRA任务 组合图使用新的数据面板
|
5 years ago |
Hades
|
73a43d6b33
|
Merge pull request #1288 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'caafa89cd896c139c4af26258aa43357d93b6c43':
REPORT-22462 设计器日文、韩文版激活页链接修改
|
5 years ago |
Wim.Zhai
|
6d0dbef6a8
|
Merge pull request #1289 in DESIGN/design from ~WIM.ZHAI/xdesign:feature/10.0 to feature/10.0
* commit 'c34b063a3e3a3f9fcc1b6f52e4a7f2af7d98806a':
CHART-11322 refactor 散点图值字段用size表示
|
5 years ago |
Wim.Zhai
|
c34b063a3e
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~wim.zhai/Xdesign into feature/10.0
|
5 years ago |