Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/assets/styles/mixin.less

@@ -543,4 +543,86 @@
 }
 .grey {
     color: @m-grey2;
+}
+.selectBtn.ant-btn {
+    margin-left: 10px;
+    width: 80px;
+    height: 30px;
+    line-height: 31px;
+    text-align: center;
+    background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
+    border: 0;
+    color: @m-white0;
+    font-size: 14px;
+    .rounded-corners(3px);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+}
+.btnPrimary.ant-btn,.operBtn.ant-btn {
+    margin-left: 10px;
+    width: 80px;
+    height: 30px;
+    line-height: 31px;
+    text-align: center;
+    background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
+    border: 0;
+    color: @m-white0;
+    font-size: 14px;
+    .rounded-corners(3px);
+    &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+}
+.ant-table-expanded-row {
+    .btn-list {
+        padding-right: 10px;
+        text-align: right;
+    }
+    .btnPrimary.ant-btn {
+        width: 80px;
+        height: 26px;
+        line-height: 27px;
+        border: 0;
+        background: linear-gradient(0deg, @m-blue2, @m-blue0);
+        box-shadow: -1px 0px 0px 0px @m-black10;
+        .rounded-corners(3px);
+        &:hover,
+    &:focus {
+        background: linear-gradient(0deg, @m-blue2-hover 0%, @m-blue0-hover 99%);
+        color: rgba(@m-white0, 0.8);
+        border: 0;
+    }
+    }
+    .btnDanger.ant-btn:extend(.ant-table-expanded-row .btnPrimary.ant-btn) {
+        background: linear-gradient(0deg, @m-red0, @m-red1);
+        color: @m-white0;
+        font-size: 14px;
+        &:hover,
+        &:focus {
+            background: linear-gradient(0deg, @m-red0-hover 0%, @m-red1-hover 99%);
+            color: rgba(@m-white0, 0.8);
+            border: 0;
+        }
+    }
+    .btnDeafault.ant-btn:extend(.ant-table-expanded-row .btnPrimary.ant-btn) {
+        background: linear-gradient(0deg, @m-grey12 0%, @m-grey13 100%);
+        color: @m-white0;
+        font-size: 14px;
+        &:hover,
+        &:focus {
+            background: linear-gradient(0deg, @m-grey12-hover 0%, @m-grey13-hover 99%);
+            color: rgba(@m-white0, 0.8);
+            border: 0;
+        }
+    }
+    .ant-btn+.ant-btn {
+        margin-left: 10px;
+    }
 }

src/assets/styles/variables.less

@@ -42,6 +42,7 @@
 @m-black7: #15293A;
 @m-black8: #212629;
 @m-black9: #161A1C;
+@m-black10: #121618;
 @m-blue0: #3a87f7;
 @m-blue0-hover: rgba(@m-blue0, .8);
 @m-blue1: #4885eb;

src/common/components/buttonList/interface.ts

@@ -1,4 +1,4 @@
-export type BtnClassName = 'btnDeafault' | 'btnPrimary' | 'btnDanger'
+export type BtnClassName = 'btnDeafault' | 'btnPrimary' | 'btnDanger' | 'operBtn'
 export interface BtnList {
     lable: string;  // 按钮名字
     callback: Function;

src/common/setup/contextMenu/index.ts

@@ -17,6 +17,8 @@ function getClassName(val: string): BtnClassName {
         result = 'btnDanger'
     } else if (val === '') {
         result = 'btnDeafault'
+    } else if (val.includes('add')) {
+        result = 'operBtn'
     } else {
         result = 'btnPrimary'
     }

src/views/information/custom/compoments/filterTable/index.vue

@@ -106,31 +106,4 @@ export default defineComponent({
     }
     
 }
-.selectBtn.ant-btn {
-    margin-left: 10px;
-    width: 80px;
-    height: 30px;
-    line-height: 31px;
-    text-align: center;
-    background: linear-gradient(0deg, @m-grey15 0%, @m-grey16 98%);
-    border: 0;
-    color: @m-white0;
-    font-size: 14px;
-    .rounded-corners(3px);
-    &:hover,
-    &:focus {
-        background: linear-gradient(0deg, @m-grey15-hover 0%, @m-grey16-hover 98%);
-        color: rgba(@m-white0, 0.8);
-        border: 0;
-    }
-}
-.operBtn.ant-btn:extend(.selectBtn.ant-btn) {
-    background: linear-gradient(0deg, @m-blue6 0%, @m-blue7 99%);
-    &:hover,
-    &:focus {
-        background: linear-gradient(0deg, @m-blue6-hover 0%, @m-blue7-hover 99%);
-        color: rgba(@m-white0, 0.8);
-        border: 0;
-    }
-}
 </style>;