查询中增加视图

o2web/source/x_component_query_StatementDesigner/$Statement/view.html

@@ -104,16 +104,48 @@
                         <td class="editTableTitle">标题:</td>
                         <td class="editTableValue"><input type="text" class="editTableInput titleInput_vf"/></td>
                     </tr>
-                    <tr>
+                    <tr id="text{$.id}parameterInputTr" style="display: none">
+                        <td class="editTableTitle">参数:</td>
+                        <td class="editTableValue">
+                            <input type="text" class="editTableInput parameterInput_vf"/>
+                            <div style="line-height: 20px;color:#999;">注：参数对应查询语句和总数语句中对应的where条件，形如":filed"</div>
+                        </td>
+                    </tr>
+                    <tr id="text{$.id}pathInputTr">
                         <td class="editTableTitle">路径:</td>
                         <td class="editTableValue">
                             <input type="text" class="editTableInput pathInput_vf"/>
-                            <div style="line-height: 20px;color:#999;">注：路径的写法是表别名.字段名，如：o.title</div>
+                            <div style="line-height: 20px;color:#999;">注：路径的写法是"表别名.字段名"，如：o.title</div>
                         </td>
                     </tr>
                     <tr>
                         <td class="editTableTitle">数据类型:</td>
                         <td class="editTableValue"><select class="datatypeInput_vf">
+<!--                                 onchange="if (this.selectedIndex==2){-->
+<!--                                    $('text{$.id}viewFilterDateFormulaSelector').setStyle('display', 'block');-->
+<!--                                    $('text{$.id}viewFilterDateOnlyFormulaSelector').setStyle('display', 'none');-->
+<!--                                    $('text{$.id}viewFilterTimeOnlyFormulaSelector').setStyle('display', 'none');-->
+<!--                                   }else if (this.selectedIndex==3){-->
+<!--                                    $('text{$.id}viewFilterDateFormulaSelector').setStyle('display', 'none');-->
+<!--                                    $('text{$.id}viewFilterDateOnlyFormulaSelector').setStyle('display', 'block');-->
+<!--                                    $('text{$.id}viewFilterTimeOnlyFormulaSelector').setStyle('display', 'none');-->
+
+<!--                                }else if (this.selectedIndex==4){-->
+<!--                                    $('text{$.id}viewFilterDateFormulaSelector').setStyle('display', 'none');-->
+<!--                                    $('text{$.id}viewFilterDateOnlyFormulaSelector').setStyle('display', 'none');-->
+<!--                                    $('text{$.id}viewFilterTimeOnlyFormulaSelector').setStyle('display', 'block');-->
+<!--                                }else{-->
+<!--                                    $('text{$.id}viewFilterDateFormulaSelector').setStyle('display', 'none');-->
+<!--                                    $('text{$.id}viewFilterDateOnlyFormulaSelector').setStyle('display', 'none');-->
+<!--                                    $('text{$.id}viewFilterTimeOnlyFormulaSelector').setStyle('display', 'none');-->
+<!--                                }-->
+
+<!--                                if (this.selectedIndex==0){-->
+<!--                                    $('text{$.id}viewFilterTextFormulaSelector').setStyle('display', 'block');-->
+<!--                                }else{-->
+<!--                                    $('text{$.id}viewFilterTextFormulaSelector').setStyle('display', 'none');-->
+<!--                                }">-->
+
                             <option value="textValue" selected>文本</option>
                             <option value="numberValue">数字</option>
                             <option value="dateTimeValue">日期时间</option>
@@ -122,20 +154,123 @@
                             <option value="booleanValue">布尔</option>
                         </select></td>
                     </tr>
