superman
2aeb2bdbbf
Merge pull request #6532 in DESIGN/design from release/11.0 to final/11.0
...
* commit '0ef0f5afc62f2d505c815e4e2520a1780a64c128': (28 commits)
REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候,判断处理逻辑不正确的问题
REPORT-58836 自定义导出二期
REPORT-61618 复用组件生成时带“-”,导致部分公式失效@Jaimme
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
REPORT-61708 FR11内置的组件更新替换
REPORT-57521 切换环境的代码放到edt线程
REPORT-57521
REPORT-57521
REPORT-57521 去掉websocket断开提示延迟
REPORT-57521
REPORT-57521 远程设计时websocket断开情况下的提示优化
CHART-21570 大屏模板适配11.0 图表组件没有跟随主题选项
REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
REPORT-61606 pc自适应属性中“决策报表”文案修改
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
REPORT-58584
REPORT-58584
REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
REPORT-57521 突然发现已经有关于websocket帮助文档的地址了
...
3 years ago
fanglei
0ef0f5afc6
Pull request #6528 : REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候,判断处理逻辑不正确的问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'f988f5ab2b622f255b1a0a8d0d4e8cbe478b29ac':
REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候,判断处理逻辑不正确的问题
3 years ago
方磊
f988f5ab2b
REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候,判断处理逻辑不正确的问题
3 years ago
Bruce.Deng
2f2c41d95b
Pull request #6511 : REPORT-58836 自定义导出二期
...
Merge in DESIGN/design from ~BRUCE.DENG/design:release/11.0 to release/11.0
* commit '452531bd0c0c66565a82b377745669cf2c1a125d':
REPORT-58836 自定义导出二期
3 years ago
Bruce.Deng
452531bd0c
REPORT-58836 自定义导出二期
3 years ago
Tommy
10b496ce27
Pull request #6490 : REPORT-61708 FR11内置的组件更新替换
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit 'aae1f0cfb141f8ee446d8ba7f26e0777af19c1ff':
REPORT-61708 FR11内置的组件更新替换
3 years ago
fanglei
d661252012
Pull request #6506 : REPORT-61618 复用组件生成时带“-”,导致部分公式失效@Jaimme
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit 'c30b210e38afa552c1d1efae0c120960607a82dc':
REPORT-61618 复用组件生成时带“-”,导致部分公式失效@Jaimme
3 years ago
方磊
c30b210e38
REPORT-61618 复用组件生成时带“-”,导致部分公式失效@Jaimme
3 years ago
fanglei
40c2d69e27
Pull request #6493 : REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '73a5ccf767cfdc9f1d78ec0d283a9f2b176b3766':
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
3 years ago
方磊
73a5ccf767
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
3 years ago
kuangshuai
aae1f0cfb1
REPORT-61708 FR11内置的组件更新替换
3 years ago
zheng
6097900f33
Pull request #6477 : CHART-21570 大屏模板适配11.0 图表组件没有跟随主题选项
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit '3a444419d16a0e618c420aba42b5c1e0e2f0e56d':
CHART-21570 大屏模板适配11.0 图表组件没有跟随主题选项
3 years ago
starryi
a8dcc978c5
Pull request #6474 : REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
...
Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0
* commit '0eebd17018f9f2f69ee500f5288cba9ca2860558':
REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
3 years ago
fanglei
7e6f2de035
Pull request #6476 : REPORT-57521 远程设计时websocket断开情况下的提示优化
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '1f78cadeeba88faa4aac5f6f94bf5d3d2f3e42f7':
REPORT-57521 切换环境的代码放到edt线程
REPORT-57521
REPORT-57521
REPORT-57521 去掉websocket断开提示延迟
REPORT-57521
REPORT-57521 远程设计时websocket断开情况下的提示优化
3 years ago
方磊
1f78cadeeb
REPORT-57521 切换环境的代码放到edt线程
3 years ago
方磊
08146bcc02
REPORT-57521
3 years ago
方磊
e30fe72381
REPORT-57521
3 years ago
方磊
3e2795fc1b
REPORT-57521 去掉websocket断开提示延迟
3 years ago
方磊
f2110f83ca
REPORT-57521
3 years ago
方磊
08cb30cc2e
REPORT-57521 远程设计时websocket断开情况下的提示优化
3 years ago
shine
3a444419d1
CHART-21570 大屏模板适配11.0 图表组件没有跟随主题选项
3 years ago
Starryi
0eebd17018
REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
...
【问题原因】
修改国际化文本
【改动思路】
同上
3 years ago
Henry.Wang
846fdc63ef
Pull request #6472 : REPORT-61606 pc自适应属性中“决策报表”文案修改
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '65f61002d48868ad992bd390fa39673791f3c6c2':
REPORT-61606 pc自适应属性中“决策报表”文案修改
3 years ago
Henry.Wang
65f61002d4
Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0
3 years ago
Henry.Wang
2653824683
REPORT-61606 pc自适应属性中“决策报表”文案修改
3 years ago
superman
5d2fd9d2be
Merge pull request #6469 in DESIGN/design from final/11.0 to release/11.0
...
* commit '80b5db8074e2d778fd25a882b9ca17a00c2533b4':
REPORT-61846 数据连接越权漏洞修复
3 years ago
superman
80b5db8074
Merge pull request #6468 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '8d5dfbdc228cc5d19a7c3f0095247cb34feaba6b':
REPORT-61846 数据连接越权漏洞修复
3 years ago
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