bri-components 1.3.35 → 1.3.37

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "bri-components",
-    "version": "1.3.35",
+    "version": "1.3.37",
     "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/list/mixins/quoteListModal.vue

@@ -169,6 +169,7 @@
                         cursor: pointer;
 
                         &-active {
+                            color: #ffffff;
                             background-color: @theme-hover;
                         }
                     }

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

@@ -159,6 +159,10 @@ export default {
                 _isExport: false, // 导出
                 _isQuote: false, // 引用
                 _quoteListFields: [], // 引用列表的显示字段
+                _quoteAdvSearch: {
+                    logic: "and",
+                    conditions: []
+                }, // 引用列表筛选条件
                 ...this.propsObj,
 
                 _contentHeight: this.propsObj._contentHeight || 500 // 表格最大高度
@@ -200,17 +204,20 @@ export default {
         disabledOldDataRow () {
             return this.selfPropsObj._disabledOldDataRow;
         },
+        isImport () {
+            return this.selfPropsObj._isImport;
+        },
+        isExport () {
+            return this.selfPropsObj._isExport;
+        },
         isQuote () {
             return this.selfPropsObj._isQuote;
         },
         quoteListFields () {
             return this.selfPropsObj._quoteListFields;
         },
-        isImport () {
-            return this.selfPropsObj._isImport;
-        },
-        isExport () {
-            return this.selfPropsObj._isExport;
+        quoteAdvSearch () {
+            return this.$transformAdvSearch(this.selfPropsObj._quoteAdvSearch, this.parentFormList, this.parentObj);
         },
 
         modalPropsObj () {
@@ -232,7 +239,8 @@ export default {
                             fieldKey: "_id",
                             fieldOperator: "ne",
                             fieldValue: [this.parentDataId]
-                        }
+                        },
+                        this.quoteAdvSearch
                     ]
                 }
             };

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

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