fix(msg): incomplete display mqtt5 properties in message box

emqx · Sep 12, 2023 · 59f2099 · 59f2099
1 parent 787477a
commit 59f2099
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 13 deletions.
diff --git a/src/components/MsgLeftItem.vue b/src/components/MsgLeftItem.vue
@@ -41,6 +41,9 @@
         <p v-if="properties.contentType" class="properties left">
           <span>{{ $t('connections.contentType') }}: {{ properties.contentType }}</span>
         </p>
+        <p v-if="properties.payloadFormatIndicator" class="properties left">
+          <span>{{ $t('connections.payloadFormatIndicator') }}: {{ properties.payloadFormatIndicator }}</span>
+        </p>
         <p v-if="properties.topicAlias" class="properties left">
           <span>{{ $t('connections.topicAlias') }}: {{ properties.topicAlias }}</span>
         </p>
@@ -50,6 +53,9 @@
         <p v-if="properties.correlationData" class="properties left">
           <span>{{ $t('connections.correlationData') }}: {{ properties.correlationData }}</span>
         </p>
+        <p v-if="properties.messageExpiryInterval" class="properties left">
+          <span>{{ $t('connections.messageExpiryInterval') }}: {{ properties.messageExpiryInterval }}</span>
+        </p>
         <p v-if="properties.userProperties" class="user-properties properties left">
           <KeyValueEditor
             class="msg-item-props"

diff --git a/src/components/MsgPublish.vue b/src/components/MsgPublish.vue
@@ -20,13 +20,12 @@
                 </el-col>
                 <el-col :span="24">
                   <el-form-item :label="$t('connections.payloadFormatIndicator')" prop="payloadFormatIndicator">
-                    <el-checkbox
-                      style="width: 100%"
+                    <el-switch
                       size="mini"
                       v-model="MQTT5PropsForm.payloadFormatIndicator"
-                      border
-                      >{{ MQTT5PropsForm.payloadFormatIndicator ? 'true' : 'false' }}</el-checkbox
-                    >
+                      active-color="#13ce66"
+                      inactive-color="#A2A9B0"
+                    ></el-switch>
                   </el-form-item>
                 </el-col>
                 <el-col :span="24">
@@ -345,19 +344,23 @@ export default class MsgPublish extends Vue {
 
   /**
    * Notice:
-   * when we jump order by`creation page` <-> `connection page`,
-   * the monaco will not init or destroy, because we use the v-show to hidden Msgpublish componment.
-   * So we need to operate editor creation and destroy manually by listening on route.
-   * relative PR: https://github.com/emqx/MQTTX/pull/518 https://github.com/emqx/MQTTX/pull/446
+   *
+   * When we switch between the `creation page` and `connection page`, the Monaco editor is not initialized or destroyed.
+   * Instead, we use `v-show` to hide the `MsgPublish` component.
+   * Therefore, we need to manually create and destroy the editor by listening to the route.
+   *
+   * Relevant PRs:
+   * - https://github.com/emqx/MQTTX/pull/518
+   * - https://github.com/emqx/MQTTX/pull/446
    */
   @Watch('$route.params.id', { immediate: true, deep: true })
   private async handleIdChanged(to: string, from: string) {
     const editorRef = this.$refs.payloadEditor as Editor
     if (to && from === '0' && to !== '0') {
-      // Init the editor when rout jump from creation page
+      // Initialize the editor when the route jumps from the creation page
       editorRef.initEditor()
     } else if (from && from !== '0' && to === '0') {
-      // destroy the editor when rout jump to creation page
+      // Destroy the editor when the route jumps to the creation page
       editorRef.destroyEditor()
     }
     this.loadProperties()
@@ -377,7 +380,10 @@ export default class MsgPublish extends Vue {
     }
   }
 
-  // Notice: add editor creation and destroy manually export for it's father componment.
+  /**
+   * Manually create and destroy the editor for the parent component.
+   * Note: This function destroys the editor instance.
+   */
   public editorDestory() {
     const editorRef = this.$refs.payloadEditor as Editor
     editorRef.destroyEditor()

diff --git a/src/components/MsgRightItem.vue b/src/components/MsgRightItem.vue
@@ -26,6 +26,9 @@
         <p v-if="properties.contentType" class="properties right">
           <span>{{ $t('connections.contentType') }}: {{ properties.contentType }}</span>
         </p>
+        <p v-if="properties.payloadFormatIndicator" class="properties right">
+          <span>{{ $t('connections.payloadFormatIndicator') }}: {{ properties.payloadFormatIndicator }}</span>
+        </p>
         <p v-if="properties.topicAlias" class="properties right">
           <span>{{ $t('connections.topicAlias') }}: {{ properties.topicAlias }}</span>
         </p>
@@ -35,6 +38,9 @@
         <p v-if="properties.correlationData" class="properties right">
           <span>{{ $t('connections.correlationData') }}: {{ properties.correlationData }}</span>
         </p>
+        <p v-if="properties.messageExpiryInterval" class="properties right">
+          <span>{{ $t('connections.messageExpiryInterval') }}: {{ properties.messageExpiryInterval }}</span>
+        </p>
         <p v-if="properties.userProperties" class="user-properties properties right">
           <KeyValueEditor
             class="msg-item-props"
@@ -67,7 +73,7 @@ export default class MsgrightItem extends Vue {
   @Prop({ required: false }) public meta?: string
   @Prop({ required: false, default: () => ({}) }) public properties!: PushPropertiesModel
 
-  private customMenu(event: MouseEvent) {
+  public customMenu(event: MouseEvent) {
     this.$emit('showmenu', this.payload, event)
   }