bri-components 1.1.1 → 1.1.3

package/src/components/list/DshBox/DshSingleData.vue

@@ -27,7 +27,6 @@
 </template>
 
 <script>
-
     export default {
         name: "DshSingleData",
         components: {},
@@ -55,12 +54,6 @@
                 default () {
                     return [];
                 }
-            },
-            extraOperationList: {
-                type: Array,
-                default () {
-                    return [];
-                }
             }
         },
         computed: {

package/src/components/list/DshCascaderTable.vue

@@ -145,15 +145,14 @@
                                             <!-- 普通单元格 -->
                                             <td
                                                 v-else
-                                                :key="col._key"
+                                                :key="col._key + ''"
                                                 :style="getTdStyle(col, row)"
                                             >
                                                 <dsh-unit
-                                                    :canEdit="canEdit && (col.canEdit === undefined ? true : col.canEdit)"
+                                                    :canEdit="canEdit"
+                                                    :rowIndex="rowIndex"
                                                     :formData="row[col.nodeKey]"
                                                     :formItem="col"
-                                                    :rowIndex="rowIndex"
-                                                    :isUnit="!canEdit"
                                                     @change="$dispatchEvent(operationMap.changeVal, col, row, arguments)"
                                                 ></dsh-unit>
                                             </td>

package/src/components/list/ZTree.vue

@@ -25,9 +25,9 @@
                 <dsh-form
                     v-if="treeFormShow"
                     ref="treeForm"
-                    :labelWidth="80"
                     :formList="treeFormList"
                     :formData="treeFormData"
+                    :labelStyle="{ width: '80px' }"
                 ></dsh-form>
 
                 <dsh-buttons

package/src/components/other/ZLoading.vue

@@ -9,7 +9,13 @@
     >
         <div class="ZLoading-main">
             <slot>
-                <img :src="imgSrc" />
+                <div class="ZLoading-main-content">
+                    <div class="ZLoading-main-loading" :style="getStyle">
+                    </div>
+                    <div v-if="showLoadingText" class="ZLoading-main-loadingText">
+                        加载中...
+                    </div>
+                </div>
             </slot>
         </div>
    </div>
@@ -37,7 +43,12 @@
             },
             kongImg: {
                 type: String
-            }
+            },
+            mode: {
+                type: String,
+                default: "large" // small middle
+            },
+            showLoadingText: Boolean
         },
         data () {
             return {};
@@ -51,9 +62,27 @@
                 } else {
                     return undefined;
                 }
+            },
+            getStyle () {
+                let styleMap = {
+                    large: {
+                        width: "49px",
+                        height: "49px"
+                    },
+                    middle: {
+                        width: "35px",
+                        height: "35px"
+                    },
+                    small: {
+                        width: "16px",
+                        height: "16px"
+                    }
+                };
+                return styleMap[this.mode];
             }
         },
         created () {},
-        methods: {}
+        methods: {
+        }
     };
 </script>

package/src/components/small/BriDrawer.vue

@@ -0,0 +1,132 @@
+<template>
+    <Drawer
+        class="BriDrawer"
+        v-model="showModal"
+        :title="selfPropsObj.title"
+        :width="selfPropsObj.width"
+        :height="selfPropsObj.height"
+        :closable="selfPropsObj.closable"
+        :mask-closable="selfPropsObj.maskClosable"
+        :mask="selfPropsObj.mask"
+        :mask-style="selfPropsObj.maskStyle"
+        :styles="selfPropsObj.styles"
+        :scrollable="selfPropsObj.scrollable"
+        :placement="selfPropsObj.placement"
+        :transfer="selfPropsObj.transfer"
+        :class-name="selfPropsObj.className"
+        :inner="selfPropsObj.inner"
+        :draggable="selfPropsObj.draggable"
+        :before-close="selfPropsObj.beforeClose"
+        :lock-scroll="selfPropsObj.lockScroll"
+        @on-close="close"
+        @on-visible-change="visibleChange"
+        @on-resize-width="resizeChange"
+    >
+        <div
+            slot="header"
+            class="BriDrawer-header"
+        >
+            <slot name="header">
+                {{ selfPropsObj.title }}
+            </slot>
+        </div>
+
+        <!-- 删除按钮 -->
+        <Icon
+            v-if="selfPropsObj.closable"
+            slot="close"
+            class="BriDrawer-close"
+            type="md-close"
+            size="20"
+            @click.stop="clickClose"
+        />
+
+        <slot
+            slot="trigger"
+            name="trigger"
+        ></slot>
+
+        <div class="BriDrawer-main">
+            <div class="BriDrawer-body">
+                <slot></slot>
+            </div>
+
+            <div
+                v-if="selfPropsObj.footer"
+                class="BriDrawer-footer"
+            >
+                <slot name="footer">
+                    <dsh-buttons
+                        :list="list"
+                        @click="$dshEmit($event)"
+                    ></dsh-buttons>
+                </slot>
+            </div>
+        </div>
+    </Drawer>
+</template>
+
+<script>
+    export default {
+        name: "BriDrawer",
+        props: {
+            value: Boolean,
+            propsObj: {
+                type: Object,
+                default () {
+                    return {};
+                }
+            },
+            list: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            }
+        },
+        model: {
+            prop: "value",
+            event: "input"
+        },
+        data () {
+            return {};
+        },
+        computed: {
+            showModal: {
+                get () {
+                    return this.value;
+                },
+                set (bool) {
+                    this.input(bool);
+                }
+            },
+            selfPropsObj () {
+                return {
+                    width: 320,
+                    closable: true,
+                    transfer: true,
+                    footer: true,
+                    ...this.propsObj
+                };
+            }
+        },
+        created () {},
+        methods: {
+            input (bool) {
+                this.$emit("input", bool);
+            },
+            clickClose () {
+                this.showModal = false;
+            },
+            close (...parmas) {
+                this.$emit("on-close", ...parmas);
+            },
+            resizeChange (...parmas) {
+                this.$emit("on-resize-change", ...parmas);
+            },
+            visibleChange (bool = false) {
+                this.$emit("on-visible-change", bool);
+            }
+        }
+    };
+</script>

