shine
3819a1492c
Merge branch 'feature/big-screen' of ssh://code.fineres.com:7999/~zheng/C-design into feature/big-screen
3 years ago
shine
2e4770f954
CHART-20319 fix:大屏模板图表没有超链等界面引起npe
3 years ago
Bjorn
240eb014fe
Pull request #5451 : CHART-20117 图表主题样式
...
Merge in DESIGN/design from ~BJORN/design:feature/x to feature/x
* commit '7e6eedfd8b300a53263f5f9cf0f8b4343885aab1':
CHART-20117 图表主题样式
3 years ago
superman
ccd5d8d9f1
Merge pull request #5458 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '9785a8fe42a62d829d10ddd4bd7c3a9b21ff5cee':
3 years ago
superman
9785a8fe42
Merge pull request #5457 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'd7836c4cb35ebf7ab05cb0ce889ccedef670b495':
REPORT-57610 单元格没画出来
3 years ago
superman
8dd65bfce5
Merge pull request #5454 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '1deec6d3a147be5251694091ddad4cba23eb44dd':
REPORT-51276 组件批量下载前需要登录
REPORT-55717 解决组件快捷配置编辑按钮会打开多个弹窗问题
REPORT-57610 单元格没画出来
3 years ago
xiqiu
8c01a5ed49
REPORT-57643 改个布局
3 years ago
kerry
d76702ffbe
REPORT-56602 页面设置的纸张大小与实际分页精度不符
3 years ago
ju|剧浩宇
6fd1d73e28
Pull request #5452 : 无jira 解决冲突
...
Merge in DESIGN/design from ~HADES/design:feature/x to feature/x
* commit 'beaaf903f9b44e207e98faa8fd39778f66ee9d69': (87 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
hades
beaaf903f9
无jira 解决冲突
3 years ago
白岳
7e6eedfd8b
CHART-20117 图表主题样式
3 years ago
Tommy
1deec6d3a1
Pull request #5422 : REPORT-55717 解决组件快捷配置编辑按钮会打开多个弹窗问题
...
Merge in DESIGN/design from ~TOMMY/design:feature/10.0 to feature/10.0
* commit 'e0fe5ba36eb59bb753b4d6b4cb1f87f7a5dea42b':
REPORT-51276 组件批量下载前需要登录
REPORT-55717 解决组件快捷配置编辑按钮会打开多个弹窗问题
3 years ago
xiqiu
e713690a68
Merge remote-tracking branch 'origin/feature/10.0' into feature/10.0
3 years ago
xiqiu
9c52e84c6c
REPORT-57643 调整combobox的大小
3 years ago
hades
fb0c6563df
REPORT-55048 https远程连接时,设计器上无法获取服务器推送过来的eventhread线程日志
3 years ago
zheng
d7836c4cb3
Pull request #5446 : REPORT-57610 feature to releasse 单元格没画出来
...
Merge in DESIGN/design from feature/10.0 to release/10.0
* commit 'bb2a12d17e3ac54c40b3d28240256fa9e369e828':
REPORT-57610 单元格没画出来
3 years ago
ju|剧浩宇
408a1d5511
Pull request #5445 : 无jira任务, release/10.0 合 release/11.0
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '057829123e35148842f5a9f57a37c2899030c159': (87 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
Henry.Wang
057829123e
无jira任务, release/10.0 合 release/11.0
3 years ago
zheng
bb2a12d17e
Pull request #5420 : REPORT-57610 有些单元格没画出来
...
Merge in DESIGN/design from ~ZHENG/c-design:feature/big-screen to feature/10.0
* commit '6b6a790aee629e2b98b2a019cdc3e3ae65007978':
REPORT-57610 单元格没画出来
3 years ago
superman
553f738235
Merge pull request #5442 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'f45280f667e0c826498931361cf6cce2ad46d920':
3 years ago
superman
f45280f667
Merge pull request #5441 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '61cff0de459a630760c4a256251df93837466309':
3 years ago
superman
61cff0de45
Merge pull request #5438 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '76ad65482f37e18e880cd606f5c01066c55e05eb': (98 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
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
227e554a84
Merge pull request #5428 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'fc64a08f0bedc7902969e579bbd30a2f68471242':
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 组件复用-组件目录树选中控件,如果选中后不移动鼠标的话,控件没有出现工具栏
3 years ago
superman
3d301a748a
Merge pull request #5427 in DESIGN/design from release/11.0 to feature/x
...
* commit '21f09ae20566b592859b46733a014d1eca6d5216':
MOBILE-32704 11.0部分插件内置
REPORT-55468 内置启动时打开空文件
REPORT-57251 修复设计器无法打开环境之外cptx的问题
MOBILE-32704 11.0部分插件内置
MOBILE-32704 11.0部分插件内置
MOBILE-32704 11.0部分插件内置
3 years ago
superman
21f09ae205
Merge pull request #5426 in DESIGN/design from release/10.0 to release/11.0
...
* commit '26e99f81f7543570c4668061162d8d727fe024c1':
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
kerry
8168279f5c
Pull request #5416 : REPORT-56548 视觉修改
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '1a6d9db38d4f29f7bfbc8818bf49b451d28c7d73':
REPORT-56548 视觉修改
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
kerry
1a6d9db38d
REPORT-56548 视觉修改
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
Heyman.Wang
b39ef3da56
Pull request #5370 : MOBILE-32704 11.0部分插件内置
...
Merge in DESIGN/design from ~HEYMAN.WANG/design:release/11.0 to release/11.0
* commit 'd5cd33159687806dbab2c975eda7daf2d6b59f4b':
MOBILE-32704 11.0部分插件内置
MOBILE-32704 11.0部分插件内置
MOBILE-32704 11.0部分插件内置
MOBILE-32704 11.0部分插件内置
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