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

* commit '7ff0be3a09669f35993f3b164b850671f4f3bb2f':
  REPORT-16458 设计器中更新日志推送弹框显示不全=>显示更多新特性
  REPORT-16458 设计器中更新日志推送弹框显示不全=>文字不全
  REPORT-14865 更新日志推送=>显示最新版本号

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

@@ -16,6 +16,7 @@ import com.fr.web.struct.category.StylePath;
 import com.fr.web.struct.impl.FineUI;
 
 import javax.swing.JPanel;
+import javax.swing.SwingUtilities;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.Frame;
@@ -34,11 +35,16 @@ class DesignerPushUpdateDialog extends UIDialog {
         initComponents();
     }
 
-    static void createAndShow(Frame parent, DesignerUpdateInfo updateInfo) {
+    static void createAndShow(final Frame parent, final DesignerUpdateInfo updateInfo) {
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
                 DesignerPushUpdateDialog dialog = new DesignerPushUpdateDialog(parent);
                 dialog.populate(updateInfo);
                 dialog.showDialog();
             }
+        });
+
+    }
 
     private void initComponents() {
         JPanel contentPane = (JPanel) getContentPane();
@@ -72,7 +78,7 @@ class DesignerPushUpdateDialog extends UIDialog {
 
     private Model createModel(DesignerUpdateInfo updateInfo) {
         Model model = new Model();
-        model.setVersion(updateInfo.getPushVersion());
+        model.setVersion(updateInfo.getLatestVersion());
         model.setContent(updateInfo.getPushContent());
         model.setMoreInfoUrl(updateInfo.getMoreInfoUrl());
         model.setBackgroundUrl(updateInfo.getBackgroundUrl());

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

@@ -4,6 +4,8 @@ body {
     color: white;
     background-size: 100% 100% !important;
     -moz-background-size: 100% 100% !important;
+
+    font-family: PingFangSC-Regular, Georgia, "Nimbus Roman No9 L", "Songti SC", "Noto Serif CJK SC", "Source Han Serif SC", "Source Han Serif CN", STSong, "AR PL New Sung", "AR PL SungtiL GB", NSimSun, SimSun, "TW\-Sung", "WenQuanYi Bitmap Song", "AR PL UMing CN", "AR PL UMing HK", "AR PL UMing TW", "AR PL UMing TW MBE", PMingLiU, MingLiU, serif !important;
 }
 
 .close-btn {
@@ -24,15 +26,17 @@ body {
     color: white !important;
 }
 
+.font-bold {
+    font-weight: bold;
+}
+
 .title {
-    font-family: PingFangSC-Semibold;
     font-size: 24px;
     letter-spacing: 1.5px;
     line-height: 24px;
 }
 
 .version {
-    font-family: PingFangSC-Semibold;
     font-size: 12px;
     line-height: 14px;
     margin-top: 6px;
@@ -40,9 +44,8 @@ body {
 
 .desc {
     margin-top: 40px;
-    font-family: PingFangSC-Regular;
     font-size: 13px;
-    width: 540px;
+    width: 82%;
     margin-left: 19px;
     text-indent: -19px;
     overflow: visible !important;
@@ -54,7 +57,6 @@ body {
 
 .moreInfo {
     margin-top: 20px;
-    font-family: PingFangSC-Regular;
     font-size: 13px;
     text-decoration: underline;
 }
@@ -65,7 +67,7 @@ body {
 }
 
 .buttonGroup .bi-button {
-    font-family: PingFangSC-Medium;
+    font-weight: 600;
     font-size: 11px;
     text-align: center;
     line-height: 12px;

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

@@ -33,13 +33,13 @@ function getTitleArea() {
             {
                 type: "bi.label",
                 text: i18nText("Fine-Design_Find_New_Version"),
-                cls: "title",
+                cls: "title font-bold",
                 textAlign: "left"
             },
             {
                 type: "bi.label",
                 text: Pool.data.getVersion(),
-                cls: "version",
+                cls: "version font-bold",
                 textAlign: "left"
             }
         ]
@@ -126,13 +126,7 @@ function getShowItems() {
 
     var buttonGroup = getButtonGroup();
 
-    var showItems = [title, closeButton, descArea];
+    return [title, closeButton, descArea, moreInfo, buttonGroup];
-    if (descList.length > MAX_DESC_NUM) {
-        showItems.push(moreInfo);
-    }
-    showItems.push(buttonGroup);
-
-    return showItems;
 }
 
 window.addEventListener("load", function (ev) {