Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0

designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java

@@ -450,7 +450,7 @@ public class EnvChangeEntrance {
                 // 切换完成后清理密码
                 updateNotRememberPwdEnv();
                 if (changeResult) {
-                    VersionCheckUtils.showVersionCheckDialog(envListPane.updateEnvManager());
+                    VersionCheckUtils.showVersionCheckDialog(envListPane.getSelectedName());
                 }
             }
 
@@ -483,7 +483,7 @@ public class EnvChangeEntrance {
                     DesignerExiter.getInstance().execute();
                 } else {
                     updateNotRememberPwdEnv();
-                    VersionCheckUtils.showVersionCheckDialog(envListPane.updateEnvManager());
+                    VersionCheckUtils.showVersionCheckDialog(envListPane.getSelectedName());
                 }
             }
 

designer-base/src/main/java/com/fr/design/data/DesignerStrategyConfigUtils.java

@@ -5,6 +5,7 @@ import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.esd.core.strategy.config.StrategyConfig;
 import com.fr.esd.core.strategy.config.StrategyConfigHelper;
+import com.fr.esd.core.strategy.config.service.StrategyConfigService;
 import com.fr.esd.core.strategy.persistence.StrategyConfigsAttr;
 import com.fr.esd.event.DSMapping;
 import com.fr.esd.event.DsNameTarget;
@@ -67,7 +68,7 @@ public class DesignerStrategyConfigUtils {
             FILE file = jTemplate.getEditingFILE();
             if (file != null) {
                 String path = file.getPath();
-                return StrategyConfigHelper.recommended(path);
+                return StrategyConfigService.isTemplateEnabled(path);
             }
         }
         return false;

designer-base/src/main/java/com/fr/design/data/tabledata/strategy/StrategyConfigHandler.java

@@ -0,0 +1,37 @@
+package com.fr.design.data.tabledata.strategy;
+
+import com.fr.esd.core.strategy.config.StrategyConfig;
+import com.fr.esd.query.StrategicTableData;
+
+/**
+ * @author rinoux
+ * @version 10.0
+ * Created by rinoux on 2021/3/19
+ */
+public abstract class StrategyConfigHandler<T extends StrategicTableData> {
+
+    private final T tableData;
+
+    public StrategyConfigHandler(T tableData) {
+        this.tableData = tableData;
+    }
+
+    protected T getTableData() {
+        return tableData;
+    }
+
+    /**
+     * 查找配置
+     *
+     * @return 缓存配置
+     */
+    public abstract StrategyConfig find();
+
+
+    /**
+     * 保存配置
+     *
+     * @param config 缓存配置
+     */
+    public abstract void save(T saved, StrategyConfig config);
+}

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -18,13 +18,13 @@ import com.fr.design.data.datapane.connect.ConnectionTableProcedurePane;
 import com.fr.design.data.datapane.preview.PreviewTablePane;
 import com.fr.design.data.datapane.preview.sql.PreviewPerformedSqlPane;
 import com.fr.design.data.datapane.sqlpane.SQLEditPane;
-import com.fr.design.data.tabledata.tabledatapane.db.ServerStrategyConfigHandler;
+import com.fr.design.data.tabledata.strategy.StrategyConfigHandler;
+import com.fr.design.data.tabledata.tabledatapane.db.DBTableDataSavedHook;
 import com.fr.design.data.tabledata.tabledatapane.db.StrategyConfigFrom;
-import com.fr.design.data.tabledata.tabledatapane.db.StrategyConfigHandler;
-import com.fr.design.data.tabledata.tabledatapane.db.TemplateStrategyConfigHandler;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.fun.DBTableDataMenuHandler;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -43,7 +43,11 @@ import com.fr.design.menu.ToolBarDef;
 import com.fr.design.utils.ParameterUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.esd.core.strategy.config.StrategyConfig;
+import com.fr.esd.core.strategy.config.StrategyConfigHelper;
 import com.fr.esd.core.strategy.config.service.StrategyConfigService;
+import com.fr.esd.event.DSMapping;
+import com.fr.esd.event.DsNameTarget;
+import com.fr.esd.event.StrategyEventsNotifier;
 import com.fr.esd.query.StrategicTableData;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.IOUtils;
@@ -53,6 +57,7 @@ import com.fr.script.Calculator;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ParameterProvider;
 import com.fr.stable.StringUtils;
+import com.fr.workspace.WorkContext;
 
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -619,4 +624,107 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
             return this.title;
         }
     }
