From 49784e833d4b0cf68b3df00b646b438dfcbd7ece Mon Sep 17 00:00:00 2001
From: "fly.li" <Fly.Li@fanruan.com>
Date: Tue, 21 Dec 2021 17:01:06 +0800
Subject: [PATCH 1/3] =?UTF-8?q?REPORT-55241:=E6=B7=BB=E5=8A=A0=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=BC=95=E6=93=8E=E5=B1=9E=E6=80=A7=E5=9F=8B=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/ReportEngineAttrAction.java        | 42 ++++++++++++++++++-
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
index 4c7feab061..19ce479c3f 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
@@ -5,9 +5,15 @@ import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.DesignerContext;
+import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.WorkSheetDesigner;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.report.ReportEnginePane;
+import com.fr.intelli.record.FocusPoint;
+import com.fr.intelli.record.MetricRegistry;
+import com.fr.intelli.record.Original;
+import com.fr.json.JSONObject;
+import com.fr.report.stable.LayerReportAttr;
 import com.fr.report.worksheet.WorkSheet;
 
 public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesigner> {
@@ -19,7 +25,6 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
         this.setMnemonic(getMenuKeySet().getMnemonic());
 		this.setSmallIcon("/com/fr/design/images/m_report/reportEngineAttr");
         this.generateAndSetSearchText(ReportEnginePane.class.getName());
-
     }
 
     private boolean isChange;
@@ -43,7 +48,15 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
             @Override
             public void doOk() {
                 isChange = true;
-                tplEC.setLayerReportAttr(layerReportEnginePane.updateBean());
+                LayerReportAttr originLayerReportAttr = tplEC.getLayerReportAttr();
+                LayerReportAttr layerReportAttr = layerReportEnginePane.updateBean();
+                //只有当前设置为新引擎时，才会提交埋点。
+                if (layerReportAttr.isClientPaging() && layerReportAttr.getEngineState() == LayerReportAttr.ENGINE_X){
+                    if (layerReportAttr.isChanged(originLayerReportAttr)){
+                        new ReportEngineMetricRecord().submit(layerReportAttr);
+                    }
+                }
+                tplEC.setLayerReportAttr(layerReportAttr);
                 //设置新引擎后，需要刷新一下，计算属性设置入口是否显示，取决于是否设置了新引擎模式。
                 DesignerContext.getDesignerFrame().resetToolkitByPlus(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
 
@@ -53,4 +66,29 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
         return isChange;
     }
 
+    /**
+    * 内部类
+    * */
+    class ReportEngineMetricRecord{
+        private final static String FOCUS_ID = "FR-F6011";
+        private void submit(LayerReportAttr layerReportAttr){
+            JSONObject body = new JSONObject();
+            body.put("totalPage", layerReportAttr.isPageQuery() ? 1 : 0);
+            body.put("pagesize", layerReportAttr.isPageQuery() ? layerReportAttr.getCountPerPage() : 0);
+            body.put("totalNum", layerReportAttr.isEnableRowCount() ? 1 : 0);
+            FocusPoint focusPoint = FocusPoint.newBuilder()
+                    .id(FOCUS_ID)
+                    .source(Original.EMBED)
+                    .text(getPath())
+                    .body(body.toString())
+                    .build();
+            MetricRegistry.getMetric().submit(focusPoint);
+        }
+
+        private String getPath(){
+            JTemplate<?, ?> currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+            return currentEditingTemplate.getPath();
+        }
+    }
+
 }

From 4e9a12fc73b4982818ebf9b6f92734e57612d5e9 Mon Sep 17 00:00:00 2001
From: "fly.li" <Fly.Li@fanruan.com>
Date: Tue, 21 Dec 2021 17:14:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?REPORT-55241:=E4=BF=AE=E6=94=B9=E4=B8=80?=
 =?UTF-8?q?=E4=B8=8B=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/actions/report/ReportEngineAttrAction.java  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
index 19ce479c3f..cf10117ba6 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
@@ -50,15 +50,13 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
                 isChange = true;
                 LayerReportAttr originLayerReportAttr = tplEC.getLayerReportAttr();
                 LayerReportAttr layerReportAttr = layerReportEnginePane.updateBean();
-                //只有当前设置为新引擎时，才会提交埋点。
-                if (layerReportAttr.isClientPaging() && layerReportAttr.getEngineState() == LayerReportAttr.ENGINE_X){
-                    if (layerReportAttr.isChanged(originLayerReportAttr)){
-                        new ReportEngineMetricRecord().submit(layerReportAttr);
-                    }
-                }
                 tplEC.setLayerReportAttr(layerReportAttr);
                 //设置新引擎后，需要刷新一下，计算属性设置入口是否显示，取决于是否设置了新引擎模式。
                 DesignerContext.getDesignerFrame().resetToolkitByPlus(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
+                //只有当前设置为新引擎时，才会提交埋点。
+                if (layerReportAttr.isEnableEngineX() && layerReportAttr.isChanged(originLayerReportAttr)){
+                    new ReportEngineMetricRecord().submit(layerReportAttr);
+                }
 
             }
         });

From b1d23b093d436c24efdb5f7a885d4b3e9810a43b Mon Sep 17 00:00:00 2001
From: "fly.li" <Fly.Li@fanruan.com>
Date: Tue, 21 Dec 2021 17:17:06 +0800
Subject: [PATCH 3/3] =?UTF-8?q?REPORT-55241:=E4=BF=AE=E6=94=B9=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=BC=80=E5=90=AF=E5=9B=BA=E5=AE=9A=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=97=B6=E5=9B=BA=E5=AE=9A=E5=88=86=E9=A1=B5=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/actions/report/ReportEngineAttrAction.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
index cf10117ba6..d80622b56f 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportEngineAttrAction.java
@@ -72,7 +72,7 @@ public class ReportEngineAttrAction extends ReportComponentAction<WorkSheetDesig
         private void submit(LayerReportAttr layerReportAttr){
             JSONObject body = new JSONObject();
             body.put("totalPage", layerReportAttr.isPageQuery() ? 1 : 0);
-            body.put("pagesize", layerReportAttr.isPageQuery() ? layerReportAttr.getCountPerPage() : 0);
+            body.put("pagesize", layerReportAttr.getCountPerPage());
             body.put("totalNum", layerReportAttr.isEnableRowCount() ? 1 : 0);
             FocusPoint focusPoint = FocusPoint.newBuilder()
                     .id(FOCUS_ID)