Henry.Wang
d092816eb3
feature/10.0 -> feature/x 冲突解决
4 years ago
superman
e6667c1b51
Merge pull request #4330 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'ebd8b8c6ebcf91bd1abfbca0daec3bca25af3da8':
CHART-19306 仪表盘配色面板修改
4 years ago
Bjorn
ebd8b8c6eb
Pull request #4316 : CHART-19306 仪表盘配色面板修改
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '46d77e489323f9f03c4e78e80f6df664603c35dc':
CHART-19306 仪表盘配色面板修改
4 years ago
superman
97699f5dd5
Merge pull request #4323 in DESIGN/design from feature/10.0 to feature/x
...
* commit '28b02fd2700f2b05370a7276268a8b1029338241':
REPORT-52538 组件复用-合入主版本-事件的常规设置处,切换组件后再查看,事件设置面板就不显示内容了
4 years ago
kerry
28b02fd270
Pull request #4315 : REPORT-52538 组件复用-合入主版本-事件的常规设置处,切换组件后再查看,事件设置面板就不显示内容了
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '96b2f00fdaf01fb5d30313a2f976c73d5f39ca8b':
REPORT-52538 组件复用-合入主版本-事件的常规设置处,切换组件后再查看,事件设置面板就不显示内容了
4 years ago
白岳
46d77e4893
CHART-19306 仪表盘配色面板修改
4 years ago
kerry
96b2f00fda
REPORT-52538 组件复用-合入主版本-事件的常规设置处,切换组件后再查看,事件设置面板就不显示内容了
4 years ago
superman
d2698f2690
Merge pull request #4313 in DESIGN/design from feature/10.0 to feature/x
...
* commit '142c7ea2fa09cfc4773781e067731392dcf67b4a':
REPORT-51244【10.0.17】复用组件接触点优化
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
REPORT-51678 同步部分插件修复代码
REPORT-52364 SnapChat弹窗资源路径修改与国际化
REPORT-52490 社区菜单添加模板商城入口
REPORT-51678 promptWindow逻辑反了
REPORT-51244 【10.0.17】复用组件接触点优化 - 功能补充
REPORT-51678 组件复用插件代码合并--补充SnapChat相关逻辑
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago
superman
142c7ea2fa
Merge pull request #4311 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'a25522c2a1b93e0b424e97611f3c836ec68c225d':
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago
superman
a25522c2a1
Merge pull request #4310 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '7315d5a9866149a9fc9376a71b17bde6216585f4':
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago
superman
7315d5a986
Merge pull request #4309 in DESIGN/design from final/10.0 to release/10.0
...
* commit '2403e06c154fbd6c8e0188d7e9b10ca526cb890a':
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago
superman
2403e06c15
Merge pull request #4308 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '9b8b8e85f9f5f841bfbe5b821f0d802fed018252':
4 years ago
Kara
431c8999fc
Pull request #4306 : REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功 &&REPORT-52554 安装了抽数缓存插件 存在npe
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'dfa979bd453d9863273a71929f1ad3163881c695':
REPORT-52554 安装了抽数缓存插件 存在npe
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
4 years ago
kerry
232b54cb88
Pull request #4307 : REPORT-51244【10.0.17】复用组件接触点优化
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '2e2b119c31693288936868caa9580c418b6ac669':
REPORT-51244【10.0.17】复用组件接触点优化
4 years ago
kerry
2e2b119c31
REPORT-51244【10.0.17】复用组件接触点优化
4 years ago
hades
dfa979bd45
REPORT-52554 安装了抽数缓存插件 存在npe
4 years ago
Tommy
89997d193c
Pull request #4304 : REPORT-51678 组件复用插件代码合并--补充SnapChat相关逻辑
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit '4f70159da57d5a2e3731f8fa9040a5872f677b36':
REPORT-51678 同步部分插件修复代码
REPORT-52364 SnapChat弹窗资源路径修改与国际化
REPORT-52490 社区菜单添加模板商城入口
REPORT-51678 promptWindow逻辑反了
REPORT-51678 组件复用插件代码合并--补充SnapChat相关逻辑
4 years ago
hades
582920d235
REPORT-52564 插件-新自适应-插件和新主jar有不兼容问题,有的模板切换新老模式不成功
4 years ago
kuangshuai
4f70159da5
REPORT-51678 同步部分插件修复代码
4 years ago
kuangshuai
03fe02e702
REPORT-52364 SnapChat弹窗资源路径修改与国际化
4 years ago
kuangshuai
72b00b8298
REPORT-52490 社区菜单添加模板商城入口
4 years ago
kerry
e42d988e52
Pull request #4305 : REPORT-51244 【10.0.17】复用组件接触点优化 - 功能补充
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit '51a80eab8dcd672f48629466bdad7184e35ecf99':
REPORT-51244 【10.0.17】复用组件接触点优化 - 功能补充
4 years ago
kuangshuai
722d32f6db
REPORT-51678 promptWindow逻辑反了
4 years ago
kerry
51a80eab8d
REPORT-51244 【10.0.17】复用组件接触点优化 - 功能补充
4 years ago
kuangshuai
53388c1024
REPORT-51678 组件复用插件代码合并--补充SnapChat相关逻辑
4 years ago
superman
9b8b8e85f9
Merge pull request #4303 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'd62196745d51eae21f91564fcd3bf9da6fb0a504': (68 commits)
REPORT-52212 切换远程出现白色弹窗 漏改调整
REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
REPORT-52418 国际化适配
REPORT-52406 导出-字体检测-权限编辑时检测按钮需要灰化
REPORT-52212 去掉工作目录切换成功提示
REPORT-52212 【10.0.16冒烟】切换远程出现白色弹窗 update 遗漏的
REPORT-52212 【10.0.16冒烟】切换远程出现白色弹窗
REPORT-52103 打开聚合报表的情况下 插件-性能优化插件-启用太慢 update
REPORT-52103 打开聚合报表的情况下 插件-性能优化插件-启用太慢
REPORT-52085 装有老版本的新自适应插件 frm无法打开
REPORT-51442 菜单栏和数据集面板灰化问题
CHART-19174 设计器自定义wms带token无效问题
REPORT-51305 打开/保存模板时切换时 右侧面板可用问题 + 第一次打开时加载动画问题
REPORT-51315 保存中的模板,标签的图标遗漏加载动效
REPORT-51304 保存时gif背景为透明时 锯齿太严重 通过代码来绘制
REPORT-51401 打开模板,设计器上日志顺序不对
REPORT-51409 打开模板加载失败后,点击重试,文件目录上方的工具栏都变得可操作了
CHART-19104 鼠标的click事件不能稳定触发,改为change事件
REPORT-51281 & REPORT-51378 & REPORT-51490 导出-字体检测-模板保存相关问题
...
4 years ago
Kara
d62196745d
Pull request #4302 : REPORT-52212 切换远程出现白色弹窗 漏改调整
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'af75c06a8ea90034a81f754b368851e5a5c67c25':
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago
hades
af75c06a8e
REPORT-52212 切换远程出现白色弹窗 漏改调整
4 years ago
superman
67497ad233
Merge pull request #4301 in DESIGN/design from feature/10.0 to feature/x
...
* commit '9b3ad11c5493a3d3172e2a2507e3231ed37bf5c2':
REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
REPORT-52406 导出-字体检测-权限编辑时检测按钮需要灰化
4 years ago
superman
9b3ad11c54
Merge pull request #4299 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '59b6b2bfc0d489447c2619e081a777506a668c68':
REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
REPORT-52406 导出-字体检测-权限编辑时检测按钮需要灰化
4 years ago
superman
59b6b2bfc0
Merge pull request #4298 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '7e4742949a3fabdedd2001e20efd650f99bd09dc':
REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
REPORT-52406 导出-字体检测-权限编辑时检测按钮需要灰化
4 years ago
superman
7e4742949a
Merge pull request #4297 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'f8c74e4f324247fcb49ac0935cb6ef4c238552ae':
REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
REPORT-52406 导出-字体检测-权限编辑时检测按钮需要灰化
4 years ago
Kara
f8c74e4f32
Pull request #4288 : REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '9c9a301a971462c7aebd2fc326a689036897b80e':
REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
4 years ago
Kara
7bb1cc379b
Pull request #4271 : REPORT-52406 导出-字体检测-权限编辑时检测按钮需要灰化
...
Merge in DESIGN/design from ~BRUCE.DENG/design:final/10.0 to final/10.0
* commit '522537a0b294bd0a1b3e98fd02c75c0a153d7805':
REPORT-52406 导出-字体检测-权限编辑时检测按钮需要灰化
4 years ago
superman
1410b42deb
Merge pull request #4295 in DESIGN/design from feature/10.0 to feature/x
...
* commit '585d6221b5c60916c38a6844d105964b11e089bf':
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
4 years ago
superman
585d6221b5
Merge pull request #4293 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '833136c32a80500029f6c726e20abeb4a8b5c3b3':
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
4 years ago
ju|剧浩宇
0fe1f8e99c
Pull request #4289 : 无jira任务 feature/10.0合feature/x
...
Merge in DESIGN/design from ~TOMMY/design:feature/x to feature/x
* commit 'acbec8eb98ce28cf910b5d13ac31894cdaa3a87d':
REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
REPORT-52418 国际化适配
REPORT-51678 复用组件插件合并主jar
REPORT-51678 复用组件合并主jar国际化
REPORT-52151 控件事件支持重命名开发
REPORT-51678 组件复用插件代码合并主jar
4 years ago
kuangshuai
acbec8eb98
Merge branch 'feature/10.0' into feature/x
...
# Conflicts:
# designer-form/src/main/java/com/fr/design/designer/creator/XWAbsoluteLayout.java
# designer-form/src/main/java/com/fr/design/mainframe/CoverReportPane.java
4 years ago
hades
9c9a301a97
REPORT-52462 保存模板时,将设计器最小化到后台,模板保存失败的弹窗到了屏幕左上角
4 years ago
Tommy
833136c32a
Pull request #4245 : REPORT-52087 单元格元素数据列中首次修改字符不会生效
...
Merge in DESIGN/design from ~TOMMY/design:bugfix/10.0 to bugfix/10.0
* commit 'b9dea208341a3eadf8078a5e98c06956cd3779fe':
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
REPORT-52087 单元格元素数据列中首次修改字符不会生效
4 years ago
superman
88b10c157f
Merge pull request #4285 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '2c43227fe60a48143a73b801c48ff3ff1ad3271c':
REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
REPORT-52418 国际化适配
4 years ago
superman
2c43227fe6
Merge pull request #4284 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '2d737f1135498d86a6cf9ed3a26e13a1539d07a5':
REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
REPORT-52418 国际化适配
4 years ago
superman
2d737f1135
Merge pull request #4283 in DESIGN/design from final/10.0 to release/10.0
...
* commit '929ca3ef67b02087b69b0d155876a3bf595fa4ba':
REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
REPORT-52418 国际化适配
4 years ago
Tommy
7892846538
Pull request #4279 : REPORT-51678 组件复用插件代码合并主jar
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit 'f055c56eb522aa018a00866d774a79bb2819da65':
REPORT-51678 复用组件插件合并主jar
REPORT-51678 复用组件合并主jar国际化
REPORT-51678 组件复用插件代码合并主jar
4 years ago
kuangshuai
b9dea20834
REPORT-52087 单元格元素数据列中首次修改字符不会生效
4 years ago
Kara
929ca3ef67
Pull request #4280 : REPORT-52418 国际化适配,增加空格好看点
...
Merge in DESIGN/design from ~XIQIU/design:final/10.0 to final/10.0
* commit '020cc9232f95fd5c4b0859a3d968210e2c2bbaf0':
REPORT-52418 国际化适配
4 years ago
Kara
b5875d2ef3
Pull request #4281 : REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'c46db35e97d9a518b4379b32b46b6086012ef5c5':
REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
4 years ago
hades
c46db35e97
REPORT-52411 && REPORT-52222 设计器吃资源cpu和gpu
4 years ago
kerry
baf200f14e
Pull request #4278 : REPORT-52151 控件事件支持重命名开发
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/10.0 to feature/10.0
* commit 'cc4b438cfb65a96a21964a8b0f16fdf887495548':
REPORT-52151 控件事件支持重命名开发
4 years ago
xiqiu
020cc9232f
Merge remote-tracking branch 'origin/final/10.0' into final/10.0
4 years ago