Parcourir la source

视图过滤中增加in操作符

unknown il y a 5 ans
Parent
commit
4170c58ef4

+ 1 - 0
o2web/source/x_component_portal_PageDesigner/Module/View/view.html

@@ -186,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>

+ 1 - 0
o2web/source/x_component_process_FormDesigner/Module/View/view.html

@@ -247,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>

+ 1 - 0
o2web/source/x_component_process_FormDesigner/Module/ViewSelector/ViewSelector.html

@@ -175,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>

+ 1 - 0
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>

+ 1 - 0
o2web/source/x_component_query_ViewDesigner/$View/view.html

@@ -586,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>
 

+ 8 - 11
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");
@@ -264,8 +266,7 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 "greaterThanOrEqualTo": {},
                 "lessThan": {},
                 "lessThanOrEqualTo": {},
-                "range": {},
-                "in": {}
+                "range": {}
             },
             "dateTimeValue": {
                 "equals": {
@@ -288,9 +289,6 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 },
                 "range": {
                     "invalidValue" : ["@year","@season","@month","@time","@date"]
-                },
-                "in": {
-                    "invalidValue" : ["@year","@season","@month","@time","@date"]
                 }
             },
             "dateValue": {
@@ -314,9 +312,6 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 },
                 "range": {
                     "invalidValue" : ["@year","@season","@month","@date"]
-                },
-                "in": {
-                    "invalidValue" : ["@year","@season","@month","@date"]
                 }
             },
             "timeValue": {
@@ -340,9 +335,6 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 },
                 "range": {
                     "invalidValue" : ["@time"]
-                },
-                "in": {
-                    "invalidValue" : ["@time"]
                 }
             },
             "booleanValue": {
@@ -367,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 = [];