Merge pull request #4345 from yangyy/v3.2.x_fix

修复动态分组保存multilike值不为数组的问题
TencentBlueKing · Jun 23, 2020 · cc96241 · cc96241
2 parents acddb85 + c5b6a25
commit cc96241
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/src/ui/src/views/custom-query/define.vue b/src/ui/src/views/custom-query/define.vue
@@ -21,7 +21,7 @@
                 <label class="userapi-label">
                     {{$t("CustomQuery['查询名称']")}}<span class="color-danger"> * </span>
                 </label>
-                <input type="text" class="cmdb-form-input" 
+                <input type="text" class="cmdb-form-input"
                 v-model.trim="name"
                 :name="$t('CustomQuery[\'查询名称\']')"
                 :disabled="!authority.includes('update')"
@@ -144,9 +144,9 @@
                 </bk-button>
             </div>
         </div>
-        <v-preview ref="preview" 
-            v-if="isPreviewShow" 
-            :apiParams="apiParams" 
+        <v-preview ref="preview"
+            v-if="isPreviewShow"
+            :apiParams="apiParams"
             :attribute="object"
             :tableHeader="attribute.selected"
             @close="isPreviewShow = false">
@@ -332,6 +332,12 @@
                             operator: property.operator,
                             value: property.value === 'true'
                         })
+                    } else if (property.operator === '$multilike') {
+                        param.condition.push({
+                            field: property.propertyId,
+                            operator: property.operator,
+                            value: property.value.split('\n').filter(str => str.trim().length).map(str => str.trim())
+                        })
                     } else {
                         let operator = property.operator
                         let value = property.value