From d50390c154415027aab8f4f8b80914c021138862 Mon Sep 17 00:00:00 2001
From: "xinxin.wu" <xinxin.wu@fit2cloud.com>
Date: Wed, 14 Aug 2024 18:10:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):=20?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=A2=84=E8=A7=88=E8=AF=B7=E6=B1=82=E4=BD=93?=
 =?UTF-8?q?Json-Schema=E6=A0=BC=E5=BC=8F=E8=A1=A8=E6=A0=BC=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=80=89=E9=A1=B9=E7=BC=BA=E5=B0=91=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5&=E9=BB=98=E8=AE=A4=E5=BC=80=E5=90=AF?=
 =?UTF-8?q?=E4=B8=94=E7=BD=AE=E7=81=B0=E4=B8=8D=E5=8F=AF=E7=82=B9=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/pure/ms-json-schema/index.vue  | 326 ++++++++++--------
 1 file changed, 174 insertions(+), 152 deletions(-)

diff --git a/frontend/src/components/pure/ms-json-schema/index.vue b/frontend/src/components/pure/ms-json-schema/index.vue
index ffab0b7011..b12b431509 100644
--- a/frontend/src/components/pure/ms-json-schema/index.vue
+++ b/frontend/src/components/pure/ms-json-schema/index.vue
@@ -54,7 +54,7 @@
     </template>
     <template #type="{ record }">
       <a-tooltip
-        v-if="record.id !== 'root'"
+        v-if="record.id !== 'root' && !props.disabled"
         :content="t(record.required ? 'apiTestDebug.paramRequired' : 'apiTestDebug.paramNotRequired')"
       >
         <div
@@ -740,157 +740,179 @@
       value: 'url',
     },
   ];
