ju
|
4c4e2c3ea7
|
无JIRA任务 环境监听的优先级,先启动activator再触发老的env监听
|
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 |
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 |
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 |
Qinghui.Liu
|
cf2516a609
|
Merge pull request #473 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '2804a4584d86190a20a442f2621859b25bc9357c':
修改数据面板
|
6 years ago |
zheng
|
9e0941cfea
|
update
|
6 years ago |
zheng
|
32e4797dca
|
conflict
|
6 years ago |
zheng
|
e2fb52733f
|
CHART-2912 && CHART-2969 扩展接口 自定义字段名
|
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
|
edea1a36ee
|
Merge pull request #476 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0
* commit '3121c8d87a30b4e7bf601ada27451d0d2c007329':
REPORT-11257
|
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 |
Mata.Li
|
3121c8d87a
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~mata.li/designrel into release/10.0
|
6 years ago |
Mata.Li
|
b376e9dc1b
|
REPORT-11257
|
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 |