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
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
Henry.Wang
8d5dfbdc22
Pull request #6458 : REPORT-61846 数据连接越权漏洞修复
...
Merge in DESIGN/design from ~HENRY.WANG/design:persist/11.0 to persist/11.0
* commit '61d5afb631d0b2f2c36d74ccce102a55f1e7fcfa':
REPORT-61846 数据连接越权漏洞修复
3 years ago
Henry.Wang
61d5afb631
REPORT-61846 数据连接越权漏洞修复
3 years ago
superman
db33f9d8e1
Merge pull request #6457 in DESIGN/design from release/11.0 to feature/x
...
* commit '1878786cf32551c2fae289aa3019e9002007f309':
REPORT-61846 数据连接越权漏洞修复
3 years ago
superman
1878786cf3
Merge pull request #6456 in DESIGN/design from final/11.0 to release/11.0
...
* commit '443127ce24de123267481a11c0641fe0f42851cd':
REPORT-61846 数据连接越权漏洞修复
3 years ago
superman
c9d462c0bf
Merge pull request #6454 in DESIGN/design from feature/10.0 to feature/x
...
* commit '712b9d42cb782ee3ff3cc531f7ca9f5f6c3afdbb':
3 years ago
superman
712b9d42cb
Merge pull request #6451 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'f63202f399fe3f4261515a931e357c797c6191db':
3 years ago
superman
f63202f399
Merge pull request #6450 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit 'fd217291bd69626e77f10144a3c4923cb536c84b':
3 years ago
superman
fd217291bd
Merge pull request #6449 in DESIGN/design from final/10.0 to release/10.0
...
* commit '92dafeedd8489255ad57d6edfafc2672ee0f344d':
3 years ago
superman
92dafeedd8
Merge pull request #6448 in DESIGN/design from persist/10.0 to final/10.0
...
* commit '2709de7e62367f74c253e4c4d7cb1011d1df84b3':
3 years ago
Henry.Wang
443127ce24
Pull request #6447 : REPORT-61846 数据连接越权漏洞修复
...
Merge in DESIGN/design from ~HENRY.WANG/design:final/11.0 to final/11.0
* commit 'a2f3e8bc4a9fcfda7493cecba75ec82a78e0a141':
REPORT-61846 数据连接越权漏洞修复
3 years ago
ju|剧浩宇
7c399f5c34
Pull request #6446 : 无JIRA任务 解决冲突
...
Merge in DESIGN/design from ~FANGLEI/design10.0:feature/x to feature/x
* commit '574d127a0e7ea88dd9626cb3f7d72b7dd1a26234':
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
REPORT-58584
REPORT-58584
REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
REPORT-57521 突然发现已经有关于websocket帮助文档的地址了
REPORT-60538 还原改动
REPORT-60538 还原改动
REPORT-60538 还原改动
REPORT-57521 远程设计时websocket断开情况下的提示优化
REPORT-60538
REPORT-60538 英日韩环境未屏蔽在线组件库
3 years ago
Henry.Wang
a2f3e8bc4a
REPORT-61846 数据连接越权漏洞修复
3 years ago
方磊
574d127a0e
Merge branch 'release/11.0' into feature/x
...
* release/11.0:
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
REPORT-58584
REPORT-58584
REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
REPORT-57521 突然发现已经有关于websocket帮助文档的地址了
REPORT-60538 还原改动
REPORT-60538 还原改动
REPORT-60538 还原改动
REPORT-57521 远程设计时websocket断开情况下的提示优化
REPORT-60538
REPORT-60538 英日韩环境未屏蔽在线组件库
# Conflicts:
# designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
# designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
3 years ago
superman
759807240c
Merge pull request #6441 in DESIGN/design from feature/10.0 to feature/x
...
* commit '7424b0b22511032fdadfce420e785595b8461303':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
update
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
3 years ago
fanglei
f0ed9ba1a3
Pull request #6426 : REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '13e54b514ebd25548e19dd8280592d704cde4c1c':
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
REPORT-58584
REPORT-58584
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
3 years ago
superman
2709de7e62
Merge pull request #6442 in DESIGN/design from final/10.0 to persist/10.0
...
* commit 'bd1af0df2b8f09988494f14c8be75330bf01c02a':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago
superman
7424b0b225
Merge pull request #6431 in DESIGN/design from bugfix/10.0 to feature/10.0
...
* commit 'a6ff2be536d4db7046551971df21082100c998b9':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
update
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
3 years ago
superman
a6ff2be536
Merge pull request #6430 in DESIGN/design from release/10.0 to bugfix/10.0
...
* commit '398ae7f2d745dfc9ddf361baeca90e0601697772':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
update
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
3 years ago
superman
398ae7f2d7
Merge pull request #6429 in DESIGN/design from final/10.0 to release/10.0
...
* commit 'bd1af0df2b8f09988494f14c8be75330bf01c02a':
REPORT-61736 条件属性背景插入图片以后,点击其他位置,条件属性框空白
3 years ago
方磊
13e54b514e
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
3 years ago
方磊
84d58cae82
REPORT-58584
3 years ago
方磊
91523213fd
REPORT-58584
3 years ago
Fly.Li
79fb9bbf51
Pull request #6427 : REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
...
Merge in DESIGN/design from ~FLY.LI/design:final/11.0 to release/11.0
* commit '82bf9d3b2579ff0483011eb9d921153ac45dec77':
REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
3 years ago
Fly.Li
82bf9d3b25
REPORT-61671:新创建报表的报表引擎属性默认选择新引擎时,新引擎选项下方不应该出现固定分页选项
3 years ago
方磊
65a21b3de2
REPORT-58584 FR11-二轮回归-设计器菜单栏-服务器-控件管理-预定义控件重名时没有提示
3 years ago
fanglei
75e0e258ed
Pull request #6412 : REPORT-57521 远程设计时websocket断开情况下的提示优化
...
Merge in DESIGN/design from ~FANGLEI/design10.0:release/11.0 to release/11.0
* commit '340700014bc3c7f5bf8f7837c51a703e97f75316':
REPORT-57521 突然发现已经有关于websocket帮助文档的地址了
REPORT-60538 还原改动
REPORT-60538 还原改动
REPORT-60538 还原改动
REPORT-57521 远程设计时websocket断开情况下的提示优化
REPORT-60538
REPORT-60538 英日韩环境未屏蔽在线组件库
3 years ago
superman
781da35c58
Merge pull request #6425 in DESIGN/design from release/11.0 to feature/x
...
* commit 'a1bafe52e90856da8b9823d084c6001d16182482':
REPORT-58836 自定义导出二期-revert
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
3 years ago
zheng
87555fd274
Pull request #6414 : CHART-21418 fix bugs
...
Merge in DESIGN/design from ~ZHENG/c-design:release/10.0 to release/10.0
* commit 'c08b5b0213a60fbe15683f4516c56e0217f8bc92':
update
CHART-20951 fix:大屏模板中的图表 警戒线文字默认样式
CHART-21418 fix:颜色控件弹框 如果是从displayComponent上面离开的,隐藏弹出界面。
3 years ago
superman
a1bafe52e9
Merge pull request #6424 in DESIGN/design from final/11.0 to release/11.0
...
* commit 'cf1497de7b74678a285685ea0fb5590a5279ff46':
REPORT-58836 自定义导出二期-revert
REPORT-61682【固定布局-原布局推荐4.1】决策报表-自适应布局-布局id有几个重复了
3 years ago
superman
cf1497de7b
Merge pull request #6423 in DESIGN/design from persist/11.0 to final/11.0
...
* commit '161a3a9bfbb8dde6b874f1a119447bbf5d2ab1ff':
3 years ago
superman
aa3eaa034e
Merge pull request #6421 in DESIGN/design from feature/10.0 to feature/x
...
* commit '8942367775ce42e9000d950540be94f237e2858f':
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
REPORT-61652 全局自适应-样式细节优化-某个字段国际化显示不全
3 years ago