hades
a5ed7beadd
无jira 解决冲突
3 years ago
方磊
cc3ae6732b
REPORT-61695 决策报表-自适应布局下组件右侧设置面板显示“组件大小”,绝对布局下显示的是“控件位置”“控件大小”
3 years ago
shine
237c837375
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~zheng/C-design into release/10.0
3 years ago
shine
103beaec4c
REPORT-61610 fix:插件重新加载 图表配置界面报错 A.class can not cast to A.class
3 years ago
fanglei
40c2d69e27
Pull request #6493 : REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '73a5ccf767cfdc9f1d78ec0d283a9f2b176b3766':
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
3 years ago
fanglei
6ab2e0e78b
Pull request #6492 : REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/10.0 to release/10.0
* commit 'ab86d37db01776bd73c7b9a5d0f3e6b25fc7f401':
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
3 years ago
superman
98e00cf792
Merge pull request #6497 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'ed0aa27a7a663e950e20c4364e082a5912a8e836':
REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
REPORT-60887 MAC OS x电脑上 编辑按钮飘移
3 years ago
superman
ed0aa27a7a
Merge pull request #6496 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'eafddf1151974a17dd02643102eb742fdedde701':
REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
REPORT-60887 MAC OS x电脑上 编辑按钮飘移
3 years ago
shine
6479efca90
CHART-21418 fix:第二次修改 区分弹框在上面还是下面 如果在上面 则是从displayComponent下面离开 隐藏弹框
3 years ago
方磊
ab86d37db0
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
3 years ago
方磊
73a5ccf767
REPORT-59744 聚合报表块手动修改位置以后,点击空白处位置偏移
3 years ago
kerry
3084eef79d
REPORT-60153 复用组件接触点优化二期
3 years ago
kuangshuai
aae1f0cfb1
REPORT-61708 FR11内置的组件更新替换
3 years ago
pengda
eafddf1151
Pull request #6489 : REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
...
Merge in DESIGN/design from ~PENGDA/design:release/10.0 to release/10.0
* commit '9df5abe79cdb5a4b4334afbe0aae157db6139750':
REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
3 years ago
kerry
67488db684
Pull request #6488 : REPORT-60153 复用组件接触点优化二期
...
Merge in DESIGN/design from ~KERRY/design_10.0:feature/x to feature/x
* commit '0e79734a55dd4db1f75463d2f4610286ec81ed20':
代码修改
代码修改
REPORT-60153 复用组件接触点优化二期
3 years ago
kerry
0e79734a55
代码修改
3 years ago
pengda
9df5abe79c
REPORT-61306 设计器缩放时,显示通知的弹窗未跟随设计器内部界面,而是固定显示在右侧
3 years ago
zheng
6097900f33
Pull request #6477 : CHART-21570 大屏模板适配11.0 图表组件没有跟随主题选项
...
Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0
* commit '3a444419d16a0e618c420aba42b5c1e0e2f0e56d':
CHART-21570 大屏模板适配11.0 图表组件没有跟随主题选项
3 years ago
starryi
a8dcc978c5
Pull request #6474 : REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
...
Merge in DESIGN/design from ~STARRYI/design:release/11.0 to release/11.0
* commit '0eebd17018f9f2f69ee500f5288cba9ca2860558':
REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
3 years ago
fanglei
7e6f2de035
Pull request #6476 : REPORT-57521 远程设计时websocket断开情况下的提示优化
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '1f78cadeeba88faa4aac5f6f94bf5d3d2f3e42f7':
REPORT-57521 切换环境的代码放到edt线程
REPORT-57521
REPORT-57521
REPORT-57521 去掉websocket断开提示延迟
REPORT-57521
REPORT-57521 远程设计时websocket断开情况下的提示优化
3 years ago
kerry
8f014fb5b7
代码修改
3 years ago
Hades
0dd2227354
Pull request #6475 : REPORT-60887 MAC OS x电脑上 编辑按钮飘移
...
Merge in DESIGN/design from ~HADES/design:release/10.0 to release/10.0
* commit '6026f0d575fd41c4ce7f68da6ee22e5f63bf8e82':
REPORT-60887 MAC OS x电脑上 编辑按钮飘移
3 years ago
kerry
40ed97e4df
REPORT-60153 复用组件接触点优化二期
3 years ago
superman
912c384497
Merge pull request #6487 in DESIGN/design from release/11.0 to feature/x
...
* commit '846fdc63efc742e9afdf2f1bd38667cb91a66f41':
REPORT-61606 pc自适应属性中“决策报表”文案修改
3 years ago
superman
c0a06fd410
Merge pull request #6484 in DESIGN/design from feature/10.0 to feature/x
...
* commit 'a0df3e86030758e70a926c41b0357a7c6ffe113f':
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-59614 远程设计下无推送日志
3 years ago
superman
a0df3e8603
Merge pull request #6481 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit '5896880e0fbfe925b730133c8c9a3aac2e36cf9e':
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-59614 远程设计下无推送日志
3 years ago
superman
5896880e0f
Merge pull request #6480 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'f21f519c868df944c364cc401ae97cfca09fd236':
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-59814 代码优化
REPORT-59814 组件埋点 groupingDetail 返回概率是空数据
3 years ago
方磊
1f78cadeeb
REPORT-57521 切换环境的代码放到edt线程
3 years ago
方磊
08146bcc02
REPORT-57521
3 years ago
方磊
e30fe72381
REPORT-57521
3 years ago
方磊
3e2795fc1b
REPORT-57521 去掉websocket断开提示延迟
3 years ago
方磊
f2110f83ca
REPORT-57521
3 years ago
方磊
08cb30cc2e
REPORT-57521 远程设计时websocket断开情况下的提示优化
3 years ago
shine
3a444419d1
CHART-21570 大屏模板适配11.0 图表组件没有跟随主题选项
3 years ago
hades
6026f0d575
REPORT-60887 MAC OS x电脑上 编辑按钮飘移
3 years ago
Starryi
0eebd17018
REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
...
【问题原因】
修改国际化文本
【改动思路】
同上
3 years ago
Henry.Wang
f21f519c86
Pull request #6471 : REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/10.0 to release/10.0
* commit '6c33a708599a073dd546368d395afa42799ff2fd':
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
3 years ago
Henry.Wang
6c33a70859
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
3 years ago
superman
6bcac9b9b2
Merge pull request #6473 in DESIGN/design from feature/10.0 to release/10.0
...
* commit '712b9d42cb782ee3ff3cc531f7ca9f5f6c3afdbb':
REPORT-59814 代码优化
REPORT-59814 组件埋点 groupingDetail 返回概率是空数据
3 years ago
Henry.Wang
846fdc63ef
Pull request #6472 : REPORT-61606 pc自适应属性中“决策报表”文案修改
...
Merge in DESIGN/design from ~HENRY.WANG/design:release/11.0 to release/11.0
* commit '65f61002d48868ad992bd390fa39673791f3c6c2':
REPORT-61606 pc自适应属性中“决策报表”文案修改
3 years ago
starryi
953258d193
Pull request #6459 : REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
...
Merge in DESIGN/design from ~STARRYI/design:feature/x to feature/x
* commit 'ff61af8327d38f61a21242cb9b26af911ebd3b22':
REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
3 years ago
Henry.Wang
65f61002d4
Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0
3 years ago
Henry.Wang
2653824683
REPORT-61606 pc自适应属性中“决策报表”文案修改
3 years ago
Henry.Wang
62ef8a99b1
REPORT-61654 设计器-非中文设计器-字体缺失检测的弹窗内容显示不全
3 years ago
Hades
714df66ea4
Pull request #6460 : REPORT-59614 远程设计下无推送日志
...
Merge in DESIGN/design from ~HADES/design:bugfix/10.0 to bugfix/10.0
* commit '3dc7263f558ce06d7dcc5bf38419cb9ba0dbe883':
REPORT-59614 远程设计下无推送日志
3 years ago
superman
ba060d00bd
Merge pull request #6470 in DESIGN/design from release/11.0 to feature/x
...
* commit '5d2fd9d2be66261d59cb4f3e15ab10229038dc0e':
REPORT-61846 数据连接越权漏洞修复
3 years ago
superman
5d2fd9d2be
Merge pull request #6469 in DESIGN/design from final/11.0 to release/11.0
...
* commit '80b5db8074e2d778fd25a882b9ca17a00c2533b4':
REPORT-61846 数据连接越权漏洞修复
3 years ago
superman
80b5db8074
Merge pull request #6468 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '8d5dfbdc228cc5d19a7c3f0095247cb34feaba6b':
REPORT-61846 数据连接越权漏洞修复
3 years ago
hades
3dc7263f55
REPORT-59614 远程设计下无推送日志
3 years ago
Starryi
ff61af8327
REPORT-61900 【主题切换】主题管理页面,右下角应该改成关闭按钮,不是完成
...
【问题原因】
修改国际化文本
【改动思路】
同上
3 years ago