+
+    /**
+     * 服务器数据集配置处理器
+     */
+    private static class ServerStrategyConfigHandler extends StrategyConfigHandler<DBTableData> {
+        private final String origName;
+
+        private final String origConnection;
+
+        private final String origQuery;
+
+        public ServerStrategyConfigHandler(DBTableData tableData) {
+            super(tableData);
+            this.origName = tableData.getDsName();
+            this.origConnection = tableData.getDatabase().toString();
+            this.origQuery = tableData.getQuery();
+        }
+
+        @Override
+        public StrategyConfig find() {
+            StrategyConfig strategyConfig = null;
+            if (getTableData() != null) {
+                try {
+                    strategyConfig = getTableData().getStrategyConfig() == null ? null : getTableData().getStrategyConfig().clone();
+                } catch (CloneNotSupportedException e) {
+                    FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                }
+            }
+
+            return strategyConfig;
+        }
+
+        @Override
+        public void save(DBTableData saved, StrategyConfig strategyConfig) {
+            String conn = saved.getDatabase().toString();
+            String query = saved.getQuery();
+
+
+            //检查数据链接和sql是否修改，如果修改需要触发缓存监听事件
+            if (!conn.equals(origConnection) || !query.equals(origQuery)) {
+                if (StringUtils.isNotEmpty(origName)) {
+                    //新建数据集的origName为null，不用触发
+                    StrategyEventsNotifier.modifyDataSet(DSMapping.ofServerDS(new DsNameTarget(origName)));
+                }
+            }
+
+
+            //配置变动事件
+            try {
+                final StrategyConfig orig = getTableData().getStrategyConfig();
+                saved.setStrategyConfig(strategyConfig.clone());
+                StrategyEventsNotifier.compareAndFireConfigEvents(orig, strategyConfig, DSMapping.ofServerDS(new DsNameTarget(saved.getDsName())));
+            } catch (CloneNotSupportedException e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            }
+        }
+    }
+
+
+    /**
+     * 模版数据集配置处理器
+     */
+    private static class TemplateStrategyConfigHandler extends StrategyConfigHandler<DBTableData> {
+        public TemplateStrategyConfigHandler(DBTableData tableData) {
+            super(tableData);
+        }
+
+        @Override
+        public StrategyConfig find() {
+            StrategyConfig strategyConfig = null;
+            String tplPath = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath();
+            if (getTableData() != null && StringUtils.isNotEmpty(tplPath)) {
+                //设置保存数据集的事件检查钩子
+                //新建模版此时不存在，不需要注册钩子
+                if (getTableData().getXmlSavedHook() == null && WorkContext.getWorkResource().exist(tplPath)) {
+                    getTableData().setXmlSavedHook(new DBTableDataSavedHook(tplPath, getTableData()));
+                }
+
+                //获取当前的缓存配置，没有就创建一份
+                String dsName = getTableData().getDsName();
+
+                //这里为了之前兼容插件创建的配置，缓存配置不在DBTableData，而是从模版attr读取
+                strategyConfig = DesignerStrategyConfigUtils.getStrategyConfig(dsName);
+
+                if (strategyConfig == null || strategyConfig.isUseGlobal()) {
+                    //模版里面没有配置，检查模版是否被开启
+                    boolean tplEnabled = StrategyConfigService.isTemplateEnabled(tplPath);
+                    if (tplEnabled) {
+                        //使用全局配置
+                        strategyConfig = StrategyConfigHelper.createStrategyConfig(true);
+                    }
+                }
+            }
+
+            return strategyConfig;
+        }
+
+        @Override
+        public void save(DBTableData saved, StrategyConfig config) {
+
+            //DBTableDataSavedHook处理了
+        }
+    }
 }

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/db/ServerStrategyConfigHandler.java

