6cd7c0409a
Merge pull request #7185 in DESIGN/design from release/11.0 to feature/x
...
* commit '86b4ee0de62df25888cdf27fcfb59b20878f22da':
无jira任务 单元测试打包失败，先屏蔽这边
3 years ago
vito
1b0ae7b6ee
Pull request #7179 : 无jira任务 单元测试打包
...
Merge in DESIGN/design from ~VITO/c-design:release/10.0 to release/10.0
* commit 'e103647723b3a40d9fe94d21aabb8ee7acec4593':
无jira任务 单元测试打包
3 years ago
e103647723
无jira任务 单元测试打包
3 years ago
vito
86b4ee0de6
Pull request #7178 : 无jira任务 单元测试打包失败，先屏蔽这边
...
Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0
* commit '9eeb83cf4a1aeb7272e963d4b96116b6223b6935':
无jira任务 单元测试打包失败，先屏蔽这边
3 years ago
9eeb83cf4a
无jira任务 单元测试打包失败，先屏蔽这边
3 years ago
ab7de686bd
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
987923d5f8
REPORT-64173 限定具体实现的最大占用布局，优化展示效果
3 years ago
kerry
a07d8a9f75
KERNEL-9636 新自适应中设计器模块和主 jar 中的重复代码
3 years ago
Elijah
6f8046a07a
Pull request #7170 : REPORT-64286 fix: 内嵌tomcat不支持websocket
...
Merge in DESIGN/design from ~ELIJAH/design:feature/x to feature/x
* commit 'ea86dd59d5321ac3c3da88290203428bb2f225aa':
REPORT-64286 fix: 内嵌tomcat不支持websocket
3 years ago
Hades
59c499244b
Pull request #7168 : REPORT-64156 解锁失败加个提示弹窗
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'e0acf704977d236ea08475b5ad537dc6ef71ba5a':
REPORT-64156 解锁失败加个提示弹窗
3 years ago
2c182a7052
Pull request #7169 : REPORT-64267 【主题优化】拖入数据列以后，双击打开点击确定，数据列没了
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '51b9bfb372eb7d97ce633e130ca7ea8e1035403b':
REPORT-64267 【主题优化】拖入数据列以后，双击打开点击确定，数据列没了
3 years ago
Qinghui.Liu
6b51e7fcd0
CHART-22075 富文本支持9～11号字体
3 years ago
kerry
a3381a843b
Pull request #7153 : KERNEL-9636 && REPORT-63725 frm设计器界面修改; 新自适应中设计器模块和主 jar 中的重复代码
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '3d91403aac093065ce8811063372b39e979e25a2':
代码修改
KERNEL-9636 新自适应中设计器模块和主 jar 中的重复代码
3 years ago
Elijah
ea86dd59d5
REPORT-64286 fix: 内嵌tomcat不支持websocket
3 years ago
51b9bfb372
REPORT-64267 【主题优化】拖入数据列以后，双击打开点击确定，数据列没了
...
【问题原因】
FormatPane并不一定会被注册GlobalNameListener，所以需要
进行判空处理，避免抛出异常
【改动思路】
同上
3 years ago
ce8baa1732
Pull request #7167 : REPORT-64262 【视觉验收】主题编辑的边框配置完善
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-62689/feature/x to feature/x
* commit '977e23dbc5278f317659d57b11933cf62f68b9eb':
REPORT-64262 【视觉验收】主题编辑的边框配置完善
3 years ago
e0acf70497
REPORT-64156 解锁失败加个提示弹窗
3 years ago
977e23dbc5
REPORT-64262 【视觉验收】主题编辑的边框配置完善
...
【问题原因】
单元格样式预览区域四周要留有外边距
【改动思路】
同上
3 years ago
kerry
3d91403aac
Merge branch 'feature/x' of https://code.fineres.com/scm/design/design into feature/x
...
# Conflicts:
# designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
3 years ago
658e983ec5
Pull request #7166 : REPORT-62440 表头排序内置
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x
* commit 'dcc26061060613abb8e2f786adb960eeb1878ad1':
REPORT-62440 表头排序内置
3 years ago
Lucian.Chen
50f7e2237a
Pull request #7155 : REPORT-62876 填报配置时支持表的精确搜索
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:feature/x to feature/x
* commit 'd075335787fa68cfaf133a9711036b2928091c8a':
REPORT-62876 填报配置时支持表的精确搜索
3 years ago
d0f2c920ed
Pull request #7128 : REPORT-64080 【主题边框】框选设置样式外边框后，框选小部分切换自定义，之后设计器里显示有问题
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-62689/feature/x to feature/x
* commit '07be63cef322c072d22a16ae4048640b83b5b196':
REPORT-64080 【主题边框】框选设置样式外边框后，框选小部分切换自定义，之后设计器里显示有问题
3 years ago
dcc2606106
REPORT-62440 表头排序内置
3 years ago
7af2ec98cf
Merge pull request #7165 in DESIGN/design from release/11.0 to feature/x
...
* commit '8535783b6e54efce98593b01b33f0074b7b30bc7':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
8535783b6e
Merge pull request #7164 in DESIGN/design from final/11.0 to release/11.0
...
* commit '7ecbffadbb465c21f88aee4e9b623d071e88590d':
3 years ago
7ecbffadbb
Merge pull request #7163 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '8947fee0c9201c7887c813fc165e9fdfe93f7402':
3 years ago
6b431180e3
Merge pull request #7159 in DESIGN/design from release/10.0 to release/11.0
...
* commit '95b3ef73f1fd4aac4038069ae42be7e3ac6bc7b6':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
b61de82e05
Merge pull request #7158 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '95b3ef73f1fd4aac4038069ae42be7e3ac6bc7b6':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
95b3ef73f1
Merge pull request #7157 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'ca27d54e842035e119aa44983dd9b795fa6347e4':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
ca27d54e84
Merge pull request #7156 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '656b3fcbbdfdb60d5ab672b225628d980fa8c9b4':
3 years ago
d075335787
REPORT-62876 填报配置时支持表的精确搜索
3 years ago
kerry
5aa637b87f
代码修改
3 years ago
8947fee0c9
Merge pull request #7154 in DESIGN/design from final/11.0 to persist/11.0
...
* commit 'fbe67c0078e40d21dc66f6bd228371c8abe2be4e':
3 years ago
kerry
6d6f5362bd
Merge branch 'feature/x' of ssh://code.fineres.com:7999/~kerry/design_10.0 into feature/x
3 years ago
kerry
08a39eee5c
KERNEL-9636 新自适应中设计器模块和主 jar 中的重复代码
3 years ago
99056db189
Pull request #7139 : REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
...
Merge in DESIGN/design from ~TOMMY/design:final/10.0 to final/10.0
* commit '4f62f88149dace31c3bf6fd84cd2fcd714217979':
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
07be63cef3
REPORT-64080 【主题边框】框选设置样式外边框后，框选小部分切换自定义，之后设计器里显示有问题
...
【问题原因】
重新规范下交互效果，当框选的单元格样式从跟随主题切换到自定义时，
单元格的样式效果应当保持不变（从NameStyle变为Style)，且右侧样式
面板应当是此框选区域的整体样式
【改动思路】
当样式设置从跟随主题切换到自定义时，应当将被选择的单元格样式设置
从NameStyle设置为Style，且不能使用样式面板中的设置重置单元格样式
3 years ago
320a5ac5c9
Pull request #7152 : REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '19954cabfd990c5e51821c8716e6e6b61be9ec88':
REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项
3 years ago
19954cabfd
REPORT-63808 【主题优化】格式单独拿出来以后，发现数据列的弹窗配置中没有格式项
...
【问题原因】
格式设置项从样式中分离出来后，数据列的弹窗
中需要按照新的设计稿增加格式设置
【改动思路】
同上
3 years ago
656b3fcbbd
Merge pull request #7150 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'b56616d07893e15ae0cd8b0d47d6c41af7bff6fd':
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
REPORT-64095 websocket频繁出现断开又连上问题
REPORT-64013 社区url修正（添加锚点标致）
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
4f62f88149
REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
3 years ago
Dylan.Liu
be2644be66
Pull request #7103 : KERNEL-9687 log4j版本升级-设计器配合
...
Merge in DESIGN/design from ~HADES/design:KERNEL-9687 to feature/x
* commit 'b7d61b5196cdf01ab27be87c2cae39eefe8a2235':
KERNEL-9687 log4j版本升级-设计器配合
3 years ago
46413b0201
Pull request #7075 : REPORT-62440 表头排序内置
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x
* commit 'bd82a9d6949b8793092b28235099a8661e2c75fb':
REPORT-62440 表头排序内置
REPORT-62440 表头排序内置
REPORT-62440 表头排序内置
REPORT-62440 表头排序内置
REPORT-62440 表头排序内置
REPORT-62440 表头排序内置
REPORT-62440 表头排序内置
REPORT-62440 表头排序内置
3 years ago
bd82a9d694
REPORT-62440 表头排序内置
3 years ago
98a30cb40d
REPORT-62440 表头排序内置
3 years ago
1b66571feb
REPORT-62440 表头排序内置
3 years ago
9944abee2c
Pull request #7105 : REPORT-64062 & REPORT-64079 & REPORT-64112
...
Merge in DESIGN/design from ~STARRYI/design:REPORT-62689/feature/x to feature/x
* commit '77ba71a7be6404f60122114043416b1c89c2420a':
REPORT-64112 【模板主题】悬浮元素样式切换，上方的预览图没有即时生效
REPORT-64079 【主题边框】悬浮元素的样式效果跟交互稿不一致
REPORT-64062 【主题边框】上一个样式设置边框颜色后，新增的样式默认边框色会记录
3 years ago
kerry
854ff33129
Pull request #7104 : KERNEL-9636 设计器渲染表单去除分辨率的差异
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit 'e972e7ef1cc5323bf4127d966262c5733d20dac6':
去除新老转换时，调整表单组件尺寸的逻辑
代码修改
代码修改
KERNEL-9636 设计器渲染表单去除分辨率的差异
3 years ago
9afbbdc933
Pull request #7117 : 无jira 解决冲突
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '4319065b6207193abdb6c0beb41e05442ecb7629':
无jira 去掉无用 import
KERNEL-9860 插件修改xml中active标签逻辑重构 跟vito讨论了下，决定模板报错的一键处理这儿，也是需要修改xml的，因为也是用户自己点的处理
CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
KERNEL-9860 插件修改xml中active标签逻辑重构 【问题原因】rt 【改动思路】详见https://kms.fineres.com/pages/viewpage.action?pageId=289590798 【review建议】
REPORT-64095 websocket频繁出现断开又连上问题
3 years ago
4319065b62
无jira 去掉无用 import
3 years ago
superman
vito
vito
xiqiu
kerry
Elijah
Hades
starryi
Qinghui.Liu
Starryi
hades
Henry.Wang
Lucian.Chen
lucian
Tommy
Dylan.Liu
ju|剧浩宇