 alex.sung
|
687bc4a923
|
UT暂时不提交
|
6 years ago |
|
alex.sung
|
e44f433a4e
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~alex.sung/design into release/10.0
|
6 years ago |
|
alex.sung
|
611df1e0ab
|
UT
|
6 years ago |
|
alex.sung
|
39a1dd0a40
|
REPORT-11403 查询结果出来的横向滚动条位置偏上了
调整下纵向滚动条位置
|
6 years ago |
 Qinghui.Liu
|
d7c3ecf912
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
Qinghui.Liu
|
b7a81c4dac
|
为说明信息和值下拉框添加选项“无”
|
6 years ago |
plough
|
7a5eeab5df
|
Merge pull request #499 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit 'c3741d27034a79e939907550066ee21829124f02':
REPORT-11445 @plough:打印设置中打印份数可以为0不合理
|
6 years ago |
plough
|
c3741d2703
|
REPORT-11445 @plough:打印设置中打印份数可以为0不合理
|
6 years ago |
zheng
|
f341c7edd9
|
Merge pull request #498 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'eadb2e7fb068968c646ad73dba73aeb7458417ba':
CHART-3011 地球默认背景
|
6 years ago |
|
zheng
|
eadb2e7fb0
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~zheng/C-design into release/10.0
|
6 years ago |
|
zheng
|
b4da2f3ee8
|
CHART-3011 地球默认背景
|
6 years ago |
|
Alex.Sung
|
a60b0c9ab5
|
Merge pull request #495 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-10946 @Sung：离线状态下（断网）alphafine都打不开了
* commit '3847e66b0ba581505ac1a823f749c94e2bc73b97':
REPORT-11403 @Sung：查询结果出来的横向滚动条位置偏上了 调整高度
在getNoConnectList里判断isNetworkOk, 对外就一个方法getNoConnectList
REPORT-10946 @Sung：离线状态下（断网）alphafine都打不开了 之前的断网情况逻辑耦合太严重了，剥离出来
|
6 years ago |
ju
|
63be1e5f8d
|
Merge pull request #497 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '4c4e2c3ea77b318664f327c36a7e3c62c597bf33':
无JIRA任务 环境监听的优先级，先启动activator再触发老的env监听
|
6 years ago |
|
alex.sung
|
3847e66b0b
|
REPORT-11403 @Sung：查询结果出来的横向滚动条位置偏上了
调整高度
|
6 years ago |
|
ju
|
4c4e2c3ea7
|
无JIRA任务 环境监听的优先级，先启动activator再触发老的env监听
|
6 years ago |
 yaoh.wu
