From 61d066b4c98fef95387d060bd1d8131c507801de Mon Sep 17 00:00:00 2001
From: luoyifan <luoyifan@qq.com>
Date: Fri, 30 May 2025 18:14:44 +0800
Subject: [PATCH] readonly select mouseMove cursor

---
 src/designer/Viewport.ts                          |  2 +-
 src/designer/metaComponents/IMetaProp.ts          |  8 ++++++++
 src/designer/metaComponents/NumberInput.vue       |  3 ++-
 src/designer/metaComponents/SwitchItem.vue        |  3 ++-
 src/designer/metaComponents/TextInput.vue         |  5 +++--
 src/designer/metaComponents/UUIDItem.vue          |  3 ++-
 src/designer/model2DEditor/DragControls.js        | 25 +++++++++--------------
 src/designer/model2DEditor/EsDragControls.ts      |  4 ++++
 src/designer/model2DEditor/tools/SelectInspect.ts |  2 +-
 src/model/itemType/ItemTypeDefine.ts              |  7 +++++--
 10 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/src/designer/Viewport.ts b/src/designer/Viewport.ts
index adfac22..1bb402a 100644
--- a/src/designer/Viewport.ts
+++ b/src/designer/Viewport.ts
@@ -289,7 +289,7 @@ export default class Viewport {
     controlsNew.enableDamping = false
     controlsNew.enableZoom = true
     controlsNew.enableRotate = false
-    controlsNew.mouseButtons = { LEFT: THREE.MOUSE.PAN } // 鼠标中键平移
+    controlsNew.mouseButtons = { LEFT: THREE.MOUSE.PAN, RIGHT: THREE.MOUSE.PAN } // 鼠标中键平移
     controlsNew.screenSpacePanning = false // 定义平移时如何平移相机的位置 控制不上下移动
     controlsNew.listenToKeyEvents(viewerDom) // 监听键盘事件
     controlsNew.keys = { LEFT: 'KeyA', UP: 'KeyW', RIGHT: 'KeyD', BOTTOM: 'KeyS' }
diff --git a/src/designer/metaComponents/IMetaProp.ts b/src/designer/metaComponents/IMetaProp.ts
index 5edb9c0..fec9e8d 100644
--- a/src/designer/metaComponents/IMetaProp.ts
+++ b/src/designer/metaComponents/IMetaProp.ts
@@ -17,6 +17,14 @@ export default defineComponent({
         this.refreshValue()
       }
     })
