From 0f2aef50a1d9fb4b277b759817da6647903d6e45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 13 Jul 2023 17:44:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0=E6=94=B6?=
 =?UTF-8?q?=E9=9B=86=E6=B8=85=E5=8D=95=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/CollectionType/index.vue   | 41 +++++++++++--------
 .../CollectionTypeDisabled/index.vue          | 31 ++++++++------
 2 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/jero-web/src/components/CollectionType/index.vue b/jero-web/src/components/CollectionType/index.vue
index 5927e63fd..4b6bc0fc6 100644
--- a/jero-web/src/components/CollectionType/index.vue
+++ b/jero-web/src/components/CollectionType/index.vue
@@ -3,7 +3,7 @@
     <div class="box">
       <!--      纯文本-->
       <div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block" class="valflex">
             <div class="textClass" v-if='itemval.type==="text"'>
@@ -113,7 +113,7 @@
       </div>
       <!--      默认值-->
       <div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block" class="valflex">
             <div class="textClass" v-if='itemval.type==="text"'>
@@ -152,7 +152,7 @@
       </div>
       <!--      纯下拉单选-->
       <div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block" class="valflex">
             <div class="textClass" v-if='itemval.type === "pull"'>
@@ -183,7 +183,7 @@
       </div>
       <!--      纯下拉多选-->
       <div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" style="flex: 1"
+        <div v-for="(item,index) in keyIndex()" :key="index" style="flex: 1"
              class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block;" class="valflex"
@@ -216,7 +216,7 @@
       </div>
       <!--      纯附件-->
       <div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" style="flex: 1"
+        <div v-for="(item,index) in keyIndex()" :key="index" style="flex: 1"
              class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block" class="valflex">
@@ -243,7 +243,7 @@
       </div>
       <!--      文本+下拉单选-->
       <div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block" class="valflex">
             <div class="textClass" v-if='itemval.type==="pull"'>
@@ -365,7 +365,7 @@
       </div>
       <!--      文本+下拉多选-->
       <div v-else-if='detailDate.controlType === "6" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block"
                :class="{'multiple':itemval.type==='pull_more'?true:false}"
@@ -489,7 +489,7 @@
       </div>
       <!--      文本+附件-->
       <div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block" class="valflex">
             <div class="textClass" v-if='itemval.type==="text"'>
@@ -606,7 +606,7 @@
       </div>
       <!--      下拉单选+附件-->
       <div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]"
                :key="index1" style="display: inline-block" class="valflex">
             <!--            <div v-for='(itemval,val) in val' :key='val'>-->
@@ -646,7 +646,7 @@
       </div>
       <!--      下拉多选+附件-->
       <div v-else-if='detailDate.controlType === "9" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block"
                :class="{'multiple':itemval.type==='pull_more'?true:false}"
@@ -688,7 +688,7 @@
       </div>
       <!--      文本+下拉单选+附件-->
       <div v-else-if='detailDate.controlType === "10" && detailDate.paramsConfigData' class="add_flex">
-        <div v-for="(item,index) in key" :key="index" class="add-width">
+        <div v-for="(item,index) in keyIndex()" :key="index" class="add-width">
           <!--        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>-->
           <div v-for="(itemval,index1) in detailDate.paramsConfigData[item]" :key="index1"
                style="display: inline-block" class="valflex">
