ee87f640dc
Merge pull request #6018 in DESIGN/design from release/11.0 to feature/x
...
* commit 'e98af599cd982df89c83545d6397ce71d050cd08':
REPORT-56481 修正错误
REPORT-56481 决策报表-模板打开时一直弹出提醒
Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动
3 years ago
e98af599cd
Merge pull request #6017 in DESIGN/design from final/11.0 to release/11.0
...
* commit '6ba243a75252fda49bc5d33b20edfe840f3f125e':
Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动
3 years ago
6ba243a752
Merge pull request #6016 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'de53744add24f1a2ef6725f2407bba965c62c04e':
REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动
3 years ago
8637e9b245
Pull request #6015 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from zheng-1632710859332 to feature/x
* commit '5f263e4d9517862f2eded81584b108bbd9c70d74':
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
REPORT-60004 远程设计-保存弹窗 目录显示问题
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
CHART-20939 design fix: 三维组合地图有类型界面
3 years ago
zheng
5f263e4d95
Fixed merge conflict
3 years ago
6217c56855
Merge pull request #6010 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '159e071708da5229a675642e7b144c979a83f97d':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
159e071708
Merge pull request #6009 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '1f8bd7a1d6f90d714a8d1520586e39677b959b60':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
acf2e8c978
Pull request #5981 : CHART-20411 适配 大屏模板 文件菜单
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '77c7a84eecde096651e1822302db51d47f79ed8e':
和抽之前完全一样
CHART-21076 清楚磁盘缓存
CHART-20411 适配大屏模板关闭
CHART-20411 适配大屏模板另存为
3 years ago
shine
77c7a84eec
和抽之前完全一样
3 years ago
Hades
1f8bd7a1d6
Pull request #5979 : REPORT-60004 远程设计-保存弹窗 目录显示问题
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '71c15a84accd64ae515f8a3ff217758b123b989c':
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
shine
291452a0f5
CHART-21076 清楚磁盘缓存
3 years ago
shine
236125c553
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0
3 years ago
c5df6da3fb
Pull request #5980 : 无JIRA任务 还原一也是无JIRA任务的改动
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit '32e6708bc3f6175435f530ead0fbe5b312567ec2':
无JIRA任务 还原一也是无JIRA任务的改动
3 years ago
32e6708bc3
无JIRA任务 还原一也是无JIRA任务的改动
3 years ago
82ecbcabb5
Pull request #5976 : REPORT-59905&REPORT-59952 若干bug
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit 'c971e997fb1e2d2dff3367a435b1aa19faac0321':
REPORT-59952 还原代码
REPORT-59952&无JIRA任务 还原代码&click事件感觉用起来不舒服，鼠标点下释放位置偏离一点点就失灵了，改成press事件
REPORT-59905&REPORT-59952 若干bug
3 years ago
c971e997fb
REPORT-59952 还原代码
3 years ago
9b73a2fab6
REPORT-59952&无JIRA任务 还原代码&click事件感觉用起来不舒服，鼠标点下释放位置偏离一点点就失灵了，改成press事件
3 years ago
shine
ac01b5c6fe
CHART-20411 适配大屏模板关闭
3 years ago
shine
2a967d27f2
CHART-20411 适配大屏模板另存为
3 years ago
71c15a84ac
REPORT-60004 远程设计-保存弹窗 目录显示问题
3 years ago
kerry
4a6bd9b0b6
Pull request #5971 : REPORT-59932 【固定布局-原布局推荐4.1】剪切问题
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'ac008319d7992d2d5681efd8fb0acce01f93eb51':
代码调整
REPORT-59948 && REPORT-59948
命名修改
REPORT-59932 【固定布局-原布局推荐4.1】剪切问题
3 years ago
a73a338215
Pull request #5978 : REPORT-56481 决策报表-模板打开时一直弹出提醒
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit 'cd8c8d3108c8686399fb0342c21b7493bc8b7437':
REPORT-56481 修正错误
REPORT-56481 决策报表-模板打开时一直弹出提醒
3 years ago
7d1424fb15
Pull request #5975 : REPORT-55989 mac的触控板左右滑动时，设计器的设计主体面板是上下滚动的
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit 'a4f08dcb02bfec117b3ad1767a40c2dac2bc53db':
REPORT-55989 mac的触控板左右滑动时，设计器的设计主体面板是上下滚动的
3 years ago
cd8c8d3108
REPORT-56481 修正错误
3 years ago
898c8a9199
Pull request #5977 : REPORT-59976 11.0更新有bug
...
Merge in DESIGN/design from ~BRYANT/design:final/11.0 to final/11.0
* commit 'f384b0c7f1224c10f958e94bab86f3e8ed790262':
Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
3 years ago
6be9f801ef
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~fanglei/design10.0 into release/11.0
...
* 'release/11.0' of ssh://code.fineres.com:7999/~fanglei/design10.0: (32 commits)
REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
REPORT-57298【回归测试】控件事件名显示完全，但出现横向滚动条
REPORT-59719 fix加个判断
REPORT-59719 下拉框效果还有点问题 fix
REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动
REPORT-59719 下拉框效果还有点问题
REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白
REPORT-55377 升级tomcat到8.5.69
REPORT-56220 数据连接越权漏洞修复
REPORT-56220 数据连接越权漏洞修复
REPORT-56220 数据连接越权漏洞修复
REPORT-56220 数据连接越权漏洞修复
REPORT-55377 更新Tomcat版本到8.5.69
add executeJavaScriptAndReturnValue function
CHART-20662 fix:数据集字段拖入单元格 白色文字
CHART-19792 大屏模板屏蔽全局参数菜单项
v7打开调试窗口失败的问题
还原范围
CHART-20642 图表预定义配色避免重名和空字符串名
新接口
...
3 years ago
bcc44e97ac
REPORT-56481 决策报表-模板打开时一直弹出提醒
3 years ago
a4f08dcb02
REPORT-55989 mac的触控板左右滑动时，设计器的设计主体面板是上下滚动的
...
【问题原因】
1. 移植JScrollPane的触摸板滚轮交互逻辑到表单布局和报表网格面板中
2. 复用表单和报表的滚轮处理逻辑, 表单和报表各自实现所需的接口即可
【改动思路】
同上
3 years ago
f384b0c7f1
Update designer-base/src/main/java/com/fr/design/update/ui/dialog/UpdateMainDialog.java
3 years ago
89f63b0c62
Update designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java
3 years ago
kerry
ac008319d7
代码调整
3 years ago
dce5874859
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~fanglei/design10.0 into feature/x
...
* 'feature/x' of ssh://code.fineres.com:7999/~fanglei/design10.0:
REPORT-59908 && REPORT-59906 && REPORT-59907
REPORT-59844 视觉微调
REPORT-59351 【主题切换】国际化显示问题
REPORT-59674 FR11新主题，单元格样式跟随主题时，样式选择中的字体看不清
REPORT-59423 【主题切换】高分辨率下主题管理页面显示不全
REPORT-59756 【主题切换】新建主题时，输入主题名称的时候会卡顿 & REPORT-59078 【主题切换】主题编辑界面 保存按钮交互优化
REPORT-57298【回归测试】控件事件名显示完全，但出现横向滚动条
代码修改
REPORT-57810 固定布局-原布局推荐4.1
REPORT-59719 fix加个判断
REPORT-59719 下拉框效果还有点问题 fix
REPORT-59770 【主题切换】编辑主题时，主题配色修改以后，细节配置和整体预览里的颜色没有相应联动
REPORT-59719 下拉框效果还有点问题
REPORT-59719 【10.0】点击数据源的刷新按钮，数据列表会变空白
3 years ago
5f6c301db7
REPORT-59905&REPORT-59952 若干bug
3 years ago
kerry
f88caa05f1
REPORT-59948 && REPORT-59948
3 years ago
0a98e919fb
Merge pull request #5973 in DESIGN/design from release/10.0 to release/11.0
...
* commit '37244ffdf28063263b772d5e3f44723fdfa35e99':
REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
3 years ago
ddb83185d8
Merge pull request #5969 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '2ec5de4bb1ec7e794d54c2cd1ac1f216b8e1a143':
REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
3 years ago
kerry
6a28016370
命名修改
3 years ago
d019c73e66
Pull request #5962 : REPORT-59756 & REPORT-59078 & REPORT-59423 & REPORT-59674 & REPORT-59351
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '9239e90287e2f7b42127d6d9a100a3244755c96e':
REPORT-59351 【主题切换】国际化显示问题
REPORT-59674 FR11新主题，单元格样式跟随主题时，样式选择中的字体看不清
REPORT-59423 【主题切换】高分辨率下主题管理页面显示不全
REPORT-59756 【主题切换】新建主题时，输入主题名称的时候会卡顿 & REPORT-59078 【主题切换】主题编辑界面 保存按钮交互优化
3 years ago
kerry
5d7f2db6a7
REPORT-59932 【固定布局-原布局推荐4.1】剪切问题
3 years ago
zheng
0f5d60f75f
Pull request #5970 : CHART-20686 fix bugs
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '2adee772b27b5092297900c75b180bfe9215f80e':
CHART-20686 大屏模板中的图表不支持导出
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
3 years ago
kerry
6899994bc9
Pull request #5960 : REPORT-59844 && REPORT-59908 && REPORT-59906 && REPORT-59907 布局推荐 bug 修复；视觉微调
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '0757ed358e0c727f2d2f09f5f44ab2f304790737':
REPORT-59908 && REPORT-59906 && REPORT-59907
REPORT-59844 视觉微调
3 years ago
zheng
d15b1510df
Pull request #5963 : CHART-21014 fix: 大屏模板中的cpt组件里面还是要有全部图表类型的
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '8c8873de3d238fe76eac21cbbf88138a77a5fe45':
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
3 years ago
shine
2adee772b2
CHART-20686 大屏模板中的图表不支持导出
3 years ago
kerry
0757ed358e
REPORT-59908 && REPORT-59906 && REPORT-59907
3 years ago
2ec5de4bb1
Merge pull request #5968 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '37244ffdf28063263b772d5e3f44723fdfa35e99':
REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
3 years ago
37244ffdf2
Merge pull request #5967 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'e8abf8cc271c58fd17f1c36e66bcbc68b2c9d17a':
REPORT-57551 设计器显示，自适应布局下body背景设置以后，画布中没有实时显示背景
3 years ago
shine
026ecab6ad
CHART-20850 fix:大屏模板中 试管型仪表盘切换为横向后 标签颜色就变了
3 years ago
279507fb90
Merge pull request #5961 in DESIGN/design from release/11.0 to feature/x
...
* commit '069506d2f8613787f215fee3dbf4cf720f1c4ff3':
REPORT-57298【回归测试】控件事件名显示完全，但出现横向滚动条
3 years ago
shine
8c8873de3d
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into feature/10.0
3 years ago
shine
0c327207bc
CHART-21014 大屏模板中的cpt组件里面还是要有全部图表类型的
3 years ago
superman
ju|剧浩宇
zheng
eason
Hades
fanglei
方磊
hades
kerry
starryi
Bryant
Starryi