shine
160c0bd9ef
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into feature/10.0
4 years ago
shine
e8a70ea8bf
CHART-18997design 表单 扩展图表图表块读取失败 不吞抛错rethrow
4 years ago
superman
471382f8f0
Merge pull request #4082 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '0dc2ac14184fe11fac8992b00d763802720ee8e7':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
REPORT-51199 模版数据集预览图标偏移
4 years ago
pengda
2590d1b6c6
Pull request #4060 : REPORT-51292 mongodb插件-feature分支下点击确定后保存失效
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '803a58287888453a0ca1d2c62c16876b5162efdb':
REPORT-51292 mongodb插件-feature分支下点击确定后保存失效
4 years ago
ju|剧浩宇
3114066d15
Pull request #4069 : 无jira 解决冲突
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit '7b1fd9b72feaaaf14981c0be47d118015ab92f2d':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
CHART-18997 处理下打开模板出错时情况
CHART-18997 处理下打开模板出错时情况
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51199 模版数据集预览图标偏移
REPORT-51162 端口输入限制失效 & REPORT-51260 redshift的特定url格式无法识别
KERNEL-7542 优化设计器发现的一些问题
4 years ago
hades
7b1fd9b72f
无jira 解决冲突
4 years ago
superman
ff296045e9
Merge pull request #4066 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '9954537d47dbd9bf730655e598f851eb12ade728':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
9954537d47
Merge pull request #4065 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'a5328e9e28628d4cf3076dd9ca190bc145e4f3b6':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
a5328e9e28
Merge pull request #4064 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '0dc2ac14184fe11fac8992b00d763802720ee8e7':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-47952 公式编辑器中数据集参数获取问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
0dc2ac1418
Merge pull request #4063 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'ff37e3146b25b11aeb61b8d1c1b1ad3e849ad9d0':
4 years ago
Kara
81a51a299b
Pull request #4062 : REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:final/10.0 to final/10.0
* commit 'b72d94b00377a0dfe844b2470e3127ecc525f3cf':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
lucian
b72d94b003
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
Kara
647dda4d92
Pull request #4061 : REPORT-47952 公式编辑器中数据集参数获取问题
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit 'fa7e71d96ef21e547ecf9fe00618ff7b5881a29c':
REPORT-47952 公式编辑器中数据集参数获取问题
4 years ago
hades
fa7e71d96e
REPORT-47952 公式编辑器中数据集参数获取问题
4 years ago
pengda
803a582878
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
pengda
20f8de54d6
REPORT-51292 mongodb插件-feature分支下点击确定后保存失效
4 years ago
pengda
2274c5b548
Pull request #4049 : REPORT-51162 端口输入限制失效 & REPORT-51260 redshift的特定url格式无法识别
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit '4356dce3ffd191ec8875f36df0aa6a644a0d3351':
REPORT-51162 端口输入限制失效 & REPORT-51260 redshift的特定url格式无法识别
4 years ago
Henry.Wang
c6451c1db0
Pull request #4048 : KERNEL-7542 优化设计器发现的一些问题
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '345943696ffb6471ef6ce1126c2273bbb4e0feed':
KERNEL-7542 优化设计器发现的一些问题
4 years ago
Hades
e7cbbd31d2
Pull request #4059 : CHART-18997 处理下打开模板出错时情况
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '907e2957afe37bad882a49c5d1ae6dd1dfeb2f33':
CHART-18997 处理下打开模板出错时情况
CHART-18997 处理下打开模板出错时情况
4 years ago
hades
907e2957af
CHART-18997 处理下打开模板出错时情况
4 years ago
Kara
980daf8cdd
Pull request #4056 : REPORT-51199 模版数据集预览图标偏移
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/10.0 to final/10.0
* commit '20e84c09ca545647c0b5e4f3e66223512675bb3f':
REPORT-51199 模版数据集预览图标偏移
4 years ago
hades
9abed876cd
CHART-18997 处理下打开模板出错时情况
4 years ago
superman
ff37e3146b
Merge pull request #4058 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '4a972a12e091a3c489c5d0b609c2f7f9d2d25762':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-51199 模版数据集预览图标偏移
REPORT-49034 引用JS静态资源文件路径出错
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50096 处理下切换数据连接场景
REPORT-49686 决策报表自适应布局,添加参数面板后,无法通过右侧设置面板调整绝对画布块的大小 【问题原因】这里绝对画布块的高度调整要分为两种方式,一种是拖拽改变,另一种是在右侧面板中改变高度数值,问题的原因是此前REPORT-7588中,拖拽时会走到FormSelection#fixCreator(),这里面为绝对画布块做特殊处理时,漏算了参数面板的高度,然后在REPORT-34739中,FRFitLayoutAdapter#fix()方法中处理了一下参数面板造成的偏移,所以拖拽的逻辑都正常;但是如果在右侧面板中改变高度时,会直接走到FRFitLayoutAdapter#fix()中,此时是没有漏算参数面板高度的,因此经过处理之后,反而组件的backupBound会多了个参数面板高度,这样会造成每次改变都加上这个高度,就出现了bug现象 【改动思路】把判断参数面板是否漏算的逻辑放到FormSelection#fixCreator()中
REPORT-50096 数据填充时不需要触发监听
REPORT-50096 在设计器中更改数据库类型后 数据库名称字段操作和之前保持一致
REPORT-50096 fix 预防npe
REPORT-50096 FR远程BI,未改动配置,确认保存后配置发生变化
4 years ago
Kara
4a972a12e0
Pull request #4057 : REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:final/10.0 to final/10.0
* commit '9a8d4a66d71e28df762d47f43634175eab1d2377':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
lucian
9a8d4a66d7
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
Henry.Wang
20e84c09ca
Merge branch 'final/10.0' of https://code.fineres.com/scm/~henry.wang/design into final/10.0
4 years ago
Henry.Wang
8cb25024fd
REPORT-51199 模版数据集预览图标偏移
4 years ago
pengda
4356dce3ff
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
4 years ago
pengda
95f3f7f120
REPORT-51162 端口输入限制失效 & REPORT-51260 redshift的特定url格式无法识别
4 years ago
Henry.Wang
345943696f
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
4 years ago
Henry.Wang
ebf7b3a935
KERNEL-7542 优化设计器发现的一些问题
4 years ago
superman
396778ab28
Merge pull request #4041 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'd4149c8879de656d28abe10e5a95da8a3abe0fa1':
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
d4149c8879
Merge pull request #4039 in DESIGN/design from release/10.0 to feature/10.0
...
* commit 'ee6be146a1e6ce0945cba2fd470ac77f4036d9be':
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
ee6be146a1
Merge pull request #4038 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '824e775fe4b0ac9ae3582205be0d71fb663f8a64':
REPORT-51199 模版数据集预览图标偏移
4 years ago
superman
824e775fe4
Merge pull request #4037 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '970445f730f682a4514c206134238dab8dbe5fc6':
REPORT-51199 模版数据集预览图标偏移
4 years ago
Kara
970445f730
Pull request #4035 : REPORT-51199 模版数据集预览图标偏移
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/10.0 to final/10.0
* commit 'c7592920dd5c6699f187c0ae11f0232c0f1aa669':
REPORT-51199 模版数据集预览图标偏移
4 years ago
Henry.Wang
c7592920dd
REPORT-51199 模版数据集预览图标偏移
4 years ago
rinoux
773099fbd4
Pull request #4028 : REPORT-51163 插件监听的代码丢了
...
Merge in DESIGN/design from ~RINOUX/design:feature/x to feature/x
* commit '0551a2c472be63298f2a59955057ff73e248d1af':
REPORT-51163 插件监听的代码丢了
4 years ago
rinoux
0551a2c472
REPORT-51163 插件监听的代码丢了
4 years ago
superman
0a2a778945
Merge pull request #4021 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'd79936cb6a626ef21bcc4808d6d3e23d0cac53e2':
FineJOptionPane
conflict
REPORT-51153 数据连接界面优化-url全部删除后,各配置项不会自动清空
REPORT-51126 数据连接界面优化-端口的联动有点问题
4 years ago
zheng
d79936cb6a
Pull request #4014 : CHART-18724 design 图表读取失败 不打开模板
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '73fdd9a70298ffb16cc5ec1b9a9eefd628852741':
FineJOptionPane
conflict
4 years ago
shine
73fdd9a702
FineJOptionPane
4 years ago
pengda
22e9271040
Pull request #4004 : REPORT-51126 数据连接界面优化-端口的联动有点问题
...
Merge in DESIGN/design from ~PENGDA/design:feature/10.0 to feature/10.0
* commit 'd8c5f2481e93bf24005d6d8cc12860b12d628806':
REPORT-51153 数据连接界面优化-url全部删除后,各配置项不会自动清空
REPORT-51126 数据连接界面优化-端口的联动有点问题
4 years ago
ju|剧浩宇
7d613f7e3f
Pull request #4015 : 无jira 解决冲突
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'c9990648f37e5dbbd35fe7d9f9461b3c7de34762':
REPORT-49034 引用JS静态资源文件路径出错
REPORT-50802 参数面板组建设置面板中,删除按钮的快捷键提示浮窗内容不正确
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
REPORT-49986 CloseCurrentTemplateAction 换行格式问题
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 add
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化 fix
REPORT-49986 【10.0.16】性能优化之阻塞EDT线程时优化
4 years ago
hades
c9990648f3
无jira 解决冲突
4 years ago
shine
84c0646c2c
Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into feature/10.0
4 years ago
shine
972c696008
conflict
4 years ago
superman
4e82018e4b
Merge pull request #4011 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '3e727767c4c47304873e761d37aa1fad363923b0':
REPORT-49034 引用JS静态资源文件路径出错
REPORT-50802 参数面板组建设置面板中,删除按钮的快捷键提示浮窗内容不正确
4 years ago
superman
3e727767c4
Merge pull request #4010 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '45362d9fbe74df413ff8d3463f19b7bd319adc75':
REPORT-49034 引用JS静态资源文件路径出错
4 years ago
superman
45362d9fbe
Merge pull request #4009 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit '27109177e1365f707fafbcc57e2f12cdd01132c9':
4 years ago