Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7 into dev

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

@@ -449,8 +449,8 @@ import { FormItemModel } from '@/model/form-detail';
      * @type {boolean}
      * @memberof AppEmbedPicker
      */
-    public isDragendCol: boolean = <#if app.getPSApplicationUI()??>${app.getPSApplicationUI().getPFStyleParam('EL-TABLE.ISDRAGENDCOL',false)?c}<#else>false</#if>;
-    <#--  public isDragendCol: boolean = true;  -->
+    public isDragendCol: boolean = true;
+    <#-- public isDragendCol: boolean = <#if app.getPSApplicationUI()??>${app.getPSApplicationUI().getPFStyleParam('EL-TABLE.ISDRAGENDCOL',false)?c}<#else>false</#if>;-->
     
     /**
      * 所有列成员