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 |
ju
|
9eab8bdad6
|
REPORT-11216 10.0远程设计问题解决
模板锁现在是用socketio做的关闭解锁,如果socketio没连上的话,模板就永远没办法解锁了
加心跳来处理模板锁异常关闭的情况
|
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 |
Alex.Sung
|
4a26e9d17d
|
Merge pull request #482 in DESIGN/design from ~ALEX.SUNG/design:feature/10.0 to feature/10.0
REPORT-10954 & REPORT-10928
* commit 'c8705329e15b9fab6872f793cd9a5534e24af23c':
REPORT-10954&REPORT-10928 “模板内容”这一项不要支持分词搜索; 需分词的场景下,先搜索不分词的结果集,以获取匹配度最高的结果集。
|
6 years ago |
alex.sung
|
c8705329e1
|
REPORT-10954&REPORT-10928
“模板内容”这一项不要支持分词搜索;
需分词的场景下,先搜索不分词的结果集,以获取匹配度最高的结果集。
|
6 years ago |
ju
|
e09eb931c9
|
Merge pull request #481 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '63773958701f283d5b8c291227f61319d7bf2cfe':
REPORT-10847 【10.0冒烟】日志级别设置为debug,日志中只查看得到info信息 bug提错了 回退一下
|
6 years ago |
ju
|
6377395870
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
6 years ago |
ju
|
c1c0c303b5
|
REPORT-10847 【10.0冒烟】日志级别设置为debug,日志中只查看得到info信息
bug提错了 回退一下
|
6 years ago |
ju
|
1f0ac6d5c3
|
Merge pull request #480 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'ccaf797fd825664428b34735ff346fd63552be63':
REPORT-11216 10.0远程设计问题解决 isRoot缓存下,不用每次都rpc
REPORT-11216 10.0远程设计问题解决 isRoot缓存下,不用每次都rpc
|
6 years ago |
ju
|
ccaf797fd8
|
REPORT-11216 10.0远程设计问题解决
isRoot缓存下,不用每次都rpc
|
6 years ago |
ju
|
b3b038286d
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
6 years ago |
ju
|
d60c3e6936
|
REPORT-11216 10.0远程设计问题解决
isRoot缓存下,不用每次都rpc
|
6 years ago |
ju
|
096a562dc6
|
Merge pull request #479 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'd2a9cecc594a3888afe97e974fdc2d4078d1d8c9':
REPORT-11216 10.0远程设计问题解决
|
6 years ago |
ju
|
d2a9cecc59
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
6 years ago |
ju
|
3a6d78c7b2
|
REPORT-11216 10.0远程设计问题解决
|
6 years ago |
neil
|
8b3726e5d3
|
Merge pull request #478 in DESIGN/design from ~NEIL/design:feature/10.0 to feature/10.0
* commit 'f9b9ede9f0c336931abe1ba44a80f40c5e432478':
无JIRA任务,冲突修复.
|
6 years ago |
Mata.Li
|
169accd6ac
|
Merge pull request #477 in DESIGN/design from ~MATA.LI/design:feature/10.0 to feature/10.0
* commit '981c8e946191768748a2964a1c0f336f2e2b9e27':
REPORT-11144
|
6 years ago |
neil
|
f9b9ede9f0
|
无JIRA任务,冲突修复.
|
6 years ago |
neil
|
349ec167f9
|
Merge pull request #475 in DESIGN/design from ~NEIL/design-10:release/10.0 to feature/10.0
* commit '323b0402c5645f9f1a34be7096f19cba6c1bc4a0': (26 commits)
冲突
冲突
formatter
what happen?
REPORT-11144
CHART-2912 数据面板自定义(数据集数据不用下拉框&单元格数据不用公式输入框)。
REPORT-11201 权限管理中的国际化问题
REPORT-11044 frm中选中块时,老是跳转
REPORT-11026
REPORT-11123 【10.0冒烟】表单预览国际化问题,点击没反应
REPORT-11059 插入行策略,默认值设置为公式,修改公示后不能成功修改!!!
revert
冲突
国家化修改
REPORT-10676 9patch10, FR9.0设计器支持移动端预览效果
无JIRA任务,使历史颜色存储最大值生效
REPORT-11037 最近使用颜色只存不透明颜色
REPORT-10935 & REPORT-10921
REPORT-11000【10.0冒烟】插件安装的国际化问题
REPORT-11000【10.0冒烟】插件的国际化问题
...
|
6 years ago |
Mata.Li
|
981c8e9461
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/design into feature/10.0
|
6 years ago |
Mata.Li
|
2575ec502b
|
REPORT-11144
|
6 years ago |
neil
|
323b0402c5
|
冲突
|
6 years ago |
neil
|
ac6d19d81b
|
冲突
|
6 years ago |
neil
|
84228992a8
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~neil/design-10 into release/10.0
|
6 years ago |
zack
|
ce69006aa1
|
Merge pull request #472 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'ba0ab2680a5d411fe37f32996e9c893da04a4ab1':
REPORT-11255 切换本地环境的时候自动启动内置服务器
|
6 years ago |
zack
|
ba0ab2680a
|
REPORT-11255 切换本地环境的时候自动启动内置服务器
|
6 years ago |
ju
|
21b738222f
|
Merge pull request #471 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit '8da56daee841b0c187999e3ac8cdbd4f6302973f':
无JIRA任务 设计器端口占用的时候卡主
|
6 years ago |
yaoh.wu
|
30bf0d0a9c
|
Merge pull request #469 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '5d8a420ca5d8ff2bab69688e9d3533124b3a5876':
无JIRA任务,单元测试还没写完,先注释
代码质量
REPORT-11268 关闭模板主动释放文件锁,分布式锁,代码质量
|
6 years ago |
ju
|
8da56daee8
|
无JIRA任务 设计器端口占用的时候卡主
|
6 years ago |
Wim.Zhai
|
e280eb06c5
|
Merge pull request #470 in DESIGN/design from ~WIM.ZHAI/xdesign:release/10.0 to release/10.0
数据集数据、左移单元格数据界面文字显示框、数据集数据界面-汇总方式
* commit 'e42e066b5779e8b12fa9939b43652d0ff47e9b4b':
formatter
what happen?
|
6 years ago |
yaoh.wu
|
5d8a420ca5
|
无JIRA任务,单元测试还没写完,先注释
|
6 years ago |
yaoh.wu
|
366810a296
|
代码质量
|
6 years ago |
Wim.Zhai
|
e42e066b57
|
formatter
|
6 years ago |
Wim.Zhai
|
0d72d523e0
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~wim.zhai/Xdesign into release/10.0
|
6 years ago |
Wim.Zhai
|
ce29ce9ff5
|
what happen?
|
6 years ago |
Mata.Li
|
81575c1edf
|
Merge pull request #468 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '3a6aa0de0a63516c61704e5556111460cd6a5e45':
REPORT-11144
|
6 years ago |
yaoh.wu
|
baf67a033b
|
REPORT-11268 关闭模板主动释放文件锁,分布式锁,代码质量
|
6 years ago |
Mata.Li
|
3a6aa0de0a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
28465552b0
|
REPORT-11144
|
6 years ago |
ju
|
7021f24cad
|
Merge pull request #467 in DESIGN/design from ~JU/design:feature/10.0 to feature/10.0
* commit 'ef33237cae7086ad8214466854de4501d4ffc443':
REPORT-11216 10.0远程设计问题解决 先传一波代码 1、拆分了rpc部分和channel部分 2、http channel写完好了 后续处理: 1、netty channel 2、gzip传输 3、图表地图资源太大导致图表卡的问题 4、其他性能优化 5、代码质量调整
|
6 years ago |
ju
|
ef33237cae
|
REPORT-11216 10.0远程设计问题解决
先传一波代码
1、拆分了rpc部分和channel部分
2、http channel写完好了
后续处理:
1、netty channel
2、gzip传输
3、图表地图资源太大导致图表卡的问题
4、其他性能优化
5、代码质量调整
|
6 years ago |
zheng
|
77945d86e3
|
Merge pull request #466 in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '26504d4b45e64e8117ce15f7f390180ab274b2ff':
CHART-2912 数据面板自定义(数据集数据不用下拉框&单元格数据不用公式输入框)。
|
6 years ago |
zheng
|
26504d4b45
|
CHART-2912 数据面板自定义(数据集数据不用下拉框&单元格数据不用公式输入框)。
|
6 years ago |
yaoh.wu
|
db21f75849
|
Merge pull request #465 in DESIGN/design from ~YAOH.WU/design:feature/10.0 to feature/10.0
* commit '21f518ed6c1169c49b8bcd261f2eadfe281f1200':
多人远程
多人远程
bug 处理
无任务,自测bug修复
新建文件夹 交互修订
REPORT-10896 多人远程设计
|
6 years ago |
yaoh.wu
|
21f518ed6c
|
Merge branch 'feature/10.0' of http://cloud.finedevelop.com:2015/scm/design/design into feature/10.0
|
6 years ago |
yaoh.wu
|
295a93d6b3
|
多人远程
|
6 years ago |