Starryi
42dcfbfb32
REPORT-68062 单元格数据列高级设置-格式设置不生效
...
【问题原因】
DSColumnAdvancedPane.FormatAttrPane,
未继承AbstractAttrNoScrollPane,缺少了一些监听导致。
原有代码在合并时丢失,需要重新补充下
【改动思路】
无
【review建议】
3 years ago
Henry.Wang
5dd59393ed
Pull request #8308 : REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0
* commit '155264458b41737dadeba6d405e82b5c2193fe4b':
REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
3 years ago
Henry.Wang
155264458b
REPORT-68061 单元格元素-数据设置-自定义分组设置无法点击确定
3 years ago
Lucian.Chen
584157b41d
Pull request #8306 : REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:final/11.0 to final/11.0
* commit 'a0f83145e890362ffd320dacc16c7466d4bd1a4e':
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
3 years ago
lucian
a0f83145e8
REPORT-68161 填报-模板web属性-切换设置时,编辑行背景设置的点击逻辑确认
3 years ago
pengda
1b0002e490
Pull request #8304 : CHART-22972 HyperlinkProvider接口对图表超链不起作用
...
Merge in DESIGN/design from ~PENGDA/design:final/11.0 to final/11.0
* commit '67446e16f7f34e197d468cf79788e9a46c286d4d':
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
pengda
67446e16f7
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
3 years ago
pengda
f8c08500c4
CHART-22972 HyperlinkProvider接口对图表超链不起作用
3 years ago
pengda
9deb4fe57b
Pull request #8294 : CHART-23227 钻取点地图&钻取区域地图切换类型,预览无法展示
...
Merge in DESIGN/design from ~PENGDA/design:final/11.0 to final/11.0
* commit '3147786e6a66d0f856281f19141facd460e1a1c5':
CHART-23227 钻取点地图&钻取区域地图切换类型,预览无法展示
3 years ago
pengda
3147786e6a
CHART-23227 钻取点地图&钻取区域地图切换类型,预览无法展示
3 years ago
wei
df69a6368f
Pull request #8288 : CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
...
Merge in DESIGN/design from ~WEI/design:final/11.0 to final/11.0
* commit '4a8fd982c54bb83a96e3ee05ee5a7b9b7f8feae5':
v7的构造函数不能走v6的,会一直创建v6的Chromium进程,先搞个构造函数这样处理下..
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
Revert "CHART-23172 & CHART-23111 只处理没正确关闭engine"
CHART-23172 & CHART-23111 只处理没正确关闭engine
Revert "CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine"
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
3 years ago
WeiYanglu
4a8fd982c5
v7的构造函数不能走v6的,会一直创建v6的Chromium进程,先搞个构造函数这样处理下..
3 years ago
WeiYanglu
c777d0889a
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
3 years ago
WeiYanglu
541fd4f288
Revert "CHART-23172 & CHART-23111 只处理没正确关闭engine"
...
This reverts commit ea109b45f6
.
3 years ago
WeiYanglu
ea109b45f6
CHART-23172 & CHART-23111 只处理没正确关闭engine
3 years ago
WeiYanglu
c7b284ad9e
Revert "CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine"
...
This reverts commit b069132341
.
3 years ago
WeiYanglu
b069132341
CHART-23172 & CHART-23111 v7的jxbrowser没有正确关闭engine
3 years ago
pengda
47961506b8
Pull request #8242 : REPORT-68059 js编辑器,自定义按钮触发的弹窗层级不对
...
Merge in DESIGN/design from ~PENGDA/design:final/11.0 to final/11.0
* commit '39b29d40664f9bd7041073c5c3c6cdb54ff10ba2':
REPORT-68059 js编辑器,自定义按钮触发的弹窗层级不对
3 years ago
superman
5968103606
Merge pull request #8244 in DESIGN/design from release/11.0 to final/11.0
...
* commit '51558d540d72d6673c1f3149cc9d61d722d31efc':
REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
REPORT-67329 填报-web端预览-10升级11,透明的纸张背景变成了白色
无JIRA项目 对Install4j方法的调用全部改用反射实现,避免出现引用异常
REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错
REPORT-65140 报表块图表块在设计器上改变大小的时候,保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸
REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时,老预览下看不到该控件,新预览下可以看到 1、在修改布局的时候,同时修改参数面板的width
REPORT-67092 交互视觉修改
REPORT-66690 tab块名称不允许重复
3 years ago
pengda
39b29d4066
REPORT-68059 js编辑器,自定义按钮触发的弹窗层级不对
3 years ago
Hades
51558d540d
Pull request #8239 : REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
...
Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0
* commit 'cad840da238e03d6dc86df14077dcd62d65b4cf7':
REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
3 years ago
hades
cad840da23
REPORT-67833 富文本-颜色设置:选择主题色后最近使用的颜色处不会更新,需要多次点击
3 years ago
rinoux
bf975f7f19
Pull request #8229 : REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit 'b26a85d3f668ffe41d402d7089420744ec45acd9':
REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
3 years ago
rinoux
b26a85d3f6
REPORT-67954 远程设计时数据集面板数据连接空白的问题 提交11
3 years ago
superman
74e765624b
Merge pull request #8194 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'd96cebca32ac38dae6847fd85d9b289bdb954a6b':
3 years ago
superman
d96cebca32
Merge pull request #8193 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '53a0554b757e46ef11e708e9b53241818396e43a':
3 years ago
kerry
df8e916189
Pull request #8184 : REPORT-67329 填报-web端预览-10升级11,透明的纸张背景变成了白色
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0
* commit '6394044df6f4f02d3cd61bbecb523de468acbe0a':
REPORT-67329 填报-web端预览-10升级11,透明的纸张背景变成了白色
3 years ago
kerry
6394044df6
REPORT-67329 填报-web端预览-10升级11,透明的纸张背景变成了白色
3 years ago
superman
53a0554b75
Merge pull request #8183 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '181bbc74b774fca0025f29f71920fc45df4fdd56':
3 years ago
starryi
70bf342d9e
Pull request #8160 : REPORT-67689 对Install4j方法的调用全部改用反射实现,避免出现引用异常
...
Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0
* commit 'fd1e35aaa194d8f471ec66e2295c5e66f59b6afd':
无JIRA项目 对Install4j方法的调用全部改用反射实现,避免出现引用异常
3 years ago
Starryi
fd1e35aaa1
无JIRA项目 对Install4j方法的调用全部改用反射实现,避免出现引用异常
...
【问题原因】
考核同学使用starter项目,无法进行正常编译,出现类和方法调用异常。
一方面是starter项目没有配置对intall4j的编译依赖导致,另一方面是主jar中
对install4j API的使用没有反射导致
【改动思路】
改用反射方式调用Install4J相关API
【review建议】
3 years ago
Yuan.Wang
9c2f469c35
Pull request #8109 : REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错
...
Merge in DESIGN/design from ~YUAN.WANG/design:release/11.0 to release/11.0
* commit 'aa34194900409a2a803958dfa18ce14464ca137d':
REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错
3 years ago
Yuan.Wang
aa34194900
REPORT-67224 填报-web端再计算-服务器配置填报行背景色报错
3 years ago
kerry
10d4e9eb0a
Pull request #8090 : REPORT-65140 报表块图表块在设计器上改变大小的时候,保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0
* commit 'b37653b5e70f43ed23b3e4d33f800f1d083e11fc':
REPORT-65140 报表块图表块在设计器上改变大小的时候,保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸
3 years ago
superman
607cb44ec9
Merge pull request #8098 in DESIGN/design from final/11.0 to release/11.0
...
* commit '181bbc74b774fca0025f29f71920fc45df4fdd56':
CHART-23035 仪表盘轴标签样式修改均不生效
CHART-23035 仪表盘轴标签样式修改均不生效
3 years ago
superman
181bbc74b7
Merge pull request #8097 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'd14435e09c7fe09907f0755bd890e5c41de20e6c':
3 years ago
kerry
b37653b5e7
REPORT-65140 报表块图表块在设计器上改变大小的时候,保存在 xml 里面的 elementcaseEdito 的尺寸依然是初始尺寸
3 years ago
superman
d14435e09c
Merge pull request #8087 in DESIGN/design from final/11.0 to persist/11.0
...
* commit 'c6317d30811868472d164f361dba8abbfb982870':
CHART-23035 仪表盘轴标签样式修改均不生效
CHART-23035 仪表盘轴标签样式修改均不生效
KERNEL-9928 重构水印 1.水印接口规范
REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
REPORT-65724 安全性-水印-水印公式不解析 1.面板统一从全局读
3 years ago
fanglei
c6317d3081
Pull request #8086 : CHART-23035 仪表盘轴标签样式修改均不生效
...
Merge in DESIGN/design from ~FANGLEI/design:final/11.0 to final/11.0
* commit '3418096cef65b89120db69798efa72765e83bac0':
CHART-23035 仪表盘轴标签样式修改均不生效
3 years ago
方磊
3418096cef
CHART-23035 仪表盘轴标签样式修改均不生效
3 years ago
fanglei
279ae14610
Pull request #8085 : CHART-23035 仪表盘轴标签样式修改均不生效
...
Merge in DESIGN/design from ~FANGLEI/design:final/11.0 to final/11.0
* commit '1911ebba5145bfff6ad86d95152f7473a2dde50d':
CHART-23035 仪表盘轴标签样式修改均不生效
3 years ago
方磊
1911ebba51
CHART-23035 仪表盘轴标签样式修改均不生效
3 years ago
Link.Zhao
09cf4accc2
Pull request #8070 : REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时,老预览下看不到该控件,新预览下可以看到
...
Merge in DESIGN/design from ~LINK.ZHAO/design:release/11.0 to release/11.0
* commit 'baf60127e9443e7a2a0d6d7c9cb7fff06c8b8969':
REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时,老预览下看不到该控件,新预览下可以看到 1、在修改布局的时候,同时修改参数面板的width
3 years ago
superman
a3d6a810ed
Merge pull request #8080 in DESIGN/design from final/11.0 to release/11.0
...
* commit '1b5822849500ad2fc2524436fd78e42bf77b4ef8':
KERNEL-9928 重构水印 1.水印接口规范
REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
REPORT-65724 安全性-水印-水印公式不解析 1.面板统一从全局读
3 years ago
Hoky.He
1b58228495
Pull request #8072 : KERNEL-9928 重构水印
...
Merge in DESIGN/design from ~HOKY.HE/design:final/11.0 to final/11.0
* commit '81b629180fd419731094677aa85c312337474f14':
KERNEL-9928 重构水印 1.水印接口规范
REPORT-65724 安全性-水印-水印公式不解析 1.从全局读取水印
REPORT-65724 安全性-水印-水印公式不解析 1.面板统一从全局读
3 years ago
Hoky
81b629180f
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
...
# Conflicts:
# designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
# designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRFitLayoutDefinePane.java
3 years ago
Hoky
6118879924
KERNEL-9928 重构水印
...
1.水印接口规范
3 years ago
Link.Zhao
baf60127e9
REPORT-66771 FR11老决策报表-参数面板控件坐标超过960且设计画布里可以看到该控件时,老预览下看不到该控件,新预览下可以看到
...
1、在修改布局的时候,同时修改参数面板的width
3 years ago
superman
94269f38a5
Merge pull request #8041 in DESIGN/design from final/11.0 to release/11.0
...
* commit '2368b5ff1a2e94b1adeadcb53a8cfb6373596076':
3 years ago
superman
2368b5ff1a
Merge pull request #8040 in DESIGN/design from persist/11.0 to final/11.0
...
* commit 'abd881651a53b42b253f6ea4d2684557ff068e75':
3 years ago