视图配置项目整理

o2web/source/x_component_ForumDocument/Vote.js

@@ -73,8 +73,8 @@ MWF.xApplication.ForumDocument.Vote = new Class({
         }
 
         var personStr = "";
-        if( this.data.voteCount ){
-            personStr = "，目前已有"+ this.data.voteCount +"人参与"
+        if( this.data.voteUserCount || this.data.voteCount ){
+            personStr = "，目前已有"+ this.data.voteUserCount || this.data.voteCount +"人参与"
         }else{
             personStr = "，目前还没有人参与"
         }

o2web/source/x_component_process_ViewDesigner/Property.js

@@ -1013,6 +1013,7 @@ MWF.xApplication.process.ViewDesigner.Property.Filter = new Class({
                     this.calendar = new MWF.widget.Calendar(valueInput, {
                         "style": "xform",
                         "isTime": true,
+                        "secondEnable" : true,
                         "target": this.property.designer.content,
                         "format": "%Y-%m-%d %H:%M:%S"
                     });

o2web/source/x_component_process_ViewDesigner/widget/ViewFilter.js

@@ -100,6 +100,7 @@ MWF.xApplication.process.ViewDesigner.widget.ViewFilter = new Class({
             this.calendar = new MWF.widget.Calendar(this.valueDatetimeInput, {
                 "style": "xform",
                 "isTime": true,
+                "secondEnable" : true,
                 "target": this.app.content,
                 "format": "db"
             });

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

@@ -206,6 +206,9 @@
                         <input class="editTableRadio" name="text{$.id}*data.where.scope" text{($.data.where.scope=='all')?'checked':''} type="radio" value="all"/>全部
                     </td>
                 </tr>
+                <tr>
+                    <td class="editTableValue" colspan="2">取应用和流程的并集</td>
+                </tr>
                 <tr>
                     <td class="editTableTitle">选择应用:</td>
                     <td class="editTableValue">
@@ -237,6 +240,9 @@
                         <input class="editTableRadio" name="text{$.id}*data.where.draft" text{(!$.data.where.draft)?'checked':''} type="radio" value="false"/>否
                     </td>
                 </tr>
+                <tr>
+                    <td class="editTableValue" colspan="2">取栏目和分类的并集：</td>
+                </tr>
                 <tr>
                     <td class="editTableTitle">选择栏目:</td>
                     <td class="editTableValue">
@@ -252,6 +258,9 @@
             </table>
         </div>
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+            <tr>
+                <td class="editTableValue" colspan="2">取组织、人员和身份的并集：</td>
+            </tr>
             <tr>
                 <td class="editTableTitle">拟稿组织:</td>
                 <td class="editTableValue">
@@ -277,27 +286,83 @@
         <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
             <tr><td class="editTableTitle">时段类型:</td><td class="editTableValue">
                 <input class="editTableRadio" name="text{$.id}*data.where.dateRange.dateRangeType"
-                       onclick="if (this.checked){ $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_YearArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none'); }"
+                       onclick="if (this.checked){
+                           $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_YearArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_adjust').setStyle('display', 'none');
+                       }"
                        type="radio" text{(['year','season','month','week','date','season'].indexOf($.data.where.dateRange.dateRangeType)==-1)?'checked':''} value="none"/>全部
 
                 <input class="editTableRadio" name="text{$.id}*data.where.dateRange.dateRangeType"
-                       onclick="if (this.checked){ $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_YearArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none'); }"
+                       onclick="if (this.checked){
+                           $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_YearArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_adjust').setStyle('display', 'none');
+                       }"
                        type="radio" text{($.data.where.dateRange.dateRangeType=='range')?'checked':''} value="range"/>范围<br/>
 
                 <input class="editTableRadio" name="text{$.id}*data.where.dateRange.dateRangeType"
-                       onclick="if (this.checked){ $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none'); }"
+                       onclick="if (this.checked){
+                           $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_adjust').setStyle('display', '');
+                       }"
                        type="radio" text{($.data.where.dateRange.dateRangeType=='year')?'checked':''} value="year"/>年度
                 <input class="editTableRadio" name="text{$.id}*data.where.dateRange.dateRangeType"
-                       onclick="if (this.checked){ $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');}"
+                       onclick="if (this.checked){
+                           $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_adjust').setStyle('display', '');
+                       }"
                        type="radio" text{($.data.where.dateRange.dateRangeType=='season')?'checked':''} value="season"/>季度
                 <input class="editTableRadio" name="text{$.id}*data.where.dateRange.dateRangeType"
-                       onclick="if (this.checked){ $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');}"
+                       onclick="if (this.checked){
+                           $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_adjust').setStyle('display', '');
+                       }"
                        type="radio" text{($.data.where.dateRange.dateRangeType=='month')?'checked':''} value="month"/>月度
                 <input class="editTableRadio" name="text{$.id}*data.where.dateRange.dateRangeType"
-                       onclick="if (this.checked){ $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');}"
+                       onclick="if (this.checked){
+                           $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_DateArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_adjust').setStyle('display', '');
+                       }"
                        type="radio" text{($.data.where.dateRange.dateRangeType=='week')?'checked':''} value="week"/>周
                 <input class="editTableRadio" name="text{$.id}*data.where.dateRange.dateRangeType"
