diff --git a/frontend/src/components/content_value/ContentEntryEditor.vue b/frontend/src/components/content_value/ContentEntryEditor.vue
index 954f415..a9a2b54 100644
--- a/frontend/src/components/content_value/ContentEntryEditor.vue
+++ b/frontend/src/components/content_value/ContentEntryEditor.vue
@@ -11,6 +11,7 @@ import FullScreen from '@/components/icons/FullScreen.vue'
 import WindowClose from '@/components/icons/WindowClose.vue'
 import Pin from '@/components/icons/Pin.vue'
 import OffScreen from '@/components/icons/OffScreen.vue'
+import ContentEditor from '@/components/content_value/ContentEditor.vue'
 
 const props = defineProps({
     field: {
@@ -79,6 +80,19 @@ const displayValue = computed(() => {
     }
     return viewAs.value
 })
+const editingContent = ref('')
+const enableSave = computed(() => {
+    return editingContent.value !== viewAs.value
+})
+
+const viewLanguage = computed(() => {
+    switch (viewAs.format) {
+        case formatTypes.JSON:
+            return 'json'
+        default:
+            return 'plaintext'
+    }
+})
 
 const btnStyle = computed(() => ({
     padding: '3px',
@@ -112,7 +126,7 @@ const onFormatChanged = async (decode = '', format = '') => {
             format,
         })
         viewAs.field = props.field + ''
-        viewAs.value = value
+        editingContent.value = viewAs.value = value
         viewAs.decode = decode || retDecode
         viewAs.format = format || retFormat
     } finally {
@@ -125,6 +139,10 @@ const onUpdateValue = (value) => {
     viewAs.value = value
 }
 
+const onInput = (content) => {
+    editingContent.value = content
+}
+
 const onToggleFullscreen = () => {
     emit('update:fullscreen', !!!props.fullscreen)
 }
@@ -135,7 +153,7 @@ const onClose = () => {
 }
 
 const onSave = () => {
-    emit('save', viewAs.field, viewAs.value, viewAs.decode, viewAs.format)
+    emit('save', viewAs.field, editingContent.value, viewAs.decode, viewAs.format)
     if (!isPin.value) {
         nextTick().then(onClose)
     }
@@ -160,14 +178,14 @@ const onSave = () => {
                 <!-- value -->
                 <div class="editor-content-item flex-box-v flex-item-expand">
                     <div class="editor-content-item-label">{{ props.valueLabel }}</div>
-                    <n-input
-                        :placeholder="props.value"
-                        :resizable="false"
-                        :value="displayValue"
-                        autofocus
+                    <content-editor
+                        :border="true"
+                        :content="displayValue"
+                        :language="viewLanguage"
                         class="flex-item-expand"
-                        type="textarea"
-                        @update:value="onUpdateValue" />
+                        style="height: 100%"
+                        @input="onInput"
+                        @reset="onInput" />
                     <format-selector
                         :decode="viewAs.decode"
                         :format="viewAs.format"
@@ -202,7 +220,7 @@ const onSave = () => {
             </template>
             <template #action>
                 <n-space :wrap="false" :wrap-item="false" justify="end">
-                    <n-button ghost @click="onSave">
+                    <n-button :disabled="!enableSave" :secondary="enableSave" type="primary" @click="onSave">
                         <template #icon>
                             <n-icon :component="Save" />
                         </template>
diff --git a/frontend/src/components/content_value/ContentValueHash.vue b/frontend/src/components/content_value/ContentValueHash.vue
index ad85a19..a1d4f59 100644
--- a/frontend/src/components/content_value/ContentValueHash.vue
+++ b/frontend/src/components/content_value/ContentValueHash.vue
@@ -162,6 +162,7 @@ const saveEdit = async (field, value, decode, format) => {
             index: [currentEditRow.no - 1],
         })
         if (success) {
+            currentEditRow.value = value
             $message.success(i18n.t('dialogue.save_value_succ'))
         } else {
             $message.error(msg)