Tommy
29a0b2f500
Merge branch 'release/11.0' into feature/x
...
# Conflicts:
# designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
# designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
3 years ago
Tommy
9594293125
Pull request #6761 : REPORT-62974 引导提示文字与按钮实际文字不一致
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit '122b5e86cd5db47ab21d90133b01739c643ba54c':
REPORT-62974 引导提示文字与按钮实际文字不一致
3 years ago
kerry
00ff65fb26
Pull request #6760 : REPORT-62926 && REPORT-62920 && REPORT-62967 && REPORT-62964
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '427fb1aa96942d417238b8cb65ee794cab6e4f1e':
REPORT-62398 【接触点优化】筛选面板存在时,上下滑动鼠标显示异常
REPORT-62970【接触点优化】筛选动效问题,交互看下
REPORT-62926 && REPORT-62920 && REPORT-62967 && REPORT-62964
3 years ago
kerry
427fb1aa96
REPORT-62398
...
【接触点优化】筛选面板存在时,上下滑动鼠标显示异常
3 years ago
starryi
675635f437
Pull request #6758 : REPORT-62972 【接触点优化】跟组件可更新的交互提示问题 & REPORT-62984 设计器触摸板问题-双指向右滑动时,设计器界面同时向右下滑动
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit 'f4ce22e862bc2dc0fe091337187d8782919057fb':
REPORT-62984 设计器触摸板问题-双指向右滑动时,设计器界面同时向右下滑动
REPORT-62972 【接触点优化】跟组件可更新的交互提示问题
3 years ago
Starryi
f4ce22e862
REPORT-62984 设计器触摸板问题-双指向右滑动时,设计器界面同时向右下滑动
...
【问题原因】
修复REPORT-55989时实现了新的支持双向触摸滚动的MouseWheelListener,
但未删除旧的触摸板滚动处理逻辑,导致旧的纵向滚动逻辑也一起生效了
【改动思路】
删除旧的纵向滚动处理逻辑
3 years ago
superman
2a9d0bfd7a
Merge pull request #6769 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '538bcda0047060ad0800a66d50b9f4377d208314':
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后,reportlets根目录显示不了FVS模板,只有点击工具栏的刷新按钮才能出现
REPORT-62275 tab高度弹窗撤销问题
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
REPORT-62554 再打开设计器模板会空白
3 years ago
ju|剧浩宇
834cef3ba7
Pull request #6768 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'a02ea7988e90e46d5dff91d0d66a1858d54c91d8':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
方磊
a02ea7988e
Merge branch 'release/10.0' into release/11.0
...
* release/10.0:
REPORT-62275 tab高度弹窗撤销问题
# Conflicts:
# designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java
3 years ago
kerry
dc1f4cd0ff
REPORT-62970【接触点优化】筛选动效问题,交互看下
3 years ago
fanglei
ab07c4a63c
Pull request #6759 : REPORT-62275 tab高度弹窗撤销问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'b7287df4749f12276f4908d2277d4fd7c21e232a':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
ju|剧浩宇
5e273681fe
Pull request #6767 : 无jira任务, release/10.0 合 release/11.0
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '2a4d3e38214e207df2ce676d5c2a2b619ce23f05':
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后,reportlets根目录显示不了FVS模板,只有点击工具栏的刷新按钮才能出现
REPORT-62275 tab高度弹窗撤销问题
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
REPORT-62554 再打开设计器模板会空白
3 years ago
fanglei
92d1d8b90c
Pull request #6766 : REPORT-62275 tab高度弹窗撤销问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '19b7fcb536e8ef99218cca5827601eeb6c8ea46e':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
Henry.Wang
2a4d3e3821
无jira任务, release/10.0 合 release/11.0 解决冲突
3 years ago
方磊
19b7fcb536
REPORT-62275 tab高度弹窗撤销问题
3 years ago
superman
538bcda004
Merge pull request #6764 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'f15b3ee2738b27c7e7d99aec32778d9d18562df4':
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后,reportlets根目录显示不了FVS模板,只有点击工具栏的刷新按钮才能出现
REPORT-62275 tab高度弹窗撤销问题
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
REPORT-62554 再打开设计器模板会空白
3 years ago
Tommy
122b5e86cd
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.0
3 years ago
Tommy
e125cbe2d9
REPORT-62974 引导提示文字与按钮实际文字不一致
3 years ago
kerry
eb4fbebd72
REPORT-62926 && REPORT-62920 && REPORT-62967 && REPORT-62964
3 years ago
Starryi
ac23b37e17
REPORT-62972 【接触点优化】跟组件可更新的交互提示问题
...
【问题原因】
本地组件可更新提示初始时应该不可见
【改动思路】
同上
3 years ago
方磊
b7287df474
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-62680 插件-插件管理-设计器里没有适配禁用提示 代码质量问题
REPORT-62896 替换常量
REPORT-62896 下载主题引导过程中概率性退出引导问题
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 【问题原因】设计器里没适配 【改动思路】1. 适配下弹窗提示;2. 之前把forbid-reminder放到PluginView里还是不合适,换成通过xml获取的方式 【review建议】无
3 years ago
方磊
07d4884230
REPORT-62275 tab高度弹窗撤销问题
3 years ago
Hades
f15b3ee273
Pull request #6757 : CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后,reportlets根目录显示不了FVS模板,只有点击工具栏的刷新按钮才能出现
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'ccaa4cf79a164a7bc61facc7d9ef7cbf96b3856b':
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后,reportlets根目录显示不了FVS模板,只有点击工具栏的刷新按钮才能出现
3 years ago
fanglei
a75436f092
Pull request #6756 : REPORT-62275 tab高度弹窗撤销问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '1b52c54a85171a2e46e2170096c9f66264023d8a':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
hades
ccaa4cf79a
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后,reportlets根目录显示不了FVS模板,只有点击工具栏的刷新按钮才能出现
3 years ago
Tommy
819ee73425
Pull request #6755 : REPORT-62896 下载主题引导过程中概率性退出引导问题
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit 'dbb9bb6ce7083fb2b0cebbaee3206db3238ff75f':
REPORT-62896 替换常量
REPORT-62896 下载主题引导过程中概率性退出引导问题
3 years ago
方磊
1b52c54a85
REPORT-62275 tab高度弹窗撤销问题
3 years ago
fanglei
5c51007a5c
Pull request #6728 : REPORT-62275&REPORT-62275 表单拖入失败-自动撤销&tab高度弹窗撤销问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit '60edfb2cbdaa50ba950ed4d1a54982de15cd9cbb':
REPORT-62275&REPORT-61827
REPORT-62275
REPORT-61827
REPORT-62275 表单拖入失败-自动撤销
3 years ago
Hoky.He
67f89bea89
Pull request #6753 : REPORT-62809 && REPORT-62814 && REPORT-62815 && REPORT-62816 && REPORT-62817
...
Merge in DESIGN/design from ~HOKY.HE/design-hoky:feature/x to feature/x
* commit '582ba968e6832c4c0ae676f5ce4b92947a180e24':
REPORT-62809 && REPORT-62814 && REPORT-62815 && REPORT-62816 && REPORT-62817 1.修改布局与一些错误
3 years ago
Yvan
6d2d495ffd
Pull request #6754 : REPORT-62680 插件-插件管理-设计器里没有适配禁用提示
...
Merge in DESIGN/design from ~YVAN/design:release/11.0 to release/11.0
* commit '3e6b0f874e3928d485c059ac61b8010a2fb30a99':
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 代码质量问题
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示 【问题原因】设计器里没适配 【改动思路】1. 适配下弹窗提示;2. 之前把forbid-reminder放到PluginView里还是不合适,换成通过xml获取的方式 【review建议】无
3 years ago
yvan
3e6b0f874e
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示
...
代码质量问题
3 years ago
Hades
afbe5f618a
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
...
* commit 'd72bc467a66226d2083ee76b5e787eb4aaeeba8e':
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
REPORT-62554 再打开设计器模板会空白
3 years ago
Tommy
dbb9bb6ce7
REPORT-62896 替换常量
3 years ago
Tommy
4b1d31cfa1
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~tommy/design into release/11.0
3 years ago
Tommy
ed0a2090df
REPORT-62896 下载主题引导过程中概率性退出引导问题
3 years ago
Henry.Wang
d72bc467a6
Pull request #6731 : REPORT-62554 再打开设计器模板会空白
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'a992039144f20522d64e707de1da6ec46e4bed2c':
REPORT-62554 再打开设计器模板会空白
3 years ago
zheng
5edddd28f7
Pull request #6742 : CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '042a5d0752f90a7dc197087a5040f744dad25064':
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
3 years ago
kerry
dd59957f3c
Pull request #6730 : REPORT-60154 && REPORT-62780 【阻塞】【接触点优化】收起筛选面板,开始轮播加载时,最新版本会提示网络连接失败导致无法正常轮播;【来源于迭代任务】【V3.1.0】【无需适配】复用组件接触点优化二期
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'f81fc8d004823e8b5d264284306fb02402fc916c':
REPORT-62780【阻塞】【接触点优化】收起筛选面板,开始轮播加载时,最新版本会提示网络连接失败导致无法正常轮播
REPORT-60154【来源于迭代任务】【V3.1.0】【无需适配】复用组件接触点优化二期
3 years ago
方磊
60edfb2cbd
REPORT-62275&REPORT-61827
3 years ago
yvan
8c72116a9f
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
3 years ago
yvan
8368200619
REPORT-62680 插件-插件管理-设计器里没有适配禁用提示
...
【问题原因】设计器里没适配
【改动思路】1. 适配下弹窗提示;2. 之前把forbid-reminder放到PluginView里还是不合适,换成通过xml获取的方式
【review建议】无
3 years ago
Hoky
582ba968e6
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
Hoky
7c550df360
REPORT-62809 && REPORT-62814 && REPORT-62815 && REPORT-62816 && REPORT-62817
...
1.修改布局与一些错误
3 years ago
方磊
0ae062a012
REPORT-62275
3 years ago
shine
042a5d0752
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
15341520dd
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
3 years ago
kerry
f81fc8d004
REPORT-62780【阻塞】【接触点优化】收起筛选面板,开始轮播加载时,最新版本会提示网络连接失败导致无法正常轮播
3 years ago
kerry
64287df3fd
REPORT-60154【来源于迭代任务】【V3.1.0】【无需适配】复用组件接触点优化二期
3 years ago
fanglei
e898117c98
Pull request #6729 : REPORT-62596 远程设计websocket断开提示优化-远程正常状态下启动设计器时出现toast弹窗
...
Merge in DESIGN/design from ~FANGLEI/design:feature/x to feature/x
* commit '3fb2b1f27929db5672431a6b808d112172b28c4e':
REPORT-62596 远程设计websocket断开提示优化-远程正常状态下启动设计器时出现toast弹窗
3 years ago
方磊
3fb2b1f279
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~fanglei/design into feature/x
...
* 'feature/x' of ssh://code.fineres.com:7999/~fanglei/design:
REPORT-60748 决策报表-属性-坐标尺寸交互问题
3 years ago