package/src/components/small/DshButtons.vue

@@ -14,7 +14,7 @@
                     :key="operationItem.type"
                     :style="operationItem.style"
                     :class="[
-                        index ? 'dsh-margin-left5' : undefined,
+                        index ? 'dsh-margin-left8' : undefined,
                         !operationItem.customIcon && !operationItem.icon ? 'DshButtons-item' : undefined,
                         itemClass,
                     ]"
@@ -59,7 +59,7 @@
                     :key="operationItem.type"
                     :style="operationItem.style"
                     :class="[
-                        index ? 'dsh-margin-left5' : undefined,
+                        index ? 'dsh-margin-left8' : undefined,
                         !operationItem.customIcon && !operationItem.icon ? 'DshButtons-item' : undefined,
                         itemClass,
                     ]"
@@ -82,7 +82,7 @@
                 :key="operationItem.type"
                 :style="operationItem.style"
                 :class="[
-                    index ? 'dsh-margin-left5' : undefined,
+                    index ? 'dsh-margin-left8' : undefined,
                     !operationItem.customIcon && !operationItem.icon ? 'DshButtons-item' : undefined,
                     itemClass,
                     ...(Array.isArray(operationItem.class) ? operationItem.class : [operationItem.class])

package/src/components/small/DshControlDefine.vue

@@ -18,7 +18,7 @@
                     :list="val"
                     @delete="deleteTag"
                     :propsObj="{
-                        closable: canEdit,
+                        closable: canEdit && propsObj.canEdit,
                         size: selfPropsObj._multiplerow ? 'medium' : 'default'
                     }"
                 ></dsh-tags>

package/src/components/small/DshModal.vue

@@ -143,113 +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 {
-                    padding: 20px;
-                    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%;
-                }
-            }
-        }
-        &-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/unit/DshFormItem.vue

@@ -1,17 +1,18 @@
 <template>
     <div
         :class="[
-            'DshFormItem',
-            { 'DshFormItem-required': formItem._required&&canEdit },
-            { 'DshFormItem-line': formItem._line },
-            `DshFormItem-${formItem._type}`,
+            {
+                'DshFormItem': true,
+                'DshFormItem-required': canEdit && formItem._required,
+                'DshFormItem-line': formItem._line,
+            },
             formControlClass,
+            formItem.formControlClass
         ]"
         :style="{
             width: `calc(${(formItem._br ? (formItem._span || 24)/24 : 1) * 100}% - 12px)`,
             height: formItem._br || (formItem._span || 24) === 24 ? undefined : `${height}px`,
             minHeight: `${46}px`,
-            alignItems: formItem._labelAlignItems || 'center',
             ...rowStyle
         }"
     >
@@ -19,26 +20,30 @@
         <div
             v-if="!formItem._noLabel"
             class="DshFormItem-label"
-            :style="[
-                selfLabelStyle,
-                { justifyContent: formItem._labelAlign }
-            ]"
+            :style="labelStyle"
         >
