msb-public-java
/
jeecg
mirror of https://gitee.com/jeecg/jeecg.git
1
0
Code Issues Projects Releases Wiki Activity

jeecg 3.6.5 注释问题修复

Browse Source
jeecg_3.6.5
zhangdaiscott 9 years ago
parent e331b4c4bb
commit 8c6c47b91f
15 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File

3
src/main/webapp/WEB-INF/tld/easyui.tld
Unescape View File

@ -1441,7 +1441,6 @@
<rtexprvalue>true</rtexprvalue>
<description>是否可编辑-默认是可以编辑</description>
</attribute>
-end- Author:jg_xugj 许国杰 Date:20151209 for：增加只读属性 -->
</tag>
<!-- 按钮权限标签 -->
@ -1508,7 +1507,6 @@
<rtexprvalue>true</rtexprvalue>
<description>部门名称</description>
</attribute>
-end- Author:jg_renjie Date:20160320 for：增加传入值 -->
</tag>
<tag>
<name>userSelect</name>
@ -1560,6 +1558,5 @@
<rtexprvalue>true</rtexprvalue>
<description>弹出框标头</description>
</attribute>
-end- Author:wangkun Date:20160327 for：增加传入值 -->
</tag>
</taglib>

4
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/checkboxs.html
Unescape View File

@ -213,18 +213,14 @@ function fnParseOptions(gChecked)
<th><span>字段</span> </th>
</tr>
<tr>
--Author:jg_renjie Date:20150717 for：将input修改为select-->
<td>
<select id="datasource"></select>
</td>
<td>
<select id="field">
--Author:jg_renjie Date:20150722 for：设置默认选项的value值 -->
<option selected value=''>请先选择数据源</option>
-end--Author:jg_renjie Date:20150722 for：设置默认选项的value值 -->
</select>
</td>
-end--Author:jg_renjie Date:20150717 for：将input修改为select -->
</tr>
<tr>
<th><span>数据字典</span></th>

8
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/listctrl.html
Unescape View File

