Skip to content

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

Merge branch 'master' into 2020.07.12

上级 13892505
隐藏空白字符变更
内嵌 并排
正在显示 包含 594 行增加 和 70 行删除
@CONTROL/应用菜单/CONTROL-BASE.vue.ftl
浏览文件 @ 9c012def
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<template v-if="Object.is(mode,'horizontal')"> <template v-if="Object.is(mode,'horizontal')">
<template v-for="item0 in menus"> <template v-for="item0 in menus">
<template v-if="item0.items && Array.isArray(item0.items) && item0.items.length > 0"> <template v-if="item0.items && Array.isArray(item0.items) && item0.items.length > 0">
<el-submenu v-show="!item0.hidden" :index="item0.name" :popper-class="popperClass" :key="item0.id"> <el-submenu v-show="!item0.hidden" :index="item0.name" :popper-class="popperClass" :key="item0.id" :class="item0.textcls">
<template slot='title'> <template slot='title'>
<template v-if="item0.icon && item0.icon != ''"> <template v-if="item0.icon && item0.icon != ''">
<img :src="item0.icon" class='app-menu-icon' /> <img :src="item0.icon" class='app-menu-icon' />
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</template> </template>
<template v-for="item1 in item0.items"> <template v-for="item1 in item0.items">
<template v-if="item1.items && Array.isArray(item1.items) && item1.items.length > 0"> <template v-if="item1.items && Array.isArray(item1.items) && item1.items.length > 0">
<el-submenu v-show="!item1.hidden" :index="item1.name" :popper-class="popperClass" :key="item1.id"> <el-submenu v-show="!item1.hidden" :index="item1.name" :popper-class="popperClass" :key="item1.id" :class="item1.textcls">
<template slot='title'> <template slot='title'>
<template v-if="item1.icon && item1.icon != ''"> <template v-if="item1.icon && item1.icon != ''">
<img :src="item1.icon" class='app-menu-icon' /> <img :src="item1.icon" class='app-menu-icon' />
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</template> </template>
<template v-for="item2 in item1.items"> <template v-for="item2 in item1.items">
<template v-if="item2.type =='MENUITEM'"> <template v-if="item2.type =='MENUITEM'">
<el-menu-item v-show="!item2.hidden" :index="item2.name" :key="item2.id"> <el-menu-item v-show="!item2.hidden" :index="item2.name" :key="item2.id" :class="item2.textcls">
<template v-if="item2.icon && item2.icon != ''"> <template v-if="item2.icon && item2.icon != ''">
<img :src="item2.icon" class='app-menu-icon' /> <img :src="item2.icon" class='app-menu-icon' />
</template> </template>
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
</template> </template>
<template v-else> <template v-else>
<template v-if="item1.type =='MENUITEM'"> <template v-if="item1.type =='MENUITEM'">
<el-menu-item v-show="!item1.hidden" :index="item1.name" :key="item1.id"> <el-menu-item v-show="!item1.hidden" :index="item1.name" :key="item1.id" :class="item1.textcls">
<template v-if="item1.icon && item1.icon != ''"> <template v-if="item1.icon && item1.icon != ''">
<img :src="item1.icon" class='app-menu-icon' /> <img :src="item1.icon" class='app-menu-icon' />
</template> </template>
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</template> </template>
<template v-else> <template v-else>
<template v-if="item0.type =='MENUITEM'"> <template v-if="item0.type =='MENUITEM'">
<el-menu-item v-show="!item0.hidden" :index="item0.name" :key="item0.id"> <el-menu-item v-show="!item0.hidden" :index="item0.name" :key="item0.id" :class="item0.textcls">
<template v-if="item0.icon && item0.icon != ''"> <template v-if="item0.icon && item0.icon != ''">
<img :src="item0.icon" class='app-menu-icon' /> <img :src="item0.icon" class='app-menu-icon' />
</template> </template>
......
@CONTROL/数据看板/CONTROL-BASE.vue.ftl
浏览文件 @ 9c012def
...@@ -32,13 +32,21 @@ ...@@ -32,13 +32,21 @@
</#macro> </#macro>
<#if (layout == 'TABLE_24COL' || layout == 'TABLE_12COL') && LayoutPos??><#t> <#if (layout == 'TABLE_24COL' || layout == 'TABLE_12COL') && LayoutPos??><#t>
<i-col<#if LayoutPos.getColXS() != -1> :xs="{ span: <@format_numer LayoutPos.getColXS()*multiple/>, offset: <#if LayoutPos.getColXSOffset() != -1><@format_numer LayoutPos.getColXSOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColSM() != -1> :sm="{ span: <@format_numer LayoutPos.getColSM()*multiple />, offset: <#if LayoutPos.getColSMOffset() != -1><@format_numer LayoutPos.getColSMOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColMD() != -1> :md="{ span: <@format_numer LayoutPos.getColMD()*multiple />, offset: <#if LayoutPos.getColMDOffset() != -1><@format_numer LayoutPos.getColMDOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :lg="{ span: <@format_numer LayoutPos.getColLG()*multiple />, offset: <#if LayoutPos.getColLGOffset() != -1><@format_numer LayoutPos.getColLGOffset()*multiple /><#else>0</#if> }"</#if>> <i-col<#if LayoutPos.getColXS() != -1> :xs="{ span: <@format_numer LayoutPos.getColXS()*multiple/>, offset: <#if LayoutPos.getColXSOffset() != -1><@format_numer LayoutPos.getColXSOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColSM() != -1> :sm="{ span: <@format_numer LayoutPos.getColSM()*multiple />, offset: <#if LayoutPos.getColSMOffset() != -1><@format_numer LayoutPos.getColSMOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColMD() != -1> :md="{ span: <@format_numer LayoutPos.getColMD()*multiple />, offset: <#if LayoutPos.getColMDOffset() != -1><@format_numer LayoutPos.getColMDOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :lg="{ span: <@format_numer LayoutPos.getColLG()*multiple />, offset: <#if LayoutPos.getColLGOffset() != -1><@format_numer LayoutPos.getColLGOffset()*multiple /><#else>0</#if> }"</#if>>
<#if portlet.getPSPortlets?? && portlet.getPSPortlets()??>
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <card class="portlet-card" :bordered="false" dis-hover :padding="0">
<#else>
<card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
</#if>
<#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content> <#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content>
<#if view.getViewStyle?? && view.getViewStyle()?? && (view.getViewStyle() == 'cardportal' || view.getViewStyle == 'entitydatakanbanviewcard' || view.getViewStyle() == 'entitydatakanbanunitsviewcard' )>
<a slot='extra'></a>
<#else>
<p slot='title'> <p slot='title'>
${portlet.getTitle()} ${portlet.getTitle()}
<span class="line"></span> <span class="line"></span>
</p> </p>
<a slot='extra'></a> <a slot='extra'></a>
</#if>
</#if> </#if>
<span> <span>
<@ibizindent blank=10><#t> <@ibizindent blank=10><#t>
...@@ -49,13 +57,21 @@ ...@@ -49,13 +57,21 @@
</i-col> </i-col>
<#-- ELSE：门户部件绘制，Flex --> <#-- ELSE：门户部件绘制，Flex -->
<#else> <#else>
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <#if portlet.getPSPortlets?? && portlet.getPSPortlets()??>
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<#else>
<card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
</#if>
<#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content> <#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content>
<#if view.getViewStyle?? && view.getViewStyle()?? && (view.getViewStyle() == 'cardportal' || view.getViewStyle == 'entitydatakanbanviewcard' || view.getViewStyle() == 'entitydatakanbanunitsviewcard' )>
<a slot='extra'></a>
<#else>
<p slot='title'> <p slot='title'>
${portlet.getTitle()} ${portlet.getTitle()}
<span class="line"></span> <span class="line"></span>
</p> </p>
<a slot='extra'></a> <a slot='extra'></a>
</#if>
</#if> </#if>
<span> <span>
<@ibizindent blank=10><#t> <@ibizindent blank=10><#t>
......
@CONTROL/数据看板/CONTROL.less.ftl
浏览文件 @ 9c012def
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
} }
} }
} }
} }
} }
<#ibizinclude> <#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl ../@MACRO/CSS/DEFAULT.less.ftl
......
@CONTROL/表单/CONTROL-BASE.vue.ftl
浏览文件 @ 9c012def
...@@ -344,7 +344,7 @@ import schema from 'async-validator'; ...@@ -344,7 +344,7 @@ import schema from 'async-validator';
let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:""; let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
// 常规规则 // 常规规则
if(item.type == 'SIMPLE'){ if(item.type == 'SIMPLE'){
startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,{},item.isKeyCond)); startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond));
falg.infoMessage = item.ruleInfo; falg.infoMessage = item.ruleInfo;
} }
// 数值范围 // 数值范围
...@@ -1217,6 +1217,9 @@ import schema from 'async-validator'; ...@@ -1217,6 +1217,9 @@ import schema from 'async-validator';
return; return;
} }
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
if(this.viewparams && this.viewparams.copymode){
data.srfuf = '0';
}
const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator); const post: Promise<any> = Object.is(data.srfuf, '1')?this.service.update(action, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(action,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
post.then((response: any) => { post.then((response: any) => {
if (!response.status || response.status !== 200) { if (!response.status || response.status !== 200) {
...@@ -1225,7 +1228,7 @@ import schema from 'async-validator'; ...@@ -1225,7 +1228,7 @@ import schema from 'async-validator';
} }
return; return;
} }
this.viewparams.copymode = false;
const data = response.data; const data = response.data;
this.onFormLoad(data,'save'); this.onFormLoad(data,'save');
this.$emit('save', data); this.$emit('save', data);
......
@CONTROL/表格/CONTROL-BASE.vue#COLUMN.ftl
浏览文件 @ 9c012def
...@@ -163,7 +163,13 @@ ...@@ -163,7 +163,13 @@
viewname: '${srffilepath2(dataview.getCodeName())}', height: ${dataview.getHeight()?c},width: ${dataview.getWidth()?c},title: <@getViewLanguageTitle dataview />,placement: '${dataview.getOpenMode()}', isRedirectView: <#if dataview.isRedirectView()>true<#else>false</#if>,deResParameters: <@getDeResParameters dataview />,parameters: <@getParameters dataview /> viewname: '${srffilepath2(dataview.getCodeName())}', height: ${dataview.getHeight()?c},width: ${dataview.getWidth()?c},title: <@getViewLanguageTitle dataview />,placement: '${dataview.getOpenMode()}', isRedirectView: <#if dataview.isRedirectView()>true<#else>false</#if>,deResParameters: <@getDeResParameters dataview />,parameters: <@getParameters dataview />
</#assign> </#assign>
</#if> </#if>
<app-column-link deKeyField='<#if dataview.isPSDEView()>${dataview.getPSAppDataEntity().getCodeName()?lower_case}</#if>' :context="JSON.parse(JSON.stringify(context))" :viewparams="JSON.parse(JSON.stringify(viewparams))" :data="row" :linkview="{<#compress><#if appLinkView??>${appLinkView}</#if></#compress>}" valueitem="<#if item.getLinkValueItem()??>${item.getLinkValueItem()}</#if>"> <app-column-link
deKeyField='<#if dataview.isPSDEView()>${dataview.getPSAppDataEntity().getCodeName()?lower_case}</#if>'
:context="JSON.parse(JSON.stringify(context))"
:viewparams="JSON.parse(JSON.stringify(viewparams))"
:data="row"
:linkview="{<#compress><#if appLinkView??>${appLinkView}</#if></#compress>}"
valueitem="<#if item.getLinkValueItem()??>${item.getLinkValueItem()}</#if>">
<#-- BEGIN：常规显示 --> <#-- BEGIN：常规显示 -->
<#if item.getPSDEGridEditItem()?? && item.getPSDEGridEditItem().getPSEditorType?? && item.getPSDEGridEditItem().getPSEditorType()??> <#if item.getPSDEGridEditItem()?? && item.getPSDEGridEditItem().getPSEditorType?? && item.getPSDEGridEditItem().getPSEditorType()??>
<app-span name='${item.name}' editorType="${item.getPSDEGridEditItem().getPSEditorType().getStandardPSEditorType()}" :value="row.${item.getName()?lower_case}"></app-span> <app-span name='${item.name}' editorType="${item.getPSDEGridEditItem().getPSEditorType().getStandardPSEditorType()}" :value="row.${item.getName()?lower_case}"></app-span>
......
@CONTROL/表格/CONTROL-BASE.vue.ftl
浏览文件 @ 9c012def
<template> <template>
<div class='grid' style="height:100%;"> <div class='grid' style="height:100%">
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<i-form style="height:100%"> <i-form style="height:100%;display:flex;flex-direction: column;justify-content: space-between">
<el-table v-if="isDisplay === true" <el-table v-if="isDisplay === true"
<#-- BEGIN：是否支持排序 --> <#-- BEGIN：是否支持排序 -->
<#if !ctrl.isNoSort()> <#if !ctrl.isNoSort()>
...@@ -17,11 +17,11 @@ ...@@ -17,11 +17,11 @@
:show-summary="true && items.length > 0" :show-summary="true && items.length > 0"
:summary-method="getSummaries" :summary-method="getSummaries"
</#if> </#if>
<#-- 表格聚合end --> <#-- 表格聚合end -->
:height="isEnablePagingBar && items.length > 0 ? 'calc(100% - 50px)' : '100%'"
:highlight-current-row ="isSingleSelect" :highlight-current-row ="isSingleSelect"
:row-class-name="getRowClassName" :row-class-name="getRowClassName"
:cell-class-name="getCellClassName" :cell-class-name="getCellClassName"
:height="isEnablePagingBar && items.length > 0 ? 'calc(100% - 50px)' : '100%'"
@row-click="rowClick($event)" @row-click="rowClick($event)"
@select-all="selectAll($event)" @select-all="selectAll($event)"
@select="select($event)" @select="select($event)"
...@@ -1407,7 +1407,7 @@ import { FormItemModel } from '@/model/form-detail'; ...@@ -1407,7 +1407,7 @@ import { FormItemModel } from '@/model/form-detail';
return prev; return prev;
} }
}, 0); }, 0);
sums[index] = tempData; sums[index] = tempData.toFixed(3);
} }
<#elseif singleColumn.getAggMode() == "AVG"> <#elseif singleColumn.getAggMode() == "AVG">
if(Object.is(column.property,'${singleColumn.getCodeName()?lower_case}')){ if(Object.is(column.property,'${singleColumn.getCodeName()?lower_case}')){
...@@ -1419,7 +1419,7 @@ import { FormItemModel } from '@/model/form-detail'; ...@@ -1419,7 +1419,7 @@ import { FormItemModel } from '@/model/form-detail';
return prev; return prev;
} }
}, 0); }, 0);
sums[index] = tempData/data.length; sums[index] = (tempData/data.length).toFixed(2);
} }
<#elseif singleColumn.getAggMode() == "MAX"> <#elseif singleColumn.getAggMode() == "MAX">
if(Object.is(column.property,'${singleColumn.getCodeName()?lower_case}')){ if(Object.is(column.property,'${singleColumn.getCodeName()?lower_case}')){
...@@ -1611,6 +1611,12 @@ import { FormItemModel } from '@/model/form-detail'; ...@@ -1611,6 +1611,12 @@ import { FormItemModel } from '@/model/form-detail';
*/ */
public async save(args: any[], params?: any, $event?: any, xData?: any){ public async save(args: any[], params?: any, $event?: any, xData?: any){
let _this = this; let _this = this;
// 拷贝模式
if(_this.viewparams && _this.viewparams.copymode && Object.is(_this.viewparams.copymode,'true') && _this.items && _this.items.length >0){
for (const item of _this.items) {
item.rowDataState = 'create';
}
}
if(_this.items && _this.items.length >0){ if(_this.items && _this.items.length >0){
for (const item of _this.items) { for (const item of _this.items) {
if(Object.is(item.rowDataState, 'update')){ if(Object.is(item.rowDataState, 'update')){
......
@CONTROL/表格/CONTROL.less.ftl
浏览文件 @ 9c012def
...@@ -33,6 +33,10 @@ ...@@ -33,6 +33,10 @@
display: inline; display: inline;
} }
.el-table { .el-table {
height: 100%;
display:flex;
flex-direction: column;
justify-content: start;
.el-table__row{ .el-table__row{
.grid-uiaction-divider { .grid-uiaction-divider {
padding:0 10px 0 10px; padding:0 10px 0 10px;
...@@ -94,9 +98,6 @@ ...@@ -94,9 +98,6 @@
} }
} }
} }
.el-table__body-wrapper{
height: calc(100% - 45px) !important;
}
} }
.ivu-modal-content{ .ivu-modal-content{
.footer{ .footer{
......
@CONTROL/视图布局面板/@MACRO/DATA_PANEL.vue.ftl
浏览文件 @ 9c012def
<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if> <#if view.getViewStyle() != 'DEFAULT'>${view.getViewStyle()}</#if>"> <div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if> <#if view.getViewStyle() != 'DEFAULT'>${view.getViewStyle()?lower_case}</#if>">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction> <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
<card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false"> <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
......
@CONTROL/视图布局面板/实体数据看板视图 (卡片)/VIEW.less.ftl 0 → 100644
浏览文件 @ 9c012def
<#ibizinclude>
../@MACRO/DEFAULT.less.ftl
</#ibizinclude>
<#if view.getViewStyle?? && view.getViewStyle()?? && view.getViewStyle()?lower_case == 'entitydatakanbanviewcard'>
.entitydatakanbanviewcard {
background-color: #F0F2F5;
box-shadow: none !important;
>.view-card {
background-color: #F0F2F5;
>.ivu-card-head{
display: none;
}
}
.portlet-card {
background-color: #f0f2f5;
}
.custom-card {
background-color: #ffffff;
margin: 5px;
box-shadow: 1px 1px 5px rgb(209, 205, 205);
.view-card {
background-color: #ffffff;
}
}
}
</#if>
\ No newline at end of file
@CONTROL/视图布局面板/实体数据看板视图 (卡片)/VIEW.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if> <#if view.getViewStyle() != 'DEFAULT'>${view.getViewStyle()?lower_case}</#if>">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
<card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<#ibizinclude>
../@MACRO/VIEW_CAPTION.vue.ftl
</#ibizinclude>
<#if view.hasPSControl('toolbar')>
<#assign toolbarCtrl = view.getPSControl('toolbar')>
<@ibizindent blank=8>
${P.getCtrlCode(toolbarCtrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
<div class="content-container">
<#if view.getPSControls()??>
<#list view.getPSControls() as ctrl>
<#if ctrl.getControlType() != "TOOLBAR">
<#if P.getCtrlCode(ctrl, 'CONTROL.html')??>
<@ibizindent blank=12>
${P.getCtrlCode(ctrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
</#if>
</#list>
</#if>
</div>
</card>
</div>
@CONTROL/视图布局面板/实体数据看板视图 (卡片)/template.properties 0 → 100644
浏览文件 @ 9c012def
CTRLTYPE=VIEWLAYOUTPANEL#ENTITYDATAKANBANVIEWCARD
\ No newline at end of file
@CONTROL/视图布局面板/实体数据看板视图（部件视图卡片）/VIEW.less.ftl 0 → 100644
浏览文件 @ 9c012def
<#ibizinclude>
../@MACRO/DEFAULT.less.ftl
</#ibizinclude>
<#if view.getViewStyle?? && view.getViewStyle()?? && view.getViewStyle()?lower_case == 'entitydatakanbanunitsviewcard'>
.entitydatakanbanunitsviewcard {
background-color: #F0F2F5;
box-shadow: none !important;
>.view-card {
background-color: #F0F2F5;
>.ivu-card-head{
display: none;
}
}
.portlet-card {
background-color: #f0f2f5;
}
.custom-card {
background-color: #ffffff;
margin: 5px;
box-shadow: 1px 1px 5px rgb(209, 205, 205);
.view-card {
background-color: #ffffff;
}
}
}
</#if>
\ No newline at end of file
@CONTROL/视图布局面板/实体数据看板视图（部件视图卡片）/VIEW.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if> <#if view.getViewStyle() != 'DEFAULT'>${view.getViewStyle()?lower_case}</#if>">
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
<card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<#ibizinclude>
../@MACRO/VIEW_CAPTION.vue.ftl
</#ibizinclude>
<#if view.hasPSControl('toolbar')>
<#assign toolbarCtrl = view.getPSControl('toolbar')>
<@ibizindent blank=8>
${P.getCtrlCode(toolbarCtrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
<div class="content-container">
<#if view.getPSControls()??>
<#list view.getPSControls() as ctrl>
<#if ctrl.getControlType() != "TOOLBAR">
<#if P.getCtrlCode(ctrl, 'CONTROL.html')??>
<@ibizindent blank=12>
${P.getCtrlCode(ctrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
</#if>
</#list>
</#if>
</div>
</card>
</div>
@CONTROL/视图布局面板/实体数据看板视图（部件视图卡片）/template.properties 0 → 100644
浏览文件 @ 9c012def
CTRLTYPE=VIEWLAYOUTPANEL#ENTITYDATAKANBANUNITSVIEWCARD
\ No newline at end of file
@CONTROL/视图布局面板/应用看板视图（卡片）/VIEW.less.ftl 0 → 100644
浏览文件 @ 9c012def
<#ibizinclude>
../@MACRO/DEFAULT.less.ftl
</#ibizinclude>
.${srffilepath2(view.getCodeName())}{
display: block;
}
<#if view.getViewStyle?? && view.getViewStyle()?? && view.getViewStyle()?lower_case == 'cardportal'>
.cardportal {
background-color: #F0F2F5;
box-shadow: none !important;
.view-card {
background-color: #F0F2F5;
}
.portlet-card {
background-color: #f0f2f5;
}
.custom-card {
background-color: #ffffff;
margin: 5px;
box-shadow: 1px 1px 5px rgb(209, 205, 205);
.view-card {
background-color: #ffffff;
}
}
> .view-card > .ivu-card-body {
height: 100%;
}
}
</#if>
@CONTROL/视图布局面板/应用看板视图（卡片）/VIEW.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<div class='view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if> <#if view.getViewStyle() != 'DEFAULT'>${view.getViewStyle()?lower_case}</#if>'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
<card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' dis-hover :bordered="false">
<div class='content-container'>
<div class='view-top-messages'>
</div>
<@ibizindent blank=12>
<#if view.hasPSControl('dashboard')>
${P.getCtrlCode('dashboard', 'CONTROL.html').code}
</#if>
</@ibizindent>
<div class='view-bottom-messages'>
</div>
</div>
</card>
</div>
\ No newline at end of file
@CONTROL/视图布局面板/应用看板视图（卡片）/template.properties 0 → 100644
浏览文件 @ 9c012def
CTRLTYPE=VIEWLAYOUTPANEL#CARDPORTAL
\ No newline at end of file
@CONTROL/门户部件/CONTROL-BASE.vue.ftl
浏览文件 @ 9c012def
...@@ -225,10 +225,11 @@ import { Environment } from '@/environments/environment'; ...@@ -225,10 +225,11 @@ import { Environment } from '@/environments/environment';
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public handleItemClick($event:any){ public handleItemClick($event:any){
let data: any = $event.params && Object.keys($event.params).length > 0 ? $event.params : null;
<#if ctrl.getPSAppViewLogics?? && ctrl.getPSAppViewLogics()??> <#if ctrl.getPSAppViewLogics?? && ctrl.getPSAppViewLogics()??>
<#list ctrl.getPSAppViewLogics() as appViewLogic> <#list ctrl.getPSAppViewLogics() as appViewLogic>
if(Object.is($event,'${appViewLogic.name}')){ if(Object.is($event.tag,'${appViewLogic.name}')){
this.${appViewLogic.name}(null); this.${appViewLogic.name}(data, $event.tag, $event.event);
} }
</#list> </#list>
</#if> </#if>
......
@CONTROL/门户部件/CONTROL.html.ftl
浏览文件 @ 9c012def
...@@ -44,13 +44,21 @@ ...@@ -44,13 +44,21 @@
<#if (layout == 'TABLE_24COL' || layout == 'TABLE_12COL') && LayoutPos??><#t> <#if (layout == 'TABLE_24COL' || layout == 'TABLE_12COL') && LayoutPos??><#t>
<i-col<#if LayoutPos.getColXS() != -1> :xs="{ span: <@format_numer LayoutPos.getColXS()*multiple/>, offset: <#if LayoutPos.getColXSOffset() != -1><@format_numer LayoutPos.getColXSOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColSM() != -1> :sm="{ span: <@format_numer LayoutPos.getColSM()*multiple />, offset: <#if LayoutPos.getColSMOffset() != -1><@format_numer LayoutPos.getColSMOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColMD() != -1> :md="{ span: <@format_numer LayoutPos.getColMD()*multiple />, offset: <#if LayoutPos.getColMDOffset() != -1><@format_numer LayoutPos.getColMDOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :lg="{ span: <@format_numer LayoutPos.getColLG()*multiple />, offset: <#if LayoutPos.getColLGOffset() != -1><@format_numer LayoutPos.getColLGOffset()*multiple /><#else>0</#if> }"</#if>> <i-col<#if LayoutPos.getColXS() != -1> :xs="{ span: <@format_numer LayoutPos.getColXS()*multiple/>, offset: <#if LayoutPos.getColXSOffset() != -1><@format_numer LayoutPos.getColXSOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColSM() != -1> :sm="{ span: <@format_numer LayoutPos.getColSM()*multiple />, offset: <#if LayoutPos.getColSMOffset() != -1><@format_numer LayoutPos.getColSMOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColMD() != -1> :md="{ span: <@format_numer LayoutPos.getColMD()*multiple />, offset: <#if LayoutPos.getColMDOffset() != -1><@format_numer LayoutPos.getColMDOffset()*multiple /><#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :lg="{ span: <@format_numer LayoutPos.getColLG()*multiple />, offset: <#if LayoutPos.getColLGOffset() != -1><@format_numer LayoutPos.getColLGOffset()*multiple /><#else>0</#if> }"</#if>>
<div class="portlet-without-title"> <div class="portlet-without-title">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <#if portlet.getPSPortlets?? && portlet.getPSPortlets()??>
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<#else>
<card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
</#if>
<#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content> <#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content>
<#if view.getViewStyle?? && view.getViewStyle()?? && view.getViewStyle() != 'DEFAULT'>
<a slot='extra'></a>
<#else>
<p slot='title'> <p slot='title'>
${portlet.getTitle()} ${portlet.getTitle()}
<span class="line"></span> <span class="line"></span>
</p> </p>
<a slot='extra'></a> <a slot='extra'></a>
</#if>
</#if> </#if>
<span> <span>
<@ibizindent blank=14><#t> <@ibizindent blank=14><#t>
...@@ -63,13 +71,21 @@ ...@@ -63,13 +71,21 @@
<#-- BEGIN：子门户部件绘制,Flex --> <#-- BEGIN：子门户部件绘制,Flex -->
<#else> <#else>
<div class="portlet-without-title"> <div class="portlet-without-title">
<card class="portlet-card" :bordered="false" dis-hover :padding="0"> <#if portlet.getPSPortlets?? && portlet.getPSPortlets()??>
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<#else>
<card class="portlet-card custom-card" :bordered="false" dis-hover :padding="10">
</#if>
<#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content> <#if portlet.getPortletType() == 'CONTAINER' && portlet.isShowTitleBar() && portlet.getTitle()?has_content>
<p slot='title'> <#if view.getViewStyle?? && view.getViewStyle()?? && view.getViewStyle() != 'DEFAULT'>
${portlet.getTitle()} <a slot='extra'></a>
<span class="line"></span> <#else>
</p> <p slot='title'>
<a slot='extra'></a> ${portlet.getTitle()}
<span class="line"></span>
</p>
<a slot='extra'></a>
</#if>
</#if> </#if>
<span> <span>
<@ibizindent blank=14><#t> <@ibizindent blank=14><#t>
......
@EDITOR/下拉列表框 (动态代码表国际化)/EDITOR.vue.ftl
浏览文件 @ 9c012def
...@@ -7,6 +7,10 @@ ...@@ -7,6 +7,10 @@
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="detailsModel.${editor.name}.disabled" :disabled="detailsModel.${editor.name}.disabled"
<#if item.getPSAppDEField?? && item.getPSAppDEField()?? && item.getPSAppDEField().getStdDataType()??>
<#assign datatype = srfjavatype(item.getPSAppDEField().getStdDataType())>
valueType="<#if datatype == 'BigInteger' || datatype == 'Integer' || datatype == 'Double' || datatype == 'Decimal' || datatype == 'Float' || datatype == 'BigDecimal'>number<#else>string</#if>"
</#if>
<#if editor.getPSCodeList()??> <#if editor.getPSCodeList()??>
<#assign codelist=editor.getPSCodeList()> <#assign codelist=editor.getPSCodeList()>
tag='${codelist.codeName}' tag='${codelist.codeName}'
......
@EDITOR/下拉列表框/EDITOR.vue.ftl
浏览文件 @ 9c012def
...@@ -9,7 +9,11 @@ ...@@ -9,7 +9,11 @@
:viewparams="viewparams" :viewparams="viewparams"
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="detailsModel.${editor.name}.disabled" :disabled="detailsModel.${editor.name}.disabled"
<#if item.getPSAppDEField?? && item.getPSAppDEField()?? && item.getPSAppDEField().getStdDataType()??>
<#assign datatype = srfjavatype(item.getPSAppDEField().getStdDataType())>
valueType="<#if datatype == 'BigInteger' || datatype == 'Integer' || datatype == 'Double' || datatype == 'Decimal' || datatype == 'Float' || datatype == 'BigDecimal'>number<#else>string</#if>"
</#if>
<#if editor.getPSCodeList()??> <#if editor.getPSCodeList()??>
<#assign codelist=editor.getPSCodeList()> <#assign codelist=editor.getPSCodeList()>
tag='${codelist.codeName}' tag='${codelist.codeName}'
......
@EDITOR/数值框/EDITOR.vue.ftl
浏览文件 @ 9c012def
...@@ -8,11 +8,14 @@ ...@@ -8,11 +8,14 @@
:disabled="detailsModel.${editor.name}.disabled" :disabled="detailsModel.${editor.name}.disabled"
type='number' type='number'
<#if item.getPSAppDEField()?? && item.getPSAppDEField().getPSDEField()?? && item.getPSAppDEField().getPSDEField().getPrecision??> <#if item.getPSAppDEField()?? && item.getPSAppDEField().getPSDEField()?? && item.getPSAppDEField().getPSDEField().getPrecision??>
<#if item.getPSAppDEField().getPSDEField().getDataType() == 'FLOAT' && item.getPSAppDEField().getPSDEField().getPrecision() == 0> <#assign datatype = item.getPSAppDEField().getPSDEField().getDataType()>
<#if datatype=='DOUBLE' || datatype=='DECIMAL' || datatype=='FLOAT' || datatype=='BIGDECIMAL'>
<#if item.getPSAppDEField().getPSDEField().getPrecision() == 0>
:precision="2" :precision="2"
<#else> <#else>
:precision="${item.getPSAppDEField().getPSDEField().getPrecision()?c}" :precision="${item.getPSAppDEField().getPSDEField().getPrecision()?c}"
</#if> </#if>
</#if>
</#if> </#if>
<#if editor.getPlaceHolder()??>placeholder="${editor.getPlaceHolder()}"</#if> <#if editor.getPlaceHolder()??>placeholder="${editor.getPlaceHolder()}"</#if>
style="${editor.getEditorCssStyle()}"> style="${editor.getEditorCssStyle()}">
......
@EDITOR/文本框/EDITOR.vue.ftl
浏览文件 @ 9c012def
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
<#else> <#else>
<input-box v-model="data.${editor.name}" @enter="onEnter($event)" <#if item.getUnitName()??> unit="${item.getUnitName()}"</#if> :disabled="detailsModel.${editor.name}.disabled" type='<#if item.getPSDEField?? && item.getPSDEField()??><#assign datatype=srfjavatype(item.getPSDEField().getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>text</#if><#else>text</#if>' <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> style="${editor.getEditorCssStyle()}"></input-box> <input-box
v-model="data.${editor.name}"
@enter="onEnter($event)"
<#if item.getUnitName()??> unit="${item.getUnitName()}"</#if>
:disabled="detailsModel.${editor.name}.disabled"
type='<#if item.getPSDEField?? && item.getPSDEField()??><#assign datatype=srfjavatype(item.getPSDEField().getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>text</#if><#else>text</#if>'
<#if item.getPSDEField?? && item.getPSDEField()?? && item.getPSDEField().getPrecision??>
<#assign datatype=srfjavatype(item.getPSDEField().getStdDataType())>
<#if datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>
<#if item.getPSDEField().getPrecision() == 0>
:precision="2"
<#else>
:precision="${item.getPSDEField().getPrecision()?c}"
</#if>
</#if>
</#if>
<#if item.getPlaceHolder()??>
placeholder="${item.getPlaceHolder()}"
</#if>
style="${editor.getEditorCssStyle()}">
</input-box>
</#if> </#if>
\ No newline at end of file
@LOGIC/@UIACTION/前台调用/LOGIC.vue.ftl
浏览文件 @ 9c012def
...@@ -198,11 +198,11 @@ ${front_block} ...@@ -198,11 +198,11 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); _this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
...@@ -229,11 +229,11 @@ ${front_block} ...@@ -229,11 +229,11 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); _this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
...@@ -261,11 +261,11 @@ ${front_block} ...@@ -261,11 +261,11 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); _this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
...@@ -295,11 +295,11 @@ ${front_block} ...@@ -295,11 +295,11 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); _this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
...@@ -427,18 +427,18 @@ ${front_block} ...@@ -427,18 +427,18 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}(result.datas,context, params, $event, xData,actionContext); _this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context, params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}(result.datas,context, params, $event, xData,actionContext); this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context, params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
if(window.opener){ <#-- if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress); window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close(); window.close();
} } -->
return result.datas; return result.datas;
}); });
} }
...@@ -470,18 +470,18 @@ ${front_block} ...@@ -470,18 +470,18 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); _this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}(result.datas,context,params, $event, xData,actionContext); this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context,params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
if(window.opener){ <#-- if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress); window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close(); window.close();
} } -->
return result.datas; return result.datas;
}); });
} }
...@@ -514,18 +514,18 @@ ${front_block} ...@@ -514,18 +514,18 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}(result.datas,context, params, $event, xData,actionContext); _this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context, params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}(result.datas,context, params, $event, xData,actionContext); this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context, params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
if(window.opener){ <#-- if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress); window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close(); window.close();
} } -->
return result.datas; return result.datas;
}); });
} }
...@@ -556,11 +556,11 @@ ${front_block} ...@@ -556,11 +556,11 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}(result.datas,context, params, $event, xData,actionContext); _this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context, params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}(result.datas,context, params, $event, xData,actionContext); this.${nextPSUIAction.getFullCodeName()}(result.datas[0],context, params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
......
@LOGIC/@UIACTION/工作流前台调用/LOGIC.vue.ftl
浏览文件 @ 9c012def
...@@ -145,10 +145,10 @@ ...@@ -145,10 +145,10 @@
} }
<#-- 是否重新加载数据 --> <#-- 是否重新加载数据 -->
actionContext.closeView(); actionContext.closeView();
if(window.opener){ <#-- if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress); window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close(); window.close();
} } -->
}); });
} }
const view: any = { const view: any = {
...@@ -167,10 +167,10 @@ ...@@ -167,10 +167,10 @@
} }
<#-- 是否重新加载数据 --> <#-- 是否重新加载数据 -->
actionContext.closeView(); actionContext.closeView();
if(window.opener){ <#-- if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress); window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close(); window.close();
} } -->
}); });
} }
const view: any = { const view: any = {
...@@ -190,10 +190,10 @@ ...@@ -190,10 +190,10 @@
} }
<#-- 是否重新加载数据 --> <#-- 是否重新加载数据 -->
actionContext.closeView(); actionContext.closeView();
if(window.opener){ <#-- if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress); window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close(); window.close();
} } -->
}); });
} }
const view: any = { const view: any = {
......
@LOGIC/@UIACTION/工作流后台调用/LOGIC.vue.ftl
浏览文件 @ 9c012def
...@@ -92,10 +92,10 @@ ...@@ -92,10 +92,10 @@
<#else> <#else>
actionContext.$Notice.success({ title: '成功', desc: '${item.getCaption()}成功！' }); actionContext.$Notice.success({ title: '成功', desc: '${item.getCaption()}成功！' });
</#if> </#if>
if(window.opener){ <#-- if(window.opener){
window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress); window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
window.close(); window.close();
} } -->
return response; return response;
}).catch((response: any) => { }).catch((response: any) => {
if (!response || !response.status || !response.data) { if (!response || !response.status || !response.data) {
......
@LOGIC/@UIACTION/系统预置/sys/拷贝/LOGIC.vue.ftl
浏览文件 @ 9c012def
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
* @memberof ${srfclassname('${view.name}')}Base * @memberof ${srfclassname('${view.name}')}Base
*/ */
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) { public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) { <#-- if (args.length === 0) {
return; return;
} }
const _this: any = this; const _this: any = this;
...@@ -28,5 +28,20 @@ ...@@ -28,5 +28,20 @@
xData.copy(args[0].srfkey); xData.copy(args[0].srfkey);
} else { } else {
_this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' }); _this.$Notice.error({ title: '错误', desc: 'opendata 视图处理逻辑不存在，请添加!' });
} -->
if (args.length === 0) {
return;
}
const _this: any = this;
if (_this.opendata && _this.opendata instanceof Function) {
const data: any = { };
if (args.length > 0) {
<#if appde??>Object.assign(data, { ${appde.codeName?lower_case}: args[0].${appde.codeName?lower_case} });</#if>
}
if(!params) params = {};
Object.assign(params,{copymode:true});
_this.opendata([{ ...data }], params, $event, xData);
} else {
Object.assign(this.viewparams,{copymode:true});
} }
} }
\ No newline at end of file
@LOGIC/@VIEWLOGIC/编辑/LOGIC.vue.ftl
浏览文件 @ 9c012def
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
* @param {*} [xData] * @param {*} [xData]
* @memberof ${srfclassname('${view.name}')} * @memberof ${srfclassname('${view.name}')}
*/ */
public ${item.name}(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) { public ${item.name}(args: any[],fullargs?:any,params?: any, $event?: any, xData?: any) {
<#if item.getPSControlContainer().getViewType??> <#if item.getPSControlContainer().getViewType??>
if(!this.viewDefaultUsage){ if(!this.viewDefaultUsage){
if(Object.is(this.navModel,"route")){ if(Object.is(this.navModel,"route")){
...@@ -156,6 +156,9 @@ ...@@ -156,6 +156,9 @@
<#elseif dataview.getOpenMode() == 'INDEXVIEWTAB' || dataview.getOpenMode() == ''> <#elseif dataview.getOpenMode() == 'INDEXVIEWTAB' || dataview.getOpenMode() == ''>
<#-- 打开顶级分页视图 --> <#-- 打开顶级分页视图 -->
const _this: any = this; const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openIndexViewTab = (data: any) => { const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
<#if dataview.getViewType() == "DEWFDYNAEDITVIEW" > <#if dataview.getViewType() == "DEWFDYNAEDITVIEW" >
...@@ -168,11 +171,17 @@ ...@@ -168,11 +171,17 @@
<#elseif dataview.getOpenMode() == 'POPUPAPP'> <#elseif dataview.getOpenMode() == 'POPUPAPP'>
<#-- 打开独立程序弹出 --> <#-- 打开独立程序弹出 -->
const _this: any = this; const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data); const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
window.open('./#'+routePath, '_blank'); window.open('./#'+routePath, '_blank');
<#elseif dataview.getOpenMode() = 'POPUPMODAL'> <#elseif dataview.getOpenMode() = 'POPUPMODAL'>
<#-- 打开模态 --> <#-- 打开模态 -->
const _this: any = this; const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openPopupModal = (view: any, data: any) => { const openPopupModal = (view: any, data: any) => {
let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data); let container: Subject<any> = this.$appmodal.openModal(view, tempContext, data);
container.subscribe((result: any) => { container.subscribe((result: any) => {
...@@ -195,6 +204,9 @@ ...@@ -195,6 +204,9 @@
<#elseif dataview.getOpenMode()?index_of('DRAWER') == 0> <#elseif dataview.getOpenMode()?index_of('DRAWER') == 0>
<#-- 打开抽屉 --> <#-- 打开抽屉 -->
const _this: any = this; const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openDrawer = (view: any, data: any) => { const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data); let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => { container.subscribe((result: any) => {
...@@ -218,6 +230,9 @@ ...@@ -218,6 +230,9 @@
<#elseif dataview.getOpenMode() == 'POPOVER'> <#elseif dataview.getOpenMode() == 'POPOVER'>
<#-- 打开气泡卡片 --> <#-- 打开气泡卡片 -->
const _this: any = this; const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openPopOver = (view: any, data: any) => { const openPopOver = (view: any, data: any) => {
let container: Subject<any> = this.$apppopover.openPop($event, view, tempContext, data); let container: Subject<any> = this.$apppopover.openPop($event, view, tempContext, data);
container.subscribe((result: any) => { container.subscribe((result: any) => {
......
@VIEW/实体数据看板视图 （卡片）/VIEW-BASE.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<#assign self_viewparam>
this.$forceUpdate();
</#assign>
<#assign self_content>
/**
* 加载数据
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public loadModel(){
<#assign appDataEntity = view.getPSAppDataEntity() />
if(this.context.${appDataEntity.getCodeName()?lower_case}){
this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
this.viewState.next({ tag: 'app-actionbar', action: 'loadmodel', data:_data});
if (_data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case}) {
Object.assign(this.model, { dataInfo: _data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case} });
if(this.$tabPageExp){
let _this:any = this;
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
}
if(this.$route){
this.$route.meta.info = this.model.dataInfo;
}
<#noparse>Object.assign(this.model, { srfTitle: `${this.$t(this.model.srfTitle)} - ${this.model.dataInfo}` });</#noparse>
}
})
}
}
</#assign>
<#ibizinclude>
../@MACRO/LAYOUTPANEL_VIEW.template.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW_HEADER-BASE.vue.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW_CONTENT-BASE.vue.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW_BOTTOM-BASE.vue.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW-BASE.style.ftl
</#ibizinclude>
\ No newline at end of file
@VIEW/实体数据看板视图 （卡片）/VIEW.less.ftl 0 → 100644
浏览文件 @ 9c012def
${P.getLayoutCode().code}
\ No newline at end of file
@VIEW/实体数据看板视图 （卡片）/VIEW.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<#ibizinclude>
../@MACRO/VIEW.vue.ftl
</#ibizinclude>
\ No newline at end of file
@VIEW/实体数据看板视图 （卡片）/template.properties 0 → 100644
浏览文件 @ 9c012def
VIEWTYPE=APPDEPORTALVIEW#ENTITYDATAKANBANVIEWCARD
\ No newline at end of file
@VIEW/实体数据看板视图（部件视图卡片）/VIEW-BASE.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<#assign self_viewparam>
this.$forceUpdate();
</#assign>
<#assign created_block>
if(this.formDruipart){
this.formDruipart.subscribe((res:any) =>{
if(Object.is(res.action,'load')){
const _this: any = this;
_this.engine.load(res.data,true);
}
});
}
</#assign>
<#assign self_content>
/**
* 加载数据
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public loadModel(){
<#assign appDataEntity = view.getPSAppDataEntity() />
if(this.context.${appDataEntity.getCodeName()?lower_case}){
this.appEntityService.getDataInfo(JSON.parse(JSON.stringify(this.context)),{},false).then((response:any) =>{
if (!response || response.status !== 200) {
return;
}
const { data: _data } = response;
this.viewState.next({ tag: 'app-actionbar', action: 'loadmodel', data:_data});
if (_data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case}) {
Object.assign(this.model, { dataInfo: _data.${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case} });
if(this.$tabPageExp){
let _this:any = this;
this.$tabPageExp.setCurPageCaption(_this.$t(this.model.srfTitle), _this.$t(this.model.srfTitle), _this.model.dataInfo);
}
if(this.$route){
this.$route.meta.info = this.model.dataInfo;
}
<#noparse>Object.assign(this.model, { srfTitle: `${this.$t(this.model.srfTitle)} - ${this.model.dataInfo}` });</#noparse>
}
})
}
}
</#assign>
<#ibizinclude>
../@MACRO/LAYOUTPANEL_VIEW.template.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW_HEADER-BASE.vue.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW_CONTENT-BASE.vue.ftl
</#ibizinclude>
/**
* 是否嵌入关系界面
*
* @type {boolean}
* @memberof ${srfclassname('${view.name}')}Base
*/
@Prop({default:false}) public isformDruipart?: boolean;
/**
* 界面关系通讯对象
*
* @type {Subject<ViewState>}
* @memberof ${srfclassname('${view.name}')}Base
*/
@Prop() public formDruipart!: Subject<ViewState>;
<#ibizinclude>
../@MACRO/VIEW_BOTTOM-BASE.vue.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW-BASE.style.ftl
</#ibizinclude>
\ No newline at end of file
@VIEW/实体数据看板视图（部件视图卡片）/VIEW.less.ftl 0 → 100644
浏览文件 @ 9c012def
${P.getLayoutCode().code}
\ No newline at end of file
@VIEW/实体数据看板视图（部件视图卡片）/VIEW.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<#ibizinclude>
../@MACRO/VIEW.vue.ftl
</#ibizinclude>
\ No newline at end of file
@VIEW/实体数据看板视图（部件视图卡片）/template.properties 0 → 100644
浏览文件 @ 9c012def
VIEWTYPE=APPDEPORTALVIEW9#ENTITYDATAKANBANUNITSVIEWCARD
\ No newline at end of file
@VIEW/应用看板视图 （卡片）/VIEW-BASE.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<#assign mounted_block>
this.viewState.next({ tag: 'dashboard', action: 'load', data: {} });
</#assign>
<#ibizinclude>
../@MACRO/LAYOUTPANEL_VIEW.template.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW_HEADER-BASE.vue.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW_CONTENT-BASE.vue.ftl
</#ibizinclude>
/**
* 应用起始页面
*
* @type {boolean}
* @memberof ${srfclassname('${view.name}')}Base
*/
public isDefaultPage: boolean = ${view.isDefaultPage()?c};
<#ibizinclude>
../@MACRO/VIEW_BOTTOM-BASE.vue.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/VIEW-BASE.style.ftl
</#ibizinclude>
\ No newline at end of file
@VIEW/应用看板视图 （卡片）/VIEW.less.ftl 0 → 100644
浏览文件 @ 9c012def
${P.getLayoutCode().code}
\ No newline at end of file
@VIEW/应用看板视图 （卡片）/VIEW.vue.ftl 0 → 100644
浏览文件 @ 9c012def
<#ibizinclude>
../@MACRO/VIEW.vue.ftl
</#ibizinclude>
\ No newline at end of file
@VIEW/应用看板视图 （卡片）/template.properties 0 → 100644
浏览文件 @ 9c012def
VIEWTYPE=APPPORTALVIEW#CARDPORTAL
\ No newline at end of file
APP/src/service/%DE_PKGPATH%/%DE_PKGPATH%-service-base.ts.ftl
浏览文件 @ 9c012def
...@@ -52,6 +52,8 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr ...@@ -52,6 +52,8 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
if(item.srffrontuf){ if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){ if(Object.is(item.srffrontuf,"0")){
item.${minorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case} = null; item.${minorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case} = null;
<#-- 置空父键 -->
if(item.hasOwnProperty('${majorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}') && item.${majorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}) item.${majorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case} = null;
} }
delete item.srffrontuf; delete item.srffrontuf;
} }
...@@ -529,7 +531,8 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr ...@@ -529,7 +531,8 @@ import ${srfclassname('${singleLogic.getCodeName()}')}Logic from '@/service/${sr
<#if afterlogic.getPSDELogic()?? && afterlogic.getPSDELogic().getLogicHolder?? && afterlogic.getPSDELogic().getLogicHolder()?? && (afterlogic.getPSDELogic().getLogicHolder() == 2 || afterlogic.getPSDELogic().getLogicHolder() == 3)> <#if afterlogic.getPSDELogic()?? && afterlogic.getPSDELogic().getLogicHolder?? && afterlogic.getPSDELogic().getLogicHolder()?? && (afterlogic.getPSDELogic().getLogicHolder() == 2 || afterlogic.getPSDELogic().getLogicHolder() == 3)>
<#assign singleLogic = afterlogic.getPSDELogic() /> <#assign singleLogic = afterlogic.getPSDELogic() />
<@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}:${srfclassname('${singleLogic.getCodeName()}')}Logic = new ${srfclassname('${singleLogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(res))});</@compress> <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}:${srfclassname('${singleLogic.getCodeName()}')}Logic = new ${srfclassname('${singleLogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(res))});</@compress>
<@compress single_line=true>res = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,res.data,isloading?true:false);</@compress> <@compress single_line=true>let returndata:any = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,res.data,isloading?true:false);</@compress>
res ={status:200,data:returndata};
</#if> </#if>
</#list> </#list>
</#if> </#if>
......
APP/src/uiservice/%DE_PKGPATH%/%DE_PKGPATH%-ui-service-base.ts.ftl
浏览文件 @ 9c012def
<#ibiztemplate> <#ibiztemplate>
TARGET=PSAPPDATAENTITY TARGET=PSAPPDATAENTITY
</#ibiztemplate> </#ibiztemplate>
<#macro getMainStateOPPrivs mainState> <#macro getMainStateOPPrivs mainState dataEntity>
<#compress> <#compress>
<#if dataEntity.getAllPSDEOPPrivs?? && dataEntity.getAllPSDEOPPrivs()??>
<#if mainState.getPSDEMainStateOPPrivs?? && mainState.getPSDEMainStateOPPrivs()??> <#if mainState.getPSDEMainStateOPPrivs?? && mainState.getPSDEMainStateOPPrivs()??>
{<#list mainState.getPSDEMainStateOPPrivs() as mainStateOPPriv>'${mainStateOPPriv.getName()}':<#if mainState.isOPPrivAllowMode()>1<#else>0</#if><#if mainStateOPPriv_has_next>,</#if></#list>} {<#list mainState.getPSDEMainStateOPPrivs() as stateOPPriv><#if stateOPPriv.getPSDEOPPriv()?? && !stateOPPriv.getPSDEOPPriv().getMapPSDEOPPrivName()??>'${stateOPPriv.getName()}':<#if mainState.isOPPrivAllowMode()>1<#else>0</#if>,</#if></#list><#list dataEntity.getAllPSDEOPPrivs() as mainStateOPPriv>'${mainStateOPPriv.getName()}':<#list mainState.getPSDEMainStateOPPrivs() as stateOPPriv><#if stateOPPriv.getName() == mainStateOPPriv.getName()><#assign iscurState = true/></#if></#list><#if iscurState?? && iscurState ><#if mainState.isOPPrivAllowMode()>1<#else>0</#if><#else><#if mainState.isOPPrivAllowMode()>0<#else>1</#if></#if><#assign iscurState = false/><#if mainStateOPPriv_has_next>,</#if></#list>}
</#if>
<#else> <#else>
{} {}
</#if> </#if>
</#compress> </#compress>
</#macro> </#macro>
import { Environment } from '@/environments/environment'; import { Environment } from '@/environments/environment';
...@@ -153,7 +155,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UIServiceBase exten ...@@ -153,7 +155,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UIServiceBase exten
<#if item.getPSDataEntity?? && item.getPSDataEntity()?? && item.getPSDataEntity().getAllPSDEMainStates()??> <#if item.getPSDataEntity?? && item.getPSDataEntity()?? && item.getPSDataEntity().getAllPSDEMainStates()??>
<#list item.getPSDataEntity().getAllPSDEMainStates() as demState> <#list item.getPSDataEntity().getAllPSDEMainStates() as demState>
<#if demState.getMSTag()??> <#if demState.getMSTag()??>
this.allDeMainStateOPPrivsMap.set('${demState.getMSTag()}',<@getMainStateOPPrivs mainState=demState />); this.allDeMainStateOPPrivsMap.set('${demState.getMSTag()}',<@getMainStateOPPrivs mainState=demState dataEntity=item.getPSDataEntity() />);
</#if> </#if>
</#list> </#list>
</#if> </#if>
......
CHANGELOG.md
浏览文件 @ 9c012def
## v7.0.0-alpha.16 [2020-8-2]
### Bug修复
修复表格聚合异常
修复文本框精度问题
修复属性值规则常规规则异常
修复应用菜单标题重复问题
修复界面行为异常问题
修复下拉选组件代码表类型和属性进行不匹配问题
### 功能新增及优化
#### 模板
新增应用数据看板视图（卡片样式）、实体数据看板视图（卡片样式）
优化拷贝功能
优化临时模式新建置空父键
优化实体行为执行后逻辑
优化操作栏触发界面行为逻辑
优化实体主状态
#### 基础文件
优化数值框数值位置
优化应用语言选择组件和应用组织部门信息呈现组件
优化无数据主键界面行为逻辑
## v7.0.0-alpha.15 [2020-7-23] ## v7.0.0-alpha.15 [2020-7-23]
### Bug修复 ### Bug修复
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或