From 23bf1d2af488f341d8c13416f27726feee03234c Mon Sep 17 00:00:00 2001
From: huanghao1412 <huanghao1412@163.com>
Date: Thu, 7 Mar 2024 15:22:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E7=BB=84=E6=80=81=20?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E5=9B=BA=E5=AE=9A=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CustomComponents/EngineeringConfig/config.ts      |  4 +++-
 .../CustomComponents/EngineeringConfig/config.vue     |  8 +++++---
 src/packages/index.d.ts                               |  4 +++-
 .../ContentCharts/components/ChartsItemBox/index.vue  |  4 +---
 src/views/chart/ContentEdit/hooks/useDrag.hook.ts     | 11 +++++++++--
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts
index 65161635..0d8441bc 100644
--- a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts
+++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.ts
@@ -16,7 +16,7 @@ export const option = {
   // 展示标题
   isThereATitleComponet: false,
   // 控制内层 使外层选中失效
-  enableInner: false
+  enableInner: true
 }
 
 export default class Config extends PublicConfigClass implements CreateComponentType
@@ -27,6 +27,8 @@ export default class Config extends PublicConfigClass implements CreateComponent
     this.attr.h = 1080
     this.attr.x = 0
     this.attr.y = 0
+    this.attr.isHeadInsert = true
+    this.attr.isFixedInit = true
   }
   public key = EngineeringConfig.key
   public chartConfig = cloneDeep(EngineeringConfig)
diff --git a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue
index 2098efee..f93837ee 100644
--- a/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue
+++ b/src/packages/components/CustomComponents/CustomComponents/EngineeringConfig/config.vue
@@ -1,9 +1,11 @@
 <template>
   <CollapseItem name="组态" :expanded="true">
     <SettingItemBox name="移动组态" :alone="true">
-      <n-space justify="start">
-        <n-switch v-model:value="optionData.enableInner" size="small"></n-switch>
-      </n-space>
+      <SettingItem name="开启后能移动组态，但无法选中组件，可以在左侧图层栏选中">
+        <n-space justify="start">
+          <n-switch v-model:value="optionData.enableInner" size="small"></n-switch>
+        </n-space>
+      </SettingItem>
     </SettingItemBox>
     <SettingItemBox name="标题">
       <SettingItem name="如果有标题将展示">
diff --git a/src/packages/index.d.ts b/src/packages/index.d.ts
index 0217e64d..4f815f38 100644
--- a/src/packages/index.d.ts
+++ b/src/packages/index.d.ts
@@ -118,7 +118,9 @@ export const BlendModeEnumList = [
 export interface PublicConfigType {
   id: string
   isGroup: boolean
-  attr: { x: number; y: number; w: number; h: number; zIndex: number; offsetX: number; offsetY: number }
+  // isHeadInsert 组件置底
+  // isFixedInit 组件初始时位置以x,y为准 不以鼠标位置为准
+  attr: { x: number; y: number; w: number; h: number; zIndex: number; offsetX: number; offsetY: number, isHeadInsert?: boolean, isFixedInit?: boolean }
   styles: {
     [FilterEnum.FILTERS_SHOW]: boolean
     [FilterEnum.OPACITY]: number
diff --git a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue
index b33cd74c..74cebd93 100644
--- a/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue
+++ b/src/views/chart/ContentCharts/components/ChartsItemBox/index.vue
@@ -129,9 +129,7 @@ const dblclickHandle = async (item: ConfigType) => {
       newComponent.chartConfig.chartFrame = item.chartFrame
     }
     // 组件置底插入
-    let isHead = false
-    let isHeadList = ['EngineeringConfig']
-    if(isHeadList.includes(newComponent.chartConfig.key)) isHead = true
+    let isHead = !!newComponent.chartConfig.isHeadInsert
     // 添加
     chartEditStore.addComponentList(newComponent, isHead, true)
     // 选中
diff --git a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts
index 266e85fd..0b32c105 100644
--- a/src/views/chart/ContentEdit/hooks/useDrag.hook.ts
+++ b/src/views/chart/ContentEdit/hooks/useDrag.hook.ts
@@ -40,8 +40,15 @@ export const dragHandle = async (e: DragEvent) => {
       newComponent.chartConfig.chartFrame = dropData.chartFrame
     }
 
-    setComponentPosition(newComponent, e.offsetX - newComponent.attr.w / 2, e.offsetY - newComponent.attr.h / 2)
-    chartEditStore.addComponentList(newComponent, false, true)
+    if(newComponent.attr.isFixedInit) {
+      setComponentPosition(newComponent, newComponent.attr.x, newComponent.attr.y)
+    }
+    else {
+      setComponentPosition(newComponent, e.offsetX - newComponent.attr.w / 2, e.offsetY - newComponent.attr.h / 2)
+    }
+
+    let isHead = !!newComponent.attr.isHeadInsert
+    chartEditStore.addComponentList(newComponent, isHead, true)
     chartEditStore.setTargetSelectChart(newComponent.id)
     loadingFinish()
   } catch (error) {