zheng
11bdd55efc
Pull request #7027 : CHART-21584 feat:fvs.chart.font 单位px 范围6-200
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'adf49bfded20a12f7fc261119314b1fc582069f4':
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
shine
adf49bfded
update
3 years ago
shine
043a81042d
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
a74ef15eb8
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
starryi
4396805594
Pull request #6990 : REPORT-56014 & REPORT-56015 & REPORT-60161
...
Merge in DESIGN/design from ~STARRYI/design:bugfix/10.0 to bugfix/10.0
* commit '84b3103890b1620c393be4657a8ca9720301f800':
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
3 years ago
superman
7ad1878c3a
Merge pull request #7013 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '158094bf632878e97c4ed7f103362013fcd2b033':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
superman
158094bf63
Merge pull request #7011 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '52925ffe09be87d9f6b60293782657a502e16827':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
superman
52925ffe09
Merge pull request #7009 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '925f5058768a450212da7fd55df7689002f2c67f':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
superman
925f505876
Merge pull request #7008 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'dc6b99807e495492062639ce007cc6c831616798':
3 years ago
superman
dc6b99807e
Merge pull request #7007 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'c60528cff2e0ecb91224714bc407efce7792437d':
3 years ago
superman
c60528cff2
Merge pull request #7006 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'b5ae394a59595d62ef2acfd102773d84b0a55f2e':
3 years ago
fanglei
93e04b27fc
Pull request #7004 : REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '69ed61a95692120a21f786ce5c837cb4730ba374':
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
方磊
69ed61a956
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:
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
3 years ago
方磊
dceeb24569
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
3 years ago
Starryi
84b3103890
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
...
【问题原因】
点九图边界线值为0也是有效值
【改动思路
3 years ago
Starryi
6621921d0d
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
...
【问题原因】
点九图小而组件大,且中间不可缩放的尺寸为0时,就会出现空白。从点九图的
使用机制上看无法避免上上述情况,需要在生成点九图的时候,强制中间缩放
区域的尺寸最小为1才行,即两条平行线之间的最小间距为1.
【改动思路】
同上
3 years ago
superman
7f43782290
Merge pull request #6973 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '6413f7cfd3aea92744b53bca6fb6ad4a3e9d4cd0':
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
3 years ago
superman
6413f7cfd3
Merge pull request #6971 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'bd533afa9b4a1264afa6d8dfe033cb2a5c3cf953':
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
3 years ago
superman
bd533afa9b
Merge pull request #6965 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '22d1824127fe2296171820d6feb24bf133f1833d':
3 years ago
starryi
fbf5178447
Pull request #6945 : REPORT-62691 & REPORT-63322
...
Merge in DESIGN/design from ~STARRYI/design:bugfix/10.0 to bugfix/10.0
* commit 'afe4c1e5b59c02838ee3ca871eb5ee6b9ca84fa6':
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
3 years ago
Starryi
afe4c1e5b5
REPORT-63322 决策报表及聚合报表,无法拖动组件
...
【问题原因】
在某些场景下,组件可能会被破坏或无法被当前设计器解析,从而出现
异常。若拖拽时的异常不被处理,会导致无法完成整个swing拖拽过程,
从而影响后续其他所有的组件拖拽。
【改动思路】
同产品以及交互讨论,新增了一个错误提示信息,当拖拽组件出现
异常时,提示用户,同时终结当前的拖拽。
3 years ago
superman
22d1824127
Merge pull request #6946 in DESIGN/design from feature/10.0 to release/10.0
...
* commit '18ca498021f3533d538491f9f223f2ff10903d6a':
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
Starryi
0ce53a60b4
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
...
【问题原因】
10.0设计器上对组件版本进行检测,并限制使用不兼容的组件
【改动思路】
同上
3 years ago
superman
ff085ff240
Merge pull request #6909 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '18ca498021f3533d538491f9f223f2ff10903d6a':
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
superman
18ca498021
Merge pull request #6907 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'ad9569f781fcc6e66b3f4f36ef281dd3088107cd':
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
starryi
ad9569f781
Pull request #6873 : REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
...
Merge in DESIGN/design from ~STARRYI/design:bugfix/10.0 to bugfix/10.0
* commit 'ef86abec5ae2a96c5d27acc2d895c98cbf132453':
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
superman
8a914f985c
Merge pull request #6887 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '08fd9f604bd9c481fb5be6d23042201d7879e3b0':
3 years ago
superman
08fd9f604b
Merge pull request #6885 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '38665fc771d1640f3f87683d8dbb356a8a6475b8':
3 years ago
superman
38665fc771
Merge pull request #6883 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '0033cce022c3b6a25519717bfd110475d39f8025':
3 years ago
superman
0033cce022
Merge pull request #6882 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'b5ae394a59595d62ef2acfd102773d84b0a55f2e':
3 years ago
superman
b5ae394a59
Merge pull request #6881 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '0b0bf1f9de0003f1a85b1a67d286d07415f02d1e':
3 years ago
superman
d725ec7168
Merge pull request #6876 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '6d6dadaaec4d38fb628c3e27bb8ca74052149db5':
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
3 years ago
superman
6d6dadaaec
Merge pull request #6874 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '2b4993a33d3f4c8ff501411df36944a384f376be':
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
3 years ago
Starryi
ef86abec5a
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
...
【问题原因】
11.0上修复了一个相同的问题REPORT-59963,需要在10.0
上也提交下
调整Tab块样式导致样式刷新时,标题栏的样式均被初始化
【改动思路】
1. Tab组件虽然在样式面板上没有设置标题样式的设置项,即
TitlePacker,但依然使用了标题样式相关的字段,如背景,
是否显示标题栏等,这些标题相关的字段不能在调整样式时被重置,
所以需要在Tab的StylePane中始终保持
2. Tab组件的样式数据初始化应该在数据模型层完成
3 years ago
superman
0b0bf1f9de
Merge pull request #6872 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '78862fcb1d3fcabce50a05d238d12826679fd454':
CHART-22038 决策报表,安装ECharts后,图表块插入图表区域不显示echarts的图标
REPORT-63305 设计器获取父容器,需要对拓展的布局插件兼容处理下
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
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
4964673e74
Merge pull request #6845 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '7c54fb326c1fe1b11b10904abbf564c69b5a7401':
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
d08b1d3c92
Merge pull request #6783 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '25ba5e7d5b37e8c0f8f56d2d5dc243556cd9c642':
REPORT-62275 tab高度弹窗撤销问题
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