Merge branch 'dev' into 'master'

Dev See merge request apaas-v3/apaas-ui!1

Merge branch 'dev' into 'master'
Dev See merge request apaas-v3/apaas-ui!1
7babac10 · 张亚松 · b8c4873f · c14e00a7 · 7babac10 · 7babac10
Commit 7babac10 authored Mar 09, 2022 by 张亚松
9 changed files
--- a/.beagle.yml
+++ b/.beagle.yml
@@ -51,7 +51,7 @@ pipeline:
    base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3
    dockerfile: .beagle/dockerfile
    repo: wod/apaas-ui
-    version: v3.0.3
+    version: v3.0.4
    channel: alpha
    args: "TARGETOS=linux,TARGETARCH=amd64" ## 不同架构的构建参数
    registry: registry.cn-qingdao.aliyuncs.com
@@ -70,8 +70,8 @@ pipeline:
    dns: 223.5.5.5
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha
-    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha
+    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4
    registry: registry.cn-qingdao.aliyuncs.com
    secrets: 
      - source: REGISTRY_USER_ALIYUN
@@ -88,7 +88,7 @@ pipeline:
    dns: 223.5.5.5
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4
    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0
    registry: registry.cn-qingdao.aliyuncs.com
    secrets: 
@@ -108,7 +108,7 @@ pipeline:
    base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-arm64
    dockerfile: .beagle/dockerfile
    repo: wod/apaas-ui
-    version: v3.0.3
+    version: v3.0.4
    channel: alpha-arm64
    args: "TARGETOS=linux,TARGETARCH=arm64"
    registry: registry.cn-qingdao.aliyuncs.com
@@ -127,8 +127,8 @@ pipeline:
    dns: 223.5.5.5
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha-arm64
-    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-arm64
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-arm64
+    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-arm64
    registry: registry.cn-qingdao.aliyuncs.com
    secrets: 
      - source: REGISTRY_USER_ALIYUN
@@ -145,7 +145,7 @@ pipeline:
    dns: 223.5.5.5
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-arm64
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-arm64
    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-arm64
    registry: registry.cn-qingdao.aliyuncs.com
    secrets: 
@@ -164,7 +164,7 @@ pipeline:
    base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-ppc64le
    dockerfile: .beagle/dockerfile
    repo: wod/apaas-ui
-    version: v3.0.3
+    version: v3.0.4
    channel: alpha-ppc64le
    args: "TARGETOS=linux,TARGETARCH=ppc64le"
    registry: registry.cn-qingdao.aliyuncs.com
@@ -182,8 +182,8 @@ pipeline:
    dns: 223.5.5.5
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha-ppc64le
-    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-ppc64le
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-ppc64le
+    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-ppc64le
    registry: registry.cn-qingdao.aliyuncs.com
    secrets: 
      - source: REGISTRY_USER_ALIYUN
@@ -199,7 +199,7 @@ pipeline:
    dns: 223.5.5.5
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-ppc64le
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-ppc64le
    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-ppc64le
    registry: registry.cn-qingdao.aliyuncs.com
    secrets: 
@@ -218,7 +218,7 @@ pipeline:
    base: hub.wodcloud.com/wod/ui-base:2.0-apaasv3-mips64le
    dockerfile: .beagle/dockerfile
    repo: wod/apaas-ui
-    version: v3.0.3
+    version: v3.0.4
    channel: alpha-mips64le
    args: "TARGETOS=linux,TARGETARCH=mips64le"
    registry: registry.cn-qingdao.aliyuncs.com
@@ -236,8 +236,8 @@ pipeline:
    dns: 223.5.5.5
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha-mips64le
-    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-mips64le
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha-mips64le
+    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-mips64le
    registry: registry.cn-qingdao.aliyuncs.com
    secrets: 
      - source: REGISTRY_USER_ALIYUN
@@ -253,7 +253,7 @@ pipeline:
    dns: 223.5.5.5
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-mips64le
+    source: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-mips64le
    target: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0-mips64le
    registry: registry.cn-qingdao.aliyuncs.com
    secrets: 
@@ -270,7 +270,7 @@ pipeline:
    namespace: apaas-v3
    deployment: apaas-ui
    container: apaas-ui
-    registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.3-alpha
+    registry: registry.cn-qingdao.aliyuncs.com/wod/apaas-ui:v3.0.4-alpha
    when:
      branch: 
        - dev
