实体服务调整

APP/src/app-core/service/%DE_PKGPATH%/%DE_PKGPATH%-service-base.ts.ftl

@@ -53,6 +53,8 @@ import { ${srfclassname('${singleLogic.getCodeName()}')}Logic } from './${srffil
                     if(item.srffrontuf){
                         if(Object.is(item.srffrontuf,"0")){
                             item.${minorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case} = null;
+                            <#-- 置空父键 -->
+                            if(item.hasOwnProperty('${majorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}') && item.${majorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}) item.${majorPSAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case} = null;
                         }
                         delete item.srffrontuf;
                     }
@@ -105,7 +107,7 @@ import { ${srfclassname('${singleLogic.getCodeName()}')}Logic } from './${srffil
 
 <#-- 定义service_block start -->
 <#macro service_block item singleAppMethod afterActionStr = "">
- <#if item.getPSAppDERSPathCount() gt 0 && singleServiceApi??>
+ <#if item.getPSAppDERSPathCount() gt 0 && singleAppMethod.getPSDEServiceAPIMethod?? &&  singleAppMethod.getPSDEServiceAPIMethod()??>
     <#assign singleServiceApi = singleAppMethod.getPSDEServiceAPIMethod()/>
     <#list 1..item.getPSAppDERSPathCount() as count>
         <#assign path = ''/>
@@ -533,8 +535,9 @@ import { ${srfclassname('${singleLogic.getCodeName()}')}Logic } from './${srffil
         <#list appdeAction.getAfterPSDEActionLogics() as afterlogic>
         <#if afterlogic.getPSDELogic()?? && afterlogic.getPSDELogic().getLogicHolder?? && afterlogic.getPSDELogic().getLogicHolder()?? && (afterlogic.getPSDELogic().getLogicHolder() == 2 || afterlogic.getPSDELogic().getLogicHolder() == 3)>
         <#assign singleLogic = afterlogic.getPSDELogic() />
-    <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}:${srfclassname('${singleLogic.getCodeName()}')}Logic = new ${srfclassname('${singleLogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(res))});</@compress>
-            <@compress single_line=true>res = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,res.data,isloading?true:false);</@compress>
+    <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}:${srfclassname('${singleLogic.getCodeName()}')}Logic = new ${srfclassname('${singleLogic.getCodeName()}')}Logic({context:JSON.parse(JSON.stringify(context)),data:JSON.parse(JSON.stringify(res)).data});</@compress>
+            <@compress single_line=true>let ${singleLogic.getCodeName()?lower_case}Data:any = await ${singleLogic.getCodeName()?lower_case}.onExecute(context,res.data,isloading?true:false);</@compress>
+            res ={status:200,data:${singleLogic.getCodeName()?lower_case}Data};
         </#if>
         </#list>
     </#if>
@@ -634,57 +637,6 @@ export class ${srfclassname('${item.getCodeName()}')}ServiceBase extends EntityS
     <#-- 无实体行为，有接口走接口，无接口走本地供数 end -->
     </#if>
     }
-    <#-- 查询数据集(post方式)start -->
-    <#-- @author zpc -->
-    <#-- @update 2020.7.13 15:00 -->
-    <#--  <#if singleAppMethod.getMethodType?? && singleAppMethod.getMethodType()?? && singleAppMethod.getMethodType() == "FETCH">
-    <#assign dataSet = singleAppMethod.getPSDEDataSet() />  -->
-
-    <#--  /**
-     * search${dataSet.getCodeName()}接口方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @param {boolean} [isloading]
-     * @returns {Promise<any>}
-     * @memberof ${srfclassname('${item.getCodeName()}')}ServiceBase
-     */
-    public async search${dataSet.getCodeName()}(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {  -->
-    <#-- 检查行为是否可以执行 start -->
-    <#-- @author zpc -->
-    <#-- @update 2020.7.13 16:00 -->
-    <#--  <#if singleAppMethod.getPSDEAction()??>
-    <#assign appdeAction = singleAppMethod.getPSDEAction() />
-    <#if appdeAction.getTestActionMode?? && appdeAction.getTestActionMode()?? && (appdeAction.getTestActionMode() == 1 || appdeAction.getTestActionMode() == 3)>
-        let result:any = await this.test${srfclassname('search${dataSet.getCodeName()}')}(context,data);
-		if(!result) return;
-    </#if>
-    </#if>  -->
-    <#-- 检查行为是否可以执行 end -->
-    <#--  <#if item.getPSAppDERSPathCount() gt 0 && singleServiceApi??>
-        <#list 1..item.getPSAppDERSPathCount() as count>
-        <#assign path = ''/>
-        <#assign condition = ''/>
-        <#list item.getPSAppDERSPath(count_index)  as deRSPath>
-            <#if deRSPath.getMajorPSAppDataEntity?? && deRSPath.getMajorPSAppDataEntity()??>
-                <#assign _dataEntity = deRSPath.getMajorPSAppDataEntity()/>
-                <#assign condition>${condition}context.${_dataEntity.getCodeName()?lower_case} && </#assign>
-                <#assign path>${path}${srfpluralize(_dataEntity.codeName)?lower_case}/<#noparse>$</#noparse>{context.${_dataEntity.getCodeName()?lower_case}}/</#assign>
-            </#if>
-        </#list>
-        if(${condition}true){
-            let tempData:any = JSON.parse(JSON.stringify(data));
-            return Http.getInstance().post(`/${path}${srfpluralize(item.codeName)?lower_case}/search${dataSet.getCodeName()?lower_case}`,tempData,isloading);
-        }
-        </#list>
-    </#if>
-    <#if item.isMajor()>
-        let tempData:any = JSON.parse(JSON.stringify(data));
-        return Http.getInstance().post(`/${srfpluralize(item.codeName)?lower_case}/search${dataSet.getCodeName()?lower_case}`,tempData,isloading);
-    </#if>
-    }
-    </#if>  -->
-    <#-- 查询数据集(post方式)end -->
     <#-- 检查行为是否可以执行 start -->
     <#-- @author zpc -->
     <#-- @update 2020.7.13 17:00 -->
@@ -703,21 +655,6 @@ export class ${srfclassname('${item.getCodeName()}')}ServiceBase extends EntityS
     <@getTestActionModifier appdeAction=appdeAction/> async test${srfclassname('${singleAppMethod.getCodeName()}')}(context: any = {},data: any = {}): Promise<any> {
         return true;
     }
-    <#--  <#if singleAppMethod.getMethodType?? && singleAppMethod.getMethodType()?? && singleAppMethod.getMethodType() == "FETCH">
-    <#assign dataSet = singleAppMethod.getPSDEDataSet() />
-
-    /**
-     * test${srfclassname('search${dataSet.getCodeName()}')}方法
-     *
-     * @param {*} [context={}]
-     * @param {*} [data={}]
-     * @returns {Promise<any>}
-     * @memberof ${srfclassname('${item.getCodeName()}')}ServiceBase
-     */
-    <@getTestActionModifier appdeAction=appdeAction/> async test${srfclassname('search${dataSet.getCodeName()}')}(context: any = {},data: any = {}): Promise<any> {
-        return true;
-    }
-    </#if>  -->
     </#if>
     </#if>
     <#-- 检查行为是否可以执行 end -->