kerry
685bdddcde
代码修改
3 years ago
kerry
a1c88fd6c3
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x
3 years ago
kerry
003361ad38
KERNEL-9636 设计器渲染表单去除分辨率的差异
3 years ago
kerry
ce44f4b365
Pull request #7098 : REPORT-62424 【模板主题】见附件截图,windows的主题配置中的整体预览图显示有点问题
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '8f733e588b7a225e67bed61c07c22cb24a9a6a82':
REPORT-62424 【模板主题】见附件截图,windows的主题配置中的整体预览图显示有点问题
3 years ago
starryi
8177964d23
Pull request #7081 : REPORT-63760 7 REPORT-64006 7 & REPORT-64005
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '100d24c16cc297feff52dbde0f9522eaaad14d10':
REPORT-64005 【主题边框】单元格的高度没有自适应文本内容
REPORT-63760 【主题切换】撤销以后,样式设置有问题 & REPORT-64006 【模板主题】单元格自定义样式背景色设置不生效
3 years ago
superman
27aa973230
Merge pull request #7096 in DESIGN/design from release/11.0 to feature/x
...
* commit '4fe9b0b46033ea37cc253dbcbc6b762b945b7d71':
REPORT-63505 解决10.0合11.0导致的逻辑冲突
REPORT-64013 社区url修正(添加锚点标致)
REPORT-64013 社区url修正(添加锚点标致)
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
3 years ago
Tommy
4fe9b0b460
Pull request #7097 : REPORT-63505 解决10.0合11.0导致的逻辑冲突
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit '027b84bf62fd27182aaf592b9f8834adbc186943':
REPORT-63505 解决10.0合11.0导致的逻辑冲突
3 years ago
kerry
8f733e588b
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x
3 years ago
kerry
bb391c1135
REPORT-62424 【模板主题】见附件截图,windows的主题配置中的整体预览图显示有点问题
3 years ago
Tommy
027b84bf62
REPORT-63505 解决10.0合11.0导致的逻辑冲突
3 years ago
Xiqiu
1377e8a639
Pull request #7079 : REPORT-62735 连接池配置优化
...
Merge in DESIGN/design from ~XIQIU/design:feature/x to feature/x
* commit '8dbfeaf0c7c851de680b8781524ec86a493bf69d':
REPORT-62735 连接池配置优化
3 years ago
ju|剧浩宇
40d9f356b0
Pull request #7086 : 无jira任务, release/10.0 合 release/11.0
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit '915e971afa97e76c767aa6dbd80a6c74df419d98':
REPORT-64013 社区url修正(添加锚点标致)
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
REPORT-60161 【组件背景分离】设置九点图的线在边界上后,其他操作回来发现恢复成默认井字型
REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图,如果线重叠了的话,web端显示有问题
REPORT-63322 决策报表及聚合报表,无法拖动组件
REPORT-62691 11.0版本产出的组件,在10.0下正常安装,但复用时模板保存失败
3 years ago
shine
915e971afa
conflict
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
44a561e373
Pull request #7077 : REPORT-64013 社区url修正(添加锚点标致)
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit '63f849ee85d95fdf8dd34edc67f7d95fd769de02':
REPORT-64013 社区url修正(添加锚点标致)
3 years ago
fanglei
80c3ea2388
Pull request #7080 : CHART-22039 为图表标签字体颜色按钮新增自动选项
...
Merge in DESIGN/design from ~FANGLEI/design:feature/x to feature/x
* commit 'ce085cedd58d847785427d840ad2243e73ab24e1':
CHART-22039 为图表标签字体颜色按钮新增自动选项
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
Starryi
100d24c16c
REPORT-64005 【主题边框】单元格的高度没有自适应文本内容
...
【问题原因】
单元格样式预览面板自适应内容高度
【改动思路】
同上
3 years ago
Starryi
3389d16af7
REPORT-63760 【主题切换】撤销以后,样式设置有问题 &
...
REPORT-64006 【模板主题】单元格自定义样式背景色设置不生效
【问题原因】
ColorBackgroundQuickPane注册监听器ChangeListenerImpl的逻辑不
能丢,因为里面有修改字段backgroundChange的逻辑.所以在监听器重复注
册以及UndoState重复生成时,应该保留ChangeListenerImpl, 而放弃
NewColorSelectBox内部自己注册ChangeListener.
【改动思路】
同上
3 years ago
方磊
ce085cedd5
CHART-22039 为图表标签字体颜色按钮新增自动选项
3 years ago
xiqiu
8dbfeaf0c7
REPORT-62735 连接池配置优化
3 years ago
方磊
63f849ee85
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
Hades
fb3f6b9ff6
Pull request #7073 : REPORT-62438 远程模板锁定优化 改一个交互细节
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'b0112cb1303ee82caa65e87fea494b975da0d532':
REPORT-62438 远程模板锁定优化 改一个交互细节
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
superman
cdc9a2f8b0
Merge pull request #7072 in DESIGN/design from release/11.0 to feature/x
...
* commit '0fb21350d9f6aef10d2eaf8e0e5e79f393efb380':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
hades
b0112cb130
REPORT-62438 远程模板锁定优化 改一个交互细节
3 years ago
Hades
fc34f7f16a
Pull request #7058 : REPORT-62438 远程模板锁定优化
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '81a4154c7cf173b66b00d7e879081191180bf023':
REPORT-62438 远程模板锁定优化 修复门槛测试用例的bug
REPORT-62438 远程模板锁定优化 更新部分业务逻辑
REPORT-62438 远程模板锁定优化 更新下国际化和一个展示相关业务逻辑
REPORT-62438 远程模板锁定优化
3 years ago
superman
0fb21350d9
Merge pull request #7064 in DESIGN/design from release/10.0 to release/11.0
...
* commit '39cd7f04342a3f900f3fb67643d4eb13a87f55d5':
3 years ago
hades
81a4154c7c
REPORT-62438 远程模板锁定优化 修复门槛测试用例的bug
3 years ago
ju|剧浩宇
90c23893ff
Pull request #7066 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit '9c49620859f0c9cbf2f30b503e780092f77180a0':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
方磊
9c49620859
Merge branch 'release/10.0' into release/11.0
...
* release/10.0:
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
# Conflicts:
# designer-base/src/main/java/com/fr/design/actions/community/StudyPlanAction.java
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
starryi
8a1542c808
Pull request #7045 : REPORT-63808 【主题优化】格式单独拿出来以后,发现数据列的弹窗配置中没有格式项
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '9abcb9db6d2bb308c7c1922cf234af1ad49dc356':
REPORT-63808 【主题优化】格式单独拿出来以后,发现数据列的弹窗配置中没有格式项
3 years ago
Fly.Li
1e027ca039
Pull request #7060 : REPORT-55240:修改一下设计器关于报表引擎的设置界面
...
Merge in DESIGN/design from ~FLY.LI/design:feature/x to feature/x
* commit '30748629ae0ff4a7cfad07e0d090bfc669c81062':
REPORT-55240:修改一下设计器关于报表引擎的设置界面
3 years ago
hades
b2fce2875d
REPORT-62438 远程模板锁定优化 更新部分业务逻辑
3 years ago
Tommy
b28939592e
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
hades
42c68b1832
REPORT-62438 远程模板锁定优化 更新下国际化和一个展示相关业务逻辑
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
fanglei
c5d3fc981a
Pull request #7057 : REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
...
Merge in DESIGN/design from ~FANGLEI/design:release/11.0 to release/11.0
* commit 'e691b1a8ac5e9733ca4bc2a8b9521f9aade23507':
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
hades
d8650de421
REPORT-62438 远程模板锁定优化
3 years ago
方磊
e691b1a8ac
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
方磊
123b0ce7e1
REPORT-62804 设计器工具栏的链接改动(社区url改动需求)
3 years ago
superman
dd1cc91c1a
Merge pull request #7055 in DESIGN/design from release/11.0 to feature/x
...
* commit '8d837c1be641355b6d7003a6030c4f39860039d4':
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
3 years ago
superman
8d837c1be6
Merge pull request #7049 in DESIGN/design from release/10.0 to release/11.0
...
* commit '861c84c4aec091b57e850d89fbf73a1dbd4e133d':
REPORT-63106 决策报表-两个组件选中时拖拽到其他位置,然后点击对齐任意一个,两个组件会跳回刚才的位置
3 years ago