Merge pull request #21 in ~NEIL/design from release/10.0 to feature/10.0

* commit 'e04fd4abc356ddeed9bee5b5203e66726c8c8cdf': (54 commits)
  冲突
  .
  ct
  REPORT-21408 sumprecise 函数问题 公式需要变蓝， 改第三方库
  换一个扩展性更好的方式
  rt
  REPORT-19557 ToolbarItemProvider接口需要支持表单报表块
  取消屏蔽
  屏蔽回传代码
  补充日志
  fix 调试输出
  update
  REPORT-21871 批量添加单元格组 合并场景
  REPORT-21584 设置参数界面的设计宽度到100，所有控件还是可以正常显示
  update
  REPORT-20769  模版数据集数据库模糊查询交互产品改进 && REPORT-14560 同步到10.0
  REPORT-19945 设计器启动信息收集
  REPORT-19945 设计器启动信息收集
  客户端携带鉴权
  回传
  ...

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

@@ -24,6 +24,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogFormatter;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
+import com.fr.general.SupportLocale;
 import com.fr.general.locale.LocaleCenter;
 import com.fr.general.locale.LocaleMark;
 import com.fr.general.xml.GeneralXMLTools;
@@ -116,7 +117,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
     private Color paginationLineColor = Color.black; // line color of paper
     private boolean supportCellEditorDef = false;
     private boolean isDragPermited = false;
-    private Locale language = Locale.getDefault();
+    private Locale language = checkLocale(Locale.getDefault());
     //2014-8-26默认显示全部, 因为以前的版本, 虽然是false, 实际上是显示所有表, 因此这边要兼容
     private boolean useOracleSystemSpace = true;
     private int cachingTemplateLimit = CACHINGTEMPLATE_LIMIT;
