bri-components 1.2.12 → 1.2.13

package/src/components/small/DshTags.vue

@@ -24,7 +24,11 @@
             @on-change="changeChecked"
         >
             <slot :tagItem="tagItem">
-                {{ $dataType(tagItem) === "object" ? tagItem.realname || tagItem.full_name || tagItem.name : tagItem }}
+                <Icon
+                    v-if="getItemIcon(tagItem)"
+                    :type="getItemIcon(tagItem)"
+                />
+                {{ getItemName(tagItem) }}
             </slot>
         </Tag>
 
@@ -67,7 +71,11 @@
                         @on-change="changeChecked"
                     >
                         <slot :tagItem="tagItem">
-                            {{ $dataType(tagItem) === "object" ? tagItem.realname || tagItem.full_name || tagItem.name : tagItem }}
+                            <Icon
+                                v-if="getItemIcon(tagItem)"
+                                :type="getItemIcon(tagItem)"
+                            />
+                            {{ getItemName(tagItem) }}
                         </slot>
                     </Tag>
                 </div>
@@ -97,6 +105,10 @@
                 default: false
             }
         },
+        model: {
+            prop: "list",
+            event: "change"
+        },
         data () {
             return {
                 maxTagCount: undefined,
@@ -106,6 +118,12 @@
                 },
                 getItemClosable (item) {
                     return this.getItemDisabled(item) === false && this.propsObj.closable;
+                },
+                getItemIcon (item) {
+                    return (this.$dataType(item) === "object" ? item.icon || item._icon : undefined) || this.propsObj.icon;
+                },
+                getItemName (item) {
+                    return this.$dataType(item) === "object" ? item.realname || item.full_name || item.name || item._name || item._id : item;
                 }
             };
         },
@@ -137,6 +155,7 @@
             deleteTag (event, item, index) {
                 this.list.splice(index, 1);
                 this.callEliipsis();
+                this.$emit("change", [...this.list]);
                 this.$emit("delete", item, index);
             },
             // 改变标签状态

package/src/styles/common/control.less

