bri-components 1.2.24 → 1.2.26

package/package.json

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

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/controls/base/BriUpload/BriUpload.vue

@@ -118,21 +118,11 @@
             BriUploadImage,
             uploadList
         },
-        props: {
-            type: {
-                type: String,
-                default: "drag"
-            },
-            maxSize: {
-                type: Number,
-                default: 1024
-            }
-        },
+        props: {},
         data () {
             return {
                 prefixCls: prefixCls,
                 dragOver: false,
-                tempIndex: 1,
 
                 operationMap: {
                     upload: {
@@ -150,6 +140,8 @@
                     _fileType: "file",
                     _showType: this.isFullRow && !this.isInTable ? "old" : "inline", // 宽度为100%、且不在级联表格或内部表格里的 显示老版
                     // _multiple: true,
+                    _useType: "drag",
+                    _maxSize: 1024 * 1024,
                     _format: [],
 
                     ...this.propsObj,
@@ -164,9 +156,15 @@
             showType () {
                 return this.selfPropsObj._showType;
             },
+            useType () {
+                return this.selfPropsObj._useType;
+            },
             format () {
                 return this.selfPropsObj._format;
             },
+            maxSize () {
+                return this.selfPropsObj._maxSize;
+            },
 
             // 限制文件格式
             accept () {
@@ -177,9 +175,9 @@
             classes () {
                 return {
                     [`${prefixCls}`]: true,
-                    [`${prefixCls}-select`]: this.type === "select",
-                    [`${prefixCls}-drag`]: this.type === "drag",
-                    [`${prefixCls}-dragOver`]: this.type === "drag" && this.dragOver,
+                    [`${prefixCls}-select`]: this.useType === "select",
+                    [`${prefixCls}-drag`]: this.useType === "drag",
+                    [`${prefixCls}-dragOver`]: this.useType === "drag" && this.dragOver,
                     [`BriUpload-${this.showType}-wrapper`]: true
                 };
             }
@@ -196,8 +194,8 @@
                 if (data.res === 0) {
                     if (this.multipleMode) {
                         this.curValList = [
-                            ...this.curValList,
-                            data.data
+                            data.data,
+                            ...this.curValList
                         ];
                     } else {
                         this.curValList = [
@@ -234,7 +232,7 @@
 
                     postFiles.forEach(fileItem => {
                         if (
-                            !this.format.every(item => item.toLocaleLowerCase() !== fileItem.name.split(".").pop().toLocaleLowerCase()) &&
+                            (!this.format.length || this.format.some(item => item.toLocaleLowerCase() === fileItem.name.split(".").pop().toLocaleLowerCase())) &&
                             (fileItem.size <= this.maxSize * 1024)
                         ) {
                             this.handlePost(fileItem);

package/src/components/form/DshDefaultSearch.vue

@@ -165,9 +165,9 @@
             getFormItem (formItem) {
                 return {
                     ...this.formatFormItem(formItem),
+
                     _line: true,
-                    _br: formItem._defaultSearchBr,
-                    _wrap: formItem._defaultSearchWrap,
+                    _useColor: false,
 
                     ...(
                         // date、daterange类型的(formItem._type基本不会为daterange)

package/src/components/form/searchMixin.js

@@ -111,6 +111,11 @@ export default {
         getFormItem (formItem) {
             return {
                 ...this.formatFormItem(formItem),
+
+                _line: false,
+                _span: 24,
+                _useColor: true,
+
                 ...(
                     ["default", "rely"].includes(this.mode)
                         ? (
@@ -121,10 +126,7 @@ export default {
                                 : {}
                         )
                         : {}
-                ),
-                _line: false,
-                _span: 24,
-                _useColor: true
+                )
             };
         },
         // 格式化表单配置，适合需要

package/src/components/unit/DshFormUnit.vue

@@ -117,10 +117,10 @@
                     return [];
                 }
             },
-            // 实际最精确值是68px（label:30px, control:32px, 上下padding各: 3px，因为ivu-form-item-content里line-height: 32px导致有问题，故先70px
+            // 实际最精确值是68px（label:30px, control:32px, 上下padding各: 2px 8px，因为ivu-form-item-content里line-height: 32px导致有问题，故先74px
             height: {
                 type: [String, Number],
-                default: "70"
+                default: "74"
             },
             rowStyle: {
                 type: Object,

package/src/styles/components/form/DshForm.less

@@ -1,15 +1,18 @@
 .DshForm {
+    padding-bottom: 5px;
+
     &-item-FormItem {
         margin-bottom: 0px!important;
     }
 
     .ivu-form-item-content {
         line-height: normal;
-    }
-    .ivu-form-item-error-tip {
-        top: 100%;
-        left: 16px;
-        padding-top: 0px;
-        font-size: 12px;
+
+        .ivu-form-item-error-tip {
+            top: calc(100% - 8px);
+            left: 16px;
+            padding-top: 0px;
+            font-size: 12px;
+        }
     }
 }

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

@@ -1,6 +1,6 @@
 .DshFormUnit {
-    margin: 5px 6px;
-    padding: 3px 10px;
+    margin: 3px 6px;
+    padding: 2px 10px 8px;
 
     &-required {
         .DshFormUnit-label-name:before {