From 2ffe759adb2881af7d9d489a1927403c1e7db381 Mon Sep 17 00:00:00 2001
From: YuanFeng <770153798@qq.com>
Date: Wed, 11 Sep 2024 23:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E7=A8=BF=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DraftDesign/components/DynamicPropConfig.vue      |  2 +-
 .../src/components/DraftDesign/index.vue              | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DynamicPropConfig.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DynamicPropConfig.vue
index c1aeef9..4dbbb56 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DynamicPropConfig.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DynamicPropConfig.vue
@@ -18,7 +18,7 @@
         "位置信息配置为节点的位置信息。如：添加了3个配置数据这时会依次添加到对应位置上。从而实现动态属性配置。"
       </el-alert>
       <el-form>
-        <el-row>
+        <el-row style="min-width: 900px">
           <el-col :span="6" :xs="12">
             <el-form-item label="组名称">
               <el-input v-model="that.configInfo.groupName" placeholder="请输入组名称"/>
diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
index 6646a35..c0f5594 100644
--- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
+++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/index.vue
@@ -1509,15 +1509,24 @@ const removeEmptyGroup = () => {
   }
 
   let delIndex = []
+  let allKey = []
   for (let i = 0; i < that.pageConfig.propList.length; i++) {
     if(!propGroupIdList.includes(that.pageConfig.propList[i].groupId)){
       delIndex.push(i)
+      continue;
     }
+    allKey.push(that.pageConfig.propList[i].groupId)
   }
-  console.debug("delIndex", delIndex)
   for (let i = 0; i < delIndex.length; i++) {
     that.pageConfig.propList.splice(delIndex[i], 1)
   }
+  let newArr = []
+  for (let i = 0; i < that.pageConfig.propOrderByList.length; i++) {
+    if(allKey.includes(that.pageConfig.propOrderByList[i].key)){
+      newArr.push(that.pageConfig.propOrderByList[i])
+    }
+  }
+  that.pageConfig.propOrderByList = newArr
 }
 const orderByPropList = () => {