Merge branch 'dev'

@EDITOR/图片控件/EDITOR.vue.ftl

 <#if editor?? && editor.render??> 
     ${editor.render.code}
 <#else>
- <app-image-upload :multiple="true" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' style="${editor.getEditorCssStyle()}overflow: auto;"></app-image-upload>
- </#if>
\ No newline at end of file
+<app-image-upload 
+  :multiple="true"
+  :limit="<#if editor.getEditorParam('limit','') != ''>${editor.getEditorParam('limit','')}<#else>9999</#if>"
+  :accept="'<#if editor.getEditorParam('accept','') != ''>${editor.getEditorParam('accept','')}<#else>image/*</#if>'"
+  :formState="formState" 
+  :ignorefieldvaluechange="ignorefieldvaluechange" 
+  @formitemvaluechange="onFormItemValueChange" 
+  :data="JSON.stringify(this.data)" 
+  name='${editor.name}' 
+  :value="data.${editor.name}" 
+  :disabled="detailsModel.${editor.name}.disabled" 
+  :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' 
+  :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' 
+  style="${editor.getEditorCssStyle()}overflow: auto;">
+</app-image-upload>
+</#if>
\ No newline at end of file

@EDITOR/图片控件/GRIDEIDTOR.vue.ftl

@@ -2,6 +2,8 @@
     ${editor.render.code}
 <#else>
 <app-file-upload 
+  :limit="<#if editor.getEditorParam('limit','') != ''>${editor.getEditorParam('limit','')}<#else>9999</#if>"
+  :accept="'<#if editor.getEditorParam('accept','') != ''>${editor.getEditorParam('accept','')}<#else>*</#if>'"
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}" 

@EDITOR/图片控件（单项）/EDITOR.vue.ftl

 <#if editor?? && editor.render??> 
     ${editor.render.code}
 <#else>
- <app-image-upload :multiple="false" :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' ></app-image-upload>
- </#if>
\ No newline at end of file
+<app-image-upload 
+  :multiple="false"
+  :limit="<#if editor.getEditorParam('limit','') != ''>${editor.getEditorParam('limit','')}<#else>9999</#if>"
+  :accept="'<#if editor.getEditorParam('accept','') != ''>${editor.getEditorParam('accept','')}<#else>image/*</#if>'"
+  :formState="formState"
+  :ignorefieldvaluechange="ignorefieldvaluechange"
+  @formitemvaluechange="onFormItemValueChange"
+  :data="JSON.stringify(this.data)"
+  name='${editor.name}'
+  :value="data.${editor.name}"
+  :disabled="detailsModel.${editor.name}.disabled"
+  :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>'
+  :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'>
+  </app-image-upload>
+</#if>
\ No newline at end of file

@EDITOR/图片控件（单项）/GRIDEIDTOR.vue.ftl

@@ -2,6 +2,8 @@
     ${editor.render.code}
 <#else>
 <app-file-upload 
+  :limit="<#if editor.getEditorParam('limit','') != ''>${editor.getEditorParam('limit','')}<#else>9999</#if>"
+  :accept="'<#if editor.getEditorParam('accept','') != ''>${editor.getEditorParam('accept','')}<#else>*</#if>'"
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}" 

@EDITOR/文件上传/EDITOR.vue.ftl

 <#if editor?? && editor.render??> 
     ${editor.render.code}
 <#else>
-<app-file-upload :formState="formState" :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'  style="${editor.getEditorCssStyle()}overflow: auto;"></app-file-upload>
+<app-file-upload
+  :limit="<#if editor.getEditorParam('limit','') != ''>${editor.getEditorParam('limit','')}<#else>9999</#if>"
+  :accept="'<#if editor.getEditorParam('accept','') != ''>${editor.getEditorParam('accept','')}<#else>*</#if>'"
+  :formState="formState"
+  :ignorefieldvaluechange="ignorefieldvaluechange"
+  @formitemvaluechange="onFormItemValueChange"
+  :data="JSON.stringify(this.data)"
+  name='${editor.name}'
+  :value="data.${editor.name}"
+  :disabled="detailsModel.${editor.name}.disabled"
+  :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>'
+  :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'
+  :multiple='<#if editor.getEditorParam('multiple','') != ''>${editor.getEditorParam('multiple','')}<#else>true</#if>'
+  style="${editor.getEditorCssStyle()}overflow: auto;">
+</app-file-upload>
 </#if>
\ No newline at end of file

@EDITOR/文件上传/GRIDEIDTOR.vue.ftl

@@ -2,6 +2,8 @@
     ${editor.render.code}
 <#else>
 <app-file-upload 
+  :limit="<#if editor.getEditorParam('limit','') != ''>${editor.getEditorParam('limit','')}<#else>9999</#if>"
+  :accept="'<#if editor.getEditorParam('accept','') != ''>${editor.getEditorParam('accept','')}<#else>*</#if>'"
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}" 

@EDITOR/文件上传（支持拖拽）/EDITOR.vue.ftl

-<app-file-upload  :isdrag="true" :formState="formState"  :ignorefieldvaluechange="ignorefieldvaluechange" @formitemvaluechange="onFormItemValueChange" :data="JSON.stringify(this.data)" name='${editor.name}' :value="data.${editor.name}" :disabled="detailsModel.${editor.name}.disabled" :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>' :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>' style="${editor.getEditorCssStyle()}overflow: auto;"></app-file-upload>
\ No newline at end of file
+<app-file-upload
+  :isdrag="true"
+  :limit="<#if editor.getEditorParam('limit','') != ''>${editor.getEditorParam('limit','')}<#else>9999</#if>"
+  :accept="'<#if editor.getEditorParam('accept','') != ''>${editor.getEditorParam('accept','')}<#else>*</#if>'"
+  :formState="formState"
+  :ignorefieldvaluechange="ignorefieldvaluechange"
+  @formitemvaluechange="onFormItemValueChange"
+  :data="JSON.stringify(this.data)"
+  name='${editor.name}'
+  :value="data.${editor.name}"
+  :disabled="detailsModel.${editor.name}.disabled"
+  :uploadparams='<#if editor.getEditorParam('uploadparams','') != ''>${editor.getEditorParam('uploadparams','')}<#else>{}</#if>'
+  :exportparams='<#if editor.getEditorParam('exportparams','') != ''>${editor.getEditorParam('exportparams','')}<#else>{}</#if>'
+  :multiple='<#if editor.getEditorParam('multiple','') != ''>${editor.getEditorParam('multiple','')}<#else>true</#if>'
+  style="${editor.getEditorCssStyle()}overflow: auto;">
+</app-file-upload>

@EDITOR/文件上传（支持拖拽）/GRIDEIDTOR.vue.ftl

 <app-file-upload 
   :isdrag="true"
+  :limit="<#if editor.getEditorParam('limit','') != ''>${editor.getEditorParam('limit','')}<#else>9999</#if>"
+  :accept="'<#if editor.getEditorParam('accept','') != ''>${editor.getEditorParam('accept','')}<#else>*</#if>'"
   :formState="viewState" 
   :ignorefieldvaluechange="false" 
   @formitemvaluechange="($event)=>{onGridItemValueChange(row,$event,$index)}"