REPORT-31399 && REPORT-30691 新自适应-表单-web端展示-插件启用和禁用;【模板制作优化】@kerry，cpt模板添加图表时，发现没有记录

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

@@ -111,7 +111,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
     private void initPercent(WAbsoluteLayout widget) {
         Toolkit toolkit = Toolkit.getDefaultToolkit();
         Dimension scrnsize = toolkit.getScreenSize();
-        double screenValue = FRScreen.getByDimension(scrnsize).getValue();
+        double screenValue = FRScreen.getDesignScreenByDimension(scrnsize).getValue();
         if (!AssistUtils.equals(screenValue, FormArea.DEFAULT_SLIDER)) {
             this.setContainerPercent(screenValue / FormArea.DEFAULT_SLIDER);
         }
@@ -247,7 +247,7 @@ public class XWAbsoluteLayout extends XLayoutContainer {
      */
     @Override
     public void updateChildBound(int minHeight) {
-        double prevContainerPercent = FRScreen.getByDimension(toData().getDesigningResolution()).getValue() / FormArea.DEFAULT_SLIDER;
+        double prevContainerPercent = FRScreen.getDesignScreenByDimension(toData().getDesigningResolution()).getValue() / FormArea.DEFAULT_SLIDER;
         if (toData().getCompState() == 0 && !AssistUtils.equals(containerPercent, prevContainerPercent)) {
             for (int i = 0; i < this.getComponentCount(); i++) {
                 XCreator creator = getXCreator(i);

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

@@ -72,7 +72,7 @@ public class XWFitLayout extends XLayoutContainer {
 	private void initPercent(){
 		Toolkit toolkit = Toolkit.getDefaultToolkit();
 		Dimension scrnsize = toolkit.getScreenSize();
-		double screenValue = FRScreen.getByDimension(scrnsize).getValue();
+		double screenValue = FRScreen.getDesignScreenByDimension(scrnsize).getValue();
 		if (!AssistUtils.equals(FormArea.DEFAULT_SLIDER, screenValue)) {
 			this.setContainerPercent(screenValue / FormArea.DEFAULT_SLIDER);
 		}
@@ -1331,4 +1331,4 @@ public class XWFitLayout extends XLayoutContainer {
 			}
 		}
 	}
-}
+}

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

@@ -63,7 +63,7 @@ public class CoverReportPane extends CoverPane implements HelpDialogHandler{
 //            controlMode = IOUtils.readIcon(IconPathConstants.TD_EL_SHARE_CLOSE_ICON_PATH);
             controlButton.setVisible(false);
             helpDialog = new WidgetHelpDialog(DesignerContext.getDesignerFrame(), helpMsg);
-            double screenValue = FRScreen.getByDimension(Toolkit.getDefaultToolkit().getScreenSize()).getValue();
+            double screenValue = FRScreen.getDesignScreenByDimension(Toolkit.getDefaultToolkit().getScreenSize()).getValue();
             int offsetX = 0;
             if (screenValue < FormArea.DEFAULT_SLIDER) {
                 offsetX = (int) ((1 - screenValue / FormArea.DEFAULT_SLIDER)

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

@@ -220,7 +220,7 @@ public class FormArea extends JComponent implements ScrollRulerComponent {
     private void initCalculateSize() {
         Toolkit toolkit = Toolkit.getDefaultToolkit();
         Dimension scrnsize = toolkit.getScreenSize();
-        this.screenValue = FRScreen.getByDimension(scrnsize).getValue();
+        this.screenValue = FRScreen.getDesignScreenByDimension(scrnsize).getValue();
         XLayoutContainer root = FormArea.this.designer.getRootComponent();
         // 7.1.1不放缩放滑块，但表单大小仍按屏幕分辨率调整
 //        slidePane.populateBean(screenValue);

designer-realize/src/main/java/com/fr/design/mainframe/template/info/JWorkBookProcessInfo.java

@@ -101,6 +101,9 @@ public class JWorkBookProcessInfo extends TemplateProcessInfo<WorkBook> {
                 for (int i = 0; i < columnLength; i++) {
                     for (int j = 0; j < rowLength; j++) {
                         TemplateCellElement templateCellElement = templateElementCase.getTemplateCellElement(i, j);
+                        if (templateCellElement == null) {
+                            continue;
+                        }
                         Object value = templateCellElement.getValue();
                         if (isTestCell(value, templateCellElement.getStyle())) {
                             return true;
@@ -129,20 +132,20 @@ public class JWorkBookProcessInfo extends TemplateProcessInfo<WorkBook> {
         }
         return parameterAttr.getParameterUI() != null;
     }
-    
-    
+
+
     @Override
     public JSONArray getComponentsInfo() {
         return new JSONArray();
     }
-    
+
     @Override
     public JSONArray getReuseCmpList() {
         return JSONArray.create();
     }
-    
+
     @Override
     public void updateTemplateOperationInfo(TemplateOperate templateOption) {
-    
+
     }
 }