--- a/package.json
+++ b/package.json
@@ -30,6 +30,7 @@
    "string-format": "^2.0.0",
    "svg-sprite-loader": "^4.2.6",
    "thread-loader": "^3.0.0",
+    "uuid": "^8.3.2",
    "vue": "^2.6.10",
    "vue-codemirror": "^4.0.6",
    "vue-cropper": "^0.5.2",

--- a/src/components/e-charts/gkmultiple_circle.vue
+++ b/src/components/e-charts/gkmultiple_circle.vue
@@ -3,7 +3,7 @@
 </template>

 <script>
-import uuidv1 from "uuid/v1";
+import { v4 as uuidv4 } from 'uuid';
 var echarts = require("echarts");
 export default {
  props: {
@@ -29,7 +29,7 @@ export default {
  components: {},
  data() {
    return {
-      yylx_asy: uuidv1()
+      yylx_asy: uuidv4()
    };
  },
  watch: {

--- a/src/components/e-charts/line_chart.vue
+++ b/src/components/e-charts/line_chart.vue
@@ -3,7 +3,7 @@
 </template>

 <script>
-import uuidv1 from "uuid/v1";
+import { v4 as uuidv4 } from 'uuid';
 var echarts = require("echarts");
 export default {
  props: {
@@ -45,7 +45,7 @@ export default {
  components: {},
  data() {
    return {
-      line: uuidv1()
+      line: uuidv4()
    };
  },
  watch: {

--- a/src/components/e-charts/multiple_circle.vue
+++ b/src/components/e-charts/multiple_circle.vue
@@ -3,7 +3,7 @@
 </template>

 <script>
-import uuidv1 from "uuid/v1";
+import { v4 as uuidv4 } from 'uuid';
 var echarts = require("echarts");
 export default {
  props: {
@@ -41,7 +41,7 @@ export default {
  components: {},
  data() {
    return {
-      yylx_asy: uuidv1(),
+      yylx_asy: uuidv4(),
    };
  },
  watch: {

--- a/src/components/e-charts/single_circle.vue
+++ b/src/components/e-charts/single_circle.vue
@@ -3,7 +3,7 @@
 </template>

 <script>
-import uuidv1 from "uuid/v1";
+import { v4 as uuidv4 } from 'uuid';
 var echarts = require("echarts");
 export default {
  props: {
@@ -21,7 +21,7 @@ export default {
  components: {},
  data() {
    return {
-      health: uuidv1(),
+      health: uuidv4(),
    };
  },
  watch: {

--- a/src/pages/workbench/fwzc_fwcs.vue
+++ b/src/pages/workbench/fwzc_fwcs.vue
@@ -269,6 +269,31 @@
                </el-col>
              </el-row>
            </el-tab-pane>
+            <el-tab-pane
+              label="请求头Header"
+              name="3"
+            >
+              <ces-table
+                ref="fwcs_zhfw_qqtcs"
+                size="mini"
+                :border="true"
+                :headers="sjfwQqtcs"
+                url
+                :datas="datasQqu"
+                :searchShow="false"
+                :addRowBtn="false"
+                :autoAdd="true"
+                :isDialog="false"
+                :isSelection="false"
+                :isIndex="true"
+                :radius="true"
+                :emptyText="emptyText"
+                :stripe="false"
+                :paginationShow="false"
+                :pageSizeShow="false"
+                headerCellClassName="th_pink"
+              ></ces-table>
+            </el-tab-pane>
          </el-tabs>
        </div>
        <div v-if="activeBtn == 1">
@@ -380,6 +405,31 @@
                ></ces-table>
              </div>
            </el-tab-pane>
+           <el-tab-pane
+              label="请求头Header"
+              name="2"
+            >
+              <ces-table
+                ref="fwcs_zhfw_qqtcs"
+                size="mini"
+                :border="true"
+                :headers="sjfwQqtcs"
+                url
+                :datas="datasQqu"
+                :searchShow="false"
+                :addRowBtn="false"
+                :autoAdd="true"
+                :isDialog="false"
+                :isSelection="false"
+                :isIndex="true"
+                :radius="true"
+                :emptyText="emptyText"
+                :stripe="false"
+                :paginationShow="false"
+                :pageSizeShow="false"
+                headerCellClassName="th_pink"
+              ></ces-table>
+            </el-tab-pane>
          </el-tabs>
        </div>
      </block-radius>
@@ -621,6 +671,31 @@
                  </el-col>
                </el-row>
              </el-tab-pane>
+              <el-tab-pane
+                label="请求头Header"
+                name="3"
+              >
+                <ces-table
+                ref="fwcs_zhfw_qqtcs"
+                size="mini"
+                :border="true"
+                :headers="sjfwQqtcs"
+                url
+                :datas="datasQqu"
+                :searchShow="false"
+                :addRowBtn="false"
+                :autoAdd="true"
+                :isDialog="false"
+                :isSelection="false"
+                :isIndex="true"
+                :radius="true"
+                :emptyText="emptyText"
+                :stripe="false"
+                :paginationShow="false"
+                :pageSizeShow="false"
+                headerCellClassName="th_pink"
+              ></ces-table>
+              </el-tab-pane>
            </el-tabs>
            <div v-show="itemOne.resultShow">
              <div v-show="itemOne.resSuccess">
@@ -1011,6 +1086,16 @@ export default {
          ]
        }
      ],
+      sjfwQqtcs:[
+        {
+          label: "key",
+          prop: "requestEncoding",
+          type: "input",
+          align: "left"
+        },
+        { label: "value", prop: "requestValue", type: "input", align: "left" }
+      ],
+      datasQqu:[],
      datasZhForm: [],
      datasZhwww: [],
      emptyText: "暂无数据",
@@ -1201,6 +1286,7 @@ export default {
    clickFwcs() {
      let headers = {};
      let requestData = {};
+      let requestHeaderDataObj = {};
      if (this.activeBtn == 0 || this.activeBtn == 3) {
        if (this.sqfsVal != "") {
          headers.Authorization = [];
@@ -1253,6 +1339,31 @@ export default {
          }
        }
      }
+      if(this.activeBtn == 0 || this.activeBtn == 2 || this.activeBtn == 3 || this.activeBtn == 4){
+        let requestHeader = this.$refs.fwcs_zhfw_qqtcs.getTableData();
+         for (let i = 0; i < requestHeader.length; i++) {
+          if (
+            requestHeader[i] &&
+            requestHeader[i].requestEncoding &&
+            requestHeader[i].requestValue &&
+            requestHeader[i].requestEncoding != "" &&
+            requestHeader[i].requestValue != ""
+          ) {
+            console.log(Object.keys(requestHeaderDataObj).indexOf(requestHeader[i].requestEncoding) == -1)
+            if (
+              Object.keys(requestHeaderDataObj).indexOf(requestHeader[i].requestEncoding) == -1
+            ) {
+              requestHeaderDataObj[requestHeader[i].requestEncoding] = [];
+              requestHeaderDataObj[requestHeader[i].requestEncoding][0] = requestHeader[i].requestValue;
+            } else {
+              requestHeaderDataObj[requestHeader[i].requestEncoding].push(
+                requestHeader[i].requestValue
+              );
+            }
+          }
+        }
+        headers = Object.assign(headers, requestHeaderDataObj)
+      }
      let bodys = "";
      let contentType = "";
      if (this.activeBtn == 0 || this.activeBtn == 3) {

--- a/src/pages/workbench/workPlace.vue
+++ b/src/pages/workbench/workPlace.vue
@@ -342,7 +342,7 @@
 </template>

 <script>
-import uuidv1 from "uuid/v1";
+import { v4 as uuidv4 } from 'uuid';
 import tableUm from "@/components/table/table-um";
 import ListPagination from "@/components/comments-pagination";
 import helper from "@/services/helper.js";
@@ -384,11 +384,11 @@ export default {
      now_app: 0,
      now_online:-1,
      manage_flag: false,
-      health: uuidv1(),
-      yy_asy: uuidv1(),
-      fwyy: uuidv1(),
-      fwlx_asy: uuidv1(),
-      yylx_asy: uuidv1(),
+      health: uuidv4(),
+      yy_asy: uuidv4(),
+      fwyy: uuidv4(),
+      fwlx_asy: uuidv4(),
+      yylx_asy: uuidv4(),
      now_chart:0,
      cpu_data:{
        data: 0,

--- a/yarn.lock
+++ b/yarn.lock