bri-components 1.1.3 → 1.1.5

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/DshPage.vue

@@ -19,6 +19,7 @@
         @on-page-size-change="changePageSize"
     />
 </template>
+
 <script>
     export default {
         name: "DshPage",

package/src/index.js

@@ -8,8 +8,6 @@ import { VeTable, VeLocale } from "vue-easytable";
 import CN from "vue-easytable/libs/locale/lang/zh-CN.js";
 
 // list
-// import { VTable } from "./components/list/easyTable/index.js";
-// import EvTable from "./components/list/evTable/EvTable.vue"; // 大表格
 import DshBox from "./components/list/DshBox/DshBox.vue";
 import DshTable from "./components/list/DshBox/DshTable.vue";
 import DshList from "./components/list/DshBox/DshList.vue";
@@ -33,7 +31,7 @@ import DshInput from "./components/controls/base/DshInput.vue";
 import DshNumber from "./components/controls/base/DshNumber/DshNumber.vue";
 import DshSelect from "./components/controls/base/DshSelect.vue";
 import DshCheckbox from "./components/controls/base/DshCheckbox.vue";
-import DshCascader from "./components/controls/base/DshCascader.vue";
+import DshCascader from "./components/controls/base/DshCascader/DshCascader.vue";
 
 // 其他
 import ZCode from "./components/other/ZCode.vue";
@@ -65,28 +63,24 @@ 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";
 
 /* -------------------- 局部组件 ----------------------- */
-// pages
-import Error500 from "./components/pages/Error/Error500.vue";
-import Error403 from "./components/pages/Error/Error403.vue";
-import Error404 from "./components/pages/Error/Error404.vue";
+// error
+import Error500 from "./components/Error/Error500.vue";
+import Error403 from "./components/Error/Error403.vue";
+import Error404 from "./components/Error/Error404.vue";
 
 // controls
-// import DshTextMultiple from "./controls/base/textMultiple/DshTextMultiple.vue"; // 暂时不用了
-import MultipleInput from "./components/controls/base/textMultiple/MultipleInput.vue";
-import YSerialNumber from "./components/controls/base/YSerialNumber.vue";
+import BriInputs from "./components/controls/base/BriInputs.vue";
 import DshNumberange from "./components/controls/base/DshNumberange.vue";
 import DshDate from "./components/controls/base/DshDate.vue";
 import DshDaterange from "./components/controls/base/DshDaterange.vue";
 import DshSwitch from "./components/controls/base/DshSwitch.vue";
-// import DshCascaderMultiple from "./controls/base/DshCascaderMultiple.vue"; // 暂时不用了
-import ZUpload from "./components/controls/base/ZUpload/index.vue";
-import YUploadImage from "./components/controls/base/ZUpload/YUploadImage.vue";
+import BriUpload from "./components/controls/base/BriUpload/index.vue";
+import BriUploadImage from "./components/controls/base/BriUpload/BriUploadImage.vue";
 import DshCoordinates from "./components/controls/base/DshCoordinates.vue";
 import DshEditor from "./components/controls/base/DshEditor.vue";
 import DshDivider from "./components/controls/base/DshDivider.vue";
@@ -97,14 +91,13 @@ 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 = {
     DshDraggable,
     DshCropper,
 
-    // VTable,
-    // EvTable,
     DshBox,
     DshTable,
     DshList,
@@ -154,10 +147,11 @@ const map = {
     DshSteps,
     Ctooltip,
     DshPage,
-    DshControlDefine,
     DshFileShow,
     BriButton,
-    BriTree
+    BriTree,
+
+    BriSvg
 };
 const install = function (Vue, opts = {}) {
     ViewUI.LoadingBar.config({
@@ -193,8 +187,6 @@ export {
     DshDraggable,
     DshCropper,
 
-    VTable,
-    EvTable,
     DshBox,
     DshTable,
     DshList,
@@ -244,7 +236,6 @@ export {
     DshSteps,
     Ctooltip,
     DshPage,
-    DshControlDefine,
     DshFileShow,
     BriButton,
     BriTree,
@@ -254,16 +245,13 @@ export {
     Error403,
     Error404,
 
-    // DshTextMultiple,
-    MultipleInput,
-    YSerialNumber,
+    BriInputs,
     DshNumberange,
     DshDate,
     DshDaterange,
     DshSwitch,
-    // DshCascaderMultiple,
-    ZUpload,
-    YUploadImage,
+    BriUpload,
+    BriUploadImage,
     DshCoordinates,
     DshEditor,
     DshDivider,
@@ -272,5 +260,6 @@ export {
     DshBack,
     DshUndeveloped,
 
-    ZIframe
+    ZIframe,
+    BriSvg
 };

package/src/styles/common/control.less

@@ -51,10 +51,6 @@
 // }
 
 // 表单模式
-.control-show {
-    border: none;
-    background-color: transparent;
-}
 .control-edit {
     height: 32px;
     border: 1px solid @borderColor;
@@ -64,6 +60,22 @@
     cursor: pointer;
     color: @textColor;
 }
+.control-disabled {
+    border: 1px solid @border-disabled;
+    border-radius: @borderRadius;
+    background: @inputBg-disabled;
+    cursor: not-allowed;
+    color: @textColor-disabled;
+}
+.control-show {
+    border: none;
+    background-color: transparent;
+}
+.control-unit {
+    border: none;
+    background-color: transparent;
+}
+
 .control-placeholder {
     color: @placeholderColor;
 }
@@ -74,19 +86,6 @@
     line-height: 32px;
     color: @textColor-readonly;
 }
-.control-disabled {
-    border: 1px solid @border-disabled;
-    border-radius: @borderRadius;
-    background: @inputBg-disabled;
-    cursor: not-allowed;
-    color: @textColor-disabled;
-}
 .control-notext {
     color: @placeholderColor;
 }
-
-// 暂时移到这里，部分需要删除
-.control-nodata-text {
-    color: @placeholderColor ;
-    font-weight: 400;
-}

package/src/styles/components/controls/{MultipleInput.less → BriInputs.less}

@@ -1,4 +1,4 @@
-.MutipleInput {
+.BriInputs {
     width: 100%;
 
     i {

package/src/styles/components/controls/{ZUpload.less → BriUpload.less}

@@ -1,4 +1,4 @@
-.ZUpload {
+.BriUpload {
     width: 100%;
     height: 100%;
     position: relative;
@@ -314,7 +314,7 @@
     }
 }
 
-.YUploadImage {
+.BriUploadImage {
     position: relative;
 
     &-set {
@@ -396,7 +396,7 @@
     }
 }
 
-.ZUpload-readonly {
+.BriUpload-readonly {
     border: none;
     border-radius: 0px;
     background-color: transparent;
@@ -420,7 +420,7 @@
     }
 }
 
-.ZUpload-disabled {
+.BriUpload-disabled {
     .control-disabled();
     .ZUploa-old-wrapper {
         margin: 0px;

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/controls/DshCoordinates.less

@@ -2,63 +2,68 @@
     width: 100%;
     line-height: 30px;
 
-    .textRight {
-        text-align: right;
-    }
-
-    &-wrap {
+    &-edit {
         position: relative;
         padding: 0 32px 0 8px;
-        &-zuobiao {
-            color: #e5e5e5;
-            line-height: 32px;
-            position: absolute;
-            right: 6px;
-            top: 0;
-        }
-    }
 
-    &-text {
-        width: 100%;
-        display: flex;
-        justify-content: space-between;
-        align-items: center;
+        .value {
+            width: 100%;
+            display: flex;
+            justify-content: space-between;
+            align-items: center;
 
-        &-icon {
-            padding: 5px;
+            &-name {
+                .dsh-ellipsis();
+            }
+    
+            &-icon {
+                padding: 5px;
+            }
         }
-    }
 
-    &-notext {
-        color: @placeholderColor;
-    }
-
-    &-message {
-        position: absolute;
-        color: red;
-        font-size: 12px;
-        bottom: -16px;
-        left: 0px;
-    }
+        .nodata {
+            color: @placeholderColor;
 
-    &-map {
-        width: 100%;
-        height: 100%;
+            &-icon {
+                color: #e5e5e5;
+                line-height: 32px;
+                position: absolute;
+                right: 6px;
+                top: 0;
+            }
+        }
     }
 
-    &-show {
-        padding: 0 8px;
-        line-height: 32px;
-    }
-    
     &-modal {
         &-header {
             padding: 5px 0px;
     
-            &-text {
-                font-size: @textSize;
-                line-height: 18px;
+            .edit {
+                &-message {
+                    position: absolute;
+                    color: red;
+                    font-size: 12px;
+                    bottom: -16px;
+                    left: 0px;
+                }
+
+                &-text {
+                    font-size: @textSize;
+                    line-height: 18px;
+                }
             }
+
+            .show {
+                &-name {
+                    text-align: right;
+                    .dsh-padding-top10();
+                }
+            }
+        }
+
+        &-map {
+            width: 100%;
+            height: 100%;
         }
     
         .ivu-modal-content {
@@ -71,4 +76,9 @@
             }
         }
     }
+
+    &-show {
+        padding: 0 8px;
+        line-height: 32px;
+    }
 }

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

@@ -30,4 +30,22 @@
             border-color: transparent;
         }
     }
+}
+.ivu-input-number-handler {
+    &-wrap {
+        // opacity: 1;
+        border-left: none;
+    }
+    &-down {
+        border: none;
+    }
+    &:hover {
+        background-color: @hoverBg;
+        .ivu-input-number-handler-down-inner, .ivu-input-number-handler-up-inner {
+            color: @textColor;
+        }
+    }
+    &-down-inner, &-up-inner {
+        color: @contentColor;
+    }
 }

package/src/styles/components/index.less

@@ -1,36 +1,43 @@
 // controls
-@import "./controls/DshCheckbox.less";
-@import "./controls/DshCoordinates.less";
-@import "./controls/DshDaterange.less";
-@import "./controls/DshDivider.less";
 @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/ZUpload.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/MultipleInput.less";
-@import "./controls/BriLabels.less";
-@import "./controls/DshPackage.less";
+@import "./controls/DshDivider.less";
+
+@import "./controls/BriUpload.less";
 @import "./controls/flatTable.less";
 @import "./controls/cascaderTable.less";
+@import "./controls/BriLabels.less";
+@import "./controls/DshPackage.less";
+
 @import "./controls/controlShow.less";
-@import "./controls/DshDate.less";
 
 // form
 @import "./form/DshAdvSearchForm.less";
 @import "./form/DshDefaultSearch.less";
 
 // list
-@import "./list/evTable.less";
-@import "./list/DshCascaderTable.less";
-// @import "./list/DshFlatTable.less";
-@import "./list/DshSingleData.less";
-@import "./list/DshCrossTable.less";
-@import "./list/ivu_reset.less";
+@import "./list/DshBox/DshBox.less";
+@import "./list/DshBox/DshTable.less";
+@import "./list/DshBox/DshCrossTable.less";
+@import "./list/DshBox/DshCard.less";
+@import "./list/DshBox/DshPanel.less";
+@import "./list/DshBox/DshSingleData.less";
+@import "./list/DshBox/DshList.less";
+
 @import "./list/BriTable.less";
 @import "./list/BriFlatTable.less";
+@import "./list/DshCascaderTable.less";
+@import "./list/ZTree.less";
 
 // other
 @import "./other/DshEditPanel.less";
@@ -39,7 +46,6 @@
 @import "./other/ZCode.less";
 @import "./other/ZCollapseTree.less";
 @import "./other/ZGantt.less";
-@import "./other/InfoCascader.less";
 @import "./other/ZLoading.less";
 @import "./other/BriTransfer.less";
 
@@ -51,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/list/DshBox/DshBox.less

@@ -0,0 +1,20 @@
+.DshBox {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+
+    &-list {
+        width: 100%;
+        flex: 1;
+        min-height: 60px;
+        margin-bottom: 10px;
+        background: #fff;
+        overflow: auto;
+    }
+
+    &-page {
+        width: 100%;
+        height: 30px;
+    }
+}