@@ -906,15 +906,24 @@ export default {
     // Object.keys(this.detailDate.paramsConfigData).sort().forEach(function(key) {
     //   ordered[key] = that.detailDate.paramsConfigData[key]
     // })
-    this.key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
-      let index = a.lastIndexOf('+')
-      let index1 = b.lastIndexOf('+')
-      return a.slice(0, index) - b.slice(0, index1)
-    })
+    // this.key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
+    //   let index = a.lastIndexOf('+')
+    //   let index1 = b.lastIndexOf('+')
+    //   return a.slice(0, index) - b.slice(0, index1)
+    // })
+    // console.log(this.key)
     // this.detailDate.paramsConfigData = ordered
     // this.detailDate.paramsConfigData = { ...this.detailDate.paramsConfigData }
   },
   methods: {
+    keyIndex(){
+       let key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
+        let index = a.lastIndexOf('+')
+        let index1 = b.lastIndexOf('+')
+        return a.slice(0, index) - b.slice(0, index1)
+      })
+      return key
+    },
     selectChange(val) {
       this.$nextTick(() => {
         let element = document.querySelectorAll(
diff --git a/jero-web/src/components/CollectionTypeDisabled/index.vue b/jero-web/src/components/CollectionTypeDisabled/index.vue
index 5eb406f75..8c2a0d9e3 100644
--- a/jero-web/src/components/CollectionTypeDisabled/index.vue
+++ b/jero-web/src/components/CollectionTypeDisabled/index.vue
@@ -3,7 +3,7 @@
     <div class='box'>
       <!--      纯文本-->
       <div v-if='detailDate.controlType === "1" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block" class='valflex'>
             <div class="textClass" v-if='itemval.type==="text"'>
@@ -101,7 +101,7 @@
       </div>
       <!--      默认值-->
       <div v-if='detailDate.controlType === "11" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block" class='valflex'>
             <div class="textClass" v-if='itemval.type==="text"'>
@@ -136,7 +136,7 @@
       </div>
       <!--      纯下拉单选-->
       <div v-else-if='detailDate.controlType === "2" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block" class='valflex'>
             <div class="textClass" v-if='itemval.type === "pull"'>
@@ -164,7 +164,7 @@
       </div>
       <!--      纯下拉多选-->
       <div v-else-if='detailDate.controlType === "3" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' style='flex: 1'
+        <div v-for='(item,index) in keyIndex()' :key='index' style='flex: 1'
              class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block;" class='valflex'
@@ -194,7 +194,7 @@
       </div>
       <!--      纯附件-->
       <div v-else-if='detailDate.controlType === "4" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' style='flex: 1'
+        <div v-for='(item,index) in keyIndex()' :key='index' style='flex: 1'
              class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block" class='valflex'>
@@ -218,7 +218,7 @@
       </div>
       <!--      文本+下拉单选-->
       <div v-else-if='detailDate.controlType === "5" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block" class='valflex'>
             <div class="textClass" v-if='itemval.type==="pull"'>
@@ -328,7 +328,7 @@
       </div>
       <!--      文本+下拉多选-->
       <div v-else-if='detailDate.controlType === "6" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block"
                :class="{'multiple':itemval.type==='pull_more'?true:false}"
@@ -440,7 +440,7 @@
       </div>
       <!--      文本+附件-->
       <div v-else-if='detailDate.controlType === "7" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block" class='valflex'>
             <div class="textClass" v-if='itemval.type==="text"'>
@@ -545,7 +545,7 @@
       </div>
       <!--      下拉单选+附件-->
       <div v-else-if='detailDate.controlType === "8" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]'
                :key='index1' style="display: inline-block" class='valflex'>
             <!--            <div v-for='(itemval,val) in val' :key='val'>-->
@@ -582,7 +582,7 @@
       </div>
       <!--      下拉多选+附件-->
       <div v-else-if='detailDate.controlType === "9" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block"
                :class="{'multiple':itemval.type==='pull_more'?true:false}"
@@ -621,7 +621,7 @@
       </div>
       <!--      文本+下拉单选+附件-->
       <div v-else-if='detailDate.controlType === "10" && detailDate.paramsConfigData' class='add_flex'>
-        <div v-for='(item,index) in key' :key='index' class='add-width'>
+        <div v-for='(item,index) in keyIndex()' :key='index' class='add-width'>
           <!--        <div v-for='(item,index) in detailDateList' :key='index' class='add-width'>-->
           <div v-for='(itemval,index1) in detailDate.paramsConfigData[item]' :key='index1'
                style="display: inline-block" class='valflex'>
@@ -861,7 +861,14 @@
         return id
         // return Math.random().toString(32)
       },
-
+      keyIndex(){
+        let key = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
+          let index = a.lastIndexOf('+')
+          let index1 = b.lastIndexOf('+')
+          return a.slice(0, index) - b.slice(0, index1)
+        })
+        return key
+      },
       addconfig() {
         let paramsConfigData = Object.keys(this.detailDate.paramsConfigData).sort((a, b) => {
           let index = a.lastIndexOf('+')