Henry.Wang
8d5dfbdc22
Pull request #6458 : REPORT-61846 数据连接越权漏洞修复
...
Merge in DESIGN/design from ~HENRY.WANG/design:persist/11.0 to persist/11.0
* commit '61d5afb631d0b2f2c36d74ccce102a55f1e7fcfa':
REPORT-61846 数据连接越权漏洞修复
3 years ago
Henry.Wang
61d5afb631
REPORT-61846 数据连接越权漏洞修复
3 years ago
superman
1878786cf3
Merge pull request #6456 in DESIGN/design from final/11.0 to release/11.0
...
* commit '443127ce24de123267481a11c0641fe0f42851cd':
REPORT-61846 数据连接越权漏洞修复
3 years ago
Henry.Wang
443127ce24
Pull request #6447 : REPORT-61846 数据连接越权漏洞修复
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0
* commit 'a2f3e8bc4a9fcfda7493cecba75ec82a78e0a141':
REPORT-61846 数据连接越权漏洞修复
3 years ago
Henry.Wang
a2f3e8bc4a
REPORT-61846 数据连接越权漏洞修复
3 years ago
fanglei
f0ed9ba1a3
Pull request #6426 : REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '13e54b514ebd25548e19dd8280592d704cde4c1c':
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
REPORT-58584
REPORT-58584
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
3 years ago
方磊
13e54b514e
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
3 years ago
方磊
84d58cae82
REPORT-58584
3 years ago
方磊
91523213fd
REPORT-58584
3 years ago
Fly.Li
79fb9bbf51
Pull request #6427 : REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
...
Merge in DESIGN/design from ~FLY.LI/design:final/11.0 to release/11.0
* commit '82bf9d3b2579ff0483011eb9d921153ac45dec77':
REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
3 years ago
Fly.Li
82bf9d3b25
REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
3 years ago
方磊
65a21b3de2
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
3 years ago
fanglei
75e0e258ed
Pull request #6412 : REPORT-57521 远程设计时websocket断开情况下的提示优化
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '340700014bc3c7f5bf8f7837c51a703e97f75316':
REPORT-57521 突然发现已经有关于websocket帮助文档的地址了
REPORT-60538 还原改动
REPORT-60538 还原改动
REPORT-60538 还原改动
REPORT-57521 远程设计时websocket断开情况下的提示优化
REPORT-60538
REPORT-60538 英日韩环境未屏蔽在线组件库
3 years ago
superman
a1bafe52e9
Merge pull request #6424 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'cf1497de7b74678a285685ea0fb5590a5279ff46':
REPORT-58836 自定义导出二期-revert
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
3 years ago
superman
cf1497de7b
Merge pull request #6423 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '161a3a9bfbb8dde6b874f1a119447bbf5d2ab1ff':
3 years ago
方磊
340700014b
REPORT-57521 突然发现已经有关于websocket帮助文档的地址了
3 years ago
superman
161a3a9bfb
Merge pull request #6413 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '6f5a51bc44fc36968f092942ef5aa29f16997874':
REPORT-58836 自定义导出二期-revert
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
REPORT-61521 主题下载引导页加载异常
3 years ago
方磊
5db55bd0c7
REPORT-60538 还原改动
3 years ago
方磊
e3eac1175c
REPORT-60538 还原改动
3 years ago
方磊
c8eafd75e8
REPORT-60538 还原改动
3 years ago
方磊
f9d27e9845
REPORT-57521 远程设计时websocket断开情况下的提示优化
3 years ago
Bruce.Deng
6f5a51bc44
Pull request #6411 : REPORT-58836 自定义导出二期-revert
...
Merge in DESIGN/design from ~BRUCE.DENG/design:final/11.0 to final/11.0
* commit 'e060ab116db9b5ca6697003009d53854707a5bb3':
REPORT-58836 自定义导出二期-revert
3 years ago
Bruce.Deng
e060ab116d
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
3 years ago
Bruce.Deng
54886cdfc0
REPORT-58836 自定义导出二期-revert
3 years ago
kerry
146b15e983
Pull request #6410 : REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/11.0 to final/11.0
* commit '1f320aa852db127369922a7d8a513cc25f2730cd':
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
3 years ago
kerry
1f320aa852
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
3 years ago
superman
1b6e607b23
Merge pull request #6406 in DESIGN/design from final/11.0 to release/11.0
...
* commit '16579561d430cd7df6a2c97e9c2adec7b8738924':
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
3 years ago
Fly.Li
16579561d4
Pull request #6397 : REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
...
Merge in DESIGN/design from ~FLY.LI/design:final/11.0 to final/11.0
* commit 'ddcd55949f738a2e7983fccfe1135590f11a30dd':
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
3 years ago
Fly.Li
ddcd55949f
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
3 years ago
Bruce.Deng
0d72922794
Pull request #6396 : REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
...
Merge in DESIGN/design from ~BRUCE.DENG/design:final/11.0 to final/11.0
* commit 'fbefef76ea088b39076acc545e4a6527661ba8bf':
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
3 years ago
Bruce.Deng
fbefef76ea
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
3 years ago
superman
a309a96cd3
Merge pull request #6393 in DESIGN/design from final/11.0 to release/11.0
...
* commit '63789fc9f1c2c3cf02cbc741836a1a1bcc38d152':
REPORT-61521 主题下载引导页加载异常
3 years ago
superman
63789fc9f1
Merge pull request #6392 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '471960c84d2015fc9ded63dc7a3cd58214c6782c':
3 years ago
Tommy
62e626b602
Pull request #6376 : REPORT-61521 主题下载引导页加载异常
...
Merge in DESIGN/design from ~TOMMY/design:final/11.0 to final/11.0
* commit 'ec99e25755fcdcfa3173e895a1f3e2d98e66ecfe':
REPORT-61521 主题下载引导页加载异常
3 years ago
superman
471960c84d
Merge pull request #6383 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '519ff1131dc640aa47e7a3698cf13b3781cd3c5e':
3 years ago
kuangshuai
ec99e25755
Merge branch 'final/11.0' of ssh://code.fineres.com:7999/~tommy/design into final/11.0
3 years ago
kuangshuai
ddf9d42ea3
REPORT-61521 主题下载引导页加载异常
3 years ago
superman
ad25855ae0
Merge pull request #6360 in DESIGN/design from final/11.0 to release/11.0
...
* commit '519ff1131dc640aa47e7a3698cf13b3781cd3c5e':
REPORT-61505 导出-导出事件-模板保存问题
REPORT-58538 适配平台支持服务器数据集权限
REPORT-61510 组件埋点版本由jartime更换成jar版本
REPORT-61338 设计器主题-主题配色修改保存后出现异常空白提示框
CHART-21579 模版主题编辑页面-图表-系列-渐变色的色值联动逻辑修改
REPORT-61338 设计器主题-主题配色修改保存后出现异常空白提示框
REPORT-61366 FR11决策报表的报表块对应的单元格样式问题
3 years ago
superman
519ff1131d
Merge pull request #6359 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'be7b56255e9683965df1763af6332aa08318d50d':
3 years ago
superman
be7b56255e
Merge pull request #6356 in DESIGN/design from final/11.0 to persist/11.0
...
* commit 'c9572d151baad6e77f7a9b44379cc7cc6a7cd334': (359 commits)
REPORT-61505 导出-导出事件-模板保存问题
REPORT-58538 适配平台支持服务器数据集权限
REPORT-61510 组件埋点版本由jartime更换成jar版本
REPORT-61338 设计器主题-主题配色修改保存后出现异常空白提示框
CHART-21579 模版主题编辑页面-图表-系列-渐变色的色值联动逻辑修改
REPORT-60896 mac目录蒙层结束后有遗留透明块
REPORT-61299 popupMenu的子组件高亮不需要弹窗
REPORT-61338 设计器主题-主题配色修改保存后出现异常空白提示框
REPORT-61366 FR11决策报表的报表块对应的单元格样式问题
REPORT-61299 弹窗类面板高亮区域不加白边
REPORT-61437 导出-导出事件-自定义命名-提示文字会消失
REPORT-60896 代码还原
REPORT-61301 布局推荐-mac设计器全屏时,固定布局/非固定布局的弹窗飘移
无JIRA任务 引导任务的组件替换下
REPORT-61415 主题色颜色选择框黑色列不符合设计
REPORT-61413 【主题切换】cpt预览图里的左上角斜线单元格应该和小标题格式一致
REPORT-60896 引导蒙层有残留阴影
REPORT-61207 引导相关字体显示不对且被截断
REPORT-60366 fr11-linux设计器-插件无法在线更新
CHART-21579 模版主题编辑页面-图表-系列-渐变色的色值联动逻辑修改
...
3 years ago
starryi
c9572d151b
Pull request #6345 : CHART-21579 模版主题编辑页面-图表-系列-渐变色的色值联动逻辑修改
...
Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0
* commit '29814f2081f57569503963b7d67563cb8cf4d40c':
REPORT-61338 设计器主题-主题配色修改保存后出现异常空白提示框
CHART-21579 模版主题编辑页面-图表-系列-渐变色的色值联动逻辑修改
3 years ago
Tommy
573c5fd1e8
Pull request #6346 : REPORT-61510 组件埋点版本由jartime更换成jar版本
...
Merge in DESIGN/design from ~TOMMY/design:final/11.0 to final/11.0
* commit 'd841375a5bfa1183c913f39bcea92b70f3c02ba7':
REPORT-61510 组件埋点版本由jartime更换成jar版本
3 years ago
zack
e5888818e2
Pull request #6348 : REPORT-61505 导出-导出事件-模板保存问题
...
Merge in DESIGN/design from ~ZACK/design:final/11.0 to final/11.0
* commit '895fbc41b44cfe1e649cd88f55fd1dceae268020':
REPORT-61505 导出-导出事件-模板保存问题
3 years ago
zack
895fbc41b4
REPORT-61505 导出-导出事件-模板保存问题
3 years ago
Henry.Wang
233643a4bd
Pull request #6347 : REPORT-58538 适配平台支持服务器数据集权限
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0
* commit '2c5364119057db9aad70d9c2a39e1c4623742d09':
REPORT-58538 适配平台支持服务器数据集权限
3 years ago
Henry.Wang
2c53641190
REPORT-58538 适配平台支持服务器数据集权限
3 years ago
kuangshuai
d841375a5b
Merge branch 'final/11.0' of ssh://code.fineres.com:7999/~tommy/design into final/11.0
3 years ago
kuangshuai
7ed323a4ef
REPORT-61510 组件埋点版本由jartime更换成jar版本
3 years ago
Starryi
29814f2081
REPORT-61338 设计器主题-主题配色修改保存后出现异常空白提示框
...
【问题原因】
确保在EDT展示Toast
【改动思路】
同上
3 years ago
starryi
3fe48c224f
Pull request #6336 : REPORT-61366 & REPORT-61338
...
Merge in DESIGN/design from ~STARRYI/design:final/11.0 to final/11.0
* commit '205e0eb733076c9d9ab0665a8aaefc60d1cb8dfa':
REPORT-61338 设计器主题-主题配色修改保存后出现异常空白提示框
REPORT-61366 FR11决策报表的报表块对应的单元格样式问题
3 years ago