feat: .

src/views/draw-file/board/editCAD/Layer.js

@@ -136,8 +136,6 @@ export default class Layer {
             const selectItem = stateService.getSelectItem()
             if (eventName == null && selectItem) {
                 stateService.setDraggingItem(selectItem)
-                //stateService.setFocusItem(selectItem)
-                //this.uiControl.showAttributes()
                 this.uiControl.selectUI = selectItem.type
             } else if (eventName == null) {
                 this.uiControl.clearUI();
@@ -476,6 +474,7 @@ export default class Layer {
                 focusItem = {
                     vectorId: draggingItem.vectorId,
                     type: draggingItem.type,
+                    selectIndex:draggingItem.selectIndex,
                     cursor: { x: this.lastX, y: this.lastY },
                 }
                 this.uiControl.showAttributes(focusItem)

src/views/draw-file/board/editCAD/Renderer/Draw.js

@@ -382,14 +382,14 @@ export default class Draw {
             }
         } else if (draggingItem && draggingItem.type == VectorType.Circle) {
             if (geometry.vectorId == draggingItem.vectorId) {
-                if(selectItem.selectIndex == SelectState.All){
+                if(draggingItem.selectIndex == SelectState.All){
                     this.context.strokeStyle = Style.Select.Circle.strokeStyle
                     this.context.fillStyle = Style.Select.Circle.fillStyle
                     fillFlag = true;
                 }
-                else if(selectItem.selectIndex.indexOf(SelectState.Vertex)>-1){
+                else if(draggingItem.selectIndex.indexOf(SelectState.Vertex)>-1){
                     this.context.strokeStyle = Style.Select.Circle.strokeStyle
-                    let vertexIndex = selectItem.selectIndex.replace(SelectState.Vertex+'_','');
+                    let vertexIndex = draggingItem.selectIndex.replace(SelectState.Vertex+'_','');
                     this.drawCircle({
                         x:geometry.points[vertexIndex].x,
                         y:geometry.points[vertexIndex].y,
@@ -402,14 +402,14 @@ export default class Draw {
 
         if (focusItem && focusItem.type == VectorType.Circle) {
             if (geometry.vectorId == focusItem.vectorId) {
-                if(selectItem.selectIndex == SelectState.All){
+                if(focusItem.selectIndex == SelectState.All){
                     this.context.strokeStyle = Style.Focus.Circle.strokeStyle
                     this.context.fillStyle = Style.Focus.Circle.fillStyle
                     fillFlag = true;
                 }
-                else if(selectItem.selectIndex.indexOf(SelectState.Vertex)>-1){
+                else if(focusItem.selectIndex.indexOf(SelectState.Vertex)>-1){
                     this.context.strokeStyle = Style.Focus.Circle.strokeStyle
-                    let vertexIndex = selectItem.selectIndex.replace(SelectState.Vertex+'_','');
+                    let vertexIndex = focusItem.selectIndex.replace(SelectState.Vertex+'_','');
                     this.drawCircle({
                         x:geometry.points[vertexIndex].x,
                         y:geometry.points[vertexIndex].y,
@@ -464,14 +464,14 @@ export default class Draw {
             }
         } else if (draggingItem && draggingItem.type == VectorType.Icon) {
             if (geometry.vectorId == draggingItem.vectorId) {
-                if(selectItem.selectIndex == SelectState.All){
+                if(draggingItem.selectIndex == SelectState.All){
                     this.context.strokeStyle = Style.Select.Icon.strokeStyle
                     this.context.fillStyle = Style.Select.Icon.fillStyle
                     fillFlag = true;
                 }
-                else if(selectItem.selectIndex.indexOf(SelectState.Vertex)>-1){
+                else if(draggingItem.selectIndex.indexOf(SelectState.Vertex)>-1){
                     this.context.strokeStyle = Style.Select.Icon.strokeStyle
-                    let vertexIndex = selectItem.selectIndex.replace(SelectState.Vertex+'_','');
+                    let vertexIndex = draggingItem.selectIndex.replace(SelectState.Vertex+'_','');
                     this.drawCircle({
                         x:geometry.points[vertexIndex].x,
                         y:geometry.points[vertexIndex].y,
@@ -484,14 +484,14 @@ export default class Draw {
 
         if (focusItem && focusItem.type == VectorType.Icon) {
             if (geometry.vectorId == focusItem.vectorId) {
-                if(selectItem.selectIndex == SelectState.All){
+                if(focusItem.selectIndex == SelectState.All){
                     this.context.strokeStyle = Style.Focus.Icon.strokeStyle
                     this.context.fillStyle = Style.Focus.Icon.fillStyle
                     fillFlag = true;
                 }
-                else if(selectItem.selectIndex.indexOf(SelectState.Vertex)>-1){
+                else if(focusItem.selectIndex.indexOf(SelectState.Vertex)>-1){
                     this.context.strokeStyle = Style.Focus.Icon.strokeStyle
-                    let vertexIndex = selectItem.selectIndex.replace(SelectState.Vertex+'_','');
+                    let vertexIndex = focusItem.selectIndex.replace(SelectState.Vertex+'_','');
                     this.drawCircle({
                         x:geometry.points[vertexIndex].x,
                         y:geometry.points[vertexIndex].y,