Merge branch 'feature/10.0' of https://cloud.finedevelop.com/scm/~bjorn/design into feature/10.0

designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java

@@ -26,9 +26,9 @@ import com.fr.workspace.server.vcs.git.config.GcConfig;
 import javax.swing.Icon;
 import javax.swing.border.EmptyBorder;
 import java.awt.Color;
-import java.util.Date;
 
-import static com.fr.stable.StableUtils.pathJoin;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 /**
  * Created by XiaXiang on 2019/4/17.

designer-base/src/main/java/com/fr/design/remote/ui/AbstractManagerPane.java

@@ -314,16 +314,15 @@ public abstract class AbstractManagerPane extends BasicPane {
 
     private void addToMemberList() {
         addingListModel.clear();
-        for (RemoteDesignMember member : addingMembers) {
+        for (RemoteDesignMember addingMember : addingMembers) {
             // 如果包含在右侧列表中，那么左侧列表默认选中
-            if (addedMembers.contains(member)) {
+            for (RemoteDesignMember addedMember : addedMembers){
-                member.setAuthority(true);
+                if (addingMember.equals(addedMember)){
-                member.setSelected(true);
+                    addingMember.setAuthority(addedMember.hasAuthority());
-            } else {
+                    addingMember.setSelected(true);
-                member.setAuthority(false);
+                }
-                member.setSelected(false);
             }
-            addingListModel.addElement(member);
+            addingListModel.addElement(addingMember);
         }
         addingList.revalidate();
         addingList.repaint();

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java

@@ -3,7 +3,6 @@ package com.fr.design.mainframe.chart.gui;
 import com.fr.base.BaseUtils;
 import com.fr.chart.base.AttrChangeConfig;
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartattr.SwitchState;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.beans.BasicBeanPane;
@@ -187,12 +186,6 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     private void calculateMultiChartMode() {
         //设置切换功能是否可用
         editingCollection.getChangeConfigAttr().setEnable(changeEnable());
-        //多图表切换模式
-        if (editingCollection.getChartCount() > 1) {
-            editingCollection.setState(SwitchState.CHANGE);
-        } else {
-            editingCollection.setState(SwitchState.DEFAULT);
-        }
     }
 
     /**
@@ -363,7 +356,7 @@ public class ChartTypeButtonPane extends BasicBeanPane<ChartCollection> implemen
     private void checkConfigButtonVisible() {
         addButton.setVisible(ChartTypeManager.enabledChart(editingCollection.getSelectedChartProvider().getID()));
         //新建一个collection
-        if (editingCollection.getState() == SwitchState.DEFAULT && editingCollection.getSelectedChartProvider() != null) {
+        if (editingCollection.getChartCount() == 1 && editingCollection.getSelectedChartProvider() != null) {
             //Chart 不支持图表切换
             configButton.setVisible(supportChange());
         }

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypePane.java

@@ -1,7 +1,6 @@
 package com.fr.design.mainframe.chart.gui;
 
 import com.fr.chart.chartattr.ChartCollection;
-import com.fr.chart.chartattr.SwitchState;
 import com.fr.chart.charttypes.ChartTypeManager;
 import com.fr.chartx.attr.ChartProvider;
 import com.fr.design.ChartTypeInterfaceManager;
@@ -218,7 +217,7 @@ public class ChartTypePane extends AbstractChartAttrPane{
 			//第一步就是重构cards
 			cards.clear();
 			if (enabledChart) {
-				if (collection.getState() == SwitchState.DEFAULT) {
+				if (collection.getChartCount() == 1) {
 					addAllCards();
 				} else {
 					addOnePriorityCards(priority);