提交 90d63163 编写于 作者: tony001's avatar tony001

Merge branch 'dev'

...@@ -22,6 +22,19 @@ ...@@ -22,6 +22,19 @@
</#if> </#if>
</#macro> </#macro>
<#-- 获取快速搜索栏提示 Placeholder -->
<#macro getSearchPlaceholder ctrl>
<#assign isdrawcComma = false />
<#if ctrl.getPSAppDataEntity?? && ctrl.getPSAppDataEntity()?? && ctrl.getPSAppDataEntity().getAllPSAppDEFields?? && ctrl.getPSAppDataEntity().getAllPSAppDEFields()??>
<#list ctrl.getPSAppDataEntity().getAllPSAppDEFields() as field>
<#if field.isEnableQuickSearch()>
<#if isdrawcComma>,<#else><#assign isdrawcComma = true /></#if><#t>
${field.getPSDEField().getLogicName()}<#t>
</#if>
</#list>
</#if>
</#macro>
<#-- 获取导航上下文 --> <#-- 获取导航上下文 -->
<#macro getNavigateContext currentItem> <#macro getNavigateContext currentItem>
{<#t> {<#t>
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<div class='tabviewpanel<#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>' style="height:100%;"> <div class='tabviewpanel<#if ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>' style="height:100%;">
<tabs :value="tabValue" :animated="false" class='tabexppanel' name='${ctrl.getCodeName()?lower_case}' @on-click="tabPanelClick"> <tabs :value="activiedTabViewPanel" :animated="false" class='tabexppanel' name='${ctrl.getCodeName()?lower_case}' @on-click="tabPanelClick">
<#list ctrl.getPSControls() as tabviewpanel> <#list ctrl.getPSControls() as tabviewpanel>
<tab-pane :index="${tabviewpanel_index}" name='${tabviewpanel.name}' tab='${ctrl.getCodeName()?lower_case}' class='<#if tabviewpanel.getPSSysCss?? && tabviewpanel.getPSSysCss()??>${tabviewpanel.getPSSysCss().getCssName()}</#if>' v-if="computedAuthorizedPanel('${tabviewpanel.name}')" <tab-pane :index="${tabviewpanel_index}" name='${tabviewpanel.name}' tab='${ctrl.getCodeName()?lower_case}' class='<#if tabviewpanel.getPSSysCss?? && tabviewpanel.getPSSysCss()??>${tabviewpanel.getPSSysCss().getCssName()}</#if>' v-if="authResourceObject['${tabviewpanel.name}'].visabled"
:label="(h) =>{ :label="(h) =>{
return h('div', [ return h('div', [
<#if tabviewpanel.getPSSysImage()??> <#if tabviewpanel.getPSSysImage()??>
...@@ -58,6 +58,14 @@ import { Environment } from '@/environments/environment'; ...@@ -58,6 +58,14 @@ import { Environment } from '@/environments/environment';
*/ */
public appAuthService: ${appde.getCodeName()}AuthService = new ${appde.getCodeName()}AuthService(); public appAuthService: ${appde.getCodeName()}AuthService = new ${appde.getCodeName()}AuthService();
/**
* 界面UI服务对象
*
* @type {${srfclassname('${appde.getCodeName()}')}UIService}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public appUIService:${srfclassname('${appde.getCodeName()}')}UIService = new ${srfclassname('${appde.getCodeName()}')}UIService(this.$store);
/** /**
* 是否初始化 * 是否初始化
* *
...@@ -120,13 +128,13 @@ import { Environment } from '@/environments/environment'; ...@@ -120,13 +128,13 @@ import { Environment } from '@/environments/environment';
public action:any = ''; public action:any = '';
/** /**
* 分页面板统一资源存储对象 * 分页面板权限标识存储对象
* *
* @public * @public
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public authResourceObject:any = {<#list ctrl.getPSControls() as tabviewpanel>'${tabviewpanel.name}':<#if tabviewpanel.getEmbeddedPSAppDEView()?? && tabviewpanel.getEmbeddedPSAppDEView().getAccessKey()??>'${tabviewpanel.getEmbeddedPSAppDEView().getAccessKey()}'<#else>null</#if><#if tabviewpanel_has_next>,</#if></#list>}; public authResourceObject:any = {<#list ctrl.getPSControls() as tabviewpanel>'${tabviewpanel.name}':{resourcetag:<#if tabviewpanel.getEmbeddedPSAppDEView()?? && tabviewpanel.getEmbeddedPSAppDEView().getAccessKey()??>'${tabviewpanel.getEmbeddedPSAppDEView().getAccessKey()}'<#else>null</#if><#if tabviewpanel.getPSDEOPPriv?? && tabviewpanel.getPSDEOPPriv()??>,actiontarget: 'SINGLEKEY',noprivdisplaymode:2,dataaccaction:'${tabviewpanel.getPSDEOPPriv().getName()}'</#if>,visabled: true,disabled: false}<#if tabviewpanel_has_next>,</#if></#list>};
/** /**
* 被激活的分页面板 * 被激活的分页面板
...@@ -137,39 +145,45 @@ import { Environment } from '@/environments/environment'; ...@@ -137,39 +145,45 @@ import { Environment } from '@/environments/environment';
public activiedTabViewPanel: string = '<#list ctrl.getPSControls() as tabviewpanel><#if tabviewpanel_index==0>${tabviewpanel.name}</#if></#list>'; public activiedTabViewPanel: string = '<#list ctrl.getPSControls() as tabviewpanel><#if tabviewpanel_index==0>${tabviewpanel.name}</#if></#list>';
/** /**
* 计算激活分页面板 * 计算分页面板权限
* *
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public computedActiviedPanel(){ public computedAuthPanel(data:any){
if(this.$store.getters['authresource/getEnablePermissionValid']){ if(!data || Object.keys(data).length === 0){
if(Object.keys(this.authResourceObject).length >0){ return;
let targetResult:Array<any> = []; }
Object.keys(this.authResourceObject).forEach((item:any) =>{ if(this.authResourceObject && Object.keys(this.authResourceObject).length >0){
if(this.computedAuthorizedPanel(item)) Object.keys(this.authResourceObject).forEach((key:string) =>{
targetResult.push(item); if(this.authResourceObject[key] && this.authResourceObject[key]['dataaccaction']){
let tempUIAction:any = Util.deepCopy(this.authResourceObject[key]);
let result: any[] = ViewTool.calcActionItemAuthState(data,[tempUIAction],this.appUIService);
this.authResourceObject[key].visabled = this.computedPanelWithResource(key,tempUIAction.visabled);
this.authResourceObject[key].disabled = this.computedPanelWithResource(key,tempUIAction.disabled);
}
}) })
if(targetResult.length >0){ const keys:any = Object.keys(this.authResourceObject);
this.activiedTabViewPanel = targetResult[0]; for(let i=0;i<keys.length;i++){
this.tabPanelClick(targetResult[0]); if(this.authResourceObject[keys[i]].visabled){
this.tabPanelClick(keys[i]);
return;
} }
} }
} }
} }
/** /**
* 计算分页面板是否显示 * 合入统一资源权限
* *
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public computedAuthorizedPanel(name:string){ public computedPanelWithResource(name:string,mainState:boolean){
if(!this.$store.getters['authresource/getEnablePermissionValid']) if(!this.$store.getters['authresource/getEnablePermissionValid'])
return true; return mainState === false?false:true;
if(!this.authResourceObject[name]) if(!this.authResourceObject[name])
return true; return mainState === false?false:true;
return this.appAuthService.getResourcePermission(this.authResourceObject[name]); const resourceAuth:boolean = this.appAuthService.getResourcePermission(this.authResourceObject[name]['resourcetag']);
return !resourceAuth?false:mainState?true:false;
} }
/** /**
...@@ -184,7 +198,6 @@ import { Environment } from '@/environments/environment'; ...@@ -184,7 +198,6 @@ import { Environment } from '@/environments/environment';
/** /**
* vue 生命周期 * vue 生命周期
* *
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
...@@ -204,15 +217,18 @@ import { Environment } from '@/environments/environment'; ...@@ -204,15 +217,18 @@ import { Environment } from '@/environments/environment';
Object.assign(this.context,{srfparentdename:'${appDataEntity.getCodeName()}',srfparentkey:this.context.${appDataEntity.getCodeName()?lower_case}}) Object.assign(this.context,{srfparentdename:'${appDataEntity.getCodeName()}',srfparentkey:this.context.${appDataEntity.getCodeName()?lower_case}})
} }
</#if> </#if>
this.computedActiviedPanel();
if (this.viewState) { if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => { this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) { if (!Object.is(tag, this.name)) {
return; return;
} }
if(Object.is(action,'loadmodel')){
this.computedAuthPanel(data);
}else{
this.action = action; this.action = action;
this.viewState.next({ tag: this.activiedTabViewPanel, action: action, data: data }); this.viewState.next({ tag: this.activiedTabViewPanel, action: action, data: data });
this.$forceUpdate(); this.$forceUpdate();
}
}); });
} }
} }
...@@ -251,6 +267,7 @@ import { Environment } from '@/environments/environment'; ...@@ -251,6 +267,7 @@ import { Environment } from '@/environments/environment';
if (!$event) { if (!$event) {
return; return;
} }
this.isInit = [];
this.isInit[$event] = true; this.isInit[$event] = true;
if (!this.viewState) { if (!this.viewState) {
return; return;
......
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<div :class="['app-list',<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()>'${singleCss.getCssName()}',</#if>this.items.length > 0 ? '' : 'app-list-empty' ]"> <div :class="['app-list',<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()>'${singleCss.getCssName()}',</#if>this.items.length > 0 ? '' : 'app-list-empty' ]">
<div v-if="items.length > 0"> <div v-if="items.length > 0">
...@@ -37,7 +40,7 @@ ...@@ -37,7 +40,7 @@
</div> </div>
</div> </div>
<div v-else style="text-align: center;"> <div v-else style="text-align: center;">
{{ $t('app.commonWords.noData') }} {{ $t('<#if langbase??>${langbase}.nodata</#if>') }}
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
...@@ -48,7 +51,7 @@ ...@@ -48,7 +51,7 @@
</template> </template>
</div> </div>
<div v-else> <div v-else>
{{ $t('app.commonWords.noData') }} {{ $t('<#if langbase??>${langbase}.nodata</#if>') }}
</div> </div>
<el-backtop target=".content-container .app-list"></el-backtop> <el-backtop target=".content-container .app-list"></el-backtop>
</div> </div>
...@@ -405,6 +408,7 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -405,6 +408,7 @@ import CodeListService from "@/codelist/codelist-service";
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterMounted () { public afterMounted () {
const loadMoreCallBack:any = this.throttle(this.loadMore,3000);
this.$el.addEventListener('scroll', ()=> { this.$el.addEventListener('scroll', ()=> {
if(this.$el.scrollHeight > this.$el.clientHeight) { if(this.$el.scrollHeight > this.$el.clientHeight) {
this.isScrollBar = true; this.isScrollBar = true;
...@@ -412,7 +416,7 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -412,7 +416,7 @@ import CodeListService from "@/codelist/codelist-service";
this.isScrollBar = false; this.isScrollBar = false;
} }
if( this.$el.scrollTop + this.$el.clientHeight >= this.$el.scrollHeight) { if( this.$el.scrollTop + this.$el.clientHeight >= this.$el.scrollHeight) {
this.loadMore(); loadMoreCallBack();
} }
}) })
} }
...@@ -437,8 +441,13 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -437,8 +441,13 @@ import CodeListService from "@/codelist/codelist-service";
if (!Object.is(this.name, tag)) { if (!Object.is(this.name, tag)) {
return; return;
} }
if (Object.is(action,'load') || Object.is(action,'refresh')) { if (Object.is(action,'load')) {
this.refresh(data) this.curPage = 1;
this.items = [];
this.load(data);
}
if (Object.is(action,'refresh')) {
this.refresh(data);
} }
}); });
} }
...@@ -486,8 +495,7 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -486,8 +495,7 @@ import CodeListService from "@/codelist/codelist-service";
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public loadMore(){ public loadMore(){
if(this.totalRecord>this.items.length) if(this.totalRecord>this.items.length){
{
this.curPage = ++this.curPage; this.curPage = ++this.curPage;
this.isAddBehind = true; this.isAddBehind = true;
this.load({}); this.load({});
...@@ -501,7 +509,7 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -501,7 +509,7 @@ import CodeListService from "@/codelist/codelist-service";
* @memberof Main * @memberof Main
*/ */
public refresh(args?: any) { public refresh(args?: any) {
this.curPage = 1; this.isAddBehind = true;
this.load(args); this.load(args);
} }
...@@ -548,13 +556,14 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -548,13 +556,14 @@ import CodeListService from "@/codelist/codelist-service";
if(!this.isAddBehind){ if(!this.isAddBehind){
this.items = []; this.items = [];
} }
if (Object.keys(data).length > 0) { if (data && data.length > 0) {
let datas = JSON.parse(JSON.stringify(data)); let datas = JSON.parse(JSON.stringify(data));
datas.map((item: any) => { datas.map((item: any) => {
Object.assign(item, { isselected: false }); Object.assign(item, { isselected: false });
}); });
this.totalRecord = response.total; this.totalRecord = response.total;
this.items.push(...datas); this.items.push(...datas);
this.items = this.arrayNonRepeatfy(this.items);
} }
this.isAddBehind = false; this.isAddBehind = false;
this.$emit('load', this.items); this.$emit('load', this.items);
...@@ -582,6 +591,44 @@ import CodeListService from "@/codelist/codelist-service"; ...@@ -582,6 +591,44 @@ import CodeListService from "@/codelist/codelist-service";
}); });
} }
/**
* 列表数据去重
*
* @param {Array<any>} [arr]
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public arrayNonRepeatfy(arr:Array<any>) {
let map = new Map();
let array = new Array();
for (let i = 0; i < arr.length; i++) {
map .set(arr[i].srfkey, arr[i]);
}
map.forEach((value:any, key:string, map:any) => {
array.push(value);
});
return array ;
}
/**
* 节流
*
* @param {Array<any>} [arr]
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public throttle(fn:any, wait:number){
let time = 0;
return () =>{
let now = Date.now()
let args = arguments;
if(now - time > wait){
fn.apply(this, args)
time = now;
}
}
}
/** /**
* 删除 * 删除
* *
......
...@@ -160,7 +160,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -160,7 +160,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
* @type {(string)} * @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public placeholder="<@getQuickSearchPlaceholder view />"; public placeholder="<@getQuickSearchPlaceholder ctrl />";
/** /**
* 搜索值 * 搜索值
......
...@@ -161,7 +161,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -161,7 +161,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
* @type {(string)} * @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public placeholder="<@getQuickSearchPlaceholder view />"; public placeholder="<@getQuickSearchPlaceholder ctrl />";
/** /**
* 搜素值 * 搜素值
......
...@@ -4,7 +4,7 @@ ${ctrl.render.code} ...@@ -4,7 +4,7 @@ ${ctrl.render.code}
<#else> <#else>
<layout class="app-wizard<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>"> <layout class="app-wizard<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>">
<#if ctrl.getPSDEWizard?? && ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardSteps?? && ctrl.getPSDEWizard().getPSDEWizardSteps()??> <#if ctrl.getPSDEWizard?? && ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardSteps?? && ctrl.getPSDEWizard().getPSDEWizardSteps()??>
<el-steps class="wizard-steps" :active="wizardForms.indexOf(activeForm)" finish-status="success"> <el-steps class="wizard-steps" :active="wizardForms.indexOf(activeForm)" finish-status="success" align-center>
<#list ctrl.getPSDEWizard().getPSDEWizardSteps() as step> <#list ctrl.getPSDEWizard().getPSDEWizardSteps() as step>
<el-step title="${step.getTitle()}"></el-step> <el-step title="${step.getTitle()}"></el-step>
</#list> </#list>
......
...@@ -2,18 +2,20 @@ ...@@ -2,18 +2,20 @@
${item.render.code} ${item.render.code}
<#else> <#else>
<app-rawitem <app-rawitem
:viewparams="viewparams"
:context="context"
contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>" contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>"
sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>" sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>"
contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>" contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>"
<#if item.getRawContent?? && item.getRawContent()??>
rawContent="${item.getRawContent()}"
</#if>
<#if item.getHtmlContent?? && item.getHtmlContent()??> <#if item.getHtmlContent?? && item.getHtmlContent()??>
htmlContent="${item.getHtmlContent()}" :htmlContent="`${item.getHtmlContent()}`"
</#if> </#if>
<#if item.getPSSysImage?? && item.getPSSysImage()??> <#if item.getPSSysImage?? && item.getPSSysImage()??>
<#assign img=item.getPSSysImage()> <#assign img=item.getPSSysImage()>
<#if img.getCssClass()?? && (img.getCssClass()?length gt 0)> <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
imageClass="${img.getCssClass()}"</#if></#if>> imageClass="${img.getCssClass()}"</#if></#if>>
<#if item.getContentType?? && item.getContentType() == 'RAW'>
${item.getRawContent()}
</#if>
</app-rawitem> </app-rawitem>
</#if> </#if>
\ No newline at end of file
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<div class="app-data-chart<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>"> <div class="app-data-chart<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>">
<div v-if="isNoData" class="chart-no-data"><i class="el-icon-data-analysis"></i>{{$t('app.commonWords.noData')}}</div> <div v-if="isNoData" class="chart-no-data"><i class="el-icon-data-analysis"></i>{{$t('<#if langbase??>${langbase}.nodata</#if>')}}</div>
<div v-else class="app-charts" :id="chartId" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()};</#if>height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()}px<#else>100%</#if>;padding: 6px 0;"></div> <div v-else class="app-charts" :id="chartId" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()};</#if>height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()}px<#else>100%</#if>;padding: 6px 0;"></div>
</div> </div>
</#if> </#if>
......
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<div class="app-data-chart<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>"> <div class="app-data-chart<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>">
<div v-if="isNoData" class="chart-no-data"><i class="el-icon-data-analysis"></i>{{$t('app.commonWords.noData')}}</div> <div v-if="isNoData" class="chart-no-data"><i class="el-icon-data-analysis"></i>{{$t('<#if langbase??>${langbase}.nodata</#if>')}}</div>
<div v-else class="app-charts" :id="chartId" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()};</#if>height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()}px<#else>100%</#if>;padding: 6px 0;"></div> <div v-else class="app-charts" :id="chartId" style="<#if ctrl.getWidth() gt 0>width: ${ctrl.getWidth()};</#if>height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()}px<#else>100%</#if>;padding: 6px 0;"></div>
</div> </div>
</#if> </#if>
......
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<#if ctrl.render??><#t> <#if ctrl.render??><#t>
${ctrl.render.code} ${ctrl.render.code}
...@@ -85,13 +88,13 @@ ...@@ -85,13 +88,13 @@
</a> </a>
</div> </div>
<div v-else style="text-align: center;"> <div v-else style="text-align: center;">
{{ $t('app.commonWords.noData') }} {{ $t('<#if langbase??>${langbase}.nodata</#if>') }}
</div> </div>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
</#if> </#if>
</row> </row>
<div v-else class="app-data-empty">{{ $t('app.commonWords.noData') }}</div> <div v-else class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</div>
<el-backtop target=".content-container .app-data-view"></el-backtop> <el-backtop target=".content-container .app-data-view"></el-backtop>
</div> </div>
</#if> </#if>
......
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
* @type {(string)} * @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public placeholder="<@getQuickSearchPlaceholder view />"; public placeholder="<@getQuickSearchPlaceholder ctrl />";
/** /**
* 搜素值 * 搜素值
......
<#ibizinclude> <#ibizinclude>
../../@MACRO/LANG_FUN.ftl ../../@MACRO/LANG_FUN.ftl
</#ibizinclude> </#ibizinclude>
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
...@@ -24,6 +27,7 @@ ${ctrl.render.code} ...@@ -24,6 +27,7 @@ ${ctrl.render.code}
</#if> </#if>
<context-menu-container> <context-menu-container>
<#if ctrl.getCalendarStyle?? && ctrl.getCalendarStyle() == 'TIMELINE'> <#if ctrl.getCalendarStyle?? && ctrl.getCalendarStyle() == 'TIMELINE'>
<template v-if="events.length >0">
<el-timeline> <el-timeline>
<el-timeline-item <el-timeline-item
v-for="(item, index) in events" v-for="(item, index) in events"
...@@ -53,7 +57,12 @@ ${ctrl.render.code} ...@@ -53,7 +57,12 @@ ${ctrl.render.code}
</context-menu> </context-menu>
</el-timeline-item> </el-timeline-item>
</el-timeline> </el-timeline>
</template>
<template v-else>
<span class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</span>
</template>
<#else> <#else>
<template v-if="events.length >0">
<div class="event-legends"> <div class="event-legends">
<#if ctrl.getPSSysCalendarItems()??> <#if ctrl.getPSSysCalendarItems()??>
<#list ctrl.getPSSysCalendarItems() as calendarItem> <#list ctrl.getPSSysCalendarItems() as calendarItem>
...@@ -86,6 +95,10 @@ ${ctrl.render.code} ...@@ -86,6 +95,10 @@ ${ctrl.render.code}
<modal v-model="modalVisible" width="250px" :title="$t('app.calendar.dateSelectModalTitle')" class-name='date-select-modal' @on-ok="gotoDate"> <modal v-model="modalVisible" width="250px" :title="$t('app.calendar.dateSelectModalTitle')" class-name='date-select-modal' @on-ok="gotoDate">
<el-date-picker style="width: 200px;" v-model="selectedGotoDate" type="date"></el-date-picker> <el-date-picker style="width: 200px;" v-model="selectedGotoDate" type="date"></el-date-picker>
</modal> </modal>
</template>
<template v-else>
<span class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</span>
</template>
</#if> </#if>
</context-menu-container> </context-menu-container>
</div> </div>
......
...@@ -12,6 +12,12 @@ ...@@ -12,6 +12,12 @@
.el-timeline{ .el-timeline{
padding-left: 2px; padding-left: 2px;
} }
.app-data-empty{
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;
}
.event-legends{ .event-legends{
width: 100%; width: 100%;
text-align: center; text-align: center;
......
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
:highlight-current-row="isSingleSelect" :highlight-current-row="isSingleSelect"
@current-change="select" @current-change="select"
> >
<template slot="empty">
{{$t('<#if langbase??>${langbase}.nodata</#if>')}}
</template>
<#if ctrl.getPSDETreeColumns()??> <#if ctrl.getPSDETreeColumns()??>
<#list ctrl.getPSDETreeColumns() as column> <#list ctrl.getPSDETreeColumns() as column>
<el-table-column show-overflow-tooltip prop="${column.getName()?lower_case}" label="${column.getCaption()}"<#if column.getWidthUnit()!='STAR'> :width="${column.getWidth()?c}" <#else> :min-width="${column.getWidth()?c}" </#if> :align="'${column.getAlign()?lower_case}'"> <el-table-column show-overflow-tooltip prop="${column.getName()?lower_case}" label="${column.getCaption()}"<#if column.getWidthUnit()!='STAR'> :width="${column.getWidth()?c}" <#else> :min-width="${column.getWidth()?c}" </#if> :align="'${column.getAlign()?lower_case}'">
...@@ -282,7 +285,23 @@ ...@@ -282,7 +285,23 @@
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.load(); this.afterCreated();
}
/**
* 执行created后的逻辑
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public afterCreated() {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
return;
}
if (Object.is('load', action)) {
this.load(data);
}
});
} }
/** /**
...@@ -331,7 +350,7 @@ ...@@ -331,7 +350,7 @@
* 打开编辑数据 * 打开编辑数据
* *
* @returns * @returns
* @memberof TreeTableBase * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public opendata(args: any) { public opendata(args: any) {
if(this.selections.length === 0) { if(this.selections.length === 0) {
...@@ -352,6 +371,27 @@ ...@@ -352,6 +371,27 @@
</#if> </#if>
} }
/**
* vue 生命周期
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public destroyed() {
this.afterDestroy();
}
/**
* 执行destroyed后的逻辑
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
}
<#ibizinclude> <#ibizinclude>
../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
</#ibizinclude> </#ibizinclude>
......
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
...@@ -24,6 +27,7 @@ ...@@ -24,6 +27,7 @@
@check="onCheck" @check="onCheck"
@current-change="selectionChange" @current-change="selectionChange"
:filter-node-method="filterNode" :filter-node-method="filterNode"
:empty-text="$t('<#if langbase??>${langbase}.nodata</#if>')"
> >
<template slot-scope="{ node, data }"> <template slot-scope="{ node, data }">
<context-menu :ref='data.id' :isBlocked="true" :contextMenuStyle="{width: '100%'}" :data="node" :renderContent="renderContextMenu" @showContext="showContext(data,$event)"> <context-menu :ref='data.id' :isBlocked="true" :contextMenuStyle="{width: '100%'}" :data="node" :renderContent="renderContextMenu" @showContext="showContext(data,$event)">
...@@ -270,7 +274,7 @@ import UIService from '@/uiservice/ui-service'; ...@@ -270,7 +274,7 @@ import UIService from '@/uiservice/ui-service';
<#if childCtrl.getControlType() == "CONTEXTMENU"> <#if childCtrl.getControlType() == "CONTEXTMENU">
<#if childCtrl.getPSDEToolbarItems()??> <#if childCtrl.getPSDEToolbarItems()??>
<#list childCtrl.getPSDEToolbarItems() as item> <#list childCtrl.getPSDEToolbarItems() as item>
${childCtrl.getOwner().getNodeType()}_${item.name}: {name:'${item.name}',nodeOwner:'${childCtrl.getOwner().getNodeType()}',<#if item.getPSUIAction()??><#assign uiaction=item.getPSUIAction()>type: '${uiaction.getUIActionType()}', tag: '${uiaction.getUIActionTag()}'<#if (uiaction.getActionTarget()!="")>, actiontarget: '${uiaction.getActionTarget()}'</#if><#if uiaction.getNoPrivDisplayMode(view)??>, noprivdisplaymode:${uiaction.getNoPrivDisplayMode(view)}</#if><#if uiaction.getDataAccessAction()??>, dataaccaction:'${uiaction.getDataAccessAction()}'</#if>, visabled: true, disabled: false</#if>}, ${childCtrl.getOwner().getNodeType()}_${item.name}: {name:'${item.name}',nodeOwner:'${childCtrl.getOwner().getNodeType()}',<#if item.getPSUIAction?? && item.getPSUIAction()??><#assign uiaction=item.getPSUIAction()>type: '${uiaction.getUIActionType()}', tag: '${uiaction.getUIActionTag()}'<#if (uiaction.getActionTarget()!="")>, actiontarget: '${uiaction.getActionTarget()}'</#if><#if uiaction.getNoPrivDisplayMode(view)??>, noprivdisplaymode:${uiaction.getNoPrivDisplayMode(view)}</#if><#if uiaction.getDataAccessAction()??>, dataaccaction:'${uiaction.getDataAccessAction()}'</#if>, visabled: true, disabled: false</#if>},
</#list> </#list>
</#if> </#if>
</#if> </#if>
......
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
* @type {(string)} * @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public placeholder="<@getQuickSearchPlaceholder view />"; public placeholder="<@getQuickSearchPlaceholder ctrl />";
/** /**
* 过滤值 * 过滤值
...@@ -409,7 +409,7 @@ ...@@ -409,7 +409,7 @@
public onDrViewDatasChange($event: any): void { public onDrViewDatasChange($event: any): void {
<#if ctrl.getPSDETree()??> <#if ctrl.getPSDETree()??>
<#assign tree = ctrl.getPSDETree()/> <#assign tree = ctrl.getPSDETree()/>
this.viewState.next({ tag: '${tree.name}', action: 'refresh_current' }); this.viewState.next({ tag: '${tree.name}', action: 'refresh_parent' });
</#if> </#if>
} }
......
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
* @type {(string)} * @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public placeholder="<@getQuickSearchPlaceholder view />"; public placeholder="<@getQuickSearchPlaceholder ctrl />";
/** /**
* 过滤值 * 过滤值
......
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<layout class="app-wizard<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>"> <layout class="app-state-wizard<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>">
<#if ctrl.getPSDEWizard?? && ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardSteps?? && ctrl.getPSDEWizard().getPSDEWizardSteps()??> <#if ctrl.getPSDEWizard?? && ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardSteps?? && ctrl.getPSDEWizard().getPSDEWizardSteps()??>
<div class="view-steps"> <div class="view-steps">
<div class="background-box"></div> <div class="background-box"></div>
<div class="steps_icon" @click="handleClick('PRE')"><i class="el-icon-arrow-left"></i></div> <div class="steps_icon" @click="handleClick('PRE')"><i class="el-icon-arrow-left"></i></div>
<el-steps class="wizard-steps" :active="(wizardForms.indexOf(activeForm) + 1)" finish-status="success"> <el-steps class="wizard-steps" :active="(wizardForms.indexOf(activeForm) + 1)" finish-status="success" align-center>
<#list ctrl.getPSDEWizard().getPSDEWizardSteps() as step> <#list ctrl.getPSDEWizard().getPSDEWizardSteps() as step>
<el-step :class="{'app-active-step':activeForm==='<@getStepForm ctrlmodel=ctrl step=step />'?true:false}"> <el-step :class="{'app-active-step':activeForm==='<@getStepForm ctrlmodel=ctrl step=step />'?true:false}">
<template v-slot:title> <template v-slot:title>
...@@ -37,16 +37,16 @@ ...@@ -37,16 +37,16 @@
<#if ctrl.getPSDEEditForms()??> <#if ctrl.getPSDEEditForms()??>
<#list ctrl.getPSDEEditForms() as form> <#list ctrl.getPSDEEditForms() as form>
<#assign handler = form.getPSAjaxControlHandler() /> <#assign handler = form.getPSAjaxControlHandler() />
<el-popover v-model="stepVisiable['${form.getName()}']" ref="${form.getName()}_popover" popper-class="app-wizard-popover-container" placement="bottom-<#if form_has_next>start<#else>end</#if>" trigger="click"> <el-popover v-model="stepVisiable['${form.getName()}']" ref="${form.getName()}_popover" popper-class="app-state-wizard-popover-container" placement="bottom-<#if form_has_next>start<#else>end</#if>" trigger="click">
<div class="app-wizard-container"> <div class="app-state-wizard-container">
<div class="app-wizard-header"> <div class="app-state-wizard-header">
<div class="app-wizard-header-extra"> <div class="app-state-wizard-header-extra">
<Icon type="md-open" size="18" @click="handleOPen('${form.getName()}')"/> <Icon type="md-open" size="18" @click="handleOPen('${form.getName()}')"/>
<Icon type="md-close" size="18" @click="handleClose('${form.getName()}')"/> <Icon type="md-close" size="18" @click="handleClose('${form.getName()}')"/>
</div> </div>
</div> </div>
<div class="popover-title">${form.getLogicName()}</div> <div class="popover-title">${form.getLogicName()}</div>
<div class="app-wizard-content"> <div class="app-state-wizard-content">
<view_${form.getName()} <view_${form.getName()}
:key="'${form.name}'" :key="'${form.name}'"
:viewState='wizardState' :viewState='wizardState'
...@@ -64,14 +64,14 @@ ...@@ -64,14 +64,14 @@
ref='${form.name}'> ref='${form.name}'>
</view_${form.getName()}> </view_${form.getName()}>
</div> </div>
<div class="app-wizard-footer"> <div class="app-state-wizard-footer">
<i-button v-if="isVisiable('${form.name}','PREV')" @click="onClickPrev('${form.name}')" ><Icon type="ios-arrow-back"></Icon></i-button> <i-button v-if="isVisiable('${form.name}','PREV')" @click="onClickPrev('${form.name}')" ><Icon type="ios-arrow-back"></Icon></i-button>
<i-button v-if="isVisiable('${form.name}','NEXT')" @click="onClickNext('${form.name}')" type="primary" long>{{$t('app.wizardPanel.next')}}</i-button> <i-button v-if="isVisiable('${form.name}','NEXT')" @click="onClickNext('${form.name}')" type="primary" long>{{$t('app.wizardPanel.next')}}</i-button>
<i-button v-if="isVisiable('${form.name}','FINISH')" @click="onClickFinish('${form.name}')" type="primary" long>{{$t('app.wizardPanel.complete')}}</i-button> <i-button v-if="isVisiable('${form.name}','FINISH')" @click="onClickFinish('${form.name}')" type="primary" long>{{$t('app.wizardPanel.complete')}}</i-button>
</div> </div>
</div> </div>
</el-popover> </el-popover>
<drawer class="app-wizard-drawer" :closable="false" :value="drawerOpenStatus.isOpen && drawerOpenStatus.formName == '${form.name}'" <drawer class="app-state-wizard-drawer" :closable="false" :value="drawerOpenStatus.isOpen && drawerOpenStatus.formName == '${form.name}'"
:width="600" title="${form.getLogicName()}" @on-visible-change="onVisibleChange($event)"> :width="600" title="${form.getLogicName()}" @on-visible-change="onVisibleChange($event)">
<view_${form.getName()} <view_${form.getName()}
:key="'${form.name}'" :key="'${form.name}'"
......
.app-wizard { .app-state-wizard {
background: #fff; background: #fff;
height: 100%;
.view-steps{ .view-steps{
display: flex; display: flex;
padding: 0 20px; padding: 0 20px;
...@@ -73,30 +72,30 @@ ...@@ -73,30 +72,30 @@
border-top: 2px solid rgb(225, 225, 225); border-top: 2px solid rgb(225, 225, 225);
} }
} }
.app-wizard-popover-container{ .app-state-wizard-popover-container{
.app-wizard-container{ .app-state-wizard-container{
width: 100%; width: 100%;
.popover-title{ .popover-title{
position: absolute; position: absolute;
top: 14px; top: 14px;
left: 13px; left: 13px;
} }
.app-wizard-header{ .app-state-wizard-header{
width: 100%; width: 100%;
height: 30px; height: 30px;
line-height: 22px; line-height: 22px;
padding: 2px; padding: 2px;
border-bottom: 1px solid #ccc; border-bottom: 1px solid #ccc;
margin-bottom: 10px; margin-bottom: 10px;
.app-wizard-header-extra{ .app-state-wizard-header-extra{
float: right; float: right;
} }
} }
.app-wizard-content{ .app-state-wizard-content{
width: 100%; width: 100%;
padding: 4px 0px; padding: 4px 0px;
} }
.app-wizard-footer{ .app-state-wizard-footer{
display: flex; display: flex;
} }
} }
...@@ -104,7 +103,7 @@ ...@@ -104,7 +103,7 @@
.el-popper[x-placement^=bottom] { .el-popper[x-placement^=bottom] {
margin-top: 0px; margin-top: 0px;
} }
.app-wizard-drawer{ .app-state-wizard-drawer{
.app-form { .app-form {
height: calc(100% - 51px); height: calc(100% - 51px);
} }
......
<#ibizinclude> <#ibizinclude>
../../@MACRO/LANG_FUN.ftl ../../@MACRO/LANG_FUN.ftl
</#ibizinclude> </#ibizinclude>
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<gantt-elastic :class="ganttClass<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" :tasks="tasks" :options="getOptions(this.locale)" :dynamic-style="dynamicStyle" @taskList-item-dblclick="taskClick" @task-item-expand="taskItemExpand"> <div class="app-gantt">
<gantt-elastic v-if="tasks.length >0" :class="ganttClass<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>" :tasks="tasks" :options="getOptions(this.locale)" :dynamic-style="dynamicStyle" @taskList-item-dblclick="taskClick" @task-item-expand="taskItemExpand">
</gantt-elastic> </gantt-elastic>
<div v-else class="app-data-empty">{{$t('<#if langbase??>${langbase}.nodata</#if>')}}</div>
</div>
</#if> </#if>
</template> </template>
<#assign import_block> <#assign import_block>
...@@ -356,8 +362,16 @@ GanttElastic, ...@@ -356,8 +362,16 @@ GanttElastic,
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.afterCreated();
}
/**
* 执行created后的逻辑
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public afterCreated() {
this.locale = this.$i18n.locale; this.locale = this.$i18n.locale;
this.load();
if(AppCenterService && AppCenterService.getMessageCenter()){ if(AppCenterService && AppCenterService.getMessageCenter()){
this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{ this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){ if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
...@@ -368,6 +382,14 @@ GanttElastic, ...@@ -368,6 +382,14 @@ GanttElastic,
} }
}) })
} }
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
return;
}
if (Object.is('load', action)) {
this.load(data);
}
});
} }
/** /**
...@@ -402,6 +424,9 @@ GanttElastic, ...@@ -402,6 +424,9 @@ GanttElastic,
if(this.appStateEvent){ if(this.appStateEvent){
this.appStateEvent.unsubscribe(); this.appStateEvent.unsubscribe();
} }
if(this.viewStateEvent){
this.viewStateEvent.unsubscribe();
}
<#if destroyed_block??> <#if destroyed_block??>
${destroyed_block} ${destroyed_block}
</#if> </#if>
......
.gantt { .app-gantt{
height: 100%;
.gantt {
height: 100%; height: 100%;
.gantt-elastic__main-view-container { .gantt-elastic__main-view-container {
flex-grow: 1; flex-grow: 1;
} }
}
.app-data-empty{
height: 100%;
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;
}
} }
<#ibizinclude> <#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl ../@MACRO/CSS/DEFAULT.less.ftl
......
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<div class="app-data-view-group<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>"> <div class="app-data-view-group<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??><#assign singleCss = ctrl.getPSSysCss()> ${singleCss.getCssName()}</#if>">
<template v-if="items.length > 0">
<template v-for="(group, index) of groups"> <template v-for="(group, index) of groups">
<#if ctrl.groupRender??> <#if ctrl.groupRender??>
${ctrl.groupRender.code} ${ctrl.groupRender.code}
...@@ -68,6 +72,10 @@ ${ctrl.render.code} ...@@ -68,6 +72,10 @@ ${ctrl.render.code}
</#if> </#if>
</div> </div>
</#if> </#if>
</template>
<template v-else>
<span class="app-data-empty">{{ $t('<#if langbase??>${langbase}.nodata</#if>') }}</span>
</template>
</div> </div>
</#if> </#if>
</template> </template>
......
...@@ -52,6 +52,12 @@ ...@@ -52,6 +52,12 @@
border-top-width: 1px; border-top-width: 1px;
} }
} }
.app-data-empty{
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;
}
} }
<#ibizinclude> <#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl ../@MACRO/CSS/DEFAULT.less.ftl
......
...@@ -2,18 +2,20 @@ ...@@ -2,18 +2,20 @@
${item.render.code} ${item.render.code}
<#else> <#else>
<app-rawitem <app-rawitem
:viewparams="viewparams"
:context="context"
contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>" contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>"
sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>" sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>"
contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>" contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>"
<#if item.getRawContent?? && item.getRawContent()??>
rawContent="${item.getRawContent()}"
</#if>
<#if item.getHtmlContent?? && item.getHtmlContent()??> <#if item.getHtmlContent?? && item.getHtmlContent()??>
htmlContent="${item.getHtmlContent()}" :htmlContent="`${item.getHtmlContent()}`"
</#if> </#if>
<#if item.getPSSysImage?? && item.getPSSysImage()??> <#if item.getPSSysImage?? && item.getPSSysImage()??>
<#assign img=item.getPSSysImage()> <#assign img=item.getPSSysImage()>
<#if img.getCssClass()?? && (img.getCssClass()?length gt 0)> <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
imageClass="${img.getCssClass()}"</#if></#if>> imageClass="${img.getCssClass()}"</#if></#if>>
<#if item.getContentType?? && item.getContentType() == 'RAW'>
${item.getRawContent()}
</#if>
</app-rawitem> </app-rawitem>
</#if> </#if>
\ No newline at end of file
...@@ -278,7 +278,7 @@ import { Environment } from '@/environments/environment'; ...@@ -278,7 +278,7 @@ import { Environment } from '@/environments/environment';
</#if> </#if>
<#if ctrl.getPSDEFormItemVRs()??> <#if ctrl.getPSDEFormItemVRs()??>
<#list ctrl.getPSDEFormItemVRs() as fideValueRule> <#list ctrl.getPSDEFormItemVRs() as fideValueRule>
<#if fideValueRule.getPSDEFormItemName() == formdetail.getName()> <#if fideValueRule.getPSDEFormItemName()?lower_case == formdetail.getName()?lower_case >
<#-- 系统值规则 --> <#-- 系统值规则 -->
<#if fideValueRule.getPSSysValueRule()??> <#if fideValueRule.getPSSysValueRule()??>
<#assign valueRule = fideValueRule.getPSSysValueRule()/> <#assign valueRule = fideValueRule.getPSSysValueRule()/>
...@@ -293,8 +293,8 @@ import { Environment } from '@/environments/environment'; ...@@ -293,8 +293,8 @@ import { Environment } from '@/environments/environment';
<#-- 属性值规则 --> <#-- 属性值规则 -->
<#if fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()?? && fideValueRule.getCheckMode() != 2 && fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??> <#if fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()?? && fideValueRule.getCheckMode() != 2 && fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??>
<#assign deRule = fideValueRule.getPSDEFValueRule()/> <#assign deRule = fideValueRule.getPSDEFValueRule()/>
{validator:(rule:any, value:any)=>{return this.verifyDeRules("${fideValueRule.getPSDEFormItemName()}").isPast},message: this.verifyDeRules("${fideValueRule.getPSDEFormItemName()}").infoMessage, trigger: 'change' }, {validator:(rule:any, value:any)=>{return this.verifyDeRules("${fideValueRule.getPSDEFormItemName()?lower_case}").isPast},message: this.verifyDeRules("${fideValueRule.getPSDEFormItemName()?lower_case}").infoMessage, trigger: 'change' },
{validator:(rule:any, value:any)=>{return this.verifyDeRules("${fideValueRule.getPSDEFormItemName()}").isPast},message: this.verifyDeRules("${fideValueRule.getPSDEFormItemName()}").infoMessage, trigger: 'blur' }, {validator:(rule:any, value:any)=>{return this.verifyDeRules("${fideValueRule.getPSDEFormItemName()?lower_case}").isPast},message: this.verifyDeRules("${fideValueRule.getPSDEFormItemName()?lower_case}").infoMessage, trigger: 'blur' },
</#if> </#if>
</#if> </#if>
</#list> </#list>
...@@ -317,7 +317,7 @@ import { Environment } from '@/environments/environment'; ...@@ -317,7 +317,7 @@ import { Environment } from '@/environments/environment';
<#if fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()?? && fideValueRule.getCheckMode() != 2 && fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??> <#if fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()?? && fideValueRule.getCheckMode() != 2 && fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??>
<#assign deRule = fideValueRule.getPSDEFValueRule()/> <#assign deRule = fideValueRule.getPSDEFValueRule()/>
<#if fideValueRule.getPSDEFormItemName?? && fideValueRule.getPSDEFormItemName()??> <#if fideValueRule.getPSDEFormItemName?? && fideValueRule.getPSDEFormItemName()??>
${fideValueRule.getPSDEFormItemName()}:[ ${fideValueRule.getPSDEFormItemName()?lower_case}:[
<#if deRule.getPSDEFVRGroupCondition?? && deRule.getPSDEFVRGroupCondition()?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??> <#if deRule.getPSDEFVRGroupCondition?? && deRule.getPSDEFVRGroupCondition()?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
<#list deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() as condItem> <#list deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() as condItem>
<@getDeRule condItem /> <@getDeRule condItem />
...@@ -858,12 +858,12 @@ import { Environment } from '@/environments/environment'; ...@@ -858,12 +858,12 @@ import { Environment } from '@/environments/environment';
const arg: any = { ...JSON.parse(JSON.stringify(this.data)) } ; const arg: any = { ...JSON.parse(JSON.stringify(this.data)) } ;
Object.assign(arg, { srfactionparam: result.datas }); Object.assign(arg, { srfactionparam: result.datas });
const details: string[] = [<#list itemUpdate.getPSDEFIUpdateDetails() as detail><#if detail_index gt 0>, </#if>'${detail.getPSDEFormDetailName()?lower_case}'</#list>]; const details: string[] = [<#list itemUpdate.getPSDEFIUpdateDetails() as detail><#if detail_index gt 0>, </#if>'${detail.getPSDEFormDetailName()?lower_case}'</#list>];
this.updateFormItems('${itemUpdate.codeName}', arg, details, ${itemUpdate.isShowBusyIndicator()?c}); this.updateFormItems('${itemUpdate.getPSAppDEMethod().getCodeName()}', arg, details, ${itemUpdate.isShowBusyIndicator()?c});
} }
}); });
<#else> <#else>
const details: string[] = [<#list itemUpdate.getPSDEFIUpdateDetails() as detail><#if detail_index gt 0>, </#if>'${detail.getPSDEFormDetailName()?lower_case}'</#list>]; const details: string[] = [<#list itemUpdate.getPSDEFIUpdateDetails() as detail><#if detail_index gt 0>, </#if>'${detail.getPSDEFormDetailName()?lower_case}'</#list>];
this.updateFormItems('${itemUpdate.codeName}', this.data, details, ${itemUpdate.isShowBusyIndicator()?c}); this.updateFormItems('${itemUpdate.getPSAppDEMethod().getCodeName()}', this.data, details, ${itemUpdate.isShowBusyIndicator()?c});
</#if> </#if>
} }
</#if> </#if>
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</#if> </#if>
<template <#if (ctrl.isEnableRowEdit() && item.isEnableRowEdit())>v-if="!actualIsOpenEdit"</#if>> <template <#if (ctrl.isEnableRowEdit() && item.isEnableRowEdit())>v-if="!actualIsOpenEdit"</#if>>
<#if item.getPSDEUIAction?? && item.getPSDEUIAction()??> <#if item.getPSDEUIAction?? && item.getPSDEUIAction()??>
<a @click="uiAction(row, '${item.getPSDEUIAction().getUIActionTag()}', $event)"> <a v-show="row.${item.getPSDEUIAction().getUIActionTag()}.visabled" :disabled="row.${item.getPSDEUIAction().getUIActionTag()}.disabled" :style="{'display': 'block'}" @click="uiAction(row, '${item.getPSDEUIAction().getUIActionTag()}', $event)">
</#if> </#if>
<#if (item.render??)> <#if (item.render??)>
<#-- BEGIN:列绘制 --> <#-- BEGIN:列绘制 -->
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
</app-column-link > </app-column-link >
<#else> <#else>
<#if item.getPSDEUIAction?? && item.getPSDEUIAction()??> <#if item.getPSDEUIAction?? && item.getPSDEUIAction()??>
<a @click="uiAction(row, '${item.getPSDEUIAction().getUIActionTag()}', $event)"> <a v-show="row.${item.getPSDEUIAction().getUIActionTag()}.visabled" :disabled="row.${item.getPSDEUIAction().getUIActionTag()}.disabled" :style="{'display': 'block'}" @click="uiAction(row, '${item.getPSDEUIAction().getUIActionTag()}', $event)">
</#if> </#if>
<#if item.getValueFormat()?? && item.getValueFormat() != "%1$s"> <#if item.getValueFormat()?? && item.getValueFormat() != "%1$s">
<app-format-data format="${item.getValueFormat()}" :data="row.${item.getName()?lower_case}"></app-format-data> <app-format-data format="${item.getValueFormat()}" :data="row.${item.getName()?lower_case}"></app-format-data>
......
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<template> <template>
<#if ctrl.render??> <#if ctrl.render??>
${ctrl.render.code} ${ctrl.render.code}
...@@ -38,7 +41,7 @@ ${ctrl.render.code} ...@@ -38,7 +41,7 @@ ${ctrl.render.code}
@row-dblclick="rowDBLClick($event)" @row-dblclick="rowDBLClick($event)"
ref='multipleTable' :data="items" :show-header="!isHideHeader"> ref='multipleTable' :data="items" :show-header="!isHideHeader">
<template slot="empty"> <template slot="empty">
{{$t('app.gridpage.noData')}} {{$t('<#if langbase??>${langbase}.nodata</#if>')}}
<#if ctrl.getQuickPSDEToolbar?? && ctrl.getQuickPSDEToolbar()??> <#if ctrl.getQuickPSDEToolbar?? && ctrl.getQuickPSDEToolbar()??>
<span class="quick-toolbar"> <span class="quick-toolbar">
<#assign quickToolbar = ctrl.getQuickPSDEToolbar()/> <#assign quickToolbar = ctrl.getQuickPSDEToolbar()/>
...@@ -492,6 +495,14 @@ import { Environment } from '@/environments/environment'; ...@@ -492,6 +495,14 @@ import { Environment } from '@/environments/environment';
*/ */
public isDisplay:boolean = <#if ctrl.getAggMode() == "ALL">false<#else>true</#if>; public isDisplay:boolean = <#if ctrl.getAggMode() == "ALL">false<#else>true</#if>;
/**
* 表格行编辑项校验错误提示信息
*
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public errorMessages: Array<any> = [];
/** /**
* 部件刷新 * 部件刷新
* *
...@@ -541,6 +552,13 @@ import { Environment } from '@/environments/environment'; ...@@ -541,6 +552,13 @@ import { Environment } from '@/environments/environment';
isEnableRowEdit: false, isEnableRowEdit: false,
</#if> </#if>
<#-- END:是否支持行编辑 --> <#-- END:是否支持行编辑 -->
<#-- BEGIN:是否启用 -->
<#if column.getEnableCond?? && column.getEnableCond()??>
enableCond: ${column.getEnableCond()?c} ,
<#else>
enableCond: 3 ,
</#if>
<#-- END:是否启用 -->
}, },
</#list> </#list>
</#if> </#if>
...@@ -646,7 +664,7 @@ import { Environment } from '@/environments/environment'; ...@@ -646,7 +664,7 @@ import { Environment } from '@/environments/environment';
<#assign valueRule = fideValueRule.getPSSysValueRule()/> <#assign valueRule = fideValueRule.getPSSysValueRule()/>
<#if valueRule.getRuleType?? && valueRule.getRuleType()??> <#if valueRule.getRuleType?? && valueRule.getRuleType()??>
<#if valueRule.getRuleType() == "REG"> <#if valueRule.getRuleType() == "REG">
{ <#if valueRule.getRegExCode?? && valueRule.getRegExCode()??>pattern: /^${valueRule.getRegExCode()}$/</#if><#if valueRule.getRuleInfo?? && valueRule.getRuleInfo()??>, message: '${valueRule.getRuleInfo()}'</#if>, trigger: 'change' }, { <#if valueRule.getRegExCode?? && valueRule.getRegExCode()??>pattern: /${valueRule.getRegExCode()}/</#if><#if valueRule.getRuleInfo?? && valueRule.getRuleInfo()??>, message: '${valueRule.getRuleInfo()}'</#if>, trigger: 'change' },
<#elseif valueRule.getRuleType() == "SCRIPT"> <#elseif valueRule.getRuleType() == "SCRIPT">
{ <#if valueRule.getScriptCode?? && valueRule.getScriptCode()??>validator: (rule:any, value:any, callback:any) => { ${valueRule.getScriptCode()} }</#if><#if valueRule.getRuleInfo?? && valueRule.getRuleInfo()??>, message: '${valueRule.getRuleInfo()}'</#if>, trigger: 'change' }, { <#if valueRule.getScriptCode?? && valueRule.getScriptCode()??>validator: (rule:any, value:any, callback:any) => { ${valueRule.getScriptCode()} }</#if><#if valueRule.getRuleInfo?? && valueRule.getRuleInfo()??>, message: '${valueRule.getRuleInfo()}'</#if>, trigger: 'change' },
</#if> </#if>
...@@ -694,6 +712,7 @@ import { Environment } from '@/environments/environment'; ...@@ -694,6 +712,7 @@ import { Environment } from '@/environments/environment';
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public async validateAll(){ public async validateAll(){
this.errorMessages = [];
let validateState = true; let validateState = true;
let index = -1; let index = -1;
for(let item of this.items){ for(let item of this.items){
...@@ -702,6 +721,7 @@ import { Environment } from '@/environments/environment'; ...@@ -702,6 +721,7 @@ import { Environment } from '@/environments/environment';
for(let property of Object.keys(this.rules)){ for(let property of Object.keys(this.rules)){
if(!await this.validate(property,item,index)){ if(!await this.validate(property,item,index)){
validateState = false; validateState = false;
this.errorMessages.push(this.gridItemsModel[index][property].error);
} }
} }
} }
...@@ -1098,14 +1118,36 @@ import { Environment } from '@/environments/environment'; ...@@ -1098,14 +1118,36 @@ import { Environment } from '@/environments/environment';
*/ */
public async formatExcelData(filterVal:any, jsonData:any) { public async formatExcelData(filterVal:any, jsonData:any) {
let codelistColumns:Array<any> = [ let codelistColumns:Array<any> = [
<#if hasDEExport> <#if ctrl.getPSDEDataExport()?? && ctrl.getPSDEDataExport().getPSDEDataExportItems()??>
<#assign exportItems = ctrl.getPSDEDataExport().getPSDEDataExportItems() /> <#list ctrl.getPSDEDataExport().getPSDEDataExportItems() as column>
<#else> <#if column.getPSCodeList?? && column.getPSCodeList()??>
<#assign exportItems = ctrl.getAllPSDEGridColumns() /> <#assign codelist = column.getPSCodeList()>
</#if> <#if codelist.getCodeListType() == 'STATIC' || codelist.getCodeListType() == 'DYNAMIC'>
<#if exportItems??> {
<#list exportItems as column> name: '${column.getName()?lower_case}',
<#if (hasDEExport || (!column.isHideDefault() && column.getName() != '')) && column.getCodeList?? && column.getCodeList()?? && column.getCLConvertMode() == 'FRONT'> srfkey: '${codelist.codeName}',
codelistType : '${codelist.getCodeListType()}',
<#if codelist.getOrMode() == 'STR'>
textSeparator: '${codelist.textSeparator}',
renderMode: 'string',
valueSeparator: "${codelist.valueSeparator}",
<#elseif codelist.getOrMode() == 'NUM'>
renderMode: 'number',
textSeparator: '${codelist.textSeparator}',
valueSeparator: ',',
<#else>
renderMode: 'other',
textSeparator: '、',
valueSeparator: ',',
</#if>
},
</#if>
</#if>
</#list>
<#else>
<#if ctrl.getAllPSDEGridColumns()??>
<#list ctrl.getAllPSDEGridColumns() as column>
<#if (!column.isHideDefault() && column.getName() != '') && column.getPSCodeList?? && column.getPSCodeList()?? && column.getCLConvertMode() == 'FRONT'>
<#assign codelist = column.getPSCodeList()> <#assign codelist = column.getPSCodeList()>
<#if codelist.getCodeListType() == 'STATIC' || codelist.getCodeListType() == 'DYNAMIC'> <#if codelist.getCodeListType() == 'STATIC' || codelist.getCodeListType() == 'DYNAMIC'>
{ {
...@@ -1129,6 +1171,7 @@ import { Environment } from '@/environments/environment'; ...@@ -1129,6 +1171,7 @@ import { Environment } from '@/environments/environment';
</#if> </#if>
</#if> </#if>
</#list> </#list>
</#if>
</#if> </#if>
]; ];
let _this = this; let _this = this;
...@@ -1161,7 +1204,7 @@ import { Environment } from '@/environments/environment'; ...@@ -1161,7 +1204,7 @@ import { Environment } from '@/environments/environment';
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getCodelistValue(items: any[], value: any, codelist: any,){ public getCodelistValue(items: any[], value: any, codelist: any,){
if(!value){ if(!value && value !== 0 && value !== false){
return this.$t('codelist.'+codelist.srfkey+'.empty'); return this.$t('codelist.'+codelist.srfkey+'.empty');
} }
if (items) { if (items) {
...@@ -1913,8 +1956,16 @@ import { Environment } from '@/environments/environment'; ...@@ -1913,8 +1956,16 @@ import { Environment } from '@/environments/environment';
} }
} }
} }
if(!await this.validateAll()){ if (!await this.validateAll()) {
if(this.errorMessages && this.errorMessages.length > 0) {
let descMessage: string = '';
this.errorMessages.forEach((message: any) => {
descMessage = descMessage + '<p>' + message + '<p>';
})
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: descMessage });
} else {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
}
return []; return [];
} }
let successItems:any = []; let successItems:any = [];
...@@ -2067,9 +2118,20 @@ import { Environment } from '@/environments/environment'; ...@@ -2067,9 +2118,20 @@ import { Environment } from '@/environments/environment';
if (!mode || (mode && Object.is(mode, ''))) { if (!mode || (mode && Object.is(mode, ''))) {
return; return;
} }
<#if ctrl.getAllPSDEGridColumns?? && ctrl.getAllPSDEGridColumns()??>
<#list ctrl.getAllPSDEGridColumns() as column>
<#if column.getPSAppDEField?? && column.getPSAppDEField()?? && column.getPSAppDEField().isKeyField() && appde.getKeyPSAppDEField()?? && appde.getKeyPSAppDEField().getCodeName() == column.getPSAppDEField().getCodeName()>
<#assign columnKeyName = column.getName()?lower_case >
</#if>
</#list>
</#if>
let tempContext: any = this.$util.deepCopy(this.context);
<#if columnKeyName??>
Object.is(tempContext, { ${appde.getCodeName()?lower_case}: data.${columnKeyName} });
</#if>
const arg: any = JSON.parse(JSON.stringify(data)); const arg: any = JSON.parse(JSON.stringify(data));
Object.assign(arg,{viewparams:this.viewparams}); Object.assign(arg,{viewparams:this.viewparams});
const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading); const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);
post.then((response: any) => { post.then((response: any) => {
if (!response || response.status !== 200) { if (!response || response.status !== 200) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.gridpage.formitemFailed') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.gridpage.formitemFailed') as string) });
...@@ -2378,6 +2440,24 @@ import { Environment } from '@/environments/environment'; ...@@ -2378,6 +2440,24 @@ import { Environment } from '@/environments/environment';
}) })
} }
/**
* 获取表格列禁用状态
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public getColumnDisabled(data:any,name:string){
if(this.allColumns || Array.isArray(this.allColumns)){
const curColumn:any = this.allColumns.find((item:any) =>{
return item.name === name;
})
if(curColumn.hasOwnProperty('enableCond')){
return data.srfuf == 1 ? (curColumn.enableCond & 2) !== 2 : (curColumn.enableCond & 1) !== 1
}else{
return false;
}
}
}
<#ibizinclude> <#ibizinclude>
../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
</#ibizinclude> </#ibizinclude>
......
...@@ -236,7 +236,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi ...@@ -236,7 +236,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
result.then((response) => { result.then((response) => {
//处理返回数据,补充判断标识 //处理返回数据,补充判断标识
if(response.data){ if(response.data){
Object.assign(response.data,{srfuf:0}); Object.assign(response.data,{srfuf:'0'});
} }
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -445,7 +445,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi ...@@ -445,7 +445,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
requestData[item.prop] = context[item.name]; requestData[item.prop] = context[item.name];
} }
}else{ }else{
if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){ if(item && item.isEditable && item.prop && item.name && data.hasOwnProperty(item.name)){
requestData[item.prop] = data[item.name]; requestData[item.prop] = data[item.name];
} }
} }
......
...@@ -168,7 +168,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co ...@@ -168,7 +168,7 @@ import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/co
* @type {(string)} * @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public placeholder="<@getQuickSearchPlaceholder view />"; public placeholder="<@getQuickSearchPlaceholder ctrl />";
/** /**
* 搜素值 * 搜素值
......
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
<#ibizinclude> <#ibizinclude>
../@MACRO/View_Pos_Body_Msgs.vue.ftl ../@MACRO/View_Pos_Body_Msgs.vue.ftl
</#ibizinclude> </#ibizinclude>
<#if view.hasPSControl('statewizardpanel')>
${P.getCtrlCode('statewizardpanel', 'CONTROL.html').code}
</#if>
<#if view.hasPSControl('tabexppanel')> <#if view.hasPSControl('tabexppanel')>
${P.getCtrlCode('tabexppanel', 'CONTROL.html').code} ${P.getCtrlCode('tabexppanel', 'CONTROL.html').code}
</#if> </#if>
......
...@@ -155,19 +155,21 @@ ...@@ -155,19 +155,21 @@
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<app-rawitem <app-rawitem
:viewparams="viewparams"
:context="context"
contentStyle="<#if ctrl.getPSSysCss()??>${ctrl.getPSSysCss().getCssName()}</#if>" contentStyle="<#if ctrl.getPSSysCss()??>${ctrl.getPSSysCss().getCssName()}</#if>"
sizeStyle="<#if ctrl.getRawItemHeight() gt 0>height: ${ctrl.getRawItemHeight()?c}px;</#if><#if ctrl.getRawItemWidth() gt 0>width: ${ctrl.getRawItemWidth()?c}px;</#if>" sizeStyle="<#if ctrl.getRawItemHeight() gt 0>height: ${ctrl.getRawItemHeight()?c}px;</#if><#if ctrl.getRawItemWidth() gt 0>width: ${ctrl.getRawItemWidth()?c}px;</#if>"
contentType="<#if ctrl.getContentType?? && ctrl.getContentType()??>${ctrl.getContentType()}</#if>" contentType="<#if ctrl.getContentType?? && ctrl.getContentType()??>${ctrl.getContentType()}</#if>"
<#if ctrl.getRawContent?? && ctrl.getRawContent()??>
rawContent="${ctrl.getRawContent()}"
</#if>
<#if ctrl.getHtmlContent?? && ctrl.getHtmlContent()??> <#if ctrl.getHtmlContent?? && ctrl.getHtmlContent()??>
htmlContent="${ctrl.getHtmlContent()}" :htmlContent="`${ctrl.getHtmlContent()}`"
</#if> </#if>
<#if ctrl.getPSSysImage?? && ctrl.getPSSysImage()??> <#if ctrl.getPSSysImage?? && ctrl.getPSSysImage()??>
<#assign img=ctrl.getPSSysImage()> <#assign img=ctrl.getPSSysImage()>
<#if img.getCssClass()?? && (img.getCssClass()?length gt 0)> <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
imageClass="${img.getCssClass()}"</#if></#if>> imageClass="${img.getCssClass()}"</#if></#if>>
<#if ctrl.getContentType?? && ctrl.getContentType() == 'RAW'>
${ctrl.getRawContent()}
</#if>
</app-rawitem> </app-rawitem>
</#if> </#if>
</div> </div>
......
...@@ -3,20 +3,21 @@ ...@@ -3,20 +3,21 @@
${item.render.code} ${item.render.code}
<#else> <#else>
<app-rawitem <app-rawitem
:viewparams="viewparams"
:context="context"
contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>" contentStyle="<#if item.getPSSysCss()??>${item.getPSSysCss().getCssName()}</#if>"
sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>" sizeStyle="<#if item.getRawItemHeight() gt 0>height: ${item.getRawItemHeight()?c}px;</#if><#if item.getRawItemWidth() gt 0>width: ${item.getRawItemWidth()?c}px;</#if>"
contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>" contentType="<#if item.getContentType?? && item.getContentType()??>${item.getContentType()}</#if>"
caption="<#if item.getCaption?? && item.getCaption()??>${item.getCaption()}</#if>"
<#if item.getRawContent?? && item.getRawContent()??>
rawContent="${item.getRawContent()}"
</#if>
<#if item.getHtmlContent?? && item.getHtmlContent()??> <#if item.getHtmlContent?? && item.getHtmlContent()??>
htmlContent="${item.getHtmlContent()}" :htmlContent="`${item.getHtmlContent()}`"
</#if> </#if>
<#if item.getPSSysImage?? && item.getPSSysImage()??> <#if item.getPSSysImage?? && item.getPSSysImage()??>
<#assign img=item.getPSSysImage()> <#assign img=item.getPSSysImage()>
<#if img.getCssClass()?? && (img.getCssClass()?length gt 0)> <#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>
imageClass="${img.getCssClass()}"</#if></#if>> imageClass="${img.getCssClass()}"</#if></#if>>
<#if item.getContentType?? && item.getContentType() == 'RAW'>
${item.getRawContent()}
</#if>
</app-rawitem> </app-rawitem>
</#if> </#if>
</#assign> </#assign>
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box <input-box
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
v-model="row[column.property]" v-model="row[column.property]"
style="${item.getEditorCssStyle()}" style="${item.getEditorCssStyle()}"
type="text" type="text"
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box <input-box
v-model="data.${editor.getName()?lower_case}" v-model="data.${editor.getName()?lower_case}"
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-rich-text-editor :formState="formState" :value="data.${editor.name}" @change="(val) =>{this.data.${editor.name} =val}" :disabled="detailsModel.${editor.name}.disabled" :data="JSON.stringify(this.data)" name="${editor.name}" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' <#if editor.getEditorHeight() gt 0> height={${editor.getEditorHeight()?c}}</#if> style="${editor.getEditorCssStyle()}"></app-rich-text-editor> <app-rich-text-editor :formState="formState" :value="data.${editor.name}" @change="(val) =>{this.data.${editor.name} =val}" :disabled="detailsModel.${editor.name}.disabled" :data="JSON.stringify(this.data)" name="${editor.name}" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' <#if editor.getEditorHeight() gt 0> height={${editor.getEditorHeight()?c}}</#if> style="${editor.getEditorCssStyle()}"></app-rich-text-editor>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-rich-text-editor :formState="formState" :value="data.${editor.name}" @change="(val) =>{this.data.${editor.name} =val;panelEditItemChange(data, '${editor.name?lower_case}', val)}" :disabled="detailsModel.${item.getCodeName()}.disabled" :data="JSON.stringify(this.data)" name="${editor.name}" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' <#if editor.getEditorHeight() gt 0> height={${editor.getEditorHeight()?c}}</#if> style="${editor.getEditorCssStyle()}"></app-rich-text-editor> <app-rich-text-editor :formState="formState" :value="data.${editor.name}" @change="(val) =>{this.data.${editor.name} =val;panelEditItemChange(data, '${editor.name?lower_case}', val)}" :disabled="detailsModel.${item.getCodeName()}.disabled" :data="JSON.stringify(this.data)" name="${editor.name}" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' <#if editor.getEditorHeight() gt 0> height={${editor.getEditorHeight()?c}}</#if> style="${editor.getEditorCssStyle()}"></app-rich-text-editor>
</#if> </#if>
\ No newline at end of file
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<dropdown-list <dropdown-list
v-model="row[column.property]" v-model="row[column.property]"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
:data="row" :data="row"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list <dropdown-list
v-model="data.${editor.name}" v-model="data.${editor.name}"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list <dropdown-list
v-model="row[column.property]" v-model="row[column.property]"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
:data="row" :data="row"
:context="context" :context="context"
:viewparams="viewparams" :viewparams="viewparams"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list <dropdown-list
v-model="data.${editor.name?lower_case}" v-model="data.${editor.name?lower_case}"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list <dropdown-list
v-model="data.${editor.name}" v-model="data.${editor.name}"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list <dropdown-list
v-model="row[column.property]" v-model="row[column.property]"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
style="${item.getEditorCssStyle()}width: 100px;" style="${item.getEditorCssStyle()}width: 100px;"
:data="row" :data="row"
:context="context" :context="context"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list <dropdown-list
v-model="data.${editor.name?lower_case}" v-model="data.${editor.name?lower_case}"
......
<dropdown-list-mpicker <dropdown-list-mpicker
v-model="row[column.property]" v-model="row[column.property]"
:itemParam="<#if item.getEditorParam('ITEMPARAM','') != ''>${item.getEditorParam('ITEMPARAM','')}<#else>{}</#if>" :itemParam="<#if item.getEditorParam('ITEMPARAM','') != ''>${item.getEditorParam('ITEMPARAM','')}<#else>{}</#if>"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
<#if item.getPSCodeList()??> <#if item.getPSCodeList()??>
<#assign codelist=editor.getPSCodeList()> <#assign codelist=editor.getPSCodeList()>
tag='${codelist.codeName}' tag='${codelist.codeName}'
......
<dropdown-list-mpicker <dropdown-list-mpicker
v-model="row[column.property]" v-model="row[column.property]"
:itemParam="<#if item.getEditorParam('ITEMPARAM','') != ''>${item.getEditorParam('ITEMPARAM','')}<#else>{}</#if>" :itemParam="<#if item.getEditorParam('ITEMPARAM','') != ''>${item.getEditorParam('ITEMPARAM','')}<#else>{}</#if>"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
<#if item.getPSCodeList()??> <#if item.getPSCodeList()??>
<#assign codelist=editor.getPSCodeList()> <#assign codelist=editor.getPSCodeList()>
tag='${codelist.codeName}' tag='${codelist.codeName}'
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list-mpicker <dropdown-list-mpicker
v-model="data.${editor.name}" v-model="data.${editor.name}"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list-mpicker <dropdown-list-mpicker
v-model="row[column.property]" v-model="row[column.property]"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
<#if item.getPSCodeList()??> <#if item.getPSCodeList()??>
<#assign codelist=editor.getPSCodeList()> <#assign codelist=editor.getPSCodeList()>
tag='${codelist.codeName}' tag='${codelist.codeName}'
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<dropdown-list-mpicker <dropdown-list-mpicker
v-model="data.${editor.name?lower_case}" v-model="data.${editor.name?lower_case}"
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-code-editor :code="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" @change="(val) =>{this.data.${editor.name} =val}" codetype="javascript" ></app-code-editor> <app-code-editor :code="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" @change="(val) =>{this.data.${editor.name} =val}" codetype="javascript" ></app-code-editor>
</#if> </#if>
\ No newline at end of file
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-radio-group <app-radio-group
v-model="data.${editor.name}" v-model="data.${editor.name}"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-radio-group <app-radio-group
v-model="row[column.property]" v-model="row[column.property]"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
name="${item.name}" name="${item.name}"
:data="row" :data="row"
:context="context" :context="context"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-radio-group <app-radio-group
v-model="data.${editor.name?lower_case}" v-model="data.${editor.name?lower_case}"
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' style="${editor.getEditorCssStyle()}overflow: auto;"></app-image-upload> <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' style="${editor.getEditorCssStyle()}overflow: auto;"></app-image-upload>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-file-upload <app-file-upload
:formState="viewState" :formState="viewState"
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:data="JSON.stringify(row)" :data="JSON.stringify(row)"
:name='column.property' :name='column.property'
:value="row[column.property]" :value="row[column.property]"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
:rowPreview="true" :rowPreview="true"
:imageOnly="true" :imageOnly="true"
:uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-file-upload <app-file-upload
:formState="viewState" :formState="viewState"
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-image-upload :multiple="false" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' ></app-image-upload> <app-image-upload :multiple="false" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' ></app-image-upload>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-file-upload <app-file-upload
:formState="viewState" :formState="viewState"
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
:data="JSON.stringify(row)" :data="JSON.stringify(row)"
:name='column.property' :name='column.property'
:value="row[column.property]" :value="row[column.property]"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
:rowPreview="true" :rowPreview="true"
:imageOnly="true" :imageOnly="true"
:uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-file-upload <app-file-upload
:formState="viewState" :formState="viewState"
......
<#if item.render??>
${item.render.code}
<#else>
<app-image-romate :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="this.data" name='${editor.name}' :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-image-romate>
</#if>
\ No newline at end of file
EDITORTYPE=PICTURE#ROMATE
\ No newline at end of file
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
<app-mpicker <app-mpicker
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
<app-mpicker <app-mpicker
:activeData="row" :activeData="row"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
:curvalue="row[column.property]" :curvalue="row[column.property]"
:name="column.property" :name="column.property"
:context="context" :context="context"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
<app-mpicker <app-mpicker
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
<app-mpicker <app-mpicker
:activeData="row" :activeData="row"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
:curvalue="row[column.property]" :curvalue="row[column.property]"
:name="column.property" :name="column.property"
:context="context" :context="context"
......
<div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type"> <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
<textarea class="ivu-input" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea> <textarea class="ivu-input" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
</div> </div>
\ No newline at end of file
<div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type"> <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
<textarea class="ivu-input" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea> <textarea class="ivu-input" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
</div> </div>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box v-model="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" type='textarea' style="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box> <input-box v-model="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" type='textarea' style="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type"> <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
<textarea class="ivu-input" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea> <textarea class="ivu-input" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
</div> </div>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type"> <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
<textarea <textarea
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box v-model="data.${editor.name}" :textareaId="this.$util.createUUID()" :disabled="detailsModel.${editor.name}.disabled" type='textarea' textareaStyle="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box> <input-box v-model="data.${editor.name}" :textareaId="this.$util.createUUID()" :disabled="detailsModel.${editor.name}.disabled" type='textarea' textareaStyle="${editor.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if>></input-box>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type"> <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
<textarea class="ivu-input" rows="10" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea> <textarea class="ivu-input" rows="10" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" <#if item.getPlaceHolder()??> placeholder="${item.getPlaceHolder()}"</#if> @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></textarea>
</div> </div>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type"> <div class="ivu-input-wrapper ivu-input-wrapper-default ivu-input-type">
<textarea <textarea
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<i-input type="password" v-model="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></i-input> <i-input type="password" v-model="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></i-input>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box type="password" :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" v-model="row[column.property]" style="${item.getEditorCssStyle()}" @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></input-box> <input-box type="password" :disabled="getColumnDisabled(row,column.property)" v-model="row[column.property]" style="${item.getEditorCssStyle()}" @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}"></input-box>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box <input-box
type="password" type="password"
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-switch name='${editor.name}' :value="this.data.${editor.name}" @change="($event)=>{this.data.${editor.name} = $event} " :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-switch> <app-switch name='${editor.name}' :value="this.data.${editor.name}" @change="($event)=>{this.data.${editor.name} = $event} " :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-switch>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-switch name='${editor.name}' :value="row[column.property]" @change="($event)=>{row[column.property] = $event;gridEditItemChange(row, column.property, $event, $index)} " :disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" style="${item.getEditorCssStyle()}"></app-switch> <app-switch name='${editor.name}' :value="row[column.property]" @change="($event)=>{row[column.property] = $event;gridEditItemChange(row, column.property, $event, $index)} " :disabled="getColumnDisabled(row,column.property)" style="${item.getEditorCssStyle()}"></app-switch>
</#if> </#if>
\ No newline at end of file
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-switch <app-switch
name='${editor.name?lower_case}' name='${editor.name?lower_case}'
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box <input-box
v-model="data.${editor.name}" v-model="data.${editor.name}"
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box <input-box
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
v-model="row[column.property]" v-model="row[column.property]"
<#if item.getUnitName?? && item.getUnitName()??> <#if item.getUnitName?? && item.getUnitName()??>
unit="${item.getUnitName()}" unit="${item.getUnitName()}"
......
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<input-box <input-box
type="number" type="number"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
name='${editor.name}' name='${editor.name}'
<#if editor.getEditorParam("PICKUPDATA", "") != "">pickUpData="${editor.getEditorParam("PICKUPDATA", "")}"</#if> <#if editor.getEditorParam("PICKUPDATA", "") != "">pickUpData="${editor.getEditorParam("PICKUPDATA", "")}"</#if>
<#-- 自填模式文本属性、值属性start --> <#-- 自填模式文本属性、值属性start -->
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
name='${editor.name}' name='${editor.name}'
<#if editor.getPSAppDataEntity?? && editor.getPSAppDataEntity()??> <#if editor.getPSAppDataEntity?? && editor.getPSAppDataEntity()??>
deMajorField='${editor.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}' deMajorField='${editor.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}'
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<#if editor.getPickupPSAppView().getViewType() == 'DEMPICKUPVIEW'> <#if editor.getPickupPSAppView().getViewType() == 'DEMPICKUPVIEW'>
:isSingleSelect="false" :isSingleSelect="false"
</#if> </#if>
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
name='${editor.name}' name='${editor.name}'
<#if editor.getPSAppDataEntity?? && editor.getPSAppDataEntity()??> <#if editor.getPSAppDataEntity?? && editor.getPSAppDataEntity()??>
deMajorField='${editor.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}' deMajorField='${editor.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}'
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-picker <app-picker
:formState="formState" :formState="formState"
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<app-picker <app-picker
:formState="viewState" :formState="viewState"
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
name='${editor.name}' name='${editor.name}'
<#if editor.getEditorParam("PICKUPDATA", "") != "">pickUpData="${editor.getEditorParam("PICKUPDATA", "")}"</#if> <#if editor.getEditorParam("PICKUPDATA", "") != "">pickUpData="${editor.getEditorParam("PICKUPDATA", "")}"</#if>
<#-- 自填模式文本属性、值属性start --> <#-- 自填模式文本属性、值属性start -->
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if item.getRefPickupPSAppView()??> <#if item.getRefPickupPSAppView()??>
<#assign pickupview = item.getRefPickupPSAppView()> <#assign pickupview = item.getRefPickupPSAppView()>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if item.getRefPickupPSAppView()??> <#if item.getRefPickupPSAppView()??>
<#assign pickupview = item.getRefPickupPSAppView()> <#assign pickupview = item.getRefPickupPSAppView()>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
name='${editor.name}' name='${editor.name}'
<#-- 自填模式文本属性、值属性start --> <#-- 自填模式文本属性、值属性start -->
<#if editor.getPSAppDEACMode?? && editor.getPSAppDEACMode()??> <#if editor.getPSAppDEACMode?? && editor.getPSAppDEACMode()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
name='${editor.name}' name='${editor.name}'
<#-- 自填模式文本属性、值属性start --> <#-- 自填模式文本属性、值属性start -->
<#if editor.getPSAppDEACMode?? && editor.getPSAppDEACMode()??> <#if editor.getPSAppDEACMode?? && editor.getPSAppDEACMode()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
:viewparams="viewparams" :viewparams="viewparams"
:localContext =<@getNavigateContext editor /> :localContext =<@getNavigateContext editor />
:localParam =<@getNavigateParams editor /> :localParam =<@getNavigateParams editor />
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1" :disabled="getColumnDisabled(row,column.property)"
name='${editor.name}' name='${editor.name}'
<#-- 自填模式文本属性、值属性start --> <#-- 自填模式文本属性、值属性start -->
<#if editor.getPSAppDEACMode?? && editor.getPSAppDEACMode()??> <#if editor.getPSAppDEACMode?? && editor.getPSAppDEACMode()??>
......
<#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude> <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
<#if item.render??> <#if editor?? && editor.render??>
${item.render.code} ${editor.render.code}
<#else> <#else>
<#if editor.getEditorParam("PICKUPVIEW",true)??> <#if editor.getEditorParam("PICKUPVIEW",true)??>
<#if editor.getPickupPSAppView()??> <#if editor.getPickupPSAppView()??>
......
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
此差异已折叠。
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册