@@ -1,13 +1,3 @@
-// 单元格标签式展示 -非全部类型通用
-.bri-unit-show () {
-    background-color: @theme-focus;
-    color: @themeColor;
-    border-radius: @borderRadius;
-    padding: 2px 8px;
-    line-height: 24px;
-    display: inline;
-}
-
 // 表单控件共用样式
 .bri-control-edit {
     border: 1px solid @borderColor;
@@ -15,11 +5,6 @@
     background: @inputBg;
     cursor: pointer;
     color: @textColor;
-
-    .ivu-icon {
-        padding: 5px;
-        color: @placeholderColor;
-    }
 }
 .bri-control-disabled {
     border: 1px solid @border-disabled;
@@ -27,11 +12,6 @@
     background: @inputBg-disabled;
     cursor: not-allowed;
     color: @textColor;
-
-    .ivu-icon {
-        padding: 5px;
-        color: @placeholder-disabled-color;
-    }
     
     &.bri-control-nodata {
         color: @placeholder-disabled-color;
@@ -51,6 +31,7 @@
 .bri-control-show {
     border: none;
     background-color: transparent;
+    color: @textColor;
 
     .text {
         .dsh-ellipsis();
@@ -59,6 +40,7 @@
 .bri-control-unit {
     border: none;
     background-color: transparent;
+    color: @textColor;
 
     .text {
         .dsh-ellipsis();
@@ -69,7 +51,13 @@
 .bri-control-nodata {
     color: @placeholderColor;
 }
-// 编辑disabled模式下无数据
-.bri-control-disabled-placeholder {
-    color: @textColor-disabled;
-}
+
+// 单元格标签式展示 -非全部类型通用
+.bri-unit-show () {
+    display: inline;
+    padding: 2px 8px;
+    border-radius: @borderRadius;
+    background-color: @theme-focus;
+    line-height: 24px;
+    color: @themeColor;
+}

package/src/styles/components/controls/BriControlInput.less

@@ -19,6 +19,10 @@
         overflow: hidden;
     }
 
+    .ivu-icon {
+        padding: 5px;
+        color: @placeholder-disabled-color;
+    }
     .icon {
         &-default {
 

package/src/styles/components/controls/base/BriUpload/BriUpload.less

@@ -147,12 +147,12 @@
             }
 
             &-nodata {
-                .bri-control-disabled-placeholder();
+                color: @placeholder-disabled-color;
                 text-indent: 7px;
                 text-align: left;
             }
             &-inline-nodata {
-                .bri-control-disabled-placeholder();
+                color: @placeholder-disabled-color;
             }
         }
     }

package/src/styles/components/controls/base/DshInput.less

@@ -22,7 +22,7 @@
             border-color: @border-disabled;
         }
         &::-webkit-input-placeholder {
-            .bri-control-disabled-placeholder();
+            color: @placeholder-disabled-color;
         }
     }
     

package/src/styles/components/controls/base/DshNumber.less

@@ -14,32 +14,26 @@
 
 .ivu-input-number {
     width: 100%;
+    
+    // .bri-control-edit();
+    .ivu-input-number-input {
+        color: @textColor;
+    }
 
     &-disabled {
-        .bri-control-disabled();
-
-        &:hover {
-            border-color: @border-disabled;
-        }
-        
-        .DshNumber-suffix {
-            color: @textColor-disabled;
-            background-color: transparent;
-            border-color: transparent;
-        }
+        // .bri-control-disabled();
         .ivu-input-number-input {
             opacity: 1;
             background: @inputBg-disabled;
             color: @textColor;
             &::-webkit-input-placeholder {
-                .bri-control-disabled-placeholder();
+                color: @placeholder-disabled-color;
             }
         }
     }
 
     &-handler {
         &-wrap {
-            // opacity: 1;
             border-left: none;
         }
         &-down {
@@ -53,7 +47,8 @@
                 color: @textColor;
             }
         }
-        &-down-inner, &-up-inner {
+        &-down-inner, 
+        &-up-inner {
             color: @contentColor;
         }
     }

package/src/styles/components/controls/base/DshSelect.less

@@ -47,22 +47,24 @@
             }
 
             each(@resourceColor, {
-                .color-@{index} {
-                    .ivu-radio {
-                        .ivu-radio-inner {
-                            border-color: @value;
+                    .color-@{index} {
+                        .ivu-radio {
+                            .ivu-radio-inner {
+                                border-color: @value;
+                            }
                         }
-                    }
 
-                    .ivu-radio-checked {
-                        .ivu-radio-inner {
-                            &::after {
-                                background-color: @value;
+                        .ivu-radio-checked {
+                            .ivu-radio-inner {
+                                &::after {
+                                    background-color: @value;
+                                }
                             }
                         }
                     }
                 }
-            });
+
+            );
         }
 
         &-scroll {
@@ -144,6 +146,26 @@
     }
 }
 
+.ivu-select {
+    .ivu-select-selection {
+        // .bri-control-edit();
+    }
+}
+
+.ivu-select-disabled {
+    .ivu-select-selection {
+        .bri-control-disabled();
+    
+        &:hover {
+            border-color: @border-disabled;
+        }
+    }
+    .ivu-select-input[disabled] {
+        color: @textColor;
+        -webkit-text-fill-color: @textColor;
+    }
+}
+
 .ivu-select-item {
     margin: 4px 8px;
     border-radius: @borderRadius;
@@ -153,7 +175,7 @@
     }
 
     &-selected {
-        background-color: @theme-focus  !important;
+        background-color: @theme-focus;
         color: @themeColor;
     }
 
@@ -162,20 +184,9 @@
             .bri-control-disabled();
         }
     }
-    
+
     &-input[disabled] {
         color: @textColor-disabled;
         -webkit-text-fill-color: @textColor-disabled;
     }
-}
-
-.ivu-select-disabled .ivu-select-selection {
-    .bri-control-disabled();
-    &:hover {
-        border-color: @border-disabled;
-    }
-}
-.ivu-select-input[disabled] {
-    color: @textColor;
-    -webkit-text-fill-color: @textColor-disabled;
-}
+}

