Merge branch 'fix/View.add_in_comparison' into 'wrdp'

Merge of fix/View.add_in_comparison 视图过滤中增加in操作符 to wrdp

See merge request o2oa/o2oa!2111

o2web/source/x_component_portal_PageDesigner/Module/View/view.html

@@ -171,6 +171,7 @@
 							<option value="like">匹配(like)</option>
 							<option value="notLike">不匹配(not-like)</option>
 							<option value="range">范围(range)</option>
+							<option value="in">包含(in)</option>
 						</select></td>
 					</tr>
 					<tr style="display:none">
@@ -185,6 +186,7 @@
 								<option value="true" selected>是(True)</option>
 								<option value="false">否(False)</option>
 							</select>
+							<div class="multiValueNotice_vf" style="display: none;color: #999;line-height: 24px;">多值用半角逗号(,)隔开</div>
 						</td>
 					</tr>
 				</table>

o2web/source/x_component_process_FormDesigner/Module/View/view.html

@@ -232,6 +232,7 @@
 							<option value="like">匹配(like)</option>
 							<option value="notLike">不匹配(not-like)</option>
 							<option value="range">范围(range)</option>
+							<option value="in">包含(in)</option>
 						</select></td>
 					</tr>
 					<tr style="display:none">
@@ -246,6 +247,7 @@
 								<option value="true" selected>是(True)</option>
 								<option value="false">否(False)</option>
 							</select>
+							<div class="multiValueNotice_vf" style="display: none;color: #999;line-height: 24px;">多值用半角逗号(,)隔开</div>
 						</td>
 					</tr>
 				</table>

o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html

@@ -160,6 +160,7 @@
                             <option value="like">匹配(like)</option>
                             <option value="notLike">不匹配(not-like)</option>
                             <option value="range">范围(range)</option>
+                            <option value="in">包含(in)</option>
                         </select></td>
                     </tr>
                     <tr style="display:none">
@@ -174,6 +175,7 @@
                                 <option value="true" selected>是(True)</option>
                                 <option value="false">否(False)</option>
                             </select>
+                            <div class="multiValueNotice_vf" style="display: none;color: #999;line-height: 24px;">多值用半角逗号(,)隔开</div>
                         </td>
                     </tr>
                 </table>

o2web/source/x_component_process_ViewDesigner/$View/view.html

@@ -317,6 +317,7 @@
                                 <option value="true" selected>是(True)</option>
                                 <option value="false">否(False)</option>
                             </select>
+                            <div class="multiValueNotice_vf" style="display: none;color: #999;line-height: 24px;">多值用半角逗号(,)隔开</div>
                         </td>
                     </tr>
                 </table>

o2web/source/x_component_query_ViewDesigner/$View/view.html

@@ -571,6 +571,7 @@
                                 <option value="like">匹配(like)</option>
                                 <option value="notLike">不匹配(not-like)</option>
                                 <option value="range">范围(range)</option>
+                                <option value="in">包含(in)</option>
                             </select></td>
                         </tr>
                         <tr>
@@ -585,6 +586,7 @@
                                     <option value="true" selected>是(True)</option>
                                     <option value="false">否(False)</option>
                                 </select>
+                                <div class="multiValueNotice_vf" style="display: none;color: #999;line-height: 24px;">多值用半角逗号(,)隔开</div>
                             </td>
                         </tr>
 

o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js

@@ -101,6 +101,8 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
             this.createScriptArea(scriptValueArea);
         }
 
+        this.multiValueNoticeNode = this.inputAreaNode.getElement(".multiValueNotice_vf");
+
         this.titleInput = this.inputAreaNode.getElement(".titleInput_vf");
         this.pathInput = this.inputAreaNode.getElement(".pathInput_vf");
         this.datatypeInput = this.inputAreaNode.getElement(".datatypeInput_vf");
@@ -252,6 +254,9 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 },
                 "range": {
                     "invalidValue" : ["@person", "@unitList", "@unitAllList", "@identityList" ]
+                },
+                "in" : {
+                    "invalidValue" : ["@person", "@unitList", "@unitAllList", "@identityList" ]
                 }
             },
             "numberValue": {
@@ -354,6 +359,11 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
         var options = this.comparisonInput.options;
 
         var comparison = options[this.comparisonInput.selectedIndex].value;
+        if( availableComparisonList.contains( "in" ) && comparison === "in" ){
+            if(this.multiValueNoticeNode)this.multiValueNoticeNode.show()
+        }else{
+            if(this.multiValueNoticeNode)this.multiValueNoticeNode.hide()
+        }
 
         if( !this.originalComparisonOptions ){
             this.originalComparisonOptions = [];