合并分支 'dev' 到 'master'

Dev

查看合并请求 !3

@CONTROL/表格/SERVICE.ts.ftl

@@ -119,6 +119,15 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
     @Errorlog
     public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
+        <#-- 手动修改数据主键的情况start -->
+        <#if ctrl.getPSDEGridEditItems()??>
+        <#list ctrl.getPSDEGridEditItems() as editItem>
+        <#if editItem.getPSAppDEField()?? && editItem.getPSAppDEField().isKeyField() && editItem.getCodeName() != "srfkey">
+        Object.assign(Data,{${editItem.getPSAppDEField().getCodeName()?lower_case}: data.${editItem.getName()}, srffrontuf: '1'});
+        </#if>
+        </#list>
+        </#if>
+        <#-- 手动修改数据主键的情况end -->
         return new Promise((resolve: any, reject: any) => {
             const _appEntityService: any = this.appEntityService;
             let result: Promise<any>;
@@ -149,15 +158,6 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
     @Errorlog
     public delete(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
-        <#-- 手动修改数据主键的情况start -->
-        <#if ctrl.getPSDEGridEditItems()??>
-        <#list ctrl.getPSDEGridEditItems() as editItem>
-        <#if editItem.getPSAppDEField()?? && editItem.getPSAppDEField().isKeyField()>
-        Object.assign(Data,{${appde.getKeyPSAppDEField().getCodeName()?lower_case}: data.${editItem.getName()}, srffrontuf: '1'});
-        </#if>
-        </#list>
-        </#if>
-        <#-- 手动修改数据主键的情况end -->
         return new Promise((resolve: any, reject: any) => {
             const _appEntityService: any = this.appEntityService;
             let result: Promise<any>;
@@ -328,18 +328,18 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
                 //处理返回数据，补充判断标识
                 if(response.data){
                     Object.assign(response.data,{srfuf:'0'});
-                    //仿真主键数据
                     <#-- 手动修改数据主键的情况start -->
-                    <#assign hasKeyFieldwithEditable = false/>
+                    <#assign hasKeyField = ''/>
                     <#if ctrl.getPSDEGridEditItems()??>
                     <#list ctrl.getPSDEGridEditItems() as editItem>
-                    <#if editItem.getPSAppDEField()?? && editItem.getPSAppDEField().isKeyField()>
-                    <#assign hasKeyFieldwithEditable>true</#assign>
+                    <#if editItem.getPSAppDEField()?? && editItem.getPSAppDEField().isKeyField() && editItem.getCodeName() != "srfkey">
+                    <#assign hasKeyField>${editItem.getName()}</#assign>
                     </#if>
                     </#list>
                     </#if>
                     <#-- 手动修改数据主键的情况end -->
-                    <#if hasKeyFieldwithEditable == false>
+                    <#if hasKeyField == "">
+                    //仿真主键数据
                     response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID();
                     </#if>
                 }