superman
759807240c
Merge pull request #6441 in DESIGN/design from feature/10.0 to feature/x
...
* commit '7424b0b22511032fdadfce420e785595b8461303':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
update
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
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
superman
781da35c58
Merge pull request #6425 in DESIGN/design from release/11.0 to feature/x
...
* commit 'a1bafe52e90856da8b9823d084c6001d16182482':
REPORT-58836 自定义导出二期-revert
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
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
superman
a1bafe52e9
Merge pull request #6424 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'cf1497de7b74678a285685ea0fb5590a5279ff46':
REPORT-58836 自定义导出二期-revert
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
3 years ago
superman
cf1497de7b
Merge pull request #6423 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '161a3a9bfbb8dde6b874f1a119447bbf5d2ab1ff':
3 years ago
superman
aa3eaa034e
Merge pull request #6421 in DESIGN/design from feature/10.0 to feature/x
...
* commit '8942367775ce42e9000d950540be94f237e2858f':
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
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
superman
161a3a9bfb
Merge pull request #6413 in DESIGN/design from final/11.0 to persist/11.0
...
* commit '6f5a51bc44fc36968f092942ef5aa29f16997874':
REPORT-58836 自定义导出二期-revert
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
REPORT-61521 主题下载引导页加载异常
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
Bruce.Deng
6f5a51bc44
Pull request #6411 : REPORT-58836 自定义导出二期-revert
...
Merge in DESIGN/design from ~BRUCE.DENG/design:final/11.0 to final/11.0
* commit 'e060ab116db9b5ca6697003009d53854707a5bb3':
REPORT-58836 自定义导出二期-revert
3 years ago
Bruce.Deng
e060ab116d
Merge remote-tracking branch 'origin/final/11.0' into final/11.0
3 years ago
Bruce.Deng
54886cdfc0
REPORT-58836 自定义导出二期-revert
3 years ago
kerry
146b15e983
Pull request #6410 : REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
...
Merge in DESIGN/design from ~KERRY/design_10.0:final/11.0 to final/11.0
* commit '1f320aa852db127369922a7d8a513cc25f2730cd':
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
3 years ago
kerry
1f320aa852
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
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
b83ccb40cc
Merge pull request #6407 in DESIGN/design from release/11.0 to feature/x
...
* commit '1b6e607b23575dbcb305158576e6be28b951be04':
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
3 years ago
superman
1b6e607b23
Merge pull request #6406 in DESIGN/design from final/11.0 to release/11.0
...
* commit '16579561d430cd7df6a2c97e9c2adec7b8738924':
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
3 years ago
superman
6b6ce9b4ee
Merge pull request #6404 in DESIGN/design from feature/10.0 to feature/x
...
* commit '327a3012b3a53e07cfdc4fe9c9b4c05fde179839':
REPORT-50016 填报属性设置-智能添加单元格组-出现重复单元格
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
Fly.Li
16579561d4
Pull request #6397 : REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
...
Merge in DESIGN/design from ~FLY.LI/design:final/11.0 to final/11.0
* commit 'ddcd55949f738a2e7983fccfe1135590f11a30dd':
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
3 years ago
Fly.Li
ddcd55949f
REPORT-61669:新建报表引擎界面默认选择新计算引擎选项
3 years ago
Bruce.Deng
0d72922794
Pull request #6396 : REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
...
Merge in DESIGN/design from ~BRUCE.DENG/design:final/11.0 to final/11.0
* commit 'fbefef76ea088b39076acc545e4a6527661ba8bf':
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
3 years ago
Bruce.Deng
fbefef76ea
REPORT-61642 导出-导出事件-其他模板-参数设置默认值错误
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
4aed4cd545
Merge pull request #6394 in DESIGN/design from release/11.0 to feature/x
...
* commit 'a309a96cd3d07c8b5f52b36dceeb10be20958174':
REPORT-61521 主题下载引导页加载异常
3 years ago
superman
a309a96cd3
Merge pull request #6393 in DESIGN/design from final/11.0 to release/11.0
...
* commit '63789fc9f1c2c3cf02cbc741836a1a1bcc38d152':
REPORT-61521 主题下载引导页加载异常
3 years ago
superman
63789fc9f1
Merge pull request #6392 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '471960c84d2015fc9ded63dc7a3cd58214c6782c':
3 years ago
superman
aa54b22683
Merge pull request #6391 in DESIGN/design from feature/10.0 to feature/x
...
* commit '3d9fd412f08dbf1eecb98479a8a9d21e22501e6a':
REPORT-61471 国际化url适配-韩文url-远程设计常见问题的弹窗显示和跳转地址问题
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