Commit 1d5309ee by 罗绍泽

修改

parent b384f83a
......@@ -17,6 +17,14 @@
</tr>
<tr>
<td class="tableStyleLable">
<span>映射应用:</span>
</td>
<td colspan="5">
<input class="easyui-textbox" id="FIELD_NAMES" name="FIELD_FIELD_NAMES" style="width:630px" value="${is_row.FIELD_NAMES}"/>
</td>
</tr>
<tr>
<td class="tableStyleLable">
<span>应用名称:</span>
</td>
<td>
......@@ -185,13 +193,5 @@
<input class="easyui-combobox" id="VERIFY_TYPE" name="FIELD_VERIFY_TYPE" data-options="required:true" style="width:130px" value="${is_row.VERIFY_TYPE}"/>
</td>
</tr>
<tr>
<td class="tableStyleLable">
<span>模拟字段:</span>
</td>
<td colspan="5">
<input class="easyui-textbox" id="FIELD_NAMES" name="FIELD_FIELD_NAMES" style="width:630px" value="${is_row.FIELD_NAMES}"/>
</td>
</tr>
</table>
</form>
......@@ -77,6 +77,9 @@ var v_entity_category = [{CODE_ID:'1',CODE_NAME:'教学类'},
//加载验证方式下拉框
var v_entity_verify = [{CODE_ID:'0',CODE_NAME:'模拟登录'},
{CODE_ID:'1',CODE_NAME:'单点登录'}];
//映射应用
var v_apps_base = jwAppPortletModel.jwAppsPortletDataAction.listBaseApps();
/****/
/**
......@@ -245,6 +248,14 @@ function addUrlOnloadCallback(is_row){
//console.log(is_row);
//$("#appUserFileImage").attr("src","jwapp/pages/apps/photo.jsp?ls_photo="+is_row.IMG_ID_S);
$("#app_content_image").hide();
$('#FIELD_NAMES').combobox({
data : v_apps_base.rowSet,
valueField : 'UUID',
textField : 'APP_NAME',
editable:false,
panelHeight:'auto'
});
$('#CATEGORY').combobox({
data : v_entity_category,
valueField : 'CODE_ID',
......@@ -313,14 +324,13 @@ function insertData(is_entity){
data = appstoreModel.actAction.insertApp(is_entity);
//自动为授予角色用户默认安装
var v_default_data = {};
v_default_data.FIELD_APP_ID = data.RETURNUUID;
v_default_data.FIELD_G_ID = is_entity.FIELD_G_ID;
v_default_data.FIELD_IS_DEFAULT = is_entity.FIELD_IS_DEFAULT
var v_result = appstoreModel.actAction.insertDefaultInstall(v_default_data);
$('#list').datagrid('reload', {});
var v_default_data = {};
v_default_data.FIELD_APP_ID = data.RETURNUUID;
v_default_data.FIELD_G_ID = is_entity.FIELD_G_ID;
v_default_data.FIELD_IS_DEFAULT = is_entity.FIELD_IS_DEFAULT
var v_result = appstoreModel.actAction.insertDefaultInstall(v_default_data);
$('#list').datagrid('reload', {});
return v_result;
}
/**
......@@ -347,6 +357,13 @@ function editRow(index){
//加载修改子页面成功后的回调
function updateUrlOnloadCallback(is_row){
$("#appUserFileImage").attr("src","photo/photo.jsp?ls_photo="+is_row.IMG_ID_S);
$('#FIELD_NAMES').combobox({
data : v_apps_base.rowSet,
valueField : 'UUID',
textField : 'APP_NAME',
editable:false,
panelHeight:'auto'
});
$('#CATEGORY').combobox({
data : v_entity_category,
valueField : 'CODE_ID',
......
......@@ -294,10 +294,22 @@ function editRow(index){
is_row = $('#list').datagrid('getSelections');
$('#list').datagrid('clearSelections');
is_row[0].OPETYPE = 'update';
openEditRow("jwAppsContentView_contentTabDetail",is_row[0],"编辑",true,0.95,0.95,0,0);
var row={};
$.extend(true,row,is_row[0]);
//去掉大文本内容FIELD_CONTENT
delete row.CONTENT;
openEditRow("jwAppsContentView_contentTabDetail",row,"编辑",true,0.95,0.95,0,0);
}
//加载修改子页面成功后的回调
function updateUrlOnloadCallback(is_row){
var rows=$('#list').datagrid('getRows');
for(var i=0;i<rows.length;i++){
if(rows[i].UUID==is_row.UUID){
is_row.CONTENT=rows[i].CONTENT;
break;
}
}
$('#PORTAL_ID').combobox({
data : v_portlet_data.rowSet,
valueField : 'PORTLET_ID',
......
......@@ -43,5 +43,15 @@
<input class="easyui-textbox" id="URL" name="FIELD_URL" data-options="required:true" style="width: 500px;" value="${is_row.URL}"/>
</td>
</tr>
<tr>
<td style="width: 20%;" class="tableStyleLable">
<span>
表单name属性对照:<br />(username,password)
</span>
</td>
<td style="width: 80%">
<input class="easyui-textbox" id="FORM_NAME" name="FIELD_FORM_NAME" data-options="required:true" style="width: 500px;" value="${is_row.FORM_NAME}"/>
</td>
</tr>
</table>
</form>
......@@ -50,7 +50,7 @@
</span>
</td>
<td style="width: 80%">
<input class="easyui-textbox" id="SORT" name="FIELD_SORT" data-options="" style="width: 500px;" value="${is_row.USER_PWD}"/>
<input class="easyui-textbox" id="SORT" name="FIELD_SORT" data-options="required:true" style="width: 500px;" value="${is_row.SORT}"/>
</td>
</tr>
</table>
......
......@@ -42,6 +42,8 @@ jwAppPortletModel.prototype.listStyle = function(){};
jwAppPortletModel.prototype.urlData = function(){};
//判断用户是否在莫一权限内
jwAppPortletModel.prototype.showFunc= function(){};
//获取基础应用映射
jwAppPortletModel.prototype.listBaseApps=function(){};
//创建一个数据操作对象,然后再后续使用
jwAppPortletModel.jwAppsPortletActAction = new jwAppPortletModel("json").delegate("jwAppsPortletAct");
//创建一个数据获取对象,然后再后续使用
......
......@@ -465,7 +465,7 @@ function addUrlOnloadCallback(is_row){
});
$('#APP_ID').combobox({
data : v_app_data.rowSet,
valueField : 'APP_ID',
valueField : 'UUID',
textField : 'APP_NAME',
multiple:false,
editable:false,
......@@ -513,10 +513,22 @@ function editRow(index){
is_row[0].OPETYPE = 'update';
inputInitialize();
$("#list").show();
openEditRow("jwAppsPortletView_portletTabDetail",is_row[0],"编辑",true,0.95,0.95,0,0);
var row={};
$.extend(true,row,is_row[0]);
//内容不传递,再后台重新查询
delete row.CONTENT;
openEditRow("jwAppsPortletView_portletTabDetail",row,"编辑",true,0.95,0.95,0,0);
}
//加载修改子页面成功后的回调
function updateUrlOnloadCallback(is_row){
var rows=$('#list').datagrid('getRows');
for(var i=0;i<rows.length;i++){
if(rows[i].PORTLET_ID==is_row.PORTLET_ID){
is_row.CONTENT=rows[i].CONTENT;
break;
}
}
inputInitialize();
$('#MAX_BTN').combobox({
data : v_entity_maxBtn,
......@@ -534,7 +546,7 @@ function updateUrlOnloadCallback(is_row){
});
$('#APP_ID').combobox({
data : v_app_data.rowSet,
valueField : 'APP_ID',
valueField : 'UUID',
textField : 'APP_NAME',
multiple:false,
editable:false,
......
......@@ -11,6 +11,8 @@ import com.gaowj.business.util.Page;
@Service
public interface PortletBusiness {
List<Map<String, Object>> listBaseApps(Map<String, Object> query) throws BusinessException;
void insert_portlet_template(Map<String,Object> entity) throws BusinessException ;
void update_portlet_template(Map<String,Object> entity) throws BusinessException ;
......
......@@ -86,7 +86,7 @@
<if test="tableName != null and tableName != '' and tableName == 'C_V_SYS_OTHERLOGIN'">
order by f.USER_SYS_NAME,f.SORT
</if>
<if test="tableName != null and tableName != '' and tableName != 'B_V_UFP_MAPPER_USER' and tableName != 'C_V_SYS_OTHERLOGIN'">
<if test="tableName != null and tableName != '' and tableName != 'B_V_UFP_MAPPER_USER' and tableName != 'C_V_SYS_OTHERLOGIN' and tableName != 'C_T_SYS_OTHERLOGIN'">
order by f.SORT
</if>
</select>
......
......@@ -302,4 +302,9 @@ public class PortletBusinessImpl implements PortletBusiness {
return portletDAO.listCount_portlet_setup(query);
}
@Override
public List<Map<String, Object>> listBaseApps(Map<String, Object> query) throws BusinessException {
return portletDAO.listBaseApps(query);
}
}
......
......@@ -40,5 +40,7 @@ public interface PortletDAO {
List<Map<String,Object>> list_portlet_setup(Map<String,Object> query) throws BusinessException ;
int listCount_portlet_setup(Map<String, Object> query) throws BusinessException ;
List<Map<String,Object>> listBaseApps(Map<String,Object> query) throws BusinessException ;
}
......@@ -301,5 +301,7 @@
</if>
</select>
<select id="listBaseApps" parameterType="map" resultType="upperCaseKeyMap">
select f.* from B_T_UFP_APPS f
</select>
</mapper>
\ No newline at end of file
......@@ -73,6 +73,23 @@ public class dataAction extends BasicAction {
setPageNo(page);
this.page = getPageNo();
}
public String listBaseApps() throws BusinessException{
PortletBusiness business = BusinessManager
.getBusiness(PortletBusiness.class);
List<Map<String, Object>> listApps=business.listBaseApps(new HashMap<String, Object>());
Map<String, Object> data = new HashMap<String, Object>();
data.put("rowSet", listApps);
data.put("pageNo", pageNo);
data.put("pageSize", pageSize);
data.put("pageCount", pageCount);
data.put("rows", listApps);
data.put("total", listApps.size());
jsonObject = new JSONObject();
jsonObject.putAll(data);
return "json";
}
public String listPTemplate() throws BusinessException {
PortletBusiness business = BusinessManager
......@@ -592,7 +609,8 @@ public class dataAction extends BasicAction {
} catch (IOException e) {
e.printStackTrace();
}
}
}
public static void main(String[] args) throws Exception, FeedException {
parseXml("http://rss.sina.com.cn/news/marquee/ddt.xml");
}
......
package com.jw.app.portlet.action;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.gaowj.business.action.BasicAction;
import com.gaowj.business.comp.BusinessManager;
import com.gaowj.business.exception.BusinessException;
import com.gaowj.business.util.RequestUtils;
import com.jw.app.business.PortletBusiness;
public class viewAction extends BasicAction {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment