bri-components 1.1.2 → 1.1.4

package/src/components/small/DshModal.vue

@@ -143,137 +143,3 @@
         }
     };
 </script>
-
-<style lang="less">
-    .DshModal {
-        &-header {
-            width: 100%;
-            height: 100%;
-        }
-        &-close {
-            padding: 2px;
-            position: absolute;
-            top: 10px;
-            right: 10px;
-            cursor: pointer;
-        }
-
-        &-default,
-        &-middle,
-        &-large,
-        &-small {
-            .ivu-modal-wrap {
-                .ivu-modal {
-                    margin: auto;
-                    position: absolute;
-                    top: 0px;
-                    bottom: 0px;
-                    left: 0px;
-                    right: 0px;
-                    .ivu-modal-content {
-                        width: 100%;
-                        height: 100%;
-                        display: flex;
-                        flex-direction: column;
-                        .ivu-modal-close {}
-
-                        .ivu-modal-header {
-                            width: 100%;
-                            height: 44px;
-                            padding: 10px 40px 10px 16px;
-                        }
-                        .ivu-modal-body {
-                            width: 100%;
-                            flex: 1;
-                            min-height: 200px;
-                            padding: 0px;
-                            overflow: auto;
-                        }
-                        .ivu-modal-footer {
-                            width: 100%;
-                            height: 50px;
-                        }
-                    }
-                }
-            }
-        }
-
-        &-default {
-            .ivu-modal-wrap {
-                .ivu-modal {
-                    width: 750px !important;
-                    height: 550px !important;
-                    max-height: 100%;
-                    max-width: 100%;
-                }
-            }
-        }
-        &-small {
-             .ivu-modal-wrap {
-                 .ivu-modal {
-                    width: 500px !important;
-                    height: 400px !important;
-                    max-height: 100%;
-                    max-width: 100%;
-                    .ivu-modal-content{
-                        .DshModal-close {
-                            top: 20px;
-                            right: 24px;
-                            color: rgba(0,0,0,0.6);
-                            font-size: 16px!important;
-                        }
-
-                        .ivu-modal-header {
-                            width: 100%;
-                            height: 44px;
-                            padding: 20px 24px 0px 24px;
-                            border-bottom: none;
-                            &-inner {
-                                color: rgba(0,0,0,0.9);
-                                font-size: 16px;
-                                font-weight: 500;
-                                line-height: 24px;
-                                height: 24px;
-                            }
-                        }
-                        .ivu-modal-body {
-                            padding: 16px 24px 20px;
-                        }
-                    }
-                }
-            }
-        }
-        &-middle {
-             .ivu-modal-wrap {
-                 .ivu-modal {
-                    width: 1000px !important;
-                    height: 800px !important;
-                    max-height: 100%;
-                    max-width: 100%;
-                }
-            }
-        }
-        &-large {
-             .ivu-modal-wrap {
-                 .ivu-modal {
-                    width: 80% !important;
-                    height: 90% !important;
-                    min-width: 1000px !important;
-                    max-height: 100%;
-                    max-width: 100%;
-                }
-            }
-        }
-        &-auto {
-             .ivu-modal-wrap {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                 .ivu-modal {
-                    top: 0px;
-                    max-height: 100%;
-                }
-            }
-        }
-    }
-</style>

package/src/components/small/DshPage.vue

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

package/src/components/unit/DshFormItem.vue

@@ -3,7 +3,7 @@
         :class="[
             {
                 'DshFormItem': true,
-                'DshFormItem-required': formItem._required && canEdit,
+                'DshFormItem-required': canEdit && formItem._required,
                 'DshFormItem-line': formItem._line,
             },
             formControlClass,
@@ -23,17 +23,13 @@
             :style="labelStyle"
         >
             <!-- 左 -->
-            <span
-                class="DshFormItem-label-left"
-                :style="labelLeftStyle"
-            >
+            <span class="DshFormItem-label-left">
                 <Ctooltip
                     :content="formItem._name"
                     transfer
                 >
                     <span :class="{
                         'DshFormItem-label-name': true,
-                        'dsh-ellipsis': true,
                         'DshFormItem-label-name-edit': canEdit,
                         'DshFormItem-label-name-show': !canEdit
                     }">
