update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像

疯狂的狮子li

2021-10-20 82f1f5d0cf1b51a5d81915e842e01760f404fa74

 ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -1,57 +1,57 @@
<template>

    <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }">

        <logo v-if="showLogo" :collapse="isCollapse" />

        <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">

            <el-menu

                :default-active="activeMenu"

                :collapse="isCollapse"

                :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg"

                :text-color="settings.sideTheme === 'theme-dark' ? variables.menuText : 'rgba(0,0,0,.65)'"

                :unique-opened="true"

                :active-text-color="settings.theme"

                :collapse-transition="false"

                mode="vertical"

            >

                <sidebar-item

                    v-for="(route, index) in permission_routes"

                    :key="route.path  + index"

                    :item="route"

                    :base-path="route.path"

                />

            </el-menu>

        </el-scrollbar>

    </div>

</template>



<script>

import { mapGetters, mapState } from "vuex";

import Logo from "./Logo";

import SidebarItem from "./SidebarItem";

import variables from "@/assets/styles/variables.scss";



export default {

    components: { SidebarItem, Logo },

    computed: {

        ...mapState(["settings"]),

        ...mapGetters(["permission_routes", "sidebar"]),

        activeMenu() {

            const route = this.$route;

            const { meta, path } = route;

            // if set path, the sidebar will highlight the path you set

            if (meta.activeMenu) {

                return meta.activeMenu;

            }

            return path;

        },

        showLogo() {

            return this.$store.state.settings.sidebarLogo;

        },

        variables() {

            return variables;

        },

        isCollapse() {

            return !this.sidebar.opened;

        }

    }

};

</script>

<template>
    <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
        <logo v-if="showLogo" :collapse="isCollapse" />
        <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
            <el-menu
                :default-active="activeMenu"
                :collapse="isCollapse"
                :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
                :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
                :unique-opened="true"
                :active-text-color="settings.theme"
                :collapse-transition="false"
                mode="vertical"
            >
                <sidebar-item
                    v-for="(route, index) in sidebarRouters"
                    :key="route.path  + index"
                    :item="route"
                    :base-path="route.path"
                />
            </el-menu>
        </el-scrollbar>
    </div>
</template>

<script>
import { mapGetters, mapState } from "vuex";
import Logo from "./Logo";
import SidebarItem from "./SidebarItem";
import variables from "@/assets/styles/variables.scss";

export default {
    components: { SidebarItem, Logo },
    computed: {
        ...mapState(["settings"]),
        ...mapGetters(["sidebarRouters", "sidebar"]),
        activeMenu() {
            const route = this.$route;
            const { meta, path } = route;
            // if set path, the sidebar will highlight the path you set
            if (meta.activeMenu) {
                return meta.activeMenu;
            }
            return path;
        },
        showLogo() {
            return this.$store.state.settings.sidebarLogo;
        },
        variables() {
            return variables;
        },
        isCollapse() {
            return !this.sidebar.opened;
        }
    }
};
</script>