Merge branch 'dev'

@CONTROL/表格/CONTROL-BASE.vue.ftl

@@ -17,11 +17,11 @@
         :show-summary="true && items.length > 0"
         :summary-method="getSummaries"
         </#if>
-        :height="isEnablePagingBar && items.length > 0 ? 'calc(100% - 50px)' : '100%'" 
         <#-- 表格聚合end -->  
         :highlight-current-row ="isSingleSelect"
         :row-class-name="getRowClassName"
         :cell-class-name="getCellClassName"
+        :height="isEnablePagingBar && items.length > 0 ? 'calc(100% - 50px)' : '100%'"
         @row-click="rowClick($event)"  
         @select-all="selectAll($event)"  
         @select="select($event)"  

@CONTROL/视图布局面板/实体数据看板视图 (卡片)/VIEW.vue.ftl

-<#ibizinclude>
-../@MACRO/DATA_PANEL.vue.ftl
-</#ibizinclude>
\ No newline at end of file
+<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if> <#if view.getViewStyle() != 'DEFAULT'>${view.getViewStyle()?lower_case}</#if>">
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
+
+    <#ibizinclude>
+    ../@MACRO/VIEW_CAPTION.vue.ftl
+    </#ibizinclude>
+
+<#if view.hasPSControl('toolbar')>
+<#assign toolbarCtrl = view.getPSControl('toolbar')>
+<@ibizindent blank=8>
+${P.getCtrlCode(toolbarCtrl, 'CONTROL.html').code}
+</@ibizindent>
+</#if>
+        <div class="content-container">
+<#if view.getPSControls()??>
+<#list view.getPSControls() as ctrl>
+<#if ctrl.getControlType() != "TOOLBAR">
+<#if P.getCtrlCode(ctrl, 'CONTROL.html')??>
+<@ibizindent blank=12>
+${P.getCtrlCode(ctrl, 'CONTROL.html').code}
+</@ibizindent>
+</#if>
+</#if>
+</#list>
+</#if>
+        </div>
+    </card>
+</div>

@CONTROL/视图布局面板/实体数据看板视图（部件视图卡片）/VIEW.vue.ftl

-<#ibizinclude>
-../@MACRO/DATA_PANEL.vue.ftl
-</#ibizinclude>
\ No newline at end of file
+<div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if> <#if view.getViewStyle() != 'DEFAULT'>${view.getViewStyle()?lower_case}</#if>">
+    <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
+    <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
+
+    <#ibizinclude>
+    ../@MACRO/VIEW_CAPTION.vue.ftl
+    </#ibizinclude>
+
+<#if view.hasPSControl('toolbar')>
+<#assign toolbarCtrl = view.getPSControl('toolbar')>
+<@ibizindent blank=8>
+${P.getCtrlCode(toolbarCtrl, 'CONTROL.html').code}
+</@ibizindent>
+</#if>
+        <div class="content-container">
+<#if view.getPSControls()??>
+<#list view.getPSControls() as ctrl>
+<#if ctrl.getControlType() != "TOOLBAR">
+<#if P.getCtrlCode(ctrl, 'CONTROL.html')??>
+<@ibizindent blank=12>
+${P.getCtrlCode(ctrl, 'CONTROL.html').code}
+</@ibizindent>
+</#if>
+</#if>
+</#list>
+</#if>
+        </div>
+    </card>
+</div>

@EDITOR/下拉列表框 (动态代码表国际化)/EDITOR.vue.ftl

@@ -7,6 +7,10 @@
     :localContext =<@getNavigateContext editor />
     :localParam =<@getNavigateParams editor />
     :disabled="detailsModel.${editor.name}.disabled"  
+    <#if item.getPSAppDEField?? && item.getPSAppDEField()?? && item.getPSAppDEField().getStdDataType()??>
+    <#assign datatype = srfjavatype(item.getPSAppDEField().getStdDataType())>
+    valueType="<#if datatype == 'BigInteger' || datatype == 'Integer' || datatype == 'Double' || datatype == 'Decimal' || datatype == 'Float' || datatype == 'BigDecimal'>number<#else>string</#if>"
+    </#if> 
     <#if editor.getPSCodeList()??>
     <#assign codelist=editor.getPSCodeList()>
     tag='${codelist.codeName}' 

@EDITOR/下拉列表框/EDITOR.vue.ftl

@@ -9,7 +9,11 @@
     :viewparams="viewparams"
     :localContext =<@getNavigateContext editor />
     :localParam =<@getNavigateParams editor />
-    :disabled="detailsModel.${editor.name}.disabled"  
+    :disabled="detailsModel.${editor.name}.disabled" 
+    <#if item.getPSAppDEField?? && item.getPSAppDEField()?? && item.getPSAppDEField().getStdDataType()??>
+    <#assign datatype = srfjavatype(item.getPSAppDEField().getStdDataType())>
+    valueType="<#if datatype == 'BigInteger' || datatype == 'Integer' || datatype == 'Double' || datatype == 'Decimal' || datatype == 'Float' || datatype == 'BigDecimal'>number<#else>string</#if>"
+    </#if> 
     <#if editor.getPSCodeList()??>
     <#assign codelist=editor.getPSCodeList()>
     tag='${codelist.codeName}' 

@LOGIC/@UIACTION/前台调用/LOGIC.vue.ftl

@@ -435,10 +435,10 @@ ${front_block}
                     }
                       </#if>
                     </#if>
-                    if(window.opener){
+                    <#--  if(window.opener){
                         window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
                         window.close();
-                    }
+                    }  -->
                     return result.datas;
                 });
             }
@@ -478,10 +478,10 @@ ${front_block}
                     }
                       </#if>
                     </#if>
-                    if(window.opener){
+                    <#--  if(window.opener){
                         window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
                         window.close();
-                    }
+                    }  -->
                     return result.datas;
                 });
             }
@@ -522,10 +522,10 @@ ${front_block}
                     }
                       </#if>
                     </#if>
-                    if(window.opener){
+                    <#--  if(window.opener){
                         window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
                         window.close();
-                    }
+                    }  -->
                     return result.datas;
                 });
             }

@LOGIC/@UIACTION/工作流前台调用/LOGIC.vue.ftl

@@ -145,10 +145,10 @@
                 }
                 <#--  是否重新加载数据  -->
                 actionContext.closeView();
-                if(window.opener){
+                <#--  if(window.opener){
                     window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
                     window.close();
-                }
+                }  -->
             });
         }
         const view: any = {
@@ -167,10 +167,10 @@
                     }
                     <#--  是否重新加载数据  -->
                     actionContext.closeView();
-                    if(window.opener){
+                    <#--  if(window.opener){
                         window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
                         window.close();
-                    }
+                    }  -->
                 });
             }
             const view: any = {
@@ -190,10 +190,10 @@
                     }
                     <#--  是否重新加载数据  -->
                     actionContext.closeView();
-                    if(window.opener){
+                    <#--  if(window.opener){
                         window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
                         window.close();
-                    }
+                    }  -->
                 });
             }
             const view: any = {

@LOGIC/@UIACTION/工作流后台调用/LOGIC.vue.ftl

@@ -92,10 +92,10 @@
                 <#else>
                 actionContext.$Notice.success({ title: '成功', desc: '${item.getCaption()}成功！' });
                 </#if>
-                if(window.opener){
+                <#--  if(window.opener){
                     window.opener.postMessage({status:'OK',identification:'WF'},Environment.uniteAddress);
                     window.close();
-                }
+                }  -->
                 return response;
             }).catch((response: any) => {
                 if (!response || !response.status || !response.data) {