package/src/styles/components/list/BriFlatTable.less

@@ -1,6 +1,77 @@
 .BriFlatTable {
     .BriFlatTable-main {
+        width: 100%;
         height: auto;
+
+        .table {
+            width: 100%;
+            border-spacing: 0;
+            border-collapse: collapse;
+            border-color: #E5E5E5;
+            background-color: #fff;
+
+            &-head {
+                background-color: #f0f0f0;
+                color: #666;
+
+                &-description {
+                    color: #828499;
+                }
+            }
+
+            &-row {
+                height: 50px;
+
+                &:hover {
+                    .table-row-td-add {
+                        display: inline-block;
+                    }
+                }
+
+                &-td {
+                    position: relative;
+
+                    .td-inner {
+                        &-compare {
+                            width: 100%;
+                        }
+                    }
+
+                    &-tip {
+                        padding: 2px 5px 0px 20px;
+                        font-size: 12px;
+                        line-height: 1;
+                        color: #ed4014;
+                        position: absolute;
+                        top: calc(100% -15px);
+                        left: 0px;
+                    }
+                    
+                    &-add {
+                        line-height: 20px;
+                        position: absolute;
+                        bottom: 0px;
+                        right: 0px;
+                        display: none;
+                    }
+                }
+
+                &-nodata {
+                    width: 100%;
+                    height: 40px;
+                    text-align: center;
+                }
+            }
+
+            tbody {
+                // display: block;
+                // overflow-y: scroll;
+            }
+
+            thead {
+                // display: block;
+            }
+        }
     }
 
     &-create {

package/src/styles/components/list/DshCascaderTable.less

@@ -48,13 +48,24 @@
                 border-collapse: collapse;
                 border-color: #E5E5E5;
                 line-height: 16px;
-                color: #666;
 
                 &-col {
                     height: 40px;
                 }
 
-                &-row {}
+                &-row {
+                    .textarea {
+                        .ivu-input {
+                            border: none;
+                            box-shadow: none;
+                            background-color: transparent;
+                            min-height: 16px;
+                            padding: 0px;
+                            line-height: 16px;
+                            font-size: 12px;
+                        }
+                    }
+                }
 
                 &-nodata {
                     height: 30px;
@@ -75,6 +86,15 @@
                         bottom: 0px;
                         z-index: 2;
                         text-align: left;
+
+                        &-list {
+                            min-width: 120px;
+                            margin: 0px;
+                        
+                            li {
+                                padding-left: 15px !important;
+                            }
+                        }
                     }
 
                     &:hover {
@@ -86,28 +106,5 @@
             }
         }
     }
-
 }
 
-.DshCascaderTable {
-    .textarea {
-        .ivu-input {
-            border: none;
-            box-shadow: none;
-            background-color: transparent;
-            min-height: 16px;
-            padding: 0px;
-            line-height: 16px;
-            font-size: 12px;
-        }
-    }
-}
-
-.td-tree-dropdown-list {
-    min-width: 120px;
-    margin: 0px;
-
-    li {
-        padding-left: 15px !important;
-    }
-}

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

@@ -3,6 +3,7 @@
         overflow: hidden;
         width: 100%;
     }
+    
     &-poptip {
         &-tag {
             margin: 2px 0;

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

@@ -1,5 +1,5 @@
 .DshUnit {
-    .ivu-input {
-        font-size: 12px;
-    }
+    // .ivu-input {
+    //     font-size: 12px;
+    // }
 }