Merge branch 'dev' of http://demo.ibizlab.cn/vue_v2/vue_r6 into dev

@LOGIC/@VIEWLOGIC/新建/LOGIC.tsx.ftl

@@ -14,7 +14,9 @@
         this.$Notice.warning({ title: '错误', desc: '向导添加未实现' });
     <#elseif viewlogic.isEnableBatchAdd()>
         <#--  打开模态  -->
-        <#assign dataview = viewlogic.getNewDataPSAppView()/>
+        <#if viewlogic.getBatchAddPSAppViews??  &&  viewlogic.getBatchAddPSAppViews()??>
+        <#assign batchAddPSAppViews = viewlogic.getBatchAddPSAppViews()/>
+        </#if>
         const _this: any = this;
         if (_this.srfparentdata) {
             Object.assign(data, { srfparentdata: _this.srfparentdata });
@@ -32,7 +34,7 @@
             });
         }
         const view: any = {
-            viewname: '${srffilepath2(dataview.getCodeName())}', 
+            viewname: '${srffilepath2(${batchAddPSAppViews[0].getCodeName()})}', 
             height: ${dataview.getHeight()?c}, 
             width: ${dataview.getWidth()?c},  
             title: '${dataview.title}',