gy-webcode2 1.1.7 → 1.2.0

package/components/breadcrumb.vue

@@ -2,7 +2,7 @@
     <div class="breadcrumb">
         <div class="row1" v-if="showRow1">
             <div class="title ">
-                <span class="">{{$route.meta.headerMenuName}}</span>
+                <span class="">{{menuPath.meta.headerMenuName}}</span>
                 <!-- <span class="breadcrumb_iconBox">
                     <i class="el-icon-arrow-right"></i>
                 </span>
@@ -10,8 +10,9 @@
                     {{$route.meta.name}}
                 </span> -->
                 <template v-for="item,index in routerBreadcrumb">
-                    <span class="breadcrumb_iconBox">
-                        <i class="el-icon-arrow-right"></i>
+                    <span class="breadcrumb_iconBox flex aic jcc">
+                        <i class="common_iconfont common_icon-xiexian fs_12"></i>
+                        <!-- <i class="el-icon-arrow-right"></i> -->
                     </span>
                     <span :class="{hover2:index < routerBreadcrumb.length -1,s1:index == routerBreadcrumb.length -1}" @click="itemClick(item,index)">
                         {{item.name}}
@@ -28,7 +29,7 @@
                         {{routerBreadcrumb[routerBreadcrumb.length -1].name}}
                     </template>
                     <template v-else>
-                        {{$route.meta.name}}
+                        {{menuPath.name}}
                     </template>
                 </span>
                
@@ -38,6 +39,9 @@
         <div class="other">
             <div class="otherContainer">
                 <slot name="other"></slot>
+                <el-button title="返回" @click="backClick()" v-if="isBack" icon="" type="primary" class="btnIcon mar_l_10">
+                    <i class="el-icon-arrow-left"></i>
+                </el-button>
             </div>
         </div>
     </div>
