Merge branch 'dev-3.6' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.6

nezha-fronted/src/components/chart/chartList.vue

@@ -284,15 +284,25 @@ export default {
       if (!this.groupInfo) {
         const moveItem = this.copyDataList.find(item => item.id == id)
         const moveIndex = this.copyDataList.findIndex(item => item.id == id)
-        let num = 1
+        const repeatArr = []
         this.copyDataList.forEach((item, index) => {
           const moveId = String(id).split('-repeat-')[0]
           const repeatId = String(item.id).split('-repeat-')[0]
           if (moveId == repeatId && moveIndex != index) {
-            item.y = moveItem.y + (num * 0.1)
-            num++
+            repeatArr.push({
+              id: item.id,
+              y: item.y
+            })
           }
         })
+        repeatArr.sort((a, b) => a.y - b.y)
+        this.copyDataList.forEach(item => {
+          repeatArr.forEach((subItem, subIndex) => {
+            if (item.id == subItem.id) {
+              item.y = moveItem.y + ((subIndex + 1) * 0.03)
+            }
+          })
+        })
       }
       this.onScroll(this.scrollTop)
       const arr = this.copyDataList.filter(item => !item.staic && !item.repeatIndex)
@@ -589,14 +599,6 @@ export default {
             this.variablesArr.forEach((variables) => {
               const repeatVariable = this.$loadsh.get(item.param.repeat, 'variable')
               if (item.type === 'group' && variables.name === repeatVariable) {
-                if (!variables.checked.length) {
-                  item.children.forEach(children => {
-                    this.$delete(children, 'repeatIndex')
-                    this.$delete(children, 'repeatVariable')
-                    this.$delete(children, 'repeatValue')
-                  })
-                  return
-                }
                 variables.checked.forEach((subItem, subIndex) => {
                   if (subIndex > 0) {
                   // 复制数据 重新设置id

nezha-fronted/src/components/cli/fileDirectory.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="fileDirectory" style="width: 100% !important;transform: scale(1) !important;">
+  <div class="fileDirectory" style="width: 100% !important;">
     <div class="file-directory-header">
       <span style="color: #fff">
         {{$t('terminal.sftp')}}
@@ -39,7 +39,6 @@
       :title='$t("overall.newFolder")'
       destroy-on-close
       :modal-append-to-body="false"
-      :close-on-click-modal="false"
       :visible.sync="newFolderBoxShow"
       @close="newFolder(false)"
     >

nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue

@@ -77,7 +77,7 @@
                   :key="item.value"
                   :label="item.name"
                   :value="item.value">
-                </el-option>  
+                </el-option>
               </el-select>
             </div>
             <ul class="import-select-list">
@@ -601,7 +601,6 @@ export default {
     },
     exportCur () {
       const params = JSON.parse(JSON.stringify(this.params))
-      console.log(params)
       if (this.params2) {
         Object.keys(this.params2).forEach(key => {
           if (params[key]) {