Merge pull request #1610 in DESIGN/design from ~HADES/design:final/10.0 to final/10.0

* commit '7f08ca3560099aa19dcfd6388e0ed85d9f4c20c0':
  REPORT-30369 同步到final
  REPORT-30347 处理异常弹窗

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWCardMainBorderLayout.java

@@ -514,13 +514,4 @@ public class XWCardMainBorderLayout extends XWBorderLayout {
 	public boolean isSupportShared() {
 		return true;
 	}
-
-	@Override
-	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-		if (FormDesignerUtils.isAppRelayout(WidgetPropertyPane.getInstance().getEditingFormDesigner())) {
-			return new WidgetPropertyUIProvider[] {new MobileBooKMarkUsePropertyUI(this)};
-		} else {
-			return super.getWidgetPropertyUIProviders();
-		}
-	}
 }

designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

@@ -593,12 +593,8 @@ public class XWTabFitLayout extends XWFitLayout {
 	 */
 	@Override
 	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
-		if (FormDesignerUtils.isAppRelayout(WidgetPropertyPane.getInstance().getEditingFormDesigner())) {
-			return new WidgetPropertyUIProvider[] {new MobileBookMarkPropertyUI(this), new MobileBooKMarkUsePropertyUI(this)};
-		} else {
 		return new WidgetPropertyUIProvider[0];
 	}
-	}
 
 	@Override
 	public void firePropertyChange(){

designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java

@@ -181,7 +181,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetProper
         if (selection != null && xCreator != null) {
             embeddedPropertyUIProviders = selection.getSelectedCreator().getWidgetPropertyUIProviders();
             if(!designer.getDesignerMode().isFormParameterEditor()) {
-                if (!xCreator.acceptType(XWAbsoluteLayout.class, XWFitLayout.class, XWCardTagLayout.class, XWCardMainBorderLayout.class) && FormDesignerUtils.isAppRelayout(designer)) {
+                if (!xCreator.acceptType(XWAbsoluteLayout.class, XWFitLayout.class, XWCardTagLayout.class) && FormDesignerUtils.isAppRelayout(designer)) {
                     embeddedPropertyUIProviders = ArrayUtils.insert(0, embeddedPropertyUIProviders, new MobileBookMarkPropertyUI(xCreator));
                 }
                 if (xCreator.supportMobileStyle()) {

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java

@@ -34,7 +34,6 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
     private MobileComponentMarginPane marginPane;
     private MobileComponentLayoutIntervalPane intervalPane;
     private MobileBookMarkUsePane mobileBookMarkUsePane;
-    private MobileAdvanceInnerPane mobileAdvanceInnerPane;
 
     public TabMobileWidgetDefinePane(XCreator xCreator) {
         this.xCreator = xCreator;
@@ -72,10 +71,7 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
             intervalPane = new MobileComponentLayoutIntervalPane(FormTabPaddingAttrMark.XML_TAG);
             if (FormDesignerUtils.isAppRelayout(designer)) {
                 mobileBookMarkUsePane = new MobileBookMarkUsePane();
-                mobileAdvanceInnerPane = new MobileAdvanceInnerPane(xCreator);
                 innerAdvancePane.add(mobileBookMarkUsePane, BorderLayout.CENTER);
-                innerAdvancePane.add(mobileAdvanceInnerPane, BorderLayout.SOUTH);
-
             }
             innerAdvancePane.add(marginPane, BorderLayout.NORTH);
             UIExpandablePane advancePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, innerAdvancePane);
@@ -105,9 +101,6 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
         if (mobileBookMarkUsePane != null) {
             mobileBookMarkUsePane.populate(xCreator);
         }
-        if (mobileAdvanceInnerPane != null) {
-            mobileAdvanceInnerPane.populate();
-        }
     }
 
     @Override
@@ -124,8 +117,5 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
         if (mobileBookMarkUsePane != null) {
             mobileBookMarkUsePane.update(xCreator);
         }
-        if (mobileAdvanceInnerPane != null) {
-            this.mobileAdvanceInnerPane.update();
-        }
     }
 }

designer-realize/src/main/java/com/fr/start/LifecycleFatalErrorHandler.java

@@ -1,5 +1,6 @@
 package com.fr.start;
 
+import com.fr.common.report.ReportState;
 import com.fr.design.RestartHelper;
 import com.fr.design.dialog.ErrorDialog;
 import com.fr.design.dialog.FineJOptionPane;
@@ -10,6 +11,9 @@ import com.fr.exit.DesignerExiter;
 import com.fr.general.IOUtils;
 import com.fr.io.utils.ResourceIOUtils;
 import com.fr.log.FineLoggerFactory;
+import com.fr.process.ProcessEventPipe;
+import com.fr.process.engine.core.CarryMessageEvent;
+import com.fr.process.engine.core.FineProcessContext;
 import com.fr.stable.StableUtils;
 import com.fr.stable.lifecycle.ErrorType;
 import com.fr.stable.lifecycle.FineLifecycleFatalError;
@@ -45,6 +49,10 @@ public class LifecycleFatalErrorHandler {
 
     public void handle(FineLifecycleFatalError fatal) {
         SplashContext.getInstance().hide();
+        ProcessEventPipe eventPipe = FineProcessContext.getParentPipe();
+        if (eventPipe != null) {
+            eventPipe.fire(new CarryMessageEvent(ReportState.STOP.getValue()));
+        }
         map.get(fatal.getErrorType()).handle(fatal);
     }