 Lucian.Chen
|
9e0151dcd1
|
Merge pull request #1039 in DESIGN/design from ~LUCIAN.CHEN/design:feature/10.0 to feature/10.0
* commit 'ff6238a50f9d5717b2c789126a71232bcdb93b91':
无jira任务，sonar问题修复
|
5 years ago |
author
|
ff6238a50f
|
无jira任务，sonar问题修复
|
5 years ago |
vito
|
2bc3e3effa
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit '079530d6a9afb8790ce37e8e829508232773add0':
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
REPORT-19462
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
REPORT-20328 sonar
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
无jira任务，sonar问题修复
REPORT-20868 sonar问题修复
REPORT-20329 sonar问题修复
无JIRA任务 抽象实体类，给SDK做准备
无JIRA任务 修复编译错误
删掉sdk
冲突
REPORT-19466 【匹配移动端】组件级控制选中等
REPORT-19466 【匹配移动端】组件级控制选中等
误传
无JIRA任务 开放SDK对需要开放的类的标记
REPORT-19468 【匹配移动端】H5超链标题显示处理
REPORT-19465 【匹配移动端】模板级全局控制缩放等
|
5 years ago |
 Jinbokai
|
079530d6a9
|
Merge pull request #1036 in DESIGN/design from ~JINBOKAI/design:feature/10.0 to feature/10.0
* commit 'a7d3631dca4f644d8c69e73401412cb12b8aeaef':
REPORT-20328 sonar
|
5 years ago |
 Hades
|
072883efc1
|
Merge pull request #1038 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'd1b2e791e487dc66577fa19883dc9e27daaf0ea0':
REPORT-19462
|
5 years ago |
 Bruce.Deng
|
6da411e565
|
Merge pull request #1034 in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '6e65fd6e0a9ee8190fad98dfbe6d35ff4d1baf2f':
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
|
5 years ago |
|
Bruce.Deng
|
6e65fd6e0a
|
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
|
5 years ago |
|
Hades
|
d1b2e791e4
|
REPORT-19462
|
5 years ago |
|
Bruce.Deng
|
3d5a891ae6
|
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
|
5 years ago |
 Maksim
|
ee11415060
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
|
Maksim
|
c5e72eceb2
|
REPORT-20323 sonar问题修复
|
5 years ago |
jinbokai
|
a7d3631dca
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
|
jinbokai
|
d259b596ff
|
REPORT-20328 sonar
|
5 years ago |
|
Bruce.Deng
|
7800cc8235
|
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
|
5 years ago |
|
Bruce.Deng
|
380addb3e6
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
|
Bruce.Deng
|
ec9f79560f
|
REPORT-19464 【匹配移动端】TAB下菜单式图标优化2
|
5 years ago |
 kerry
|
3059e112d6
|
Merge branch 'release/10.0' of http://cloud.finedevelop.com:2015/scm/~kerry/design_10.0 into release/10.0
|
5 years ago |
Bryant
|
efb32c590f
|
Merge pull request #1032 in DESIGN/design from ~BRYANT/design:feature/10.0 to feature/10.0
* commit '195360d85a0393db64ae924dab92a74b947b9607':
REPORT-20868 sonar问题修复
|
5 years ago |
|
Bruce.Deng
|
cbbd6746c8
|
Merge pull request #1033 in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '6f2dd2cb93dbebf64cbed3c1bbc7227e45eaf571':
无jira任务，sonar问题修复
|
5 years ago |
|
Bruce.Deng
|
6f2dd2cb93
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
|
Bruce.Deng
|
dc0b27d09d
|
无jira任务，sonar问题修复
|
5 years ago |
Hugh.C
|
a19a95a165
|
Merge pull request #1031 in DESIGN/design from ~HUGH.C/design:feature/10.0 to feature/10.0
* commit '7574a965388df153045fd737a230dd9d2867acf4':
REPORT-20329 sonar问题修复
|
5 years ago |
|
Bryant
|
195360d85a
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
|
Bryant
|
61cd191cb1
|
REPORT-20868 sonar问题修复
|
5 years ago |
|
Hugh.C
|
7574a96538
|
REPORT-20329 sonar问题修复
|
5 years ago |
 richie
