bri-components 1.1.6 → 1.2.1

package/src/{components/small → abolish}/DshFileShow.vue

@@ -1,10 +1,10 @@
 <template>
-    <div class="dsh-file-show">
+    <div class="DshFileShow">
         <!-- image类型 -->
         <img
             v-for="item in list"
             :key="item._id"
-            class="dsh-file-show-img"
+            class="DshFileShow-img"
             :style="{
                 cursor: isClick ? 'pointer' : 'auto'
             }"
@@ -19,13 +19,13 @@
         <!-- 预览 -->
         <div
             :class="{
-                'dsh-file-show-wrap': true,
-                'dsh-file-show-wrap-show': showModal
+                'DshFileShow-wrap': true,
+                'DshFileShow-wrap-show': showModal
             }"
             @click.stop="closeModal()"
         >
             <div
-                class="dsh-file-show-wrap-preview"
+                class="DshFileShow-wrap-preview"
                 :style="{
                     backgroundImage: `url(${curFile.url})`
                 }"
@@ -35,8 +35,6 @@
 </template>
 
 <script>
-    import axios from "axios";
-
     export default {
         name: "DshFileShow",
         props: {
@@ -68,6 +66,10 @@
         },
         created () {},
         methods: {
+            closeModal () {
+                this.showModal = false;
+            },
+
             // 获取不同类型文件的图片
             getFileImage (item) {
                 const imageMap = this.$imageSrcMap.fileType;
@@ -108,105 +110,28 @@
                         // this.downloadFile(item);
                     }
                 }
-            },
-            downloadFile (file) {
-                axios
-                    .get(file.url, {
-                        responseType: "blob"
-                    })
-                    .then((res) => {
-                        if (window.navigator.msSaveOrOpenBlob) {
-                            // 兼容IE10
-                            navigator.msSaveBlob(res, file.name);
-                        } else {
-                            const href = URL.createObjectURL(res.data); // 创建新的URL表示指定的blob对象
-                            const a = document.createElement("a");
-                            a.style.display = "none";
-                            a.href = href; // 指定下载链接
-                            a.download = file.name; // 指定下载文件名
-                            a.click();
-                            URL.revokeObjectURL(a.href); // 释放URL对象
-                            a.remove();
-                        }
-                });
-            },
-            closeModal () {
-                this.showModal = false;
             }
+            // downloadFile (file) {
+            //     axios
+            //         .get(file.url, {
+            //             responseType: "blob"
+            //         })
+            //         .then((res) => {
+            //             if (window.navigator.msSaveOrOpenBlob) {
+            //                 // 兼容IE10
+            //                 navigator.msSaveBlob(res, file.name);
+            //             } else {
+            //                 const href = URL.createObjectURL(res.data); // 创建新的URL表示指定的blob对象
+            //                 const a = document.createElement("a");
+            //                 a.style.display = "none";
+            //                 a.href = href; // 指定下载链接
+            //                 a.download = file.name; // 指定下载文件名
+            //                 a.click();
+            //                 URL.revokeObjectURL(a.href); // 释放URL对象
+            //                 a.remove();
+            //             }
+            //     });
+            // }
         }
     };
 </script>
-
-<style lang="less" scoped>
-    .dsh-file-show {
-        display: block;
-        overflow: hidden;
-        word-break: keep-all;
-        white-space: nowrap;
-        text-overflow: ellipsis;
-        display: flex;
-
-        &-img {
-            margin-right: 3px;
-            &:hover{
-                cursor: pointer;
-            }
-        }
-
-        // 遮罩层
-        &-wrap {
-            width: 100%;
-            height: 100%;
-            position: fixed;
-            top: 0px;
-            left: 0px;
-            bottom: 0px;
-            right: 0px;
-            z-index: 9999;
-            text-align: center;
-            overflow: auto;
-            display: none;
-            background: rgba(0,0,0,0);
-
-            &-show {
-                display: block;
-                background: rgba(0,0,0,.6);
-                animation: animate-show .3s linear;
-            }
-
-            &-preview {
-                position: absolute;
-                width: 90%;
-                height: 90%;
-                top: 5%;
-                left: 5%;
-                left: 5%;
-                right: 5%;
-                background-size: contain;
-                background-repeat: no-repeat;
-                background-position: center;
-            }
-
-            // &-roll {
-            //     height: 100%;
-            //     position: absolute;
-            //     top: 0;
-            //     bottom: 0;
-            //     left: 0;
-            //     right: 0;
-            //     margin: auto;
-            // }
-        }
-
-        @keyframes animate-show {
-            from {
-                display: none;
-                background: rgba(0,0,0,0);
-            }
-            to {
-                display: block;
-                background: rgba(0,0,0,.6);
-            }
-        }
-    }
-</style>

