superman
7e812cd436
Merge pull request #4131 in DESIGN/design from feature/10.0 to feature/x
...
* commit '90f80c19dc56c7e3e6be6d4423e5be40a13ae839':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
superman
90f80c19dc
Merge pull request #4129 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '1bcf1e037225972b3843be78b85c9c3561550ace':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
superman
1bcf1e0372
Merge pull request #4128 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'e0860282ae1cc853423cf97f24739fb8ab378a08':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
Lucian.Chen
e0860282ae
Pull request #4125 : REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
...
Merge in DESIGN/design from ~LUCIAN.CHEN/design:bugfix/10.0 to bugfix/10.0
* commit '67f2694862ed2a2216df19e3874c45c5c7189572':
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
lucian
67f2694862
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
lucian
d88687d988
REPORT-50908 填报-填报属性设置-填报属性中对表查询定位的问题
4 years ago
superman
ec25816384
Merge pull request #4118 in DESIGN/design from feature/10.0 to feature/x
...
* commit '47a21534619a95202f35febecbc611c707684ab6':
CHART-18951 悬浮窗图表无法关闭
4 years ago
Henry.Wang
47a2153461
Pull request #4112 : CHART-18951 悬浮窗图表无法关闭
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'adc8808b16cb289867aaae05732cff5444498f0d':
CHART-18951 悬浮窗图表无法关闭
4 years ago
Henry.Wang
adc8808b16
CHART-18951 悬浮窗图表无法关闭
4 years ago
superman
f43dcd0246
Merge pull request #4111 in DESIGN/design from feature/10.0 to feature/x
...
* commit '5ffdbc7480a67019e16bd9383d2c20d0f00588e5':
CHART-19018 插入悬浮图表后,再插入单元格图表,无法点出图表属性面板
REPORT-51317 保存失败后,保存中加载动画还在
4 years ago
Henry.Wang
5ffdbc7480
Pull request #4105 : CHART-19018 插入悬浮图表后,再插入单元格图表,无法点出图表属性面板
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '394b4702629b28fd4ec76f217b9ebcdc638b2945':
CHART-19018 插入悬浮图表后,再插入单元格图表,无法点出图表属性面板
4 years ago
Henry.Wang
394b470262
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
4 years ago
Henry.Wang
e799d65b7e
CHART-19018 插入悬浮图表后,再插入单元格图表,无法点出图表属性面板
4 years ago
Hades
c3fee9ef44
Pull request #4091 : REPORT-51317 保存失败后,保存中加载动画还在
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'fb0d6575de14889736788e0819b4e0d528989cae':
REPORT-51317 保存失败后,保存中加载动画还在
4 years ago
superman
1eb17aa266
Merge pull request #4104 in DESIGN/design from feature/10.0 to feature/x
...
* commit '48ef2eacb9d9bc48f52f5ce45328a525d794d981':
REPORT-51446 注册表启动设计器会报错并闪退
CHART-18997design 表单 扩展图表图表块读取失败 不吞抛错rethrow
4 years ago
superman
48ef2eacb9
Merge pull request #4095 in DESIGN/design from release/10.0 to feature/10.0
...
* commit 'fe9df15ebdeb3eb19b617b1199bd94c4e1382be6':
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
superman
fe9df15ebd
Merge pull request #4094 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'ac5a017db914f9eb6befe9f94799d088aaaa1024':
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
Hades
ac5a017db9
Pull request #4090 : REPORT-51446 注册表启动设计器会报错并闪退
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '1a028c69f12910ccccd58db15560fc0b9393ad0c':
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
hades
fb0d6575de
REPORT-51317 保存失败后,保存中加载动画还在
4 years ago
hades
1a028c69f1
REPORT-51446 注册表启动设计器会报错并闪退
4 years ago
zheng
1371fa5b25
Pull request #4083 : CHART-18997 design 表单 扩展图表图表块读取失败 不吞抛错rethrow
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '160c0bd9ef3a988a78b5144d9528738589f6c42e':
CHART-18997design 表单 扩展图表图表块读取失败 不吞抛错rethrow
4 years ago
superman
fbe01d42b4
Merge pull request #4089 in DESIGN/design from feature/10.0 to feature/x
...
* commit '2103940ee944d0f0e3ec4b7501b9e5815a2d9ef7':
REPORT-51292 mongodb插件-feature分支下点击确定后保存失效
4 years ago
superman
2103940ee9
Merge pull request #4087 in DESIGN/design from release/10.0 to feature/10.0
...
* commit '795b1b0451612c68e9eb33380cae8614d74bd42b':
4 years ago
superman
795b1b0451
Merge pull request #4086 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit 'bc6bae75d9a1affde6a936c1560b2fed3644b253':
4 years ago
superman
bc6bae75d9
Merge pull request #4085 in DESIGN/design from final/10.0 to bugfix/10.0
...
* commit 'c4d444dfa32fbcd95fcd12ce9fa25f8458a93ebd':
4 years ago
superman
c4d444dfa3
Merge pull request #4084 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '471382f8f0195cc18bb69e3eb24e2b134784505a':
4 years ago
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