superman
ed0aa27a7a
Merge pull request #6496 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'eafddf1151974a17dd02643102eb742fdedde701':
REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
REPORT-60887 MAC OS x电脑上 编辑按钮飘移
3 years ago
shine
6479efca90
CHART-21418 fix:第二次修改 区分弹框在上面还是下面 如果在上面 则是从displayComponent下面离开 隐藏弹框
3 years ago
方磊
ab86d37db0
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
3 years ago
pengda
eafddf1151
Pull request #6489 : REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '9df5abe79cdb5a4b4334afbe0aae157db6139750':
REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
3 years ago
pengda
9df5abe79c
REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
3 years ago
Hades
0dd2227354
Pull request #6475 : REPORT-60887 MAC OS x电脑上 编辑按钮飘移
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '6026f0d575fd41c4ce7f68da6ee22e5f63bf8e82':
REPORT-60887 MAC OS x电脑上 编辑按钮飘移
3 years ago
superman
5896880e0f
Merge pull request #6480 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'f21f519c868df944c364cc401ae97cfca09fd236':
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-59814 代码优化
REPORT-59814 组件埋点 groupingDetail 返回概率是空数据
3 years ago
hades
6026f0d575
REPORT-60887 MAC OS x电脑上 编辑按钮飘移
3 years ago
Henry.Wang
f21f519c86
Pull request #6471 : REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '6c33a708599a073dd546368d395afa42799ff2fd':
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
3 years ago
Henry.Wang
6c33a70859
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
3 years ago
superman
6bcac9b9b2
Merge pull request #6473 in DESIGN/design from feature/10.0 to release/10.0
...
* commit '712b9d42cb782ee3ff3cc531f7ca9f5f6c3afdbb':
REPORT-59814 代码优化
REPORT-59814 组件埋点 groupingDetail 返回概率是空数据
3 years ago
Henry.Wang
62ef8a99b1
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
3 years ago
Hades
714df66ea4
Pull request #6460 : REPORT-59614 远程设计下无推送日志
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '3dc7263f558ce06d7dcc5bf38419cb9ba0dbe883':
REPORT-59614 远程设计下无推送日志
3 years ago
hades
3dc7263f55
REPORT-59614 远程设计下无推送日志
3 years ago
superman
712b9d42cb
Merge pull request #6451 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'f63202f399fe3f4261515a931e357c797c6191db':
3 years ago
superman
f63202f399
Merge pull request #6450 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'fd217291bd69626e77f10144a3c4923cb536c84b':
3 years ago
superman
fd217291bd
Merge pull request #6449 in DESIGN/design from final/10.0 to release/10.0
...
* commit '92dafeedd8489255ad57d6edfafc2672ee0f344d':
3 years ago
superman
92dafeedd8
Merge pull request #6448 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '2709de7e62367f74c253e4c4d7cb1011d1df84b3':
3 years ago
superman
2709de7e62
Merge pull request #6442 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'bd1af0df2b8f09988494f14c8be75330bf01c02a':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago
superman
7424b0b225
Merge pull request #6431 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'a6ff2be536d4db7046551971df21082100c998b9':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
update
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
3 years ago
superman
a6ff2be536
Merge pull request #6430 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '398ae7f2d745dfc9ddf361baeca90e0601697772':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
update
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
3 years ago
superman
398ae7f2d7
Merge pull request #6429 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'bd1af0df2b8f09988494f14c8be75330bf01c02a':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
3 years ago
zheng
87555fd274
Pull request #6414 : CHART-21418 fix bugs
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'c08b5b0213a60fbe15683f4516c56e0217f8bc92':
update
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
3 years ago
Henry.Wang
bd1af0df2b
Pull request #6422 : REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/10.0 to final/10.0
* commit '4cfc8cf48b1ba3fb26efffdd29ff46181bcafbdd':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
3 years ago
Henry.Wang
4cfc8cf48b
Merge branch 'final/10.0' of https://code.fineres.com/scm/~henry.wang/design into final/10.0
3 years ago
Henry.Wang
930d95a452
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
3 years ago
superman
8942367775
Merge pull request #6418 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'df9cefb9e999cbecf104759d3aec8ce02f236d92':
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago
superman
df9cefb9e9
Merge pull request #6417 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'dbaa5e47dc656ae5278a1c06d83f95bed51dc71a':
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago
superman
dbaa5e47dc
Merge pull request #6416 in DESIGN/design from final/10.0 to release/10.0
...
* commit '413c8bd9f2965911fdcfcc1521a4592a52bd2580':
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago
superman
413c8bd9f2
Merge pull request #6415 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'bba30ed45ff1742f3e4516bce4f0c55ed4d13e63':
3 years ago
shine
c08b5b0213
update
3 years ago
shine
bc52116a16
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
Henry.Wang
39bd08f1a1
Pull request #6408 : REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/10.0 to final/10.0
* commit 'fd87cb7b7e2f824067713f3f3205bc62ea33e7d3':
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago
superman
bba30ed45f
Merge pull request #6409 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'c73dd20885961a8fbfbd36378ace96fdb38d41af': (26 commits)
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
REPORT-60356 设计器11.0适配-10.0打不开11.0提示弹窗和其他弹窗(提示自定义样式已丢失)同时打开了,没有设置弹窗优先级
REPORT-55377 升级 tomcat 版本修复公开漏洞
for duchamp mode
CHART-21376 fix:大屏模板组合图新增类型 默认样式
CHART-21357 fix:新增坐标轴样式
CHART-21391 fix:大屏模板 组合图切换到自定义组合图 类型面板没有出来
REPORT-61356 fix 统一api使用入口
REPORT-60253 安装大数据集导出插件后,模板从本地切换到远程,再切换到本地,触发保存模板会弹窗 保存失败,有npe报错
REPORT-61356 设计器启动加载完成后,停留的空白时间变长
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
REPORT-60661 国际化url适配
BI-95654 拷贝数据连接时复制了identity
CHART-21219 特殊形状柱形图触发保存
REPORT-60752 【10.0】tab组件,移动端属性设置样式模板,从默认切换到自定义后不保存关闭窗口,再次进入后,选项会显示自定义,应该还是默认才对
REPORT-60561 全局自适应-样式细节优化
REPORT-58193设计器埋点剥离二期-组件复用埋点-marketClick触发条件有问题
REPORT-59476 文本控件校验规则支持国际化
...
3 years ago
Henry.Wang
fd87cb7b7e
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago
Henry.Wang
5053378106
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago
superman
327a3012b3
Merge pull request #6401 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '1cff54ce9c51058ccf181a659f223c38c652e616':
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
3 years ago
superman
1cff54ce9c
Merge pull request #6400 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '8226b0d95a7140f7a4226ebe848027830172e44b':
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
3 years ago
superman
8226b0d95a
Merge pull request #6399 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'c73dd20885961a8fbfbd36378ace96fdb38d41af':
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
3 years ago
shine
0210104f7c
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
3 years ago
Hades
c73dd20885
Pull request #6395 : REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '56df61ca0a6abf5bfe38522b7bbfbe9355008b0a':
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
3 years ago
hades
56df61ca0a
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
3 years ago
superman
3d9fd412f0
Merge pull request #6388 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '405bf679140aead1ed53f17d250000ec628d8b33':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
superman
405bf67914
Merge pull request #6387 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '43cd077fb0b4ce17fa7f1126163d4001f5ec09e6':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
superman
43cd077fb0
Merge pull request #6386 in DESIGN/design from final/10.0 to release/10.0
...
* commit '7cdd87460a05baa97cec111a8f604e62a009577f':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
Henry.Wang
7cdd87460a
Pull request #6384 : REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/10.0 to final/10.0
* commit '0dfea644723e97c69c6f9e35daedba21f757dece':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
Henry.Wang
0dfea64472
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
3 years ago
shine
0a6bbd3517
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
3 years ago
superman
5f490a52a3
Merge pull request #6375 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '4357b60c04c33ba67662d00b178f1d834b3d68fe':
3 years ago
superman
4357b60c04
Merge pull request #6374 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '9cfa15f44486f9842d18ddcf02fbe2a02064e523':
3 years ago