:bookmark: Releasing / Version tags. 2.2.0 ui

src/api/daemon/status-trace-log.js

@@ -42,7 +42,7 @@ export function getObj (id) {
 
 export function delObj (id) {
   return request({
-    url: '/daemon/statustracelog/' + id,
+    url: '/daemon/status-trace-log/' + id,
     method: 'delete'
   })
 }

src/mixins/color.js

@@ -1,175 +1,167 @@
-import {
-  mapGetters
-} from 'vuex'
-const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#409EFF' // default color
+import { mapGetters } from "vuex";
+const version = require("element-ui/package.json").version; // element-ui version from node_modules
+const ORIGINAL_THEME = "#409EFF"; // default color
 export default function () {
   return {
-    data () {
+    data() {
       return {
         themeVal: ORIGINAL_THEME
       }
     },
-    created () {
-      this.themeVal = this.theme
+    created() {
+      this.themeVal = this.theme;
     },
     watch: {
-      themeVal (val, oldVal) {
-        this.$store.commit('SET_THEME', val)
-        this.updateTheme(val, oldVal)
+      themeVal(val, oldVal) {
+        this.$store.commit("SET_THEME", val);
+        this.updateTheme(val, oldVal);
       }
     },
     computed: {
-      ...mapGetters(['theme'])
+      ...mapGetters(["theme"])
     },
     methods: {
-      updateTheme (val, oldVal) {
-        if (typeof val !== 'string') return
-        const head = document.getElementsByTagName('head')[0]
-        const themeCluster = this.getThemeCluster(val.replace('#', ''))
-        const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
+      updateTheme(val, oldVal) {
+        if (typeof val !== "string") return;
+        const head = document.getElementsByTagName("head")[0];
+        const themeCluster = this.getThemeCluster(val.replace("#", ""));
+        const originalCluster = this.getThemeCluster(oldVal.replace("#", ""));
         const getHandler = (variable, id) => {
           return () => {
             const originalCluster = this.getThemeCluster(
-              ORIGINAL_THEME.replace('#', '')
-            )
+              ORIGINAL_THEME.replace("#", "")
+            );
             const newStyle = this.updateStyle(
               this[variable],
               originalCluster,
               themeCluster
-            )
+            );
 
-            let styleTag = document.getElementById(id)
+            let styleTag = document.getElementById(id);
             if (!styleTag) {
-              styleTag = document.createElement('style')
-              styleTag.setAttribute('id', id)
-              head.appendChild(styleTag)
+              styleTag = document.createElement("style");
+              styleTag.setAttribute("id", id);
+              head.appendChild(styleTag);
             }
-            styleTag.innerText = newStyle
-          }
-        }
+            styleTag.innerText = newStyle;
+          };
+        };
 
-        const chalkHandler = getHandler('chalk', 'chalk-style')
+        const chalkHandler = getHandler("chalk", "chalk-style");
 
         if (!this.chalk) {
-          const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
-          this.getCSSString(url, chalkHandler, 'chalk')
+          const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`;
+          this.getCSSString(url, chalkHandler, "chalk");
         } else {
-          chalkHandler()
+          chalkHandler();
         }
 
         const link = [].slice.call(
-          document.getElementsByTagName('head')[0].getElementsByTagName('link')
-        )
-        for (let i = link.length - 3; i < link.length; i++) {
-          const style = link[i]
-          if (style.href.indexOf('app') != -1) {
+          document.getElementsByTagName("head")[0].getElementsByTagName("link")
+        );
+        for (let i = 0; i < link.length; i++) {
+          const style = link[i];
+          if (style.href.includes('css')) {
             this.getCSSString(style.href, innerText => {
               const originalCluster = this.getThemeCluster(
-                ORIGINAL_THEME.replace('#', '')
-              )
+                ORIGINAL_THEME.replace("#", "")
+              );
               const newStyle = this.updateStyle(
                 innerText,
                 originalCluster,
                 themeCluster
-              )
-              let styleTag = document.getElementById(i)
+              );
+              let styleTag = document.getElementById(i);
               if (!styleTag) {
-                styleTag = document.createElement('style')
-                styleTag.id = i
-                styleTag.innerText = newStyle
-                head.appendChild(styleTag)
+                styleTag = document.createElement("style");
+                styleTag.id = i;
+                styleTag.innerText = newStyle;
+                head.appendChild(styleTag);
               }
-            })
+            });
           }
         }
 
-        const styles = [].slice
-          .call(document.querySelectorAll('style'))
-          .filter(style => {
-            const text = style.innerText
-            return (
-              new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
-            )
-          })
+        const styles = [].slice.call(document.querySelectorAll("style"))
+
         styles.forEach(style => {
           const {
             innerText
-          } = style
-          if (typeof innerText !== 'string') return
+          } = style;
+          if (typeof innerText !== "string") return;
           style.innerText = this.updateStyle(
             innerText,
             originalCluster,
             themeCluster
-          )
-        })
+          );
+        });
       },
-      updateStyle (style, oldCluster, newCluster) {
-        let newStyle = style
+      updateStyle(style, oldCluster, newCluster) {
+        let newStyle = style;
         oldCluster.forEach((color, index) => {
-          newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
-        })
-        return newStyle
+          newStyle = newStyle.replace(new RegExp(color, "ig"), newCluster[index]);
+        });
+        return newStyle;
       },
 
-      getCSSString (url, callback, variable) {
-        const xhr = new XMLHttpRequest()
+      getCSSString(url, callback, variable) {
+        const xhr = new XMLHttpRequest();
         xhr.onreadystatechange = () => {
           if (xhr.readyState === 4 && xhr.status === 200) {
             if (variable) {
-              this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
+              this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, "");
             }
-            callback(xhr.responseText)
+            callback(xhr.responseText);
           }
-        }
-        xhr.open('GET', url)
-        xhr.send()
+        };
+        xhr.open("GET", url);
+        xhr.send();
       },
 
-      getThemeCluster (theme) {
+      getThemeCluster(theme) {
         const tintColor = (color, tint) => {
-          let red = parseInt(color.slice(0, 2), 16)
-          let green = parseInt(color.slice(2, 4), 16)
-          let blue = parseInt(color.slice(4, 6), 16)
+          let red = parseInt(color.slice(0, 2), 16);
+          let green = parseInt(color.slice(2, 4), 16);
+          let blue = parseInt(color.slice(4, 6), 16);
 
           if (tint === 0) {
             // when primary color is in its rgb space
-            return [red, green, blue].join(',')
+            return [red, green, blue].join(",");
           } else {
-            red += Math.round(tint * (255 - red))
-            green += Math.round(tint * (255 - green))
-            blue += Math.round(tint * (255 - blue))
+            red += Math.round(tint * (255 - red));
+            green += Math.round(tint * (255 - green));
+            blue += Math.round(tint * (255 - blue));
 
-            red = red.toString(16)
-            green = green.toString(16)
-            blue = blue.toString(16)
+            red = red.toString(16);
+            green = green.toString(16);
+            blue = blue.toString(16);
 
-            return `#${red}${green}${blue}`
+            return `#${red}${green}${blue}`;
           }
-        }
+        };
 
         const shadeColor = (color, shade) => {
-          let red = parseInt(color.slice(0, 2), 16)
-          let green = parseInt(color.slice(2, 4), 16)
-          let blue = parseInt(color.slice(4, 6), 16)
+          let red = parseInt(color.slice(0, 2), 16);
+          let green = parseInt(color.slice(2, 4), 16);
+          let blue = parseInt(color.slice(4, 6), 16);
 
-          red = Math.round((1 - shade) * red)
-          green = Math.round((1 - shade) * green)
-          blue = Math.round((1 - shade) * blue)
+          red = Math.round((1 - shade) * red);
+          green = Math.round((1 - shade) * green);
+          blue = Math.round((1 - shade) * blue);
 
-          red = red.toString(16)
-          green = green.toString(16)
-          blue = blue.toString(16)
+          red = red.toString(16);
+          green = green.toString(16);
+          blue = blue.toString(16);
 
-          return `#${red}${green}${blue}`
-        }
+          return `#${red}${green}${blue}`;
+        };
 
-        const clusters = [theme]
+        const clusters = [theme];
         for (let i = 0; i <= 9; i++) {
-          clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
+          clusters.push(tintColor(theme, Number((i / 10).toFixed(2))));
         }
-        clusters.push(shadeColor(theme, 0.1))
-        return clusters
+        clusters.push(shadeColor(theme, 0.1));
+        return clusters;
       }
     }
   }

