Hugh.C
|
ad37c78b5c
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~hugh.c/design into release/10.0
|
5 years ago |
Hugh.C
|
47ed0af3ca
|
REPORT-27189 切换到单机环境,鼠标悬停在版本管理上,提示错误
|
5 years ago |
Hades
|
b0899d0c8d
|
Merge pull request #1448 in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'b5e312362576324171af5048ae7912998dd58d98':
fix
MOBILE-25615 高度重置问题
|
5 years ago |
hades
|
b5e3123625
|
fix
|
5 years ago |
hades
|
633dd6dbda
|
MOBILE-25615 高度重置问题
|
5 years ago |
Hades
|
e6f5f06690
|
Merge pull request #23 in ~HADES/design from feature/10.0 to release/10.0
* commit 'b2498e18f8c095171a5bae0113db97c24ddff8be':
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
|
5 years ago |
Hades
|
b2498e18f8
|
Merge pull request #1442 in DESIGN/design from ~HADES/design:feature/10.0 to feature/10.0
* commit 'f8329a6aff5a80f88501def038de64315f3bd408':
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
|
5 years ago |
Hades
|
50de08b80d
|
Merge pull request #1443 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'a8f8977f9a0353881c5127abad715edabe14af73':
MOBILE-25614 && MOBILE-25605
|
5 years ago |
neil
|
74644f4c95
|
Merge pull request #1445 in DESIGN/design from ~NEIL/design:release/10.0 to release/10.0
* commit '88ea59c3311d5c08db887a90b01267428a5e632e':
无jira任务, 冲突修复
|
5 years ago |
neil
|
88ea59c331
|
无jira任务, 冲突修复
|
5 years ago |
Kara
|
4a0a058925
|
Merge pull request #1444 in DESIGN/design from ~BJORN/design:final/10.0 to final/10.0
* commit 'a0995d1ddc84c15fe69e7db427800a4dcfdeb4a7':
CHART-12746 埋点
|
5 years ago |
白岳
|
a0995d1ddc
|
CHART-12746 埋点
|
5 years ago |
hades
|
a8f8977f9a
|
MOBILE-25614 && MOBILE-25605
|
5 years ago |
hades
|
f8329a6aff
|
REPORT-27138 && REPORT-27137 && REPORT-27109 && REPORT-27140
|
5 years ago |
neil
|
9806e23955
|
Merge pull request #1441 in DESIGN/design from ~NEIL/design:release/10.0 to release/10.0
* commit '194810931f6510ffe7b45c20658a5d8c34f35eb9': (150 commits)
ct
ct
ct
ct
ct
ct
ct
ct
ct
ct
去掉是否连接弹出框
CHART-12733 图表数据结构 地图相关 回退
通过内部类来做异常处理
CHART-12733 线型支持虚线 补充网格线 警戒线 趋势线。 回退
RPC调用自定义异常处理方法做抽象
CHART-12733 图表数据结构 回退
CHART-12733 大数据模式 回退
CHART-12733 线型支持虚线 回退
CHART-12733 轴标签缩略间隔显示 回退
CHART-12733 标签的自动调整 回退
...
|
5 years ago |
neil
|
194810931f
|
Merge pull request #24 in ~NEIL/design from feature/10.0 to release/10.0
* commit 'a12b217ea3bdd27e7d89aac18170076cfa22b90a': (150 commits)
ct
ct
ct
ct
ct
ct
ct
ct
ct
ct
去掉是否连接弹出框
CHART-12733 图表数据结构 地图相关 回退
通过内部类来做异常处理
CHART-12733 线型支持虚线 补充网格线 警戒线 趋势线。 回退
RPC调用自定义异常处理方法做抽象
CHART-12733 图表数据结构 回退
CHART-12733 大数据模式 回退
CHART-12733 线型支持虚线 回退
CHART-12733 轴标签缩略间隔显示 回退
CHART-12733 标签的自动调整 回退
...
|
5 years ago |
neil
|
a12b217ea3
|
ct
|
5 years ago |
neil
|
84b2a7e819
|
ct
|
5 years ago |
neil
|
c508cb2a91
|
ct
|
5 years ago |
neil
|
997a4e3b5d
|
ct
|
5 years ago |
neil
|
251728f08a
|
ct
|
5 years ago |
neil
|
07e7c2aec3
|
ct
|
5 years ago |
neil
|
3cad18d7c5
|
ct
|
5 years ago |
neil
|
e26b97cdc4
|
ct
|
5 years ago |
neil
|
bead3c635b
|
ct
|
5 years ago |
neil
|
4fb73f1d25
|
ct
|
5 years ago |
ju.ju
|
5952b630ff
|
Merge pull request #1440 in DESIGN/design from ~EASON/design:release/10.0 to release/10.0
* commit '1810907a62e25e978c8ffb8bc10fe5a9ccd6349e':
代码合并冲突
|
5 years ago |
eason-skx
|
1810907a62
|
代码合并冲突
|
5 years ago |
Bjorn
|
86b6f4d7dc
|
Merge pull request #1438 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '96854b618530042e1b8ca9dbd9c12d608d25bb0e':
CHART-12814 悬浮图表去掉clone
CHART-12814 悬浮图表数据问题
|
5 years ago |
白岳
|
96854b6185
|
CHART-12814 悬浮图表去掉clone
|
5 years ago |
白岳
|
8f95491160
|
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into release/10.0
|
5 years ago |
白岳
|
63858532be
|
CHART-12814 悬浮图表数据问题
|
5 years ago |
Hades
|
6409b95f54
|
Merge pull request #1436 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '5f69c695a23442cf1e469602e9ff86d724654b8d':
MOBILE-25493 && MOBILE-25540 交互调整
|
5 years ago |
Bjorn
|
2ddaeacc24
|
Merge pull request #1437 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'b93b6f2ca65ebd4629211b747bd125e7052d2183':
CHART-12815 天数不增加的问题
|
5 years ago |
白岳
|
b93b6f2ca6
|
CHART-12815 天数不增加的问题
|
5 years ago |
hades
|
5f69c695a2
|
MOBILE-25493 && MOBILE-25540 交互调整
|
5 years ago |
Bjorn
|
14f69fe22a
|
Merge pull request #1435 in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '23e5b5a1ddd5b22aed4976f1c36ad03d5e896714':
CHART-12746 埋点接口
CHART-12746
CHART-12746
CHART-12746
CHART-12746
CHART-12746 修改map value类型,创建时间的用法
CHART-12746 图表埋点
|
5 years ago |
白岳
|
23e5b5a1dd
|
CHART-12746 埋点接口
|
5 years ago |
Kara
|
a1538a4283
|
Merge pull request #1434 in DESIGN/design from ~JU/design:final/10.0 to final/10.0
* commit '95c13712d7a3f3ef0268d3cee4f88152b841bfea':
无JIRA任务 merge错误
|
5 years ago |
ju
|
95c13712d7
|
无JIRA任务 merge错误
|
5 years ago |
Kara
|
14ad7807a2
|
Merge pull request #1433 in DESIGN/design from ~JEO/report-design:final/10.0 to final/10.0
* commit '6fabbd17b5542328784a81f2d693bd4e1380fb71': (26 commits)
fix import
MOBILE-25475 && MOBILE-25477
REPORT-26672 review 改进
REPORT-26672 设计器和服务器都注册的lic都没有勾选远程设计功能点,还是可以远程连接
fix 国际化
MOBILE-25397 折叠展开样式设计器部分
fix 初始化
fix
MOBILE-25111 默认UI调整
CHART-12645 默认值被覆盖
fix
REPORT-25003 && REPORT-24491
REPORT-24174【新引擎】批量转换及检测
update
CHART-12406 弹出图片文件选择框时,条件属性弹框不应该隐藏
REPORT-25778 json数据集,设计器重启之后消失 换一种处理方式,刷新面板会导致各种诡异的问题
REPORT-26492 二维码显示不对
MOBILE-24587 防止不必要的提示 && 取消勾选时更新
REPORT-26432 10.0.4设计器中没有sheet可见
REPORT-26263 切换远程目录到tomcat,放置一段时间切回本地,出现切换失败的弹窗,实际切换成功 修复 npe 。
...
|
5 years ago |
jeo
|
6fabbd17b5
|
Merge branch 'release/10.0' into final/10.0
# Conflicts:
# designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/MobileAdvanceDefinePane.java
|
5 years ago |
Maksim
|
cb17acb69b
|
Merge pull request #1432 in DESIGN/design from ~MAKSIM/design:feature/10.0 to feature/10.0
* commit 'ba69ff6c5e77de63e0967b0453f7cd298226b8a5':
去掉是否连接弹出框
|
5 years ago |
Maksim
|
ba69ff6c5e
|
去掉是否连接弹出框
|
5 years ago |
yaoh.wu
|
f14b44343f
|
Merge pull request #1423 in DESIGN/design from ~MAKSIM/design:feature/10.0 to feature/10.0
* commit 'f4e14c04c507aa7ddd9781ba99c8716d7f9be07e':
通过内部类来做异常处理
RPC调用自定义异常处理方法做抽象
国际化修改
国际化文件修改
远程设计兼容及服务检测
|
5 years ago |
白岳
|
47f2acbb17
|
CHART-12746
|
5 years ago |
白岳
|
305fcce817
|
CHART-12746
|
5 years ago |
白岳
|
e73a8bbdea
|
CHART-12746
|
5 years ago |
zheng
|
10456cd69e
|
Merge pull request #1430 in DESIGN/design from ~ZHENG/c-design:feature/10.0 to feature/10.0
* commit '29cfb125c2bb99043ba808c4cc9c5f8a3cd846dc':
CHART-12733 图表数据结构 地图相关 回退
CHART-12733 线型支持虚线 补充网格线 警戒线 趋势线。 回退
CHART-12733 图表数据结构 回退
CHART-12733 大数据模式 回退
CHART-12733 线型支持虚线 回退
CHART-12733 轴标签缩略间隔显示 回退
CHART-12733 标签的自动调整 回退
CHART-12733 区域显示策略 回退
CHART-12733 图表缩放新设计 回退
CHART-12086 组合图中的饼图分类从不要回退到灰化,原因:标签提示超链等需要统一
|
5 years ago |
白岳
|
ff23933b9c
|
CHART-12746
|
5 years ago |