bri-components 1.1.3 → 1.1.4

package/src/components/small/DshControlDefine.vue

@@ -3,7 +3,7 @@
         :class="{
             'dsh-control-define': true,
             'dsh-control-define-multiplerow': selfPropsObj._multiplerow,
-            'dsh-control-define-disabled': $isDisabled(canEdit, propsObj),
+            'dsh-control-define-disabled': !finalCanEdit,
             'dsh-control-define-show': !canEdit
         }"
         @click="clickInput"
@@ -53,6 +53,10 @@
                 type: Boolean,
                 default: true
             },
+            finalCanEdit: {
+                type: Boolean,
+                default: true
+            },
             value: {
                 type: [String, Array],
                 default () {

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";
@@ -71,22 +69,19 @@ 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";
@@ -103,8 +98,6 @@ const map = {
     DshDraggable,
     DshCropper,
 
-    // VTable,
-    // EvTable,
     DshBox,
     DshTable,
     DshList,
@@ -193,8 +186,6 @@ export {
     DshDraggable,
     DshCropper,
 
-    VTable,
-    EvTable,
     DshBox,
     DshTable,
     DshList,
@@ -254,16 +245,13 @@ export {
     Error403,
     Error404,
 
-    // DshTextMultiple,
-    MultipleInput,
-    YSerialNumber,
+    BriInputs,
     DshNumberange,
     DshDate,
     DshDaterange,
     DshSwitch,
-    // DshCascaderMultiple,
-    ZUpload,
-    YUploadImage,
+    BriUpload,
+    BriUploadImage,
     DshCoordinates,
     DshEditor,
     DshDivider,

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/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";
 

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

package/src/styles/components/list/DshBox/DshCard.less

@@ -0,0 +1,59 @@
+.DshCard {
+    display: flex;
+    flex-wrap: wrap;
+    background-color: #ffffff;
+    padding: 0 40px;
+    
+    &-item {
+        width: 250px;
+        height: 210px;
+        box-sizing: border-box;
+        margin: 10px 16px 30px;
+        border-radius: 6px;
+        overflow: hidden;
+        box-shadow: 0px 4px 8px 0px rgba(222, 222, 222, 0.75);
+        cursor: pointer;
+        display: flex;
+        flex-direction: column;
+        position: relative;
+
+        &-dropdown {
+            position: absolute;
+            top: 5px;
+            right: 5px;
+        }
+        &-image {
+            padding-top: 20px;
+            height: 122px;
+        }
+        &-info {
+            flex: 1;
+            padding: 8px 15px;
+            overflow: hidden;
+            background: #F7FBFF;
+            &-title {
+                font-size: 14px;
+                font-weight: 600;
+            }
+            &-col {
+                height: 24px;
+            }
+
+            .unit {
+                display: flex;
+                flex-direction: row;
+                &-label {
+                    max-width: 60px;
+                    font-weight: 400;
+                    color: #515A6E;
+                }
+                &-colon {
+
+                }
+                &-value {
+                    flex: 1;
+                }
+            }
+        }
+    }
+}

package/src/styles/components/list/DshBox/DshList.less

@@ -0,0 +1,142 @@
+.DshList {
+    @height:44px;
+    
+    .list {
+        &-loading {
+            min-height: 100px;
+
+            &-wrap {
+                display: block;
+                height: 100%;
+                width: 100%;
+                background-color: #fff;
+                z-index: 99999;
+                position: relative;
+                opacity: 0.6;
+            }
+
+            &-content {
+                z-index: 9999999;
+                position: absolute;
+                top: 30px;
+                left: 50%;
+            }
+
+            &-icon {
+                -moz-animation: spin 2.3s infinite linear;
+                -o-animation: spin 2.3s infinite linear;
+                -webkit-animation: spin 2.3s infinite linear;
+                animation: spin 2.3s infinite linear;
+                display: inline-block;
+                font-size: 28px;
+                opacity:0.6;
+
+                &:before {
+                    content: '\e838';
+                }
+            }
+        }
+
+        &-cols,
+        &-rows {
+            position: relative;
+            &-left {
+                width: 48px;
+                text-align: center;
+                position: absolute;
+                left: 0;
+                top: 0;
+                label {
+                    display: inline-block;
+                    height: 36px;
+                    padding: 9px 5px;
+                    margin: 0px;
+                    line-height: 18px;
+                }
+            }
+
+            .row {
+                width: 100%;
+                line-height: 20px;
+                display: flex;
+                justify-content: space-between;
+                &-item {
+                    min-width: 120px;
+                    height: 100%;
+                    padding: 0 16px;
+                    font-size: 14px;
+                    align-items: center;
+                }
+            }
+        }
+
+        &-cols {
+            height: @height;
+            background: #f0f0f0;
+            &-left {}
+            &-right {}
+
+            .row {
+                font-weight: 700;
+                &-item {
+                    padding: 10px 16px;
+                    border-top: 1px #e5e5e5 solid;
+                    border-bottom: 1px #f0f0f0 solid;
+                    border-left: 1px #e5e5e5 solid;
+
+                    &:last-child{
+                       border-right: 1px #e5e5e5 solid;
+                    }
+
+                    &-inner {
+                        .dsh-ellipsis{
+                            font-size: 14px;
+                            color: #666;
+                            font-weight: 700;
+                            line-height: 24px;
+                        }
+                    }
+                }
+            }
+        }
+
+        &-rows {
+            &-left {
+                label {
+                    height: 44px;
+                    line-height: 20px;
+                }
+            }
+            &-right {}
+
+            .row {
+                height: 44px;
+                line-height: 20px;
+
+                cursor: pointer;
+                &-item {
+                    display: flex;
+                    border: 1px solid #E5E5E5;
+                    border-width: 0 0 1px 1px;
+
+                    &:last-child{
+                        border-width: 0 1px 1px 1px;
+                    }
+
+                    &-inner {
+                        width: 100%;
+                        font-size: 14px;
+                        color: #333;
+                        font-weight: 400;
+                        line-height: 24px;
+                    }
+                }
+            }
+        }
+
+        &-noData {
+            padding: 10px 0px;
+            text-align: center;
+        }
+    }
+}