bri-components 1.1.4 → 1.1.5

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

@@ -1,79 +1,95 @@
 .DshCascader {
     width: 100%;
 
-    &-single {
-        text-align: left;
-        padding: 0 10px;
-        height: 32px;
-        line-height: 32px;
-        border: 1px solid @borderColor;
-        border-radius: 4px;
-        cursor: pointer;
-
-        &-val {
+    #input-content () {
+        .hasdata {
             width: 100%;
+            height: 100%;
+            padding: 2px 8px;
             display: flex;
             justify-content: space-between;
             align-items: center;
+            .bri-scrollbar3();
+            overflow-y: hidden;
 
-            &-text {
-                .dsh-ellipsis();
-
-                &-disabled {
-                    color: @borderColor;
-                }
-            }
-
-            &-clear {
-                margin-left: 5px;
+            .DshTags {
+                display: flex;
+                white-space: nowrap;
             }
         }
 
-        &-placeholder {
+        &-nodata {
+            display: inline-block;
+            padding: 2px 8px;
             color: @placeholderColor;
-            padding: 0 7px;
         }
     }
 
-    &-modal {
-
-        &-wrap {
-            width: 100%;
-            height: 100%;
-            .dsh-flex-col-start-start();
+    &-multiple {
+        width: 100%;
 
-            &-content {
-                width: 100%;
-                flex: 1;
-                min-height: 0px;
-                overflow: auto;
+        &-input {
+            #input-content();
+        }
+    }
 
-                .content {
-                    &-cascader {
-                        width: 90%;
-                        margin: 10px auto;
-                    }
+    &-custom {
+        &-input {
+            #input-content();            
+                
+            .hasdata {
+                &-text {
+                    .dsh-ellipsis();
+                }
+                
+                &-clear {
+                    margin-left: 5px;
                 }
             }
+        }
+    }
+    
+    &-single {
+        width: 100%;
+    }
+    
+    &-show {
+        #input-content();
+
+        .hasdata {
+            &-multiple {}
+            
+            &-single {
+                .dsh-ellipsis();
+            }
+        }
+    }
 
-            &-footer {
-                width: 100%;
-                padding: 10px;
+    &-multiplerow {
+        height: 70px;
 
-                .btn {
-                    text-align: right;
-                }
+        .hasdata {
+            overflow-y: auto;
+
+            .DshTags {
+                flex-wrap: wrap;
             }
         }
     }
 }
 
-.ivu-cascader-transfer {
-    max-height: 400px !important;
+.ivu-cascader {
+    &-label {
+        padding-right: 24px;
+    }
+
+    &-transfer {
+        max-height: 400px !important;
 
-    .ivu-cascader-menu {
-        max-height: 400px;
-        height: auto;
-        max-width: 300px;
+        .ivu-cascader-menu {
+            max-height: 400px;
+            height: auto;
+            max-width: 300px;
+        }
     }
 }

package/src/styles/components/index.less

@@ -57,7 +57,6 @@
 @import "./small/DshTabs.less";
 @import "./small/DshTitle.less";
 @import "./small/DshSteps.less";
-@import "./small/DshControlDefine.less";
 @import "./small/BriButton.less";
 @import "./small/BriDrawer.less";
 @import "./small/DshModal.less";

package/src/styles/components/other/ZLoading.less

@@ -27,13 +27,7 @@
         .ZLoading-main {
             width: 100%;
             height: 100%;
-            .dsh-flex();
-            
-            &-content {
-                display: flex;
-                flex-direction: column;
-                align-items: center;
-            }
+            .dsh-flex-col();
 
             &-loading {
                 border-radius: 50%;
@@ -47,6 +41,10 @@
                 margin-top: 8px;
                 color: @themeColor;
             }
+            &-noText {
+                color: @textColor;
+                margin-top: 16px;
+            }
         }
     }
 }

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

@@ -42,12 +42,6 @@
         
                 .ivu-dropdown-item-divided:before {
                     margin: 0px;
-                    // content: '';
-                    // height: 5px;
-                    // display: block;
-                    // background-color: #fff;
-                    // position: relative;
-                    // top: -7px;
                 }
             }
 
@@ -58,7 +52,7 @@
     }
 }
 .ivu-select-dropdown {
-    border: 0.5px solid rgba(229,229,229,1);
+    border: 0.5px solid #e5e5e5;
     box-shadow: 0 3px 14px 2px rgba(0,0,0,0.05), 0 8px 10px 1px rgba(0,0,0,0.06), 0 5px 5px -3px rgba(0,0,0,0.1);
     padding: 8px;
     max-height: 500px

package/src/components/small/DshControlDefine.vue

@@ -1,115 +0,0 @@
-<template>
-    <div
-        :class="{
-            'dsh-control-define': true,
-            'dsh-control-define-multiplerow': selfPropsObj._multiplerow,
-            'dsh-control-define-disabled': !finalCanEdit,
-            'dsh-control-define-show': !canEdit
-        }"
-        @click="clickInput"
-    >
-        <!-- 有值 -->
-        <template v-if="Array.isArray(val) ? !!val.length : !!val">
-            <div
-                v-if="Array.isArray(val)"
-                class="dsh-control-define-text"
-            >
-                <dsh-tags
-                    :list="val"
-                    @delete="deleteTag"
-                    :propsObj="{
-                        closable: canEdit && propsObj.canEdit,
-                        size: selfPropsObj._multiplerow ? 'medium' : 'default'
-                    }"
-                ></dsh-tags>
-            </div>
-
-            <div
-                v-else
-                class="dsh-control-define-text"
-            >
-                <span class="dsh-ellipsis">{{ val }}</span>
-                <Icon
-                    v-if="canEdit"
-                    type="md-close"
-                    @click.stop="clickClear"
-                />
-            </div>
-        </template>
-
-        <!-- 无值 -->
-        <span
-            v-else
-            class="dsh-control-define-nodata"
-        >{{ selfPropsObj._placeholder }}</span>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "DshControlDefine",
-        props: {
-            canEdit: {
-                type: Boolean,
-                default: true
-            },
-            finalCanEdit: {
-                type: Boolean,
-                default: true
-            },
-            value: {
-                type: [String, Array],
-                default () {
-                    return [];
-                }
-            },
-            propsObj: {
-                type: Object,
-                default () {
-                    return {};
-                }
-            }
-        },
-        data () {
-            return {};
-        },
-        computed: {
-            val: {
-                get () {
-                    return this.value;
-                },
-                set (val) {
-                    this.$emit("input", val);
-                }
-            },
-
-            selfPropsObj () {
-                return {
-                    _multiplerow: true,
-                    ...this.propsObj
-                };
-            }
-        },
-        created () {},
-        methods: {
-            clickInput (e) {
-                if (!this.canEdit) {
-                    e.stopPropagation();
-                }
-            },
-
-            // 删除
-            deleteTag (item, index, ...params) {
-                this.val = [...this.val];
-
-                this.$emit("delete", item, index, ...params);
-            },
-            // 清除文字
-            clickClear () {
-                this.val = "";
-
-                this.$emit("delete");
-            }
-        }
-    };
-</script>

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

@@ -1,40 +0,0 @@
-.dsh-control-define {
-    .control-edit();
-
-    &-multiplerow {
-        height: 70px;
-        .dsh-control-define-text {
-            overflow-y: auto;
-            .DshTags {
-                flex-wrap: wrap;
-            }
-        }
-    }
-
-    &-disabled {
-        .control-disabled();
-    }
-
-    &-show {
-        .control-show();
-    }
-
-    &-text {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        padding: 2px 8px;
-        .bri-scrollbar3();
-        overflow-y: hidden;
-    
-        .DshTags {
-            display: flex;
-            white-space: nowrap;
-        }
-    }
-
-    &-nodata {
-        .control-notext();
-        padding: 0 7px;
-    }
-}