superman
6c6978399b
Merge pull request #3753 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '480c9ecadf43db167d6ebd5f1aee671eb42fa455':
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
Yvan
5abbd96853
Pull request #3751 : 无JIRA任务 上传下因代码冲突被删除的svg图标
...
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '46f30d661ff164210f1489e1e317494531eee308':
无JIRA任务 上传下因代码冲突被删除的svg图标
4 years ago
Yvan
46f30d661f
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yvan
8e2f877e49
无JIRA任务 上传下因代码冲突被删除的svg图标
4 years ago
Hades
a7cabd6eaf
Pull request #3749 : REPORT-48965 出现concurrentModification异常
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '6daaa9f4f9b0bd2ea5f0a4d67b62660895bb5c6c':
REPORT-48965 使用批量添加 减少容器复制次数
REPORT-48965 出现concurrentModification异常
4 years ago
hades
6daaa9f4f9
REPORT-48965 使用批量添加 减少容器复制次数
4 years ago
hades
f462925487
REPORT-48965 出现concurrentModification异常
4 years ago
kerry
480c9ecadf
Pull request #3739 : REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
...
Merge in DESIGN/design from ~KERRY/design_10.0:bugfix/10.0 to bugfix/10.0
* commit '91923d2a67474afe06355ecf36f997d0f693548f':
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
kerry
48adff3f2d
Pull request #3744 : REPORT-45944 ui调整
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'a6c3b13be06efdb7c06fd6b5ccd090b1e2e2dd62':
REPORT-45944 ui调整
4 years ago
kerry
a6c3b13be0
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~kerry/design_10.0 into release/10.0
4 years ago
kerry
ad8e082c39
REPORT-45944 ui调整
4 years ago
superman
3d783a9315
Merge pull request #3742 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '6d86eb162d869e90d18f41e19660068b8ff84fbd':
REPORT-47438 判断跟随自主界面的条件再优化补充下
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗在多屏情况下部分弹窗显示在另一块屏幕
4 years ago
superman
6d86eb162d
Merge pull request #3741 in DESIGN/design from final/10.0 to release/10.0
...
* commit '934568a138c45e8d82395b5cd7c3cfb0336b382a':
4 years ago
superman
934568a138
Merge pull request #3740 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '05012c185433934fe4d4429875fbaf05e1b29038':
4 years ago
kerry
91923d2a67
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
superman
86a3608f18
Merge pull request #3738 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '4d62bbf253d9ab3076d39a74702e105baa199e01':
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
Lucian.Chen
4d62bbf253
Pull request #3737 : REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0
* commit 'be9992d61cf6f225b9d159377851b974f32b3583':
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
4 years ago
lucian
be9992d61c
REPORT-48999 填报-填报属性设置-填报属性快捷设置远程设计修改无效
4 years ago
Hades
3b0a9ba057
Pull request #3720 : REPORT-47438 设计器弹窗部分弹窗不跟随设计器主界面位置
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '352edc342e14313eb7d9849ba3178dc192e88a29':
REPORT-47438 判断跟随自主界面的条件再优化补充下
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
REPORT-47438 设计器弹窗在多屏情况下部分弹窗显示在另一块屏幕
4 years ago
superman
05012c1854
Merge pull request #3736 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '88b4e541162ebdef7e5e97394fb2fb934584801d':
4 years ago
superman
e36a0b31fe
Merge pull request #3732 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'ae3625ad10d198a35ba88e949a8b7dfd2140c99f':
REPORT-45944 日文版模板重命名弹窗显示不全
4 years ago
kerry
ae3625ad10
Pull request #3721 : REPORT-45944 日文版模板重命名弹窗显示不全
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'afd47660ce6ecde19898240741d93cd093ee9b1a':
REPORT-45944 日文版模板重命名弹窗显示不全
4 years ago
kerry
c6c3cedced
Pull request #3723 : REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
...
Merge in DESIGN/design from ~KERRY/design_10.0:bugfix/10.0 to bugfix/10.0
* commit 'f4dc1d91ef39fd78bc01cbdcadbeb72343fd459c':
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
hades
352edc342e
REPORT-47438 判断跟随自主界面的条件再优化补充下
4 years ago
superman
e4df16beda
Merge pull request #3726 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c975900a8fc227e15afc09dc0c0574a8235d4065':
REPORT-48933 设计器菜单-社区下新增“工单中心”链接
REPORT-48204 【10.0.15】JDK11设计器遗留问题优化
4 years ago
kerry
f4dc1d91ef
REPORT-48324 聚合报表,超链在设计器中切换模板后显示不对
4 years ago
Henry.Wang
c975900a8f
Pull request #3722 : REPORT-48933 设计器菜单-社区下新增“工单中心”链接
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'aeeb2f15cef5669fdf3a8dc30358fea76740db5f':
REPORT-48933 设计器菜单-社区下新增“工单中心”链接
4 years ago
Henry.Wang
aeeb2f15ce
REPORT-48933 设计器菜单-社区下新增“工单中心”链接
4 years ago
kerry
afd47660ce
REPORT-45944 日文版模板重命名弹窗显示不全
4 years ago
hades
7ca88aa36e
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
4 years ago
hades
4aa18921dc
REPORT-47438 设计器弹窗部分弹窗不跟随主屏位置
4 years ago
hades
6e396f6a89
REPORT-47438 设计器弹窗在多屏情况下部分弹窗显示在另一块屏幕
4 years ago
Hades
3dc0028c64
Pull request #3719 : REPORT-48204 【10.0.15】JDK11设计器遗留问题优化
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '26e3d8f9ac9ee26c63870ede3a0e24836171b36f':
REPORT-48204 【10.0.15】JDK11设计器遗留问题优化
4 years ago
hades
26e3d8f9ac
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hades/design into release/10.0
4 years ago
hades
69384a369d
REPORT-48204 【10.0.15】JDK11设计器遗留问题优化
4 years ago
superman
125a208fec
Merge pull request #3697 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c0f588c7e088ddadcafc9e18d099074091707a5c':
CHART-18429 点类地图散点条件属性默认值
4 years ago
Bjorn
c0f588c7e0
Pull request #3694 : CHART-18429 点类地图散点条件属性默认值
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '9c84543f44a055e4eecccb4b1a6dec3ce05a49cf':
CHART-18429 点类地图散点条件属性默认值
4 years ago
白岳
9c84543f44
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0
4 years ago
白岳
6f6e077132
CHART-18429 点类地图散点条件属性默认值
4 years ago
superman
d3b97a17a2
Merge pull request #3690 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e86d1b9fd81cc8b98bc490f3fe8916ce28c56c31':
热力地图
CHART-18383 地图部分icon国际化优化
CHART-17714 轮播gis点地图-卫星图层-预览控制台抛错
REPORT-48318 改成给search传参,避免造成卡顿问题
REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化 【问题原因】IOUtils.readResource()方法里会对实现了ResourcePathTransformer接口的某些插件资源进行文件路径的替换,而之前依靠IOUtils.readResource()判断文件是否存在时,没有考虑这一点,紧接着去读Icon的时候仍然使用了原始路径,造成了路径不一致的问题,可能导致bug 【改动思路】把IOUtils中的transformPath逻辑搬了一套过来,保证判断资源是否存在和读取资源的路径一致
REPORT-48318 刷新时才去更新缓存
4 years ago
Bjorn
e86d1b9fd8
Pull request #3687 : CHART-18383 地图部分icon国际化优化
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'b30ac485ea151b93f2e85d4fe07ffcd6a91c6585':
热力地图
CHART-18383 地图部分icon国际化优化
4 years ago
pengda
d45f79fbdb
Pull request #3686 : CHART-17714 轮播gis点地图-卫星图层-预览控制台抛错
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '7acff2aac8bd859e2fdbad61e49efd7f04dfbf47':
CHART-17714 轮播gis点地图-卫星图层-预览控制台抛错
4 years ago
白岳
b30ac485ea
热力地图
4 years ago
白岳
a981f881de
CHART-18383 地图部分icon国际化优化
4 years ago
ju|剧浩宇
46f82d7c99
Pull request #3679 : REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化
...
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit '1c4cf004df35e4218a30db43f94a7f661853e8a1':
REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化 【问题原因】IOUtils.readResource()方法里会对实现了ResourcePathTransformer接口的某些插件资源进行文件路径的替换,而之前依靠IOUtils.readResource()判断文件是否存在时,没有考虑这一点,紧接着去读Icon的时候仍然使用了原始路径,造成了路径不一致的问题,可能导致bug 【改动思路】把IOUtils中的transformPath逻辑搬了一套过来,保证判断资源是否存在和读取资源的路径一致
4 years ago
Xiqiu
0251a5f178
Pull request #3677 : REPORT-48318 刷新时才去更新缓存
...
Merge in DESIGN/design from ~XIQIU/design:release/10.0 to release/10.0
* commit 'c829390f0c31d8c7765aea700cb8e20e15f9630c':
REPORT-48318 改成给search传参,避免造成卡顿问题
REPORT-48318 刷新时才去更新缓存
4 years ago
pengda
7acff2aac8
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
pengda
778dcc9ac9
CHART-17714 轮播gis点地图-卫星图层-预览控制台抛错
4 years ago
superman
3919af743b
Merge pull request #3682 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd6100c29c5dc24c49edd0c3a548b045ff754241d':
REPORT-47886 参数面板先添加两个参数,再新建两个参数 全部添加,参数和查询按钮会重叠
REPORT-47886 参数面板先添加两个参数,再新建两个参数 全部添加,参数和查询按钮会重叠
4 years ago
Henry.Wang
d6100c29c5
Pull request #3678 : REPORT-47886 参数面板先添加两个参数,再新建两个参数 全部添加,参数和查询按钮会重叠
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '66d6036ef79788a1025d569cbb27aa4b5591befb':
REPORT-47886 参数面板先添加两个参数,再新建两个参数 全部添加,参数和查询按钮会重叠
REPORT-47886 参数面板先添加两个参数,再新建两个参数 全部添加,参数和查询按钮会重叠
4 years ago