From ef0a928e87e2b743bfec0ab8fbc5f395075a942b Mon Sep 17 00:00:00 2001
From: bwcx_jzy <bwcx_jzy@163.com>
Date: Thu, 16 Sep 2021 10:06:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E5=80=BC=E5=90=8E=E8=87=AA=E5=8A=A8=E9=80=89=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=87=E4=BB=B6=E6=8E=A7=E5=88=B6=E5=8F=B0?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-vue/src/components/customSelect/index.vue | 185 +++++++++---------
 web-vue/src/pages/build/list-info.vue         |  50 +----
 .../node/node-layout/project/project-file.vue |  14 +-
 web-vue/src/pages/node/terminal.vue           |   4 +-
 4 files changed, 112 insertions(+), 141 deletions(-)

diff --git a/web-vue/src/components/customSelect/index.vue b/web-vue/src/components/customSelect/index.vue
index e608541b3..d56228790 100644
--- a/web-vue/src/components/customSelect/index.vue
+++ b/web-vue/src/components/customSelect/index.vue
@@ -4,7 +4,7 @@
       <a-icon slot="suffixIcon" type="reload" @click="refreshSelect" />
       <div slot="dropdownRender" slot-scope="menu">
         <div style="padding: 8px 8px; cursor: pointer; display: flex" @mousedown="(e) => e.preventDefault()">
-        <a-input-search
+          <a-input-search
             enter-button="添加"
             v-model="selectInput"
             @search="onSearch"
@@ -13,14 +13,14 @@
             @click="(e) => e.target.focus()"
             :placeholder="inputPlaceholder"
             size="small"
-        >
-          <a-tooltip slot="suffix">
-            <template slot="title">
-              <slot name="inputTips"></slot>
-            </template>
-            <a-icon type="question-circle" theme="filled" />
-          </a-tooltip>
-        </a-input-search>
+          >
+            <a-tooltip slot="suffix">
+              <template slot="title">
+                <slot name="inputTips"></slot>
+              </template>
+              <a-icon type="question-circle" theme="filled" />
+            </a-tooltip>
+          </a-input-search>
         </div>
         <a-divider style="margin: 4px 0" />
         <v-nodes :vnodes="menu" />
@@ -30,92 +30,95 @@
   </div>
 </template>
 
-
 <script>
-  import { Select } from 'ant-design-vue'
+import { Select } from "ant-design-vue";
 
-  export default {
-    components: {
-      Select,
-      VNodes: {
-        functional: true,
-        render: (h, ctx) => ctx.props.vnodes,
-      },
-    },
-    
-    data() {
-      return {
-        selectInput: "",
-        selectOpen: false,
-        selectFocus: false,
-        inputFocus: false,
-        optionList: [],
-        selected: ''
-      }
-    },
-    props: {
-      // 继承原组件所有props
-      ...Select.props,
-      data: {
-        type: Array,
-        default: () => []
-      },
-      inputPlaceholder: {
-        type: String,
-        default: '请输入...'
-      },
-      selectPlaceholder: {
-        type: String,
-        default: '请选择'
-      }
-    },
-    watch: {
-      value: {
-        handler(v) {
-          this.selected = v
-        },
-        immediate: true,
-      },
-      data: {
-        handler(v) {
-          this.optionList = v;
-        },
-        deep: true,
-        immediate: true,
-      },
+export default {
+  components: {
+    Select,
+    VNodes: {
+      functional: true,
+      render: (h, ctx) => ctx.props.vnodes,
     },
+  },
 
-    methods: {
-      refreshSelect() {
-         this.$emit("onRefreshSelect");
+  data() {
+    return {
+      selectInput: "",
+      selectOpen: false,
+      selectFocus: false,
+      inputFocus: false,
+      optionList: [],
+      selected: "",
+    };
+  },
+  props: {
+    // 继承原组件所有props
+    ...Select.props,
+    data: {
+      type: Array,
+      default: () => [],
+    },
+    inputPlaceholder: {
+      type: String,
+      default: "请输入...",
+    },
+    selectPlaceholder: {
+      type: String,
+      default: "请选择",
+    },
+  },
+  watch: {
+    value: {
+      handler(v) {
+        this.selected = v;
       },
-      selectChange(v) {
-        this.$emit("input", v);
-        this.selectOpen = false;
+      immediate: true,
+    },
+    data: {
+      handler(v) {
+        this.optionList = v;
       },
-      onSearch(v) {
-        if (!v) {
-          return;
-        }
+      deep: true,
+      immediate: true,
+    },
+  },
+
+  methods: {
+    refreshSelect() {
+      this.$emit("onRefreshSelect");
+    },
+    selectChange(v) {
+      this.$emit("input", v);
+      this.selectOpen = false;
+    },
+    onSearch(v) {
+      if (!v) {
+        return;
+      }
+      let index = this.optionList.indexOf(v);
+      if (index === -1) {
         this.optionList = [...this.optionList, v];
-        this.selectInput = "";
-      },
-      setSelectOpen(v) {
-        this.selectFocus = v;
-        if (this.inputFocus || this.selectFocus) {
-          this.selectOpen = true;
-          return;
-        }
-        this.selectOpen = false;
-      },
-      visibleInput(v) {
-        this.inputFocus = v;
-        if (this.inputFocus || this.selectFocus) {
-          this.selectOpen = true;
-          return;
-        }
-        this.selectOpen = false;
-      },
-    }
-  }
-</script>
\ No newline at end of file
+      }
+      this.selectInput = "";
+      this.selected = v;
+    },
+    setSelectOpen(v) {
+      this.selectFocus = v;
+      if (this.inputFocus || this.selectFocus) {
+        this.selectOpen = true;
+        return;
+      }
+      this.selectOpen = false;
+    },
+    visibleInput(v) {
+      this.inputFocus = v;
+      if (this.inputFocus || this.selectFocus) {
+        this.selectOpen = true;
+        return;
+      }
+      this.selectOpen = false;
+    },
+  },
+};
+</script>
diff --git a/web-vue/src/pages/build/list-info.vue b/web-vue/src/pages/build/list-info.vue
index 76d7cdd64..07419cf4b 100644
--- a/web-vue/src/pages/build/list-info.vue
+++ b/web-vue/src/pages/build/list-info.vue
@@ -75,32 +75,17 @@
     <a-modal v-model="editBuildVisible" title="编辑构建" @ok="handleEditBuildOk" width="50%" :maskClosable="false">
       <a-form-model ref="editBuildForm" :rules="rules" :model="temp" :label-col="{ span: 4 }" :wrapper-col="{ span: 20 }">
         <a-form-model-item label="名称" prop="name">
-          <a-input v-model="temp.name" placeholder="名称" />
-        </a-form-model-item>
-        <a-form-model-item label="分组名称" prop="group">
           <a-row>
-            <a-col :span="18">
-              <a-select v-model="temp.group" placeholder="可手动输入">
-                <a-select-option v-for="group in groupList" :key="group">{{ group }}</a-select-option>
-              </a-select>
+            <a-col :span="10">
+              <a-input v-model="temp.name" placeholder="名称" />
             </a-col>
-            <a-col :span="6">
-              <a-popover v-model="addGroupvisible" title="添加分组" trigger="click">
-                <template slot="content">
-                  <a-row>
-                    <a-col :span="18">
-                      <a-input v-model="temp.tempGroup" placeholder="分组名称" />
-                    </a-col>
-                    <a-col :span="6">
-                      <a-button type="primary" @click="handleAddGroup">确认</a-button>
-                    </a-col>
-                  </a-row>
-                </template>
-                <a-button type="primary" class="btn-add">添加分组</a-button>
-              </a-popover>
+            <a-col :span="4" style="text-align: right">分组名称：</a-col>
+            <a-col :span="10">
+              <custom-select v-model="temp.group" :data="groupList" inputPlaceholder="添加分组" selectPlaceholder="分组名称,可以不选择"> </custom-select>
             </a-col>
           </a-row>
         </a-form-model-item>
+
         <a-form-model-item label="仓库地址" prop="repositoryId">
           <a-select v-model="temp.repositoryId" @select="changeRepositpry" @change="changeRepositpry" placeholder="请选择仓库">
             <a-select-option v-for="item in repositoryList" :key="item.id" :value="item.id">{{ item.name }}[{{ item.gitUrl }}]</a-select-option>
@@ -121,7 +106,7 @@
                 </div>
               </custom-select>
             </a-col>
-            <a-col :span="4" style="text-align: right"> 标签(TAG):</a-col>
+            <a-col :span="4" style="text-align: right"> 标签(TAG)：</a-col>
             <a-col :span="10">
               <custom-select
                 v-model="temp.branchTagName"
@@ -273,7 +258,6 @@ export default {
       temp: {},
       // 页面控制变量
       editBuildVisible: false,
-      addGroupvisible: false,
       triggerVisible: false,
       buildLogVisible: false,
       afterOptList: [
@@ -540,26 +524,6 @@ export default {
       this.loadSshList();
       this.editBuildVisible = true;
     },
-    // 添加分组
-    handleAddGroup() {
-      if (!this.temp.tempGroup || this.temp.tempGroup.length === 0) {
-        this.$notification.warning({
-          message: "分组名称不能为空",
-          duration: 2,
-        });
-        return false;
-      }
-      // 添加到分组列表
-      if (this.groupList.indexOf(this.temp.tempGroup) === -1) {
-        this.groupList.push(this.temp.tempGroup);
-      }
-      this.temp.tempGroup = "";
-      this.$notification.success({
-        message: "添加成功",
-        duration: 2,
-      });
-      this.addGroupvisible = false;
-    },
     // 获取仓库分支
     loadBranchList() {
       if (this.tempRepository.repoType !== 0) {
diff --git a/web-vue/src/pages/node/node-layout/project/project-file.vue b/web-vue/src/pages/node/node-layout/project/project-file.vue
index 72f72ff73..afe39bcb2 100644
--- a/web-vue/src/pages/node/node-layout/project/project-file.vue
+++ b/web-vue/src/pages/node/node-layout/project/project-file.vue
@@ -5,7 +5,7 @@
     <a-layout-sider theme="light" class="sider" width="25%">
       <div class="dir-container">
         <a-button type="primary" @click="loadData">刷新目录</a-button>
-        <a-button type="primary" @click="goConsole" v-show="runMode !== 'File'">控制台</a-button>
+        <a-button type="primary" v-if="showConsole" @click="goConsole" v-show="runMode !== 'File'">控制台</a-button>
       </div>
       <a-empty v-if="treeList.length === 0" />
       <el-tree
@@ -123,6 +123,10 @@ export default {
     absPath: {
       type: String,
     },
+    showConsole: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
@@ -139,7 +143,7 @@ export default {
       uploadRemoteFileVisible: false,
       editFileVisible: false,
       successSize: 0,
-      fileContent: '',
+      fileContent: "",
 
       cmOptions: {
         mode: "application/json",
@@ -204,7 +208,7 @@ export default {
 
     // 关闭编辑器弹窗
     handleCloseModal() {
-      this.fileContent = ''
+      this.fileContent = "";
     },
 
     // 加载数据
@@ -272,9 +276,9 @@ export default {
 
       readFile(params).then((res) => {
         if (res.code === 200) {
-          setTimeout(()=> {
+          setTimeout(() => {
             this.fileContent = res.data;
-          }, 300)
+          }, 300);
         }
       });
     },
diff --git a/web-vue/src/pages/node/terminal.vue b/web-vue/src/pages/node/terminal.vue
index ebe8b007c..db653fddd 100644
--- a/web-vue/src/pages/node/terminal.vue
+++ b/web-vue/src/pages/node/terminal.vue
@@ -82,8 +82,8 @@ export default {
         disableStdin: false,
         rendererType: "canvas",
         theme: {
-          foreground: "#7e9192", //字体
-          background: "#002833", //背景色
+          // foreground: "#7e9192", //字体
+          // background: "#002833", //背景色
           cursor: "help", //设置光标
           lineHeight: 16,
         },