-<!--                    <tr>-->
-<!--                        <td class="editTableTitle"></td>-->
-<!--                        <td class="editTableValue">-->
-<!--                            <input type="radio" class="restrictFilterInput_vf" value="restrict" name="text{$.id}viewFilterType" onclick="if (this.checked){-->
-<!--                                $('text{$.id}viewFilterRestrict').setStyle('display', 'block');-->
-<!--                                $('text{$.id}viewCustomFilterRestrict').setStyle('display', 'none');-->
-<!--                            }"/>作为默认过滤条件<br>-->
-<!--                            <input type="radio" class="customFilterInput_vf" value="custom" name="text{$.id}viewFilterType" onclick="if (this.checked){-->
-<!--                                $('text{$.id}viewFilterRestrict').setStyle('display', 'none');-->
-<!--                                $('text{$.id}viewCustomFilterRestrict').setStyle('display', 'block');-->
-<!--                            }" checked/>作为自定义过滤数据-->
-<!--                        </td>-->
-<!--                    </tr>-->
+                    <tr>
+                        <td class="editTableTitle"></td>
+                        <td class="editTableValue">
+                            <input type="radio" class="restrictFilterInput_vf" value="restrict" name="text{$.id}viewFilterType" onclick="if (this.checked){
+                                debugger;
+                                $('text{$.id}viewFilterRestrict').setStyle('display', 'block');
+                                $('text{$.id}parameterInputTr').setStyle('display', 'table-row');
+                                $('text{$.id}viewCustomFilterRestrict').setStyle('display', 'none');
+                                $('text{$.id}pathInputTr').setStyle('display', 'none');
+                            }"/>作为默认过滤条件<br>
+                            <input type="radio" class="customFilterInput_vf" value="custom" name="text{$.id}viewFilterType" onclick="if (this.checked){
+                                $('text{$.id}viewFilterRestrict').setStyle('display', 'none');
+                                $('text{$.id}parameterInputTr').setStyle('display', 'none');
+                                $('text{$.id}viewCustomFilterRestrict').setStyle('display', 'block');
+                                $('text{$.id}pathInputTr').setStyle('display', 'table-row');
+                            }" checked/>作为自定义过滤数据
+                        </td>
+                    </tr>
                 </table>