@@ -1323,7 +1324,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         String tmpVal;
         if ((tmpVal = reader.getElementValue()) != null) {
             if (!CommonUtils.isNumber(tmpVal)) {
-                setLanguage(CommonUtils.stringToLocale(tmpVal));
+                setLanguage(checkLocale(CommonUtils.stringToLocale(tmpVal)));
             } else {
                 // 用于兼容10.0之前的版本
                 int value = Integer.parseInt(tmpVal);
@@ -1372,6 +1373,16 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter {
         }
     }
 
+    /**
+     * 对国际化进行校验
+     * 非简繁英日韩的默认环境 设计器全部默认为英文版本
+     * @param locale
+     * @return
+     */
+    private Locale checkLocale(Locale locale) {
+        return SupportLocale.getInstance().isSupport(locale) ? locale : Locale.US;
+    }
+
     private void readReportLengthUnit(XMLableReader reader) {
         String tmpVal;
         if (StringUtils.isNotBlank(tmpVal = reader.getElementValue())) {

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

@@ -20,6 +20,7 @@ import com.fr.plugin.AbstractExtraClassManager;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.plugin.injectable.PluginSingleInjection;
 import com.fr.plugin.solution.closeable.CloseableContainedSet;
+import com.fr.stable.Filter;
 import com.fr.stable.plugin.ExtraDesignClassManagerProvider;
 
 import java.util.ArrayList;
@@ -111,14 +112,27 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
         return result.toArray(new WidgetOption[result.size()]);
     }
 
-
     public WidgetOption[] getWebWidgetOptions() {
+        return getWebWidgetOptions(new Filter<ToolbarItemProvider>() {
+            @Override
+            public boolean accept(ToolbarItemProvider toolbarItemProvider) {
+                return true;
+            }
+        });
+    }
+
+    public WidgetOption[] getWebWidgetOptions(Filter<ToolbarItemProvider> filter) {
         Set<ToolbarItemProvider> set = getArray(ToolbarItemProvider.XML_TAG);
-        if (set.isEmpty()) {
+        return getWebWidgetOptions(set, filter);
+    }
+
+    public WidgetOption[] getWebWidgetOptions(Set<ToolbarItemProvider> set, Filter<ToolbarItemProvider> filter) {
+        if (set == null || set.isEmpty()) {
             return new WidgetOption[0];
         }
         List<WidgetOption> list = new ArrayList<>();
         for (ToolbarItemProvider provider : set) {
+            if (filter != null && filter.accept(provider)) {
                 WidgetOption option = WidgetOptionFactory.createByWidgetClass(
                         provider.nameForWidget(),
                         IOUtils.readIcon(provider.iconPathForWidget()),
@@ -126,11 +140,11 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
                 );
                 list.add(option);
             }
+        }
         return list.toArray(new WidgetOption[list.size()]);
     }
 
 
-
     public Map<Class<? extends Widget>, Class<?>> getFormWidgetOptionsMap() {
         Set<FormWidgetOptionProvider> set = getArray(FormWidgetOptionProvider.XML_TAG);
         Map<Class<? extends Widget>, Class<?>> map = new HashMap<>();
@@ -168,7 +182,6 @@ public class ExtraDesignClassManager extends AbstractExtraClassManager implement
     }
 
 
-
     public WidgetOption[] getCellWidgetOptions() {
         Set<CellWidgetOptionProvider> set = getArray(CellWidgetOptionProvider.XML_TAG);
         if (set.isEmpty()) {

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java

@@ -35,7 +35,7 @@ public class ConnectionTableProcedurePane extends BasicPane {
 	private ConnectionComboBoxPanel connectionComboBox;
 	private UICheckBox tableCheckBox;
 	private UICheckBox viewCheckBox;
-	private UITextField searchField;
+	protected UITextField searchField;
 	private TableViewList tableViewList;
 	private java.util.List<DoubleClickSelectedNodeOnTreeListener> listeners = new java.util.ArrayList<DoubleClickSelectedNodeOnTreeListener>();
 
@@ -90,12 +90,17 @@ public class ConnectionTableProcedurePane extends BasicPane {
 		this.add(tableViewListPane, BorderLayout.CENTER);
 		this.add(filterPane, BorderLayout.SOUTH);
 		this.setPreferredSize(new Dimension(WIDTH, getPreferredSize().height));
+		addKeyMonitor();
 	}
 
 	protected void filter(Connection connection, String conName, List<String> nameList) {
 		connection.addConnection(nameList, conName, new Class[]{AbstractDatabaseConnection.class});
 	}
 
+	protected void addKeyMonitor() {
+
+	}
+
 	protected JPanel createCheckBoxgroupPane() {
 		JPanel checkBoxgroupPane = FRGUIPaneFactory.createNColumnGridInnerContainer_S_Pane(2);
 		JPanel first = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();

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

@@ -57,6 +57,8 @@ import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
+import java.awt.event.KeyEvent;
+import java.awt.event.KeyListener;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -95,6 +97,30 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> {
 
                 connection.addConnection(nameList, conName, new Class[]{JDBCDatabaseConnection.class, JNDIDatabaseConnection.class});
             }
+
+            @Override
+            protected void addKeyMonitor() {
+                searchField.addKeyListener(new KeyListener() {
+                    
+                    @Override
+                    public void keyTyped(KeyEvent e) {
+
+                    }
+
+                    @Override
+                    public void keyPressed(KeyEvent e) {
+                        if (e.getKeyCode() == KeyEvent.VK_ENTER) {
+                            e.setKeyCode(KeyEvent.VK_UP);
+                            DBTableDataPane.this.connectionTableProcedurePane.requestFocus();
+                        }
+                    }
+
+                    @Override
+                    public void keyReleased(KeyEvent e) {
+
+                    }
+                });
+            }
         };
         connectionTableProcedurePane.addDoubleClickListener(new DoubleClickSelectedNodeOnTreeListener() {
 

designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@@ -11,6 +11,7 @@ import com.fr.general.ComparatorUtils;
 import com.fr.general.GeneralContext;
 import com.fr.general.IOUtils;
 import com.fr.general.http.HttpClient;
+import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.PluginStoreConstants;
@@ -293,10 +294,9 @@ public class WebViewDlgHelper {
         new SwingWorker<Void, Void>() {
             @Override
             protected Void doInBackground() throws Exception {
-                HttpClient httpClient = new HttpClient(CloudCenter.getInstance().acquireUrlByKind("shop.plugin.update") + "?" + PluginUtils.FR_VERSION + "=" + ProductConstants.VERSION + "&version=" + PluginStoreConstants.getInstance().getProps("VERSION"));
+                String url = CloudCenter.getInstance().acquireUrlByKind("shop.plugin.update");
-                httpClient.asGet();
+                if (url != null) {
-                if (httpClient.getResponseCode() == HttpURLConnection.HTTP_OK) {
+                    String text = HttpToolbox.get(url + "?" + PluginUtils.FR_VERSION + "=" + ProductConstants.VERSION + "&version=" + PluginStoreConstants.getInstance().getProps("VERSION"));
-                    String text = httpClient.getResponseText();
                     JSONObject resultJSONObject = new JSONObject(text);
                     String isLatest = resultJSONObject.optString("result");
                     if (!ComparatorUtils.equals(isLatest, LATEST)) {

designer-base/src/main/java/com/fr/design/file/HistoryTemplateListCache.java

@@ -264,11 +264,6 @@ public class HistoryTemplateListCache implements CallbackEvent {
                 if (size == index + 1 && index > 0) {
                     //如果删除的是后一个Tab，则定位到前一个
                     MutilTempalteTabPane.getInstance().setSelectedIndex(index - 1);
-                    JTemplate selectedFile = MutilTempalteTabPane.getInstance().getSelectedFile();
-                    if (!isCurrentEditingFile(selectedFile.getPath())) {
-                        //如果此时面板上的实时刷新的selectedIndex得到的和历史的不一样
-                        DesignerContext.getDesignerFrame().activateJTemplate(selectedFile);
-                    }
                 }
             }
         }
@@ -277,6 +272,13 @@ public class HistoryTemplateListCache implements CallbackEvent {
         if (openFileCount == 0) {
             DesignerContext.getDesignerFrame().addAndActivateJTemplate();
         }
+
+        JTemplate selectedFile = MutilTempalteTabPane.getInstance().getSelectedFile();
+        if (!isCurrentEditingFile(selectedFile.getPath())) {
+            //如果此时面板上的实时刷新的selectedIndex得到的和历史的不一样
+            DesignerContext.getDesignerFrame().activateJTemplate(selectedFile);
+        }
+
         MutilTempalteTabPane.getInstance().repaint();
     }
 

designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java

@@ -156,6 +156,9 @@ public class MutilTempalteTabPane extends JComponent {
     }
 
     public JTemplate getSelectedFile() {
+        if (openedTemplate.size() == selectedIndex) {
+            selectedIndex = Math.max(--selectedIndex, 0);
+        }
         return openedTemplate.get(selectedIndex);
     }
 

designer-base/src/main/java/com/fr/design/fun/ToolbarItemProvider.java

@@ -1,6 +1,8 @@
 package com.fr.design.fun;
 
+import com.fr.design.mainframe.JTemplate;
 import com.fr.form.ui.Widget;
+import com.fr.stable.Filter;
 import com.fr.stable.fun.mark.Mutable;
 
 /**
@@ -8,7 +10,7 @@ import com.fr.stable.fun.mark.Mutable;
  * @since : 8.0
  * 自定义web工具栏菜单
  */
-public interface ToolbarItemProvider extends Mutable {
+public interface ToolbarItemProvider extends Mutable, Filter<JTemplate> {
 
     String XML_TAG = "ToolbarItemProvider";
 
@@ -36,4 +38,12 @@ public interface ToolbarItemProvider extends Mutable {
      */
     String nameForWidget();
 
+    /**
+     * 模板（决策报表 or cpt）是否支持此工具栏按钮
+     * JTemplate  模板
+     * @return 支持返回true, 否则false
+     */
+    @Override
+    boolean accept(JTemplate template);
+
 }

designer-base/src/main/java/com/fr/design/fun/impl/AbstractToolbarItem.java

@@ -1,6 +1,9 @@
 package com.fr.design.fun.impl;
 
+import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.fun.ToolbarItemProvider;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.JVirtualTemplate;
 import com.fr.stable.fun.impl.AbstractProvider;
 import com.fr.stable.fun.mark.API;
 
@@ -10,6 +13,7 @@ import com.fr.stable.fun.mark.API;
 @API(level = ToolbarItemProvider.CURRENT_LEVEL)
 public abstract class AbstractToolbarItem extends AbstractProvider implements ToolbarItemProvider {
 
+    @Override
     public int currentAPILevel() {
         return CURRENT_LEVEL;
     }
@@ -18,4 +22,12 @@ public abstract class AbstractToolbarItem extends AbstractProvider implements To
     public String mark4Provider() {
         return getClass().getName();
     }
+
+    @Override
+    public boolean accept(JTemplate jTemplate) {
+        if (jTemplate == null) {
+            jTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        }
+        return jTemplate == null || jTemplate.isJWorkBook() || jTemplate instanceof JVirtualTemplate;
+    }
 }

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -532,7 +532,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
             String oldName = fnf.getName();
             String suffix = fnf.isDirectory() ? StringUtils.EMPTY : oldName.substring(oldName.lastIndexOf(CoreConstants.DOT), oldName.length());
-            oldName = oldName.replace(suffix, StringUtils.EMPTY);
+            oldName = StringUtils.replaceLast(oldName, suffix, StringUtils.EMPTY);
             this.setLayout(new BorderLayout());
             this.setModal(true);
 
@@ -651,7 +651,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
             String oldName = fnf.getName();
             String suffix = fnf.isDirectory() ? StringUtils.EMPTY : oldName.substring(oldName.lastIndexOf(CoreConstants.DOT), oldName.length());
-            oldName = oldName.replaceAll(suffix, StringUtils.EMPTY);
+            oldName = StringUtils.replaceLast(oldName, suffix, StringUtils.EMPTY);
 
             // 输入为空或者没有修改
             if (ComparatorUtils.equals(userInput, oldName)) {

designer-base/src/main/java/com/fr/design/update/ui/dialog/RestoreResultDialog.java

@@ -12,6 +12,7 @@ import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.project.ProjectConstants;
 
+
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.JDialog;

designer-base/src/main/resources/com/fr/design/gui/syntax/ui/rsyntaxtextarea/modes/FormulaTokenMaker.flex

@@ -578,7 +578,13 @@ FunctionNames = "ABS"|
                 "YEAR"|
                 "year"|
                 "YEARDELTA"|
-                "yeardelta"
+                "yeardelta"|
+                "SUMPRECISE"|
+                "sumprecise"|
+                "QUERY"|
+                "query"|
+                "WEBIMAGE"|
+                "webimage"
 
 
 %state MLC

designer-base/src/test/java/com/fr/design/ExtraDesignClassManagerTest.java

@@ -0,0 +1,70 @@
+package com.fr.design;
+
+import com.fr.config.dao.DaoContext;
+import com.fr.config.dao.impl.LocalClassHelperDao;
+import com.fr.config.dao.impl.LocalEntityDao;
+import com.fr.config.dao.impl.LocalXmlEntityDao;
+import com.fr.design.fun.ToolbarItemProvider;
+import com.fr.design.gui.core.WidgetOption;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.mainframe.JVirtualTemplate;
+import com.fr.general.ModuleContext;
+import com.fr.log.FineLoggerFactory;
+import com.fr.report.restriction.CellCountRestriction;
+import com.fr.report.restriction.ReportRestrictionScene;
+import com.fr.restriction.Restrictions;
+import com.fr.stable.Filter;
+import com.fr.stable.module.Module;
+import junit.framework.TestCase;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author zack
+ * @version 10.0
+ *          Created by zack on 2019/9/17
+ */
+public class ExtraDesignClassManagerTest extends TestCase {
+    @Override
+    protected void setUp() throws Exception {
+        DaoContext.setEntityDao(new LocalEntityDao());
+        DaoContext.setClassHelperDao(new LocalClassHelperDao());
+        DaoContext.setXmlEntityDao(new LocalXmlEntityDao());
+        ModuleContext.startModule(Module.PAGE_MODULE);
+        Restrictions.register(ReportRestrictionScene.CELL_COUNT, new CellCountRestriction());
+    }
+
+    public void testGetWebOption() {
+        try {
+            final JTemplate jTemplate = new JVirtualTemplate(null);
+            ToolbarItemProvider item = EasyMock.mock(ToolbarItemProvider.class);
+            ToolbarItemProvider item1 = EasyMock.mock(ToolbarItemProvider.class);
+            EasyMock.expect(item.accept(jTemplate)).andReturn(false).anyTimes();
+            EasyMock.expect(item.classForWidget()).andReturn(null).anyTimes();
+            EasyMock.expect(item.iconPathForWidget()).andReturn("").anyTimes();
+            EasyMock.expect(item.nameForWidget()).andReturn("1").anyTimes();
+            EasyMock.expect(item1.accept(jTemplate)).andReturn(true).anyTimes();
+            EasyMock.expect(item1.classForWidget()).andReturn(null).anyTimes();
+            EasyMock.expect(item1.iconPathForWidget()).andReturn("").anyTimes();
+            EasyMock.expect(item1.nameForWidget()).andReturn("2").anyTimes();
+            EasyMock.replay(item);
+            EasyMock.replay(item1);
+
+            Set<ToolbarItemProvider> set = new HashSet<>();
+            set.add(item);
+            set.add(item1);
+            WidgetOption[] widgetOptions = ExtraDesignClassManager.getInstance().getWebWidgetOptions(set, new Filter<ToolbarItemProvider>() {
+                @Override
+                public boolean accept(ToolbarItemProvider toolbarItemProvider) {
+                    return toolbarItemProvider.accept(jTemplate);
+                }
+            });
+            Assert.assertEquals(1, widgetOptions.length);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+    }
+}

designer-form/src/main/java/com/fr/design/designer/properties/FormWidgetAuthorityEditPane.java

@@ -56,6 +56,7 @@ public class FormWidgetAuthorityEditPane extends AuthorityEditPane {
             for (String selectedRole : selectedArray) {
                 for (Widget widget : widgets) {
                     widget.changeVisibleAuthorityState(selectedRole, widgetVisible.isSelected());
+                    widgetAvailable.setEnabled(widgetVisible.isSelected());
                 }
             }
             doAfterAuthority();

designer-form/src/main/java/com/fr/design/mainframe/widget/accessibles/AccessibleElementCaseToolBarEditor.java

@@ -1,13 +1,17 @@
 package com.fr.design.mainframe.widget.accessibles;
 
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.fun.ToolbarItemProvider;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.mainframe.FormWebWidgetConstants;
 import com.fr.design.mainframe.widget.editors.ElementCaseToolBarPane;
 import com.fr.design.mainframe.widget.wrappers.ElementCaseToolBarWrapper;
 import com.fr.form.web.FormToolBarManager;
 import com.fr.stable.ArrayUtils;
+import com.fr.stable.Filter;
 
 import javax.swing.SwingUtilities;
 import java.util.ArrayList;
@@ -52,6 +56,13 @@ public class AccessibleElementCaseToolBarEditor extends UneditableAccessibleEdit
         List<WidgetOption> defaultOptions = Arrays.asList(FormWebWidgetConstants.getFormElementCaseToolBarInstance());
         List<WidgetOption> options = new ArrayList<WidgetOption>();
         options.addAll(defaultOptions);
+        WidgetOption[] widgetOptions = ExtraDesignClassManager.getInstance().getWebWidgetOptions(new Filter<ToolbarItemProvider>() {
+            @Override
+            public boolean accept(ToolbarItemProvider toolbarItemProvider) {
+                return toolbarItemProvider.accept(HistoryTemplateListCache.getInstance().getCurrentEditingTemplate());
+            }
+        });
+        options.addAll(Arrays.asList(widgetOptions));
         return options.toArray(new WidgetOption[options.size()]);
     }
 

designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@@ -24,6 +24,7 @@ import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.widget.accessibles.AccessibleBackgroundEditor;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.ui.designer.AbstractDataModify;
+import com.fr.design.widget.ui.designer.component.UIBoundSpinner;
 import com.fr.form.ui.container.WParameterLayout;
 import com.fr.general.Background;
 
@@ -61,7 +62,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
 
     public void initComponent() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
-        designerWidth = new UISpinner(1, Integer.MAX_VALUE, 1);
+        designerWidth = new UIBoundSpinner(1, Integer.MAX_VALUE, 1);
         JPanel advancePane = createAdvancePane();
         UIExpandablePane advanceExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, advancePane);
         this.add(advanceExpandablePane, BorderLayout.NORTH);
@@ -162,7 +163,11 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
     public WParameterLayout updateBean() {
         WParameterLayout wParameterLayout = (WParameterLayout) creator.toData();
         wParameterLayout.setLabelName(labelNameTextField.getText());
+        if (isCompsOutOfDesignerWidth((int) designerWidth.getValue())) {
+            designerWidth.setValue(wParameterLayout.getDesignWidth());
+        } else {
             wParameterLayout.setDesignWidth((int) designerWidth.getValue());
+        }
         wParameterLayout.setDelayDisplayContent(displayReport.isSelected());
         wParameterLayout.setUseParamsTemplate(useParamsTemplate.isSelected());
         JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
@@ -172,6 +177,15 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         return wParameterLayout;
     }
 
+    private boolean isCompsOutOfDesignerWidth(int designerWidth){
+        for(int i=0; i<root.getComponentCount(); i++){
+            Component comp = root.getComponent(i);
+            if(comp.getX() + comp.getWidth() > designerWidth){
+                return true;
+            }
+        }
+        return false;
+    }
     @Override
     public DataCreatorUI dataUI() {
         return null;

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

@@ -19,6 +19,7 @@ import com.fr.design.mainframe.MobileWidgetListPane;
 import com.fr.design.mainframe.WidgetPropertyPane;
 import com.fr.form.ui.container.WParameterLayout;
 import com.fr.form.ui.container.WSortLayout;
+import com.fr.general.CloudCenter;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.SiteCenter;
 import com.fr.log.FineLoggerFactory;
@@ -87,9 +88,7 @@ public class ParaMobileDefinePane extends MobileWidgetDefinePane {
         double[] rowSize = {p, p};
         double[] columnSize = {p, f};
         int[][] rowCount = {{1, 1}, {1, 1}};
-        if (ExtraReportClassManager.getInstance().getArray(MobileParamStyleProvider.MARK_STRING).size() != 0) {
+        if (ExtraReportClassManager.getInstance().getArray(MobileParamStyleProvider.MARK_STRING).isEmpty()) {
-            tipLabel = null;
-        } else {
             ((WParameterLayout) (paraCreator.toData())).setProvider((MobileParamStyleProvider) ((Item) paramLocationComboBox.getItemAt(0)).getValue());
         }
         Component[][] components = new Component[][]{
@@ -127,10 +126,9 @@ public class ParaMobileDefinePane extends MobileWidgetDefinePane {
             @Override
             public void mouseClicked(MouseEvent e) {
                 try {
-                    //todo 添加对应插件下载地址
+                    Desktop.getDesktop().browse(new URI(CloudCenter.getInstance().acquireUrlByKind("plugin.mobile.style")));
-                    Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("plugin.download")));
                 } catch (Exception exp) {
-
+                    FineLoggerFactory.getLogger().error(exp.getMessage(), exp);
                 }
             }
             @Override

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

@@ -62,8 +62,7 @@ public class CellElementEditPane extends BasicPane {
             @Override
             public void tabChanged(int index) {
                 card.show(center, paneList.get(index).title4PopupWindow());
-                paneList.get(index).populateBean(cellelement, ePane);// 设置面板变了，也要populate
+                populate(ePane);
-                paneList.get(index).addAttributeChangeListener(listener);
                 if (titleChangeListener != null) {
                     titleChangeListener.fireTitleChange(getSelectedTabName());
                 }

designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/StartupMessageCollector.java

@@ -0,0 +1,92 @@
+package com.fr.design.mainframe.messagecollect;
+
+import com.fr.concurrent.NamedThreadFactory;
+import com.fr.design.DesignerEnvManager;
+import com.fr.design.mainframe.SiteCenterToken;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
+import com.fr.general.CloudCenter;
+import com.fr.general.ComparatorUtils;
+import com.fr.general.http.HttpToolbox;
+import com.fr.json.JSONObject;
+import com.fr.log.FineLoggerFactory;
+import com.fr.module.ModuleContext;
+import com.fr.module.engine.FineModule;
+import com.fr.runtime.FineRuntime;
+import com.fr.stable.StringUtils;
+
+import java.util.HashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * 启动信息收集
+ *
+ * @author vito
+ * @version 10.0
+ * Created by vito on 2019/9/4
+ */
+public class StartupMessageCollector {
+
+    private static final String XML_STARTUP_TIME = "t";
+    private static final String XML_STARTUP_LOG = "startupLog";
+    private static final String XML_STARTUP_Memory = "designerMemory";
+    private static final String XML_STARTUP_COST = "cost";
+    private static final String XML_UUID = "UUID";
+    private static final String STARTUP_URL_KEY = "user.info.v10.startup";
+    private static final String LOG_TYPE = "single";
+    private static final int BYTE_TO_MB = 1024 * 1024;
+
+    public static final StartupMessageCollector INSTANCE = new StartupMessageCollector();
+
+    private StartupMessageCollector() {
+    }
+
+    public static StartupMessageCollector getInstance() {
+        return INSTANCE;
+    }
+
+    public void recordStartupLog() {
+        EventDispatcher.listen(FineRuntime.ApplicationEvent.AFTER_START, new Listener<Long>() {
+
+            @Override
+            public void on(Event event, Long param) {
+                final String url = CloudCenter.getInstance().acquireUrlByKind(STARTUP_URL_KEY);
+                if (StringUtils.isEmpty(url)) {
+                    return;
+                }
+                ExecutorService es = Executors.newSingleThreadExecutor(new NamedThreadFactory("StartupMessageCollector"));
+                es.submit(new Runnable() {
+                    @Override
+                    public void run() {
+                        FineModule root = (FineModule) ModuleContext.getRoot().getRoot();
+                        JSONObject profile = root.profile();
+                        JSONObject json = JSONObject.create()
+                                .put(XML_UUID,  DesignerEnvManager.getEnvManager().getUUID())
+                                .put(XML_STARTUP_TIME, FineRuntime.getAppStartTime() + FineRuntime.getStartingTime())
+                                .put(XML_STARTUP_COST, FineRuntime.getStartingTime())
+                                .put(XML_STARTUP_LOG, profile)
+                                .put(XML_STARTUP_Memory, Runtime.getRuntime().totalMemory() / BYTE_TO_MB);
+                        sendInfo(json, url + LOG_TYPE);
+                    }
+                });
+                es.shutdown();
+            }
+        });
+    }
+
+    private boolean sendInfo(JSONObject content, String url) {
+        boolean success = false;
+        try {
+            HashMap<String, Object> para = new HashMap<>();
+            para.put("token", SiteCenterToken.generateToken());
+            para.put("content", content);
+            String res = HttpToolbox.post(url, para);
+            success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return success;
+    }
+}

designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/solid/SolidCollectConstants.java

@@ -0,0 +1,18 @@
+package com.fr.design.mainframe.messagecollect.solid;
+
+/**
+ * Created by alex sung on 2019/9/5.
+ */
+public class SolidCollectConstants {
+    private SolidCollectConstants(){}
+
+    /**
+     * 客户端请求subject
+     */
+    public static final String REQUEST_SUBJECT = "solid";
+
+    /**
+     * 客户端请求超时鉴权时间，默认1h失效
+     */
+    public static final long TIME_OUT = 60 * 60 * 1000;
+}

designer-realize/src/main/java/com/fr/design/mainframe/messagecollect/solid/SolidCollector.java

@@ -0,0 +1,97 @@
+package com.fr.design.mainframe.messagecollect.solid;
+
+import com.fr.general.CloudCenter;
+import com.fr.general.http.HttpToolbox;
+import com.fr.json.JSON;
+import com.fr.json.JSONFactory;
+import com.fr.log.FineLoggerFactory;
+import com.fr.security.JwtUtils;
+import com.fr.stable.CommonUtils;
+import com.fr.stable.StringUtils;
+import com.fr.workspace.WorkContext;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.fr.design.mainframe.messagecollect.solid.SolidCollectConstants.REQUEST_SUBJECT;
+import static com.fr.design.mainframe.messagecollect.solid.SolidCollectConstants.TIME_OUT;
+
+/**
+ * 设计器固化信息回传类
+ * Created by alex sung on 2019/8/22.
+ */
+
+
+public class SolidCollector {
+    private static final String CONTENT_URL = "/v10/collect/solid";
+    private static final String DELETE_URL = "/v10/collect/solid/delete";
+    private static final String UNLOCK_URL = "/v10/collect/solid/unlock";
+    private static final String ATTR_CIPHER_TEXT = "cipherText";
+    private static final String ATTR_SIGNATURE = "signature";
+    private static final String SOLID_UPLOAD_URL = CloudCenter.getInstance().acquireUrlByKind("design.solid");
+
+    private static volatile SolidCollector instance;
+
+    public static SolidCollector getInstance() {
+        if (instance == null) {
+            synchronized (SolidCollector.class) {
+                if (instance == null) {
+                    instance = new SolidCollector();
+                }
+            }
+        }
+        return instance;
+    }
+
+    /**
+     * 回传文件给云中心，并删除服务端本地文件
+     */
+    public void sendToCloudCenterAndDeleteFile() {
+        if (WorkContext.getCurrent().isLocal()) {
+            return;
+        }
+        FineLoggerFactory.getLogger().info("start to get solid content from server...");
+        try {
+            String content = requestContent();
+            if (StringUtils.isNotEmpty(content)) {
+                String cipherText = JSONFactory.createJSON(JSON.OBJECT, content).optString("data");
+                if(StringUtils.isNotEmpty(cipherText)){
+                    Map<String, Object> params = new HashMap<>();
+                    params.put(ATTR_CIPHER_TEXT, cipherText);
+                    params.put(ATTR_SIGNATURE, String.valueOf(CommonUtils.signature()));
+                    HttpToolbox.post(SOLID_UPLOAD_URL, params);
+
+                    String deleteUrl = WorkContext.getCurrent().getPath() + DELETE_URL;
+                    HttpToolbox.post(deleteUrl, getParams());
+                }
+            }
+            FineLoggerFactory.getLogger().info("send solid content to cloud center success.");
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().info(e.getMessage(), e);
+        } finally {
+            String unlockUrl = WorkContext.getCurrent().getPath() + UNLOCK_URL;
+            try {
+                HttpToolbox.post(unlockUrl, getParams());
+            } catch (IOException e) {
+                FineLoggerFactory.getLogger().warn(e.getMessage(), e);
+            }
+        }
+    }
+
+    /**
+     * 获取服务端固化文件内容
+     * @return 回传内容
+     */
+    public String requestContent() throws Exception {
+        Map<String, String> params = new HashMap<String, String>();
+        params.put("token", JwtUtils.createDefaultJWT(REQUEST_SUBJECT, TIME_OUT));
+        return HttpToolbox.get(WorkContext.getCurrent().getPath() + CONTENT_URL, params);
+    }
+
+    private Map<String, Object> getParams() {
+        Map<String, Object> params = new HashMap<String, Object>();
+        params.put("token", JwtUtils.createDefaultJWT(REQUEST_SUBJECT, TIME_OUT));
+        return params;
+    }
+}

designer-realize/src/main/java/com/fr/design/webattr/ToolBarDragPane.java

@@ -35,6 +35,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.ImageObserver;
+import java.util.List;
 
 /**
  * 新的拖拽ToolBar button以实现自定义工具栏 报表web设置那儿的.应该不叫ToolBarDragPane，因为实际没有提供drag功能
@@ -225,6 +226,16 @@ public class ToolBarDragPane extends WidgetToolBarPane {
 	public void setAllEnabled(boolean b) {
 		GUICoreUtils.setEnabled(this, b);
 		isEnabled = b;
+		removeAllListener(northToolBar.getToolBarButtons());
+	}
+
+	private void removeAllListener(List<ToolBarButton> toolBarButtons) {
+		for (ToolBarButton button : toolBarButtons) {
+			button.setEnabled(isEnabled);
+			if (!isEnabled) {
+				button.removeMouseListener(button);
+			}
+		}
 	}
 
 	/**

designer-realize/src/main/java/com/fr/design/webattr/WebSettingPane.java

@@ -122,8 +122,8 @@ public abstract class WebSettingPane<T extends WebContent> extends BasicBeanPane
 			choseComboBox.removeItemListener(itemListener);
 			choseComboBox.setSelectedIndex(SERVER_SET);
 			choseComboBox.addItemListener(itemListener);
-			checkEnabled(false);
 			populateServerSettings();
+			checkEnabled(false);
 			return;
 		}
 		// 模板设置

designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@@ -27,6 +27,7 @@ import com.fr.design.selection.SelectionListener;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
+import com.fr.report.cell.TemplateCellElement;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.ColumnRowGroup;
 import com.fr.stable.StringUtils;
@@ -427,7 +428,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                     dealSelectColRow(add, cellselection);
                 } else {
                     ColumnRow columnRow = ColumnRow.valueOf(cellselection.getColumn(), cellselection.getRow());
-                    String allColumnRow = columnRow.toString();
+                    String allColumnRow = newValue.toString();
                     if (!allColumnRow.contains(columnRow.toString())) {
                         add.addColumnRow(columnRow);
                     }
@@ -454,6 +455,16 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                 newAdd.clear();
                 for (int i = 0; i < cs; i++) {
                     for (int j = 0; j < rs; j++) {
+                        TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j );
+                        if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
+                            String value = cellElement.toString();
+                            if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
+                                add.addColumnRow(ColumnRow.valueOf(value));
+                            }
+                            newAdd.add(value);
+                        }
+
+                        if (cellElement == null) {
                             ColumnRow columnRow = ColumnRow.valueOf(c + i, r + j);
                             if (!allColumnRow.contains(columnRow.toString())) {
                                 add.addColumnRow(columnRow);
@@ -461,6 +472,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                             newAdd.add(columnRow.toString());
                         }
                     }
+                }
                 int oldSize = oldAdd.size();
                 int newSize = newAdd.size();
                 if (oldSize > newSize && oldAdd.containsAll(newAdd)) {

designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java

@@ -136,6 +136,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
      * @date 2014-11-24-下午3:48:19
      */
     public void resetSelectionAndChooseState() {
+        boolean chooseBlock = designer.isChooseBlock();
         designer.setChooseType(SelectionType.INNER);
         if (DesignerMode.isAuthorityEditing()) {
             JTemplate jTemplate = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
@@ -167,7 +168,9 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
             conditionAttributesGroupPane.populate(editComponent);
 
             EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
-
+            if (chooseBlock) {
+                EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_CELL_ATTR);
+            }
         }
 
         // 超级链接

designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellFormulaQuickEditor.java

@@ -103,7 +103,7 @@ public class CellFormulaQuickEditor extends CellQuickEditor {
         formulaButton.addActionListener(new ActionListener() {
             public void actionPerformed(ActionEvent evt) {
                 String text = formulaTextField.getText();
-                final UIFormula formulaPane = FormulaFactory.createFormulaPane();
+                final UIFormula formulaPane = FormulaFactory.createFormulaPaneWhenReserveFormula();
                 formulaPane.populate(BaseFormula.createFormulaBuilder().build(text));
                 formulaPane.showLargeWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
                     @Override