bri-components 1.2.1 → 1.2.3

package/src/styles/components/small/DshModal.less

@@ -154,54 +154,32 @@
 
 // 默认模态框brimodal
 .bri-modal {
-    .ivu-modal-header {
-        padding: 14px 36px;
-
-        .ivu-modal-header-inner {
-            color: @titleColor;
-            font-size: @titleSize;
-            font-weight: bold;
-        }
-    }
-
-    .ivu-modal-body {
-        padding: 16px;
+    .DshModal-close {
+        top: 20px;
+        right: 24px;
+        color: rgba(0,0,0,0.6);
+        font-size: 16px;
     }
 
-    .ivu-modal-footer {
-        display: flex;
-        justify-content: space-between;
-        padding: 20px;
-
-        button {
-            width: 48%;
-            height: 44px;
-            line-height: 44px;
+    .ivu-modal-header {
+        width: 100%;
+        height: 44px;
+        padding: 20px 24px 0px 24px;
+        border-bottom: none;
+        &-inner {
+            color: rgba(0,0,0,0.9);
+            font-size: 16px;
+            font-weight: 500;
+            line-height: 24px;
+            height: 24px;
         }
     }
-
-    &-content {
-        padding: 20px 0;
+    .ivu-modal-body {
+        padding: 16px 24px 20px;
     }
 
     &-footer {
-        display: flex;
-        justify-content: space-between;
-        padding: 20px 0;
-
-        button {
-            flex: 1;
-            margin: 0 10px;
-            height: 44px;
-            line-height: 44px;
-
-            &:first-child {
-                margin-left: 0;
-            }
-
-            &:last-child {
-                margin-right: 0;
-            }
-        }
+        text-align: right;
+        margin-top: 16px;
     }
 }

package/src/styles/components/small/DshTags.less

@@ -1,17 +1,35 @@
-.DshTags {   
-    .ivu-tag {
-        &-default {
-            border: none;
-            background-color: @borderColor;
-            color: @text-color;
+.DshTags {
+    &-autoEllipsis {
+        overflow: hidden;
+        width: 100%;
+    }
+    &-poptip {
+        &-tag {
+            margin: 2px 0;
+            .dsh-flex-row-between-center();
         }
-        &-size-medium {
-            height: 24px;
-            line-height: 26px;
-            padding: 0 8px;
+        .ivu-tag-text {
+            .dsh-ellipsis();
         }
-        &[disabled] {
-            background-color: @border-disabled;
-        }
-    }   
+    }
+}
+
+.ivu-tag {
+    &-default {
+        border: none;
+        background-color: @borderColor;
+        color: @text-color;
+    }
+    &-size-medium {
+        height: 24px;
+        padding: 0 8px;
+        line-height: 26px;
+    }
+    &[disabled] {
+        background-color: @border-disabled;
+    }
+
+    .ivu-tag-text {
+        color: inherit;
+    }
 }

package/src/styles/components/unit/DshFormItem.less

@@ -46,7 +46,7 @@
                 color: @textColor;
             }
             &-show {
-                color: @contentColor
+                color: @contentColor;
             }
             &-sign {
                 #dsh-sign-change();
@@ -59,12 +59,7 @@
     }
 
     &-control {
-        min-height: 30px;
-
-        .DshPackage-edit {
-            border: none;
-            padding: 0;
-        }
+        min-height: 32px;
     }
 
     &-line {
@@ -79,6 +74,7 @@
             overflow: hidden;
             margin: 0px;
             margin-right: 8px;
+
             // fixedbug:line模式下显示必填
             margin-left: -10px;
             padding-left: 10px;
@@ -102,24 +98,6 @@
             display: flex;
             justify-content: flex-end;
             align-items: center;
-
-            .ivu-select-default.ivu-select-multiple {
-                .ivu-select-selection {
-                    height: 32px;
-                    overflow: hidden;
-
-                    &>div {
-                        width: 100%;
-                        height: 100%;
-                        .dsh-flex-row-start-center();
-                        flex-wrap: wrap;
-                    }
-                }
-            }
         }
     }
-
-    .ivu-tooltip {
-        display: flex;
-    }
 }

package/src/styles/variables.less

@@ -40,9 +40,10 @@
 @textColor             : rgba(0, 0, 0, 0.9);
 @contentColor          : rgba(0, 0, 0, 0.6); // 正文颜色
 @titleColor            : @textColor; // title文字颜色
-@placeholderColor      : rgba(0, 0, 0, 0.4);
 @textColor-readonly    : @textColor;
 @textColor-disabled    : rgba(0, 0, 0, 0.26);
+@placeholderColor      : rgba(0, 0, 0, 0.4);
+@placeholder-disabled-color    : rgba(0, 0, 0, 0.26);
 @textWhColor           : rgba(255, 255, 255, 0.9);
 @fontWh2               : rgba(255, 255, 255, 0.55);
 @fontWh3               : rgba(255, 255, 255, 0.35);