superman
57f997fcbc
Merge pull request #7108 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e20b93f7b50457093a62625607543eb9c49d3729':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
superman
e20b93f7b5
Merge pull request #7107 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'b56616d07893e15ae0cd8b0d47d6c41af7bff6fd':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
zheng
b56616d078
Pull request #7102 : CHART-22213 cherry pick to final10.0 fix:新增警戒线 默认应该是9px12px 不是9px
...
Merge in DESIGN/design from ~ZHENG/c-design:final/10.0 to final/10.0
* commit '6c57ae3713ab5b5bb8c807d6b5e33adcb29b7988':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
3 years ago
shine
6c57ae3713
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
3 years ago
Hades
8a015c7039
Pull request #7099 : REPORT-64095 websocket频繁出现断开又连上问题
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'c6677e6906cb0f518aa8d76e56fb18e196a88928':
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
hades
c6677e6906
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
superman
94638c4c7f
Merge pull request #7084 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'fa22a67573a4c692b848525ec11167a43138c4ef':
REPORT-64013 社区url修正(添加锚点标致)
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
superman
fa22a67573
Merge pull request #7083 in DESIGN/design from final/10.0 to release/10.0
...
* commit '5253726980101f35b1953c592db97d13fdff3fca':
REPORT-64013 社区url修正(添加锚点标致)
3 years ago
fanglei
5253726980
Pull request #7078 : REPORT-64013 社区url修正(添加锚点标致)
...
Merge in DESIGN/design from ~FANGLEI/design:final/10.0 to final/10.0
* commit 'e981ca8eb1d9c0896988891da0bd7a26253a2475':
REPORT-64013 社区url修正(添加锚点标致)
3 years ago
方磊
e981ca8eb1
REPORT-64013 社区url修正(添加锚点标致)
3 years ago
zheng
dd6d55e32b
Pull request #7065 : CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit '8c767ba1c6a28b78a94e28ec7f49c68c6dfd1d81':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
3 years ago
Tommy
dd10d3f57f
Pull request #7059 : REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit 'b28939592ea72e48680d9abcb4509da2d94ac8b4':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
superman
9887725d41
Merge pull request #7076 in DESIGN/design from release/10.0 to final/10.0
...
* commit '20970382920669c62ac950e8140be5ed1882069d':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
REPORT-63092 组件复用-拖入带数据集的复用组件,删除设计画布中的组件后,数据集没有被删除
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
REPORT-63310 已保存的无边框tab块在绝对布局内调整组件大小后,自动生成了默认黑色边框 & REPORT-59963 调整Tab块样式会导致Tab标题背景色重置
3 years ago
superman
2097038292
Merge pull request #7074 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '656a9d1930552eadd5f90bc0e8aac1d92bf80a7d':
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
3 years ago
shine
8c767ba1c6
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
b927d0263d
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
3 years ago
superman
656a9d1930
Merge pull request #7063 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '39cd7f04342a3f900f3fb67643d4eb13a87f55d5':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
Tommy
b28939592e
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
fanglei
39cd7f0434
Pull request #7056 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit '123b0ce7e144e9952abf6aac425c657f9fafc70e':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
方磊
123b0ce7e1
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
superman
7a37840f23
Merge pull request #7048 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '861c84c4aec091b57e850d89fbf73a1dbd4e133d':
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
3 years ago
fanglei
861c84c4ae
Pull request #7032 : REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit 'a0798b48218e0f93de6a42859ff3504c4e22d5ce':
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
3 years ago
superman
7439a1d4d8
Merge pull request #7036 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '13f832ef783feff089e210601d6bc2be4f3a38bc':
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
update
CHART-21584 feat:fvs.chart.font 单位px 范围6-200
3 years ago
方磊
a0798b4821
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
3 years ago
fanglei
13f832ef78
Pull request #7029 : REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
...
Merge in DESIGN/design from ~FANGLEI/design:release/10.0 to release/10.0
* commit 'ca2fcb358e038e9564ac0f5edc6aad48c554316d':
REPORT-63092 漏传了import语句
REPORT-63499
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
3 years ago
方磊
ca2fcb358e
REPORT-63092 漏传了import语句
3 years ago
方磊
72b7bdacae
REPORT-63499
3 years ago
方磊
c19bb8edeb
REPORT-63499 按钮控件树节点配置控件事件,设计器上显示有问题
3 years ago
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
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
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
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
08fd9f604b
Merge pull request #6885 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '38665fc771d1640f3f87683d8dbb356a8a6475b8':
3 years ago