bri-components 1.2.25 → 1.2.27

package/package.json

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

package/src/abolish/DshFileShow.vue

@@ -1,137 +0,0 @@
-<template>
-    <div class="DshFileShow">
-        <!-- image类型 -->
-        <img
-            v-for="item in list"
-            :key="item._id"
-            class="DshFileShow-img"
-            :style="{
-                cursor: isClick ? 'pointer' : 'auto'
-            }"
-            :src="getFileImage(item)"
-            :title="item.name"
-            :alt="item.name"
-            :width="width"
-            :height="height"
-            @click.stop="clickFile(item)"
-        >
-
-        <!-- 预览 -->
-        <div
-            :class="{
-                'DshFileShow-wrap': true,
-                'DshFileShow-wrap-show': showModal
-            }"
-            @click.stop="closeModal()"
-        >
-            <div
-                class="DshFileShow-wrap-preview"
-                :style="{
-                    backgroundImage: `url(${curFile.url})`
-                }"
-            ></div>
-        </div>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: "DshFileShow",
-        props: {
-            list: {
-                type: Array,
-                default () {
-                    return [];
-                }
-            },
-
-            width: {
-                type: Number,
-                default: 24
-            },
-            height: {
-                type: Number,
-                default: 28
-            },
-            isClick: {
-                type: Boolean,
-                default: true
-            }
-        },
-        data () {
-            return {
-                showModal: false,
-                curFile: {}
-            };
-        },
-        created () {},
-        methods: {
-            closeModal () {
-                this.showModal = false;
-            },
-
-            // 获取不同类型文件的图片
-            getFileImage (item) {
-                const imageMap = this.$imageSrcMap.fileType;
-
-                if (!item.mimetype) {
-                    return imageMap.other;
-                } else if (item.mimetype.indexOf("image") > -1) {
-                    return item.url; // 压缩图片：将图片最长的边限制在100像素，短边按比例处理
-                } else if (item.mimetype.indexOf("text/plain") > -1) {
-                    return imageMap.text;
-                } else if (item.mimetype.indexOf("application/pdf") > -1) {
-                    return imageMap.pdf;
-                } else if (item.mimetype.indexOf("wordprocessingml.document") > -1 || item.mimetype.indexOf("application/msword") > -1) {
-                    return imageMap.doc;
-                } else if (item.mimetype.indexOf("presentationml.presentation") > -1 || item.mimetype.indexOf("application/vnd.ms-powerpoint") > -1) {
-                    return imageMap.ppt;
-                } else if (item.mimetype.indexOf("spreadsheetml.sheet") > -1) {
-                    return imageMap.excel;
-                } else if (item.mimetype.indexOf("application/x-zip-compressed") > -1) {
-                    return imageMap.zip;
-                } else if (item.mimetype.indexOf("application/x-rar-compressed") > -1) {
-                    return imageMap.rar;
-                } else {
-                    return imageMap.other;
-                }
-            },
-            // 点击文件，跳转对应地址
-            clickFile (item) {
-                if (this.isClick) {
-                    if (item.mimetype.indexOf("image/") > -1) {
-                        this.showModal = true;
-                        this.curFile = item;
-                    } else if (item.mimetype === "application/pdf") {
-                        window.open(item.url);
-                        // window.open(item.url + "?response-content-type=application/octet-stream");
-                    } else {
-                        window.open(item.url);
-                        // 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();
-            //             }
-            //     });
-            // }
-        }
-    };
-</script>

package/src/abolish/DshFlatTable.vue

@@ -326,7 +326,7 @@
                             : []
                     ),
 
-                    ...this.columns.filter(colItem => colItem._displayType !== "hide" && this.$isAdvRelyShow(colItem, this.outObj)),
+                    ...this.columns.filter(colItem => this.$isAdvRelyShow(colItem, this.outObj)),
 
                     ...(
                         this.canEdit && operationList.length

package/src/components/Error/Error403.vue

@@ -4,7 +4,9 @@
             <Card class="error-body-card">
                 <div class="error-body-title">
                     <span>4</span><!--
-                    --><span class="span-403-0"><Icon type="md-lock" /></span><!--
+                    --><span class="span-403-0">
+                        <Icon type="md-lock" />
+                    </span><!--
                     --><span class="span-403-3">3</span>
                 </div>
                 <p class="error-body-message">很抱歉，您没有该页面的访问权限！</p>
@@ -25,6 +27,12 @@
         components: {
             errorBack
         },
+        props: {},
+        data () {
+            return {};
+        },
+        computed: {},
+        created () {},
         methods: {}
     };
 </script>

package/src/components/Error/Error404.vue

@@ -25,6 +25,12 @@
         components: {
             errorBack
         },
+        props: {},
+        data () {
+            return {};
+        },
+        computed: {},
+        created () {},
         methods: {}
     };
 </script>