+
+    this.$nextTick(() => {
+      //@ts-ignore
+      if (typeof this.refreshValue === 'function') {
+        //@ts-ignore
+        this.refreshValue()
+      }
+    })
   },
   computed: {
     object3D(): THREE.Object3D {
diff --git a/src/designer/metaComponents/NumberInput.vue b/src/designer/metaComponents/NumberInput.vue
index 6c86fa8..62a5dac 100644
--- a/src/designer/metaComponents/NumberInput.vue
+++ b/src/designer/metaComponents/NumberInput.vue
@@ -5,7 +5,8 @@
         {{ prop.label }}
       </div>
     </template>
-    <el-input v-model="value" class="prop-editor" type="number" clearable size="small" />
+    <el-input v-model="value" class="prop-editor" type="number" clearable size="small"
+              :readonly="prop.readonly" />
   </el-form-item>
 </template>
 <script>
diff --git a/src/designer/metaComponents/SwitchItem.vue b/src/designer/metaComponents/SwitchItem.vue
index f492386..7fad9e1 100644
--- a/src/designer/metaComponents/SwitchItem.vue
+++ b/src/designer/metaComponents/SwitchItem.vue
@@ -5,7 +5,8 @@
         {{ prop.label }}
       </div>
     </template>
-    <el-switch v-model="value" class="prop-editor" clearable size="small" />
+    <el-switch v-model="value" class="prop-editor" clearable size="small"
+               :readonly="prop.readonly" />
   </el-form-item>
 </template>
 <script>
diff --git a/src/designer/metaComponents/TextInput.vue b/src/designer/metaComponents/TextInput.vue
index cbf5d6c..b67a1cc 100644
--- a/src/designer/metaComponents/TextInput.vue
+++ b/src/designer/metaComponents/TextInput.vue
@@ -1,11 +1,12 @@
 <template>
   <el-form-item :label-width="prop.labelWidth">
     <template #label>
-      <div :title="prop.label + ' - ' + prop.field" >
+      <div :title="prop.label + ' - ' + prop.field">
         {{ prop.label }}
       </div>
     </template>
-    <el-input v-model="value" class="prop-editor" type="text" clearable size="small" />
+    <el-input v-model="value" class="prop-editor" type="text" clearable size="small"
+              :readonly="prop.readonly" />
   </el-form-item>
 </template>
 <script>
diff --git a/src/designer/metaComponents/UUIDItem.vue b/src/designer/metaComponents/UUIDItem.vue
index a0859ad..841f55d 100644
--- a/src/designer/metaComponents/UUIDItem.vue
+++ b/src/designer/metaComponents/UUIDItem.vue
@@ -5,7 +5,8 @@
         {{ prop.label }}
       </div>
     </template>
-    <el-input v-model="value" class="prop-editor" type="text" clearable size="small" />
+    <el-input v-model="value" class="prop-editor" type="text" clearable size="small"
+              :readonly="prop.readonly" />
   </el-form-item>
 </template>
 <script>
diff --git a/src/designer/model2DEditor/DragControls.js b/src/designer/model2DEditor/DragControls.js
index f8afa3d..e8fe318 100644
--- a/src/designer/model2DEditor/DragControls.js
+++ b/src/designer/model2DEditor/DragControls.js
@@ -30,7 +30,7 @@ class DragControls extends EventDispatcher {
     //
 
     let isMove = false
-
+    let isMouseDownClicked = false
     const scope = this
 
     function activate() {
@@ -66,33 +66,27 @@ class DragControls extends EventDispatcher {
     }
 
     function onPointerMove(event) {
-
       if (!scope.enabled || !scope.enabledMove) return
 
-      isMove = true
+      if (isMouseDownClicked) {
+        _domElement.style.cursor = 'move'
+      }
 
+      isMove = true
       updatePointer(event)
-
       _raycaster.setFromCamera(_pointer, _camera)
 
       if (_selected) {
-
         if (_raycaster.ray.intersectPlane(_plane, _intersection)) {
-
           const pos = _intersection.sub(_offset).applyMatrix4(_inverseMatrix)
           const newIntersection = calcPositionUseSnap(event, pos)
           _selected.position.copy(newIntersection)
-
         }
-
         scope.dispatchEvent({ type: 'drag', object: _selected })
-
         return
-
       }
 
       // hover support
-
       if (event.pointerType === 'mouse' || event.pointerType === 'pen') {
 
         _intersections.length = 0
@@ -127,12 +121,9 @@ class DragControls extends EventDispatcher {
         } else {
 
           if (_hovered !== null) {
-
             scope.dispatchEvent({ type: 'hoveroff', object: _hovered })
-
             _domElement.style.cursor = 'auto'
             _hovered = null
-
           }
 
         }
@@ -163,7 +154,10 @@ class DragControls extends EventDispatcher {
             _offset.copy(_intersection).sub(_worldPosition.setFromMatrixPosition(_selected.matrixWorld))
           }
 
-          _domElement.style.cursor = 'move'
+          // setTimeout(() => {
+          //   _domElement.style.cursor = 'move'
+          // }, 20)
+          isMouseDownClicked = true
         }
         scope.dispatchEvent({ type: 'dragstart', object: _selected, e: event })
       }
@@ -183,6 +177,7 @@ class DragControls extends EventDispatcher {
       }
 
       _domElement.style.cursor = _hovered ? 'pointer' : 'auto'
+      isMouseDownClicked = false
     }
 
     function updatePointer(event) {
diff --git a/src/designer/model2DEditor/EsDragControls.ts b/src/designer/model2DEditor/EsDragControls.ts
index fda5b80..9b129c0 100644
--- a/src/designer/model2DEditor/EsDragControls.ts
+++ b/src/designer/model2DEditor/EsDragControls.ts
@@ -121,6 +121,10 @@ export default class EsDragControls {
       }
       if (e.object.userData.selectable) {
         this.viewport.state.selectedObject = markRaw(e.object)
+        EventBus.$emit('objectChanged', {
+          viewport: this,
+          object: e.object
+        })
       }
     }
 
diff --git a/src/designer/model2DEditor/tools/SelectInspect.ts b/src/designer/model2DEditor/tools/SelectInspect.ts
index 85e6352..e115b49 100644
--- a/src/designer/model2DEditor/tools/SelectInspect.ts
+++ b/src/designer/model2DEditor/tools/SelectInspect.ts
@@ -25,7 +25,7 @@ export default class SelectInspect implements ITool {
    */
   rectMaterial: THREE.MeshBasicMaterial = new THREE.MeshBasicMaterial({
     color: 0x000000,
-    opacity: 0.5,
+    opacity: 0.3,
     transparent: true
   })
 
diff --git a/src/model/itemType/ItemTypeDefine.ts b/src/model/itemType/ItemTypeDefine.ts
index 10801fb..f6787b8 100644
--- a/src/model/itemType/ItemTypeDefine.ts
+++ b/src/model/itemType/ItemTypeDefine.ts
@@ -33,8 +33,9 @@ export function getAllItemTypes(): ItemTypeDefineOption[] {
  * "点"对象类型的，基础元数据
  */
 export const BASIC_META_OF_POINT: ItemTypeMeta = [
-  { field: 'uuid', editor: 'UUID', label: 'uuid' },
-  { field: 'name', editor: 'TextInput', label: '名称'},
+  { field: 'uuid', editor: 'UUID', label: 'uuid', readonly: true },
+  { field: 'name', editor: 'TextInput', label: '名称' },
+  { field: 'userData.label', editor: 'TextInput', label: '标签' },
   { editor: 'Transform' },
   { field: 'color', editor: 'Color', label: '颜色' },
   { editor: '-' },
@@ -97,6 +98,8 @@ export type ItemTypeMeta = ItemTypeMetaItem[]
 export type ItemTypeMetaItem = {
   field?: string
   label?: string
+  labelWidth?: number
+  readonly?: boolean
   editor: '-' |
     'TextInput' | 'Number' | 'Switch' | 'Select' | 'ButtonGroup' |
     'UUID' | 'Color' | 'Transform' | 'IN_OUT_CENTER'