-  const columns: FormTableColumn[] = [
-    {
-      title: t('ms.json.schema.name'),
-      dataIndex: 'title',
-      slotName: 'title',
-      inputType: 'input',
-      size: 'medium',
-      columnSelectorDisabled: true,
-      fixed: 'left',
-      needValidRepeat: true,
-    },
-    {
-      title: t('ms.json.schema.type'),
-      dataIndex: 'type',
-      slotName: 'type',
-      titleSlotName: 'typeTitle',
-      size: 'medium',
-      width: 120,
-      addLineDisabled: true,
-      columnSelectorDisabled: true,
-    },
-    {
-      title: t('ms.json.schema.value'),
-      dataIndex: 'example',
-      slotName: 'example',
-      addLineDisabled: true,
-      columnSelectorDisabled: true,
-    },
-    {
-      title: t('common.desc'),
-      dataIndex: 'description',
-      slotName: 'description',
-      inputType: 'quickInput',
-      size: 'medium',
-      addLineDisabled: true,
-    },
-    {
-      title: t('ms.json.schema.minLength'),
-      dataIndex: 'minLength',
-      slotName: 'minLength',
-      inputType: 'inputNumber',
-      size: 'medium',
-      min: 0,
-      precision: 0,
-      addLineDisabled: true,
-      showInTable: false,
-      width: 120,
-    },
-    {
-      title: t('ms.json.schema.maxLength'),
-      dataIndex: 'maxLength',
-      slotName: 'maxLength',
-      inputType: 'inputNumber',
-      size: 'medium',
-      min: 0,
-      precision: 0,
-      addLineDisabled: true,
-      showInTable: false,
-      width: 120,
-    },
-    {
-      title: t('ms.json.schema.minimum'),
-      dataIndex: 'minimum',
-      slotName: 'minimum',
-      inputType: 'inputNumber',
-      size: 'medium',
-      addLineDisabled: true,
-      showInTable: false,
-      width: 120,
-    },
-    {
-      title: t('ms.json.schema.maximum'),
-      dataIndex: 'maximum',
-      slotName: 'maximum',
-      inputType: 'inputNumber',
-      size: 'medium',
-      addLineDisabled: true,
-      showInTable: false,
-      width: 120,
-    },
-    {
-      title: t('ms.json.schema.minItems'),
-      dataIndex: 'minItems',
-      slotName: 'minItems',
-      inputType: 'inputNumber',
-      size: 'medium',
-      min: 0,
-      precision: 0,
-      addLineDisabled: true,
-      showInTable: false,
-      width: 120,
-    },
-    {
-      title: t('ms.json.schema.maxItems'),
-      dataIndex: 'maxItems',
-      slotName: 'maxItems',
-      inputType: 'inputNumber',
-      size: 'medium',
-      min: 0,
-      precision: 0,
-      addLineDisabled: true,
-      showInTable: false,
-      width: 120,
-    },
-    {
-      title: t('ms.json.schema.default'),
-      dataIndex: 'defaultValue',
-      slotName: 'defaultValue',
-      inputType: 'input',
-      size: 'medium',
-      addLineDisabled: true,
-      showInTable: false,
-    },
-    {
-      title: t('ms.json.schema.enum'),
-      dataIndex: 'enumValues',
-      slotName: 'enumValues',
-      inputType: 'textarea',
-      size: 'medium',
-      addLineDisabled: true,
-      showInTable: false,
-    },
-    {
-      title: t('ms.json.schema.regex'),
-      dataIndex: 'pattern',
-      slotName: 'pattern',
-      size: 'medium',
-      addLineDisabled: true,
-      showInTable: false,
-      isNull: (record) => record.type !== 'string',
-    },
-    {
-      title: t('ms.json.schema.format'),
-      dataIndex: 'format',
-      slotName: 'format',
-      size: 'medium',
-      showInTable: false,
-      isNull: (record) => record.type !== 'string',
-      width: 100,
-    },
-    {
-      title: '',
-      dataIndex: 'operation',
-      slotName: 'action',
-      titleSlotName: 'batchAddTitle',
-      addLineDisabled: true,
-      width: 100,
-      showInTable: true,
-      fixed: 'right',
-    },
-  ];
+
+  const columns = computed(() => {
+    const staticColumns: FormTableColumn[] = [
+      {
+        title: t('ms.json.schema.name'),
+        dataIndex: 'title',
+        slotName: 'title',
+        inputType: 'input',
+        size: 'medium',
+        columnSelectorDisabled: true,
+        fixed: 'left',
+        needValidRepeat: true,
+        sortIndex: 1,
+      },
+      {
+        title: t('ms.json.schema.type'),
+        dataIndex: 'type',
+        slotName: 'type',
+        titleSlotName: 'typeTitle',
+        size: 'medium',
+        width: 120,
+        addLineDisabled: true,
+        columnSelectorDisabled: true,
+      },
+      {
+        title: t('ms.json.schema.value'),
+        dataIndex: 'example',
+        slotName: 'example',
+        addLineDisabled: true,
+        columnSelectorDisabled: true,
+      },
+      {
+        title: t('common.desc'),
+        dataIndex: 'description',
+        slotName: 'description',
+        inputType: 'quickInput',
+        size: 'medium',
+        addLineDisabled: true,
+      },
+      {
+        title: t('ms.json.schema.minLength'),
+        dataIndex: 'minLength',
+        slotName: 'minLength',
+        inputType: 'inputNumber',
+        size: 'medium',
+        min: 0,
+        precision: 0,
+        addLineDisabled: true,
+        showInTable: false,
+        width: 120,
+      },
+      {
+        title: t('ms.json.schema.maxLength'),
+        dataIndex: 'maxLength',
+        slotName: 'maxLength',
+        inputType: 'inputNumber',
+        size: 'medium',
+        min: 0,
+        precision: 0,
+        addLineDisabled: true,
+        showInTable: false,
+        width: 120,
+      },
+      {
+        title: t('ms.json.schema.minimum'),
+        dataIndex: 'minimum',
+        slotName: 'minimum',
+        inputType: 'inputNumber',
+        size: 'medium',
+        addLineDisabled: true,
+        showInTable: false,
+        width: 120,
+      },
+      {
+        title: t('ms.json.schema.maximum'),
+        dataIndex: 'maximum',
+        slotName: 'maximum',
+        inputType: 'inputNumber',
+        size: 'medium',
+        addLineDisabled: true,
+        showInTable: false,
+        width: 120,
+      },
+      {
+        title: t('ms.json.schema.minItems'),
+        dataIndex: 'minItems',
+        slotName: 'minItems',
+        inputType: 'inputNumber',
+        size: 'medium',
+        min: 0,
+        precision: 0,
+        addLineDisabled: true,
+        showInTable: false,
+        width: 120,
+      },
+      {
+        title: t('ms.json.schema.maxItems'),
+        dataIndex: 'maxItems',
+        slotName: 'maxItems',
+        inputType: 'inputNumber',
+        size: 'medium',
+        min: 0,
+        precision: 0,
+        addLineDisabled: true,
+        showInTable: false,
+        width: 120,
+      },
+      {
+        title: t('ms.json.schema.default'),
+        dataIndex: 'defaultValue',
+        slotName: 'defaultValue',
+        inputType: 'input',
+        size: 'medium',
+        addLineDisabled: true,
+        showInTable: false,
+      },
+      {
+        title: t('ms.json.schema.enum'),
+        dataIndex: 'enumValues',
+        slotName: 'enumValues',
+        inputType: 'textarea',
+        size: 'medium',
+        addLineDisabled: true,
+        showInTable: false,
+      },
+      {
+        title: t('ms.json.schema.regex'),
+        dataIndex: 'pattern',
+        slotName: 'pattern',
+        size: 'medium',
+        addLineDisabled: true,
+        showInTable: false,
+        isNull: (record) => record.type !== 'string',
+      },
+      {
+        title: t('ms.json.schema.format'),
+        dataIndex: 'format',
+        slotName: 'format',
+        size: 'medium',
+        showInTable: false,
+        isNull: (record) => record.type !== 'string',
+        width: 100,
+      },
+      {
+        title: '',
+        dataIndex: 'operation',
+        slotName: 'action',
+        titleSlotName: 'batchAddTitle',
+        addLineDisabled: true,
+        width: 100,
+        showInTable: true,
+        fixed: 'right',
+      },
+    ];
+    const requiredColumn: FormTableColumn[] = [
+      {
+        title: t('msFormTable.paramRequired'),
+        dataIndex: 'required',
+        slotName: 'required',
+        size: 'medium',
+        inputType: 'text',
+        columnSelectorDisabled: true,
+        valueFormat: (record) => {
+          return record.required ? t('common.yes') : t('common.no');
+        },
+        width: 68,
+      },
+    ];
+    if (props.disabled) {
+      return [...requiredColumn, ...staticColumns];
+    }
+    return staticColumns;
+  });
 
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   function emitChange(from: string) {