superman
5873107ec7
Merge pull request #2885 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e401ab665852f3e18aa689d7aaa5b852ed5c8d95':
CHART-14142 钻取地图同名区域处理
4 years ago
Bjorn
e401ab6658
Pull request #2869 : CHART-14142 钻取地图同名区域处理
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'eb3538de81c6025edb4a72345888d4c2169c4e83':
CHART-14142 钻取地图同名区域处理
4 years ago
superman
f566ebaffd
Merge pull request #2875 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'b41b299eb0f27025711af4d00fd46d14d85daa9c':
REPORT-43372 修改组件树路径的key的格式
4 years ago
Yuan.Wang
b41b299eb0
Pull request #2863 : REPORT-43372 修改组件树路径的key的格式
...
Merge in DESIGN/design from ~YUAN.WANG/design:release/10.0 to release/10.0
* commit 'beba27a61c07ac34a4c05b79a4a7804955975dc7':
REPORT-43372 修改组件树路径的key的格式
4 years ago
superman
2ec269fb61
Merge pull request #2870 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '55b04ed32c4f0c53aea09eb4d35301c7f28d30ec':
REPORT-40853 提交单元格组多次点击卡死
4 years ago
superman
55b04ed32c
Merge pull request #2868 in DESIGN/design from final/10.0 to release/10.0
...
* commit '6ab1761448506db08f979cd1dcfa1a8639796a0e':
REPORT-40853 提交单元格组多次点击卡死
4 years ago
superman
6ab1761448
Merge pull request #2867 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '70dbc1f56ced3eddc26aa356efc2b130fb0d9c75':
4 years ago
白岳
eb3538de81
CHART-14142 钻取地图同名区域处理
4 years ago
superman
70dbc1f56c
Merge pull request #2866 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '556dc363ed854ae0acad3c224125c5b17273364d':
REPORT-40853 提交单元格组多次点击卡死
REPORT-43280 参数面板控件选不到
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
4 years ago
Kara
556dc363ed
Pull request #2865 : REPORT-40853 提交单元格组多次点击卡死
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '2a9061f0f11cb840f1fc06052c4534ca25fad5be':
REPORT-40853 提交单元格组多次点击卡死
4 years ago
hades
2a9061f0f1
REPORT-40853 提交单元格组多次点击卡死
4 years ago
vito
0c3ee6ee40
Pull request #2864 : 无jira任务 bugfix单元测试打包依赖变更
...
Merge in DESIGN/design from ~VITO/c-design:bugfix/10.0 to bugfix/10.0
* commit '4943a82057fd8a67a06bd14e377a012217f97142':
无jira任务 bugfix单元测试打包依赖变更
4 years ago
vito
4943a82057
无jira任务 bugfix单元测试打包依赖变更
4 years ago
Yuan.Wang
beba27a61c
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
4 years ago
Yuan.Wang
7e7514a8b8
REPORT-43372 修改组件树路径的key的格式
4 years ago
hades
56f45d13b0
REPORT-32205 设计器多屏使用问题
4 years ago
superman
2fd6f3f949
Merge pull request #2854 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'e1e083947e09489c3695c2955a540acc5dda3870':
REPORT-43280 参数面板控件选不到
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
4 years ago
ju
e1e083947e
Pull request #2853 : 无jira任务, final/10.0 合 release/10.0
...
Merge in DESIGN/design from final/10.0 to release/10.0
* commit '7cb2cb31fe3652cd622166870aa365ad19681473':
REPORT-43280 参数面板控件选不到
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
4 years ago
Kara
7cb2cb31fe
Pull request #2851 : REPORT-42470 假保存 && REPORT-43280 参数面板控件选不到
...
Merge in DESIGN/design from ~HADES/design:final/10.0 to final/10.0
* commit '63d53215ffdef923d2e2d80e1f31db38daa64933':
REPORT-43280 参数面板控件选不到
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
4 years ago
hades
63d53215ff
REPORT-43280 参数面板控件选不到
4 years ago
hades
ea78749631
REPORT-42470 调整下位置 保证原顺序不变
4 years ago
hades
80fa1d102a
REPORT-42470 假保存
4 years ago
ju
b8c2de6063
Pull request #2843 : REPORT-43280 参数面板控件选不到
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit 'dbf47dc902b9cec2c60a00e3dcb7c3555003dfdd':
REPORT-43280 参数面板控件选不到
4 years ago
superman
a4362fbee6
Merge pull request #2842 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '88d0687213050bea8fc9441020e242d17385ac94':
CHART-16721 预定义样式代码回退
REPORT-43198 预定义样式功能优化代码回退遗漏部分
REPORT-43198 预定义样式功能优化代码回退遗漏部分
代码回退
代码屏蔽
代码屏蔽
REPORT-43198 预定义样式功能优化代码回退
代码修改
REPORT-42887 && REPORT-42450 新建多sheet背景不生效; 单元格设置预定义样式的时候,使用工具栏设置边框设置失败
REPORT-42550 注册RPC接口
代码修改
REPORT-42550 预定义样式优化及与图表统一迭代
4 years ago
hades
dbf47dc902
REPORT-43280 参数面板控件选不到
4 years ago
Bjorn
88d0687213
Pull request #2839 : CHART-16721 预定义样式功能回退
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '70a489ac1ce9c644d1a130ab102fbff25bd75aed':
CHART-16721 预定义样式代码回退
4 years ago
白岳
70a489ac1c
CHART-16721 预定义样式代码回退
4 years ago
ju.ju
698acb538a
Pull request #2838 : REPORT-43198 预定义样式功能优化代码回退遗漏部分
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'c8019d174d59da1236bbec1b29d2271168a6467c':
REPORT-43198 预定义样式功能优化代码回退遗漏部分
4 years ago
kerry
c8019d174d
REPORT-43198 预定义样式功能优化代码回退遗漏部分
4 years ago
ju.ju
bd58bf1af5
Pull request #2837 : REPORT-43198 预定义样式功能优化代码回退遗漏部分
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit 'aa971a8b2816f9d83c319689dfa6bdf6a0f447bb':
REPORT-43198 预定义样式功能优化代码回退遗漏部分
4 years ago
kerry
aa971a8b28
REPORT-43198 预定义样式功能优化代码回退遗漏部分
4 years ago
kerry
2d71f52cb0
Pull request #2830 : REPORT-43198 预定义样式功能优化代码回退
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '4a0d90e57c01b19683537a01b336f936f93e3321':
代码回退
代码屏蔽
代码屏蔽
REPORT-43198 预定义样式功能优化代码回退
代码修改
REPORT-42887 && REPORT-42450 新建多sheet背景不生效; 单元格设置预定义样式的时候,使用工具栏设置边框设置失败
REPORT-42550 注册RPC接口
代码修改
REPORT-42550 预定义样式优化及与图表统一迭代
4 years ago
superman
bb049fd1d7
Merge pull request #2834 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '506e6d9b5ad75017b89364e17c43acbc502da55f':
REPORT-42970 添加websocket 断开/失败时的日志
4 years ago
Hades
506e6d9b5a
Pull request #2831 : REPORT-42970 添加websocket 断开/失败时的日志
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '68ae90069b9719d8b80695de4d6eafc7d6af7817':
REPORT-42970 添加websocket 断开/失败时的日志
4 years ago
hades
68ae90069b
REPORT-42970 添加websocket 断开/失败时的日志
4 years ago
kerry
4a0d90e57c
代码回退
4 years ago
kerry
f25c4e7d58
代码屏蔽
4 years ago
kerry
91efa8f5eb
代码屏蔽
4 years ago
kerry
184c97428d
REPORT-43198 预定义样式功能优化代码回退
4 years ago
kerry
a0e1fa40b2
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~kerry/design_10.0 into release/10.0
4 years ago
superman
93330b8b32
Merge pull request #2822 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '705a0979b019ef3b1bcb047d0eca35426c1b47f0':
CHART-16680 仪表盘切换,部分属性默认不是自动
CHART-16682 回退代码,防止设计器崩溃
REPORT-42972 加个判断
REPORT-42973 直接切换远程 日志里没有对应的报错
REPORT-42973 直接切换远程 日志里没有对应的报错
REPORT-42972 远程对接平台密码-密码超期,设计器启动时连接远程密码,报错弹窗异常
4 years ago
Bjorn
705a0979b0
Pull request #2819 : CHART-16680 仪表盘切换,部分属性默认不是自动
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '7792e29c813f515d3c4ece6e6d423ebac0d6502a':
CHART-16680 仪表盘切换,部分属性默认不是自动
4 years ago
白岳
7792e29c81
CHART-16680 仪表盘切换,部分属性默认不是自动
4 years ago
eason
145dbee40d
Pull request #2818 : CHART-16682 回退代码,防止设计器崩溃
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'cb55de4faa6fc4b8a9d4eaff52cba9f6a9f8add2':
CHART-16682 回退代码,防止设计器崩溃
4 years ago
Hades
88efdd38a3
Pull request #2817 : REPORT-42972 远程对接平台密码-密码超期,设计器启动时连接远程密码,报错弹窗异常 && REPORT-42973 直接切换远程 日志里没有对应的报错
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '24d71eb1f1491390eb9c58eab63be95526384557':
REPORT-42972 加个判断
REPORT-42973 直接切换远程 日志里没有对应的报错
REPORT-42973 直接切换远程 日志里没有对应的报错
REPORT-42972 远程对接平台密码-密码超期,设计器启动时连接远程密码,报错弹窗异常
4 years ago
Qinghui.Liu
cb55de4faa
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
4 years ago
Qinghui.Liu
b25508678a
CHART-16682 回退代码,防止设计器崩溃
4 years ago
hades
24d71eb1f1
REPORT-42972 加个判断
4 years ago
hades
8a11dd7f32
REPORT-42973 直接切换远程 日志里没有对应的报错
4 years ago
hades
efb007f81e
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hades/design into release/10.0
4 years ago