Merge branch 'feature/x' of https://code.fineres.com/scm/~yuan.wang/design into feature/x

designer-base/src/main/java/com/fr/design/javascript/JavaScriptActionPane.java

@@ -42,7 +42,7 @@ public abstract class JavaScriptActionPane extends UIComboBoxPane<JavaScript> {
     protected List<FurtherBasicBeanPane<? extends JavaScript>> initPaneList() {
         List<FurtherBasicBeanPane<? extends JavaScript>> paneList = new ArrayList<FurtherBasicBeanPane<? extends JavaScript>>();
         // JS脚本,表单提交,提交入库,流程管理,发送邮件. 703中去掉表单提交和流程管理
-        paneList.add(new JavaScriptImplPane(getDefaultArgs()));
+        paneList.add(new JavaScriptImplPane(getDefaultArgs(),true));
 //		paneList.add(new FormSubmitJavaScriptPane(this));
         contentDBManiPane = new ArrayList();
         contentDBManiPane.add(createDBManipulationPane());

designer-base/src/main/java/com/fr/design/style/color/ColorCell.java

@@ -100,11 +100,13 @@ public class ColorCell extends JComponent implements ColorSelectable {
 
         if (e == null || e.getID() == MouseEvent.MOUSE_RELEASED) {
             colorSelectable.setColor(this.getColor());
-            colorSelectable.colorSetted(this);
+            // 先添加最近使用
             if (this.getColor() != null) {
                 int rgb = this.getColor().getRGB();
                 DesignerEnvManager.getEnvManager().getColorConfigManager().addToColorQueue(new Color(rgb));
             }
+            // 这边会获取到最近使用颜色并更新 添加逻辑需要放到前面 否则不会及时更新
+            colorSelectable.colorSetted(this);
         }
 
         if (e != null) {