superman
76ad65482f
Merge pull request #5437 in DESIGN/design from feature/10.0 to bugfix/10.0
...
* commit 'fc64a08f0bedc7902969e579bbd30a2f68471242': (96 commits)
REPORT-57128&REPORT-57657 优化代码冗余逻辑
REPORT-57128&REPORT-57657 修复参数面板中会显示间距线的问题&修复报表块图表块不显示间距线的问题
REPORT-57128 【FRM布局推荐】组件复用-关于悬浮hover组件的交互设计更新
REPORT-57520 报表块内图表超链不应该显示悬浮窗图表
REPORT-57658 处理odbc链接的共存关系
REPORT-57438 【回归测试】权限细粒度控制-参数面板控件,控件权限编辑栏无法正常显示
REPORT-53615 调整下combox的展示顺序
REPORT-57317 修改间距提示文字的大小
REPORT-57333 还原代码
REPORT-57181 【FRM布局推荐】组件复用-自动间距目前么有把小数处理成整数
REPORT-57333 【FRM布局推荐】组件复用-现在还不能实现绝对画布块上重叠放置组件
REPORT-56895 还是计算间距线相对位置的问题
REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题
REPORT-56049 组件复用-组件目录树选中控件,如果选中后不移动鼠标的话,控件没有出现工具栏
REPORT-57238 解决自动间距计算不正确的问题
REPORT-57326&EPORT-57324&REPORT-57330&REPORT-56895 布局推荐若干间距线的bug
REPORT-56925 【FRM布局推荐】组件复用-手动间距输入框没有显示水印
REPORT-55756 设计器界面移动时,工具栏保持停留原位置,没有随着移动,这个看下要不要优化下。鼠标再回到设计画布就好了
REPORT-56532 文件选择器弹窗 && REPORT-56683 文件选择器弹窗-图片压缩功能入口迁移的初次提示问题
REPORT-56926 【FRM布局推荐】组件复用-手动间距目前不支持输入小数(允许输入小数,但自动取整处理)
...
3 years ago
kuangshuai
e0fe5ba36e
REPORT-51276 组件批量下载前需要登录
3 years ago
superman
fc64a08f0b
Merge pull request #5421 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '48c1dc1f51f55a6df7e87fa49eade21362b22171':
3 years ago
Xiqiu
d7f3547e79
Pull request #5413 : REPORT-57658 处理odbc链接的共存关系
...
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '2d6f8e8878951b7e35098c98dec8ff838dd4c286':
REPORT-57658 处理odbc链接的共存关系
3 years ago
fanglei
338508ce32
Pull request #5423 : REPORT-57128&REPORT-57657 修复参数面板中会显示间距线的问题&修复报表块图表块不显示间距线的问题
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '5028683f568c66667eed0da8cfa3eb7bc7d0691f':
REPORT-57128&REPORT-57657 优化代码冗余逻辑
REPORT-57128&REPORT-57657 修复参数面板中会显示间距线的问题&修复报表块图表块不显示间距线的问题
3 years ago
方磊
5028683f56
REPORT-57128&REPORT-57657 优化代码冗余逻辑
3 years ago
方磊
60d47de8e8
REPORT-57128&REPORT-57657 修复参数面板中会显示间距线的问题&修复报表块图表块不显示间距线的问题
3 years ago
kuangshuai
05cf328810
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
3 years ago
kuangshuai
a42eedbd9f
REPORT-55717 解决组件快捷配置编辑按钮会打开多个弹窗问题
3 years ago
Tommy
e7cd03cfa4
Pull request #5414 : REPORT-57520 报表块内图表超链不应该显示悬浮窗图表
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit 'd357671ce55a7b260e29a0dc4c86a66d4ad57467':
REPORT-57520 报表块内图表超链不应该显示悬浮窗图表
3 years ago
superman
48c1dc1f51
Merge pull request #5419 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '26e99f81f7543570c4668061162d8d727fe024c1':
3 years ago
superman
26e99f81f7
Merge pull request #5418 in DESIGN/design from final/10.0 to release/10.0
...
* commit '6c39fa0e787f50006796afa65589e9db07851b3c':
3 years ago
superman
6c39fa0e78
Merge pull request #5417 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '4971b9e5cfcb65fddcac456b4d02a8d52ddc1b08':
3 years ago
shine
6b6a790aee
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
3 years ago
shine
82510e5848
REPORT-57610 单元格没画出来
3 years ago
fanglei
bca27bfa2a
Pull request #5415 : REPORT-57128 【FRM布局推荐】组件复用-关于悬浮hover组件的交互设计更新
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '03c1ccc659d63a613c3beb7785632a60bb321798':
REPORT-57128 【FRM布局推荐】组件复用-关于悬浮hover组件的交互设计更新
3 years ago
方磊
03c1ccc659
REPORT-57128 【FRM布局推荐】组件复用-关于悬浮hover组件的交互设计更新
3 years ago
kuangshuai
d357671ce5
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~tommy/design into feature/10.0
3 years ago
kuangshuai
21f5292f2d
REPORT-57520 报表块内图表超链不应该显示悬浮窗图表
3 years ago
xiqiu
2d6f8e8878
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
3 years ago
xiqiu
35f319633d
REPORT-57658 处理odbc链接的共存关系
3 years ago
Xiqiu
8294e19672
Pull request #5411 : REPORT-53615 调整下combox的展示顺序
...
Merge in DESIGN/design from ~XIQIU/design:feature/10.0 to feature/10.0
* commit '27b2c177b002bbe9d60b69f4abbaf4002ed8e7a2':
REPORT-53615 调整下combox的展示顺序
3 years ago
Henry.Wang
e71ae09f3d
Pull request #5412 : REPORT-57438 【回归测试】权限细粒度控制-参数面板控件,控件权限编辑栏无法正常显示
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/10.0 to feature/10.0
* commit '7c72424b8bbf3c07e6827811a8ac3c0b3ea677f1':
REPORT-57438 【回归测试】权限细粒度控制-参数面板控件,控件权限编辑栏无法正常显示
3 years ago
Henry.Wang
7c72424b8b
Merge branch 'feature/10.0' of https://code.fineres.com/scm/~henry.wang/design into feature/10.0
3 years ago
Henry.Wang
7f4e2c13cc
REPORT-57438 【回归测试】权限细粒度控制-参数面板控件,控件权限编辑栏无法正常显示
3 years ago
xiqiu
27b2c177b0
REPORT-53615 调整下combox的展示顺序
3 years ago
fanglei
1b0436191e
Pull request #5410 : REPORT-57317 修改间距提示文字的大小
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '5b524fefbd317b63c60890434898ef71d97c8e9e':
REPORT-57317 修改间距提示文字的大小
3 years ago
方磊
5b524fefbd
REPORT-57317 修改间距提示文字的大小
3 years ago
fanglei
48a1f1487e
Pull request #5409 : REPORT-57333 还原代码
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '2589d26e3cacefad175150200e615c15823315e8':
REPORT-57333 还原代码
3 years ago
方磊
2589d26e3c
REPORT-57333 还原代码
3 years ago
Hades
5d9bca3161
Pull request #5392 : REPORT-56049 组件复用-组件目录树选中控件,如果选中后不移动鼠标的话,控件没有出现工具栏
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '52d9dfdf35449753a4e3f2f83a69408545264007':
REPORT-56049 组件复用-组件目录树选中控件,如果选中后不移动鼠标的话,控件没有出现工具栏
3 years ago
superman
4971b9e5cf
Merge pull request #5408 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '81574ad360d11ba9f0c84712a9fa9e3ec3cf2615':
3 years ago
fanglei
82afebccf9
Pull request #5407 : REPORT-57181 【FRM布局推荐】组件复用-自动间距目前么有把小数处理成整数
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '2018937ad70336f88d8efda4b55afc1570e325c2':
REPORT-57181 【FRM布局推荐】组件复用-自动间距目前么有把小数处理成整数
3 years ago
方磊
2018937ad7
REPORT-57181 【FRM布局推荐】组件复用-自动间距目前么有把小数处理成整数
3 years ago
fanglei
008392d2a0
Pull request #5405 : REPORT-57333 【FRM布局推荐】组件复用-现在还不能实现绝对画布块上重叠放置组件
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit 'e77b612aa7af2156c0cae01dd0836deb20ae13a5':
REPORT-57333 【FRM布局推荐】组件复用-现在还不能实现绝对画布块上重叠放置组件
3 years ago
方磊
e77b612aa7
REPORT-57333 【FRM布局推荐】组件复用-现在还不能实现绝对画布块上重叠放置组件
3 years ago
fanglei
946db2fdd3
Pull request #5402 : REPORT-56895 还是计算间距线相对位置的问题
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '69bfee3359ca16974c8c82b9a2b68cd881ad4abe':
REPORT-56895 还是计算间距线相对位置的问题
3 years ago
方磊
69bfee3359
REPORT-56895 还是计算间距线相对位置的问题
3 years ago
fanglei
cd2e849824
Pull request #5393 : REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit '768b74b87b32dfeff62658b2f5307c76a7f537b0':
REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题
3 years ago
superman
0ae9827a9a
Merge pull request #5401 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'fba20ae59545fb5d8e14bb9eb7961eed052f0809':
REPORT-57238 解决自动间距计算不正确的问题
REPORT-55756 设计器界面移动时,工具栏保持停留原位置,没有随着移动,这个看下要不要优化下。鼠标再回到设计画布就好了
3 years ago
方磊
768b74b87b
REPORT-56926&REPORT-57238 解决因为修复这两个问题引起的新问题
3 years ago
fanglei
fba20ae595
Pull request #5391 : REPORT-57238 解决自动间距计算不正确的问题
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/10.0 to feature/10.0
* commit 'ff116685b16d6d906840c777c04a7b5d250934ba':
REPORT-57238 解决自动间距计算不正确的问题
3 years ago
hades
52d9dfdf35
REPORT-56049 组件复用-组件目录树选中控件,如果选中后不移动鼠标的话,控件没有出现工具栏
3 years ago
方磊
ff116685b1
Merge branch 'feature/10.0' of ssh://code.fineres.com:7999/~fanglei/design10.0 into feature/10.0
...
* 'feature/10.0' of ssh://code.fineres.com:7999/~fanglei/design10.0:
REPORT-55756 设计器界面移动时,工具栏保持停留原位置,没有随着移动,这个看下要不要优化下。鼠标再回到设计画布就好了
REPORT-56532 文件选择器弹窗 && REPORT-56683 文件选择器弹窗-图片压缩功能入口迁移的初次提示问题
3 years ago
方磊
842f4c621e
REPORT-57238 解决自动间距计算不正确的问题
3 years ago
Hades
829fa083f5
Pull request #5379 : REPORT-55756 设计器界面移动时,工具栏保持停留原位置,没有随着移动,这个看下要不要优化下。鼠标再回到设计画布就好了
...
Merge in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit '42f24c5bcf1f09c2421cad431eac7d087bb396b6':
REPORT-55756 设计器界面移动时,工具栏保持停留原位置,没有随着移动,这个看下要不要优化下。鼠标再回到设计画布就好了
3 years ago
superman
913c8e5bed
Merge pull request #5390 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '7dc14fe8c559d2b9bbf4b28ae5f356db09bcc83d':
REPORT-57326&EPORT-57324&REPORT-57330&REPORT-56895 布局推荐若干间距线的bug
REPORT-56925 【FRM布局推荐】组件复用-手动间距输入框没有显示水印
REPORT-56532 文件选择器弹窗 && REPORT-56683 文件选择器弹窗-图片压缩功能入口迁移的初次提示问题
REPORT-56926 【FRM布局推荐】组件复用-手动间距目前不支持输入小数(允许输入小数,但自动取整处理)
REPORT-57233 修正本地调试的修改
REPORT-57233 【FRM布局推荐】组件复用-对齐、自动间距、手动间距,调整后没有触发模板的保存和还原按钮,导致关闭再打开此模板还是调整前的效果
REPORT-57057 远程设计报错规范-启动远程状态下的设计器时,报错弹窗被 切换工作目录的弹窗覆盖
REPORT-53615 调整代码格式
REPORT-53615 驱动管理的设计器适配
KERNEL-7634 jxbrowser 小版本再升级下
REPORT-56929 【FRM布局推荐】组件复用-手动间距输入框目前不支持回车触发生效
CHART-20229 图表控件修改
REPORT-56906 由于UIIntNumberField被引用的地方太多了,所以还原这个类的重命名
REPORT-56134js提交事件报错中添加定位信息
REPORT-55481 模板Web属性的顶部和底部工具栏在权限编辑时,顶部工具栏被底部工具栏覆盖
REPORT-56595 数据集预览时可复制-表头复制问题
REPORT-56906&REPORT-56926 修正一个笔误
REPORT-56906&REPORT-56926 自定义一个输入框,只支持输入整数
3 years ago
superman
7dc14fe8c5
Merge pull request #5386 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '03ae05f97df139aba03a3bd14bd0f68510ef0c2a':
3 years ago
superman
03ae05f97d
Merge pull request #5385 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8ae02ad6f95dfe5ffa6b687ba461e79d843b39fb':
3 years ago
superman
8ae02ad6f9
Merge pull request #5384 in DESIGN/design from final/10.0 to release/10.0
...
* commit '81574ad360d11ba9f0c84712a9fa9e3ec3cf2615':
3 years ago