@@ -60,11 +64,21 @@ export default {
     data(){
         return {
             myID:"",
+            fullPath:"",
         }
     },
     watch:{
     },
     computed:{
+        menuPath(){
+            // return this.$store.state.menu.menuPath[this.$route.fullPath]
+            let menu = this.$store.state.menu.menuPath
+            let menuKey = Object.keys(menu).find(key => {
+                return this.fullPath.includes(key)
+            })
+            // let findMenu = 
+            return menu[menuKey]
+        },
         names(){
             return this.name ? this.name.split(',') : []
         },
@@ -79,12 +93,9 @@ export default {
                 return true;   
             }
         },
-        routeName(){
-            return this.$route.name;
-        },
         routerBreadcrumb(){
-            if(this.breadcrumb_list[this.routeName]){
-                return this.breadcrumb_list[this.routeName]
+            if(this.breadcrumb_list[this.fullPath]){
+                return this.breadcrumb_list[this.fullPath]
             }
             return []
         }
@@ -92,9 +103,10 @@ export default {
     },
     created(){
         let breadcrumb_list = this.breadcrumb_list;
-        let routeName = this.$route.name;
-        if(!breadcrumb_list[routeName]){
-            this.$set(breadcrumb_list,routeName,[])
+        let fullPath = this.$route.fullPath;
+        this.fullPath = fullPath;
+        if(!breadcrumb_list[fullPath]){
+            this.$set(breadcrumb_list,fullPath,[])
         }
         let myID = uuid(10,16)
         this.myID = myID;
@@ -102,7 +114,7 @@ export default {
         if(this.names.length){
             this.names.forEach(item => {
                 
-                breadcrumb_list[routeName].push({
+                breadcrumb_list[fullPath].push({
                     name:item,
                     id:myID,
                     click:this.backClick
@@ -110,8 +122,8 @@ export default {
             })
         }
         else{
-            breadcrumb_list[routeName].push({
-                name:this.$route.meta.name,
+            breadcrumb_list[fullPath].push({
+                name:this.menuPath.name,
                 id:myID,
                 click:this.backClick
             })
@@ -133,9 +145,9 @@ export default {
         }
     },
     beforeDestroy(){
-        let routeName = this.$route.name;
-        let rIndex = this.routerBreadcrumb.findIndex(i => i.id == this.myID)
-        this.breadcrumb_list[routeName] = this.routerBreadcrumb.splice(0,rIndex);
+        let rIndex = this.breadcrumb_list[this.fullPath].findIndex(i => i.id == this.myID)
+        this.breadcrumb_list[this.fullPath].splice(rIndex,1)
+
     }
 }
 </script>

package/css/layout.scss

@@ -191,6 +191,16 @@
     line-height: 32px;
     &.noPad{
         padding:12px 0 0 0;
+        .start{
+            .item:nth-of-type(1){
+                margin-left: 0;
+            }
+        }
+        .end{
+            .item:nth-last-of-type(1){
+                margin-right: 0;
+            }
+        }
     }
     .start{
         display: flex;
@@ -329,7 +339,7 @@
     top: 0;
     right: 0;
     bottom: 0;
-    z-index: 10;
+    z-index: 99999;
 }
 
 .routerTabs{
@@ -393,3 +403,32 @@
     }
 }
 
+.rightMenuBox{
+    position: fixed;
+    width: 100px;
+    // height: 200px;
+    padding:5px 0;
+    background: #fff;
+    left: 10px;
+    top: 10px;
+    z-index: 999;
+    // box-shadow: 0 0 10px 3px #aaa;
+    box-shadow: 0 0 10px 0px #aaa  ;
+    border-radius:4px;
+    .item{
+        display: flex;
+        align-items: center;
+        font-size: 12px;
+        height: 30px;
+        // border: 1px solid #000;
+        padding-left: 12px;
+        cursor: pointer;
+        .icon{
+            margin-right: 5px;
+        }
+        &:hover{
+            // color: #009499;
+            @include themeColor("color",'hover')
+        }
+    }
+}

package/css/modules/color.scss

@@ -48,7 +48,10 @@
 .color_2{
     color: $color2;
 }
-
+.color_3{
+    color: $color3;
+    // background-color: rgba($color: #000000, $alpha: 1.0);
+}
 .color_4{
     color: $color4;
     // background-color: rgba($color: #000000, $alpha: 1.0);

package/css/modules/elementUI.scss

@@ -5,6 +5,7 @@
     // align-items: center;
     line-height: normal;
     transition: all 0.2s ease;
+    
     // color: #262626;
     &.lan{
         @include themeColor("color",'color');
@@ -76,6 +77,7 @@
         font-size: 14px;
         padding: 5px 10px;
         min-width: 72px;
+        height: 32px;
         border-radius: 6px;
         // padding: 0;
     }
@@ -107,6 +109,10 @@
         min-width: auto ;
         font-size: 12px ;
     }
+    &.is-disabled{
+        color: #fff !important;
+        opacity: 0.5 !important;
+    }
 }
 // 输入框
 .el-input__inner{

package/css/modules/table.scss

@@ -12,17 +12,48 @@
                 font-weight: initial;
                 font-size: 14px;
             }
-            &:nth-of-type(1){
-                border-radius: 8px 0 0 0 ;
+            // &:nth-of-type(1){
+            //     border-radius: 8px 0 0 0 ;
+            // }
+            // &:nth-last-child(2){
+            //     border-radius:0 ;
+            //     // border-right: none;
+            // }
+            // &:nth-last-child(1){
+            //     border-radius:0 8px 0 0 ;
+            // }
+        }
+
+        thead.is-group th.el-table__cell,th{
+            // --el-fill-color-light:var(#fafafa);
+            background: #f0f0f0 !important;
+            // @include themeColor("-el-fill-color-light",'hover');
+            border-right: 1px solid #d9d9d9 !important;
+            
+            >.cell{
+                color:$color;
+                font-weight: initial;
+                font-size: 14px;
             }
-            &:nth-last-child(2){
-                border-radius:0 ;
-                // border-right: none;
+            
+            // &:nth-last-child(1){
+            //     border-radius:0 8px 0 0 ;
+            //     border-right: none !important;
+            // }
+        }
+    
+        thead tr:nth-of-type(1){
+            th:nth-of-type(1){
+                border-radius: 8px 0 0 0 ;
             }
-            &:nth-last-child(1){
+            th:nth-last-child(1){
                 border-radius:0 8px 0 0 ;
+                border-right: none !important;
             }
         }
+        
+
+
         .cell{
             line-height: 20px;
             padding-left:10px;
@@ -42,16 +73,26 @@
         @include themeColor("background-color",'hover',0.1)
     }
 
-    .el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
-        border-bottom: 1px solid #d9d9d9;
+    .el-table td.el-table__cell{
+        border-bottom: 1px solid #ebebeb;
     }
     .el-table--border .el-table__cell, .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{
         border-right: 1px solid #d9d9d9;
     }
+    .el-table--border th.el-table__cell{
+        border-bottom: 1px solid #d9d9d9;
+    }
+
+    .el-table th.el-table__cell.is-leaf{
+        border-bottom: 1px solid #d9d9d9;
+    }
+
     
     .el-table--border, .el-table--group{
         // border: none;
-        border: 1px solid #d9d9d9;
+        border: 1px solid #ebebeb;
+        border-radius: 8px 8px 0 0;
+
     }
     .el-table--border {
         border-right: none;

package/css/modules/tree_check.scss

@@ -25,7 +25,7 @@
     .right{
         overflow: auto;
     }
-    .left,.right{
+    .left{
 
         ul{
             padding:10px;
@@ -53,4 +53,31 @@
             }
         }
     }
+    .right{
+        >ul{
+            padding:10px;
+            li{
+                height: 25px;
+                margin-bottom: 5px;
+                display: flex;
+                font-size: 14px;
+                line-height: 25px;
+                div:nth-of-type(1){
+                    border: 1px solid #efefef;
+                    flex: 1;
+                    color:#666666;
+                    padding-left: 10px;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                }
+                div:nth-of-type(2){
+                    width: 30px;
+                    text-align:center;
+                    color:#a5becf;
+                    cursor: pointer;
+                }
+            }
+        }
+    }
 }

package/index.js

@@ -10,9 +10,10 @@
 // ~的意思是匹配最近的小版本 比如~1.0.2将会匹配所有的1.0.x版本，但不匹配1.1.0
 // ^的意思是最近的一个大版本 比如1.0.2 将会匹配 所有 1.x.x, 但不包括2.x.x
 // * 这意味着安装最新版本的依赖包
-// 已使用项目 指标管理、数据治理
+// 已使用项目 指标管理、数据治理 、数据标准
 // https://registry.npmjs.org/gy-webcode2
 
+// 1.2.0 breadcrumb 使用store的menuPath了
 module.exports = {
-    version :'1.1.7',
+    version :'1.2.0',
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gy-webcode2",
-  "version": "1.1.7",
+  "version": "1.2.0",
   "description": "gy前端公共代码",
   "main": "index.js",
   "scripts": {