package/src/abolish/DshFlatTable.vue

@@ -1,5 +1,5 @@
 <template>
-    <div :class="`DshFlatTable control-default`">
+    <div class="DshFlatTable">
         <!-- 表格内容 -->
         <div class="DshFlatTable-block">
             <table

package/src/components/controls/base/BriUpload/{index.vue → BriUpload.vue}

@@ -14,7 +14,8 @@
             `BriUpload-${showType}`,
             {
                 'BriUpload-readonly': !canEdit,
-                'BriUpload-disabled': !finalCanEdit
+                'BriUpload-disabled': canEdit && !finalCanEdit,
+                'BriUpload-unit': isUnitShow
             }
         ]"
     >
@@ -84,11 +85,11 @@
     import controlMixin from "../../controlMixin.js";
     import uploadMixin from "./uploadMixin.js";
     import BriUploadImage from "./BriUploadImage.vue";
-    import uploadList from "./upload-list.vue";
+    import uploadList from "./uploadList.vue";
 
     const prefixCls = "ivu-upload";
     export default {
-        name: "Upload",
+        name: "BriUpload",
         mixins: [
             controlMixin,
             uploadMixin

package/src/components/controls/base/BriUpload/{upload-list.vue → uploadList.vue}

@@ -12,11 +12,11 @@
             >
                 <div
                     v-for="fileItem in files"
-                    :key="fileItem.url"
-                    class="uploadList-listItem"
+                    :key="fileItem._key || fileItem._id"
+                    class="item"
                 >
                     <!-- 展示图 -->
-                    <div class="uploadList-listItem-show">
+                    <div class="item-show">
                         <img
                             v-if="propsObj._fileType === 'image' || (fileItem.mimetype.indexOf('image') > -1)"
                             :data-original="fileItem.url"
@@ -31,26 +31,27 @@
                     </div>
 
                     <!-- 展示名称 -->
-                    <Ctooltip
+                    <bri-tooltip
                         v-if="propsObj._fileType != 'image'"
-                        class="uploadList-listItem-name"
+                        class="item-name"
                         :content="fileItem.name"
                         :transfer="true"
                         placement="top-start"
                         max-width="300"
                     >
-                        <p class="uploadList-listItem-name-title">{{ fileItem.name }}</p>
-                    </Ctooltip>
+                        <p class="item-name-title">{{ fileItem.name }}</p>
+                    </bri-tooltip>
 
                     <!-- 图标 -->
                     <dsh-icons
-                        class="uploadList-listItem-action"
-                        item-class="uploadList-listItem-action-icon"
+                        class="item-action"
+                        item-class="item-action-icon"
                         :list="$getOperationList(getBtns((fileItem.mimetype.indexOf('image') > -1) || (fileItem.mimetype.indexOf('application/pdf') > -1)))"
                         @click="$dispatchEvent($event,fileItem)"
                     ></dsh-icons>
                 </div>
             </div>
+
             <div
                 v-else
                 class="uploadList-nodata"
@@ -59,17 +60,18 @@
                 <span>{{ noText }}</span>
             </div>
         </template>
+
         <!-- 自定义新的展示方式 -->
         <template v-else>
             <div
                 v-if="files && files.length > 0"
-                class="uploadList-inline-list bri-scrollbar6"
                 ref="viewerImage"
+                class="uploadList-inline-list"
             >
                 <div
-                    class="uploadList-inline-listItem"
                     v-for="fileItem in files"
                     :key="fileItem.url"
+                    class="item"
                 >
                     <img
                         v-if="propsObj._fileType === 'image' || (fileItem.mimetype.indexOf('image') > -1)"
@@ -82,14 +84,16 @@
                         :src="getFileImage(fileItem)"
                         :alt="fileItem.name"
                     >
+
                     <dsh-icons
-                        class="uploadList-inline-listItem-action"
-                        item-class="uploadList-inline-listItem-action-icon"
+                        class="item-action"
+                        item-class="item-action-icon"
                         :list="$getOperationList(getBtns((fileItem.mimetype.indexOf('image') > -1) || (fileItem.mimetype.indexOf('application/pdf') > -1) || (fileItem.mimetype=='text/plain')))"
                         @click="$dispatchEvent($event,fileItem)"
                     ></dsh-icons>
                 </div>
             </div>
+
             <span
                 v-else
                 class="uploadList-inline-nodata"

package/src/components/controls/base/BriUpload/uploadMixin.js

@@ -97,11 +97,7 @@ export default {
                 }
             })
                 .then(response => {
-                    const newResponse = {
-                        data: response,
-                        res: {}
-                    };
-                    this.handleSuccess && this.handleSuccess(newResponse, newResponse.data, file);
+                    this.handleSuccess && this.handleSuccess(response, response.data, file);
                     callback && callback(response.data);
                 }).catch(error => {
                     this.handleError && this.handleError(error, {}, file);

package/src/components/controls/base/DshCascader/DshCascader.vue

@@ -3,9 +3,9 @@
         <!-- 编辑 -->
         <template v-if="canEdit">
             <!-- 多选 多选的filterable必须是false，不然出bug -->
-            <template v-if="useMultiple === true">
+            <template v-if="multipleMode">
                 <Cascader
-                    class="DshCascader-multiple"
+                    class="DshCascader-edit-multiple"
                     :value="multipleSelectVal"
                     :data="renderCascaderData"
                     :disabled="!finalCanEdit"
@@ -22,34 +22,32 @@
                     <div
                         :class="{
                             ...commonClass,
-                            'DshCascader-multiple-input': true,
-                            'DshCascader-multiplerow': isSelfRow,
+                            'DshCascader-edit-multiple-edit': true,
+                            'DshCascader-row': isMultipleRow,
                         }"
                         @click="clickInput"
                     >
                         <!-- 有值 -->
-                        <div
-                            v-if="!$isEmptyData(curVal)"
-                            class="hasdata"
-                        >
+                        <template v-if="!$isEmptyData(curValList)">
                             <dsh-tags
-                                class="hasdata-multiple"
+                                class="overflow"
                                 :list="curValNameList"
                                 :propsObj="{
-                                    closable: canEdit,
-                                    size: isSelfRow ? 'medium' : 'default'
+                                    disabled: !finalCanEdit
                                 }"
                                 @delete="deleteItem"
                             ></dsh-tags>
