!650 使colorList变得好选

src/UI/Components/EntityModal/EntityColorList.tsx

@@ -10,7 +10,7 @@ import { EntityStore } from '../../Store/EntityStore';
 export const ColorItem = (props: { className: string, text: string, style?: React.CSSProperties, value?: number; }) =>
     <li value={props.value}>
         <i style={props.style} className={props.className}></i>
-        <span>{props.text}</span>
+        <span style={{ pointerEvents: "none" }}>{props.text}</span>
     </li>;
 
 export const ColorStyle: [string, number][] = [
@@ -98,7 +98,7 @@ export class ColorModal extends React.Component<{ store?: EntityStore; }, {}>
                         >
                             <ColorItem
                                 style={
-                                    store.colorSet.size > 1 ? null : { background: ColorMaterial.GetColor(store.colorIndex).getStyle() }
+                                    store.colorSet.size > 1 ? null : { background: ColorMaterial.GetColor(store.colorIndex).getStyle(), pointerEvents: "none" }
                                 }
                                 className="i-color"
                                 text={store.colorIndex <= 7 ? ColorStyle[store.colorIndex][0] : store.colorIndex.toString()}
@@ -125,7 +125,7 @@ export class ColorModal extends React.Component<{ store?: EntityStore; }, {}>
                                             <ColorItem
                                                 key={color}
                                                 style={
-                                                    { background: ColorMaterial.GetColor(color).getStyle() }
+                                                    { background: ColorMaterial.GetColor(color).getStyle(), pointerEvents: "none" }
                                                 }
                                                 value={color}
                                                 className="i-color"

src/UI/Components/ToolBar/PropertiesPanel.less

@@ -61,7 +61,12 @@
                         justify-content: space-between;
                         border: 1px ridge  transparent;
                         &:hover{
-                            border: 1px ridge  #394b59;
+                            border: 1px ridge  #8A9BA8;
+                            background: #BFCCD6;
+                            cursor: pointer;
+                        }
+                        >li{
+                                pointer-events: none;
                         }
                     }
                     >li{
@@ -69,8 +74,13 @@
                             width: 100%;
                         }
                         >ul{//.props-color-list
+                            outline: none;
+                            background: none !important;
                             >li{
                                 padding: 5px 0 0 0 !important;
+                                &:hover{
+                                    background: #BFCCD6 !important;
+                                }
                             }
                         }
                     }

src/UI/Components/ToolBar/Properties_Dim.tsx

@@ -57,6 +57,7 @@ export class Properties_DimPanel extends React.Component<Properties_DimPanelProp
     }
     private Dim_UseDefault(als: AlignedDimension[])
     {
+        let propsStore = PropertiesStore.GetInstance() as PropertiesStore;
         CommandWrap(() =>
         {
             this.dim_TextSize = 60;
@@ -67,6 +68,8 @@ export class Properties_DimPanel extends React.Component<Properties_DimPanelProp
                 al.LeadOutOffsetX = 30;
                 al.LeadOutVisible = true;
                 al.LeadOutFlipped = false;
+                al.ColorIndex = 7;
+                propsStore.colorIndex = 7;//todo 撤销的时候UI颜色没有同步更改
                 this.numericInputVal = "60";
                 // this.dim_InputEl.setState({ value: "60" });
             }
@@ -234,7 +237,7 @@ export class Properties_DimPanel extends React.Component<Properties_DimPanelProp
                         </div>
                     </li>
                     <li>
-                        <Button className={Classes.INTENT_WARNING} text="重置为默认" minimal small onClick={() => this.Dim_UseDefault(ents)} />
+                        <Button className={Classes.INTENT_WARNING} text="重置标注为默认" minimal small onClick={() => this.Dim_UseDefault(ents)} />
                     </li>
                 </ul>
             </Card>