Hades
|
391898c918
|
Merge pull request #1537 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '81b36cdd4185f3e883626d6cd56471821859ad94':
REPORT-27106 && REPORT-28229
|
5 years ago |
richie
|
65d8d522cf
|
Merge pull request #1533 in DESIGN/design from ~RICHIE/design:feature/10.0 to feature/10.0
* commit '455caa72fcdf5f86332d325bd64f1bdcc81c81a6':
无JIRA任务 升级新的JxBrowser+language level提升到1.8
无JIRA任务 第三方短信服务器接口
|
5 years ago |
hades
|
81b36cdd41
|
REPORT-27106 && REPORT-28229
|
5 years ago |
Hades
|
0bb39046f5
|
Merge pull request #1535 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '91c9b0535d35dbdb087e44c7052e9b450659412f':
fix import
REPORT-27106 && REPORT-27144
|
5 years ago |
Harrison
|
0ca385d1f6
|
Merge pull request #1534 in DESIGN/design from ~HARRISON/design:feature/10.0 to feature/10.0
* commit 'c24078b110d2eec4077b2956150e4e84be8efa85':
REPORT-27647 模板组件的安装下载-模板组件复用插件 图片需要先加载进去。 set 的时候就晚了
|
5 years ago |
Qinghui.Liu
|
3877a21cf4
|
Merge pull request #1536 in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '76f3423349e4b955828404c771221b77e6926a37':
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
CHART-13064 修改含有自动button的颜色选择器高度
CHART-13065 调整字符间距
CHART-13063 修改试管仪表盘布局文案
|
5 years ago |
Qinghui.Liu
|
76f3423349
|
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
|
5 years ago |
Qinghui.Liu
|
235422b755
|
CHART-13052 为仪表盘坐标轴轴标签htmlPane分配parentPane
|
5 years ago |
Qinghui.Liu
|
c4e900ef74
|
CHART-13064 修改含有自动button的颜色选择器高度
|
5 years ago |
hades
|
91c9b0535d
|
fix import
|
5 years ago |
hades
|
4c89737094
|
REPORT-27106 && REPORT-27144
|
5 years ago |
Qinghui.Liu
|
29c32eaee5
|
CHART-13065 调整字符间距
|
5 years ago |
Harrison
|
c24078b110
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
图片需要先加载进去。 set 的时候就晚了
|
5 years ago |
Qinghui.Liu
|
d5e6daeff9
|
CHART-13063 修改试管仪表盘布局文案
|
5 years ago |
richie
|
455caa72fc
|
无JIRA任务 升级新的JxBrowser+language level提升到1.8
|
5 years ago |
richie
|
448827b14a
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit '50d9d36180a069769470b1fe9cbedfb7b68ff631':
无jira 同步到feature
REPORT-27647 模板组件的安装下载-模板组件复用插件 处理下可能的 npe
REPORT-27647 模板组件的安装下载-模板组件复用插件 修复部分监听上的问题
|
5 years ago |
richie
|
50d9d36180
|
Merge pull request #1532 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '2379bd527e5778ac60b58ceefdc0f07aebf6e236':
无jira 同步到feature
|
5 years ago |
hades
|
2379bd527e
|
无jira 同步到feature
|
5 years ago |
Hades
|
6877b95101
|
Merge pull request #1531 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a4584870bd2fa7b88e18d18c7233ffbd7e341208':
REPORT-28186 mac出现短暂原生java图标问题
REPORT-28368 死锁问题 常量不需要每次读取
|
5 years ago |
hades
|
a4584870bd
|
REPORT-28186 mac出现短暂原生java图标问题
|
5 years ago |
hades
|
fc9c029ec7
|
REPORT-28368 死锁问题 常量不需要每次读取
|
5 years ago |
Harrison
|
e59463f6ad
|
Merge pull request #1530 in DESIGN/design from ~HARRISON/design:feature/10.0 to feature/10.0
* commit '8e3adfb68f7930be3605f528313e8b3dcbdf4adc':
REPORT-27647 模板组件的安装下载-模板组件复用插件 处理下可能的 npe
REPORT-27647 模板组件的安装下载-模板组件复用插件 修复部分监听上的问题
|
5 years ago |
Hades
|
015e1d15e0
|
Merge pull request #1529 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'e215b36f5e43ef1fce974ab9cf33f0b36ce3a9c5':
REPORT-28257 && REPORT-28257
|
5 years ago |
Harrison
|
8e3adfb68f
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
处理下可能的 npe
|
5 years ago |
Harrison
|
9573f4d080
|
Merge branch 'feature/10.0' of http://code.fineres.com/scm/~harrison/design into feature/10.0
|
5 years ago |
Harrison
|
11d99d7f22
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
修复部分监听上的问题
|
5 years ago |
hades
|
e215b36f5e
|
REPORT-28257 && REPORT-28257
|
5 years ago |
richie
|
9a99ccdbb8
|
Merging in latest from upstream (DESIGN/design:refs/heads/feature/10.0)
* commit 'bebd51531702a1ba8b915e8b1b57fde24709946c': (261 commits)
REPORT-27647 模板组件的安装下载-模板组件复用插件 调整暴露的接口,返回合适的接口
去掉多余接口
REPORT-27647 模板组件的安装下载-模板组件复用插件 删掉多余的设计
REPORT-27647 模板组件的安装下载-模板组件复用插件 1、抽出一个更通用的接口来添加面板 2、为共享加载器添加插件实现
REPORT-27647 模板组件的安装下载-模板组件复用插件 1、空字符串 2、判空 3、接口 xml
去掉 main 函数
REPORT-27647 模板组件的安装下载-模板组件复用插件 ui 界面 1、 本地组件库界面 2、 小圆点设计
方法名修改
设计器启动后,对初始环境做一次检测
无任务,编译失败
REPORT-27280 程序数据集支持刷新出所需参数 支持在选中 class 后,刷新出参数
无jira任务,import需要依赖third
REPORT-27189 切换到单机环境,鼠标悬停在版本管理上,提示错误
无jira任务, 冲突修复
MOBILE-25614 && MOBILE-25605
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
ct
ct
ct
ct
...
|
5 years ago |
neil
|
9761955059
|
Merge pull request #1528 in DESIGN/design from ~NEIL/design:release/10.0 to release/10.0
* commit '883240b8bd904c15cf32a12463b8fc86c7e3eba8':
合代码冲突
REPORT-27985 frm里报表块单元格超链设置缺少选项
REPORT-26915 疫情大屏模板导出内置模板为空
fix
MOBILE-25615 高度重置问题
|
5 years ago |
neil
|
883240b8bd
|
Merge pull request #1 in ~NEIL/design from bugfix/10.0 to release/10.0
* commit '2ac41d22f71d91eab15690a4f156a9cea9491409':
合代码冲突
REPORT-27985 frm里报表块单元格超链设置缺少选项
REPORT-26915 疫情大屏模板导出内置模板为空
fix
MOBILE-25615 高度重置问题
|
5 years ago |
neil
|
2ac41d22f7
|
合代码冲突
|
5 years ago |
Kara
|
e8a5ed1fc1
|
Merge pull request #1526 in DESIGN/design from ~JEO/report-design:persist/10.0 to persist/10.0
* commit 'd157a12f21d6a81f63e525617f958f1ac6cfb06c':
REPORT-28459 JWorkBook 未释放 同步到final
REPORT-28459 场景补充
REPORT-28459 JWorkBook未释放问题 同步到final
REPORT-27434 1.15jar假保存问题 更换下位置。 重构后改动了代码的位置。 没再测试
REPORT-27434 1.15jar假保存问题 监听装置需要同步刷新
|
5 years ago |
jeo
|
d157a12f21
|
Merge branch 'final/10.0' into persist/10.0
|
5 years ago |
Harrison
|
bebd515317
|
Merge pull request #1524 in DESIGN/design from ~HARRISON/design:feature/10.0 to feature/10.0
* commit '713b72cded5d886b417e5d696f1fe3c3c24aeb6f':
REPORT-27647 模板组件的安装下载-模板组件复用插件 调整暴露的接口,返回合适的接口
去掉多余接口
REPORT-27647 模板组件的安装下载-模板组件复用插件 删掉多余的设计
REPORT-27647 模板组件的安装下载-模板组件复用插件 1、抽出一个更通用的接口来添加面板 2、为共享加载器添加插件实现
REPORT-27647 模板组件的安装下载-模板组件复用插件 1、空字符串 2、判空 3、接口 xml
去掉 main 函数
REPORT-27647 模板组件的安装下载-模板组件复用插件 ui 界面 1、 本地组件库界面 2、 小圆点设计
|
5 years ago |
Hades
|
ca9f0123ec
|
Merge pull request #1523 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '2f42c6c52ae82ed619f0ea861041047db79b7898':
REPORT-28368 死锁问题 常量不需要每次读取
CHART-13168 && REPORT-27122
|
5 years ago |
Bjorn
|
266aa99fa7
|
Merge pull request #1525 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'fe01323af02935a217b9781c82d6c33063d39a28':
CHART-13072 设计器中查询数据集数据的时候替换为FR预览数据的接口查询
|
5 years ago |
Harrison
|
713b72cded
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
调整暴露的接口,返回合适的接口
|
5 years ago |
hades
|
2f42c6c52a
|
REPORT-28368 死锁问题 常量不需要每次读取
|
5 years ago |
白岳
|
fe01323af0
|
CHART-13072 设计器中查询数据集数据的时候替换为FR预览数据的接口查询
|
5 years ago |
Harrison
|
2a0bbc69bc
|
去掉多余接口
|
5 years ago |
Harrison
|
f89a5d3171
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
删掉多余的设计
|
5 years ago |
Harrison
|
5b0c5dc299
|
REPORT-27647 模板组件的安装下载-模板组件复用插件
1、抽出一个更通用的接口来添加面板
2、为共享加载器添加插件实现
|
5 years ago |
hades
|
7364fd157b
|
CHART-13168 && REPORT-27122
|
5 years ago |
Hades
|
619d35c0bd
|
Merge pull request #1522 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'b5c6415475c407b49c1cabf048c07f9a96915ec3':
REPORT-28202 && REPORT-28259 && REPORT-27271 && REPORT-28036
|
5 years ago |
Bjorn
|
4a521d73bb
|
Merge pull request #1519 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '76aa8a08d36f5f07e9fe91941e9533b2c5e30064':
CHART-13116 自定义匹配时把匹配数据转换为String
|
5 years ago |
Kara
|
b5c6415475
|
REPORT-28202 && REPORT-28259 && REPORT-27271 && REPORT-28036
|
5 years ago |
Kara
|
60b07cfef3
|
Merge pull request #1521 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '63d019cb6e6903e8fb26fd48705f3267ea29e5cd':
REPORT-28459 JWorkBook 未释放 同步到final
|
5 years ago |
Hades
|
b29797e789
|
Merge pull request #1520 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '567c127a12662fb0336f20f5b9c9ac23508ae961':
REPORT-28459 JWorkBook 未释放
|
5 years ago |
hades
|
63d019cb6e
|
REPORT-28459 JWorkBook 未释放 同步到final
|
5 years ago |
hades
|
567c127a12
|
REPORT-28459 JWorkBook 未释放
|
5 years ago |