package/src/components/Error/Error500.vue

@@ -4,11 +4,15 @@
             <Card class="error-body-card">
                 <div class="error-body-title">
                     <span>5</span><!--
-                    --><span class="span-500-0"><Icon type="logo-freebsd-devil" /></span><!--
-                    --><span class="span-500-0"><Icon type="logo-freebsd-devil" /></span>
+                    --><span class="span-500-0">
+                        <Icon type="logo-freebsd-devil" />
+                    </span><!--
+                    --><span class="span-500-0">
+                        <Icon type="logo-freebsd-devil" />
+                    </span>
                 </div>
-                <p class="error-body-message">抱歉，服务器发生错误！</p>
-                <p class="error-body-message">I'm sorry, the server is wrong!</p>
+                <p class="error-body-message">{{ msg }}</p>
+                <p class="error-body-message">The server is wrong!</p>
 
                 <!-- 返回按钮组件 -->
                 <error-back></error-back>
@@ -25,6 +29,19 @@
         components: {
             errorBack
         },
+        props: {},
+        data () {
+            return {};
+        },
+        computed: {
+            queryMsg () {
+                return this.$route.query.msg;
+            },
+            msg () {
+                return `${this.queryMsg ? `服务器错误：${this.queryMsg}` : "抱歉，服务器错误"}！`;
+            }
+        },
+        created () {},
         methods: {}
     };
 </script>

package/src/components/Error/errorBack.vue

@@ -17,10 +17,12 @@
         data () {
             return {};
         },
+        computed: {},
+        created () {},
         methods: {
             goHome () {
                 this.$router.push({
-                    name: "home"
+                    path: "/"
                 });
             },
             backPage () {

package/src/components/list/BriFlatTable.vue

@@ -151,7 +151,7 @@
                 return !!this.oldListData.length;
             },
             filterColumns () {
-                return this.columns.filter(colItem => colItem._displayType !== "hide" && this.$isAdvRelyShow(colItem, this.outObj));
+                return this.columns.filter(colItem => this.$isAdvRelyShow(colItem, this.outObj));
             },
             showColumns () {
                 const operationList = this.$getOperationList(["delete"]);

package/src/components/unit/DshFormUnit.vue

@@ -5,6 +5,7 @@
                 'DshFormUnit': true,
                 'DshFormUnit-required': canEdit && formItem._required,
                 'DshFormUnit-line': formItem._line,
+                'DshFormUnit-readOnly': !canEdit
             },
             formControlClass,
             formItem.formControlClass

package/src/styles/components/unit/DshFormUnit.less

@@ -45,9 +45,11 @@
             &-edit {
                 color: @textColor;
             }
+
             &-show {
                 color: @contentColor;
             }
+
             &-sign {
                 #dsh-sign-change();
             }
@@ -100,4 +102,8 @@
             align-items: center;
         }
     }
+
+    &-readOnly {
+        border-bottom: 1px solid #E5E5E5;
+    }
 }