bri-components 1.3.30 → 1.3.32

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.30",
+    "version": "1.3.32",
     "author": "dengshanghui",
     "description": "a component lib for vue project",
     "main": "src/index.js",

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

@@ -77,11 +77,11 @@
         <!-- 编辑和查看 列表 -->
         <slot name="list">
             <upload-list
+                :showMode="showMode"
                 :canEdit="finalCanEdit"
                 :files="curValList"
-                :emptyShowVal="emptyShowVal"
-                :showMode="showMode"
                 :propsObj="propsObj"
+                :emptyShowVal="emptyShowVal"
                 @deleteItem="clickDeteItem"
             ></upload-list>
         </slot>
@@ -370,16 +370,6 @@
                         height: 80px;
                     }
                 }
-
-                &-inline {
-                    .bri-scrollbar6();
-                    height: 48px;
-                    line-height: 48px;
-
-                    .item {
-                        flex: 0 0 48px
-                    }
-                }
             }
         }
 

package/src/components/controls/base/BriUpload/uploadList.vue

@@ -1,8 +1,8 @@
 <template>
-    <div
-        class="uploadList"
-        :class="`uploadList-${showMode}`"
-    >
+    <div :class="{
+        uploadList: true,
+        [`uploadList-${showMode}`]: true
+    }">
         <!-- 普通文本模式 -->
         <template v-if="showMode ==='old'">
             <!-- 有值 -->
@@ -50,7 +50,7 @@
                 class="uploadList-nodata"
             >
                 <Icon type="ios-time" />
-                <span>{{ noText }}</span>
+                <span>{{ noDataText }}</span>
             </div>
         </template>
 
@@ -93,7 +93,7 @@
                 v-else
                 class="uploadList-inline-nodata"
             >
-                {{ noText }}
+                {{ noDataText }}
             </span>
         </template>
     </div>
@@ -106,6 +106,10 @@
     export default {
         name: "uploadList",
         props: {
+            showMode: {
+                type: String,
+                default: "old" // inline, old, normal
+            },
             canEdit: {
                 type: Boolean,
                 default: true
@@ -116,23 +120,19 @@
                     return [];
                 }
             },
-            showMode: {
-                type: String,
-                default: "old" // inline, old, normal
-            },
-            emptyShowVal: String,
             propsObj: {
                 type: Object,
                 default () {
                     return {};
                 }
-            }
+            },
+            emptyShowVal: String
         },
         computed: {
             imageResizeConfig () {
                 return {};
             },
-            noText () {
+            noDataText () {
                 return this.canEdit
                     ? `未上传${this.propsObj._fileType === "image" ? "图片" : "文件"}`
                     : this.emptyShowVal;
@@ -334,13 +334,13 @@
                 }
 
                 &-action {
-                    background-color: @placeholderColor;
-                    display: none !important;
                     position: absolute;
                     right: 0px;
                     top: 0px;
                     left: 0px;
                     bottom: 0px;
+                    background-color: @placeholderColor;
+                    display: none !important;
                     align-items: center;
                     justify-content: center;
 
@@ -349,7 +349,6 @@
                         height: 22px;
                         line-height: 22px;
                         color: #fff;
-                        margin-left: 2px;
                     }
                 }
             }
