diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index 9f8879039b..f4d94f930c 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -609,7 +609,7 @@ export default {
           name = this.$t('api_test.definition.request.title');
         }
       }
-      if (row != null && row.tags != 'null' && row.tags != undefined) {
+      if (row != null && row.tags != 'null' && row.tags != '' && row.tags != undefined) {
         if (Object.prototype.toString.call(row.tags).match(/\[object (\w+)\]/)[1].toLowerCase() !== 'object'
           && Object.prototype.toString.call(row.tags).match(/\[object (\w+)\]/)[1].toLowerCase() !== 'array') {
           row.tags = JSON.parse(row.tags);
diff --git a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
index c3d71042d0..2389f1161e 100644
--- a/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
+++ b/frontend/src/business/components/api/definition/components/complete/EditCompleteHTTPApi.vue
@@ -48,13 +48,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="8">
               <el-form-item :label="$t('test_track.module.module')" prop="moduleId">
                 <ms-select-tree size="small" :data="moduleOptions" :defaultKey="httpForm.moduleId" @getValue="setModule" :obj="moduleObj" clearable checkStrictly/>
               </el-form-item>
             </el-col>
 
-            <el-col :span="7">
+            <el-col :span="8">
               <el-form-item :label="$t('commons.status')" prop="status">
                 <el-select class="ms-http-select" size="small" v-model="httpForm.status">
                   <el-option v-for="item in options" :key="item.id" :label="item.label" :value="item.id"/>
@@ -342,9 +342,9 @@
     margin: 20px 45px;
   }
 
-  .base-info .el-form-item >>> .el-form-item__content {
-    width: 80%;
-  }
+  /*.base-info .el-form-item >>> .el-form-item__content {*/
+  /*  width: 80%;*/
+  /*}*/
 
   .base-info .ms-http-select {
     width: 100%;
diff --git a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
index 015aea22c5..ce4669cc89 100644
--- a/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/database/BasisParameters.vue
@@ -1,8 +1,8 @@
 <template>
   <div v-loading="isReloadData">
     <el-row>
-      <el-col :span="21" style="padding-bottom: 20px">
-        <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;margin: 20px">
+      <el-col :span="spanNum" style="padding-bottom: 20px">
+        <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;">
           <el-form :model="request" :rules="rules" ref="request" label-width="100px" :disabled="isReadOnly" style="margin: 10px">
             <el-row>
               <el-col :span="8">
@@ -123,6 +123,7 @@
     },
     data() {
       return {
+        spanNum: 21,
         environments: [],
         currentEnvironment: {},
         databaseConfigsOptions: [],
@@ -137,6 +138,11 @@
       },
     },
     created() {
+      if(this.showScript){
+        this.spanNum = 21;
+      }else {
+        this.spanNum = 24;
+      }
       this.getEnvironments();
     },
     computed: {
diff --git a/frontend/src/business/components/api/definition/components/request/dubbo/BasisParameters.vue b/frontend/src/business/components/api/definition/components/request/dubbo/BasisParameters.vue
index 76bb7a5231..124231ac09 100644
--- a/frontend/src/business/components/api/definition/components/request/dubbo/BasisParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/dubbo/BasisParameters.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="21" style="padding-bottom: 20px">
-        <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;margin: 20px">
+      <el-col :span="spanNum" style="padding-bottom: 20px">
+        <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;">
 
           <el-form :model="request" ref="request" label-width="100px" :disabled="isReadOnly" style="margin: 10px">
 
@@ -117,12 +117,20 @@
     },
     data() {
       return {
+        spanNum: 21,
         activeName: "interface",
         activeName2: "args",
         protocols: DubboRequest.PROTOCOLS,
         isReloadData: false,
       }
     },
+    created() {
+      if(this.showScript){
+        this.spanNum = 21;
+      }else {
+        this.spanNum = 24;
+      }
+    },
     methods: {
       addPre() {
         let jsr223PreProcessor = createComponent("JSR223PreProcessor");
diff --git a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
index 5882851b45..5ede845710 100644
--- a/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
+++ b/frontend/src/business/components/api/definition/components/request/http/ApiHttpRequestForm.vue
@@ -1,7 +1,7 @@
 <template xmlns:v-slot="http://www.w3.org/1999/XSL/Transform">
   <div>
     <el-row>
-      <el-col :span="21">
+      <el-col :span="spanCount">
         <!-- HTTP 请求参数 -->
         <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100%" v-loading="isReloadData">
           <el-tabs v-model="activeName" class="request-tabs">
@@ -158,6 +158,7 @@
             {max: 500, message: this.$t('commons.input_limit', [0, 500]), trigger: 'blur'},
           ]
         },
+        spanCount: 21,
         headerSuggestions: REQUEST_HEADERS,
         isReloadData: false,
         isBodyShow: true,
@@ -166,6 +167,11 @@
     },
 
     created() {
+      if(!this.referenced && this.showScript){
+        this.spanCount = 21;
+      } else {
+        this.spanCount = 24;
+      }
       this.init();
     },
 
diff --git a/frontend/src/business/components/api/definition/components/request/tcp/TcpFormatParameters.vue b/frontend/src/business/components/api/definition/components/request/tcp/TcpFormatParameters.vue
index eb3ed9c6ea..1142655f30 100644
--- a/frontend/src/business/components/api/definition/components/request/tcp/TcpFormatParameters.vue
+++ b/frontend/src/business/components/api/definition/components/request/tcp/TcpFormatParameters.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
     <el-row>
-      <el-col :span="21" style="padding-bottom: 20px">
-        <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;margin: 10px">
+      <el-col :span="spanNum" style="padding-bottom: 20px">
+        <div style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100% ;">
           <el-form class="tcp" :model="request" :rules="rules" ref="request" :disabled="isReadOnly" style="margin: 20px">
             <el-tabs v-model="activeName" class="request-tabs">
               <!--test-->
@@ -188,6 +188,7 @@
     },
     data() {
       return {
+        spanNum: 21,
         activeName: "request",
         classes: TCPSampler.CLASSES,
         reportType:"xml",
@@ -218,6 +219,11 @@
       }
     },
     created() {
+      if(!this.referenced && this.showScript){
+        this.spanNum = 21;
+      }else {
+        this.spanNum = 24;
+      }
       this.currentProjectId = getCurrentProjectID();
       if (!this.request.parameters) {
         this.$set(this.request, 'parameters', []);
diff --git a/frontend/src/business/components/api/definition/components/response/ResponseText.vue b/frontend/src/business/components/api/definition/components/response/ResponseText.vue
index 1760e49247..17f147dc0a 100644
--- a/frontend/src/business/components/api/definition/components/response/ResponseText.vue
+++ b/frontend/src/business/components/api/definition/components/response/ResponseText.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="text-container" style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 88%">
+  <div class="text-container" style="border:1px #DCDFE6 solid; height: 100%;border-radius: 4px ;width: 100%">
     <el-form :model="response" ref="response" label-width="100px">
 
       <el-collapse-transition>
@@ -51,7 +51,6 @@
 
       }
     },
-
     methods: {
       active() {
         this.isActive = !this.isActive;
diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 34430c98ba..8da3e5d33a 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 34430c98ba5cbfefa6d911ef9be9f593a2368f69
+Subproject commit 8da3e5d33a1aff686266c86a380b626433476f1a