Browse Source

Merge pull request #822 in DESIGN/design from ~PLOUGH/10-design:feature/10.0 to feature/10.0

* commit '7e32059f84707fddb98f90412edc95383844b517':
  REPORT-14865 更新日志推送=>视觉调整
research/10.0
plough 6 years ago
parent
commit
728e1b0645
  1. 7
      designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java
  2. 28
      designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css
  3. 17
      designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js
  4. 2
      designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateDialogTest.java

7
designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateDialog.java

@ -151,6 +151,11 @@ class DesignerPushUpdateDialog extends UIDialog {
exit();
}
public void closeWindow() {
FocusPointManager.submit(FocusPointManager.OperateType.CLOSE_WINDOW);
exit();
}
public String i18nText(String key) {
return com.fr.design.i18n.Toolkit.i18nText(key);
}
@ -167,7 +172,7 @@ class DesignerPushUpdateDialog extends UIDialog {
private static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Push_Update_Focus_Point");
private enum OperateType {
UPDATE(1), REMIND_NEXT_TIME(2), SKIP(3);
CLOSE_WINDOW(0), UPDATE(1), REMIND_NEXT_TIME(2), SKIP(3);
private int index;
OperateType(int index) {
this.index = index;

28
designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.css

@ -2,6 +2,26 @@ body {
padding-left: 30px;
padding-top: 30px;
color: white;
background-size: 100% 100% !important;
-moz-background-size: 100% 100% !important;
}
.close-btn {
position: fixed !important;
font-size: 15px !important;
color: white !important;
top: 8px;
right: 10px;
width: 19px;
}
.close-btn .b-font {
height: 19px !important;
line-height: 19px !important;
}
.close-btn .b-font:before {
color: white !important;
}
.title {
@ -53,8 +73,14 @@ body {
border-radius: 12px;
}
.button-ignore {
.buttonGroup .button-ignore {
background-color: white !important;
border: 1px solid white !important;
color: #51A6FF;
}
.buttonGroup .button-common {
background-color: #51A6FF !important;
border: 1px solid #51A6FF !important;
}

17
designer-base/src/main/resources/com/fr/design/ui/update/push/pushUpdate.js

@ -101,9 +101,24 @@ function getMoreInfo() {
});
}
function getCloseButton() {
return BI.createWidget({
type: "bi.button",
text: "",
iconCls: "close-font",
cls: "close-btn",
clear: true,
handler: function () {
Pool.data.closeWindow();
}
});
}
function getShowItems() {
var title = getTitleArea();
var closeButton = getCloseButton();
var descList = Pool.data.getContent().split("\n");
var descArea = getDescArea(descList);
@ -111,7 +126,7 @@ function getShowItems() {
var buttonGroup = getButtonGroup();
var showItems = [title, descArea];
var showItems = [title, closeButton, descArea];
if (descList.length > MAX_DESC_NUM) {
showItems.push(moreInfo);
}

2
designer-base/src/test/java/com/fr/design/update/push/DesignerPushUpdateDialogTest.java

@ -15,7 +15,7 @@ public class DesignerPushUpdateDialogTest {
jo.put("version", "2019.03.06.04.02.43.6");
jo.put("content", "设计器改进:去除右击弹框,让操作过程更流畅;增加报表块缩放功能,利于从全局角度整体设计报表\n插件重构:插件支持热部署,即装即用,不再需要重启服务器;\nsapbw:可用于bwcube和bwquery;\n私有云认证:可在客户本地部署私有云认证服务器,业务服务器可到此服务器进行认证;\n开放:打通简道云,可以在简道云里创建项目,并将数据同步到客户的私有库\nshould not display");
jo.put("more", "http://baidu.com");
jo.put("background", "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1555043827901&di=fc266992abef5a7e13b4e0cb98975a75&imgtype=0&src=http%3A%2F%2Fi5.3conline.com%2Fimages%2Fpiclib%2F201203%2F20%2Fbatch%2F1%2F130280%2F1332249463721rez0li5fg0_medium.jpg");
jo.put("background", "http://updateten.finereport.com/fr.png");
DesignerUpdateInfo mockUpdateInfo = new DesignerUpdateInfo("111.22.11", "2211.231.1", "11.23.1", jo);
DesignerPushUpdateDialog.createAndShow(null, mockUpdateInfo);

Loading…
Cancel
Save