Merge remote-tracking branch 'origin/feature/x' into feature/x

designer-base/src/main/java/com/fr/design/record/analyzer/advice/MonitorAdvice.java

@@ -9,6 +9,7 @@ import com.fr.intelli.record.Measurable;
 import com.fr.intelli.record.MeasureObject;
 import com.fr.intelli.record.MeasureUnit;
 import com.fr.intelli.record.MetricRegistry;
+import com.fr.log.FineLoggerFactory;
 import com.fr.measure.DBMeterFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.StringUtils;
@@ -79,25 +80,17 @@ public class MonitorAdvice implements DesignerAnalyzerAdvice {
                     List<Object> newArgs = new ArrayList<>(Arrays.asList(args));
                     newArgs.add(id);
                     recordSQLDetail(id);
-                    String sessionID = null;
-                    SessionProvider provider = SessionLocalManager.getSession();
-                    if (provider != null) {
-                        sessionID = provider.getSessionID();
-                    }
                     if (measurable instanceof Estimator) {
                         measurable.asyncDurable(measureObject, newArgs.toArray());
                     } else {
-                        Object message;
+                        Object message = null;
                         try {
                             message = measurable.durableEntity(measureObject, newArgs.toArray());
                         } catch (Throwable throwable) {
-                            //埋点生成失败，降级逻辑
-                            message = measurable.fallBackEntity();
+                            FineLoggerFactory.getLogger().error(throwable.getMessage(), throwable);
                         }
-                        if (StringUtils.isEmpty(sessionID)) {
+                        if (message != null) {
                             MetricRegistry.getMetric().submit(message);
-                        } else {
-                            MetricRegistry.getMetric().submitAccumulativeData(sessionID, message);
                         }
                     }
                 }

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -553,9 +553,9 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
                 textOverflowTypeComboBox.setSelectedItem(Toolkit.i18nText("Fine-Design_Report_CellWrite_TextOverflow_NoneSymbol"));
             }
         } else {
-            showPartComboBox.setSelectedIndex(0);
+            showPartComboBox.setSelectedIndex(cellGUIAttr.isShowCharNum() ? 0 : 1);
             showCharNums.setValue(cellGUIAttr.getShowCharNums());
-            textOverflowTypeComboBox.setSelectedIndex(0);
+            textOverflowTypeComboBox.setSelectedIndex(cellGUIAttr.isTextOverflowEllipsis() ? 0 : 1);
             textOverflowCheckBox.setSelected(false);
         }
         CellPageAttr cellPageAttr = cellElement.getCellPageAttr(); // 分页