提交 3d33cd03 编写于 作者: Mosher's avatar Mosher

Revert "upadte:更新"

This reverts commit 7da7f5bd.
上级 7da7f5bd
...@@ -20,11 +20,11 @@ ${front_block} ...@@ -20,11 +20,11 @@ ${front_block}
* @memberof ${srfclassname('${item.getPSAppDataEntity().getCodeName()}')}UIService * @memberof ${srfclassname('${item.getPSAppDataEntity().getCodeName()}')}UIService
</#if> </#if>
*/ */
public async ${item.getFullCodeName()}(args: any[], context:any = {}, params: any={}, $event?: any, xData?: any, actionContext?: any, srfParentDeName?:string) { public async ${item.getFullCodeName()}(args: any[], context:any = {} ,params: any={}, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
<#else> <#else>
<#-- 界面逻辑替换执行 -->
<#if item.getUILogicAttachMode?? && item.getUILogicAttachMode()?? && item.getUILogicAttachMode() == 'REPLACE' && item.getPSAppDEUILogic?? && item.getPSAppDEUILogic()??> <#if item.getUILogicAttachMode?? && item.getUILogicAttachMode()?? && item.getUILogicAttachMode() == 'REPLACE' && item.getPSAppDEUILogic?? && item.getPSAppDEUILogic()??>
const _context: any = Object.assign(context, actionContext.context); const _context: any = Object.assign(context, actionContext.context);
const _params: any = Object.assign(params, actionContext.viewparams); const _params: any = Object.assign(params, actionContext.viewparams);
...@@ -39,21 +39,20 @@ ${front_block} ...@@ -39,21 +39,20 @@ ${front_block}
<#else> <#else>
<#-- BEGIN: 数据处理逻辑 --> <#-- BEGIN: 数据处理逻辑 -->
let data: any = {}; let data: any = {};
let tempData: any = {};
let tempContext: any = {};
let tempViewParam: any = {};
let parentContext:any = {}; let parentContext:any = {};
let parentViewParam:any = {}; let parentViewParam:any = {};
const _this: any = actionContext; const _this: any = actionContext;
<#if item.getPSNavigateContexts?? && item.getPSNavigateContexts()??>
Object.assign(context,<@getNavigateContext item />);
</#if>
<#if item.getPSNavigateParams?? && item.getPSNavigateParams()??>
Object.assign(params,<@getNavigateParams item />);
</#if>
<#-- 是否先保存目标数据start --> <#-- 是否先保存目标数据start -->
<#if item.isSaveTargetFirst()> <#if item.isSaveTargetFirst()>
const result:any = await xData.save(args,false); const result:any = await xData.save(args,false);
<#if item.getActionTarget() == 'SINGLEDATA'>
Object.assign(args[0], result.data);
<#else>
args = [result.data]; args = [result.data];
</#if> </#if>
</#if>
<#-- 是否先保存目标数据end --> <#-- 是否先保存目标数据end -->
const _args: any[] = Util.deepCopy(args); const _args: any[] = Util.deepCopy(args);
const actionTarget: string | null = <#if item.getActionTarget()??>'${item.getActionTarget()}'<#else>null</#if>; const actionTarget: string | null = <#if item.getActionTarget()??>'${item.getActionTarget()}'<#else>null</#if>;
...@@ -63,168 +62,35 @@ ${front_block} ...@@ -63,168 +62,35 @@ ${front_block}
<#assign valueItem><#if item.getValueItem?? && item.getValueItem() != ''>${item.getValueItem()}<#else>${appDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if></#assign> <#assign valueItem><#if item.getValueItem?? && item.getValueItem() != ''>${item.getValueItem()}<#else>${appDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if></#assign>
<#assign paramItem><#if item.getParamItem?? && item.getParamItem() != ''>${item.getParamItem()}<#else>${appDataEntity.getCodeName()?lower_case}</#if></#assign> <#assign paramItem><#if item.getParamItem?? && item.getParamItem() != ''>${item.getParamItem()}<#else>${appDataEntity.getCodeName()?lower_case}</#if></#assign>
<#assign textItem><#if item.getTextItem?? && item.getTextItem() != ''>${item.getTextItem()}<#else>${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case}</#if></#assign> <#assign textItem><#if item.getTextItem?? && item.getTextItem() != ''>${item.getTextItem()}<#else>${appDataEntity.getMajorPSAppDEField().getCodeName()?lower_case}</#if></#assign>
if (_args && args[0] && args[0]['${valueItem}']) { Object.assign(context, { ${appDataEntity.getCodeName()?lower_case}: '%${paramItem}%' });
Object.assign(tempContext, { ${appDataEntity.codeName?lower_case}: '%${valueItem}%' }); Object.assign(params, { ${valueItem}: '%${paramItem}%' });
} else { Object.assign(params, { ${textItem}: '%${textItem}%' });
Object.assign(tempContext, { ${appDataEntity.codeName?lower_case}: '%${paramItem}%' });
}
Object.assign(tempViewParam, { ${valueItem}: '%${paramItem}%' });
Object.assign(tempViewParam, { ${textItem}: '%${textItem}%' });
</#if>
</#if>
<#if item.getPSNavigateContexts?? && item.getPSNavigateContexts()??>
Object.assign(tempContext, <@getNavigateContext item />);
</#if> </#if>
<#if item.getPSNavigateParams?? && item.getPSNavigateParams()??>
Object.assign(tempViewParam, <@getNavigateParams item />);
</#if> </#if>
tempContext = UIActionTool.handleContextParam(actionTarget, _args, context, params, tempContext); if(_this.context){
<#if item.getActionTarget() == 'SINGLEDATA'> parentContext = _this.context;
tempData = UIActionTool.handleActionParam(actionTarget, _args, context, params, tempViewParam); }
Object.assign(data, tempData); if(_this.viewparams){
<#else> parentViewParam = _this.viewparams;
tempViewParam = UIActionTool.handleActionParam(actionTarget, _args, context, params, tempViewParam); }
</#if> context = UIActionTool.handleContextParam(actionTarget,_args,parentContext,parentViewParam,context);
Object.assign(context, tempContext); data = UIActionTool.handleActionParam(actionTarget,_args,parentContext,parentViewParam,params);
Object.assign(params, data); context = Object.assign({},actionContext.context,context);
<#-- 构建srfparentdename和srfparentkey start --> <#-- 构建srfparentdename和srfparentkey start -->
let parentObj:any = { let parentObj:any = {srfparentdename:srfParentDeName?srfParentDeName:null,srfparentkey:srfParentDeName?context[srfParentDeName.toLowerCase()]:null};
srfparentdename: srfParentDeName ? srfParentDeName : null, Object.assign(data,parentObj);
srfparentkey: srfParentDeName ? context[srfParentDeName.toLowerCase()] : null Object.assign(context,parentObj);
};
Object.assign(context, parentObj);
<#-- 构建srfparentdename和srfparentkey end --> <#-- 构建srfparentdename和srfparentkey end -->
<#-- END: 数据处理逻辑 --> <#-- END: 数据处理逻辑 -->
<#-- BEGIN: 前台处理模式:用户自定义 -->
<#if item.getFrontProcessType() == 'OTHER'>
<#if item.getScriptCode?? && item.getScriptCode()??>
const executeScriptCode = () => {
const data = args;
eval(${item.getScriptCode()});
}
return executeScriptCode();
<#else>
console.warn('自定义前端界面行为无脚本内容');
</#if>
<#-- END: 前台处理模式:用户自定义 -->
<#-- BEGIN: 前台处理模式:打印 -->
<#elseif item.getFrontProcessType() == 'PRINT'>
<#if item.getPSAppDEPrint?? && item.getPSAppDEPrint()??>
let requestUrl: string = '';
if (context && context['${item.getPSAppDataEntity().codeName?lower_case}']) {
requestUrl += `/${srfpluralize(item.getPSAppDataEntity().codeName)}/printdata/<#noparse>${context[${</#noparse>${item.getPSAppDataEntity().codeName?lower_case}}]}`;
// 存在父添加父主键信息
if (actionContext.context && actionContext.context.srfparentdename && actionContext.context.srfparentkey) {
<#noparse>requestUrl = `/${Util.srfpluralize(actionContext.context.srfparentdename).toLowerCase()}/${actionContext.context.srfparentkey}` + requestUrl;</#noparse>
}
} else {
actionContext.$Notice.error({ title: '错误', desc: 'actionContext.$t('app.utilview.nodatakey')' });
return;
}
requestUrl += '?srfprinttag=${item.getPSAppDEPrint().codeName}';
const response = await axios({
url: requestUrl,
method: 'get',
responseType: 'blob'
});
if (response.status === 200 && response.data) {
const link = window.URL.createObjectURL(response.data);
window.open(link, '_blank');
} else {
actionContext.$Notice.error({ title: '错误', desc: 'actionContext.$t('app.utilview.printerror')' });
}
<#else>
actionContext.$Notice.error({ title: '错误', desc: 'actionContext.$t('app.utilview.noprint')' });
</#if>
<#-- END: 前台处理模式:打印 -->
<#-- BEGIN: 前台处理模式:数据导入 -->
<#elseif item.getFrontProcessType() == 'DATAIMP'>
<#if item.getPSAppDEDataImport?? && item.getPSAppDEDataImport()??>
const view: any = {
viewname: 'app-data-upload',
title: actionContext.$t("app.utilview.importview"),
width: 544,
height: 368,
customClass: 'app-data-upload-modal view-default'
}
if (actionContext.context && actionContext.context.srfparentdename && actionContext.context.srfparentkey) {
Object.assign(context, { srfparentdename: actionContext.context.srfparentdename });
Object.assign(context, { srfparentkey: actionContext.context.srfparentkey });
} else {
if (context.srfparentdename) {
delete context.srfparentdename;
}
if (context.srfparentkey) {
delete context.srfparentkey;
}
}
const container: Subject<any> = actionContext.$appmodal.openModal(view, context, {
importId: '${item.getPSAppDEDataImport().codeName}',
serviceName: '${item.getPSAppDataEntity().codeName}',
appDeLogicName: '${item.getPSAppDataEntity().logicName}',
ignoreError: <#if item.getPSAppDEDataImport().getIgnoreError?? && item.getPSAppDEDataImport().getIgnoreError()>true<#else>false</#if>
});
container.subscribe((result: any) => {
if (Object.is(result.ret, 'OK')) {
actionContext.refresh(result.datas);
}
});
<#else>
actionContext.$Notice.warning({ title: '警告', desc: 'actionContext.$t('app.utilview.info')' });
</#if>
<#-- END: 前台处理模式:数据导入 -->
<#-- BEGIN: 前台处理模式:数据导出 -->
<#elseif item.getFrontProcessType() == 'DATAEXP'>
<#if item.getPSAppDEDataExport?? && item.getPSAppDEDataExport()??>
let url: string = '/${srfpluralize(appDataEntity.codeName)?lower_case}/exportdata/fetchdefault';
if (actionContext.context && actionContext.context.srfparentdename && actionContext.context.srfparentkey) {
<#noparse>url = `/${Util.srfpluralize(actionContext.context.srfparentdename).toLowerCase()}/${actionContext.context.srfparentkey}` + url;</#noparse>
}
url += '?srfexporttag=${item.getPSAppDEDataExport().codeName}';
const requestParams: any = {};
Object.assign(requestParams, { page: 0, size: <#if item.getPSAppDEDataExport().getMaxRowCount?? && item.getPSAppDEDataExport().getMaxRowCount()??>${item.getPSAppDEDataExport().getMaxRowCount()?c}<#else>1000</#if> });
try {
const response = await axios({
url: url,
method: 'post',
data: requestParams,
responseType: 'blob'
});
const fileName = decodeURIComponent('${item.getPSAppDataEntity().logicName}.xlsx');
let blob = new Blob([response.data], { type: 'application/vnd.ms-excel' });
let elink = document.createElement('a');
elink.download = fileName;
elink.style.display = 'none';
elink.href = URL.createObjectURL(blob);
document.body.appendChild(elink);
elink.click();
URL.revokeObjectURL(elink.href); // 释放URL 对象
document.body.removeChild(elink);
} catch (error: any) {
try {
const reader = new FileReader();
reader.readAsText(error.data, 'utf-8');
reader.onload = (event: any) => {
const message = JSON.parse(event.target.result)?.message;
actionContext.$Notice.error({ title: '错误', desc: 'actionContext.$t('app.grid.exportexcel.error')' });
}
} catch (error) {
actionContext.$Notice.error({ title: '错误', desc: 'actionContext.$t('app.grid.exportexcel.error')' });
}
}
<#else>
actionContext.$Notice.warning({ title: '警告', desc: 'actionContext.$t('app.grid.exportexcel.error')' });
</#if>
<#-- END: 前台处理模式:数据导出 -->
<#-- BEGIN: 前台处理模式:打开HTML --> <#-- BEGIN: 前台处理模式:打开HTML -->
<#elseif item.getFrontProcessType() == 'OPENHTMLPAGE'> <#if item.getFrontProcessType() == 'OPENHTMLPAGE'>
<#-- 打开独立程序弹出 --> <#-- 打开独立程序弹出 -->
const openPopupApp = (url: string) => { const openPopupApp = (url: string) => {
window.open(url, '_blank'); window.open(url, '_blank');
return { ok: true, result: _args }; return null;
} }
const url = `${item.getHtmlPageUrl()}`; const url = `${item.getHtmlPageUrl()}`;
return openPopupApp(url); openPopupApp(url);
<#-- END: 前台处理模式:打开HTML --> <#-- END: 前台处理模式:打开HTML -->
<#-- BEGIN: 前台处理模式:打开顶级视图,打开顶级视图或向导(模态) --> <#-- BEGIN: 前台处理模式:打开顶级视图,打开顶级视图或向导(模态) -->
<#elseif (item.getFrontProcessType() == 'TOP' || item.getFrontProcessType() == 'WIZARD') && item.getFrontPSAppView()??> <#elseif (item.getFrontProcessType() == 'TOP' || item.getFrontProcessType() == 'WIZARD') && item.getFrontPSAppView()??>
...@@ -527,11 +393,11 @@ ${front_block} ...@@ -527,11 +393,11 @@ ${front_block}
<#assign nextPSUIAction = item.getNextPSUIAction()/> <#assign nextPSUIAction = item.getNextPSUIAction()/>
<#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)> <#if !(nextPSUIAction.getPSAppDataEntity?? && nextPSUIAction.getPSAppDataEntity()??)>
if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (_this.${nextPSUIAction.getFullCodeName()} && _this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
_this.${nextPSUIAction.getFullCodeName()}([data], context, params, $event, xData, actionContext); _this.${nextPSUIAction.getFullCodeName()}([data],context,params, $event, xData,actionContext);
} }
<#else> <#else>
if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) { if (this.${nextPSUIAction.getFullCodeName()} && this.${nextPSUIAction.getFullCodeName()} instanceof Function) {
this.${nextPSUIAction.getFullCodeName()}([data], context, params, $event, xData, actionContext); this.${nextPSUIAction.getFullCodeName()}([data],context,params, $event, xData,actionContext);
} }
</#if> </#if>
</#if> </#if>
...@@ -719,6 +585,7 @@ ${front_block} ...@@ -719,6 +585,7 @@ ${front_block}
// 自定义实体界面行为 // 自定义实体界面行为
actionContext.$Notice.warning({ title: '错误', desc: '${item.getCaption()} 未实现' }); actionContext.$Notice.warning({ title: '错误', desc: '${item.getCaption()} 未实现' });
</#if> </#if>
</#if> </#if>
</#if> </#if>
</#if> </#if>
......
...@@ -20,8 +20,7 @@ TARGET=PSAPPDATAENTITY ...@@ -20,8 +20,7 @@ TARGET=PSAPPDATAENTITY
</#compress> </#compress>
</#macro> </#macro>
import { Environment } from '@/environments/environment'; import { Environment } from '@/environments/environment';
import { UIActionTool, Util } from '@/utils'; import { UIActionTool,Util } from '@/utils';
import axios from 'axios';
import UIService from '../ui-service'; import UIService from '../ui-service';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import ${srfclassname('${item.getCodeName()}')}Service from '@/service/${srffilepath2(item.getCodeName())}/${srffilepath2(item.getCodeName())}-service'; import ${srfclassname('${item.getCodeName()}')}Service from '@/service/${srffilepath2(item.getCodeName())}/${srffilepath2(item.getCodeName())}-service';
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册