superman
30f57d700c
Merge pull request #17020 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '9db63b3f30b287f51433327ae82f09002c54bb83':
REPORT-148266 revert: 撤回TableDataComboBox数据集名称展示的改动
10 hours ago
superman
9db63b3f30
Merge pull request #17019 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'dd3024d9e2b31e9cba5b12446b1b58349f7ecd41':
REPORT-148266 revert: 撤回TableDataComboBox数据集名称展示的改动
18 hours ago
Zongyu.Wang-王宗雨
dd3024d9e2
Pull request #17012 : REPORT-148266 revert: 撤回TableDataComboBox数据集名称展示的改动
...
Merge in DESIGN/design from ~ZONGYU.WANG/design:release/11.0 to release/11.0
* commit '45a112ad1db836146e8b23ea6ce30e5f9d64286b':
REPORT-148266 revert: 撤回TableDataComboBox数据集名称展示的改动
1 day ago
lemon
45a112ad1d
REPORT-148266 revert: 撤回TableDataComboBox数据集名称展示的改动
1 day ago
superman
d88a2ce677
Merge pull request #17010 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'c3b925cd13a56f440ba9100561089d07966b279c':
REPORT-148138 单测修复,由于资源同名导致覆盖,出现单测错误,通过修改资源解决。
2 days ago
superman
c3b925cd13
Merge pull request #17009 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'd6d66f7a34ad871c02b9176e0b81c5dbed124d20':
REPORT-148138 单测修复,由于资源同名导致覆盖,出现单测错误,通过修改资源解决。
2 days ago
Brian.Luo-罗旭
d6d66f7a34
Pull request #17002 : REPORT-148138 单测修复,由于资源同名导致覆盖,出现单测错误,通过修改资源解决。
...
Merge in DESIGN/design from ~BRIAN.LUO/design:release/11.0 to release/11.0
* commit '92c87cb4e9041eef9907a88b3cf6bdf1b71bc0b4':
REPORT-148138 单测修复,由于资源同名导致覆盖,出现单测错误,通过修改资源解决。
2 days ago
Brian.Luo-罗旭
92c87cb4e9
REPORT-148138 单测修复,由于资源同名导致覆盖,出现单测错误,通过修改资源解决。
2 days ago
superman
8586792dad
Merge pull request #16985 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '3db49db7165af88fb77879b54ca79f0594e905cb':
REPORT-148096 整体代码已重构,删除无效单测
REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法
REPORT-148096 暂时过滤掉与UI相关的单测
5 days ago
superman
3db49db716
Merge pull request #16984 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'cf51c366b49654321d2671f1c0826add1a729852':
REPORT-148096 整体代码已重构,删除无效单测
REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法
REPORT-148096 暂时过滤掉与UI相关的单测
5 days ago
Zongyu.Wang-王宗雨
16da522b0c
Pull request #16977 : REPORT-146147 feat:兼容内嵌式容器
...
Merge in DESIGN/design from ~ZONGYU.WANG/design:feature/x to feature/x
* commit 'a37caebf7febff2dbdf0332bbd26ba39239335ff':
REPORT-146147 feat:兼容内嵌式容器
5 days ago
lemon
a37caebf7f
REPORT-146147 feat:兼容内嵌式容器
5 days ago
Leo.Qin-覃宇攀
cf51c366b4
Pull request #16976 : REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法
...
Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0
* commit 'a125b40d18b40bc4b89017d3619b4e96d78ab4be':
REPORT-148096 整体代码已重构,删除无效单测
REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法
5 days ago
Leo.Qin
a125b40d18
REPORT-148096 整体代码已重构,删除无效单测
5 days ago
Leo.Qin
b24a386879
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
5 days ago
Leo.Qin
30450a5c7f
REPORT-148096 该方法的单测没用了,之前补充了新的没有删除旧的 && 改动,出现了未预期调用的方法
5 days ago
Leo.Qin-覃宇攀
e9205d8619
Pull request #16975 : REPORT-148096 暂时过滤掉与UI相关的单测
...
Merge in DESIGN/design from ~LEO.QIN/design:release/11.0 to release/11.0
* commit 'ee764519ef73bbbd0236c28f096dee7ff54beda5':
REPORT-148096 暂时过滤掉与UI相关的单测
5 days ago
Leo.Qin
ee764519ef
REPORT-148096 暂时过滤掉与UI相关的单测
5 days ago
superman
6187af1ee2
Merge pull request #16974 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '1770bdb32b865db4e9e6704fe76a5f63bef2d4ea':
REPORT-149091 修复动态参数切换异常
KERNEL-20956 修复jxbrowser因解压文件导致的启动失败问题
6 days ago
superman
1770bdb32b
Merge pull request #16973 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'f0d47ba081be0f374d276f8f06459c8feeaeb272':
REPORT-149091 修复动态参数切换异常
KERNEL-20956 修复jxbrowser因解压文件导致的启动失败问题
6 days ago
Shengzu.Xue-薛胜祖
f0d47ba081
Pull request #16966 : REPORT-149091 修复动态参数切换异常
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:release/11.0 to release/11.0
* commit '934b2a76eaa9a7b7925f371055810aea5ac48701':
REPORT-149091 修复动态参数切换异常
6 days ago
shengzu.xue
934b2a76ea
REPORT-149091 修复动态参数切换异常
6 days ago
vito-刘恒霖
a240b2c9fe
Pull request #16965 : KERNEL-20956 修复jxbrowser因解压文件导致的启动失败问题
...
Merge in DESIGN/design from ~VITO/c-design:release/11.0 to release/11.0
* commit '372e7d380fc477baee116d0816f438a581171208':
KERNEL-20956 修复jxbrowser因解压文件导致的启动失败问题
6 days ago
vito
372e7d380f
KERNEL-20956 修复jxbrowser因解压文件导致的启动失败问题
6 days ago
superman
3572fb2f24
Merge pull request #16947 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '81dc97e0236b33298a9c8dc3d97a7ad317029635':
REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全
1 week ago
superman
81dc97e023
Merge pull request #16946 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'd4922116b126744bba936100161167abba74764b':
REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全
1 week ago
superman
d4922116b1
Merge pull request #16939 in DESIGN/design from bugfix/11.0 to release/11.0
...
* commit '74e1e422cd016f798c3eb930903975691f54f16e':
REPORT-148266 feat:comboBox事件叠加导致部分操作卡顿问题优化
feat: JSContentPane支持自定义提示功能 #REPORT-144004
feat: 移除移动端弹窗配置调整的接口方法 #REPORT-145535
feat: 部分逻辑抽到插件中实现 #REPORT-145535
feat: fvs表格-超链-移动端弹窗支持get post设置 #REPORT-145535
1 week ago
superman
8b0a722772
Merge pull request #16938 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '74e1e422cd016f798c3eb930903975691f54f16e':
1 week ago
superman
74e1e422cd
Merge pull request #16937 in DESIGN/design from feature/x to bugfix/11.0
...
* commit 'e346ab97cc686d4df5b30e841e3f3bd9f928c903':
REPORT-148266 feat:comboBox事件叠加导致部分操作卡顿问题优化
feat: JSContentPane支持自定义提示功能 #REPORT-144004
feat: 移除移动端弹窗配置调整的接口方法 #REPORT-145535
feat: 部分逻辑抽到插件中实现 #REPORT-145535
feat: fvs表格-超链-移动端弹窗支持get post设置 #REPORT-145535
1 week ago
Richard.Fang-方超
e346ab97cc
Pull request #16931 : REPORT-148266 feat:comboBox事件叠加导致部分操作卡顿问题优化
...
Merge in DESIGN/design from ~RICHARD.FANG/design:feature/x to feature/x
* commit '2062c8874720ce47183ca6d99422fafa80daf880':
REPORT-148266 feat:comboBox事件叠加导致部分操作卡顿问题优化
2 weeks ago
lidongy-李东原
15c5184cdd
Pull request #16932 : REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全
...
Merge in DESIGN/design from ~LIDONGY/design:release/11.0 to release/11.0
* commit '61e7155d140c0cbc0d3496463187aafa5a84ab43':
REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全
2 weeks ago
lidongy
61e7155d14
Merge branch 'release/11.0' of ssh://code.fineres.com:7999/~lidongy/design into release/11.0
2 weeks ago
lidongy
a3502c3df1
REPORT-148067【模板主题】开启控件显示增强后模板主题打开显示不全
2 weeks ago
Richard.Fang
2062c88747
REPORT-148266 feat:comboBox事件叠加导致部分操作卡顿问题优化
2 weeks ago
Zhanying-占盈
6ff640fa57
Pull request #16818 : feat: JSContentPane支持自定义提示功能 #REPORT-144004
...
Merge in DESIGN/design from ~ZHANYING/design:feature/x to feature/x
* commit '58f07b2980357f8eb1c5b3415aa02630fefa0395':
feat: JSContentPane支持自定义提示功能 #REPORT-144004
2 weeks ago
superman
c36ee9c458
Merge pull request #16843 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '965cf720840404f554f1ed02f3571930f1487195':
KERNEL-20792 报表工程中使用的仓库地址修改
3 weeks ago
superman
965cf72084
Merge pull request #16834 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'bb8890174eb6667cd878f290edad04b205f6e88b':
KERNEL-20792 报表工程中使用的仓库地址修改
3 weeks ago
superman
bb8890174e
Merge pull request #16833 in DESIGN/design from final/11.0 to release/11.0
...
* commit '15c38a0365ef3006f9594274e2e5636e345c341f':
KERNEL-20792 报表工程中使用的仓库地址修改
3 weeks ago
Shengzu.Xue-薛胜祖
15c38a0365
Pull request #16823 : KERNEL-20792 报表工程中使用的仓库地址修改
...
Merge in DESIGN/design from ~SHENGZU.XUE/design:final/11.0 to final/11.0
* commit '78929f818ab5ed1eabe2db191e012fe999851cdb':
KERNEL-20792 报表工程中使用的仓库地址修改
3 weeks ago
shengzu.xue
78929f818a
KERNEL-20792 报表工程中使用的仓库地址修改
3 weeks ago
Zhanying
58f07b2980
feat: JSContentPane支持自定义提示功能 #REPORT-144004
3 weeks ago
superman
694c23b2f7
Merge pull request #16622 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit '90c70d93544c2398d027f2ca90973e4907b2e239':
fix: pr问题处理 #REPORT-147689
fix: 颜色选择面板数组越界 #REPORT-147689
1 month ago
superman
90c70d9354
Merge pull request #16621 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit 'd130ee113d462426531dc0adfbe4e1acb1eebc19':
fix: pr问题处理 #REPORT-147689
fix: 颜色选择面板数组越界 #REPORT-147689
1 month ago
Zhanying-占盈
d130ee113d
Pull request #16599 : fix: 颜色选择面板数组越界 #REPORT-147689
...
Merge in DESIGN/design from ~ZHANYING/design:release/11.0 to release/11.0
* commit '2a8478d4382b3e771e82d306082b2236ec2e180c':
fix: pr问题处理 #REPORT-147689
fix: 颜色选择面板数组越界 #REPORT-147689
1 month ago
Zhanying
2a8478d438
fix: pr问题处理 #REPORT-147689
1 month ago
Zhanying
f1fdae12f1
fix: 颜色选择面板数组越界 #REPORT-147689
1 month ago
superman
7c4a3659c5
Merge pull request #16569 in DESIGN/design from bugfix/11.0 to feature/x
...
* commit 'a0204579318ee80d953ce49e341537456147ee09':
REPORT-147166 linux下,条件属性-超链设置 打开之后,设置超链的窗口无法聚焦
1 month ago
superman
a020457931
Merge pull request #16568 in DESIGN/design from release/11.0 to bugfix/11.0
...
* commit '894ae6943051c38ba03f5b39715d79957112dd2c':
REPORT-147166 linux下,条件属性-超链设置 打开之后,设置超链的窗口无法聚焦
1 month ago
lidongy-李东原
894ae69430
Pull request #16544 : REPORT-147166 linux下,条件属性-超链设置 打开之后,设置超链的窗口无法聚焦
...
Merge in DESIGN/design from ~LIDONGY/design:release/11.0 to release/11.0
* commit 'cfa635fd77f163e8d89db96d8823ef454b8d56f6':
REPORT-147166 linux下,条件属性-超链设置 打开之后,设置超链的窗口无法聚焦
1 month ago
lidongy
cfa635fd77
REPORT-147166 linux下,条件属性-超链设置 打开之后,设置超链的窗口无法聚焦
1 month ago