superman
2b4993a33d
Merge pull request #6870 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '80c4d7686ec8be8696b981676e3db963e0883057':
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
3 years ago
superman
80c4d7686e
Merge pull request #6869 in DESIGN/design from final/10.0 to release/10.0
...
* commit '78862fcb1d3fcabce50a05d238d12826679fd454':
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
3 years ago
Hades
78862fcb1d
Pull request #6863 : CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '8de9339eceaf774fe0f497b6845a82daa8b98762':
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
3 years ago
hades
8de9339ece
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
3 years ago
Hades
326c9bff7f
Pull request #6862 : REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '568cf34dc65fa13e4efe4d2f2ab8c377732c7827':
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
3 years ago
hades
568cf34dc6
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
3 years ago
superman
7c54fb326c
Merge pull request #6843 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '11b2419281f4186136d43ce260fbd9544491eea5':
3 years ago
superman
11b2419281
Merge pull request #6840 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '126044156244bbb8983cd222280858e4d1a18fe6':
3 years ago
superman
1260441562
Merge pull request #6839 in DESIGN/design from final/10.0 to release/10.0
...
* commit '36bb7d425e18e0a372be3a15a62a5912743b8e55':
3 years ago
superman
36bb7d425e
Merge pull request #6834 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'b994b8bb8b935eae310a398ba2dea704d73a5799':
REPORT-62275 tab高度弹窗撤销问题
CHART-22020 【设计器】大屏编辑器-第一次启动设计器-插件加载成功后,reportlets根目录显示不了FVS模板,只有点击工具栏的刷新按钮才能出现
REPORT-62275 tab高度弹窗撤销问题
CHART-21785 cpt编辑状态背景和当前页面颜色背景一样 design
REPORT-62554 再打开设计器模板会空白
REPORT-60748 决策报表-属性-坐标尺寸交互问题
CHART-21951 第三方图表插件无法创建复用组件
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
CHART-21665 design fix:仪表盘刻度配色保存异常处理
REPORT-62142 fix 解密条件 关注内置的两种模板类型即可
REPORT-62142 加密模板在json数据集插件禁用启用后的模板数据集无法正常显示
REPORT-62133 mac设计器安装包起不来
3 years ago
superman
b994b8bb8b
Merge pull request #6833 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '52177afe711e2ef709ff4c28cb4d3c0bec4c8de0':
3 years ago
superman
25ba5e7d5b
Merge pull request #6781 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '52177afe711e2ef709ff4c28cb4d3c0bec4c8de0':
REPORT-62275 tab高度弹窗撤销问题
3 years ago
superman
52177afe71
Merge pull request #6779 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '92d1d8b90c3d309f670a8693f3b4bf9b77b7e665':
REPORT-62275 tab高度弹窗撤销问题
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
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
方磊
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
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
方磊
1b52c54a85
REPORT-62275 tab高度弹窗撤销问题
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
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
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
superman
c3c4374039
Merge pull request #6711 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd96b43ad5971fd553d88e8cd5e26b521ae1d05de':
REPORT-60748 决策报表-属性-坐标尺寸交互问题
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
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
8e24fc5bb5
Merge pull request #6696 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '5c4a18f4e65e1d6b2443fe01a191329218f99939':
CHART-21951 第三方图表插件无法创建复用组件
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
kuangshuai
d2c39de9d3
CHART-21951 第三方图表插件无法创建复用组件
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
042fcc8294
Merge pull request #6662 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'b29fc795a1afcbad129450d321161f6323f3afe2':
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
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
superman
709a3e2d3f
Merge pull request #6654 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '1cff000f66bdbc14bdebf09fe9db2f38b3fd1a9b':
CHART-21665 design fix:仪表盘刻度配色保存异常处理
3 years ago
superman
1cff000f66
Merge pull request #6648 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8d908f40fa0d610630c2b34e40fcbc4089a2c70f':
CHART-21665 design fix:仪表盘刻度配色保存异常处理
3 years ago
superman
8d908f40fa
Merge pull request #6647 in DESIGN/design from final/10.0 to release/10.0
...
* commit '973eb65d32932af60dc1518df6a221c65eed17a8':
3 years ago
superman
973eb65d32
Merge pull request #6646 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '82d74e697cd41a2548f3fc964a0cb28e997fc162':
3 years ago
Henry.Wang
af7313ee94
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
3 years ago
Henry.Wang
90505e143d
REPORT-62088 来回切换两个单元格及其的排序按钮,几十次后,排序按钮点击
3 years ago
zheng
10b9a92e10
Pull request #6628 : CHART-21665 design fix:仪表盘刻度配色保存异常处理
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'ddc6bdfadb87ba5166c01a2c0c3fb3eb438f3171':
CHART-21665 design fix:仪表盘刻度配色保存异常处理
3 years ago
superman
82d74e697c
Merge pull request #6641 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '027eff108d5fac397ed158d748cc96fd5136132c': (27 commits)
REPORT-62133 mac设计器安装包起不来
REPORT-62437 安装大数据集导出excel插件后,远程和本地互相切换时保存失败问题
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-61695 决策报表-自适应布局下组件右侧设置面板显示“组件大小”,绝对布局下显示的是“控件位置”“控件大小”
REPORT-61610 fix:插件重新加载 图表配置界面报错 A.class can not cast to A.class
CHART-21418 fix:第二次修改 区分弹框在上面还是下面 如果在上面 则是从displayComponent下面离开 隐藏弹框
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
REPORT-60887 MAC OS x电脑上 编辑按钮飘移
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
...
3 years ago
superman
a05d16ffce
Merge pull request #6633 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'ffe79d0137aa78f657cccec4869fd9705f84f590':
REPORT-62133 mac设计器安装包起不来
3 years ago
superman
ffe79d0137
Merge pull request #6631 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e83a12afa4d208de290bac81037b6875df31622f':
REPORT-62133 mac设计器安装包起不来
3 years ago
superman
e83a12afa4
Merge pull request #6630 in DESIGN/design from final/10.0 to release/10.0
...
* commit '027eff108d5fac397ed158d748cc96fd5136132c':
REPORT-62133 mac设计器安装包起不来
3 years ago