#20240820 适配控件

BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/composite/FactorEvaluationComposite.java

@@ -486,13 +486,12 @@ public class FactorEvaluationComposite extends EvaluationView {
 		
 		evaluationButton = new ELink(supplier_composite, SWT.NONE);
 		evaluationButton.setImage(ResourceManager.getPluginImage(IconsActivator.PLUGIN_ID, "icons/btn/blue/edit.png"));
-		evaluationButton.setEnabled(false);
 		evaluationButton.addMouseListener(new MouseAdapter() {
 			@Override
 			public void mouseUp(MouseEvent e) {
-				if (!evaluationButton.getEnabled()) {
-                    return;
-                }
+//				if (!evaluationButton.getEnabled()) {
+//                    return;
+//                }
 				setSupplierEvaluationOpinion();
 			}
 		});
@@ -1122,10 +1121,10 @@ public class FactorEvaluationComposite extends EvaluationView {
 	    	isShowBidFileOpinion = false;
 		}
 		if (curStep.getStepType().equals(com.gx.obe.components.core.enumeration.EvaluationStepEnum.COMPLIANCE)) {
-			evaluationTable = new ComplianceEvaluationTableComposite(evaluation_talbe_composite, evaluationButton, SWT.NONE);
+			evaluationTable = new ComplianceEvaluationTableComposite(evaluation_talbe_composite, SWT.NONE);
 		} else {
 			if (null != curStep.getSummaryType() && curStep.getSummaryType().equals(com.gx.obe.components.core.enumeration.EvaluationStepEnum.SUMMARY_SCORE_BY_QUALIFIED)) {
-				evaluationTable = new ComplianceEvaluationTableComposite(evaluation_talbe_composite, evaluationButton, SWT.NONE);
+				evaluationTable = new ComplianceEvaluationTableComposite(evaluation_talbe_composite, SWT.NONE);
 			} else {
 				evaluationTable = new ScoreEvaluationTableComposite(evaluation_talbe_composite, SWT.NONE);
 			}

BID-EVALUATION-STEP/src/com/gx/obe/evaluation/step/review/composite/ComplianceEvaluationTableComposite.java

@@ -114,7 +114,6 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
 	private Composite evaluationTableComposite;
 	private Composite composite_9;
 	private Text factor_evaluation_opinion;
-	private ELink evaluationButton;
 	private StyledText evaluation_factor_memo;
 	private List<EvaluationFactor> evaluationFactorList = new ArrayList<EvaluationFactor>();
 	private int maxLevel = 1;
@@ -155,7 +154,7 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
 	private ExpertEvaluationResultService expertEvaluationResultService;
 	private SupplierOpeningResultService supplierOpeningResultService;
 	private Map<String, String> objectiveFactorIdMap = new HashMap<String, String>();
-	private Map<Integer,Object> colContent = new HashMap<>();
+//	private Map<Integer,Object> colContent = new HashMap<>();
 	private final Map<Keys, Color> objectiveBackgroundMap = new HashMap<Keys, Color>();
 	private boolean sameScoreCheck = true;
 	/**
@@ -217,9 +216,8 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
 	 * @param parent
 	 * @param style
 	 */
-	public ComplianceEvaluationTableComposite(Composite parent,ELink evaluationBtn, int style) {
+	public ComplianceEvaluationTableComposite(Composite parent, int style) {
 		super(parent, style);
-		evaluationButton = evaluationBtn;
 		GridLayout gridLayout = new GridLayout(1, false);
 		gridLayout.marginHeight = 0;
 		gridLayout.marginWidth = 0;
@@ -1495,10 +1493,10 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
 						ExpertEvaluationResult expertEvaluationResult = expertEvaluationResultMap.get(supplier.getId());
 						if (null != expertEvaluationResult && null != expertEvaluationResult.getAccessment()) {
 							if (expertEvaluationResult.getAccessment().equals(EvaluationStepEnum.QUALIFIED)) {
-								colContent.put(col, EVAL_ACCESSMENT_YES);
+//								colContent.put(col, EVAL_ACCESSMENT_YES);
 								return EVAL_ACCESSMENT_YES;
 							} else if (expertEvaluationResult.getAccessment().equals(EvaluationStepEnum.UNQUALIFIED)) {
-								colContent.put(col, EVAL_ACCESSMENT_NO);
+//								colContent.put(col, EVAL_ACCESSMENT_NO);
 								return EVAL_ACCESSMENT_NO;
 							}
 						}
@@ -1770,11 +1768,11 @@ public class ComplianceEvaluationTableComposite extends Composite implements IEv
 					evalFactorResult = supplierEvaluationFactorResultMap.get(supplier.getId()).get(evaluationFactor.getId());
 				}
 				
-				if(null != colContent  && null != colContent.get(col) && StringUtils.isNotEmpty(colContent.get(col).toString())) {
-					evaluationButton.setEnabled(!EVAL_ACCESSMENT_YES.equals(colContent.get(col).toString()));
-					//重绘控件，控件刷新具有滞后性
-					evaluationButton.redraw();
-				}
+//				if(null != colContent  && null != colContent.get(col) && StringUtils.isNotEmpty(colContent.get(col).toString())) {
+//					evaluationButton.setEnabled(!EVAL_ACCESSMENT_YES.equals(colContent.get(col).toString()));
+//					//重绘控件，控件刷新具有滞后性
+//					evaluationButton.redraw();
+//				}
 				resultClickEventAction(supplier, evaluationFactor, evalFactorResult);
 				return;
 			}

com.gx.obe.common.file/src/com/gx/obe/common/file/utils/ParsingXmlUtils.java

@@ -1170,6 +1170,7 @@ public class ParsingXmlUtils {
 			param.setIncludeHeightAvgDeviationPercent("true".equals(dispersionRange.elementTextTrim("includeHeightAvgDeviationPercent")));
 			
 			Element specimenFilterConditionItemListEle = dispersionRange.element("specimenFilterConditionItemList");
+			if(specimenFilterConditionItemListEle != null) {
 				List<Element> specimenFilterConditionItemEleList = specimenFilterConditionItemListEle.elements("specimenFilterConditionItem");
 				List<SpecimenFilterConditionItem> specimenFilterConditionItemList = new ArrayList<SpecimenFilterConditionItem>();
 				if(null != specimenFilterConditionItemEleList && specimenFilterConditionItemEleList.size() > 0){
@@ -1184,6 +1185,8 @@ public class ParsingXmlUtils {
 					param.setSpecimenFilterConditionItemList(specimenFilterConditionItemList);
 				}
 			}
+			
+		}
 	}
 	
 	/**

org.eclipse.swt.core/src/org/eclipse/swt/core/widgets/EDialog.java

@@ -552,33 +552,33 @@ public abstract class EDialog extends Window {
 	 * @author liangyb
 	 * @param shell
 	 */
-	public static void addDragSupport(final Shell shell) {
-        shell.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseDown(MouseEvent e) {
-                initialMouseDownPoint = new Point(e.x, e.y);
-            }
-        });
-
-        shell.addMouseMoveListener(new MouseMoveListener() {
-            @Override
-            public void mouseMove(MouseEvent e) {
-                if (initialMouseDownPoint != null) {
-                    Point p = shell.toDisplay(e.x, e.y);
-                    p.x -= initialMouseDownPoint.x;
-                    p.y -= initialMouseDownPoint.y;
-                    shell.setLocation(p);
-                }
-            }
-        });
-
-        shell.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseUp(MouseEvent e) {
-                initialMouseDownPoint = null;
-            }
-        });
-    }
+//	public static void addDragSupport(final Shell shell) {
+//        shell.addMouseListener(new MouseAdapter() {
+//            @Override
+//            public void mouseDown(MouseEvent e) {
+//                initialMouseDownPoint = new Point(e.x, e.y);
+//            }
+//        });
+//
+//        shell.addMouseMoveListener(new MouseMoveListener() {
+//            @Override
+//            public void mouseMove(MouseEvent e) {
+//                if (initialMouseDownPoint != null) {
+//                    Point p = shell.toDisplay(e.x, e.y);
+//                    p.x -= initialMouseDownPoint.x;
+//                    p.y -= initialMouseDownPoint.y;
+//                    shell.setLocation(p);
+//                }
+//            }
+//        });
+//
+//        shell.addMouseListener(new MouseAdapter() {
+//            @Override
+//            public void mouseUp(MouseEvent e) {
+//                initialMouseDownPoint = null;
+//            }
+//        });
+//    }
 
 	/**
 	 * Notifies that this dialog's button with the given id has been pressed.

org.eclipse.swt.core/src/org/eclipse/swt/core/widgets/ELink.java

@@ -234,11 +234,11 @@ public class ELink extends CLabel {
 		return text;
 	}
 	public void setEnabled(boolean enabled){
-//		if(enabled != this.enabled){
-//			this.enabled = enabled;
-//			this.redraw();
-//		}
+		if(enabled != this.enabled){
 			this.enabled = enabled;
+			this.redraw();
+		}
+//		this.enabled = enabled;
 	}
 	
 	public boolean getEnabled(){