bri-components 1.2.12 → 1.2.14

package/src/components/list/DshCascaderTable.vue

@@ -80,6 +80,7 @@
                                         class="table-row"
                                     >
                                         <template v-for="col in rowColumnsArr[rowIndex]">
+                                            <!-- 树节点单元格、汇总单元格 -->
                                             <td
                                                 v-if="['tree', 'summary'].includes(col.colType)"
                                                 :key="col._key"

package/src/components/list/DshPage.vue

@@ -29,7 +29,7 @@
             mode: {
                 type: String,
                 default: "small",
-                validator: function (value) {
+                validator (value) {
                     return ["simple", "default", "small"].indexOf(value) !== -1;
                 }
             },
@@ -49,34 +49,32 @@
         },
         computed: {
             obj () {
-                let obj = {};
-                if (this.mode === "default") {
-                    obj = {
+                const modeMap = {
+                    default: {
                         showTotal: true,
                         showElevator: false,
                         showSizer: true
-                    };
-                } else if (this.mode === "small") {
-                    obj = {
+                    },
+                    small: {
                         showTotal: true,
                         showElevator: false,
                         showSizer: true
-                    };
-                } else if (this.mode === "simple") {
-                    obj = {
+                    },
+                    simple: {
                         // // 简洁分页不能使用总数、电梯和切换数量
                         // showTotal: true,
                         // showElevator: false,
                         // showSizer: false
-                    };
-                }
+                    }
+                };
+
                 return {
                     page: 1,
                     pagesize: 10,
-                    pagesizeOpts: [10, 12, 15, 20, 30, 40, 50],
+                    pagesizeOpts: [10, 15, 20, 30, 40, 50],
                     transfer: false,
                     placement: "bottom",
-                    ...obj,
+                    ...(modeMap[this.mode] || {}),
                     ...this.propsObj
                 };
             },

package/src/components/other/BriLoading.vue

@@ -1,8 +1,8 @@
 <template>
     <div
         v-if="value"
-        class="BriLoading"
         :class="{
+            BriLoading: true,
             'BriLoading-fix': fix,
             'BriLoading-center': center
         }"
@@ -23,7 +23,7 @@
                     </div>
                 </template>
 
-                <template v-else-if="value==2">
+                <template v-else-if="value === 2">
                     <bri-svg :src="imgSrc" />
                     <div
                         v-if="noText"

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/components/unit/DshFormItem.vue

@@ -137,7 +137,9 @@
             formControlClass: String
         },
         data () {
-            return {};
+            return {
+                showTipModal: false // tipsRender使用，不可删除
+            };
         },
         computed: {},
         created () {},

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/DshCascader/DshCascader.less

@@ -2,19 +2,19 @@
     width: 100%;
 
     &-edit {
+
         // 多选
         &-multiple {
             width: 100%;
-            
-            &-edit {
 
-            }
+            &-edit {}
         }
 
         // 单选 -新模式
         &-custom {
             width: 100%;
         }
+
         // 单选 -默认模式
         &-single {
             width: 100%;
@@ -23,22 +23,18 @@
 
     // 查看
     &-show {
-        &-multiple {
-            
-        }
+        &-multiple {}
 
-        &-single {
-
-        }
+        &-single {}
     }
 
     // 多选类型且独自一行时
     &-row {
-        &-edit {
+        &-edit {}
 
-        }
         &-show {
             height: auto;
+
             .text,
             .overflow {
                 width: 100%;
@@ -66,7 +62,6 @@
         .ivu-cascader-menu {
             max-height: 400px;
             height: auto;
-            max-width: 300px;
         }
     }
 }

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

@@ -11,7 +11,6 @@
 
         &-color {
             .ivu-checkbox-border {
-                margin-bottom: 5px;
                 margin-right: 16px;
                 height: 32px;
                 border: none;
@@ -50,71 +49,67 @@
                     }
                 }
             });
-        }
+    }
 
-        &-disabled {
-            .ivu-checkbox-disabled+span {
-                color: #515a6e;
-            }
+    &-disabled {
+        .ivu-checkbox-disabled+span {
+            color: #515a6e;
         }
+    }
 
-        &-scroll {
-            overflow-x: auto;
-            overflow-y: hidden;
-            white-space: nowrap;
+    &-scroll {
+        overflow-x: auto;
+        overflow-y: hidden;
+        white-space: nowrap;
 
-            &::-webkit-scrollbar {
-                height: 6px;
-            }
+        &::-webkit-scrollbar {
+            height: 6px;
+        }
 
-            &:-webkit-scrollbar-thumb {
-                border-radius: 3px;
-                background: rgba(51, 51, 51, .1);
-                background-clip: border-box;
-            }
+        &:-webkit-scrollbar-thumb {
+            border-radius: 3px;
+            background: rgba(51, 51, 51, .1);
+            background-clip: border-box;
         }
     }
+}
 
-    &-item {
-
-    }
+&-item {}
 
-    &-show {
+&-show {}
 
-    }
+.ivu-select-multiple {
+    .ivu-select-selection {
+        height: 32px;
+        .dsh-flex-row-between-center();
 
-    .ivu-select-multiple {
-        .ivu-select-selection {
-            height: 32px;
-            .dsh-flex-row-between-center();
-            
-            & > div {
-                width: 100%;
-                height: 100%;
-                word-break: keep-all;
-                white-space: nowrap;
-                overflow: auto;
-                .bri-scrollbar3();
+        &>div {
+            width: 100%;
+            height: 100%;
+            word-break: keep-all;
+            white-space: nowrap;
+            overflow: auto;
+            .bri-scrollbar3();
 
-                .ivu-tag {
-                    margin: 2px 4px 0px 0px;
-                    background-color: @borderColor;
-                }
+            .ivu-tag {
+                margin: 2px 4px 0px 0px;
+                background-color: @borderColor;
             }
         }
+    }
 
-        &.ivu-select-disabled {
-            .ivu-select-selection {
-                & > div {
-                    .ivu-tag {
-                        background-color: @border-disabled;
-                    }
+    &.ivu-select-disabled {
+        .ivu-select-selection {
+            &>div {
+                .ivu-tag {
+                    background-color: @border-disabled;
                 }
             }
         }
+    }
 
-        .ivu-select-item-selected:after {
-            content: none;
-        }
+    .ivu-select-item-selected:after {
+        content: none;
     }
+}
 }

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;
         }
     }