@@ -1,70 +0,0 @@
-package com.fr.design.data.tabledata.tabledatapane.db;
-
-import com.fr.data.impl.DBTableData;
-import com.fr.esd.core.strategy.config.StrategyConfig;
-import com.fr.esd.event.DSMapping;
-import com.fr.esd.event.DsNameTarget;
-import com.fr.esd.event.StrategyEventsNotifier;
-import com.fr.log.FineLoggerFactory;
-import com.fr.stable.StringUtils;
-
-/**
- * @author rinoux
- * @version 10.0
- * Created by rinoux on 2021/3/19
- */
-public class ServerStrategyConfigHandler implements StrategyConfigHandler {
-    private final DBTableData tableData;
-
-    private final String origName;
-
-    private final String origConnection;
-
-    private final String origQuery;
-
-    public ServerStrategyConfigHandler(DBTableData tableData) {
-        this.tableData = tableData;
-        this.origName = tableData.getDsName();
-        this.origConnection = tableData.getDatabase().toString();
-        this.origQuery = tableData.getQuery();
-    }
-
-    @Override
-    public StrategyConfig find() {
-        StrategyConfig strategyConfig = null;
-        if (tableData != null) {
-            try {
-                strategyConfig = tableData.getStrategyConfig() == null ? null : tableData.getStrategyConfig().clone();
-            } catch (CloneNotSupportedException e) {
-                FineLoggerFactory.getLogger().error(e.getMessage(), e);
-            }
-        }
-
-        return strategyConfig;
-    }
-
-    @Override
-    public void save(DBTableData saved, StrategyConfig strategyConfig) {
-        String conn = saved.getDatabase().toString();
-        String query = saved.getQuery();
-
-
-        //检查数据链接和sql是否修改，如果修改需要触发缓存监听事件
-        if (!conn.equals(origConnection) || !query.equals(origQuery)) {
-            if (StringUtils.isNotEmpty(origName)) {
-                //新建数据集的origName为null，不用触发
-                StrategyEventsNotifier.modifyDataSet(DSMapping.ofServerDS(new DsNameTarget(origName)));
-            }
-        }
-
-
-        //配置变动事件
-        try {
-            final StrategyConfig orig = tableData.getStrategyConfig();
-            saved.setStrategyConfig(strategyConfig.clone());
-            StrategyEventsNotifier.compareAndFireConfigEvents(orig, strategyConfig, DSMapping.ofServerDS(new DsNameTarget(saved.getDsName())));
-        } catch (CloneNotSupportedException e) {
-            FineLoggerFactory.getLogger().error(e.getMessage(), e);
-        }
-    }
-}

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/db/StrategyConfigHandler.java

@@ -1,16 +0,0 @@
-package com.fr.design.data.tabledata.tabledatapane.db;
-
-import com.fr.data.impl.DBTableData;
-import com.fr.esd.core.strategy.config.StrategyConfig;
-
-/**
- * @author rinoux
- * @version 10.0
- * Created by rinoux on 2021/3/19
- */
-public interface StrategyConfigHandler {
-
-    StrategyConfig find();
-
-    void save(DBTableData saved, StrategyConfig config);
-}

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/db/TemplateStrategyConfigHandler.java

@@ -1,50 +0,0 @@
-package com.fr.design.data.tabledata.tabledatapane.db;
-
-import com.fr.base.TableData;
-import com.fr.data.impl.DBTableData;
-import com.fr.design.data.DesignerStrategyConfigUtils;
-import com.fr.design.file.HistoryTemplateListCache;
-import com.fr.esd.core.strategy.config.StrategyConfig;
-import com.fr.esd.query.StrategicTableData;
-import com.fr.workspace.WorkContext;
-
-/**
- * @author rinoux
- * @version 10.0
- * Created by rinoux on 2021/3/19
- */
-public class TemplateStrategyConfigHandler implements StrategyConfigHandler {
-
-    DBTableData tableData;
-
-    public TemplateStrategyConfigHandler(DBTableData tableData) {
-        this.tableData = tableData;
-    }
-
-    @Override
-    public StrategyConfig find() {
-        StrategyConfig strategyConfig = null;
-        if (tableData != null) {
-            //设置保存数据集的事件检查钩子
-            String tplPath = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().getEditingFILE().getPath();
-
-            //新建模版此时不存在，不需要注册钩子
-            if (tableData.getXmlSavedHook() == null && WorkContext.getWorkResource().exist(tplPath)) {
-                tableData.setXmlSavedHook(new DBTableDataSavedHook(tplPath, tableData));
-            }
-
-            //获取当前的缓存配置，没有就创建一份
-            String dsName = tableData.getDsName();
-
-            //这里为了之前兼容插件创建的配置，缓存配置不在DBTableData，而是从模版attr读取
-            strategyConfig = DesignerStrategyConfigUtils.getStrategyConfig(dsName);
-        }
-
-        return strategyConfig;
-    }
-
-    @Override
-    public void save(DBTableData saved, StrategyConfig config) {
-
-    }
-}