-                       onclick="if (this.checked){ $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_DateArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'block'); $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none'); $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');}"
+                       onclick="if (this.checked){
+                           $('text{$.id}dateRangeType_YearArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_DateArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_WeekArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_MonthArea').setStyle('display', 'block');
+                           $('text{$.id}dateRangeType_SeasonArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_RangeArea').setStyle('display', 'none');
+                           $('text{$.id}dateRangeType_adjust').setStyle('display', '');
+                       }"
                        type="radio" text{($.data.where.dateRange.dateRangeType=='date')?'checked':''} value="date"/>日
             </td></tr>
         </table>
@@ -384,14 +449,16 @@
             </table>
         </div>
 
-        <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
-            <tr>
-                <td class="editTableTitle">偏移量:</td>
-                <td class="editTableValue">
-                    <input type="text" name="data.where.dateRange.adjust" value="text{$.data.where.dateRange.adjust}" class="editTableInput"/>
-                </td>
-            </tr>
-        </table>
+        <div id="text{$.id}dateRangeType_adjust" style="display: text{($.data.where.dateRange.dateRangeType=='none'||$.data.where.dateRange.dateRangeType=='range')?'none':''}">
+            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                <tr>
+                    <td class="editTableTitle">偏移量:</td>
+                    <td class="editTableValue">
+                        <input type="text" name="data.where.dateRange.adjust" value="text{$.data.where.dateRange.adjust}" class="editTableInput"/>
+                    </td>
+                </tr>
+            </table>
+        </div>
     </div>
 
     <div title="过滤"  class="MWFTab">

o2web/source/x_component_query_ViewDesigner/Property.js

@@ -1202,6 +1202,7 @@ MWF.xApplication.query.ViewDesigner.Property.Filter = new Class({
                     this.calendar = new MWF.widget.Calendar(valueInput, {
                         "style": "xform",
                         "isTime": true,
+                        "secondEnable": true,
                         "target": this.property.designer.content,
                         "format": "%Y-%m-%d %H:%M:%S"
                     });

o2web/source/x_component_query_ViewDesigner/widget/ViewFilter.js

@@ -95,12 +95,13 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
         this.valueDateInput = inputs[7];
         this.valueTimeInput = inputs[8];
 
-        this.datatypeInput.addEvent("change")
+        this.datatypeInput.addEvent("change");
 
         MWF.require("MWF.widget.Calendar", function(){
             this.calendar = new MWF.widget.Calendar(this.valueDatetimeInput, {
                 "style": "xform",
                 "isTime": true,
+                "secondEnable": true,
                 "target": this.app.content,
                 "format": "db",
                 "onComplate": function(){
@@ -116,6 +117,7 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
             new MWF.widget.Calendar(this.valueTimeInput, {
                 "style": "xform",
                 "timeOnly": true,
+                "secondEnable": true,
                 "target": this.app.content,
                 "format": "%H:%M:%S"
             });
@@ -147,6 +149,7 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 this.calendar = new MWF.widget.Calendar(this.valueDatetimeInput2, {
                     "style": "xform",
                     "isTime": true,
+                    "secondEnable": true,
                     "target": this.app.content,
                     "format": "db",
                     "onComplate": function(){
@@ -162,6 +165,7 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 new MWF.widget.Calendar(this.valueTimeInput2, {
                     "style": "xform",
                     "timeOnly": true,
+                    "secondEnable": true,
                     "target": this.app.content,
                     "format": "%H:%M:%S"
                 });
@@ -279,6 +283,17 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 this.addCustomFilterItem();
             }
         }
+        this.setData({
+            "logic": "and",
+            "path": "",
+            "title": "",
+            "type": "",
+            "comparison": "equals",
+            "formatType": "textValue",
+            "value": "",
+            "otherValue": "",
+            "code": ""
+        });
     },
     modifyFilterItem: function(){
         var data = this.getInputData();
@@ -450,6 +465,7 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 break;
             }
         }
+
         this.titleInput.set("value", data.title);
         this.pathInput.set("value", data.path);
 
@@ -520,7 +536,11 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter = new Class({
                 break;
         }
         this.scriptData = data.code;
-        if (this.scriptArea.editor) this.scriptArea.editor.setValue(this.scriptData.code);
+        if (this.scriptArea && this.scriptArea.editor) this.scriptArea.editor.setValue(this.scriptData.code);
+        this.changeValueInput();
+        if(this.datatypeInput.onchange){
+            this.datatypeInput.onchange();
+        }
     },
 
     deleteItem: function(item){
@@ -572,7 +592,11 @@ MWF.xApplication.query.ViewDesigner.widget.ViewFilter.Item = new Class({
     },
     getText: function(){
         var lp = this.app.lp.filter;
-        return lp[this.data.logic]+" "+this.data.path+" "+lp[this.data.comparison] + " \""+this.data.value+"\""+((this.data.comparison=="range") ? ", \""+this.data.otherValue+"\"" : "");
+        if( this.data.formatType === "numberValue" ){
+            return lp[this.data.logic]+" "+this.data.path+" "+lp[this.data.comparison] + " "+this.data.value+((this.data.comparison=="range") ? ", \""+this.data.otherValue+"\"" : "");
+        }else{
+            return lp[this.data.logic]+" "+this.data.path+" "+lp[this.data.comparison] + " \""+this.data.value+"\""+((this.data.comparison=="range") ? ", \""+this.data.otherValue+"\"" : "");
+        }
     },
     reload: function(data){
         this.data = data;