-                        </div>
+
+                            <Icon
+                                class="icon-default"
+                                type="ios-arrow-down"
+                            />
+                        </template>
 
                         <!-- 无值 -->
-                        <span
-                            v-else
-                            class="nodata"
-                        >
+                        <template v-else>
                             {{ emptyShowVal }}
-                        </span>
+                        </template>
                     </div>
                 </Cascader>
             </template>
@@ -61,42 +59,29 @@
                     <div
                         :class="{
                             ...commonClass,
-                            'DshCascader-custom-input': true
+                            'DshCascader-edit-custom': true
                         }"
-                        class
+                        @mouseenter="isHover = true"
+                        @mouseleave="isHover = false"
                         @click="openModal"
                     >
-                        <!-- 有值 -->
-                        <div
-                            v-if="!$isEmptyData(curValList)"
-                            class="hasdata"
-                            @mouseenter="isHover = true"
-                            @mouseleave="isHover = false"
-                        >
-                            <span class="hasdata-text">
-                                {{ curValNameStr }}
-                            </span>
-
-                            <Icon
-                                v-if="selfPropsObj._clearable && isHover"
-                                class="hasdata-clear"
-                                type="md-close"
-                                @click.stop="clickClear"
-                            />
-                            <Icon
-                                v-else
-                                class="hasdata-clear"
-                                type="ios-arrow-down"
-                            />
+                        <!-- 内容 -->
+                        <div class="text">
+                            {{ showVal }}
                         </div>
 
