lidongy
f1e041baac
Pull request #6258 : KERNEL-8509 fix: 部署向导重构导致打包失败。这里适配一下
...
Merge in DESIGN/design from ~LIDONGY/design:feature/x to feature/x
* commit 'bfc1f47a0600e75ba5ce906c5c5097b3da30217d':
KERNEL-8509 fix: 部署向导重构导致打包失败。这里适配一下
3 years ago
lidongy
bfc1f47a06
KERNEL-8509 fix: 部署向导重构导致打包失败。这里适配一下
3 years ago
superman
7e0fd02523
Merge pull request #6253 in DESIGN/design from release/11.0 to feature/x
...
* commit 'dc4558f2c70cae1fc8dc473b21abc31cd9e450ee':
REPORT-60995 导出-导出事件-参数设置-取消勾选继承报表后弹窗关不掉
REPORT-60919 && REPORT-60899 引导页优化解决弹窗类的引导快速点击发生异常的问题
REPORT-60992 导出-导出事件-其他模板-点击模板文件后效果错乱
REPORT-60900 视觉切图提供的有点问题,找视觉更新了切图
REPORT-59545 设计器很多报错提示弹窗的交互有问题
REPORT-60535 表单新自适应单元格设置“用下载链接显示二进制内容”设计器和PC打开颜色不一致
3 years ago
Henry.Wang
cc4d13cb22
Pull request #6250 : feature/10.0 合 feature/x 解决冲突
...
Merge in DESIGN/design from ~HENRY.WANG/design:feature/x to feature/x
* commit 'ff0da69c96c62202644a21d1b9819f92a0a76617':
REPORT-60561 全局自适应-样式细节优化
3 years ago
Henry.Wang
ff0da69c96
feature/10.0 合 feature/x 解决冲突
3 years ago
pengda
dc4558f2c7
Pull request #6242 : REPORT-60995 导出-导出事件-参数设置-取消勾选继承报表后弹窗关不掉
...
Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0
* commit 'c06eab66115cdd334e12d0ac2c21b447b87cb3d3':
REPORT-60995 导出-导出事件-参数设置-取消勾选继承报表后弹窗关不掉
3 years ago
pengda
c06eab6611
Merge remote-tracking branch 'origin/release/11.0' into release/11.0
3 years ago
pengda
41ac183f99
REPORT-60995 导出-导出事件-参数设置-取消勾选继承报表后弹窗关不掉
3 years ago
pengda
c1b7040ec6
Pull request #6225 : REPORT-60504 支持固定行数分页-“分页行数设置”控件控件名不对
...
Merge in DESIGN/design from ~PENGDA/design:feature/x to feature/x
* commit '3df65e3617ac2475e7c3cdc648158178b68d98e7':
REPORT-60504 支持固定行数分页-“分页行数设置”控件控件名不对
3 years ago
pengda
5ca0ea5209
Pull request #6233 : REPORT-60992 导出-导出事件-其他模板-点击模板文件后效果错乱
...
Merge in DESIGN/design from ~PENGDA/design:release/11.0 to release/11.0
* commit '25b2b65066dca667207f2bdd62c0b7464721aee1':
REPORT-60992 导出-导出事件-其他模板-点击模板文件后效果错乱
3 years ago
Tommy
6fc50c5a98
Pull request #6234 : REPORT-60919 && REPORT-60899 引导页优化解决弹窗类的引导快速点击发生异常的问题
...
Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0
* commit '7ba9c573e039552cf98dd60cd582c327cc2876b5':
REPORT-60919 && REPORT-60899 引导页优化解决弹窗类的引导快速点击发生异常的问题
REPORT-60798 在线获取主题右击组件包后异常
REPORT-57813 主题引导是提前下载一页
3 years ago
kuangshuai
7ba9c573e0
Merge commit '4b744ae469a3ea4627e24ce1d489ef329ed771a1' into release/11.0
3 years ago
kuangshuai
a9758df931
Merge commit 'cdf4faaea7ae8e489b36475c805da6262aaabaa3' into release/11.0
3 years ago
kuangshuai
364b073c28
REPORT-60919 && REPORT-60899 引导页优化解决弹窗类的引导快速点击发生异常的问题
3 years ago
pengda
25b2b65066
REPORT-60992 导出-导出事件-其他模板-点击模板文件后效果错乱
3 years ago
superman
6c1c19fc5c
Merge pull request #6229 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'd59ef43683b4f40b18cad86b69b9d67b6976b139':
REPORT-60561 全局自适应-样式细节优化
3 years ago
superman
d59ef43683
Merge pull request #6228 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'ef165426357a163715ad5c6a556dbe2aa75c5a40':
REPORT-60561 全局自适应-样式细节优化
3 years ago
pengda
3df65e3617
Merge remote-tracking branch 'origin/feature/x' into feature/x
3 years ago
pengda
b177160ae1
REPORT-60504 支持固定行数分页-“分页行数设置”控件控件名不对
3 years ago
fanglei
f46959d561
Pull request #6214 : REPORT-59545 设计器很多报错提示弹窗的交互有问题
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '10a55919ae344a8f8ee7dada36d0f0d892785160':
REPORT-60900 视觉切图提供的有点问题,找视觉更新了切图
REPORT-59545 设计器很多报错提示弹窗的交互有问题
3 years ago
Henry.Wang
5411edf1c8
Pull request #6212 : REPORT-60535 表单新自适应单元格设置“用下载链接显示二进制内容”设计器和PC打开颜色不一致
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '49bcb38373c7f551146541b742d6f65e67b5351b':
REPORT-60535 表单新自适应单元格设置“用下载链接显示二进制内容”设计器和PC打开颜色不一致
3 years ago
Henry.Wang
ef16542635
Pull request #6213 : REPORT-60561 全局自适应-样式细节优化
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'fde1a587e2248dab3d19a5275e0b65d9302ae7d1':
REPORT-60561 全局自适应-样式细节优化
3 years ago
superman
6dcaaed71b
Merge pull request #6221 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'd3624d25f7f37d046b67e8026b1a3922f679d805':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
方磊
10a55919ae
REPORT-60900 视觉切图提供的有点问题,找视觉更新了切图
3 years ago
superman
d3624d25f7
Merge pull request #6218 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '93935144d5ebd8d3c26eb2e1e1fec6b61bbd5a84':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
superman
93935144d5
Merge pull request #6217 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'ad47baa25e1197a6745d5b7617e528a16e9f9e39':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
superman
ad47baa25e
Merge pull request #6216 in DESIGN/design from final/10.0 to release/10.0
...
* commit '8b648061e73619a296362de9c61f636471f0dd8a':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
superman
8b648061e7
Merge pull request #6215 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '9aee7403b3b3b2eef445bbec6245190cad8c48d4':
3 years ago
方磊
a64885d6eb
REPORT-59545 设计器很多报错提示弹窗的交互有问题
3 years ago
Henry.Wang
fde1a587e2
REPORT-60561 全局自适应-样式细节优化
3 years ago
superman
52262f0c7d
Merge pull request #6204 in DESIGN/design from release/11.0 to feature/x
...
* commit 'e74e62310a55f6b145df68803a5460d4d3de299e':
REPORT-60717 【主题切换】设置组件内边距后边框线显示有问题
REPORT-60812 【主题切换】主题面板的框框显示有点出入
REPORT-59089 【主题切换】主题比较多有滚动条,右侧主题的勾选图标有点显示不全
无jira任务, feature/x 合 release/11.0 解决冲突
REPORT-58012
REPORT-60561 全局自适应-样式细节优化
REPORT-60561 全局自适应-样式细节优化
3 years ago
fanglei
e74e62310a
Pull request #6199 : REPORT-58012 树数据集修改名称后,查看数据字典,操作多次后,数据字典无法点开了
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '4da64a9955c6bd78dc2bac0404cfb7088e7556cb':
REPORT-58012
3 years ago
Henry.Wang
49bcb38373
Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0
3 years ago
Henry.Wang
a374cf2fdb
REPORT-60535 表单新自适应单元格设置“用下载链接显示二进制内容”设计器和PC打开颜色不一致
3 years ago
starryi
2f26e7ec19
Pull request #6211 : REPORT-59089 & REPORT-60812 & REPORT-60717
...
Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0
* commit 'cfca5143a51e766d3f2e333d38ae462698bb6370':
REPORT-60717 【主题切换】设置组件内边距后边框线显示有问题
REPORT-60812 【主题切换】主题面板的框框显示有点出入
REPORT-59089 【主题切换】主题比较多有滚动条,右侧主题的勾选图标有点显示不全
3 years ago
Starryi
cfca5143a5
REPORT-60717 【主题切换】设置组件内边距后边框线显示有问题
...
【问题原因】
报表块/图表块内边距优化后,标题和body的分界线左右两侧
也出现了边距,分界线需要向外扩展
【改动思路】
同上
3 years ago
Starryi
844e179040
REPORT-60812 【主题切换】主题面板的框框显示有点出入
...
【问题原因】
调整设计器Tab组件边框颜色
【改动思路】
同上
3 years ago
Starryi
181acfb3c0
REPORT-59089 【主题切换】主题比较多有滚动条,右侧主题的勾选图标有点显示不全
...
【问题原因】
调整下宽度和主题列表实现
【改动思路】
同上
3 years ago
starryi
a97448178c
Pull request #6196 : REPORT-59089 【主题切换】主题比较多有滚动条,右侧主题的勾选图标有点显示不全
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit '82c3c094e5eb91f8119bb6f93e50eb670d3c04da':
REPORT-59089 【主题切换】主题比较多有滚动条,右侧主题的勾选图标有点显示不全
3 years ago
superman
9aee7403b3
Merge pull request #6209 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '9508a0985ddb118050e8536dd746bf4a5c8fde15':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
Tommy
2882644745
Pull request #6197 : REPORT-57813 主题引导是提前下载一页
...
Merge in DESIGN/design from ~TOMMY/design:feature/x to feature/x
* commit '4b744ae469a3ea4627e24ce1d489ef329ed771a1':
REPORT-60798 在线获取主题右击组件包后异常
REPORT-57813 主题引导是提前下载一页
3 years ago
Henry.Wang
902bcc0081
Pull request #6206 : 无jira任务, feature/x 合 release/11.0 解决冲突
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit 'fe948e7d4982468e576f13b312bf907e006b9de9':
无jira任务, feature/x 合 release/11.0 解决冲突
3 years ago
Henry.Wang
fe948e7d49
无jira任务, feature/x 合 release/11.0 解决冲突
3 years ago
superman
c062985717
Merge pull request #6198 in DESIGN/design from feature/x to release/11.0
...
* commit 'd2aaaa780392c8f7234ec75d4f4e1acb10e114ba':
REPORT-59476 文本控件校验规则支持国际化
REPORT-56437 & REPORT-58955 国际化问题调整
REPORT-60683 设计器-设计器操作-10设计器刚启动好,打开11制作的模板,模板会长时间处在加载中状态,除非打开其它模板,刚才的11模板才会弹出REPORT-59959中添加的提示文本
REPORT-60528 决策报表,给一个高度较小的tab内拖入报表块,会触发弹窗提示“超出或者小于tablayout边界,不能调整大小”;客户模板的弹窗不断触发导致设计器无法操作使用
3 years ago
Henry.Wang
f918a213bc
Pull request #6205 : 无jira任务, feature/x 合 release/11.0 解决冲突
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '39214973b972665bdabe206ab35b3c65e9f74700': (185 commits)
REPORT-59545 设计器很多报错提示弹窗的交互有问题
REPORT-60392
REPORT-60625【固定布局-原布局推荐4.1】决策报表-自适应布局-右侧显示组件库面板时,选中组件无法按delete键删除,显示设置页面时可以delete删除组件
REPORT-60392 【固定布局-原布局推荐4.1】决策报表-自适应布局-新建空白模板/带布局模板,右侧组件目录树处,body名字变空了
REPORT-60489 主题面板引导长按滑动时候会有异常
REPORT-60477 完成弹窗的按钮有重影,使用UIButton实现
REPORT-60492 && REPORT-60480 解决window上不显示和错位问题
REPORT-60693 开启引导的时候设计器窗口最大化
REPORT-60561 全局自适应-样式细节优化
REPORT-60644 单元格样式设置调整,ui显示有问题
REPORT-60434 【主题获取】在线组件右键,鼠标移动点击详情时,偶现详细消失
REPORT-60485 解决引导页中模板保存点取消也显示完成弹窗
解决冲突
CHART-20675 主题样式图表预览图调整
REPORT-59902 主题切换交互框架优化
REPORT-59089 【主题切换】主题比较多有滚动条,右侧主题的勾选图标有点显示不全
REPORT-60484 解决切换工作目录会多次注册问题
REPORT-60513 功能入口提示增加遮罩
REPORT-60516 10.0release设计器打开cpt很慢
REPORT-60637 国际化
...
3 years ago
superman
d2aaaa7803
Merge pull request #6201 in DESIGN/design from feature/10.0 to feature/x
...
* commit '484d63a259e713e3e8aae12799aaf5454781d51e':
REPORT-59476 文本控件校验规则支持国际化
REPORT-56437 & REPORT-58955 国际化问题调整
REPORT-60683 设计器-设计器操作-10设计器刚启动好,打开11制作的模板,模板会长时间处在加载中状态,除非打开其它模板,刚才的11模板才会弹出REPORT-59959中添加的提示文本
REPORT-60528 决策报表,给一个高度较小的tab内拖入报表块,会触发弹窗提示“超出或者小于tablayout边界,不能调整大小”;客户模板的弹窗不断触发导致设计器无法操作使用
3 years ago
Henry.Wang
39214973b9
无jira任务, feature/x 合 release/11.0 解决冲突
3 years ago
Yuan.Wang
9508a0985d
Pull request #6190 : REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
...
Merge in DESIGN/design from ~YUAN.WANG/design:final/10.0 to final/10.0
* commit '4a5ff5cd8ee1bfa707448c7f43285fa358aa83a9':
REPORT-59476 && REPORT-59475 文本控件校验规则支持国际化 && 控件校验错误提示支持公式
3 years ago
Henry.Wang
532669385b
Pull request #6188 : REPORT-60561 全局自适应-样式细节优化
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '624e293f2a413aa3cac496225c7a93982f8e9b7c':
REPORT-60561 全局自适应-样式细节优化
REPORT-60561 全局自适应-样式细节优化
3 years ago
方磊
4da64a9955
REPORT-58012
3 years ago