Merge branch 'dev'

6f738679 · tony001 · a7120765 · 07504f6f · 6f738679 · 6f738679
--- a/@CONTROL/表格/SERVICE.ts.ftl
+++ b/@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>
+                    <#if hasKeyField == "">
+                    //仿真主键数据
                    response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID();
                    </#if>
                }

--- a/@CONTROL/门户部件/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/门户部件/CONTROL-BASE.vue.ftl
@@ -50,6 +50,7 @@
            ${render_uiaction}<#t>
            </@ibizindent>
        </p>
+        <el-divider class="divider"></el-divider>
        </#if>
        <div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
        <#assign refview = ctrl.getPortletPSAppView()><#t>
@@ -68,6 +69,7 @@
            ${render_uiaction}<#t>
            </@ibizindent>
        </p>
+        <el-divider class="divider"></el-divider>
        </#if>
        <div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
        <#assign appmenu = ctrl.getPSAppMenu()><#t>
@@ -88,6 +90,7 @@
            ${render_uiaction}<#t>
            </@ibizindent>
        </p>
+        <el-divider class="divider"></el-divider>
        </#if>
        <div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
        <#if ctrl.render??>
@@ -105,6 +108,7 @@
            ${ctrl.getTitle()}
            </span>
        </p>
+        <el-divider class="divider"></el-divider>
        </#if>
        <div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
        <#if ctrl.render??>
@@ -126,6 +130,7 @@
            ${render_uiaction}<#t>
            </@ibizindent>
        </p>
+        <el-divider class="divider"></el-divider>
        </#if>
        <div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
        <iframe src="<#if ctrl.getPageUrl()??>${ctrl.getPageUrl()}</#if>" style="height: <#if ctrl.getHeight() gt 0>${ctrl.getHeight()?c}<#else>400</#if>px;width: 100%;border-width: 1px;"></iframe>
@@ -138,6 +143,7 @@
            ${ctrl.getTitle()}
            </span>
        </p>
+        <el-divider class="divider"></el-divider>
        </#if>
        <div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
        <#if ctrl.render??>
@@ -173,6 +179,7 @@
            ${render_uiaction}<#t>
            </@ibizindent>
        </p>
+        <el-divider class="divider"></el-divider>
        </#if>
        <div class="<#if ctrl.isShowTitleBar()>portlet-with-title<#else>portlet-without-title</#if>">
        <#assign control = ctrl.getContentPSControl()><#t>

--- a/@CONTROL/门户部件/CONTROL.less.ftl
+++ b/@CONTROL/门户部件/CONTROL.less.ftl
@@ -35,6 +35,11 @@
      }
    }
  }
+  <#if ctrl.isShowTitleBar() && ctrl.getTitle()??>
+    > .divider {
+      margin: 0px 0px 11px 0px;
+    }
+  </#if>
  > .portlet-with-title{
    width:100%;
    height:calc(100% - 52px);

--- a/APP/src/codelist/%APP_CODELIST%.ts.ftl
+++ b/APP/src/codelist/%APP_CODELIST%.ts.ftl
@@ -125,15 +125,17 @@ export default class ${srfclassname('${item.getCodeName()}')} {
     */
    public doItems(items: any[]): any[] {
        let _items: any[] = [];
-        items.forEach((item: any) => {
-            let itemdata:any = {};
-            Object.assign(itemdata,{id:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
-            Object.assign(itemdata,{value:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
-            Object.assign(itemdata,{text:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
-            Object.assign(itemdata,{label:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
-            <#if item.getPValuePSAppDEField()??>Object.assign(itemdata,{pvalue:item.${item.getPValuePSAppDEField().getCodeName()?lower_case}});</#if>
-            _items.push(itemdata);
-        });
+        if(items && items instanceof Array && items.length >0){
+            items.forEach((item: any) => {
+                let itemdata:any = {};
+                Object.assign(itemdata,{id:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
+                Object.assign(itemdata,{value:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
+                Object.assign(itemdata,{text:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
+                Object.assign(itemdata,{label:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
+                <#if item.getPValuePSAppDEField()??>Object.assign(itemdata,{pvalue:item.${item.getPValuePSAppDEField().getCodeName()?lower_case}});</#if>
+                _items.push(itemdata);
+            });
+        }
        return _items;
    }