gy-webcode2 1.1.3 → 1.1.4

package/components/breadcrumb.vue

@@ -86,12 +86,12 @@ export default {
         },
         showRow1(){
             if(this.position == 'default'){
-                if(this.$store.state.breadcrumbShow){
+                if(this.$store.state.vuex_breadcrumbShow){
                     return true;   
                 }
             }
             else if(this.position == 'top'){
-                if(this.$store.state.breadcrumbShow){
+                if(this.$store.state.vuex_breadcrumbShow){
                     return true;   
                 }
             }

package/components/iconBtn.vue

@@ -1,5 +1,5 @@
 <template>
-        <span class="operateBtnIcon  " @click="$emit('click')"  >
+        <span class="operateBtnIcon  " :class="{disabled:disabled}" @click="iconClick"  >
             <el-tooltip :enterable="false"  :content="title" popper-class="operateBtnIconPopper" placement="bottom" effect="light">
                 <slot></slot>
             </el-tooltip>
@@ -12,6 +12,18 @@ export default {
         title:{
             type:String,
             default:"",
+        },
+        disabled:{
+            type:Boolean,
+            default:false
+        }
+    },
+    methods:{
+        iconClick(){
+            if(!this.disabled){
+                
+                this.$emit('click')
+            }
         }
     }
 }

package/components/themeConfig.vue

@@ -36,7 +36,7 @@
             <div class="flex aic jcb pad_t_10 pad_b_10">
                 <div>面包屑</div>
                 <div>
-                    <el-switch v-model="$store.state.breadcrumbShow"></el-switch>
+                    <el-switch @change="(value)=>{setPageStyle('breadcrumbShow',value)}" v-model="$store.state.vuex_breadcrumbShow"></el-switch>
                 </div>
             </div>
         </div>
@@ -129,20 +129,35 @@
         },
         computed:{
             themeName(){
-                return this.$store.state.themeName
+                return this.$store.state.vuex_themeName
             },
             themeColor(){
-                return this.$store.state.themeColor
+                return this.$store.state.vuex_themeColor
             },
         },
         methods:{
             changeTheme(value){
-                this.$store.state.themeName = value;
+                this.$store.state.vuex_themeName = value;
                 window.document.body.setAttribute('data-theme', value)
+                this.setPageStyle('themeName',value)
             },
             changeThemeColor(value){
-                this.$store.state.themeColor = value;
+                this.$store.state.vuex_themeColor = value;
                 window.document.body.setAttribute('data-theme-color', value)
+                this.setPageStyle('themeColor',value)
+            },
+            setPageStyle(key,val){
+                let gyPageStyle = localStorage.getItem('gy_pageStyle');
+                if(gyPageStyle){
+                    gyPageStyle =JSON.parse(gyPageStyle)
+                }
+                else{
+                    gyPageStyle = {}
+                }
+                // console.log(gyPageStyle);
+                // console.log(key,val);
+                gyPageStyle[key] = val;
+                localStorage.setItem('gy_pageStyle',JSON.stringify(gyPageStyle))
             }
         }
     }

package/css/layout.scss

@@ -222,7 +222,7 @@
     bottom: 0;
     display: flex;
     flex-direction: column;
-    .header{
+    >.header{
         height: 56px;
         display: flex;
         align-items: center;
@@ -236,7 +236,7 @@
             cursor: pointer;
         }
     }
-    .body{
+    >.body{
         position: relative;
         flex: 1;
         height: 0;

package/css/modules/color.scss

@@ -59,3 +59,6 @@
 .color_active{
     @include themeColor("color","color");
 }
+.color_lan{
+    color: #5487ee;
+}

package/css/modules/table.scss

@@ -78,12 +78,13 @@
         bottom: -1px;
     }
     &.gutter .el-table th.gutter{
-        background: #fafafa;
+        background: #f0f0f0;
         display: table-cell!important;
     }
 
     .el-table__fixed-right-patch{
-        background: #fafafa;
+        background: #f0f0f0;
+        border-radius: 0 8px 0 0;
     }
     .tr_error{
         background: #fff0f0;

package/css/modules/tabs.scss

@@ -37,7 +37,7 @@
                 // right: 6px;
                 left: 0;
                 right: 0;
-                width: 60px;
+                // width: 60px;
                 height: 2px;
                 margin: auto;
                 @include themeColor('background-color','active');
@@ -53,4 +53,57 @@
         flex: 1;
         
     }
+}
+.tabs2{
+    height: 40px;
+    background: #fff;
+    border-bottom: 1px solid #d9d9d9;
+    display: flex;
+    .items{
+        display: flex;
+    }
+    .item{
+        position: relative;
+        min-width: 100px;
+        background: #fafafa;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-size: 14px;
+        color: #000000;
+        padding: 0 20px;
+        cursor: pointer;
+        transition: all 0.3s ease;
+        border: 1px solid #d9d9d9;
+        border-right: none;
+        position: relative;
+        bottom:-1px;
+        &:nth-last-of-type(1){
+            border-right: 1px solid #d9d9d9;
+            border-radius:  0  8px 0  0 ;
+        }
+        &:nth-of-type(1){
+            border-radius: 8px 0 0 0;
+        }
+        
+        &.active{
+            background: #fff;
+            border-bottom-color: #fff;
+            position: relative;
+            @include themeColor("color",'active');
+            
+        }
+        &:hover{
+            background: #fff;
+            @include themeColor("color",'active');
+        }
+    }
+    .other{
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        flex: 1;
+        
+    }
+
 }

package/index.js

@@ -13,5 +13,5 @@
 // 已使用项目 指标管理
 
 module.exports = {
-    version :'1.1.3',
+    version :'1.1.4',
 }

package/package.json

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