-                        <!-- 无值 -->
-                        <span
+                        <!-- 右侧图标 -->
+                        <Icon
+                            v-if="selfPropsObj._clearable && isHover"
+                            class="icon-close"
+                            type="md-close"
+                            @click.stop="clickClear"
+                        />
+                        <Icon
                             v-else
-                            class="nodata"
-                        >
-                            {{ emptyShowVal }}
-                        </span>
+                            class="icon-default"
+                            type="ios-arrow-down"
+                        />
                     </div>
 
                     <!-- 内容弹框 -->
@@ -114,7 +99,7 @@
                 <!-- 输入框方式 -->
                 <template v-else>
                     <Cascader
-                        class="DshCascader-single"
+                        class="DshCascader-edit-single"
                         :value="curValList"
                         :data="renderCascaderData"
                         :placeholder="selfPropsObj._placeholder"
@@ -136,49 +121,56 @@
 
         <!-- 查看 -->
         <template v-else>
-            <div :class="{
-                ...commonClass,
-                'DshCascader-show': true,
-                'DshCascader-multiplerow': isSelfRow,
-            }">
-                <!-- 有值 -->
-                <div
-                    v-if="!$isEmptyData(curVal)"
-                    class="hasdata"
+            <!-- 多选 -->
+            <template v-if="multipleMode">
+                <bri-tooltip
+                    :content="showMultipleVal"
+                    placement="top"
+                    maxWidth="200"
+                    :transfer="true"
                 >
-                    <!-- 多选 -->
-                    <dsh-tags
-                        v-if="useMultiple"
-                        class="hasdata-multiple"
-                        :list="curValNameList"
-                        :propsObj="{
-                            closable: !canEdit,
-                            size: isSelfRow ? 'medium' : 'default'
-                        }"
-                    ></dsh-tags>
+                    <div :class="{
+                        ...commonClass,
+                        'DshCascader-show-multiple': true,
+                        'DshCascader-row': isMultipleRow,
+                    }">
+                        <!-- 有值 -->
+                        <dsh-tags
+                            v-if="!$isEmptyData(curValList)"
+                            :class="{
+                                overflow: true,
+                                'overflow-unit': isUnitShow
+                            }"
+                            :list="curValNameList"
+                            :propsObj="{
+                                closable: false
+                            }"
+                        ></dsh-tags>
 
-                    <!-- 单选 -->
-                    <Ctooltip
-                        v-else
-                        :content="curValNameStr"
-                        placement="top"
-                        maxWidth="200"
-                        :transfer="true"
-                    >
-                        <div class="hasdata-single">
-                            {{ curValNameStr }}
-                        </div>
-                    </Ctooltip>
-                </div>
+                        <!-- 无值 -->
+                        <template v-else>
+                            {{ emptyShowVal }}
+                        </template>
+                    </div>
+                </bri-tooltip>
+            </template>
 
-                <!-- 无值 -->
-                <span
-                    v-else
-                    class="nodata"
+            <!-- 单选 -->
+            <template v-else>
+                <bri-tooltip
+                    :content="showVal"
+                    placement="top"
+                    maxWidth="200"
+                    :transfer="true"
                 >
-                    {{ emptyShowVal }}
-                </span>
-            </div>
+                    <div :class="{
+                        ...commonClass,
+                        'DshCascader-show-single': true
+                    }">
+                        {{ showVal }}
+                    </div>
+                </bri-tooltip>
+            </template>
         </template>
     </div>
 </template>
@@ -236,15 +228,11 @@
             };
         },
         computed: {
-            // 是否多选模式
-            useMultiple () {
-                return ["regions", "cascaders"].includes(this.propsObj._type);
-            },
             selfPropsObj () {
                 return {
                     _filterable: true,
                     _showMode: false,
-                    _transfer: true,
+                    _transfer: false,
                     ...this.propsObj,
                     ...this.commonDealPropsObj
                 };
@@ -271,22 +259,34 @@
                     : this.cascaderData;
             },
 
+            // 是否多选类型
+            multipleMode () {
+                return ["regions", "cascaders"].includes(this.propsObj._type);
+            },
+            // 只有多选时有效
+            isMultipleRow () {
+                return this.multipleMode && (this.selfPropsObj._span === 24 || !this.selfPropsObj._span);
+            },
+            // 只有单选时有效
             showMode () {
                 return this.selfPropsObj._showMode;
             },
-            isSelfRow () {
-                return this.selfPropsObj._span === 24 || !this.selfPropsObj._span;
-            },
 
-            // 单选用的展示文字
-            curValNameStr () {
-                return this.$getTreeLinealDatas(this.curValList, this.cascaderData, "name").join("/");
-            },
-            // 多选用的展示文字
+            // 多选用 名字组成的列表
             curValNameList () {
                 return this.curValList.map(item =>
                     this.$getTreeLinealDatas(item, this.cascaderData, "name").join("/")
                 );
+            },
+            showVal () {
+                return this.$isEmptyData(this.curValList)
+                    ? this.emptyShowVal
+                    : this.$getTreeLinealDatas(this.curValList, this.cascaderData, "name").join("/");
+            },
+            showMultipleVal () {
+                return this.$isEmptyData(this.curValList)
+                    ? this.emptyShowVal
+                    : this.curValNameList.join("、");
             }
         },
         created () {},

package/src/components/controls/base/DshCascader/InfoCascader.vue

@@ -124,10 +124,6 @@
                     let newarr = [];
                     treeList.forEach(element => {
                         if (element.children && element.children.length) {
-                            if (element.title.indexOf(value) > -1) {
-                                element.expand = true;
-                                newarr.push(element);
-                            }
                             const ab = rebuildData(value, element.children);
                             const obj = {
                                 ...element,
@@ -136,6 +132,9 @@
                             };
                             if (ab && ab.length) {
                                 newarr.push(obj);
+                            } else if (element.title.indexOf(value) > -1) {
+                                element.expand = true;
+                                newarr.push(element);
                             }
                         } else {
                             if (element.title.indexOf(value) > -1) {

package/src/components/controls/base/DshCheckbox.vue

@@ -7,13 +7,13 @@
             <!-- 平铺 -->
             <CheckboxGroup
                 v-if="showType === 'flat'"
-                :class="[
-                    'DshCheckbox-checkboxGroup',
-                    { 'DshCheckbox-checkboxGroup-useColor' : selfPropsObj._useColor },
-                    { 'readonlyCheckbox' : !canEdit && !selfPropsObj._useColor },
-                    { 'readonlyColorCheckbox': !canEdit && selfPropsObj._useColor },
-                    { 'DshCheckbox-checkboxGroup-scroll': selfPropsObj._span < 24 && !selfPropsObj._br },
-                ]"
+                :class="{
+                    'DshCheckbox-group': true,
+                    'DshCheckbox-group-disabled': !canEdit && selfPropsObj._useColor,
+                    'DshCheckbox-group-color': selfPropsObj._useColor,
+                    'DshCheckbox-group-disabled-color': !canEdit && !selfPropsObj._useColor,
+                    'DshCheckbox-group-scroll': selfPropsObj._span < 24 && !selfPropsObj._br,
+                }"
                 v-model="value[controlKey]"
                 @on-change="change"
             >
@@ -77,7 +77,7 @@
             </Select>
         </template>
 
-        <Ctooltip
+        <bri-tooltip
             v-else
             placement="top"
             :transfer="true"
@@ -104,11 +104,11 @@
 
             <div
                 v-else
-                class="control-notext dsh-ellipsis"
+                class="bri-control-nodata dsh-ellipsis"
             >
                 {{ emptyShowVal }}
             </div>
-        </Ctooltip>
+        </bri-tooltip>
 
         <!-- tip项弹框提示 -->
         <dsh-render :render="tipModalRender"></dsh-render>
@@ -191,7 +191,7 @@
                     val.push(item.value);
                 }
 
-                this.change(val, item);
+                this.$emit("change", val);
             },
 
             isDisabled (item) {