Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi

Min
2 parents 50dd9126 b536fa2a
Showing 4 changed files with 35 additions and 31 deletions
.umirc.ts
src/components/Common/CommonCostomTabBill.js
src/global.less
src/index.less
@@ -38,4 +38,5 @@ export default defineConfig({
   },
   plugins: ["@umijs/plugins/dist/dva"],
   mfsu: false,
+  hash: true,
 });
@@ -5686,7 +5686,7 @@ const ProcessCardComponent = props =&gt; {
           {/* {productCardValue === "preVersion" && ( */}
           {
             bShowCombineArea ?
-              <div style={{ width:'30%' }} >
+              <div style={{ width:'38%' }} >
                 {
                   getCommonViewTableComponentCombine({
                     ...props,
@@ -5,6 +5,10 @@
 @import "./variable.less";
 @import "./skinchange.less";
+.ant-legacy-form .ant-form-item label {
+  font-size: 12px;
+}
+
 .ant-card-head {
   border-bottom: 1px solid #d9d9d9;
 }
@@ -4022,19 +4022,19 @@ table tr td .ant-select-auto-complete.ant-select .ant-input {
     .ant-modal-close {
       color: #4a495f !important;
     }
-  
+
     .ant-modal-close-x {
       width: 30px;
     }
-  
+
     .ant-modal-header {
       background-color: #e1edfe !important;
       border: 0;
-  
+
       .ant-modal-title {
         font-size: 14px;
         color: #4a495f !important;
-  
+
         span:nth-child(1) {
           overflow: hidden;
           text-overflow: ellipsis;
@@ -4044,7 +4044,7 @@ table tr td .ant-select-auto-complete.ant-select .ant-input {
         }
       }
     }
-  
+
     .ant-modal-body {
       padding: 0 !important;
     }
@@ -4069,34 +4069,33 @@ table tr td .ant-select-auto-complete.ant-select .ant-input {
   width: 100%;
   height: 30px;
   padding: 0 0 0 20px;
+  :global {
+    .radioDiv {
+      width: 100%;
+      height: 30px;
+      display: flex;
+      align-items: center;
+      .viewStyle{
+        background-color: rgb(240, 242, 245);
+        font-size: 14px !important;
+      }
-  .radioDiv {
-    width: 100%;
-    height: 30px;
-    display: flex;
-    align-items: center;
-
-    .viewStyle {
-      background-color: rgb(240, 242, 245);
-      font-size: 14px !important;
-    }
-
-    .viewStyle input[disabled] {
-      font-size: 14px !important;
-    }
-
-    .ant-col-7 {
-      background: none !important;
-      color: rgb(0, 0, 0, 0.65) !important;
-
-      label {
+      .viewStyle input[disabled]{
         font-size: 14px !important;
       }
-    }
-    .ant-radio-wrapper-disabled {
-      span {
-        color: rgba(0, 0, 0, 0.88) !important;
+      .ant-col-7 {
+        background:none!important;
+        color:rgb(0, 0, 0, 0.65)!important;
+        label{
+          font-size: 14px !important;
+        }
+      }
+
+      .ant-radio-wrapper-disabled {
+        span {
+          color: rgba(0, 0, 0, 0.88)!important;
+        }
       }
     }
   }
@@ -4213,4 +4212,4 @@ table tr td .ant-select-auto-complete.ant-select .ant-input {
   width: 22%;
   height: 38px;
   justify-content: space-between;
-}
 \ No newline at end of file
+}