@@ -357,31 +356,25 @@
 
         // 内部表格inline模式
         &-inline {
-            height: 30px;
-            line-height: 30px;
+            height: 32px;
+            line-height: 32px;
 
             &-list {
                 width: 100%;
                 height: 100%;
+                padding-left: 3px;
                 display: flex;
                 flex-wrap: nowrap;
                 overflow-x: auto;
                 overflow-y: hidden;
-                padding-left: 3px;
 
                 .item {
-                    flex: 0 0 48px;
-                    background: #f4f5fa;
+                    flex: 0 0 32px;
                     margin-right: 3px;
-                    position: relative;
                     border-radius: @borderRadius;
+                    background: #f4f5fa;
                     text-align: center;
-                    &:hover {
-                        .item-action {
-                            display: flex !important;
-                            animation: toTop 0.1s;
-                        }
-                    }
+                    position: relative;
 
                     img {
                         max-width: 100%;
@@ -390,18 +383,22 @@
                     }
 
                     &-action {
-                        display: none !important;
                         position: absolute;
                         left: 0;
                         right: 0;
                         top: 0;
                         bottom: 0;
+                        display: none !important;
                         background-color: @placeholderColor;
                         color: #fff;
                         align-items: center;
                         justify-content: center;
-                        i {
-                            margin: 0px;
+
+                        &-icon {
+                            width: 18px;
+                            height: 18px;
+                            line-height: 18px;
+                            color: #fff;
                         }
                     }
 
@@ -414,6 +411,13 @@
                             top: 0;
                         }
                     }
+
+                    &:hover {
+                        .item-action {
+                            display: flex !important;
+                            animation: toTop 0.1s;
+                        }
+                    }
                 }
             }
 

package/src/components/controls/senior/cascaderTable.vue

@@ -28,6 +28,7 @@
                         :parentObj="value"
                         @change="change"
                     ></dsh-tree-table>
+
                     <dsh-cascader-table
                         v-else
                         :canEdit="finalCanEdit"
@@ -44,72 +45,33 @@
 
             <!-- 正常使用 -->
             <template v-else>
-                <!-- 操作按钮 -->
-                <dsh-buttons
-                    class="cascaderTable-btns"
-                    itemClass="cascaderTable-btns-item"
-                    :list="$getOperationList(operationBtns)"
-                    @click="$dispatchEvent($event)"
-                ></dsh-buttons>
-
-                <template>
-                    <dsh-tree-table
-                        v-if="showMode === 'treeTable'"
-                        ref="table"
-                        :canEdit="finalCanEdit"
-                        :data="curVal.tree"
-                        :rowDefault="curVal.rowDefault"
-                        :columns="subForm"
-                        :propsObj="propsObj"
-                        :parentFormList="allFormList"
-                        :parentObj="value"
-                        @change="change"
-                    ></dsh-tree-table>
-                    <dsh-cascader-table
-                        v-else
-                        ref="table"
-                        :canEdit="finalCanEdit"
-                        :data="curVal"
-                        :treeColumns="treeForm"
-                        :subColumns="subForm"
-                        :propsObj="propsObj"
-                        :parentFormList="allFormList"
-                        :parentObj="value"
-                        @change="change"
-                    ></dsh-cascader-table>
-                </template>
-
-                <!-- 全屏查看 -->
-                <dsh-modal
-                    v-model="isEnlarge"
-                    mode="custom"
-                    :propsObj="modalPropsObj"
-                >
-                    <template>
-                        <dsh-tree-table
-                            v-if="showMode === 'treeTable'"
-                            :canEdit="finalCanEdit"
-                            :data="curVal.tree"
-                            :rowDefault="curVal.rowDefault"
-                            :columns="subForm"
-                            :propsObj="propsObj"
-                            :parentFormList="allFormList"
-                            :parentObj="value"
-                            @change="change"
-                        ></dsh-tree-table>
-                        <dsh-cascader-table
-                            v-else
-                            :canEdit="finalCanEdit"
-                            :data="curVal"
-                            :treeColumns="treeForm"
-                            :subColumns="subForm"
-                            :propsObj="propsObj"
-                            :parentFormList="allFormList"
-                            :parentObj="value"
-                            @change="change"
-                        ></dsh-cascader-table>
-                    </template>
-                </dsh-modal>
+                <!-- 层级表 -->
+                <dsh-tree-table
+                    v-if="showMode === 'treeTable'"
+                    ref="table"
+                    :canEdit="finalCanEdit"
+                    :data="curVal.tree"
+                    :rowDefault="curVal.rowDefault"
+                    :columns="subForm"
+                    :propsObj="propsObj"
+                    :parentFormList="allFormList"
+                    :parentObj="value"
+                    @change="change"
+                ></dsh-tree-table>
+
+                <!-- 级联表 -->
+                <dsh-cascader-table
+                    v-else
+                    ref="table"
+                    :canEdit="finalCanEdit"
+                    :data="curVal"
+                    :treeColumns="treeForm"
+                    :subColumns="subForm"
+                    :propsObj="propsObj"
+                    :parentFormList="allFormList"
+                    :parentObj="value"
+                    @change="change"
+                ></dsh-cascader-table>
             </template>
         </template>
     </div>
