loy
3b47f8baac
Pull request #5273 : REPORT-48167 & REPORT-48135 修复新引擎内置bug
...
Merge in DESIGN/design from ~LOY/design:release/11.0 to release/11.0
* commit '1a0fc19d1a054c1f4698f1d0cf9cef8bac40089a':
REPORT-48135 修复线程池调用方式
REPORT-48167 修复本地性能分析页面链接错误问题
3 years ago
loy
1a0fc19d1a
REPORT-48135 修复线程池调用方式
3 years ago
loy
771d1456cc
REPORT-48167 修复本地性能分析页面链接错误问题
3 years ago
superman
94ff52feb4
Merge pull request #5271 in DESIGN/design from release/11.0 to feature/x
...
* commit '9e96755af5259f69d8a89936add1a4d5770f9ba8':
REPORT-50665【FRX】挂载新决策报表模板时,应该无须添加&op=form_adaptive参数
3 years ago
kerry
9e96755af5
Pull request #5253 : REPORT-50665【FRX】挂载新决策报表模板时,应该无须添加&op=form_adaptive参数
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0
* commit '21e4bc1f77853efd1a023d13dd8df36fcba0f9d2':
REPORT-50665【FRX】挂载新决策报表模板时,应该无须添加&op=form_adaptive参数
3 years ago
superman
9e756163b3
Merge pull request #5263 in DESIGN/design from release/11.0 to feature/x
...
* commit 'b428f495ff857ccf8790677188d36d5b7d6a637d':
REPORT-51472 设计器启动缓存配置读写模块
3 years ago
rinoux
b428f495ff
Pull request #5254 : REPORT-51472 设计器启动缓存配置读写模块
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit 'b41a6ed7b37da6fb64953a73c7e342e9c364002b':
REPORT-51472 设计器启动缓存配置读写模块
3 years ago
rinoux
b41a6ed7b3
REPORT-51472 设计器启动缓存配置读写模块
3 years ago
kerry
21e4bc1f77
REPORT-50665【FRX】挂载新决策报表模板时,应该无须添加&op=form_adaptive参数
3 years ago
superman
279d472fb6
Merge pull request #5248 in DESIGN/design from release/11.0 to feature/x
...
* commit '0d15e520fd19e9060685acb32aee440b83b41b56':
KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中
3 years ago
loy
0d15e520fd
Pull request #5241 : KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中
...
Merge in DESIGN/design from ~LOY/design:release/11.0 to release/11.0
* commit '808783b8b502fb6b965efad61046e7e025ff4616':
KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中
3 years ago
loy
808783b8b5
KERNEL-8675 新引擎插件代码修改同步到11.0的内置新引擎中
3 years ago
superman
a1d1b53e1c
Merge pull request #5206 in DESIGN/design from release/11.0 to feature/x
...
* commit '284b6e92fbf1f2c538cae50f466f91b58231e7f2':
CHART-20134 图表接口判断增加对新接口的判断
KERNEL-8304 连接池逻辑重构
3 years ago
superman
284b6e92fb
Merge pull request #5205 in DESIGN/design from feature/10.0 to release/11.0
...
* commit '486c70356eb961c5fef32b7775db0ecee3cfadfe':
CHART-20134 图表接口判断增加对新接口的判断
KERNEL-8304 连接池逻辑重构
3 years ago
Bjorn
486c70356e
Pull request #5199 : CHART-20134 图表接口判断增加对新接口的判断
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '3383679b7c13d09a99b5018bed60299bba55849d':
CHART-20134 图表接口判断增加对新接口的判断
3 years ago
白岳
3383679b7c
CHART-20134 图表接口判断增加对新接口的判断
3 years ago
Xiqiu
b78513d6cb
Pull request #5165 : KERNEL-8304 连接池逻辑重构
...
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '95eb275a6cefaf9c96a2fe9ab7d97259eb9d039a':
KERNEL-8304 连接池逻辑重构
3 years ago
superman
051542d94f
Merge pull request #5183 in DESIGN/design from release/11.0 to feature/x
...
* commit 'f37dceb3e74bc40e9cf83ff7338660c1cbb48fa7':
3 years ago
superman
f37dceb3e7
Merge pull request #5182 in DESIGN/design from feature/10.0 to release/11.0
...
* commit 'eec249b5748a90583a1f7083be6453432e88ed1a':
3 years ago
superman
eec249b574
Merge pull request #5180 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '237143b3831f4ce54d822717d0ff4d26cc935fc2':
3 years ago
superman
237143b383
Merge pull request #5179 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '3f1b971a576734b43623c7f31d02add42b50257f':
3 years ago
superman
3f1b971a57
Merge pull request #5178 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'd416b56c93bac26b5b2f5b1f915fd384a2788839':
3 years ago
superman
d416b56c93
Merge pull request #5177 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '58784a38ae1a906d85aeb196a0315ce113b9883a':
3 years ago
superman
58784a38ae
Merge pull request #5176 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '2fc0b44aace0fe514861c652eaa7d09321876591':
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
设计器外双击模板打开,设计器内会额外打开一个空白的cpt
REPORT-55839 组件复用-禁用tab块的自定义图片边框入口,预期是只面向图表块与报表块
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
3 years ago
superman
864f92abbf
Merge pull request #5175 in DESIGN/design from feature/x to release/11.0
...
* commit 'da16b83633e55ea5d093b6350cf4ce39953ed5b7':
CHART-19555 注释掉暂时不用的属性
KERNEL-7640 填报预览新前端适配第一波代码合并
KERNEL-7640 填报预览新前端适配第一波代码合并
3 years ago
Bjorn
da16b83633
Pull request #5166 : CHART-19555 注释掉暂时不用的属性
...
Merge in DESIGN/design from ~BJORN/design:feature/x to feature/x
* commit '43736246f8c24f07f5421136b8e04e82718c0dfc':
CHART-19555 注释掉暂时不用的属性
3 years ago
superman
7ce033722f
Merge pull request #5173 in DESIGN/design from release/11.0 to feature/x
...
* commit 'e1f412def9fc3d9028fe47bd1354c7cd0f6284c8':
KERNEL-8608 解决控件组件在创建组件过程中丢失配置的问题
3 years ago
superman
e1f412def9
Merge pull request #5172 in DESIGN/design from feature/10.0 to release/11.0
...
* commit 'ebfd1e8cfc25b64b2346d0ca28b8a12ff027ed75':
KERNEL-8608 解决控件组件在创建组件过程中丢失配置的问题
3 years ago
Tommy
ebfd1e8cfc
Pull request #5156 : KERNEL-8608 解决控件组件在创建组件过程中丢失配置的问题
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit '552392e98b33e1a5a355eeee78233557ec3302f4':
KERNEL-8608 解决控件组件在创建组件过程中丢失配置的问题
3 years ago
白岳
43736246f8
CHART-19555 注释掉暂时不用的属性
3 years ago
xiqiu
95eb275a6c
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
3 years ago
xiqiu
bb49f59559
KERNEL-8304 连接池逻辑重构
3 years ago
superman
18fb7cb2d6
Merge pull request #5163 in DESIGN/design from release/11.0 to feature/x
...
* commit '0eae09f0c4bb631274a35ffbdbb704f0bc071fa3':
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
3 years ago
superman
0eae09f0c4
Merge pull request #5162 in DESIGN/design from feature/10.0 to release/11.0
...
* commit 'c89934721e2ccf74cbcb6f6c7b05df1891fa4beb':
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
3 years ago
superman
c89934721e
Merge pull request #5160 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '9b99d7169f81cac14773ec7346bc1fddfb230508':
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
3 years ago
superman
9b99d7169f
Merge pull request #5159 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'fb3731c7821b7ab3837beaaa48511aa51f617e85':
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
3 years ago
superman
fb3731c782
Merge pull request #5158 in DESIGN/design from final/10.0 to release/10.0
...
* commit '2fc0b44aace0fe514861c652eaa7d09321876591':
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
3 years ago
kuangshuai
552392e98b
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
3 years ago
kuangshuai
6b6c12738d
KERNEL-8608 解决控件组件在创建组件过程中丢失配置的问题
3 years ago
Kara
2fc0b44aac
Pull request #5155 : REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
...
Merge in DESIGN/design from ~STARRYI/design:final/10.0 to final/10.0
* commit '5479bfbe43ffcf9f84a11f8302562ff9305a4e0f':
REPORT-56010 【组件背景分离】组件复用-组件不显示 标题,设置边框后设计期内边框不显示
3 years ago
Starryi
5479bfbe43
REPORT-56010 【组件背景分离】组件复用-组件不显示
...
标题,设置边框后设计期内边框不显示
【问题原因】
1. 在无标题情况下,XWTitleLayout和普通的XBorderStyleWidgetCreator一样,通过
initBorderAndBackgroundStyle区初始化背景和边框,即使它自身没有样式模型,从而获得
一个默认的灰色边框(图表块和报表块的一般组件需要默认灰色边框), 遮住了图表块和报表块的边框
2. 在有标题情况下,此时XWTitleLayout从BodyCreator处,获取了需要绘制的边框,但如果之后切换
为无标题,再更新边框样式,则新边框对象会设置到BodyCreator上,而旧边框对象因为没有被清除,所以
会继续保留在XWTitleLayout上,然后覆盖了新的边框
3. 背景也有一样的效果
【改动思路】
1. XWTitleLayout重新实现initBorderAndBackgroundStyle方法
2. 若无标题,则将XWTitleLayout的边框/背景等重制为空
【review建议】
3 years ago
ju|剧浩宇
a5489d3827
Pull request #5147 : 无jira任务,冲突
...
Merge in DESIGN/design from ~BRUCE.DENG/design:feature/x to feature/x
* commit '6a0f6a4c1b23e894cb0b7612e50d92cde1f3d3c5':
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
设计器外双击模板打开,设计器内会额外打开一个空白的cpt
REPORT-55839 组件复用-禁用tab块的自定义图片边框入口,预期是只面向图表块与报表块
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-49910 【FRX】工具栏参数面板支持单独替换新前端
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55091 只有一个非超管用户的目录文件无法另存或新建
3 years ago
Bruce.Deng
6a0f6a4c1b
Merge branch 'release/11.0' of https://code.fineres.com/scm/~bruce.deng/design into feature/x
...
Conflicts:
designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
3 years ago
superman
25b1692603
Merge pull request #5145 in DESIGN/design from feature/10.0 to release/11.0
...
* commit 'e32216d2cf7143981adc4de6d1636492775d145d':
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
设计器外双击模板打开,设计器内会额外打开一个空白的cpt
REPORT-55839 组件复用-禁用tab块的自定义图片边框入口,预期是只面向图表块与报表块
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55091 只有一个非超管用户的目录文件无法另存或新建
3 years ago
superman
e32216d2cf
Merge pull request #5143 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '66275ec1fdef071f3527a1772ab330421b307602':
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
设计器外双击模板打开,设计器内会额外打开一个空白的cpt
REPORT-55839 组件复用-禁用tab块的自定义图片边框入口,预期是只面向图表块与报表块
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55091 只有一个非超管用户的目录文件无法另存或新建
3 years ago
superman
66275ec1fd
Merge pull request #5138 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e9532fcb551253d1b9f2702c7aa52cecbed6b65a':
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
设计器外双击模板打开,设计器内会额外打开一个空白的cpt
REPORT-55839 组件复用-禁用tab块的自定义图片边框入口,预期是只面向图表块与报表块
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
3 years ago
superman
e9532fcb55
Merge pull request #5137 in DESIGN/design from final/10.0 to release/10.0
...
* commit '26c52da933688cc81545f6e290943797fcc3dc22':
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
设计器外双击模板打开,设计器内会额外打开一个空白的cpt
REPORT-55839 组件复用-禁用tab块的自定义图片边框入口,预期是只面向图表块与报表块
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
REPORT-55757 【组件背景分离】组件复用-标题图案预览图,悬浮时出现的遮罩和删除图标,鼠标如果从左边/上边滑出,则删除图标消失;但从右边/下边滑出,删除图标还在
3 years ago
superman
26c52da933
Merge pull request #5136 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'cb5c3034b9338c71476cdddd385e9e2e31bae9b2':
3 years ago
Kara
a9bd4a0daf
Pull request #5135 : REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
...
Merge in DESIGN/design from ~STARRYI/design:final/10.0 to final/10.0
* commit 'b2bf9dd2c431717a46614f6762161baa1574d2c6':
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
3 years ago
Starryi
b2bf9dd2c4
REPORT-55850 【组件背景分离】组件复用-Tab组件背景和边框预览不生效
...
【问题原因】
1. Tab组件样式属性更新后,没有调用initStyl设置XCreator的样式重新渲染
2. Tab不支持圆角
3. Tab样式设置面板因为没有初始化标题相关配置项,导致update时,type变为默认值STANDARD,影响了
XWCardLayout.initStyle内部逻辑
【改动思路】
同上
3 years ago