src/page/index/top/top-setting.vue

@@ -9,7 +9,7 @@
          :class="{'setting__content--show':box}">
       <div class="setting__header">版权信息</div>
       <div class="setting__body setting__about">
-        <p>Version：PigX 2.1.0</p>
+        <p>Version：PigX 2.2.0</p>
         <p>Copyright: Pig4Cloud ©2018-2025</p>
       </div>
       <div class="setting__header">设置

src/page/login/index.vue

@@ -11,6 +11,7 @@
              src="/img/logo.png"
              alt="">
         <p class="title">{{website.infoTitle}}</p>
+        <p>v 2.2.0</p>
       </div>
       <div class="login-border">
         <div class="login-main">
@@ -40,6 +41,7 @@
 
       </div>
     </div>
+    <top-color v-show="false"></top-color>
   </div>
 </template>
 <script>
@@ -50,12 +52,14 @@
   import { setStore, getStore } from "@/util/store";
   import { dateFormat } from "@/util/date";
   import { validatenull } from "@/util/validate";
+  import topColor from "@/page/index/top/top-color";
   export default {
     name: "login",
     components: {
       userLogin,
       codeLogin,
-      thirdLogin
+      thirdLogin,
+      topColor
     },
     data() {
       return {
@@ -136,7 +140,7 @@
     border-bottom-left-radius: 5px;
     justify-content: center;
     flex-direction: column;
-    background-color: #409eff;
+    background-color: #409EFF;
     color: #fff;
     float: left;
     width: 50%;

src/page/wel.vue

@@ -6,16 +6,16 @@
           <a href="https://avue.top/#/pay" target="_blank">
             <img src="https://img.shields.io/badge/Avue-原子弹-green.svg" alt="Build Status">
           </a>
-          <img src="https://img.shields.io/badge/Spring%20Boot-2.0.8.RELEASE-yellowgreen.svg" alt="Downloads">
-          <img src="https://img.shields.io/badge/Spring%20Cloud-Finchley.SR2-blue.svg" alt="Coverage Status">
+          <img src="https://img.shields.io/badge/Spring%20Boot-2.1.2.RELEASE-yellowgreen.svg" alt="Downloads">
+          <img src="https://img.shields.io/badge/Spring%20Cloud-Greenwich.RELEASE-blue.svg" alt="Coverage Status">
         </span>
         <br/>
         <span>
           <el-collapse v-model="activeNames">
             <el-collapse-item title="完整的微服务架构" name="1">
               <div>基于Spring Cloud Gateway</div>
-              <div>基于Spring Cloud Finchley.SR2</div>
-              <div>基于Spring Boot 2.0.8.RELEASE</div>
+              <div>基于Spring Cloud Greenwich.RELEASE</div>
+              <div>基于Spring Boot 2.1.2.RELEASE</div>
             </el-collapse-item>
             <el-collapse-item title="完善的权限控制" name="2">
               <div>基于Spring Security OAuth实现鉴权体系；</div>

src/styles/element-ui.scss

@@ -52,9 +52,6 @@
   z-index: 2048;
 }
 
-.el-scrollbar__wrap {
-  overflow-x: hidden;
-}
 
 .el-col {
   margin-bottom: 8px;

src/views/activiti/detail.vue

@@ -72,5 +72,12 @@
       box-sizing: border-box;
     }
   }
+  .iframe {
+    width: 100%;
+    height: 100%;
+    border: 0;
+    overflow: hidden;
+    box-sizing: border-box;
+  }
 
 </style>

src/views/daemon/status-trace-log/index.vue

@@ -98,7 +98,7 @@
       },
       rowDel: function (row, index) {
         var _this = this
-        this.$confirm('是否确认删除ID为' + row.clientId, '提示', {
+        this.$confirm('是否确认删除ID为' + row.id, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

vue.config.js

@@ -1,4 +1,4 @@
-const url = 'http://139.224.200.249:19999'
+const url = 'http://127.0.0.1:9999'
 module.exports = {
   lintOnSave: true,
   productionSourceMap: false,