@@ -133,29 +95,7 @@
         },
         props: {},
         data () {
-            return {
-                isEnlarge: false,
-                timer: null,
-
-                operationMap: {
-                    canExport: {
-                        name: "导出",
-                        type: "canExport",
-                        icon: "md-share-alt",
-                        size: "small",
-                        btnType: "text",
-                        event: "clickExport"
-                    },
-                    canEnlarge: {
-                        name: "全屏展示",
-                        type: "canEnlarge",
-                        icon: "md-expand",
-                        size: "small",
-                        btnType: "text",
-                        event: "clickEnlarge"
-                    }
-                }
-            };
+            return {};
         },
         computed: {
             selfPropsObj () {
@@ -163,7 +103,6 @@
                     _showMode: "default", // "default", "treeTable"
                     _subForm: [],
                     _treeForm: [],
-                    _isExport: false,
                     ...this.propsObj
                 };
             },
@@ -179,23 +118,6 @@
                     ? this.curVal._treeForm
                     : this.propsObj._treeForm;
             },
-            isExport () {
-                return this.propsObj._isExport;
-            },
-
-            operationBtns () {
-                return this.isExport
-                    ? ["canExport", "canEnlarge"]
-                    : ["canEnlarge"];
-            },
-            modalPropsObj () {
-                return {
-                    title: this.controlName,
-                    fullscreen: true,
-                    showSlotClose: false,
-                    closable: true
-                };
-            },
 
             showVal () {
                 return `${this.curVal ? this.$getTreeLeafTotal(this.curVal.tree) : 0} 行`;
@@ -208,66 +130,9 @@
                 return this.$refs.table.validate();
             },
 
-            // 点击导出
-            clickExport (operationItem) {
-                operationItem.disabled = true;
-                this.handleExport(operationItem);
-            },
-            // 打开全屏模态框
-            clickEnlarge () {
-                this.isEnlarge = true;
-            },
             // 发生变动
             change (...params) {
                 this.$emit("change", ...params);
-            },
-
-            // 接口 -导出级联表
-            handleExport (operationItem) {
-                this.$https({
-                    url: {
-                        module: "sheet",
-                        name: "exportCascaderTableExcel"
-                    },
-                    params: {
-                        _key: this.controlKey,
-                        _id: this.value._id
-                    },
-                    callback: data => {
-                        this.timer = setInterval(() => {
-                            this.getJobStatusData(operationItem, data.jobId, data.excel_url);
-                        }, 1000);
-                    }
-                });
-            },
-            // 接口 -
-            getJobStatusData (operationItem, id, url) {
-                this.$https({
-                    url: {
-                        module: "sheet",
-                        name: "getJobStatus"
-                    },
-                    params: {
-                        jobId: id
-                    },
-                    callback: data => {
-                        operationItem.disabled = false;
-
-                        if (data.status === "completed") {
-                            clearInterval(this.timer);
-                            window.location.href = data.url;
-                        } else if (data.status === "failed") {
-                            clearInterval(this.timer);
-                            this.$Message.info({
-                                content: "操作失败，请稍后再试"
-                            });
-                        }
-                    },
-                    error: data => {
-                        operationItem.disabled = false;
-                        this.timer = null;
-                    }
-                });
             }
         }
     };
@@ -282,14 +147,5 @@
 
             }
         }
-
-        &-btns {
-            text-align: right;
-            color: @textColor;
-
-            &-item {
-
-            }
-        }
     }
 </style>