ju
|
2ca3b6f2cb
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
ju
|
294fddc2b0
|
无JIRA任务 改一部分findbugs
|
6 years ago |
ju
|
459e851f74
|
Merge pull request #527 in DESIGN/design from ~JU/design:release/10.0 to release/10.0
* commit '6675c853b82799b507df9b4c1364e8f88ba1cd87':
无JIRA任务 修改严重findbugs
REPORT-11123 【10.0冒烟】表单预览国际化问题,点击没反应(master屏蔽移动端预览功能)
无JIRA任务, 冲突修复.
无JIRA任务 master屏蔽国际化区分
|
6 years ago |
ju
|
6675c853b8
|
无JIRA任务 修改严重findbugs
|
6 years ago |
Wim.Zhai
|
19f3b07ca6
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit '822826117ba524f0e274ca1ff612da862e67a45f':
无JIRA任务,复用原有代码
REPORT-11590 环境切换执行完毕后关闭选择对话框,启动时环境切换和9保持一致
REPORT-11257
|
6 years ago |
zheng
|
fe8fed4baf
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
6 years ago |
zheng
|
49e23ae96e
|
CHART-3122 流向地球不支持超链
|
6 years ago |
yaoh.wu
|
822826117b
|
Merge pull request #521 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '3c28ceda91422a74ffb70d4166b77848d55294df':
无JIRA任务,复用原有代码
|
6 years ago |
yaoh.wu
|
3c28ceda91
|
无JIRA任务,复用原有代码
|
6 years ago |
yaoh.wu
|
2e4ba4aec9
|
Merge pull request #519 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit 'fe66bd8aa18b782327909e1e3641e928cfe280e5':
REPORT-11590 环境切换执行完毕后关闭选择对话框,启动时环境切换和9保持一致
|
6 years ago |
Mata.Li
|
c7ad228d13
|
Merge pull request #518 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '0714eea7b0452c12d4db211ba80c0a55fe062c76':
REPORT-11257
|
6 years ago |
yaoh.wu
|
fe66bd8aa1
|
REPORT-11590 环境切换执行完毕后关闭选择对话框,启动时环境切换和9保持一致
|
6 years ago |
Mata.Li
|
0714eea7b0
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
8f44f809e1
|
REPORT-11257
|
6 years ago |
Wim.Zhai
|
6de15112dd
|
revert code
|
6 years ago |
Wim.Zhai
|
6ebff68d17
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit '3d339165da0fc5e47716462fa86ba0e5c5757997':
REPORT-11586 不同语言环境超链选项展示问题
CHART-3073 字段下拉框包含无这个选项 && CHART-3060 中文无和英文none
|
6 years ago |
yaoh.wu
|
3d339165da
|
Merge pull request #516 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '1a9ef4739dfc3b6e5292cb325aa9d6c1de27a1f5':
REPORT-11586 不同语言环境超链选项展示问题
|
6 years ago |
zheng
|
122c9718e6
|
Merge pull request #515 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'e766024a4aa267373defceea815ace82d5ab66fe':
CHART-3073 字段下拉框包含无这个选项 && CHART-3060 中文无和英文none
|
6 years ago |
Wim.Zhai
|
3dd3b876c4
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0
|
6 years ago |
Wim.Zhai
|
ceea3afd28
|
CHART-3044 新增构造器,初始化自定义颜色
|
6 years ago |
yaoh.wu
|
1a9ef4739d
|
REPORT-11586 不同语言环境超链选项展示问题
|
6 years ago |
zheng
|
e766024a4a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
6 years ago |
zheng
|
740ae4fb47
|
CHART-3073 字段下拉框包含无这个选项 && CHART-3060 中文无和英文none
|
6 years ago |
ju
|
323cc262a1
|
Merge branch '10.0' of ssh://cloud.finedevelop.com:7999/~ju/design into release/10.0
|
6 years ago |
ju
|
5d5f23795a
|
Merge pull request #512 in DESIGN/design from feature/10.0 to release/10.0
* commit 'a453d3951edcd1d120c87aff2360dddf5d11f059':
单元测试用例
|
6 years ago |
Alex.Sung
|
20b2bc9750
|
Merge pull request #511 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-11523 @Sung:mac下alphafine打开网页超链有问题
* commit 'c117c537f3411469b7501985b27f3374a8b8e856':
REPORT-11523 @Sung:mac下alphafine打开网页超链有问题
|
6 years ago |
alex.sung
|
c117c537f3
|
REPORT-11523
@Sung:mac下alphafine打开网页超链有问题
|
6 years ago |
Alex.Sung
|
fcabee5df1
|
Merge pull request #510 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-11523 @Sung:mac下alphafine打开网页超链有问题
* commit '88db8fbe547d1a58b8eb6058a81d32b5c9f1f2b0':
使用模板打debug日志
代码质量
1.REPORT-11523 @Sung:mac下alphafine打开网页超链有问题 ---修复该问题 2.增强程序健壮性;返回按钮增加小手,增强交互性 3.修改一些次要程度的log的级别
|
6 years ago |
alex.sung
|
88db8fbe54
|
使用模板打debug日志
|
6 years ago |
zheng
|
7182a7ac7a
|
Merge pull request #509 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'd5c554e3c5a1db4f4045000a18834b1a1b2ad777':
CHART-2848 linemap startareaname not areaname
|
6 years ago |
alex.sung
|
2c5649fedb
|
代码质量
|
6 years ago |
alex.sung
|
24bd4c9197
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design into release/10.0
|
6 years ago |
alex.sung
|
ee37af303f
|
1.REPORT-11523 @Sung:mac下alphafine打开网页超链有问题
---修复该问题
2.增强程序健壮性;返回按钮增加小手,增强交互性
3.修改一些次要程度的log的级别
|
6 years ago |
plough
|
d612cd10bf
|
Merge pull request #508 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit 'b224ba62795436f8c94dc972eb2c6286e16aea2e':
REPORT-11335 设计器数据库会显示上一个的记录
|
6 years ago |
zheng
|
d5c554e3c5
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into kpibug
|
6 years ago |
yaoh.wu
|
0091f6f135
|
Merge pull request #507 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit '8dfe80a6a58c5e05e6e5cbc4235f73e6274fb945':
REPORT-11538 自定义提交事件设计器部分bug
|
6 years ago |
plough
|
b224ba6279
|
REPORT-11335 设计器数据库会显示上一个的记录
|
6 years ago |
zheng
|
ea49ba5f14
|
CHART-2848 linemap startareaname not areaname
|
6 years ago |
yaoh.wu
|
8dfe80a6a5
|
REPORT-11538 自定义提交事件设计器部分bug
|
6 years ago |
neil
|
a453d3951e
|
Merge pull request #506 in DESIGN/design from ~ALEX.SUNG/design:feature/10.0 to feature/10.0
* commit '0ed9eef0fbd80656f157c5e3bf772b1f59edeefb':
单元测试用例
|
6 years ago |
alex.sung
|
0ed9eef0fb
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design into feature/10.0
|
6 years ago |
alex.sung
|
572e3dc644
|
单元测试用例
|
6 years ago |
Qinghui.Liu
|
45c71af2cb
|
Merge pull request #503 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'c3fc7be77cfde08fb878fefc316e206ca904f254':
完善数据界面
为“值”下拉框添加选项“无”的判断条件
为说明信息和值下拉框添加选项“无”
|
6 years ago |
Harrison
|
5ccfd68b1b
|
Merge pull request #505 in DESIGN/design from feature/10.0 to release/10.0
* commit '63be1e5f8dca7cadba8a6bbcdac51ba635a3f2d1':
无JIRA任务 环境监听的优先级,先启动activator再触发老的env监听
|
6 years ago |
yaoh.wu
|
4264a3f123
|
Merge pull request #504 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit 'c62de9f2020e3ddb1274c84f17d2058891e934cc':
REPORT-11487 部分场景下 新建按钮状态问题
|
6 years ago |
yaoh.wu
|
c62de9f202
|
REPORT-11487 部分场景下 新建按钮状态问题
|
6 years ago |
zack
|
1712597ff7
|
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
* commit 'd6d4e7a0ff67cb3831de34821f03436e71a5a27c': (107 commits)
REPORT-11448 & REPORT-10678
原先的判断网络断开的逻辑,用swingworker搜索的时候,偶现性的会卡住。
UT暂时不提交
UT
REPORT-11403 查询结果出来的横向滚动条位置偏上了 调整下纵向滚动条位置
REPORT-11445 @plough:打印设置中打印份数可以为0不合理
CHART-3011 地球默认背景
REPORT-11403 @Sung:查询结果出来的横向滚动条位置偏上了 调整高度
无JIRA任务,多线程问题
删除重复代码
关闭未保存的文件交互修订
在getNoConnectList里判断isNetworkOk, 对外就一个方法getNoConnectList
REPORT-10946 @Sung:离线状态下(断网)alphafine都打不开了 之前的断网情况逻辑耦合太严重了,剥离出来
REPORT-11395 用户搜索交互修订
REPORT-11394 二次选择某些场景下可能删除失败
REPORT-11107【10.0插件】插件-输出离线HTML插件-工具栏使用该按钮报错 删除老的“输出离线html报表”代码
REPORT-11352 远程设计去除socketio的适配,部分代码质量
REPORT-11328 & REPORT-10946 & REPORT-10928 & REPORT-11196 1.修复右侧预览内容过宽,没有横向滚动条的问题 2.处理断网时,显示链接失败的一处错误逻辑 3.list中重复元素去重 4.原先写法不规范,应申明为private,set,get取存值
REPORT-11155 10.0 丢失功能点补充
REPORT-11216 10.0远程设计问题解决 模板锁现在是用socketio做的关闭解锁,如果socketio没连上的话,模板就永远没办法解锁了 加心跳来处理模板锁异常关闭的情况
...
|
6 years ago |
Mata.Li
|
d6d4e7a0ff
|
Merge pull request #502 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit 'f658b504fab10097128b850205497f348ab4750e':
REPORT-11448 & REPORT-10678
|
6 years ago |
Qinghui.Liu
|
c3fc7be77c
|
完善数据界面
|
6 years ago |
Mata.Li
|
f658b504fa
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |