bri-components 1.1.4 → 1.1.6

package/src/components/other/ZLoading.vue

@@ -9,13 +9,20 @@
     >
         <div class="ZLoading-main">
             <slot>
-                <div class="ZLoading-main-content">
+                <template v-if="value === 1">
                     <div class="ZLoading-main-loading" :style="getStyle">
                     </div>
                     <div v-if="showLoadingText" class="ZLoading-main-loadingText">
-                        加载中...
+                        {{ loadText }}
                     </div>
-                </div>
+                </template>
+
+                <template v-else-if="value==2">
+                    <BriSvg :src="imgSrc" />
+                    <div v-if="noText" class="ZLoading-main-noText">
+                        {{ noText }}
+                    </div>
+                </template>
             </slot>
         </div>
    </div>
@@ -41,27 +48,32 @@
             loadImg: {
                 type: String
             },
-            kongImg: {
+            noImg: {
                 type: String
             },
             mode: {
                 type: String,
                 default: "large" // small middle
             },
-            showLoadingText: Boolean
+            showLoadingText: {
+                type: Boolean,
+                default: false
+            },
+            loadText: {
+                type: String,
+                default: "加载中..."
+            },
+            noText: {
+                type: String,
+                default: "暂无数据"
+            }
         },
         data () {
             return {};
         },
         computed: {
             imgSrc () {
-                if (this.value == 1) {
-                    return this.loadImg || this.$imageSrcMap.loading;
-                } else if (this.value == 2) {
-                    return this.kongImg || this.$imageSrcMap.kongdata;
-                } else {
-                    return undefined;
-                }
+                return this.noImg || "zanwushuju";
             },
             getStyle () {
                 let styleMap = {

package/src/components/small/BriButton.vue

@@ -42,13 +42,13 @@
                 let setType = this.propsObj.btnType || this.type;
                 if (["cancel"].includes(defaultType)) {
                     setType = "primary";
-                } else if (["errorLine"].includes(defaultType)) {
+                } else if (["errorLine", "primaryLine"].includes(defaultType)) {
                     setType = "default";
                 } else if (["linkText", "primaryText", "errorText"].includes(defaultType)) {
                     setType = "text";
                 }
                 return {
-                    class: ["cancel", "linkText", "primaryText", "errorLine", "errorText"].includes(defaultType) ? `ivu-btn-${defaultType}` : "",
+                    class: ["cancel", "linkText", "primaryText", "errorLine", "errorText", "primaryLine"].includes(defaultType) ? `ivu-btn-${defaultType}` : "",
                     ...this.propsObj,
                     btnType: setType,
                     customIcon: this.propsObj.customIcon ? `bico-font ${this.propsObj.customIcon}` : undefined

package/src/components/small/DshButtons.vue

@@ -78,7 +78,7 @@
 
         <template v-else>
             <bri-button
-                v-for="(operationItem, index) in list"
+                v-for="(operationItem, index) in flatList"
                 :key="operationItem.type"
                 :style="operationItem.style"
                 :class="[
@@ -97,6 +97,25 @@
                     {{ operationItem.name }}
                 </span>
             </bri-button>
+
+            <dsh-dropdown
+                v-if="moreList.length"
+                class="DshButtons-dropdown"
+                :list="moreList"
+                :trigger="'hover'"
+                @click="emit($event)"
+            >
+                <slot name="more">
+                    <bri-button
+                        class="DshButtons-dropdown-more"
+                        :propsObj="moreBtnOperationObj"
+                    >
+                        <span class="DshButtons-dropdown-more-name">
+                            {{ moreBtnOperationObj.name }}
+                        </span>
+                    </bri-button>
+                </slot>
+            </dsh-dropdown>
         </template>
     </div>
 </template>
@@ -143,11 +162,18 @@
                     name: "更多",
                     type: "more",
                     size: "default",
-                    customIcon: "bico-gengduo1"
+                    customIcon: "bico-gengduo",
+                    btnType: "primaryText"
                 }
             };
         },
         computed: {
+            flatList () {
+                return this.list.slice(0, this.maxFlatNum);
+            },
+            moreList () {
+                return this.list.slice(this.maxFlatNum);
+            },
             leftFlatList () {
                 return this.leftList.slice(0, this.maxFlatNum);
             },

package/src/components/small/DshIcons.vue

@@ -5,7 +5,7 @@
     >
         <Icon
             v-for="(operationItem, index) in list"
-            :key="operationItem._key || operationItem._id || operationItem.customIcon || operationItem.icon"
+            :key="operationItem._key || operationItem._id || index"
             :style="operationItem.style"
             :class="[
                 'DshIcons-item',

package/src/components/unit/DshFormItem.vue

@@ -117,10 +117,10 @@
                     return [];
                 }
             },
-            // 实际最精确值是74px（label:30px, control:32px, 上下padding各: 6px，因为ivu-form-item-content里line-height: 32px导致有问题，故先76px
+            // 实际最精确值是68px（label:30px, control:32px, 上下padding各: 3px，因为ivu-form-item-content里line-height: 32px导致有问题，故先70px
             height: {
                 type: [String, Number],
-                default: "76"
+                default: "70"
             },
             rowStyle: {
                 type: Object,

package/src/index.js

@@ -63,7 +63,6 @@ import DshTabs from "./components/small/DshTabs.vue";
 import DshSteps from "./components/small/DshSteps.vue";
 import Ctooltip from "./components/small/Ctooltip.vue";
 import DshPage from "./components/small/DshPage.vue";
-import DshControlDefine from "./components/small/DshControlDefine.vue";
 import DshFileShow from "./components/small/DshFileShow.vue";
 import BriButton from "./components/small/BriButton.vue";
 import BriTree from "./components/small/BriTree.vue";
@@ -92,6 +91,7 @@ import DshBack from "./components/controls/special/DshBack.vue";
 import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 // other
 import ZIframe from "./components/other/ZIframe.vue";
+import BriSvg from "./components/other/BriSvg.vue";
 
 // ！！！！！！挂载全局的组件，不是别写在这
 const map = {
@@ -147,10 +147,11 @@ const map = {
     DshSteps,
     Ctooltip,
     DshPage,
-    DshControlDefine,
     DshFileShow,
     BriButton,
-    BriTree
+    BriTree,
+
+    BriSvg
 };
 const install = function (Vue, opts = {}) {
     ViewUI.LoadingBar.config({
@@ -235,7 +236,6 @@ export {
     DshSteps,
     Ctooltip,
     DshPage,
-    DshControlDefine,
     DshFileShow,
     BriButton,
     BriTree,
@@ -260,5 +260,6 @@ export {
     DshBack,
     DshUndeveloped,
 
-    ZIframe
+    ZIframe,
+    BriSvg
 };

package/src/styles/common/control.less

@@ -61,12 +61,23 @@
     color: @textColor;
 }
 .control-disabled {
+    height: 32px;
     border: 1px solid @border-disabled;
     border-radius: @borderRadius;
     background: @inputBg-disabled;
+    line-height: 32px;
     cursor: not-allowed;
     color: @textColor-disabled;
 }
+.control-readonly {
+    height: 32px;
+    border: 1px solid @border-readonly;
+    border-radius: @borderRadius;
+    background: @inputBg-readonly;
+    line-height: 32px;
+    cursor: not-allowed;
+    color: @textColor-readonly;
+}
 .control-show {
     border: none;
     background-color: transparent;
@@ -79,13 +90,6 @@
 .control-placeholder {
     color: @placeholderColor;
 }
-.control-readonly {
-    border: 1px solid @border-readonly;
-    border-radius: @borderRadius;
-    background: @inputBg-readonly;
-    line-height: 32px;
-    color: @textColor-readonly;
-}
 .control-notext {
     color: @placeholderColor;
 }

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

@@ -0,0 +1,110 @@
+.DshCascader {
+    width: 100%;
+
+    #nodata () {
+        display: inline-block;
+        padding: 0px 8px;
+        color: @placeholderColor;
+    }
+
+    // 多选
+    &-multiple {
+        width: 100%;
+
+        &-input {
+            .hasdata {
+                width: 100%;
+                height: 100%;
+                
+                &-multiple {
+                    width: 100%;
+                    height: 100%;
+                    padding: 0px 8px;
+                    .bri-scrollbar3();
+                    overflow-y: hidden;
+                }
+            }
+
+            .nodata {
+                #nodata();
+            }
+        }
+    }
+
+    // 单选 -新模式
+    &-custom {
+        &-input {
+            .hasdata {
+                width: 100%;
+                height: 100%;
+                padding: 0px 8px;
+
+                &-text {
+                    .dsh-ellipsis();
+                }
+                
+                &-clear {
+                    margin-left: 5px;
+                }
+            }
+
+            .nodata {
+                #nodata();
+            }
+        }
+    }
+    
+    // 单选 -默认模式
+    &-single {
+        width: 100%;
+    }
+    
+    // 查看
+    &-show {
+        .hasdata {
+            width: 100%;
+            height: 100%;
+            
+            &-multiple {
+                width: 100%;
+                height: 100%;
+                padding: 0px 8px;
+                .bri-scrollbar3();
+                overflow-y: hidden;
+            }
+        }
+
+        .nodata {
+            #nodata();
+        }
+    }
+
+    &-multiplerow {
+        height: 70px;
+
+        .hasdata {
+            &-multiple {
+                padding: 4px 8px;
+                overflow-y: auto;
+                display: flex;
+                flex-wrap: wrap;
+            }
+        }
+    }
+}
+
+.ivu-cascader {
+    &-label {
+        padding-right: 24px;
+    }
+
+    &-transfer {
+        max-height: 400px !important;
+
+        .ivu-cascader-menu {
+            max-height: 400px;
+            height: auto;
+            max-width: 300px;
+        }
+    }
+}

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

@@ -0,0 +1,37 @@
+.DshSwitch {
+    width: 100%;
+
+    &-show {
+        height: 24px;
+        padding: 2px 8px;
+        border-radius: 4px;
+        line-height: 20px;
+        flex-grow: 1;
+        display: flex;
+        justify-content: flex-start;
+    
+        &-name {
+            .dsh-ellipsis();
+            display: flex;
+            min-height: 32px;
+            padding: 4px;
+        }
+    }
+
+    .ivu-switch {
+        width: 50px;
+    }
+    .ivu-switch-checked:after {
+        left: 29px;
+    }
+    .ivu-switch-inner {
+        color: #fff;
+        font-size: 12px;
+        position: absolute;
+        left: auto;
+        right: 4px;
+    }
+    .ivu-switch-checked .ivu-switch-inner {
+        left: 3px;
+    }
+}

package/src/styles/components/form/DshDefaultSearch.less

@@ -1,5 +1,6 @@
 .DshDefaultSearch {
     position: relative;
+    background: #fff;
 
     &-item {
         padding: 0 !important;
@@ -21,17 +22,9 @@
         width: 100%;
         text-align: center;
         position: absolute;
-        bottom: -20px;
+        bottom: -10px;
         left: 0px;
 
-        &-zhanwei {
-            width: 100%;
-            height: 15px;
-            background: #fff;
-            position: relative;
-            z-index: 1;
-        }
-
         &-icon {
             width: 48px;
             height: 20px;
@@ -48,4 +41,43 @@
             }
         }
     }
+
+    // 输入框/下拉框
+    input,
+    .ivu-select-selection,
+    .ivu-cascader-size-default,
+    .DshCascader-multiple-input,
+    .DshDaterange-item {
+        border-radius: 0;
+
+        .ivu-select-input{
+            top: 0px!important;
+        }
+    }
+
+    .DshCascader-multiple-input {
+        height: 32px;
+        padding: 1px 6px;
+        overflow: hidden!important;
+    }
+
+    .DshFormItem-label {
+        width: 80px;
+        text-align: right;
+        margin-right: 16px;
+
+        .DshFormItem-label-left {
+            .DshFormItem-label-name {
+                font-family: "Microsoft YaHei";            
+            }
+        }
+        
+        .DshFormItem-label-right {
+            text-align: left;
+        }
+    }
+    .control-edit {
+        border-radius: 0px;
+    }
+
 }

package/src/styles/components/index.less

@@ -1,23 +1,24 @@
 // controls
-@import "./controls/DshInput.less";
-@import "./controls/BriInputs.less";
-@import "./controls/DshNumber.less";
-@import "./controls/DshNumberange.less";
-@import "./controls/DshCheckbox.less";
-@import "./controls/DshSelect.less";
-@import "./controls/DshDate.less";
-@import "./controls/DshDaterange.less";
-@import "./controls/DshCascader.less";
-@import "./controls/InfoCascader.less";
-@import "./controls/DshCoordinates.less";
-@import "./controls/DshEditor.less";
-@import "./controls/DshDivider.less";
+@import "./controls/base/DshInput.less";
+@import "./controls/base/BriInputs.less";
+@import "./controls/base/DshNumber.less";
+@import "./controls/base/DshNumberange.less";
+@import "./controls/base/DshSwitch.less";
+@import "./controls/base/DshSelect.less";
+@import "./controls/base/DshCheckbox.less";
+@import "./controls/base/DshDate.less";
+@import "./controls/base/DshDaterange.less";
+@import "./controls/base/DshCascader.less";
+@import "./controls/base/InfoCascader.less";
+@import "./controls/base/BriUpload.less";
+@import "./controls/base/DshCoordinates.less";
+@import "./controls/base/DshEditor.less";
+@import "./controls/base/DshDivider.less";
 
-@import "./controls/BriUpload.less";
-@import "./controls/flatTable.less";
-@import "./controls/cascaderTable.less";
-@import "./controls/BriLabels.less";
-@import "./controls/DshPackage.less";
+@import "./controls/senior/flatTable.less";
+@import "./controls/senior/cascaderTable.less";
+@import "./controls/senior/BriLabels.less";
+@import "./controls/senior/DshPackage.less";
 
 @import "./controls/controlShow.less";
 
@@ -57,7 +58,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/BriButton.less

@@ -100,11 +100,15 @@
  }
 .ivu-btn-linkText {
     color: @themeColor;
+    padding: 0px;
+    height: @textHeight;
     &:hover {
         background-color: transparent;
+        color: @theme-hover;
     }
     &:active {
         background-color: transparent;
+        color: @theme-active;
     }
     &[disabled] {
         color: @theme-disabled;
@@ -152,6 +156,7 @@
         }
     }
 }
+
 .ivu-btn-default, .ivu-btn-dashed {
     color: @textColor;
     border-color: @btnCancelBg;
@@ -176,6 +181,33 @@
         }
     }
 }
+
+.ivu-btn-primaryLine {
+    color: @themeColor;
+    border-color: @themeColor;
+    background-color: #fff;
+    &:hover {
+        background-color: #fff;
+        border-color: @btnBgclick;
+        color: @btnBgHover;
+    }
+    &:active {
+        background-color: #fff;
+        border-color: @btnBgclick;
+        color: @btnBgclick;
+    }
+    &[disabled] {
+        background-color: #fff;
+        border-color: @btnBgDisabled;
+        color: @btnBgDisabled;
+        &:hover, &:active {
+            background-color: #fff;
+            border-color: @btnBgDisabled;
+            color: @btnBgDisabled;
+        }
+    }
+}
+
 .ivu-btn-errorLine {
     color: @btnWarningBg;
     border-color: @btnWarningBg;
@@ -190,11 +222,11 @@
         color: @btnWarningBgClick;
     }
     &[disabled] {
-        background-color: @btnCancelBg;
+        background-color: #fff;
         border-color: @btnWarningBgDisabled;
         color: @btnWarningBgDisabled;
         &:hover, &:active {
-            background-color: @btnCancelBg;
+            background-color: #fff;
             border-color: @btnWarningBgDisabled;
             color: @btnWarningBgDisabled;
         }

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

@@ -20,11 +20,10 @@
     }
 
     &-label {
-        padding: 5px 0px 5px;
         min-width: 0px;
+        padding: 5px 0px 5px;
         line-height: 20px;
         font-size: @smallSize;
-        margin-bottom: 3px;
         display: flex;
         align-items: center;