+                 <div id="text{$.id}viewFilterRestrict"  style="display: none">
+                    <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                        <tr>
+                            <td class="editTableTitle" id="text{$.id}viewFilterValueTitleArea">值:</td>
+
+                            <td class="editTableValue">
+                                <input class="editTableRadio"  name="viewFilterValueType" type="radio" value="input" checked onclick="
+                                    if (this.checked){
+                                        $('text{$.id}viewFilterValueScriptDiv').setStyle('display', 'none');
+                                        $('text{$.id}viewFilterValueArea').setStyle('display', 'table-row');
+                                        $('text{$.id}viewFilterFormulaSelector').setStyle('display', 'block');
+                                    }
+                                "/>输入
+                                <input class="editTableRadio" name="viewFilterValueType" type="radio" value="script" onclick="
+                                    if (this.checked){
+                                        $('text{$.id}viewFilterValueScriptDiv').setStyle('display', 'block');
+                                        $('text{$.id}viewFilterValueArea').setStyle('display', 'none');
+                                        $('text{$.id}viewFilterFormulaSelector').setStyle('display', 'none');
+                                    }
+                                "/>脚本
+                            </td>
+                        </tr>
+                        <tr id="text{$.id}viewFilterValueArea">
+                            <td class="editTableTitle"></td>
+                            <td class="editTableValue">
+                                <input type="text" class="editTableInput valueTextInput_vf" style="display: block" onkeypress="$('text{$.id}viewFilterTextFormulaSelector').getElements('input').set('checked', false)"/>
+                                <input type="number" class="editTableInput valueNumberInput_vf" style="display: none"/>
+                                <input type="text" class="editTableInput valueDatetimeInput_vf" style="display: none" readonly/>
+                                <input type="text" class="editTableInput valueDateInput_vf" style="display: none" readonly/>
+                                <input type="text" class="editTableInput valueTimeInput_vf" style="display: none" readonly/>
+                                <select class="valueBooleanInput_vf" style="display: none">
+                                    <option value="true" selected>是(True)</option>
+                                    <option value="false">否(False)</option>
+                                </select>
+                            </td>
+                        </tr>
+
+                    </table>
+                     <div id="text{$.id}viewFilterFormulaSelector">
+                        <div style="display: none" id="text{$.id}viewFilterDateFormulaSelector">
+                            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                                <tr>
+                                    <td class="editTableTitle"></td>
+                                    <td class="editTableValue">
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDatetimeInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@year" />当前年度
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDatetimeInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@season" />当前季度
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDatetimeInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@month" />当前月份<br/>
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDatetimeInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@time" />当前时间
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDatetimeInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@date" />当天
+
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div style="display: none" id="text{$.id}viewFilterDateOnlyFormulaSelector">
+                            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                                <tr>
+                                    <td class="editTableTitle"></td>
+                                    <td class="editTableValue">
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDateInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@year" />当前年度
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDateInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@season" />当前季度
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDateInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@month" />当前月份<br/>
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueDateInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@date" />当天
+
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div style="display: none" id="text{$.id}viewFilterTimeOnlyFormulaSelector">
+                            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                                <tr>
+                                    <td class="editTableTitle"></td>
+                                    <td class="editTableValue">
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueTimeInput_vf').set('value', this.value)" name="text{$.id}viewFilterDateFormula" type="radio" value="@time" />当前时间
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                        <div style="display: block" id="text{$.id}viewFilterTextFormulaSelector">
+                            <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
+                                <tr>
+                                    <td class="editTableTitle"></td>
+                                    <td class="editTableValue">
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueTextInput_vf').set('value', this.value)" name="text{$.id}viewFilterTextFormula" onclick="" type="radio" value="@person" />当前人
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueTextInput_vf').set('value', this.value)" name="text{$.id}viewFilterTextFormula" type="radio" value="@identityList" />当前身份<br/>
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueTextInput_vf').set('value', this.value)" name="text{$.id}viewFilterTextFormula" type="radio" value="@unitList" />当前人所在直接组织<br/>
+                                        <input onclick="$('text{$.id}viewFilterValueArea').getElement('.valueTextInput_vf').set('value', this.value)" name="text{$.id}viewFilterTextFormula" type="radio" value="@unitAllList" />当前人所在所有组织
+                                    </td>
+                                </tr>
+                            </table>
+                        </div>
+                     </div>
+                     <div style="display:none" id="text{$.id}viewFilterValueScriptDiv">
+                         <div name="text{$.id}viewFilterValueScript" title="脚本"></div>
+                     </div>
+                </div>
+
+
                 <div id="text{$.id}viewCustomFilterRestrict"  style="display: block">
                     <table width="100%" border="0" cellpadding="5" cellspacing="0" class="editTable">
                         <tr>
@@ -144,7 +279,7 @@
                                 <input class="editTableRadio" onclick="
                                 if (this.checked){
                                     $('text{$.id}viewCustomFilterValueScriptDiv').setStyle('display', 'none');
-                                }" name="viewCustomFilterValueType" checked type="radio" value="input"/>输入
+                                }" name="viewCustomFilterValueType" checked type="radio" value="input"/>用户输入
                                 <input class="editTableRadio" onclick="
                                 if (this.checked){
                                     $('text{$.id}viewCustomFilterValueScriptDiv').setStyle('display', 'block');
@@ -159,6 +294,8 @@
                 </div>
             </div>
             <div class="actionAreaNode_vf"></div>
+            <div style="height: 20px; line-height: 20px; text-align:center; background-color: #eeeeee">默认过滤条件</div>
+            <div class="listAreaNode_vf" style="min-height: 56px; border-bottom:1px solid #CCCCCC; overflow: hidden;"></div>
             <div style="height: 20px; line-height: 20px; text-align:center; background-color: #eeeeee">自定义过滤数据</div>
             <div class="fieldListAreaNode_vf" style="min-height: 56px; border-bottom:1px solid #CCCCCC; overflow: hidden;"></div>
         </div>