Merge pull request #126 from FlowCI/develop

Develop

Author: gy2006

.gitignore

@@ -7,3 +7,4 @@ coverage
 .yarn-cache
 deploy.sh
 .vscode/
+.run/

.run/start.run.xml

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
-
 ## build from docker
-build_image=node:10.16.3-jessie
+build_image=node:14
 
 docker run -it --rm \
 -v "$PWD":/usr/src/flowci.web \

build.sh

@@ -1,6 +1,6 @@
 {
   "name": "flow-web-x",
-  "version": "0.20.45",
+  "version": "0.21.05",
   "description": "flow.ci web ui",
   "author": "Yang Guo <32008001@qq.com>",
   "private": true,
@@ -11,9 +11,9 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
-    "@antv/g6": "^3.6.0",
+    "@antv/g6": "^4.0.3",
     "@mdi/js": "^5.3.45",
-    "axios": "^0.19.0",
+    "axios": "^0.21.1",
     "babel-polyfill": "^6.26.0",
     "blueimp-md5": "^2.11.0",
     "codemirror": "^5.57.0",
@@ -24,7 +24,7 @@
     "google-protobuf": "^3.11.4",
     "js-base64": "^2.4.9",
     "jwt-decode": "^2.2.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.20",
     "marked": "^0.7.0",
     "moment": "^2.22.2",
     "monaco-editor": "^0.17.0",
@@ -54,7 +54,7 @@
     "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.0.0",
     "iscroll": "^5.2.0",
-    "sass": "^1.19.0",
+    "sass": "^1.32.6",
     "sass-loader": "^7.1.0",
     "style-resources-loader": "^1.2.1",
     "vue-template-compiler": "^2.5.21",

package-lock.json

@@ -17,6 +17,7 @@
     <v-navigation-drawer v-if="canDisplay"
                          v-model="flowNavDrawer"
                          :clipped="$vuetify.breakpoint.lgAndUp"
+                         width="20%"
                          app>
       <flow-menu></flow-menu>
     </v-navigation-drawer>

package.json

@@ -15,6 +15,18 @@ tr.v-data-table__empty-wrapper {
   text-transform: none !important;
 }
 
+.v-text-field__slot {
+  .v-label {
+    font-size: 12px;
+  }
+}
+
+.v-select__slot {
+  .v-label {
+    font-size: 12px;
+  }
+}
+
 .v-btn {
   font-weight: 600;
 }

src/App.vue

@@ -68,6 +68,7 @@
     methods: {
       onConfirmClick () {
         this.$emit('click')
+        this.dialog = false
       }
     }
   }

src/assets/styles/vuetify.scss

@@ -0,0 +1,39 @@
+<template>
+  <v-card :color="background" elevation="0">
+    <v-card-text class="pa-2">
+      <span :class="fontcolor">{{ message }}</span>
+    </v-card-text>
+  </v-card>
+</template>
+
+<script>
+export default {
+  name: "MessageBox",
+  props: {
+    background: {
+      type: String,
+      required: false,
+      default() {
+        return 'red lighten-5'
+      }
+    },
+
+    fontcolor: {
+      type: String,
+      required: false,
+      default() {
+        return 'error--text'
+      }
+    },
+
+    message: {
+      type: String,
+      required: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/components/Common/ConfirmBtn.vue

@@ -0,0 +1,24 @@
+<template>
+  <v-row align="center">
+    <v-divider></v-divider>
+    <span class="mx-2 font-weight-bold">{{ text }}</span>
+    <slot name="action"></slot>
+    <v-divider></v-divider>
+  </v-row>
+</template>
+
+<script>
+export default {
+  name: "TextDivider",
+  props: {
+    text: {
+      type: String,
+      required: true
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>