superman
f04c975a92
Merge pull request #5537 in DESIGN/design from persist/10.0 to final/10.0
...
* commit 'd353b4c263829db7605d4f909d0231ee10368105':
3 years ago
superman
26cd1c0405
Merge pull request #5536 in DESIGN/design from release/10.0 to final/10.0
...
* commit 'd047ff79d557217a6c3f2c2248004987d1096bca': (129 commits)
REPORT-57898 代码回退
REPORT-57816 REPORT-57816
REPORT-57449 【FR11回归】【开发者预览支持调整模板布局】新自适应-远程环境模板进入开发者调试后,设计器端此模板没有显示已锁定,双击模板会弹出已锁定的弹窗,但会打开一个空白模板,且此时模板才显示“已锁定”
REPORT-56047 修改下判断是否为安版本的标准
REPORT-57568 解决目录树展开收起触发打开模板的逻辑
REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态
REPORT-57590 表单参数面板剪切复制按钮禁用
REPORT-55048 fix调整下逻辑
REPORT-57490 websocket断开时弹窗位置问题
REPORT-55048 https远程连接时,设计器上无法获取服务器推送过来的eventhread线程日志 fix npe问题
REPORT-55048 https远程连接时,设计器上无法获取服务器推送过来的eventhread线程日志
REPORT-57561 远程版本不一致功能不可用的提示-启动时连接远程目录
REPORT-57979 前面=赋值了,set没意义,删掉
CHART-20312 图表切换按钮失焦事件
REPORT-57872 数据集-数据库查询时候,列名之间的分隔符没了
REPORT-57202 FR11一轮回归-页面设置纸张大小问题
REPORT-56047 设计器11.0适配内容处理 同步到10.0
REPORT-57590 表单参数面板不应该能被复制到容器内
REPORT-54538 组件复用无网络提示地址支持选中复制
REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
...
3 years ago
superman
d353b4c263
Merge pull request #5535 in DESIGN/design from final/10.0 to persist/10.0
...
* commit '6c39fa0e787f50006796afa65589e9db07851b3c':
3 years ago
Henry.Wang
d047ff79d5
Pull request #5534 : REPORT-57898 代码回退
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '58221c8ac684e725c01c92ceabd4c894cd0350ef':
REPORT-57898 代码回退
3 years ago
Henry.Wang
58221c8ac6
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
3 years ago
Henry.Wang
a37e822df7
REPORT-57898 代码回退
3 years ago
Tommy
ceeb3e06f0
Pull request #5529 : REPORT-57568 解决目录树展开收起触发打开模板的逻辑
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit 'bbef610501613c581cce192a06821e4f5df649c4':
REPORT-57568 解决目录树展开收起触发打开模板的逻辑
3 years ago
fanglei
7fd17cc048
Pull request #5531 : REPORT-57449 【FR11回归】【开发者预览支持调整模板布局】新自适应-远程环境模板进入开发者调试后,设计器端此模板没有显示已锁定,双击模板会弹出已锁定的弹窗,但会打开一个空白模板,且此时模板才显示“已锁定”
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit '27238f73cca2804d677d10c2d927d52bdcea9dc5':
REPORT-57449 【FR11回归】【开发者预览支持调整模板布局】新自适应-远程环境模板进入开发者调试后,设计器端此模板没有显示已锁定,双击模板会弹出已锁定的弹窗,但会打开一个空白模板,且此时模板才显示“已锁定”
3 years ago
pengda
ce714b3f67
Pull request #5526 : REPORT-57561 远程版本不一致功能不可用的提示-启动时连接远程目录
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit 'c583badf065a6d30ea312f8249a02033343e7ce3':
REPORT-57561 远程版本不一致功能不可用的提示-启动时连接远程目录
3 years ago
Henry.Wang
74b4ce30a1
Pull request #5533 : REPORT-57816 条件属性设置图片填充后,条件属性面板会立即消失
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '5adf17a73703d516c742926a44a0d5748b5937f5':
REPORT-57816 REPORT-57816
3 years ago
Henry.Wang
5adf17a737
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
3 years ago
Henry.Wang
79f4f1ff94
REPORT-57816 REPORT-57816
3 years ago
方磊
27238f73cc
REPORT-57449 【FR11回归】【开发者预览支持调整模板布局】新自适应-远程环境模板进入开发者调试后,设计器端此模板没有显示已锁定,双击模板会弹出已锁定的弹窗,但会打开一个空白模板,且此时模板才显示“已锁定”
3 years ago
Hades
42b825b7a7
Pull request #5530 : REPORT-56047 修改下判断是否为安装版本的标准
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit 'c45444606650526f49c0d1a163a709bac249e6de':
REPORT-56047 修改下判断是否为安版本的标准
3 years ago
hades
c454446066
REPORT-56047 修改下判断是否为安版本的标准
3 years ago
kuangshuai
bbef610501
REPORT-57568 解决目录树展开收起触发打开模板的逻辑
3 years ago
Henry.Wang
80c0090fad
Pull request #5524 : REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'e7cdfce4362fc949c69e09dbf5167bea770bef5f':
REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态
3 years ago
Tommy
f4c8993ecd
Pull request #5523 : REPORT-57590 表单参数面板剪切复制按钮禁用
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit 'be41af5e515d1e9b28cebc99fb7208634def526f':
REPORT-57590 表单参数面板剪切复制按钮禁用
3 years ago
Henry.Wang
e7cdfce436
Merge branch 'release/10.0' of https://code.fineres.com/scm/~henry.wang/design into release/10.0
3 years ago
Henry.Wang
f94fb4cbcc
REPORT-57898 【权限编辑】进入权限编辑时打开frm/大屏模板/版本管理,再回到原模板,无法退出权限编辑状态
3 years ago
Henry.Wang
c538c1f8dd
Pull request #5502 : REPORT-57872 数据集-数据库查询时候,列名之间的分隔符没了
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit 'b14d2905e2e97b9356bdc56a555edcea1e6aa1de':
REPORT-57872 数据集-数据库查询时候,列名之间的分隔符没了
3 years ago
kuangshuai
be41af5e51
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~tommy/design into release/10.0
3 years ago
kuangshuai
8857a2d07f
REPORT-57590 表单参数面板剪切复制按钮禁用
3 years ago
Hades
596bd633cb
Pull request #5521 : REPORT-55048 https远程连接时,设计器上无法获取服务器推送过来的eventhread线程日志 同步到release && REPORT-57490 websocket断开时弹窗位置问题
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '9992d53bf2b5f226ed5a6f6087affd04edb9c25f':
REPORT-55048 fix调整下逻辑
REPORT-57490 websocket断开时弹窗位置问题
REPORT-55048 https远程连接时,设计器上无法获取服务器推送过来的eventhread线程日志 fix npe问题
REPORT-55048 https远程连接时,设计器上无法获取服务器推送过来的eventhread线程日志
3 years ago
hades
9992d53bf2
REPORT-55048 fix调整下逻辑
3 years ago
hades
0c7550a04b
REPORT-57490 websocket断开时弹窗位置问题
3 years ago
hades
23bab19229
REPORT-55048 https远程连接时,设计器上无法获取服务器推送过来的eventhread线程日志 fix npe问题
3 years ago
hades
f5d21272b7
REPORT-55048 https远程连接时,设计器上无法获取服务器推送过来的eventhread线程日志
3 years ago
pengda
c583badf06
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago
pengda
b3910bc86f
REPORT-57561 远程版本不一致功能不可用的提示-启动时连接远程目录
3 years ago
Xiqiu
200c83b84c
Pull request #5507 : REPORT-57979 前面=赋值了,set没意义,删掉
...
Merge in DESIGN/design from ~XIQIU/design:release/10.0 to release/10.0
* commit 'e95103a9418292c7161f0b402bfbc84ca0479990':
REPORT-57979 前面=赋值了,set没意义,删掉
3 years ago
superman
ab30ef37d0
Merge pull request #5518 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit '517dc0ce959651a78cc697dc9afaecf2cd8ba586':
CHART-20312 图表切换按钮失焦事件
REPORT-57202 FR11一轮回归-页面设置纸张大小问题
REPORT-56047 设计器11.0适配内容处理 同步到10.0
REPORT-57590 表单参数面板不应该能被复制到容器内
REPORT-54538 组件复用无网络提示地址支持选中复制
REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
3 years ago
superman
517dc0ce95
Merge pull request #5513 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '03349c27bb8994dd02e865c3797d49d8553efa0f':
CHART-20312 图表切换按钮失焦事件
REPORT-57202 FR11一轮回归-页面设置纸张大小问题
REPORT-56047 设计器11.0适配内容处理 同步到10.0
REPORT-57590 表单参数面板不应该能被复制到容器内
REPORT-54538 组件复用无网络提示地址支持选中复制
REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
3 years ago
superman
03349c27bb
Merge pull request #5512 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'f7a781a59503a6ee49de6815b0c6c78ca8ecb0e3':
CHART-20312 图表切换按钮失焦事件
REPORT-57202 FR11一轮回归-页面设置纸张大小问题
REPORT-56047 设计器11.0适配内容处理 同步到10.0
REPORT-57590 表单参数面板不应该能被复制到容器内
REPORT-54538 组件复用无网络提示地址支持选中复制
REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
3 years ago
superman
50b45d62e9
Merge pull request #5509 in DESIGN/design from feature/10.0 to feature/big-screen
...
* commit 'fd3980bc2238083024b204bd850d424b631c036c':
REPORT-57647 cpt参数面板中组件被下方覆盖时 工具需要不可见
REPORT-57609 & REPORT-57622 导出-导出事件-模板web属性设置&服务器配置设置事件-默认设置不对
REPORT-57624 导出-导出事件-模板web属性设置导出事件-保存后再打开变为邮件事件
REPORT-57431 导出-导出事件-模板选择-文本框需要不可编辑
3 years ago
xiqiu
e95103a941
REPORT-57979 前面=赋值了,set没意义,删掉
3 years ago
Bjorn
f7a781a595
Pull request #5504 : CHART-20312 图表切换按钮失焦事件
...
Merge in DESIGN/design from ~BJORN/design:release/10.0 to release/10.0
* commit '42c40af36d92b538948fbd6059f38b5b1e042ded':
CHART-20312 图表切换按钮失焦事件
3 years ago
白岳
42c40af36d
CHART-20312 图表切换按钮失焦事件
3 years ago
Tommy
db6de26374
Pull request #5493 : REPORT-54538 REPORT-57590 bug fixed
...
Merge in DESIGN/design from ~TOMMY/design:release/10.0 to release/10.0
* commit '04bac5d214bddc2ff1d1febdfdc1c0a79e8dcad8':
REPORT-57590 表单参数面板不应该能被复制到容器内
REPORT-54538 组件复用无网络提示地址支持选中复制
3 years ago
fanglei
2b8b594963
Pull request #5501 : REPORT-57202 FR11一轮回归-页面设置纸张大小问题
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit '1973d1796492b151db7209193114aa44be892e77':
REPORT-57202 FR11一轮回归-页面设置纸张大小问题
3 years ago
Henry.Wang
b14d2905e2
REPORT-57872 数据集-数据库查询时候,列名之间的分隔符没了
3 years ago
Hades
d3bd96e7f4
Pull request #5498 : REPORT-56047 设计器11.0适配内容处理 同步到10.0
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '2607d356b9993dae5e32aab09b9876cfb498dff3':
REPORT-56047 设计器11.0适配内容处理 同步到10.0
3 years ago
方磊
1973d17964
REPORT-57202 FR11一轮回归-页面设置纸张大小问题
3 years ago
hades
2607d356b9
REPORT-56047 设计器11.0适配内容处理 同步到10.0
3 years ago
Xiqiu
71e424f565
Pull request #5480 : REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
...
Merge in DESIGN/design from ~XIQIU/design:release/10.0 to release/10.0
* commit '912084ccfb0cbb32270b88277ba121429f4f7ed5':
REPORT-57643 调整combobox的大小(feature没有合并到realease,手动合并一波)
3 years ago
kuangshuai
04bac5d214
REPORT-57590 表单参数面板不应该能被复制到容器内
3 years ago
kuangshuai
7daf44dcef
REPORT-54538 组件复用无网络提示地址支持选中复制
3 years ago
superman
fd3980bc22
Merge pull request #5485 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'fc5712574d5cdf655803b914c2287c352f5ce0e9':
REPORT-57647 cpt参数面板中组件被下方覆盖时 工具需要不可见
REPORT-57609 & REPORT-57622 导出-导出事件-模板web属性设置&服务器配置设置事件-默认设置不对
REPORT-57624 导出-导出事件-模板web属性设置导出事件-保存后再打开变为邮件事件
REPORT-57431 导出-导出事件-模板选择-文本框需要不可编辑
3 years ago
superman
fc5712574d
Merge pull request #5484 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'b1058789adcee9c2afb3a5d79e854ebb3dc56103':
REPORT-57647 cpt参数面板中组件被下方覆盖时 工具需要不可见
REPORT-57609 & REPORT-57622 导出-导出事件-模板web属性设置&服务器配置设置事件-默认设置不对
REPORT-57624 导出-导出事件-模板web属性设置导出事件-保存后再打开变为邮件事件
REPORT-57431 导出-导出事件-模板选择-文本框需要不可编辑
3 years ago
xiqiu
912084ccfb
Merge remote-tracking branch 'origin/release/10.0' into release/10.0
3 years ago