Skip to content

I
iBiz4jVue
提交 4efa110d 编写于 作者: tony001's avatar tony001
浏览文件
操作

Revert "2020.9.24 合并" 

This reverts commit 4fa4849d.
上级 4fa4849d
隐藏空白字符变更
内嵌 并排
正在显示 包含 9 行增加 和 44 行删除
@CONTROL/表格/SERVICE.ts.ftl
浏览文件 @ 4efa110d
......@@ -119,15 +119,6 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
<#-- 手动修改数据主键的情况start -->
<#if ctrl.getPSDEGridEditItems()??>
<#list ctrl.getPSDEGridEditItems() as editItem>
<#if editItem.getPSAppDEField()?? && editItem.getPSAppDEField().isKeyField() && editItem.getCodeName() != "srfkey">
Object.assign(Data,{${editItem.getPSAppDEField().getCodeName()?lower_case}: data.${editItem.getName()}, srffrontuf: '1'});
</#if>
</#list>
</#if>
<#-- 手动修改数据主键的情况end -->
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
......@@ -328,20 +319,8 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
//处理返回数据，补充判断标识
if(response.data){
Object.assign(response.data,{srfuf:'0'});
<#-- 手动修改数据主键的情况start -->
<#assign hasKeyField = ''/>
<#if ctrl.getPSDEGridEditItems()??>
<#list ctrl.getPSDEGridEditItems() as editItem>
<#if editItem.getPSAppDEField()?? && editItem.getPSAppDEField().isKeyField() && editItem.getCodeName() != "srfkey">
<#assign hasKeyField>${editItem.getName()}</#assign>
</#if>
</#list>
</#if>
<#-- 手动修改数据主键的情况end -->
<#if hasKeyField == "">
//仿真主键数据
response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID();
</#if>
}
this.handleResponse(action, response, true);
resolve(response);
......
@CONTROL/门户部件/CONTROL-BASE.vue.ftl
浏览文件 @ 4efa110d
......@@ -50,7 +50,6 @@
${render_uiaction}<#t>
</@ibizindent>
</p>
<el-divider class="divider"></el-divider>
</#if>
<div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
<#assign refview = ctrl.getPortletPSAppView()><#t>
......@@ -69,7 +68,6 @@
${render_uiaction}<#t>
</@ibizindent>
</p>
<el-divider class="divider"></el-divider>
</#if>
<div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
<#assign appmenu = ctrl.getPSAppMenu()><#t>
......@@ -90,7 +88,6 @@
${render_uiaction}<#t>
</@ibizindent>
</p>
<el-divider class="divider"></el-divider>
</#if>
<div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
<#if ctrl.render??>
......@@ -108,7 +105,6 @@
${ctrl.getTitle()}
</span>
</p>
<el-divider class="divider"></el-divider>
</#if>
<div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
<#if ctrl.render??>
......@@ -130,7 +126,6 @@
${render_uiaction}<#t>
</@ibizindent>
</p>
<el-divider class="divider"></el-divider>
</#if>
<div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
<iframe src="<#if ctrl.getPageUrl()??>${ctrl.getPageUrl()}</#if>" style="height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()?c}<#else>400</#if>px;width: 100%;border-width: 1px;"></iframe>
......@@ -143,7 +138,6 @@
${ctrl.getTitle()}
</span>
</p>
<el-divider class="divider"></el-divider>
</#if>
<div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
<#if ctrl.render??>
......@@ -179,7 +173,6 @@
${render_uiaction}<#t>
</@ibizindent>
</p>
<el-divider class="divider"></el-divider>
</#if>
<div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
<#assign control = ctrl.getContentPSControl()><#t>
......
@CONTROL/门户部件/CONTROL.less.ftl
浏览文件 @ 4efa110d
......@@ -35,11 +35,6 @@
}
}
}
<#if ctrl.isShowTitleBar() && ctrl.getTitle()??>
> .divider {
margin: 0px 0px 11px 0px;
}
</#if>
> .portlet-with-title{
width:100%;
height:calc(100% - 52px);
......
APP/src/codelist/%APP_CODELIST%.ts.ftl
浏览文件 @ 4efa110d
......@@ -125,17 +125,15 @@ export default class ${srfclassname('${item.getCodeName()}')} {
*/
public doItems(items: any[]): any[] {
let _items: any[] = [];
if(items && items instanceof Array && items.length >0){
items.forEach((item: any) => {
let itemdata:any = {};
Object.assign(itemdata,{id:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
Object.assign(itemdata,{value:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
Object.assign(itemdata,{text:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
Object.assign(itemdata,{label:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
<#if item.getPValuePSAppDEField()??>Object.assign(itemdata,{pvalue:item.${item.getPValuePSAppDEField().getCodeName()?lower_case}});</#if>
_items.push(itemdata);
});
}
items.forEach((item: any) => {
let itemdata:any = {};
Object.assign(itemdata,{id:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
Object.assign(itemdata,{value:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
Object.assign(itemdata,{text:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
Object.assign(itemdata,{label:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
<#if item.getPValuePSAppDEField()??>Object.assign(itemdata,{pvalue:item.${item.getPValuePSAppDEField().getCodeName()?lower_case}});</#if>
_items.push(itemdata);
});
return _items;
}
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或