视图过滤操作符中增加in

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">

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">

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">

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>

o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js

@@ -252,6 +252,9 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 },
                 "range": {
                     "invalidValue" : ["@person", "@unitList", "@unitAllList", "@identityList" ]
+                },
+                "in" : {
+                    "invalidValue" : ["@person", "@unitList", "@unitAllList", "@identityList" ]
                 }
             },
             "numberValue": {
@@ -261,7 +264,8 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 "greaterThanOrEqualTo": {},
                 "lessThan": {},
                 "lessThanOrEqualTo": {},
-                "range": {}
+                "range": {},
+                "in": {}
             },
             "dateTimeValue": {
                 "equals": {
@@ -284,6 +288,9 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 },
                 "range": {
                     "invalidValue" : ["@year","@season","@month","@time","@date"]
+                },
+                "in": {
+                    "invalidValue" : ["@year","@season","@month","@time","@date"]
                 }
             },
             "dateValue": {
@@ -307,6 +314,9 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 },
                 "range": {
                     "invalidValue" : ["@year","@season","@month","@date"]
+                },
+                "in": {
+                    "invalidValue" : ["@year","@season","@month","@date"]
                 }
             },
             "timeValue": {
@@ -330,6 +340,9 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 },
                 "range": {
                     "invalidValue" : ["@time"]
+                },
+                "in": {
+                    "invalidValue" : ["@time"]
                 }
             },
             "booleanValue": {