合并分支 'dev' 到 'master'

Dev

查看合并请求 !13

@CONTROL/门户部件/CONTROL.less.ftl

@@ -37,7 +37,7 @@
   }
   <#if ctrl.isShowTitleBar() && ctrl.getTitle()??>
     > .divider {
-      margin: 0px;
+      margin: 0px 0px 11px 0px;
     }
   </#if>
   > .portlet-with-title{

APP/src/codelist/%APP_CODELIST%.ts.ftl

@@ -125,6 +125,7 @@ export default class ${srfclassname('${item.getCodeName()}')} {
      */
     public doItems(items: any[]): any[] {
         let _items: any[] = [];
+        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>});
@@ -134,6 +135,7 @@ export default class ${srfclassname('${item.getCodeName()}')} {
                 <#if item.getPValuePSAppDEField()??>Object.assign(itemdata,{pvalue:item.${item.getPValuePSAppDEField().getCodeName()?lower_case}});</#if>
                 _items.push(itemdata);
             });
+        }
         return _items;
     }