Merge branch 'main' of https://github.com/metersphere/metersphere

framework/sdk-parent/frontend/src/components/MsBorderPieChart.vue

@@ -242,31 +242,31 @@ export default {
         pageIconColor: "#1F2329",
         pageIconInactiveColor: "#1F2329",
         orient: 'vertical',
-        icon:"rect",
+        icon: "rect",
         itemGap: 32,
-        left: '317px',
+        left: '50%',
         y: 'center',
         itemHeight: 8,
         itemWidth: 8, //修改icon图形大小
         itemStyle: {
           borderWidth: 0.1
         },
-        inactiveBorderWidth:0.1,
+        inactiveBorderWidth: 0.1,
         textStyle: {
           rich: {
             name: {
               fontSize: 14,
               align: 'left',
-              width: 100,
+              width: 50,
               fontWeight: 400,
-              color:'#646A73'
+              color: '#646A73'
             },
             num: {
               fontSize: 14,
               align: 'right',
-              color:'#646A73',
+              color: '#646A73',
-              fontWeight: 400,
+              fontWeight: 500,
-              padding: [0, 0, 0, 134]
+              padding: [0, 0, 0, 155]
             }
           }
         },

framework/sdk-parent/frontend/src/components/environment/EnvironmentHttpConfig.vue

@@ -45,11 +45,57 @@
           </el-input>
         </div>
 
-        <p>{{ $t('api_test.request.headers') }}</p>
+        <!-- 接口测试配置       -->
-        <el-row>
+        <form-section :title="$t('commons.api')" :init-active=true>
-          <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{ $t("commons.batch_add") }}</el-link>
+          <p>{{ $t('api_test.request.headers') }}</p>
-        </el-row>
+          <el-row>
-        <ms-api-key-value :items="condition.headers" :isShowEnable="true" :suggestions="headerSuggestions"/>
+            <el-link class="ms-el-link" @click="batchAdd" style="color: #783887"> {{
+                $t("commons.batch_add")
+              }}
+            </el-link>
+          </el-row>
+          <ms-api-key-value :items="condition.headers" :isShowEnable="true" :suggestions="headerSuggestions"/>
+        </form-section>
+
+        <!--    UI 配置    -->
+        <form-section :title="$t('commons.ui_test')" :init-active=false v-if="condition.type !== 'MODULE'">
+          <el-row :gutter="10" style="padding-top: 10px;">
+            <el-col :span="6">
+              <!-- 浏览器驱动 -->
+              <span style="margin-right: 10px;">{{ $t("ui.browser") }}</span>
+              <el-select
+                size="mini"
+                v-model="httpConfig.browser"
+                style="width: 100px"
+              >
+                <el-option
+                  v-for="b in browsers"
+                  :key="b.value"
+                  :value="b.value"
+                  :label="b.label"
+                ></el-option>
+              </el-select>
+
+            </el-col>
+            <el-col :span="6">
+              <!-- 性能模式 -->
+              <el-checkbox
+                v-model="httpConfig.headlessEnabled"
+              >
+                <span> {{ $t("ui.performance_mode") }}</span>
+              </el-checkbox>
+              <ms-instructions-icon size="10" :content="$t('ui.per_tip')"/>
+            </el-col>
+          </el-row>
+
+          <!--          当前版本实现免登录是基于 cookie 的但是现在由于安全性问题绝大多数网站都不支持 cookie登录所以先屏蔽了-->
+          <!--          <el-row :gutter="10">-->
+          <!--            <el-col :span="24">-->
+          <!--              <ms-ui-scenario-cookie-table :items="httpConfig.cookie" ref="cookieTable"/>-->
+          <!--            </el-col>-->
+          <!--          </el-row>-->
+        </form-section>
+
         <div style="margin-top: 20px">
           <el-button v-if="!condition.id" type="primary" style="float: right" size="mini" @click="add">
             {{ $t('commons.add') }}
@@ -121,10 +167,12 @@ import {getUUID} from "../../utils";
 import {KeyValue} from "../../model/EnvTestModel";
 import Vue from "vue";
 import BatchAddParameter from "./commons/BatchAddParameter";
+import FormSection from "metersphere-frontend/src/components/form/FormSection";
+import MsInstructionsIcon from 'metersphere-frontend/src/components/MsInstructionsIcon';
 
 export default {
   name: "MsEnvironmentHttpConfig",
-  components: {MsApiKeyValue, MsSelectTree, MsTableOperatorButton, BatchAddParameter},
+  components: {MsApiKeyValue, MsSelectTree, MsTableOperatorButton, BatchAddParameter, FormSection, MsInstructionsIcon},
   props: {
     httpConfig: new HttpConfig(),
     projectId: String,
@@ -165,9 +213,21 @@ export default {
         socket: "",
         domain: "",
         port: 0,
-        headers: [new KeyValue()]
+        headers: [new KeyValue()],
+        headlessEnabled: true,
+        browser: 'CHROME'
       },
-      beforeCondition: {}
+      beforeCondition: {},
+      browsers: [
+        {
+          label: this.$t("chrome"),
+          value: "CHROME",
+        },
+        {
+          label: this.$t("firefox"),
+          value: "FIREFOX",
+        },
+      ],
     };
   },
   watch: {
@@ -289,7 +349,7 @@ export default {
     list() {
       if (this.projectId) {
         this.result = getApiModuleByProjectIdAndProtocol(this.projectId, "HTTP").then((response) => {
-          if (response.data  && response.data !== null) {
+          if (response.data && response.data !== null) {
             this.moduleOptions = response.data;
           }
         });

framework/sdk-parent/frontend/src/components/environment/commons/ApiScenarioVariables.vue

@@ -455,28 +455,11 @@ export default {
       });
       this.variables = datas;
     },
-    filterScope(scope) {
+    filterScope(value, row) {
-      let datas = [];
+      if (value == "ui") {
-      let variables = _.cloneDeep(this.variables);
+        return row.scope == "ui";
-      variables.forEach((item) => {
+      }
-        if (scope == "api") {
+      return !row.scope || row.scope == "api";
-          if (
-            item.scope && item.scope != "api"
-          ) {
-            item.hidden = true;
-          } else {
-            item.hidden = undefined;
-          }
-        } else {
-          if (item.scope == scope) {
-            item.hidden = undefined;
-          } else {
-            item.hidden = true;
-          }
-        }
-        datas.push(item);
-      });
-      this.variables = datas;
     },
     openSetting(data) {
       this.$refs.apiVariableSetting.open(data);

workstation/frontend/src/business/dashboard/components/MyCaseCard.vue

@@ -122,7 +122,7 @@ export default{
   padding: 0px 0px 0px 0px;
   box-sizing: border-box;
   width: 100%;
-  color:#000000;
+  color: #1F2329;
   margin-left: 24px;
   line-height: 26px;
 }

workstation/frontend/src/business/dashboard/components/MyDashboardCard.vue

@@ -167,7 +167,7 @@ export default {
   padding: 0px 0px 0px 0px;
   box-sizing: border-box;
   width: 100%;
-  color:#000000;
+  color: #1F2329;
   margin-left: 24px;
   line-height: 26px;
 }

workstation/frontend/src/business/dashboard/components/MyFlawCard.vue

@@ -156,7 +156,7 @@ export default {
   padding: 0px 0px 0px 0px;
   box-sizing: border-box;
   width: 100%;
-  color:#000000;
+  color: #1F2329;
   margin-left: 24px;
   line-height: 26px;
 }