superman
16ec3ebfda
Merge pull request #10177 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '5a9fbbe7778e167924d03688ab55640782d48320':
无jira 解决打包失败
2 years ago
Link.Zhao-赵展
5a9fbbe777
Pull request #10173 : 无jira
...
Merge in DESIGN/design from ~LINK.ZHAO/design:release/10.0 to release/10.0
* commit '1953ccf97efe90baf433f36151feceb2040821ce':
无jira 解决打包失败
2 years ago
Link.Zhao
1953ccf97e
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
2 years ago
Link.Zhao
a51fbcd431
无jira
...
解决打包失败
2 years ago
superman
ec87e81c7b
Merge pull request #10168 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'af52f5f40583eefab80e059ced56f8422820512c':
2 years ago
superman
af52f5f405
Merge pull request #10166 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'b173c67964f043add673d563628b33496e398fad':
2 years ago
superman
b173c67964
Merge pull request #10165 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '018cbcb39e7de724775f8f9bcacaaa6e64a86a18':
2 years ago
superman
018cbcb39e
Merge pull request #10164 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'a53e5835e65680c842cacb9a2aa39cbc3137cdc8':
2 years ago
superman
a53e5835e6
Merge pull request #10163 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'a986864ca2c5846c60ae0518bcb6a8843f0c514b':
2 years ago
superman
a986864ca2
Merge pull request #10161 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '6eb8004cd48503c33f7409bb2316758def0e783c':
REPORT-80483 10.0linux设计器图表空数据弹窗点不开
REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
2 years ago
superman
5ecefb8af8
Merge pull request #10155 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '42e56b95ede35c2457668b7ed5fb1412c5060f9c':
REPORT-80483 10.0linux设计器图表空数据弹窗点不开
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 提交release10
REPORT-66853 老决策报表-没有勾选图片压缩,报表块设置图片主体填充,web预览时图片会模糊 1、修改了jpg图像的存储方式,使用原文件直接存储
2 years ago
superman
42e56b95ed
Merge pull request #10153 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '6ea6577cc097b9e40bbacdfdba9bab5b6b754dcb':
REPORT-80483 10.0linux设计器图表空数据弹窗点不开
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 提交release10
REPORT-66853 老决策报表-没有勾选图片压缩,报表块设置图片主体填充,web预览时图片会模糊 1、修改了jpg图像的存储方式,使用原文件直接存储
2 years ago
superman
6ea6577cc0
Merge pull request #10152 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd3bea697663a41f6f59dd3c4de7cd8caca871952':
REPORT-80483 10.0linux设计器图表空数据弹窗点不开
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 提交release10
REPORT-66853 老决策报表-没有勾选图片压缩,报表块设置图片主体填充,web预览时图片会模糊 1、修改了jpg图像的存储方式,使用原文件直接存储
2 years ago
superman
d3bea69766
Merge pull request #10151 in DESIGN/design from final/10.0 to release/10.0
...
* commit '6eb8004cd48503c33f7409bb2316758def0e783c':
REPORT-80483 10.0linux设计器图表空数据弹窗点不开
2 years ago
pengda-丁鹏达
6eb8004cd4
Pull request #10148 : REPORT-80483 10.0linux设计器图表空数据弹窗点不开
...
Merge in DESIGN/design from ~PENGDA/design:final/10.0 to final/10.0
* commit 'a783ce008013e5734fcd0249200d2e7c48e3bfa6':
REPORT-80483 10.0linux设计器图表空数据弹窗点不开
2 years ago
pengda
a783ce0080
Merge remote-tracking branch 'origin/final/10.0' into final/10.0
2 years ago
pengda
73700ad578
REPORT-80483 10.0linux设计器图表空数据弹窗点不开
2 years ago
Link.Zhao-赵展
b397b25b83
Pull request #10136 : REPORT-75093 运营产品化二期
...
Merge in DESIGN/design from ~LINK.ZHAO/design:release/10.0 to release/10.0
* commit '23ec5e1295ff11e18bd9d59f70885adfd1ce6e9e':
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 修改pr
REPORT-75093 运营产品化二期 提交release10
REPORT-66853 老决策报表-没有勾选图片压缩,报表块设置图片主体填充,web预览时图片会模糊 1、修改了jpg图像的存储方式,使用原文件直接存储
2 years ago
Link.Zhao
23ec5e1295
REPORT-75093 运营产品化二期
...
修改pr
2 years ago
Link.Zhao
8774c3733f
REPORT-75093 运营产品化二期
...
修改pr
2 years ago
Link.Zhao
3ce2932eb9
REPORT-75093 运营产品化二期
...
修改pr
2 years ago
Link.Zhao
3f3fe2de5b
REPORT-75093 运营产品化二期
...
提交release10
2 years ago
Link.Zhao-赵展
f8f2481c16
Merging in latest from upstream (DESIGN/design:refs/heads/release/10.0)
...
* commit '53f04b81acf630c64cfec637d2e3c25cdf0ae0c5': (55 commits)
REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
REPORT-79440 找不到驱动的话可以保存数据连接
REPORT-64340 删除无效日志
REPORT-77217 ConnectionProvider-修改之后数据连接信息无法保存 同步10.0 【问题原因】产生假保存的原因是,在保存的时候会判断现有的Connection与以前存储的Connection是否有不同,如果不同就代表需要更新。实际上插件中的Connection相关类没有写equals方法,然后新旧Connection被认为是相同了,就没有走后面的更新配置的逻辑 【改动方案】拉rinoux、vito、hugh一起沟通了下方案,暂时主代码里做个兼容,让主代码内置的两种Connection去判断是否要更新,其余的Connection(插件Connection)都必须更新 【review建议】同步10.0
单独写一个 DefaultLoginKeys
REPORT-72595 FR源码中存在加密密钥硬编码,建议放到配置文件中
REPORT-75991 插件完整性校验,弹窗链接帮助文档说明 【问题原因】安全类需求,将原来仅对官方插件开启的 插件完整性校验,扩大到了 第三方插件。但弹窗不明确,对于用户侧没有闭环,需要添加帮助文档链接,帮助用户清楚前因后果与解决方案。 【改动方案】1.提示文案内容修改;2.提示中存在超链接,将插件这边因为"插件完整性校验"而失败的弹窗单独处理了下,由原本的JOptionPane修改为JEditorPane 【review建议】其它的弹窗暂时没有变动的需求,跟产品沟通过了,如果以后有必要统一的时候再来统一处理
REPORT-72635 - 数据连接面板为空的问题(含控制权限) 有些新类,没提交进去
REPORT-72635 - 数据连接面板为空的问题(含控制权限) 【问题原因】同步到10.0 【改动思路】同步到10.0 【review建议】无
REPORT-76370 提供一个数据连接前置检查接口&提交10.0
REPORT-76370 提供一个数据连接前置检查接口&提交10.0
REPORT-38555 fix:数字控件中内容可以输入空格和减号
REPORT-38555 fix:数字控件中内容可以输入空格和减号
REPORT-38523 fix: 右侧单元格属性表鼠标事件有误,修改了mouseReleased事件
REPORT-74887 新建决策报表,拖入第三方插件图表无法编辑
无JIRA任务 合final
REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
REPORT-74118 单元格数据源老模板切换到数据集数据并添加多分类,多分类不可修改
...
2 years ago
superman
7103abca7f
Merge pull request #10117 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '2a80eb2c0e8236c372548858eb26d46d4a13e37a':
2 years ago
superman
2a80eb2c0e
Merge pull request #10115 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd22b414d18c786c42f72304d3773af0b30361011':
2 years ago
superman
d22b414d18
Merge pull request #10114 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '53f04b81acf630c64cfec637d2e3c25cdf0ae0c5':
2 years ago
superman
53f04b81ac
Merge pull request #10113 in DESIGN/design from final/10.0 to release/10.0
...
* commit '1a2d1b8240046b246d884ae610879ca35a9fa397':
2 years ago
superman
1a2d1b8240
Merge pull request #10110 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'fd481ff3c6618067c2c61c18c2704be6ffe9638c':
REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
2 years ago
superman
fd481ff3c6
Merge pull request #10109 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'ed0ecf15d1d68f185d809d6aede3cf5f9e78d3d6':
2 years ago
superman
e43665164d
Merge pull request #10049 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '806a104fe4c8e217904bfd5e9ae281320a0bd503':
REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
2 years ago
superman
806a104fe4
Merge pull request #10047 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'ed0ecf15d1d68f185d809d6aede3cf5f9e78d3d6':
REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
2 years ago
superman
ed0ecf15d1
Merge pull request #10046 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '29941823c63d69b596de3ca27d457327d735d7bf':
REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
2 years ago
Lucian.Chen-陈昊
29941823c6
Pull request #10042 : REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit 'e20b3a89cbd6dd4c9a1c222695822c78ece6aa1c':
REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
2 years ago
lucian
e20b3a89cb
REPORT-80276 填报-填报属性设置-数据表搜索时概率出现多个重复的搜索结果
2 years ago
superman
f7e4cbc9f0
Merge pull request #10036 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '107e1191fa75e2566aac3fd329553b3836ed1a69':
REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
2 years ago
superman
107e1191fa
Merge pull request #10034 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '4db1983a3ab5d6906b82ff475237e8a383f02f84':
REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
2 years ago
superman
4db1983a3a
Merge pull request #10033 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'b0c8863fe8d92a0bb808ed34cd279032dbd25208':
REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
2 years ago
Lucian.Chen-陈昊
b0c8863fe8
Pull request #10020 : REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:release/10.0 to release/10.0
* commit '46ff873f85a9274492b3d5d18a0e91765c99285f':
REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
2 years ago
lucian
46ff873f85
REPORT-79999 填报-填报属性设置-对表的模糊搜索匹配不精确
2 years ago
superman
66aea8f87d
Merge pull request #9974 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'cc4364414ffe167a092d89835aa11bbc9f18e5a8':
REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
2 years ago
superman
cc4364414f
Merge pull request #9972 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'c37554e1e622d461d29348a42f051ed860b739bb':
REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
2 years ago
superman
c37554e1e6
Merge pull request #9971 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'bf0c51b25a02233afec01bd3ffe3197589f2d452':
REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
2 years ago
Destiny.Lin-林锦龙
bf0c51b25a
Pull request #9968 : REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
...
Merge in DESIGN/design from ~DESTINY.LIN/design:release/10.0 to release/10.0
* commit 'bca1d09ded35d78d016a8cf369ab32abee7c529d':
REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
2 years ago
Destiny.Lin
bca1d09ded
REPORT-79909 设计器启动失败,有模板名称叫WorkBook88888888888888.cpt导致
2 years ago
superman
dbe991e679
Merge pull request #9961 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '2e4780a09e25620632114e5541a12245a9d0fa2c':
2 years ago
superman
2e4780a09e
Merge pull request #9959 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'cb02dfff0bbe3d78cc2c3f51becf23cdaffbde6e':
2 years ago
superman
cb02dfff0b
Merge pull request #9958 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '15e688ff54e58f743fde05bfc234ae136553b8ba':
2 years ago
superman
15e688ff54
Merge pull request #9957 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'a64b2551fbe69b8c64ee3f3355973bef7612551b':
2 years ago
superman
a64b2551fb
Merge pull request #9956 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'd93920bf668d1c48abe9a91ad12138a99760a2ac':
2 years ago
superman
d93920bf66
Merge pull request #9955 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '855a6014c9992a3fb657a842421898df2a00f9dd':
REPORT-79440 找不到驱动的话可以保存数据连接
REPORT-64340 删除无效日志
2 years ago