方磊
50e2c75306
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~fanglei/design into release/11.0
...
* 'release/11.0' of ssh://code.fineres.com:7999/~fanglei/design:
REPORT-60748 决策报表-属性-坐标尺寸交互问题
CHART-21951 第三方图表插件无法创建复用组件
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
superman
bc1c504b1c
Merge pull request #6716 in DESIGN/design from release/11.0 to feature/x
...
* commit 'f9f08a48feee1472f44d3653bb5a28e8c8028975':
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
superman
c3c4374039
Merge pull request #6711 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd96b43ad5971fd553d88e8cd5e26b521ae1d05de':
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
ju|剧浩宇
f9f08a48fe
Pull request #6710 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit '310489755f999708c8a0b833172444fd14f905c4':
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
方磊
310489755f
Merge branch 'release/10.0' into release/11.0
...
* release/10.0:
REPORT-60748 决策报表-属性-坐标尺寸交互问题
# Conflicts:
# designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java
# designer-form/src/main/java/com/fr/design/designer/creator/XCreator.java
# designer-form/src/main/java/com/fr/design/designer/creator/XCreatorUtils.java
# designer-form/src/main/java/com/fr/design/designer/creator/XLayoutContainer.java
3 years ago
hades
9bb89eee1d
KERNEL-9542 优化插件对设计器启动带来的影响
3 years ago
Henry.Wang
a992039144
REPORT-62554 再打开设计器模板会空白
3 years ago
superman
d96b43ad59
Merge pull request #6707 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '66ca0d8d92c427830a70929fb8caaa4d5b4ffceb':
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
方磊
f515d766e4
REPORT-62596 远程设计websocket断开提示优化-远程正常状态下启动设计器时出现toast弹窗
3 years ago
Hades
cfce6b4546
Merging in latest from upstream (DESIGN/design:refs/heads/feature/x)
...
* commit '8f063b46482a895340ef1b0cabfd888a0ce77b43':
REPORT-62398 && REPORT-62397【接触点优化】查看推荐组件按钮,显示不全;【接触点优化】筛选面板存在时,上下滑动鼠标显示异常
REPORT-62653 【组件可更新提醒】组件复用-组件上“版本不兼容”提示文字不明显
CHART-21951 第三方图表插件无法创建复用组件
REPORT-62677 组件复用-在线组件页面数据加载失败
REPORT-62576 【组件可更新提醒】组件复用-更新过程中取消更新失败
REPORT-62652 【组件可更新提醒】组件复用-不兼容弹窗图标应该是红色标识
REPORT-62647 组件更新成功后可更新标志应该消失
CHART-21951 第三方图表插件无法创建复用组件
REPORT-62623 && REPORT-62399 && REPORT-62547 && REPORT-62626 && REPORT-62400 && REPORT-62542 && REPORT-62544
bug修复
REPORT-62400 && REPORT-62399 && REPORT-62547【接触点优化】拖拽动效出现时,预览图不消失;【接触点优化】轮播的同时,鼠标悬浮在组件上,轮播图不消失,与组件预览图同时出现;【接触点优化】轮播的图片固定大小,导致预览图显示不全
3 years ago
方磊
a51db42343
REPORT-61827
3 years ago
kerry
8f063b4648
Pull request #6702 : REPORT-62398 && REPORT-62397【接触点优化】查看推荐组件按钮,显示不全;【接触点优化】筛选面板存在时,上下滑动鼠标显示异常
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '0dbfac7719f17f4637d9f31eddfec88d8cf45e2d':
REPORT-62398 && REPORT-62397【接触点优化】查看推荐组件按钮,显示不全;【接触点优化】筛选面板存在时,上下滑动鼠标显示异常
3 years ago
starryi
ee3c85ab22
Pull request #6689 : REPORT-62647 & REPORT-62652 & REPORT-62576 & REPORT-62677 & REPORT-62677
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '1b42276edf338ca8c89b4b66b77c97e54dc1b519':
REPORT-62653 【组件可更新提醒】组件复用-组件上“版本不兼容”提示文字不明显
REPORT-62677 组件复用-在线组件页面数据加载失败
REPORT-62576 【组件可更新提醒】组件复用-更新过程中取消更新失败
REPORT-62652 【组件可更新提醒】组件复用-不兼容弹窗图标应该是红色标识
REPORT-62647 组件更新成功后可更新标志应该消失
3 years ago
fanglei
66ca0d8d92
Pull request #6703 : REPORT-60748 决策报表-属性-坐标尺寸交互问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '3ae5bc3743bc43f33fdb3c7e4c6498675c7c6dd1':
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
方磊
3ae5bc3743
Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design into release/10.0
...
* 'release/10.0' of ssh://cloud.finedevelop.com:7999/~fanglei/design: (55 commits)
CHART-21951 第三方图表插件无法创建复用组件
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
CHART-21665 design fix:仪表盘刻度配色保存异常处理
REPORT-62133 mac设计器安装包起不来
REPORT-62437 安装大数据集导出excel插件后,远程和本地互相切换时保存失败问题
REPORT-62142 fix 解密条件 关注内置的两种模板类型即可
REPORT-62142 加密模板在json数据集插件禁用启用后的模板数据集无法正常显示
REPORT-62133 mac设计器安装包起不来
CHART-21786:不限制图片标记点大小
REPORT-60528 修复之前在弹窗提示tablayout高度有问题的时候,判断处理逻辑不正确的问题
REPORT-61654 弹窗内容显示不全
REPORT-61610 fix:回退最开始关于 相同的图表类型,不会新建图表配置界面 的逻辑改动
REPORT-62179 数字控件的最大最小值校验需支持公式
REPORT-62016 BI插件匹配检测
REPORT-61410 数据集预览时可复制-表头复制问题 && REPORT-61409 数据集预览时可复制-赋值空值时显示成Null
update
代码质量:每个实例各自监听插件事件
REPORT-61695
REPORT-61618 复用组件生成时带“-”,导致部分公式失效@Jaimme
REPORT-61610 fix:插件重新加载 图表配置界面报错 A.class can not cast to A.class
...
# Conflicts:
# designer-base/src/main/java/com/fr/design/widget/WidgetBoundsPaneFactory.java
3 years ago
方磊
3430b56fae
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago
superman
b6634637cd
Merge pull request #6701 in DESIGN/design from release/11.0 to feature/x
...
* commit '233336dfc59b05a430cd20b1a6e9abe3a6863af0':
CHART-21951 第三方图表插件无法创建复用组件
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
kerry
0dbfac7719
REPORT-62398 && REPORT-62397【接触点优化】查看推荐组件按钮,显示不全;【接触点优化】筛选面板存在时,上下滑动鼠标显示异常
3 years ago
superman
8e24fc5bb5
Merge pull request #6696 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '5c4a18f4e65e1d6b2443fe01a191329218f99939':
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
ju|剧浩宇
233336dfc5
Pull request #6695 : 无jira任务, release/10.0 合 release/11.0
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit 'fa28bf6a5b8a8d4c8ff7bff1d1d67531c18abd1b':
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
kuangshuai
fa28bf6a5b
Merge branch 'release/10.0' into release/11.0
...
# Conflicts:
# designer-realize/src/main/java/com/fr/design/share/effect/EffectItemGroup.java
3 years ago
superman
5c4a18f4e6
Merge pull request #6693 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '353485f0ddb86a6c062b093da63faeaf53bb6c8e':
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
Tommy
353485f0dd
Pull request #6690 : CHART-21951 第三方图表插件无法创建复用组件
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit 'd2c39de9d3229333e467f81c844a3b4886a89eef':
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
Tommy
86e12dcc44
Pull request #6688 : CHART-21951 第三方图表插件无法创建复用组件
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit '39703b20da47fb1ae4bb0d5506a2496e3710e22c':
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
Starryi
1b42276edf
REPORT-62653 【组件可更新提醒】组件复用-组件上“版本不兼容”提示文字不明显
...
【问题原因】
修改提示文字背景及字体
【改动思路】
同上
3 years ago
kuangshuai
d2c39de9d3
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
Starryi
d5d81f8f7c
REPORT-62677 组件复用-在线组件页面数据加载失败
...
【问题原因】
有个同时进行的任务在优化这部分代码,导致新修改的在线组件数据请求
路径在合并时丢失了,需要补充一下
【改动思路】
try-catch块中使用Exception匹配所有异常
3 years ago
Starryi
0099f1f88e
REPORT-62576 【组件可更新提醒】组件复用-更新过程中取消更新失败
...
【问题原因】
未处理取消异常
【改动思路】
try-catch块中使用Exception匹配所有异常
3 years ago
Starryi
0a1394d789
REPORT-62652 【组件可更新提醒】组件复用-不兼容弹窗图标应该是红色标识
...
【问题原因】
替换不兼容提示弹窗图标
【改动思路】
同上
3 years ago
Starryi
3c184dd951
REPORT-62647 组件更新成功后可更新标志应该消失
...
【问题原因】
更新成功后没有替换视图块中的组件数据,导致组件
数据模型中的版本还是低版本,所以会继续绘制可
更新标志。
【改动思路】
更新成功后,依照id取出最新的数据并赋值重绘
3 years ago
kuangshuai
39703b20da
CHART-21951 第三方图表插件无法创建复用组件
3 years ago
kerry
86ebd5ee74
Pull request #6685 : REPORT-62623 && REPORT-62399 && REPORT-62547 && REPORT-62626 && REPORT-62400 && REPORT-62542 && REPORT-62544 bug 修复
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'fd7a89abd349ebb97eae2bd0067f4a5c5f82b883':
REPORT-62623 && REPORT-62399 && REPORT-62547 && REPORT-62626 && REPORT-62400 && REPORT-62542 && REPORT-62544
bug修复
REPORT-62400 && REPORT-62399 && REPORT-62547【接触点优化】拖拽动效出现时,预览图不消失;【接触点优化】轮播的同时,鼠标悬浮在组件上,轮播图不消失,与组件预览图同时出现;【接触点优化】轮播的图片固定大小,导致预览图显示不全
3 years ago
hades
e044c1fcfb
Revert "KERNEL-9542 优化插件对设计器启动带来的影响"
...
This reverts commit a40d886307
.
3 years ago
方磊
e49f8cd9c9
REPORT-62275 表单拖入失败-自动撤销
3 years ago
hades
e4999db188
Merge branch 'feature/x' of https://code.fineres.com/scm/~hades/design into feature/x
3 years ago
hades
a40d886307
KERNEL-9542 优化插件对设计器启动带来的影响
3 years ago
starryi
68e12f408f
Pull request #6674 : REPORT-62573 【组件可更新提醒】组件复用-应当仅有可更新组件的分组展开
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit 'e1748fda1b5ab98f888de565f3e6ba1552e620f1':
REPORT-62573 【组件可更新提醒】组件复用-应当仅有可更新组件的分组展开
3 years ago
kerry
fd7a89abd3
REPORT-62623 && REPORT-62399 && REPORT-62547 && REPORT-62626 && REPORT-62400 && REPORT-62542 && REPORT-62544
3 years ago
kerry
21246baf46
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x
3 years ago
superman
373e830fca
Merge pull request #6684 in DESIGN/design from release/11.0 to feature/x
...
* commit 'ca278d8016b3957345e1de2ea8df217d00fc920c':
REPORT-62539 优化下代码
REPORT-62539 不触发事件了,直接改可见性
3 years ago
kerry
e7355039d8
bug修复
3 years ago
Xiqiu
ca278d8016
Pull request #6644 : REPORT-62539 不触发事件了,直接改可见性
...
Merge in DESIGN/design from ~XIQIU/design:release/11.0 to release/11.0
* commit 'aee7de437134a246ad3d31e4fc0dab0ccbde53e6':
REPORT-62539 优化下代码
REPORT-62539 不触发事件了,直接改可见性
3 years ago
Starryi
e1748fda1b
REPORT-62573 【组件可更新提醒】组件复用-应当仅有可更新组件的分组展开
...
【问题原因】
重新实现组件分组面板可展开的逻辑
【改动思路】
同上
3 years ago
xiqiu
aee7de4371
REPORT-62539 优化下代码
3 years ago
superman
f82b7c383f
Merge pull request #6673 in DESIGN/design from release/11.0 to feature/x
...
* commit 'ae1f9389c67dc2d3d64c811408e8a7a22fd22d19':
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
3 years ago
superman
6a6558b643
Merge pull request #6668 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '042fcc82940bef61e871dca8bdd296a188a53006':
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
3 years ago
superman
ae1f9389c6
Merge pull request #6667 in DESIGN/design from release/10.0 to release/11.0
...
* commit 'b29fc795a1afcbad129450d321161f6323f3afe2':
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
3 years ago
superman
042fcc8294
Merge pull request #6662 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'b29fc795a1afcbad129450d321161f6323f3afe2':
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
3 years ago
starryi
a405202d86
Pull request #6643 : REPORT-62433 11.0设计器-单元格样式-有部分样式显示的字体内容不全
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit 'a682e7d9a0907020f4b6e291c77b6fa6865fd901':
REPORT-62543 在线组件页面的搜索框失效
REPORT-62433 11.0设计器-单元格样式-有部分样式显示的字体内容不全
3 years ago
Henry.Wang
b29fc795a1
Pull request #6645 : REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,点击排序按钮时出现明显卡顿
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'af7313ee94113d290c61c42eb54cb0517ddbd69d':
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
3 years ago