Hades
bc894b6c66
Pull request #5373 : REPORT-57057 远程设计报错规范-启动远程状态下的设计器时,报错弹窗被 切换工作目录的弹窗覆盖
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '1d76a4bbcd64046b86afc76e2b07c445c5a8aad9':
REPORT-57057 远程设计报错规范-启动远程状态下的设计器时,报错弹窗被 切换工作目录的弹窗覆盖
3 years ago
Xiqiu
59392f30ff
Pull request #5372 : REPORT-53615 驱动管理的设计器适配
...
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '0fd8b045d62155b8dca8071cda1564d98c3dea5c':
REPORT-53615 调整代码格式
REPORT-53615 驱动管理的设计器适配
3 years ago
hades
1d76a4bbcd
REPORT-57057 远程设计报错规范-启动远程状态下的设计器时,报错弹窗被 切换工作目录的弹窗覆盖
3 years ago
Hades
132e11bdc6
Pull request #5368 : KERNEL-7634 jxbrowser 小版本再升级下
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'c95c24b7b6ce626b2d8b22ce54f523c9376c7c61':
KERNEL-7634 jxbrowser 小版本再升级下
3 years ago
xiqiu
0fd8b045d6
REPORT-53615 调整代码格式
3 years ago
Henry.Wang
1415f85b9f
撤销
3 years ago
Henry.Wang
e7400764b2
REPORT-57147 设计器模版默认预览方式不生效
3 years ago
Henry.Wang
6e05acab59
Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0
3 years ago
rinoux
d749e1e2c1
Pull request #5367 : REPORT-57209 共享数据集显示配置兼容
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit '2562ca8a15efe3f77b77784c75df8d373deb29f4':
REPORT-57209 共享数据集显示配置兼容
3 years ago
xiqiu
3ec75314cd
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
3 years ago
xiqiu
b95ee92287
REPORT-53615 驱动管理的设计器适配
3 years ago
Heyman
1ebd4f5ea1
MOBILE-32704 11.0部分插件内置
3 years ago
superman
fdb9cacf4e
Merge pull request #5369 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '905368a92dfb0cfbc6ad2c70496165e4f65f7261':
3 years ago
hades
c95c24b7b6
KERNEL-7634 jxbrowser 小版本再升级下
3 years ago
Yuan.Wang
91a1af3a1b
Pull request #5364 : REPORT-56134js提交事件报错中添加定位信息
...
Merge in DESIGN/design from ~YUAN.WANG/design:feature/10.0 to feature/10.0
* commit '2146d43f0364f5e9d2c2ab2d787441a8b911b835':
REPORT-56134js提交事件报错中添加定位信息
3 years ago
rinoux
2562ca8a15
REPORT-57209 共享数据集显示配置兼容
3 years ago
Henry.Wang
10014848a9
Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0
3 years ago
kerry
dc51b3ca69
Pull request #5362 : REPORT-56128【开发者预览支持调整模板布局】新自适应-设计画布里拖拽调整组件A大小,挤压绝对画布块,绝对画布块内组件会保持尺寸不变且超出绝对画布块;但开发者调试下,此场景,绝对画布块内组件尺寸适应区域调整。这里要不要统一一下效果啊@kerry
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/11.0 to release/11.0
* commit '74a947c089df0f3e0f530235e866ee3e3d23e33a':
REPORT-56128【开发者预览支持调整模板布局】新自适应-设计画布里拖拽调整组件A大小,挤压绝对画布块,绝对画布块内组件会保持尺寸不变且超出绝对画布块;但开发者调试下,此场景,绝对画布块内组件尺寸适应区域调整。这里要不要统一一下效果啊@kerry
3 years ago
fanglei
8f58c13c3b
Pull request #5366 : REPORT-56929 【FRM布局推荐】组件复用-手动间距输入框目前不支持回车触发生效
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '9b8f88406762c4eb9b677cf50cd9e427d1b84707':
REPORT-56929 【FRM布局推荐】组件复用-手动间距输入框目前不支持回车触发生效
3 years ago
Bjorn
3e8b7016a3
Pull request #5365 : CHART-20229 图表控件修改
...
Merge in DESIGN/design from ~BJORN/design:feature/10.0 to feature/10.0
* commit '39a0b0db0af3db516eb04bcf33823c13e1b9bca3':
CHART-20229 图表控件修改
3 years ago
方磊
9b8f884067
REPORT-56929 【FRM布局推荐】组件复用-手动间距输入框目前不支持回车触发生效
3 years ago
白岳
39a0b0db0a
CHART-20229 图表控件修改
3 years ago
fanglei
cea7b647cd
Pull request #5359 : REPORT-56906 自定义一个输入框,只支持输入整数
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '6ed7588b7b04ed56f94c666ead775713e6db34e3':
REPORT-56906 由于UIIntNumberField被引用的地方太多了,所以还原这个类的重命名
REPORT-56906&REPORT-56926 修正一个笔误
REPORT-56906&REPORT-56926 自定义一个输入框,只支持输入整数
3 years ago
方磊
6ed7588b7b
REPORT-56906 由于UIIntNumberField被引用的地方太多了,所以还原这个类的重命名
3 years ago
rinoux
45864acaa4
Pull request #5363 : REPORT-51472 平台开启的模版读不到状态的问题
...
Merge in DESIGN/design from ~RINOUX/design:release/11.0 to release/11.0
* commit '6fa53eda15eb07c0f150f60c6f2bd6428c24defb':
REPORT-51472 平台开启的模版读不到状态的问题
3 years ago
Yuan.Wang
2146d43f03
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
3 years ago
Yuan.Wang
48ddaa7af5
REPORT-56134js提交事件报错中添加定位信息
3 years ago
rinoux
6fa53eda15
REPORT-51472 平台开启的模版读不到状态的问题
3 years ago
Henry.Wang
db9751cd0a
Pull request #5360 : REPORT-56595 数据集预览时可复制-表头复制问题 && REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit 'bee3075e5f291f3436ad1d4e74ade0648b0dfa42':
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
REPORT-56595 数据集预览时可复制-表头复制问题
3 years ago
kerry
74a947c089
REPORT-56128【开发者预览支持调整模板布局】新自适应-设计画布里拖拽调整组件A大小,挤压绝对画布块,绝对画布块内组件会保持尺寸不变且超出绝对画布块;但开发者调试下,此场景,绝对画布块内组件尺寸适应区域调整。这里要不要统一一下效果啊@kerry
3 years ago
superman
905368a92d
Merge pull request #5361 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'f806d05ed37ed5b2ec770f82b17e9ebdd3a2af0b':
3 years ago
Henry.Wang
bee3075e5f
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
3 years ago
Henry.Wang
e88de2094c
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
3 years ago
Henry.Wang
6d81b5e4cd
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
3 years ago
Henry.Wang
05a3713694
REPORT-56595 数据集预览时可复制-表头复制问题
3 years ago
方磊
7a85d9cd65
REPORT-56906&REPORT-56926 修正一个笔误
3 years ago
方磊
31cf103296
REPORT-56906&REPORT-56926 自定义一个输入框,只支持输入整数
3 years ago
superman
01dad2d5ad
Merge pull request #5358 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '1ea984b6782f0537665a440ed076f4758274497b':
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全 && REPORT-55415 富文本框,鼠标选择不同的字体,会导致所选字体都变成一样的
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
superman
1e37eeafe5
Merge pull request #5357 in DESIGN/design from release/11.0 to feature/x
...
* commit '268378ee9b4443763224e69817d830981a79915b':
REPORT-56080 图表双击无法进入图表编辑页
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
3 years ago
superman
268378ee9b
Merge pull request #5356 in DESIGN/design from release/10.0 to release/11.0
...
* commit '2c90b13ecd4ef57c7cce2fbc58448464a3e564e6':
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
superman
1ea984b678
Merge pull request #5353 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'ebb501cd16df3ad26ff3f4f7b3646f4b77544143':
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
superman
f806d05ed3
Merge pull request #5354 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'd416b56c93bac26b5b2f5b1f915fd384a2788839':
3 years ago
superman
ebb501cd16
Merge pull request #5352 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '2c90b13ecd4ef57c7cce2fbc58448464a3e564e6':
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
Henry.Wang
f23b7a1221
Pull request #5349 : REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全 && REPORT-55415 富文本框,鼠标选择不同的字体,会导致所选字体都变成一样的
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '9cca8d76715af0da7c6e62f7d1df39573339b279':
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全 && REPORT-55415 富文本框,鼠标选择不同的字体,会导致所选字体都变成一样的
3 years ago
pengda
2c90b13ecd
Pull request #5331 : REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '80f29ea909e552c53e9d0a963f9de3f33d2001c5':
REPORT-55637 远程设计的 记住密码 功能,取消勾选无效
3 years ago
Tommy
6258f8ad19
Pull request #5348 : REPORT-56080 图表双击无法进入图表编辑页
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit '9d81243a4285b7158f86b8177a0de9494e4c1b2d':
REPORT-56080 图表双击无法进入图表编辑页
3 years ago
Henry.Wang
9cca8d7671
REPORT-55696 国际化-远程版本不一致的提示弹窗在非中文下显示不全 && REPORT-55415 富文本框,鼠标选择不同的字体,会导致所选字体都变成一样的
3 years ago
kuangshuai
9d81243a42
REPORT-56080 图表双击无法进入图表编辑页
3 years ago
ju|剧浩宇
1741f249ac
Pull request #5330 : REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '2836fd2074b04c1f7190207b7d1a940d978769a3':
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
REPORT-56679 新自适应2月份合入主 jar后在插件中修复的 bug 同步到 FR11
3 years ago
superman
1ccee2cfec
Merge pull request #5347 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'e0b5574335e9cf8b3462f387b41177e01909e65e':
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分 fix
REPORT-55795 【10.0.19】报错规范——设计器远程设计连接部分
3 years ago