|
b86bfa1b3d
|
Merge pull request #496 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit 'abd64f7ba774b00ccd3919082fc27d60ba79853d':
无JIRA任务，多线程问题
删除重复代码
关闭未保存的文件交互修订
REPORT-11395 用户搜索交互修订
REPORT-11394 二次选择某些场景下可能删除失败
|
6 years ago |
|
yaoh.wu
|
abd64f7ba7
|
无JIRA任务，多线程问题
|
6 years ago |
|
yaoh.wu
|
896e6a6ff0
|
删除重复代码
|
6 years ago |
|
yaoh.wu
|
ce5062b9a0
|
关闭未保存的文件交互修订
|
6 years ago |
|
alex.sung
|
67ff7823ff
|
在getNoConnectList里判断isNetworkOk, 对外就一个方法getNoConnectList
|
6 years ago |
|
alex.sung
|
77d2acb32a
|
REPORT-10946 @Sung：离线状态下（断网）alphafine都打不开了
之前的断网情况逻辑耦合太严重了，剥离出来
|
6 years ago |
|
yaoh.wu
|
f9191f54f3
|
REPORT-11395 用户搜索交互修订
|
6 years ago |
|
yaoh.wu
|
28b56fd047
|
REPORT-11394 二次选择某些场景下可能删除失败
|
6 years ago |
|
yaoh.wu
|
2bddfc1fee
|
Merge pull request #494 in DESIGN/design from ~YAOH.WU/design:release/10.0 to release/10.0
* commit 'dff7316bc97f1afc7b19ab63db0ef1b03401485c':
REPORT-11352 远程设计去除socketio的适配，部分代码质量
|
6 years ago |
|
Alex.Sung
|
3c49143441
|
Merge pull request #492 in DESIGN/design from ~ALEX.SUNG/design:release/10.0 to release/10.0
REPORT-11107【10.0插件】插件-输出离线HTML插件-工具栏使用该按钮报错
* commit '203e228c79bbcdbeb3398da20524e9cd2117efd5':
REPORT-11107【10.0插件】插件-输出离线HTML插件-工具栏使用该按钮报错 删除老的“输出离线html报表”代码
|
6 years ago |
|
yaoh.wu
|
dff7316bc9
|
Merge pull request #1 in ~YAOH.WU/design from feature/10.0 to release/10.0
* commit '13fee249597d7f5c1b061a8486feb5d85c04a36e':
REPORT-11352 远程设计去除socketio的适配，部分代码质量
|
6 years ago |
|
yaoh.wu
|
13fee24959
|
Merge pull request #489 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '79dba16bf94716c5212dd1fb063708931757c610':
REPORT-11352 远程设计去除socketio的适配，部分代码质量
|
6 years ago |
|
alex.sung
|
203e228c79
|
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
|
6 years ago |
|
alex.sung
|
cf7064c27c
|
REPORT-11107【10.0插件】插件-输出离线HTML插件-工具栏使用该按钮报错
删除老的“输出离线html报表”代码
|
6 years ago |
|
ju
|
15dce521a7
|
Merge pull request #490 in DESIGN/design from feature/10.0 to release/10.0
* commit 'a97ac301c350c3da0d094885f6451e83d6805e3d': (76 commits)
REPORT-11328 & REPORT-10946 & REPORT-10928 & REPORT-11196 1.修复右侧预览内容过宽，没有横向滚动条的问题 2.处理断网时，显示链接失败的一处错误逻辑 3.list中重复元素去重 4.原先写法不规范，应申明为private，set，get取存值
REPORT-11216 10.0远程设计问题解决 模板锁现在是用socketio做的关闭解锁，如果socketio没连上的话，模板就永远没办法解锁了 加心跳来处理模板锁异常关闭的情况
REPORT-11121 统一用unix文件路径分割
REPORT-11315 关闭其他模板时释放锁;打开模板过多时，关闭其中部分模板锁不释放问题
REPORT-11315 关闭其他模板时释放锁;打开模板过多时，关闭其中部分模板锁不释放问题
REPORT-10954&REPORT-10928 “模板内容”这一项不要支持分词搜索； 需分词的场景下，先搜索不分词的结果集，以获取匹配度最高的结果集。
REPORT-10847 【10.0冒烟】日志级别设置为debug,日志中只查看得到info信息 bug提错了 回退一下
REPORT-11216 10.0远程设计问题解决 isRoot缓存下，不用每次都rpc
REPORT-11216 10.0远程设计问题解决 isRoot缓存下，不用每次都rpc
REPORT-11216 10.0远程设计问题解决
无JIRA任务，冲突修复.
REPORT-11144
冲突
冲突
REPORT-11255 切换本地环境的时候自动启动内置服务器
无JIRA任务 设计器端口占用的时候卡主
无JIRA任务，单元测试还没写完，先注释
代码质量
REPORT-11268 关闭模板主动释放文件锁，分布式锁，代码质量
REPORT-11216 10.0远程设计问题解决 先传一波代码 1、拆分了rpc部分和channel部分 2、http channel写完好了 后续处理： 1、netty channel 2、gzip传输 3、图表地图资源太大导致图表卡的问题 4、其他性能优化 5、代码质量调整
...
|
6 years ago |
|
ju
|
a97ac301c3
|
Merge pull request #491 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '4fd2434ae255cce8d815da2805411e7f9112a34c':
REPORT-11155 10.0 丢失功能点补充
static方法拿出来
国际化
update
CHART-2912 && CHART-2969 扩展接口 自定义字段名
REPORT-11257
修改数据面板
|
6 years ago |
|
ju
|
4fd2434ae2
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~ju/design into feature/10.0
|
6 years ago |
|
ju
|
cd77563a72
|
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/design/design into feature/10.0
|
6 years ago |
|
Alex.Sung
|
232dd9acc8
|
Merge pull request #488 in DESIGN/design from ~ALEX.SUNG/design:feature/10.0 to feature/10.0
REPORT-11328 & REPORT-10946 & REPORT-10928 & REPORT-11196
* commit '17d4049d50575433d4c5be8a0d859263c842f9c1':
REPORT-11328 & REPORT-10946 & REPORT-10928 & REPORT-11196 1.修复右侧预览内容过宽，没有横向滚动条的问题 2.处理断网时，显示链接失败的一处错误逻辑 3.list中重复元素去重 4.原先写法不规范，应申明为private，set，get取存值
|
6 years ago |
|
yaoh.wu
|
79dba16bf9
|
REPORT-11352 远程设计去除socketio的适配，部分代码质量
|
6 years ago |
|
plough
|
faeeec995c
|
Merge pull request #487 in DESIGN/design from ~PLOUGH/10-design:release/10.0 to release/10.0
* commit '6b0d6c60ec1abcde0a6b4d890d0d6c6a4dcd6d9e':
REPORT-11155 10.0 丢失功能点补充
|
6 years ago |
|
yaoh.wu
|
e4f6c0b069
|
Merge pull request #485 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit 'f0854ca7d60e1094d53ad0c8758dfffdfdb1fd53':
REPORT-11121 统一用unix文件路径分割
|
6 years ago |
|
alex.sung
|
17d4049d50
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
6 years ago |
|
alex.sung
|
8185971723
|
REPORT-11328 & REPORT-10946 & REPORT-10928 & REPORT-11196
1.修复右侧预览内容过宽，没有横向滚动条的问题
2.处理断网时，显示链接失败的一处错误逻辑
3.list中重复元素去重
4.原先写法不规范，应申明为private，set，get取存值
|
6 years ago |
neil
|
7e76760ac7
|
Merge pull request #486 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '9eab8bdad61942404cad48097dcbdd1f72853756':
REPORT-11216 10.0远程设计问题解决 模板锁现在是用socketio做的关闭解锁，如果socketio没连上的话，模板就永远没办法解锁了 加心跳来处理模板锁异常关闭的情况
|
6 years ago |
|
plough
|
6b0d6c60ec
|
REPORT-11155 10.0 丢失功能点补充
|
6 years ago |
|
ju
|
9eab8bdad6
|
REPORT-11216 10.0远程设计问题解决
模板锁现在是用socketio做的关闭解锁，如果socketio没连上的话，模板就永远没办法解锁了
加心跳来处理模板锁异常关闭的情况
|
6 years ago |
|
zheng
|
6e55d13826
|
Merge pull request #483 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '4d6e52d550edeb252c161bba0876f85bcef2002e':
static方法拿出来
国际化
update
CHART-2912 && CHART-2969 扩展接口 自定义字段名
|
6 years ago |
|
yaoh.wu
|
f0854ca7d6
|
REPORT-11121 统一用unix文件路径分割
|
6 years ago |
|
yaoh.wu
|
fd0ee19de2
|
Merge pull request #484 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '82f844565441c944b3e6a08c058bfe06a456ca1f':
REPORT-11315 关闭其他模板时释放锁;打开模板过多时，关闭其中部分模板锁不释放问题
REPORT-11315 关闭其他模板时释放锁;打开模板过多时，关闭其中部分模板锁不释放问题
|
6 years ago |
|
yaoh.wu
|
82f8445654
|
REPORT-11315 关闭其他模板时释放锁;打开模板过多时，关闭其中部分模板锁不释放问题
|
6 years ago |
|
yaoh.wu
|
db6239a952
|
REPORT-11315 关闭其他模板时释放锁;打开模板过多时，关闭其中部分模板锁不释放问题
|
6 years ago |
|
zheng
|
4d6e52d550
|
static方法拿出来
|
6 years ago |
|
zheng
|
56405b2cd8
|
conflict
|
6 years ago |
|
zheng
|
05484d3f2e
|
国际化
|
6 years ago |