@ -2,18 +2,14 @@
<html>
<head>
<title>列表控件属性</title>
--Author:jg_renjie Date:20150725 for：添加页面相对路径-->
<base href="../../../../../"/>
-end--Author:jg_renjie Date:20150725 for：添加页面相对路径-->
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
<meta name="generator" content="www.leipi.org" />
--Author:jg_renjie Date:20150725 for：修改文件的引用路径-->
<link rel="stylesheet" href="plug-in/Formdesign/js/ueditor/formdesign/bootstrap/css/bootstrap.css">
<link rel="stylesheet" href="plug-in/Formdesign/js/ueditor/formdesign/leipi.style.css">
<script type="text/javascript" src="plug-in/Formdesign/js/ueditor/formdesign/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="plug-in/Formdesign/js/ueditor/dialogs/internal.js"></script>
-end--Author:jg_renjie Date:20150725 for：修改文件的引用路径-->
<script type="text/javascript">
function createElement(type, name)
{
@ -41,16 +37,13 @@ function createElement(type, name)
</td>
<td>
<span> 数据源 ：</span>
--Author:jg_renjie Date:20150725 for：将 datasource 由input输入框修改为select下拉框-->
<select id="datasource"></select>
-end--Author:jg_renjie Date:20150725 for：将 datasource 由input输入框修改为select下拉框 -->
</td>
<td>
宽 <input id="orgwidth" type="text" value="100%" class="input-small span1" placeholder="auto"/> % 或 px
</td>
</tr>
--Author:jg_renjie Date:20151013 for：增加fkdsid字段 -->
<tr>
<td>
<span> 外键字段 ：</span>
@ -61,7 +54,6 @@ function createElement(type, name)
<input type="text" id="fkdsid" placeholder="无则不填" style="width: 200px" class="input-medium">
</td>
</tr>
-end--Author:jg_renjie Date:20151013 for：增加fkdsid字段 -->
</thead>
</table>

4
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/radios.html
Unescape View File

@ -217,18 +217,14 @@ function fnParseOptions(gName,gChecked)
<th><span>字段</span> </th>
</tr>
<tr>
--Author:jg_renjie Date:20150717 for：将input修改为select-->
<td>
<select id="datasource"></select>
</td>
<td>
<select id="field">
--Author:jg_renjie Date:20150722 for：设置默认选项的value值 -->
<option selected value=''>请先选择数据源</option>
-end--Author:jg_renjie Date:20150722 for：设置默认选项的value值 -->
</select>
</td>
-end--Author:jg_renjie Date:20150717 for：将input修改为select -->
</tr>
<tr>
<th ><span>数据字典</span></th>

6
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/select.html
Unescape View File

@ -217,18 +217,14 @@ function fnSetAttribute( element, attName, attValue ) {
<th><span>字段</span> </th>
</tr>
<tr>
--Author:jg_renjie Date:20150717 for：将input修改为select-->
<td>
<select id="datasource"></select>
</td>
<td>
<select id="field">
--Author:jg_renjie Date:20150722 for：设置默认选项的value值 -->
<option selected value=''>请先选择数据源</option>
-end--Author:jg_renjie Date:20150722 for：设置默认选项的value值 -->
</select>
</td>
-end--Author:jg_renjie Date:20150717 for：将input修改为select -->
</tr>
<tr style="display: none;">
<th>
@ -252,10 +248,8 @@ function fnSetAttribute( element, attName, attValue ) {
</tr>
<tr>
<td>
-start--Author:jg_renjie Date:20151022 for：增加datatype属性 -->
<select type="text" id="datatype" name="datatype" value="" >
</select>
-start--Author:jg_renjie Date:20151022 for：增加datatype属性 -->
</td>
<td>
<label class="checkbox inline"> </label>

10
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/text.html
Unescape View File

@ -2,9 +2,7 @@
<html>
<head>
<title>文本框</title>
--Author:jg_renjie Date:20150717 for：添加页面相对路径-->
<base href="../../../../../"/>
-end--Author:jg_renjie Date:20150717 for：添加页面相对路径-->
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" >
<meta name="generator" content="www.leipi.org" />
@ -15,11 +13,9 @@
<!--[if lte IE 7]>
<link rel="stylesheet" type="text/css" href="bootstrap/css/ie.css">
<![endif]-->
--Author:jg_renjie Date:20150717 for：修改文件的引用路径-->
<link rel="stylesheet" href="plug-in/Formdesign/js/ueditor/formdesign/leipi.style.css">
<script type="text/javascript" src="plug-in/Formdesign/js/ueditor/formdesign/jquery-1.7.2.min.js"></script>
<script type="text/javascript" src="plug-in/Formdesign/js/ueditor/dialogs/internal.js"></script>
-end--Author:jg_renjie Date:20150717 for：修改文件的引用路径-->
<script type="text/javascript">
/* Thank you by
http://www.alt-tag.com/blog/2006/02/ie-dom-bugs/ */
@ -54,18 +50,14 @@ function createElement(type, name)
<th><span>字段</span> </th>
</tr>
<tr>
--Author:jg_renjie Date:20150717 for：将input修改为select-->
<td>
<select id="datasource"></select>
</td>
<td>
<select id="field">
--Author:jg_renjie Date:20150722 for：设置默认选项的value值 -->
<option selected value=''>请先选择数据源</option>
-end--Author:jg_renjie Date:20150722 for：设置默认选项的value值 -->
</select>
</td>
-end--Author:jg_renjie Date:20150717 for：将input修改为select -->
</tr>
<tr>
<th><span>数据类型</span> </th>
@ -114,10 +106,8 @@ function createElement(type, name)
</tr>
<tr>
<td>
-start--Author:jg_renjie Date:20151022 for：增加datatype属性 -->
<select type="text" id="datatype" name="datatype" value="" >
</select>
-start--Author:jg_renjie Date:20151022 for：增加datatype属性 -->
</td>
<td>
<label class="checkbox inline"> </label>

2
src/main/webapp/plug-in/Formdesign/js/ueditor/formdesign/textarea.html
Unescape View File

@ -62,10 +62,8 @@
</tr>
<tr>
<td>
-start--Author:jg_renjie Date:20151022 for：增加datatype属性 -->
<select type="text" id="datatype" name="datatype" value="" >
</select>
-start--Author:jg_renjie Date:20151022 for：增加datatype属性 -->
</td>
<td>
<label class="checkbox inline"> </label>

1
src/main/webapp/webpage/jeecg/demo/base/report/reportDemo.jsp
Unescape View File

@ -182,7 +182,6 @@
<span id="containerline" style="float: left; width: 30%; height: 60%"></span>
<span id="containerCol" style="float: left; width: 38%; height: 60%"></span>
<span id="containerPie" style="width: 30%; height: 60%"></span>
--Author:jg_renjie Date:20150613 for：页面自适应页面，不会出现左右滚动条 -->
<div style="width: 100%; height: 38%;">
<t:datagrid name="studentStatisticList" title="class.count.statistics" actionUrl="reportDemoController.do?listAllStatisticByJdbc" idField="id" fit="true">
<t:dgCol title="common.code" field="id" hidden="true"></t:dgCol>

3
src/main/webapp/webpage/main/ace_main.jsp
Unescape View File

@ -414,15 +414,12 @@
<td class="value"><input type="radio" value="bootstrap" name="indexStyle" /> <span>BootStrap风格</span></td>
</tr>
-->
-start--Author:gaofeng Date:2014-01-10 for:新增首页风格 -->
<tr>
<td class="value"><input type="radio" value="shortcut" name="indexStyle" /> <span>ShortCut风格</span></td>
</tr>
-start--Author:gaofeng Date:2014-01-24 for:新增首页风格 -->
<tr>
<td class="value"><input type="radio" value="sliding" name="indexStyle" /><span>Sliding云桌面</span></td>
</tr>
-end--Author:longjb Date:2013-03-15 for:新增首页风格 -->
<tr>
<td class="value"><input type="radio" value="ace" name="indexStyle" /><span>ACE平面风格</span></td>
</tr>

3
src/main/webapp/webpage/main/ace_main2.jsp
Unescape View File

@ -544,15 +544,12 @@
<td class="value"><input type="radio" value="bootstrap" name="indexStyle" /> <span>BootStrap风格</span></td>
</tr>
-->
-start--Author:gaofeng Date:2014-01-10 for:新增首页风格 -->
<tr>
<td class="value"><input type="radio" value="shortcut" name="indexStyle" /> <span>ShortCut风格</span></td>
</tr>
-start--Author:gaofeng Date:2014-01-24 for:新增首页风格 -->
<tr>
<td class="value"><input type="radio" value="sliding" name="indexStyle" /><span>Sliding云桌面</span></td>
</tr>
-end--Author:longjb Date:2013-03-15 for:新增首页风格 -->
<tr>
<td class="value"><input type="radio" value="ace" name="indexStyle" /><span>ACE平面风格</span></td>
</tr>

1
src/main/webapp/webpage/main/diy.jsp
Unescape View File

@ -465,7 +465,6 @@ fa fa-times
<tr>
<td class="value"><input type="radio" value="sliding" name="indexStyle" /><span>Sliding云桌面</span></td>
</tr>
-end--Author:longjb Date:2013-03-15 for:新增首页风格 -->
<tr>
<td class="value"><input type="radio" value="ace" name="indexStyle" /><span>ACE平面风格</span></td>
</tr>

1
src/main/webapp/webpage/main/homeTab.jsp
Unescape View File

@ -1,4 +1,3 @@
-start--Author:jg_renjie Date:20160315 for：配合首页改造，引入portal引入portal组件 -->
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@include file="/context/mytags.jsp"%>
<!DOCTYPE html >

2
src/main/webapp/webpage/main/sliding_top.jsp
Unescape View File

@ -2,7 +2,5 @@
<%@include file="/context/mytags.jsp"%>
<link rel="stylesheet" href="plug-in/accordion/css/icons.css" type="text/css"></link>
<link rel="stylesheet" href="plug-in/accordion/css/accordion.css" type="text/css"></link>
-start--Author:gaofeng Date:2014-01-10 for:新增首页风格 -->
<script type="text/javascript" src="plug-in/accordion/js/left_shortcut_menu.js"></script>
-end--Author:gaofeng Date:2014-01-10 for:新增首页风格 -->
<t:menu menuFun="${menuMap}"></t:menu>

2
src/main/webapp/webpage/system/category/category.jsp
Unescape View File

@ -54,9 +54,7 @@
<td align="right"><label class="Validform_label"> 所属上级:
</label></td>
<td class="value">
-start--Author:luobaoli Date:20150606 for：将父ID传到后台，避免更新为空 -->
<input id="pId" name="parent.id"type="hidden" value="${categoryPage.parent.id}">
-end--Author:luobaoli Date:20150606 for：将父ID传到后台，避免更新为空 -->
<input id="categoryTree" value="${categoryPage.parent.name}"> <input
id="parentId" name="parent.code" style="display: none;"
value="${categoryPage.parent.code}"> <span

1
src/main/webapp/webpage/system/user/noticeList.jsp
Unescape View File

@ -9,7 +9,6 @@
<t:dgCol title="标题" field="noticeTitle" width="120"></t:dgCol>
Author:xugj Date:20160330 for：#1012 【平台bug】系统公告列表时间格式不对 -->
<t:dgCol title="时间" field="createTime" formatter="yyyy-MM-dd hh:mm" width="80"></t:dgCol>
-end Author:xugj Date:20160330 for：#1012 【平台bug】系统公告列表时间格式不对 -->
<t:dgCol title="common.operation" field="opt" width="40"></t:dgCol>
<t:dgFunOpt funname="doRead(id,isRead)" title="common.read"></t:dgFunOpt>
</t:datagrid>

Write Preview
Loading…
Cancel
Save