diff --git a/core/frontend/src/lang/en.js b/core/frontend/src/lang/en.js
index 965787806c..f99895c847 100644
--- a/core/frontend/src/lang/en.js
+++ b/core/frontend/src/lang/en.js
@@ -608,6 +608,8 @@ export default {
       rename: 'Rename',
       untitled: 'Untitled',
       create_new_form: 'Create New Form',
+      copy_new_form: 'Copy Form',
+      edit_form: 'Edit Form',
       title: 'Title',
       no_form: 'Click to Create New',
       form_list_name: 'Form List',
diff --git a/core/frontend/src/lang/tw.js b/core/frontend/src/lang/tw.js
index 68c52af545..e3d2e0dfd3 100644
--- a/core/frontend/src/lang/tw.js
+++ b/core/frontend/src/lang/tw.js
@@ -608,6 +608,8 @@ export default {
       rename: '重命名',
       untitled: '未命名表單',
       create_new_form: '新建表單',
+      copy_new_form: '復制表單',
+      edit_form: '編輯表單',
       title: '標題',
       no_form: '暫無表單，點擊',
       form_list_name: '填報表單',
diff --git a/core/frontend/src/lang/zh.js b/core/frontend/src/lang/zh.js
index 8234cc151a..5575ebdbc5 100644
--- a/core/frontend/src/lang/zh.js
+++ b/core/frontend/src/lang/zh.js
@@ -606,6 +606,8 @@ export default {
       rename: '重命名',
       untitled: '未命名表单',
       create_new_form: '新建表单',
+      copy_new_form: '复制表单',
+      edit_form: '编辑表单',
       title: '标题',
       no_form: '暂无表单，点击',
       form_list_name: '填报表单',
diff --git a/core/frontend/src/views/dataFilling/form/ViewTable.vue b/core/frontend/src/views/dataFilling/form/ViewTable.vue
index 7558b216dc..294254d666 100644
--- a/core/frontend/src/views/dataFilling/form/ViewTable.vue
+++ b/core/frontend/src/views/dataFilling/form/ViewTable.vue
@@ -72,6 +72,11 @@
         :span="8"
       >
         <!--  编辑 todo      -->
+        <el-button
+          v-if="hasDataPermission('manage', data.privileges)"
+          type="primary"
+          @click="editForm(param)"
+        >{{ $t('panel.edit') }}</el-button>
       </el-col>
     </el-row>
 
@@ -868,6 +873,10 @@ export default {
       }*/
     },
 
+    editForm(param) {
+      this.$emit('editForm', param)
+    },
+
     showData(row) {
       searchTable(this.param.id, {
         primaryKeyValue: row.dataId,
diff --git a/core/frontend/src/views/dataFilling/form/create.vue b/core/frontend/src/views/dataFilling/form/create.vue
index 2984e22093..6f9c9da46c 100644
--- a/core/frontend/src/views/dataFilling/form/create.vue
+++ b/core/frontend/src/views/dataFilling/form/create.vue
@@ -283,7 +283,13 @@ export default {
   methods: {
     closeCreate: function() {
       // back to forms list
-      this.$router.replace('/data-filling/forms')
+      if (this.$route.query.copy) {
+        this.$router.replace({ name: 'data-filling-form', query: { id: this.$route.query.copy }})
+      } else if (this.$route.query.id) {
+        this.$router.replace({ name: 'data-filling-form', query: { id: this.$route.query.id }})
+      } else {
+        this.$router.replace('/data-filling/forms')
+      }
     },
     onMoveInComponentList(e, originalEvent) {
       if (e.relatedContext?.component?.$el?.id === 'form-drag-place') {
@@ -465,7 +471,22 @@ export default {
           class="toolbar-icon-active icon20"
           @click="closeCreate"
         />
-        <span class="text16 margin-left12">
+        <span
+          v-if="$route.query.copy"
+          class="text16 margin-left12"
+        >
+          {{ $t('data_fill.form.copy_new_form') }}
+        </span>
+        <span
+          v-else-if="$route.query.id"
+          class="text16 margin-left12"
+        >
+          {{ $t('data_fill.form.edit_form') }}
+        </span>
+        <span
+          v-else
+          class="text16 margin-left12"
+        >
           {{ $t('data_fill.form.create_new_form') }}
         </span>
       </div>
diff --git a/core/frontend/src/views/dataFilling/form/index.vue b/core/frontend/src/views/dataFilling/form/index.vue
index dedf1d6514..19ffa1269d 100644
--- a/core/frontend/src/views/dataFilling/form/index.vue
+++ b/core/frontend/src/views/dataFilling/form/index.vue
@@ -386,6 +386,18 @@ export default {
                       </el-dropdown>
                     </template>
 
+                    <span
+                      v-if="data.nodeType !== 'folder'"
+                      @click.stop
+                    >
+                      <el-button
+                        icon="el-icon-edit"
+                        type="text"
+                        size="small"
+                        @click="editForm(data)"
+                      />
+                    </span>
+
                     <span
                       style="margin-left: 12px"
                       @click.stop
@@ -410,20 +422,22 @@ export default {
                             {{ $t('panel.rename') }}
                           </el-dropdown-item>
                           <el-dropdown-item
-                            icon="el-icon-edit-outline"
+                            v-if="data.nodeType !== 'folder'"
+                            icon="el-icon-edit"
                             :command="beforeClickMore('edit', data, node)"
                           >
                             {{ $t('panel.edit') }}
                           </el-dropdown-item>
                           <el-dropdown-item
                             icon="el-icon-right"
-                            :command="beforeClickMore('move',data,node)"
+                            :command="beforeClickMore('move', data, node)"
                           >
                             {{ $t('dataset.move_to') }}
                           </el-dropdown-item>
                           <el-dropdown-item
+                            v-if="data.nodeType !== 'folder'"
                             icon="el-icon-document-copy"
-                            :command="beforeClickMore('copy',data,node)"
+                            :command="beforeClickMore('copy', data, node)"
                           >
                             {{ $t('dataset.copy') }}
                           </el-dropdown-item>
@@ -454,6 +468,7 @@ export default {
       <view-table
         v-else
         :param="displayFormData"
+        @editForm="editForm"
       />
     </el-main>