-            <span
-                class="DshFormItem-label-left"
-                :style="labelLeftStyle"
-            >
+            <!-- 左 -->
+            <span class="DshFormItem-label-left">
                 <Ctooltip
                     :content="formItem._name"
                     transfer
                 >
-                    <span class="DshFormItem-label-name dsh-ellipsis">
+                    <span :class="{
+                        'DshFormItem-label-name': true,
+                        'DshFormItem-label-name-edit': canEdit,
+                        'DshFormItem-label-name-show': !canEdit
+                    }">
                         <slot name="label">
                             {{ formItem._name }}
-                            <template v-if="changedFields && changedFields.includes(formItem._key)">
-                                <span class="DshFormItem-label-name-sign">！有更新</span>
-                            </template>
+
+                            <!-- 有更新标记-->
+                            <span
+                                v-if="changedFields.includes(formItem._key)"
+                                class="DshFormItem-label-name-sign"
+                            >！有更新</span>
                         </slot>
+
+                        <!-- label后可自定义内容 -->
                         <dsh-render
                             v-if="formItem._tipsRender"
                             :render="tipsRender(formItem,formData)"
@@ -47,8 +52,9 @@
                 </Ctooltip>
             </span>
 
+            <!-- 右 -->
             <span
-                v-if="canEdit || formItem._alwaysShowExtra"
+                v-if="canEdit"
                 class="DshFormItem-label-right"
             >
                 <slot name="extra">
@@ -66,12 +72,7 @@
         </div>
 
         <!-- 控件 -->
-        <div
-            class="DshFormItem-control"
-            :style="{
-                justifyContent: formItem._controlAlign
-            }"
-        >
+        <div class="DshFormItem-control">
             <!-- 控件位置放置的dom -->
             <slot name="control"></slot>
 
@@ -100,10 +101,22 @@
 
     export default {
         name: "DshFormItem",
-        mixins: [unitMixin],
+        mixins: [
+            unitMixin
+        ],
         props: {
-            changedFields: Array,
-
+            allFormList: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
+            changedFields: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            },
             // 实际最精确值是74px（label:30px, control:32px, 上下padding各: 6px，因为ivu-form-item-content里line-height: 32px导致有问题，故先76px
             height: {
                 type: [String, Number],
@@ -121,29 +134,12 @@
                     return {};
                 }
             },
-
-            labelWidth: [String, Number],
             formControlClass: String
         },
         data () {
-            return {
-                showTipModal: false
-            };
-        },
-        computed: {
-            selfLabelStyle () {
-                return {
-                    width: this.labelWidth + "px",
-                    ...this.labelStyle
-                    // marginRight: "20px"
-                };
-            },
-            labelLeftStyle () {
-                return {
-                    minWidth: this.labelWidth + "px"
-                };
-            }
+            return {};
         },
+        computed: {},
         created () {},
         methods: {
             // 校验方法 -供外部使用

package/src/components/unit/DshUnit.vue

@@ -17,14 +17,13 @@
             <component
                 :is="componentNameMap[formItem._type]"
                 :canEdit="canEdit"
-                :isUnit="isUnit"
-                :parentData="parentData"
                 :value="formData"
                 :propsObj="{
                     ...formItem,
                     size: 'default',
                     inTable: true
                 }"
+                :parentData="parentData"
                 @blur="blur"
                 @change="change"
             ></component>
@@ -37,11 +36,18 @@
 
     export default {
         name: "DshUnit",
-        mixins: [unitMixin],
+        mixins: [
+            unitMixin
+        ],
         props: {
             indexStr: String,
             rowIndex: Number,
-            parentData: Array
+            parentData: {
+                type: Array,
+                default () {
+                    return [];
+                }
+            }
         },
         data () {
             return {};
@@ -52,19 +58,10 @@
     };
 </script>
 
-<style lang="less" scoped>
-    .DshUnit {}
-</style>
 <style lang="less">
     .DshUnit {
         .ivu-input {
             font-size: 12px;
         }
-
-        .DshLabels-searchResult{
-            position:absolute;
-            top: 32px !important;
-            left:0;
-        }
     }
 </style>

package/src/components/unit/unitMixin.js

@@ -7,22 +7,17 @@ export default {
             type: Boolean,
             default: true
         },
-        formData: Object,
-        formItem: {
+        formData: {
             type: Object,
             default () {
                 return {};
             }
         },
-        allFormList: {
-            type: Array,
+        formItem: {
+            type: Object,
             default () {
-                return [];
+                return {};
             }
-        },
-        isUnit: {
-            type: Boolean,
-            default: false
         }
     },
     data () {