designer-form/src/main/java/com/fr/design/designer/beans/models/SelectionModel.java

@@ -85,7 +85,9 @@ public class SelectionModel {
         if (e.getButton() == MouseEvent.BUTTON3 || (!InputEventBaseOnOS.isControlDown(e) && !e.isShiftDown())) {
             // 如果Ctrl或者Shift键盘没有按下，则清除已经选择的组件
             XCreator selectXCreator = selection.getSelectedCreator();
-            if (selectXCreator != null && comp != null) {
+            boolean clickOnce = e.getClickCount() == 1;
+            boolean hasCom = selectXCreator != null && comp != null;
+            if (clickOnce && hasCom) {
                 if (StringUtils.equals(selectXCreator.toData().getWidgetName(), comp.toData().getWidgetName())) {
                     return;
                 }

designer-form/src/main/java/com/fr/design/fit/common/AdaptiveSwitchUtil.java

@@ -1,7 +1,5 @@
 package com.fr.design.fit.common;
 
-import com.fr.decision.ExtraDecisionClassManager;
-import com.fr.decision.fun.EmailSendProvider;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.design.fit.DesignerUIModeConfig;
 import com.fr.design.fit.NewJForm;
@@ -13,7 +11,6 @@ import com.fr.design.fit.attrpane.RootDesignExtendDefinePane;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JForm;
 import com.fr.design.mainframe.JTemplate;
-import com.fr.design.mainframe.JTemplateFactory;
 import com.fr.design.parameter.RootDesignDefinePane;
 import com.fr.design.preview.FormAdaptivePreview;
 import com.fr.design.preview.FormPreview;
@@ -25,8 +22,8 @@ import com.fr.design.widget.ui.designer.layout.FRAbsoluteLayoutDefinePane;
 import com.fr.design.widget.ui.designer.layout.FRFitLayoutDefinePane;
 import com.fr.file.FILE;
 import com.fr.file.MemFILE;
-import com.fr.form.fit.NewFormMarkAttr;
 import com.fr.form.main.Form;
+import com.fr.form.main.WidgetGather;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WAbsoluteBodyLayout;
@@ -152,11 +149,34 @@ public class AdaptiveSwitchUtil {
             if (DesignerUIModeConfig.getInstance().newUIMode() && jForm.getTarget().getReportFitAttr() != null && isSwitchJFromIng()) {
                 jForm.getTarget().setReportFitAttr(shiftReportFitAttr(old, jForm.getTarget().getReportFitAttr().isFitFont()));
             }
+            processAbsoluteLayoutCompatible(jForm.getTarget());
             TemplateTool.saveForm(jForm);
         }
         return template;
     }
 
+
+    private static void processAbsoluteLayoutCompatible(Form form){
+        Form.traversalWidget(form.getContainer(), new WidgetGather() {
+            @Override
+            public void dealWith(Widget widget) {
+                if (widget.acceptType(WAbsoluteBodyLayout.class)) {
+                    return;
+                }
+                WAbsoluteLayout absoluteLayout = (WAbsoluteLayout) widget;
+                //切换到新模板后，内部的绝对画布块都要设置成适应缩放的逻辑
+                absoluteLayout.setCompState(0);
+            }
+
+            @Override
+            public boolean dealWithAllCards() {
+                return true;
+            }
+        }, WAbsoluteLayout.class);
+    }
+
+
+
     /**
      * @Description: 创建模板核心方法
      * @param old 以前的方法

designer-realize/src/main/java/com/fr/start/module/DesignerESDActivator.java

@@ -1,6 +1,9 @@
 package com.fr.start.module;
 
+import com.fr.esd.cache.manager.RecommendManager;
 import com.fr.esd.core.strategy.config.service.StrategyConfigService;
+import com.fr.esd.core.strategy.recomend.EnabledTemplateService;
+import com.fr.esd.core.strategy.recomend.EnabledTemplateServiceProvider;
 import com.fr.esd.impl.strategy.config.service.DefaultStrategyConfigServiceProvider;
 import com.fr.module.Activator;
 
@@ -13,6 +16,7 @@ public class DesignerESDActivator extends Activator {
     @Override
     public void start() {
         StrategyConfigService.setService(new DefaultStrategyConfigServiceProvider());
+        EnabledTemplateService.getInstance().registerService(path -> RecommendManager.getInstance().findByPath(path) != null);
     }
 
     @Override