@@ -109,9 +105,11 @@
             unitMixin
         ],
         props: {
-            canEdit: {
-                type: Boolean,
-                default: true
+            allFormList: {
+                type: Array,
+                default () {
+                    return [];
+                }
             },
             changedFields: {
                 type: Array,
@@ -119,7 +117,6 @@
                     return [];
                 }
             },
-
             // 实际最精确值是74px（label:30px, control:32px, 上下padding各: 6px，因为ivu-form-item-content里line-height: 32px导致有问题，故先76px
             height: {
                 type: [String, Number],

package/src/components/unit/DshUnit.vue

@@ -16,7 +16,7 @@
         <template v-else>
             <component
                 :is="componentNameMap[formItem._type]"
-                :isUnit="isUnit"
+                :canEdit="canEdit"
                 :value="formData"
                 :propsObj="{
                     ...formItem,
@@ -40,10 +40,6 @@
             unitMixin
         ],
         props: {
-            isUnit: {
-                type: Boolean,
-                default: true
-            },
             indexStr: String,
             rowIndex: Number,
             parentData: {
@@ -67,11 +63,5 @@
         .ivu-input {
             font-size: 12px;
         }
-
-        .DshLabels-searchResult {
-            position:absolute;
-            top: 32px !important;
-            left:0;
-        }
     }
 </style>

package/src/components/unit/unitMixin.js

@@ -3,17 +3,20 @@ import { componentNameMap, registerComponents } from "../controls/controlMap.js"
 export default {
     components: registerComponents(),
     props: {
-        formData: Object,
-        formItem: {
+        canEdit: {
+            type: Boolean,
+            default: true
+        },
+        formData: {
             type: Object,
             default () {
                 return {};
             }
         },
-        allFormList: {
-            type: Array,
+        formItem: {
+            type: Object,
             default () {
-                return [];
+                return {};
             }
         }
     },

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";
@@ -29,12 +27,11 @@ import DshUnit from "./components/unit/DshUnit.vue";
 import DshFormItem from "./components/unit/DshFormItem.vue";
 
 // controls
-import controlShow from "./components/controls/base/controlShow.vue";
 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";
@@ -72,31 +69,27 @@ 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";
-import DshLabels from "./components/controls/base/DshLabels.vue";
-import DshPackage from "./components/controls/base/DshPackage.vue";
-
-import DshBack from "./components/controls/base/DshBack.vue";
-import DshUndeveloped from "./components/controls/base/DshUndeveloped.vue";
 
+/* 不挂载全局 */
+import DshPackage from "./components/controls/senior/DshPackage.vue";
+import DshBack from "./components/controls/special/DshBack.vue";
+import DshUndeveloped from "./components/controls/special/DshUndeveloped.vue";
 // other
 import ZIframe from "./components/other/ZIframe.vue";
 
@@ -105,8 +98,6 @@ const map = {
     DshDraggable,
     DshCropper,
 
-    // VTable,
-    // EvTable,
     DshBox,
     DshTable,
     DshList,
@@ -122,7 +113,6 @@ const map = {
     DshUnit,
     DshFormItem,
 
-    controlShow,
     DshInput,
     DshNumber,
     DshSelect,
@@ -196,8 +186,6 @@ export {
     DshDraggable,
     DshCropper,
 
-    VTable,
-    EvTable,
     DshBox,
     DshTable,
     DshList,
@@ -213,7 +201,6 @@ export {
     DshUnit,
     DshFormItem,
 
-    controlShow,
     DshInput,
     DshNumber,
     DshSelect,
@@ -258,22 +245,18 @@ export {
     Error403,
     Error404,
 
-    // DshTextMultiple,
-    MultipleInput,
-    YSerialNumber,
+    BriInputs,
     DshNumberange,
     DshDate,
     DshDaterange,
     DshSwitch,
-    // DshCascaderMultiple,
-    ZUpload,
-    YUploadImage,
+    BriUpload,
+    BriUploadImage,
     DshCoordinates,
     DshEditor,
     DshDivider,
-    DshLabels,
-    DshPackage,
 
+    DshPackage,
     DshBack,
     DshUndeveloped,
 

package/src/styles/common/control.less

@@ -8,48 +8,84 @@
     line-height: 24px;
 }
 
+// // 表单模式
+// .control {
+//     &-show {
+//         border: none;
+//         background-color: transparent;
+//     }
+
+//     &-edit {
+//         height: 32px;
+//         border: 1px solid @borderColor;
+//         border-radius: @borderRadius;
+//         background: @inputBg;
+//         line-height: 32px;
+//         color: @textColor;
+//         cursor: pointer;
+//     }
+
+//     &-placeholder {
+//         color: @placeholderColor;
+//     }
+
+//     &-readonly {
+//         border: 1px solid @border-readonly;
+//         border-radius: @borderRadius;
+//         background: @inputBg-readonly;
+//         line-height: 32px;
+//         color: @textColor-readonly;
+//     }
+
+//     &-disabled {
+//         color: @textColor-disabled;
+//         border: 1px solid @border-disabled;
+//         background: @inputBg-disabled;
+//         border-radius: @borderRadius;
+//         cursor: not-allowed;
+//     }
+
+//     &-notext {
+//         color: @placeholderColor;
+//     }
+// }
+
 // 表单模式
-.control-show {
-    border: none;
-    background-color: transparent;
-}
 .control-edit {
     height: 32px;
-    color: @textColor;
     border: 1px solid @borderColor;
-    background: @inputBg;
     border-radius: @borderRadius;
+    background: @inputBg;
     line-height: 32px;
     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;
 }
 .control-readonly {
-    color: @textColor-readonly;
     border: 1px solid @border-readonly;
-    background: @inputBg-readonly;
-    border-radius: @borderRadius;
-}
-.control-disabled {
-    color: @textColor-disabled;
-    border: 1px solid @border-disabled;
-    background: @inputBg-disabled;
     border-radius: @borderRadius;
-    cursor: not-allowed;
+    background: @inputBg-readonly;
+    line-height: 32px;
+    color: @textColor-readonly;
 }
 .control-notext {
     color: @placeholderColor;
 }
-
-// 暂时移到这里，部分需要删除
-.control-show-text {
-    display: inline-block;
-    width: 100%;
-    height: 100%;
-}
-
-.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/BriLabels.less

@@ -1,4 +1,5 @@
 .BriLabels {
+    display: flex;
     width: 100%;
 
     &-dropdown {
@@ -110,7 +111,8 @@
         align-items: center;
         height: 32px;
         overflow-y: hidden;
-        &-item{
+
+        &-item {
             .unit-show();
             .dsh-ellipsis();
             display: inline-flex;
@@ -118,7 +120,7 @@
             height: fit-content;
             padding: 0 8px;
             background-color: @borderColor;
-            color: rgba(0,0,0,0.9);
+            color: rgba(0, 0, 0, 0.9);
             font-size: 12px;
             font-weight: 400;
             line-height: 24px;

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,9 +420,8 @@
     }
 }
 
-.ZUpload-disabled {
-    cursor: not-allowed;
-    border-color: @border-disabled;
+.BriUpload-disabled {
+    .control-disabled();
     .ZUploa-old-wrapper {
         margin: 0px;
     }

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

@@ -21,25 +21,7 @@
         }
     }
 
-    &-value {
-        height: 24px;
-        line-height: 20px;
-        padding: 2px 8px;
-        border-radius: 4px;
-        margin-right: 16px;
-
-        &:last-of-type {
-            margin-right: 0px;
-        }
-
-        &-wrapper {
-            display: flex;
-            min-height: 32px;
-            padding: 4px 0;
-        }
-    }
-
-    .Dshcheckbox-tip {
+    &-tip {
         cursor: pointer;
 
         .ivu-checkbox {
@@ -47,32 +29,34 @@
         }
     }
 
-    .ivu-select-multiple .ivu-select-selection {
-        height: 32px;
-
-        &>div {
-            overflow-x: auto;
-            overflow-y: hidden;
-            white-space: nowrap;
-
-            .ivu-tag {
-                margin: 2px 4px 4px 0;
-            }
-
-            &::-webkit-scrollbar {
-                height: 8px;
-            }
-
-            &:-webkit-scrollbar-thumb {
-                border-radius: 3px;
-                background: rgba(51, 51, 51, .1);
-                background-clip: border-box;
+    .ivu-select-multiple {
+        .ivu-select-selection {
+            height: 32px;
+    
+            &>div {
+                overflow-x: auto;
+                overflow-y: hidden;
+                white-space: nowrap;
+    
+                .ivu-tag {
+                    margin: 2px 4px 4px 0;
+                }
+    
+                &::-webkit-scrollbar {
+                    height: 8px;
+                }
+    
+                &:-webkit-scrollbar-thumb {
+                    border-radius: 3px;
+                    background: rgba(51, 51, 51, .1);
+                    background-clip: border-box;
+                }
             }
         }
-    }
 
-    .ivu-select-multiple .ivu-select-item-selected:after {
-        content: none;
+        .ivu-select-item-selected:after {
+            content: none;
+        }
     }
 }
 
@@ -153,4 +137,23 @@
         font-size: 14px;
         vertical-align: middle;
     }
+}
+
+// TODO：必须单独拿出来，DshSelect组件里在混入此样式
+.DshCheckbox-value {
+    height: 24px;
+    line-height: 20px;
+    padding: 2px 8px;
+    border-radius: 4px;
+    margin-right: 16px;
+
+    &:last-of-type {
+        margin-right: 0px;
+    }
+
+    &-wrapper {
+        display: flex;
+        min-height: 32px;
+        padding: 4px 0;
+    }
 }