Merge branch 'main' of github.com:dataease/dataease into main

frontend/src/layout/index.vue

@@ -120,6 +120,7 @@ export default {
       .sidebar-container {
         width: 100% !important;
         position: initial !important;
+        height: calc(100vh - 80px) !important;
       }
   }
 </style>

frontend/src/views/chart/group/Group.vue

@@ -102,7 +102,7 @@
 
       <!--group add/edit-->
       <el-dialog v-dialogDrag :title="dialogTitle" :visible="editGroup" :show-close="false" width="30%">
-        <el-form ref="groupForm" :model="groupForm" :rules="groupFormRules">
+        <el-form ref="groupForm" :model="groupForm" :rules="groupFormRules" @keyup.enter.native="saveGroup(groupForm)">
           <el-form-item :label="$t('commons.name')" prop="name">
             <el-input v-model="groupForm.name" />
           </el-form-item>
@@ -183,7 +183,7 @@
 
       <!--rename chart-->
       <el-dialog v-dialogDrag :title="$t('chart.chart')" :visible="editTable" :show-close="false" width="30%">
-        <el-form ref="tableForm" :model="tableForm" :rules="tableFormRules">
+        <el-form ref="tableForm" :model="tableForm" :rules="tableFormRules" @keyup.enter.native="saveTable(tableForm)">
           <el-form-item :label="$t('commons.name')" prop="name">
             <el-input v-model="tableForm.name" />
           </el-form-item>

frontend/src/views/dataset/group/Group.vue

@@ -104,7 +104,7 @@
       </el-col>
 
       <el-dialog v-dialogDrag :title="dialogTitle" :visible="editGroup" :show-close="false" width="30%">
-        <el-form ref="groupForm" :model="groupForm" :rules="groupFormRules">
+        <el-form ref="groupForm" :model="groupForm" :rules="groupFormRules" @keyup.enter.native="saveGroup(groupForm)">
           <el-form-item :label="$t('commons.name')" prop="name">
             <el-input v-model="groupForm.name" />
           </el-form-item>
@@ -223,7 +223,7 @@
       </el-tree>
 
       <el-dialog v-dialogDrag :title="$t('dataset.table')" :visible="editTable" :show-close="false" width="30%">
-        <el-form ref="tableForm" :model="tableForm" :rules="tableFormRules">
+        <el-form ref="tableForm" :model="tableForm" :rules="tableFormRules" @keyup.enter.native="saveTable(tableForm)">
           <el-form-item :label="$t('commons.name')" prop="name">
             <el-input v-model="tableForm.name" />
           </el-form-item>

frontend/src/views/panel/list/EditPanel/index.vue

@@ -80,7 +80,25 @@ export default {
   created() {
     // this.getTree()
   },
+  mounted() {
+    this.bindKey()
+  },
+  destroyed() {
+    this.unBindKey()
+  },
   methods: {
+    entryKey(event) {
+      const keyCode = event.keyCode
+      if (keyCode === 13) {
+        this.save()
+      }
+    },
+    bindKey() {
+      document.addEventListener('keyup', this.entryKey)
+    },
+    unBindKey() {
+      document.removeEventListener('keyup', this.entryKey)
+    },
     showCurrentTemplateInfo(data) {
       this.editPanel.panelInfo.name = data.name
       this.editPanel.panelInfo.panelStyle = data.templateStyle

frontend/src/views/panel/list/PanelList.vue

@@ -134,7 +134,7 @@
       </el-col>
 
       <el-dialog v-dialogDrag :title="dialogTitle" :visible="editGroup" :show-close="false" width="500px">
-        <el-form ref="groupForm" :model="groupForm" :rules="groupFormRules">
+        <el-form ref="groupForm" :model="groupForm" :rules="groupFormRules" @keyup.enter.native="saveGroup(groupForm)">
           <el-form-item :label="$t('commons.name')" prop="name">
             <el-input v-model="groupForm.name" />
           </el-form-item>