diff --git a/frontend/src/api/system/template.js b/frontend/src/api/system/template.js
index 5b83b15bcb..3e17a9be40 100644
--- a/frontend/src/api/system/template.js
+++ b/frontend/src/api/system/template.js
@@ -4,7 +4,8 @@ export function save(data) {
   return request({
     url: '/template/save',
     data: data,
-    method: 'post'
+    method: 'post',
+    loading: true
   })
 }
 export function templateDelete(id) {
diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue
index 1b1f46374f..cac5c1826b 100644
--- a/frontend/src/views/panel/list/EditPanel/index.vue
+++ b/frontend/src/views/panel/list/EditPanel/index.vue
@@ -146,13 +146,17 @@ export default {
         return false
       }
       this.editPanel.panelInfo['newFrom'] = this.inputType
+      this.loading = true
       panelSave(this.editPanel.panelInfo).then(response => {
         this.$message({
           message: this.$t('commons.save_success'),
           type: 'success',
           showClose: true
         })
+        this.loading = false
         this.$emit('closeEditPanelDialog', response.data)
+      }).catch(() => {
+        this.loading = false
       })
     },
     handleFileChange(e) {
diff --git a/frontend/src/views/panel/template/component/TemplateImport.vue b/frontend/src/views/panel/template/component/TemplateImport.vue
index 45bc215f66..411bdd9fe6 100644
--- a/frontend/src/views/panel/template/component/TemplateImport.vue
+++ b/frontend/src/views/panel/template/component/TemplateImport.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-row>
+  <el-row v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
     <el-row style="margin-top: 5px">
       <el-col :span="4">{{ $t('commons.name') }}</el-col>
       <el-col :span="16">
@@ -44,6 +44,7 @@ export default {
         name: '',
         templateStyle: null,
         templateData: null,
+        dynamicData: null,
         snapshot: ''
       }
     }
@@ -118,6 +119,7 @@ export default {
         this.templateInfo.templateStyle = this.importTemplateInfo.panelStyle
         this.templateInfo.templateData = this.importTemplateInfo.panelData
         this.templateInfo.snapshot = this.importTemplateInfo.snapshot
+        this.templateInfo.dynamicData = this.importTemplateInfo.dynamicData
         this.templateInfo.nodeType = 'template'
       }
       reader.readAsText(file)