bri-components 1.3.2 → 1.3.4

package/package.json

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

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

@@ -40,7 +40,7 @@
             >
 
             <slot>
-                <div :class="`BriUpload-${showType}-imageadd`">
+                <div :class="`BriUpload-${showType}-add`">
                     <!-- 上传 -->
                     <i-circle
                         v-if="percent"
@@ -270,7 +270,7 @@
                 }
             }
 
-            &-imageadd {
+            &-add {
                 .dsh-flex-col-center-center();
                 width: 120px;
                 height: 120px;
@@ -287,12 +287,13 @@
 
             &-circle {
                 position: absolute;
-                top: 50%;
-                left: 50%;
+                top: 0;
+                left: 0;
+                bottom: 0;
+                right: 0;
+                margin: auto;
                 width: 50px !important;
                 height: 50px !important;
-                margin-top: -25px;
-                margin-left: -25px;
                 border-radius: 50%;
                 background-color: @inputBg-readonly;
 
@@ -319,7 +320,7 @@
                 }
             }
 
-            &-imageadd {
+            &-add {
                 .dsh-flex-row-center-center();
                 height: 30px;
                 background-color: @btn-hover;

package/src/components/form/searchMixin.js

@@ -191,7 +191,11 @@ export default {
                     const parameterTypeName = (this.parameterPropsObj._data.find(parameterTypeItem => parameterTypeItem._key === parameterType) || { name: `${parameterType}不存在` }).name;
 
                     const operators = fieldData[!dynamicList.length && ["set"].includes(this.mode) ? "operatorsSet" : "operators"] || fieldData.operators || [];
-                    const fieldOperator = initContion.fieldOperator || (["reference"].includes(fieldType) ? "eq" : (operators[0] || {})._key);
+                    const fieldOperator = initContion.fieldOperator || (
+                        ["reference"].includes(fieldType) && !["set"].includes(this.mode)
+                            ? "eq"
+                            : (operators[0] || {})._key
+                    );
                     const fieldOperatorName = (operators.find(operatorItem => operatorItem._key === fieldOperator) || { name: `${fieldOperator}不存在` }).name;
 
                     return {
@@ -341,7 +345,7 @@ export default {
                                             : item[key]
                                 )
                                 : item[key]
-                    }), {})
+                        }), {})
                 );
             };