Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~zheng/C-design into release/10.0

designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberField.java

@@ -35,6 +35,7 @@ public class UINumberField extends UITextField {
     private double maxValue = Double.MAX_VALUE;
 
     private boolean isContentChanged = false;
+    private boolean fillNegativeNumber = true;
 
     public UINumberField() {
         this(MAX_INTEGERLENGTH_32, MAX_DECIMALLENGTH);
@@ -62,6 +63,10 @@ public class UINumberField extends UITextField {
         initListener();
     }
 
+    public void canFillNegativeNumber(boolean fillNegativeNumber) {
+        this.fillNegativeNumber = fillNegativeNumber;
+    }
+
     public int getMaxIntegerLength() {
         return maxIntegerLength;
     }
@@ -185,6 +190,9 @@ public class UINumberField extends UITextField {
         // kunsnat: 这种限制输入 有个不好的地方, 比如删除时: 10.1  最大值限定100, 那么就删除中间的小数点之后变为101, 超出了100.
         // 但是直接限制不能删除中间类似小数点, 那么也可能遇到: 最小值10 , 从100变化到其中的19, 就很难..
         private boolean notChange(String strNew) {
+            if (!fillNegativeNumber && strNew.contains("-")) {
+                return true;
+            }
             boolean noChange = false;
             boolean isMinus = strNew.startsWith("-");
             strNew = strNew.replaceFirst("-", StringUtils.EMPTY); // 控制能输入负数

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java

@@ -368,6 +368,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         sizeJPanel.add(heightLabel);
         UINumberField heightTextFiled = new UINumberField();
         heightTextFiled.setMinValue(0);
+        heightTextFiled.canFillNegativeNumber(false);
         heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE));
         heightTextFiled.setPreferredSize(new Dimension(40, 20));
         sizeJPanel.add(heightTextFiled);
@@ -377,6 +378,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         sizeJPanel.add(widthLabel);
         UINumberField widthTextFiled = new UINumberField();
         widthTextFiled.setMinValue(0);
+        widthTextFiled.canFillNegativeNumber(false);
         widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE));
         widthTextFiled.setPreferredSize(new Dimension(40, 20));
         sizeJPanel.add(widthTextFiled);

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java

@@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.design.style.color.ColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.mobile.MobileStyle;
@@ -23,7 +23,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
     private Widget widget;
     private MobileStyleCustomDefinePane customBeanPane;
     private Class<? extends MobileStyle> mobileStyleClazz;
-    private NewColorSelectBox colorSelectBox;
+    private ColorSelectBox colorSelectBox;
     private Color titleColor = new Color(47, 142, 241);
 
     MobileStyleDefinePane(Widget widget, Class<? extends MobileStyleCustomDefinePane> customBeanPaneClass,
@@ -91,7 +91,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
         UILabel colorSelectLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Widget_Background"), UILabel.RIGHT);
         colorSelectLabel.setPreferredSize(new Dimension(65, 20));
 
-        colorSelectBox = new NewColorSelectBox(152);
+        colorSelectBox = new ColorSelectBox(152);
         colorSelectBox.addSelectChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {

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

@@ -67,6 +67,12 @@ public abstract class AbstractManagerPane extends BasicPane {
      */
     private List<RemoteDesignMember> addedMembers = new ArrayList<>();
 
+
+    /**
+     * 具有设计权限的角色/用户
+     */
+    private List<RemoteDesignMember> authorityMembers = new ArrayList<>();
+
     /**
      * 决策平台用户列表model
      */
@@ -211,6 +217,9 @@ public abstract class AbstractManagerPane extends BasicPane {
         resetAddedMembers();
         this.addedMembers.addAll(addedMembers);
 
+        resetAuthorityMembers();
+        this.authorityMembers.addAll(addedMembers);
+
         // 刷新右侧面板
         addToAddedMemberList();
 
@@ -314,15 +323,15 @@ public abstract class AbstractManagerPane extends BasicPane {
 
     private void addToMemberList() {
         addingListModel.clear();
-        for (RemoteDesignMember addingMember : addingMembers) {
+        for (RemoteDesignMember member : addingMembers) {
             // 如果包含在右侧列表中，那么左侧列表默认选中
-            for (RemoteDesignMember addedMember : addedMembers){
+            if (addedMembers.contains(member)) {
-                if (addingMember.equals(addedMember)){
+                member.setSelected(true);
-                    addingMember.setAuthority(addedMember.hasAuthority());
-                    addingMember.setSelected(true);
             }
+            else {
+                member.setSelected(false);
             }
-            addingListModel.addElement(addingMember);
+            addingListModel.addElement(member);
         }
         addingList.revalidate();
         addingList.repaint();
@@ -350,6 +359,10 @@ public abstract class AbstractManagerPane extends BasicPane {
         addedMembers.clear();
     }
 
+    private void resetAuthorityMembers() {
+        authorityMembers.clear();
+    }
+
     protected abstract Collection<RemoteDesignMember> getMembers(String userName, String keyWord);
 
     protected abstract Collection<RemoteDesignMember> getMembers(String userName, String keyWord, int pageNum, int count);
@@ -376,6 +389,7 @@ public abstract class AbstractManagerPane extends BasicPane {
 
             @Override
             protected void done() {
+                referAddingMemberList();
                 addToMemberList();
             }
         };
@@ -403,12 +417,22 @@ public abstract class AbstractManagerPane extends BasicPane {
 
             @Override
             protected void done() {
+                referAddingMemberList();
                 addToMemberList();
             }
         };
         loadMoreWorker.execute();
     }
 
+    // 检查左侧列表角色/用户是否有权限
+    private void referAddingMemberList() {
+        for (RemoteDesignMember member : addingMembers) {
+            if (authorityMembers.contains(member)){
+                member.setAuthority(true);
+            }
+        }
+    }
+
 
     private void sync2AddedMembersFromAdding() {
         RemoteDesignMember[] members = new RemoteDesignMember[addingListModel.getSize()];

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

@@ -863,7 +863,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
                 // those that are interested in this event
                 for (int i = listeners.length - 2; i >= 0; i -= 2) {
                     if (listeners[i] == SelectionListener.class) {
-                        ((SelectionListener) listeners[i + 1]).selectionChanged(new SelectionEvent(this));
+                        ((SelectionListener) listeners[i + 1]).selectionChanged(new SelectionEvent(ElementCasePane.this));
                     }
                 }
             }