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
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
hades
f9f2ffaf13
REPORT-42973 直接切换远程 日志里没有对应的报错
4 years ago
hades
da9e2fb47b
REPORT-42972 远程对接平台密码-密码超期,设计器启动时连接远程密码,报错弹窗异常
4 years ago
superman
cf38a96daa
Merge pull request #2809 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'c316a584f0fe4f6d1c8ef5475ba98ee8a2dde5c6':
CHART-16595 视觉优化,地图部分自动的背景色,不允许设置不透明度
CHART-16493 加载图表模块时,初始化富文本编辑器
4 years ago
Qinghui.Liu
c316a584f0
Pull request #2800 : CHART-16493 加载图表模块时,初始化富文本编辑器
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '94a9bb0ea69bdf5fd90ad5f8295e10718f67346a':
CHART-16493 加载图表模块时,初始化富文本编辑器
4 years ago
Bjorn
129dd012ee
Pull request #2801 : CHART-16595 视觉优化,地图部分自动的背景色,不允许设置不透明度
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'd7ef3e180f631595a8bcb8e4ee4c9c08327506fb':
CHART-16595 视觉优化,地图部分自动的背景色,不允许设置不透明度
4 years ago
白岳
d7ef3e180f
CHART-16595 视觉优化,地图部分自动的背景色,不允许设置不透明度
4 years ago
Qinghui.Liu
94a9bb0ea6
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
4 years ago
Qinghui.Liu
035d74bdaf
CHART-16493 加载图表模块时,初始化富文本编辑器
4 years ago
superman
ea08cd9eb5
Merge pull request #2796 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'dccdc05b9cda166f5132812872ee892d6c3e88a3':
用uiutil
代码修改
代码修改
REPORT-42604 直接连远程目录启动时 校验失败 未有提示弹窗
REPORT-35149 bug修复
4 years ago
Hades
dccdc05b9c
Pull request #2793 : REPORT-42604 直接连远程目录启动时 校验失败 未有提示弹窗
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '6443d803453711b228a52aa0c6dcefdba848ecbc':
REPORT-42604 直接连远程目录启动时 校验失败 未有提示弹窗
4 years ago
ju.ju
94bc4454c0
Pull request #2787 : REPORT-35149 bug修复
...
Merge in DESIGN/design from ~KERRY/design_10.0:release/10.0 to release/10.0
* commit '6dd9eb4f9fda46a28b8f10f6a44e6793d683045b':
用uiutil
代码修改
代码修改
REPORT-35149 bug修复
4 years ago
kerry
6dd9eb4f9f
用uiutil
4 years ago
kerry
d3d19e4899
代码修改
4 years ago
kerry
a4c3b7b9cc
代码修改
4 years ago
hades
6443d80345
REPORT-42604 直接连远程目录启动时 校验失败 未有提示弹窗
4 years ago
superman
2a0e19e503
Merge pull request #2790 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '4536b54659daa7dd4c3af118bd43d385416b1b43':
REPORT-41858 被选中的按钮不显示
CHART-16548 调整轴标签显示方式组件宽度
REPORT-42639 远程对接平台密码-没有远程权限,点击切换目录,弹窗内容不应该有‘修改密码’
4 years ago
kerry
f951f5756f
REPORT-35149 bug修复
4 years ago
superman
4536b54659
Merge pull request #2786 in DESIGN/design from bugfix/10.0 to release/10.0
...
* commit '5a40a78d2cd5cccd07d2dbeb18575e82a578731e':
REPORT-42470 调整下位置 保证原顺序不变
REPORT-42470 假保存
REPORT-40971 添加条件属性选择数据列,选项中的模板数据集会是别的模板的
4 years ago
Bjorn
0f6519b3ea
Pull request #2785 : REPORT-42125 被选中的按钮不显示
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'be7653fc5c91bd8ee79d135de42bebe46abb93d3':
REPORT-41858 被选中的按钮不显示
4 years ago
白岳
be7653fc5c
REPORT-41858 被选中的按钮不显示
4 years ago
Hades
76a7aeb706
Pull request #2778 : REPORT-42639 远程对接平台密码-没有远程权限,点击切换目录,弹窗内容不应该有‘修改密码’
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '95d8b57d9ec0ca88bc1f2607a59d29538d3406b5':
REPORT-42639 远程对接平台密码-没有远程权限,点击切换目录,弹窗内容不应该有‘修改密码’
4 years ago
Qinghui.Liu
d3fe8ff36c
Pull request #2779 : CHART-16548 调整轴标签显示方式组件宽度
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit '6bf07a28be0b2d482929c064695709339095480e':
CHART-16548 调整轴标签显示方式组件宽度
4 years ago
superman
5a40a78d2c
Merge pull request #2782 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'bb46ae10c7a967235674be15a782a100b8219b37':
REPORT-42540 更新一下
REPORT-39772 提示控件/组件名称不能为空
REPORT-39772 提示控件/组件名称不能为空
REPORT-42604 远程对接平台密码-测试连接锁定时 无错误日志
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
CHART-16560 仪表盘半径设置
REPORT-42540 设计面板新增sheet的缩放率逻辑确认 【问题原因】之前改这个的时候REPORT-37950只关注了缩放条可以单独控制每个sheet,没注意新增sheet的缩放条初值问题 【改动思路】与产品确认后,将每个新增sheet的缩放初值设置为100
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
CHART-15436 箱型图结果数据分类增加无
REPORT-39772 提示控件/组件名称不能为空
去掉空行
CHART-16126 预定义样式预览界面修改
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
REPORT-39772 提示控件/组件名称不能为空
REPORT-39772 提示控件/组件名称不能为空
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
4 years ago
Yvan
bb46ae10c7
Pull request #2775 : REPORT-42540 设计面板新增sheet的缩放率逻辑确认
...
Merge in DESIGN/design from ~YVAN/design:release/10.0 to release/10.0
* commit 'd04c3e3bfd4f0a16f220d53377e423399fed2e23':
REPORT-42540 更新一下
REPORT-42540 设计面板新增sheet的缩放率逻辑确认 【问题原因】之前改这个的时候REPORT-37950只关注了缩放条可以单独控制每个sheet,没注意新增sheet的缩放条初值问题 【改动思路】与产品确认后,将每个新增sheet的缩放初值设置为100
4 years ago
Qinghui.Liu
6bf07a28be
Merge branch 'release/10.0' of https://code.fineres.com/scm/~qinghui.liu/design into release/10.0
4 years ago
ju.ju
9cd2195cac
Pull request #2766 : REPORT-39772 提示控件/组件名称不能为空
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit 'f0ba8f9dac7b5faf320c9661e73e6e3d012d0920':
REPORT-39772 提示控件/组件名称不能为空
REPORT-39772 提示控件/组件名称不能为空
REPORT-39772 提示控件/组件名称不能为空
REPORT-39772 提示控件/组件名称不能为空
REPORT-39772 提示控件/组件名称不能为空
4 years ago
Qinghui.Liu
f325fa7dac
CHART-16548 调整轴标签显示方式组件宽度
4 years ago
hades
95d8b57d9e
Merge branch 'release/10.0' of https://code.fineres.com/scm/~hades/design into release/10.0
4 years ago
hades
671b2b21d8
REPORT-42639 远程对接平台密码-没有远程权限,点击切换目录,弹窗内容不应该有‘修改密码’
4 years ago
Hades
9d91ea0ac1
Pull request #24 : Release/10.0
...
Merge in ~HADES/design from DESIGN/design:release/10.0 to release/10.0
* commit '9fa3f949fb842d0e052ab7c744d017ba4872296d':
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
CHART-16560 仪表盘半径设置
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
CHART-15436 箱型图结果数据分类增加无
4 years ago
Yvan
d04c3e3bfd
REPORT-42540 更新一下
4 years ago
pengda
f0ba8f9dac
REPORT-39772 提示控件/组件名称不能为空
4 years ago
Hades
9fa3f949fb
Pull request #2777 : REPORT-42604 远程对接平台密码-测试连接锁定时 无错误日志
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '593351d4e77778488baf835a7dfd8235746e8ecf':
REPORT-42604 远程对接平台密码-测试连接锁定时 无错误日志
4 years ago
Bryant
b2bc36e27a
Pull request #2774 : REPORT-42551 & REPORT-42552 日文屏蔽更新升级
...
Merge in DESIGN/design from ~BRYANT/design:release/10.0 to release/10.0
* commit 'bf833edf75b90c5c4c40542d5802cde4416d1391':
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
REPORT-42551 & REPORT-42552 日文屏蔽更新升级
4 years ago
Bjorn
795a3ed18c
Pull request #2776 : CHART-16560 仪表盘半径设置
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit 'd514c645abea4f5b0196e55a4ce3452c352d85ee':
CHART-16560 仪表盘半径设置
4 years ago
pengda
161e1b7cab
REPORT-39772 提示控件/组件名称不能为空
4 years ago
Qinghui.Liu
22073a5284
Pull request #2773 : CHART-15436 箱型图结果数据分类增加无
...
Merge in DESIGN/design from ~QINGHUI.LIU/design:release/10.0 to release/10.0
* commit 'ec54ecc4c84663d418746500b7b20e7d86241011':
CHART-15436 箱型图结果数据分类增加无
4 years ago