|
63d0e27bb0
|
Merge pull request #1030 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit 'cd93562c52d5b305e9f872f52cdb28360e51f741':
无JIRA任务 抽象实体类，给SDK做准备
|
5 years ago |
|
richie
|
cd93562c52
|
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
|
5 years ago |
|
richie
|
84c585ed51
|
无JIRA任务 抽象实体类，给SDK做准备
|
5 years ago |
|
richie
|
bbc72b8555
|
Merge pull request #1029 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '0e875025d1645230b38e65993b4dbf5a6f4ba376':
无JIRA任务 修复编译错误
|
5 years ago |
|
richie
|
0e875025d1
|
无JIRA任务 修复编译错误
|
5 years ago |
|
Bruce.Deng
|
a35d90cc32
|
Merge pull request #1028 in DESIGN/design from ~BRUCE.DENG/design:feature/10.0 to feature/10.0
* commit '603d0d2c8202f327fb630a9afd9f2a8bcd3a9c32':
REPORT-19466 【匹配移动端】组件级控制选中等
REPORT-19466 【匹配移动端】组件级控制选中等
|
5 years ago |
zack
|
c3ecab7af4
|
Merge pull request #1027 in DESIGN/design from ~ZACK/design:feature/10.0 to feature/10.0
* commit 'a5bb0bf8cd3693e0e9bfd4cae579ba01f9b4c625':
删掉sdk
冲突
|
5 years ago |
|
zack
|
a5bb0bf8cd
|
删掉sdk
|
5 years ago |
|
zack
|
70a4c79a8f
|
冲突
|
5 years ago |
|
Bruce.Deng
|
603d0d2c82
|
REPORT-19466 【匹配移动端】组件级控制选中等
|
5 years ago |
|
richie
|
2103549f2f
|
Merge pull request #1026 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '9d0ac48c96d511c85fe1c246c47f8a78198916d7':
误传
无JIRA任务 开放SDK对需要开放的类的标记
|
5 years ago |
|
Bruce.Deng
|
27de4a0d29
|
REPORT-19466 【匹配移动端】组件级控制选中等
|
5 years ago |
|
richie
|
9d0ac48c96
|
误传
|
5 years ago |
|
richie
|
ca4adb9a4a
|
无JIRA任务 开放SDK对需要开放的类的标记
|
5 years ago |
|
Hades
|
d46f25e1df
|
Merge pull request #1024 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '8df1092d6d75f1875d54e84a8ec03baa9b1e6425':
REPORT-19468 【匹配移动端】H5超链标题显示处理
|
5 years ago |
neil
|
9ac9571941
|
Merge pull request #1023 in DESIGN/design from final/10.0 to bugfix/10.0
* commit '0ae502e597889d9dce993f7d99c1860932f94af4': (41 commits)
REPORT-20267 非 简繁英日韩 海外版本设计器默认语言问题
update
update
REPORT-20267 非简繁英日韩 海外版本设计器默认语言问题 && MOBILE-22490 链接修改
REPORT-20303 FR中点击插件管理报错闪退
REPORT-19218 设计器目录树工具栏重命名无法去除多个后缀名 && REPORT-19200 数据表现与处理-其他属性-打印/导出单元格内容/背景
REPORT-19237 权限编辑界面-可见可用逻辑问题
update
REPORT-19184 设计器，聚合报表进入编辑状态
REPORT-18720 模板web属性里面采用服务器设置时 工具栏按钮应该是处于灰化且不可点击状态
REPORT-19897 英文版设计器显示问题
补充单元测试
REPORT-19857 英文版alphafine显示问题 1. 把判断国际化的过程和 点击配置页面才能更新 的逻辑解耦。放到启动的时候做。 2. 配置不依赖于 searchOnline 而是判断中英文。
不ignored异常
加读写锁
初始化时从插件里捞一把
通过监听插件生命周期实现
插件天生可拔插，这里不能用static，应每次调用时获取
补充单元测试
REPORT-18362 插件状态根据lic显示-前台
...
|
5 years ago |
|
Hades
|
8df1092d6d
|
Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~hades/design into feature/10.0
|
5 years ago |
|
Hades
|
f5400dd00a
|
REPORT-19468 【匹配移动端】H5超链标题显示处理
|
5 years ago |
Kara
|
0ae502e597
|
Merge pull request #1022 in DESIGN/design from ~JEO/report-design:final/10.0 to final/10.0
* commit '74038a86e79bcc6e27eeb8f942f789eb10143f23': (32 commits)
REPORT-20267 非 简繁英日韩 海外版本设计器默认语言问题
update
update
REPORT-20267 非简繁英日韩 海外版本设计器默认语言问题 && MOBILE-22490 链接修改
REPORT-20303 FR中点击插件管理报错闪退
REPORT-19218 设计器目录树工具栏重命名无法去除多个后缀名 && REPORT-19200 数据表现与处理-其他属性-打印/导出单元格内容/背景
REPORT-19237 权限编辑界面-可见可用逻辑问题
update
REPORT-19184 设计器，聚合报表进入编辑状态
REPORT-18720 模板web属性里面采用服务器设置时 工具栏按钮应该是处于灰化且不可点击状态
REPORT-19897 英文版设计器显示问题
REPORT-19873 设计器英文 表单自适应被遮挡
补充单元测试
REPORT-19857 英文版alphafine显示问题 1. 把判断国际化的过程和 点击配置页面才能更新 的逻辑解耦。放到启动的时候做。 2. 配置不依赖于 searchOnline 而是判断中英文。
不ignored异常
加读写锁
初始化时从插件里捞一把
通过监听插件生命周期实现
插件天生可拔插，这里不能用static，应每次调用时获取
REPORT-19733 未装数据集插件的设计器远程设计时 编辑服务器数据集 点击确定会覆盖所有服务器中的插件数据集
...
|
5 years ago |
jeo
|
74038a86e7
|
Merge branch 'release/10.0' into final/10.0
# Conflicts:
# designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
|
5 years ago |
|
Hades
|
99493183cb
|
Merge pull request #1021 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'bebd14dc7288bd26cd105c2d05e44845315654e6':
REPORT-20267 非 简繁英日韩 海外版本设计器默认语言问题
|
5 years ago |
|
Hades
|
bebd14dc72
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hades/design into release/10.0
|
5 years ago |
|
Hades
|
82598785f8
|
REPORT-20267 非 简繁英日韩 海外版本设计器默认语言问题
|
5 years ago |
|
Hades
|
166fea6675
|
Merge pull request #1020 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'bc5f6a6cf3bb4e06ecc2e49aa5f50af57ed5ac1c':
REPORT-19465 【匹配移动端】模板级全局控制缩放等
|
5 years ago |
|
Hades
|
bc5f6a6cf3
|
REPORT-19465 【匹配移动端】模板级全局控制缩放等
|
5 years ago |
