bri-components 1.3.34 → 1.3.36

package/package.json

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

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

@@ -323,14 +323,14 @@
         &-new,
         &-inline {
             &-wrapper {
-                min-width: 30px;
-                height: 30px;
-                line-height: 30px;
+                min-width: 32px;
+                height: 32px;
+                line-height: 32px;
                 background-color: @border-readonly;
             }
 
             &-add {
-                height: 30px;
+                height: 32px;
                 border: none;
                 border-radius: 0px;
                 background-color: @btn-hover;

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

@@ -393,12 +393,13 @@
                         color: #fff;
                         align-items: center;
                         justify-content: center;
+                        flex-wrap: wrap;
 
                         &-icon {
-                            width: 18px;
-                            height: 18px;
-                            line-height: 18px;
-                            color: #fff;
+                            width: 16px;
+                            height: 16px;
+                            font-size: 16px !important;
+                            margin: 0px;
                         }
                     }
 

package/src/components/controls/mixins/controlMixin.js

@@ -229,6 +229,9 @@ export default {
         screenKey () {
             return this.propsObj.screenKey;
         },
+        allScreenKey () {
+            return this.propsObj.allScreenKey;
+        },
 
         /* 移动端在用 */
         // 只做校验而隐藏的的field框，所用的propsObj

package/src/components/list/DshTreeTable.vue

@@ -525,6 +525,7 @@
 <style lang="less" scoped>
     .DshTreeTable {
         &-top {
+            margin-bottom: 3px;
             display: flex;
             flex-direction: row;
             justify-content: space-between;

package/src/components/list/mixins/tableBaseMixin.js

@@ -138,6 +138,9 @@ export default {
         screenKey () {
             return this.propsObj.screenKey;
         },
+        allScreenKey () {
+            return this.propsObj.allScreenKey;
+        },
         commonPropsObj () {
             return {
                 // isShare: false, // 是否是分享页在用
@@ -220,7 +223,7 @@ export default {
         },
         quoteParams () {
             return {
-                screenKey: this.screenKey,
+                screenKey: this.allScreenKey,
                 fields: [...this.quoteListFields, this.controlKey, "createdAt"],
                 advSearch: {
                     logic: "and",

package/src/styles/components/small/DshModal.less

@@ -15,7 +15,8 @@
     &-default,
     &-small,
     &-middle,
-    &-large {
+    &-large,
+    &-custom {
         .ivu-modal-wrap {
             .ivu-modal {
                 margin: auto;