Merge branch 'dev'

@CONTROL/@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl

@@ -15,7 +15,7 @@ import  ${srfclassname('${appCounter.getCodeName()}')}CounterService  from '@/co
 </#list>
 </#if>
 <#if appde??>
-import ${srfclassname('${appde.getCodeName()}')}Service from '@/service/${srffilepath2(appde.getCodeName())}/${srffilepath2(appde.getCodeName())}-service';
+import ${srfclassname('${appde.getCodeName()}')}EntityService from '@/service/${srffilepath2(appde.getCodeName())}/${srffilepath2(appde.getCodeName())}-service';
 </#if>
 import ${srfclassname('${ctrl.codeName}')}Service from './${srffilepath2(ctrl.codeName)}-${ctrl.getControlType()?lower_case}-service';
 <#if ctrl.getPSUIActions?? && ctrl.getPSUIActions()??>
@@ -138,7 +138,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {${srfclassname('${appde.getCodeName()}')}Service}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store });
+    public appEntityService: ${srfclassname('${appde.getCodeName()}')}EntityService = new ${srfclassname('${appde.getCodeName()}')}EntityService({ $store: this.$store });
 </#if>
     <#if ctrl.getPSControls?? && ctrl.getPSControls()??>
     <#list ctrl.getPSControls() as childCtrl>

@CONTROL/应用菜单/CONTROL-BASE.vue.ftl

@@ -3,6 +3,9 @@
   ${quick_menus}
 <#else>
 <div class="app-app-menu<#if ctrl.getPSSysCss?? && ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if>">
+<#if ctrl.getAppMenuStyle?? && ctrl.getAppMenuStyle() == "ICONVIEW">
+          <app-icon-menus :menus = "menus" :ctrlName = "'${ctrl.codeName?lower_case}'" @menuClick="select"></app-icon-menus>  
+        <#else>
     <el-menu
       class="app-menu"
       <#if view.getMainMenuAlign()?? && view.getMainMenuAlign()!="TOP">:default-openeds="defaultOpeneds"</#if>
@@ -11,7 +14,8 @@
       :collapse="isCollapse"
       @select="select"
       :default-active="defaultActive">
-        <template v-if="Object.is(mode,'horizontal')">
+      
+      <template v-if="Object.is(mode,'horizontal')">
             <template v-for="item0 in menus">
                 <template v-if="item0.items && Array.isArray(item0.items) && item0.items.length > 0">
                     <el-submenu v-show="!item0.hidden" :index="item0.name" :popper-class="popperClass" :key="item0.id" :class="item0.textcls">
@@ -107,10 +111,12 @@
                         </el-menu-item>
                     </template>
                 </template>
-            </template>   
+            </template>  
         </template> 
         <app-menu-item v-else :isCollapse="isCollapse" :menus="menus" :ctrlName="'${ctrl.getCodeName()?lower_case}'" :isFirst="true" :counterdata="counterdata" :popper-class="popperClass"></app-menu-item>
+   
     </el-menu>
+    </#if> 
 </div>
 </#if>
 </template>

@CONTROL/表单/CONTROL-BASE.vue#DETAIL_DRUIPART.ftl

@@ -21,6 +21,7 @@ ${item.render.code}
     ]"
     :context="context"
     :viewparams="viewparams"
+    ref="druipart"
     :localContext ='<@getNavigateContext item />'
     :localParam ='<@getNavigateParams item />'
     parameterName='${appde.getCodeName()?lower_case}'

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

@@ -227,7 +227,16 @@ import { Environment } from '@/environments/environment';
      * 
      *  @memberof  ${srfclassname('${ctrl.codeName}')}Base
      */
-    public errorMessages: Array<any> = [];   
+    public errorMessages: Array<any> = []; 
+
+    /**
+     * 应用状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public appStateEvent: Subscription | undefined;
 
     /**
      * 设置表单项错误提示信息
@@ -708,9 +717,9 @@ import { Environment } from '@/environments/environment';
         if(Object.is(action,'load')){
             this.updateDefault();
         }
-        this.$nextTick(function () {
+        //  this.$nextTick(function () {
             this.ignorefieldvaluechange = false;
-        })
+        // })
     }
 
     /**
@@ -1067,6 +1076,16 @@ import { Environment } from '@/environments/environment';
                 this.$emit('load', this.data);
                 </#if>
             });
+        if(AppCenterService && AppCenterService.getMessageCenter()){
+            this.appStateEvent = AppCenterService.getMessageCenter().subscribe(({ name, action, data }) =>{
+                if(!Object.is(name,"${ctrl.getPSAppDataEntity().getCodeName()}")){
+                    return;
+                }
+                if(Object.is(action,'appRefresh')){
+                    this.refresh([data]);
+                }
+            })
+        }
     }
 
     /**
@@ -1090,6 +1109,9 @@ import { Environment } from '@/environments/environment';
         if (this.dataChangEvent) {
             this.dataChangEvent.unsubscribe();
         }
+        if(this.appStateEvent){
+            this.appStateEvent.unsubscribe();
+        }
         <#if destroyed_block??>
         ${destroyed_block}
         </#if>      
@@ -1111,6 +1133,11 @@ import { Environment } from '@/environments/environment';
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public refresh(args?: any): void {
+        let druipart:any = this.$refs.druipart
+        if (druipart) {
+          druipart.refreshDRUIPart(args);
+          return;
+        }
         let arg: any = {};
         Object.assign(arg,args?args[0]:{});
         if (this.data.srfkey && !Object.is(this.data.srfkey, '')) {

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

@@ -968,7 +968,8 @@ ${gridColumn.getName()}
                     this.selections = [];
                     resolve(response);
                 }).catch((response: any) => {
-                    if (response && response.status === 401) {
+                    if (response && response.status != 200) {
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.message});
                         return;
                     }
                     if (!response || !response.status || !response.data) {
@@ -1944,10 +1945,16 @@ ${gridColumn.getName()}
             sums[index] = (this.$t('app.gridpage.sum') as string);
             return;
           }
-          if(index === (columns.length - 1)){
+            <#if ctrl.getPSDEGridColumns?? && ctrl.getPSDEGridColumns()??>
+                <#list ctrl.getPSDEGridColumns() as columns >
+                    <#if columns.getColumnType?? && columns.getColumnType() == "UAGRIDCOLUMN">
+          if(column.columnKey && Object.is(column.columnKey,'${columns.getName()?lower_case}')){
             sums[index] = '';
             return;
           }
+                    </#if>
+                </#list>
+            </#if>
           const values = data.map((item:any) => Number(item[column.property]));
           if (!values.every((value:any) => isNaN(value))) {
             <#if ctrl.getPSDEGridColumns()??>

@CONTROL/视图布局面板/@MACRO/VIEW_CAPTION.vue.ftl

@@ -9,6 +9,6 @@
     <span class='caption-image'><img src='${viewimg.getImagePath()}'/></span>
     </#if>
     </#if>
-    <span class='caption-info'>{{$t(model.srfCaption)}}</span>
+    <span class='caption-info' :title="$t(model.srfCaption)">{{$t(model.srfCaption)}}</span>
 </div>
 </#if>
\ No newline at end of file

@EDITOR/下拉列表框（隐藏）/EDITOR.vue.ftl

+ <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
+<#else>
+ <dropdown-list-hidden 
+    v-model="data.${editor.name}" 
+    :data="data" 
+    :context="context"
+    :viewparams="viewparams"
+    :formState="formState" 
+    :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}' 
+    codelistType='${codelist.getCodeListType()}'
+    </#if> 
+    placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> style="${editor.getEditorCssStyle()}">
+ </dropdown-list-hidden>
+</#if>
\ No newline at end of file

@EDITOR/下拉列表框（隐藏）/GRIDEIDTOR.vue.ftl

+ <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
+<#else>
+ <dropdown-list-hidden 
+  v-model="row[column.property]" 
+  :disabled="getColumnDisabled(row,column.property)" 
+  :data="row" 
+  :context="context"
+  :viewparams="viewparams" 
+  :localContext =<@getNavigateContext editor />
+  :localParam =<@getNavigateParams editor />
+<#if item.getPSCodeList()??>
+  <#assign codelist=item.getPSCodeList()>
+  tag='${codelist.codeName}' 
+  codelistType='${codelist.getCodeListType()}'
+</#if> 
+  placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> 
+  style="${item.getEditorCssStyle()}" 
+  @change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
+ </dropdown-list-hidden>
+ </#if>

@EDITOR/下拉列表框（隐藏）/PANELEDITOR.vue.ftl

+ <#ibizinclude>../@MACRO/FUNC/PUBLIC.vue.ftl</#ibizinclude>
+<#if editor?? && editor.render??> 
+    ${editor.render.code}
+<#else>
+ <dropdown-list-hidden 
+  v-model="data.${editor.name?lower_case}" 
+  :disabled="detailsModel.${item.getCodeName()}.disabled" 
+  :data="data" 
+  :context="context"
+  :viewparams="viewparams" 
+  :localContext =<@getNavigateContext editor />
+  :localParam =<@getNavigateParams editor />
+<#if item.getPSCodeList()??>
+  <#assign codelist=item.getPSCodeList()>
+  tag='${codelist.codeName}' 
+  codelistType='${codelist.getCodeListType()}'
+</#if> 
+  placeholder=<#if item.getPlaceHolder()??>'${item.getPlaceHolder()}'<#else>'请选择...'</#if> 
+  style="${item.getEditorCssStyle()}" 
+  @change="($event)=>{panelEditItemChange(data, '${editor.name?lower_case}', $event)}">
+ </dropdown-list-hidden>
+ </#if>

@EDITOR/下拉列表框（隐藏）/template.properties

+EDITORTYPE=DROPDOWNLIST#HIDDEN
\ No newline at end of file

@EDITOR/文件上传 （磁盘文件）/EDITOR.vue.ftl

@@ -3,7 +3,7 @@
     formItemName="${item.name}"
     :value="data.${item.name}"
     :formState="formState"
-    folder="<#if item.getEditorParam("folder",'') != ''>${item.getEditorParam("ownerType",'')}<#else>${ctrl.getPSDataEntity().getCodeName()?lower_case}</#if>"
+    folder="<#if item.getEditorParam("folder",'') != ''>${item.getEditorParam("folder",'')}<#else>${ctrl.getPSDataEntity().getCodeName()?lower_case}</#if>"
     ownertype="<#if item.getEditorParam("ownerType",'') != ''>${item.getEditorParam("ownerType",'')}<#else>${item.name}</#if>"
     :ownerid="<#if item.getEditorParam("ownerid",'') != ''>'${item.getEditorParam("ownerid",'')}'<#else>data.srfkey</#if>"
     :show-ocrview=<#if item.getEditorParam("showOcrview",'') != ''>"${item.getEditorParam("showOcrview",'')}"<#else>"false"</#if>
@@ -11,5 +11,7 @@
     :show-edit=<#if item.getEditorParam("showEdit",'') != ''>"${item.getEditorParam("showEdit",'')}"<#else>"false"</#if>
     :show-drag=<#if item.getEditorParam("showDrag",'') != ''>"${item.getEditorParam("showDrag",'')}"<#else>"false"</#if>
     :persistence=<#if item.getEditorParam("persistence",'') != ''>"${item.getEditorParam("persistence",'')}"<#else>"false"</#if>
+    :show-download=<#if item.getEditorParam("showDownload",'') != ''>"${item.getEditorParam("showDownload",'')}"<#else>"false"</#if>
+    :show-delete=<#if item.getEditorParam("showDelete",'') != ''>"${item.getEditorParam("showDelete",'')}"<#else>"false"</#if>
     @formitemvaluechange="onFormItemValueChange">
 </disk-file-upload>
\ No newline at end of file

@EDITOR/滑动输入条/EDITOR.vue.ftl

 <#if editor?? && editor.render??> 
     ${editor.render.code}
 <#else>
-<app-slider name='${editor.name}' :value="this.data.${editor.name}" @change="onFormItemValueChange" :disabled="detailsModel.${editor.name}.disabled" style="${editor.getEditorCssStyle()}"></app-slider>
+<app-slider 
+  name='${editor.name}'
+  :value="this.data.${editor.name}"
+  @change="onFormItemValueChange"
+  :disabled="detailsModel.${editor.name}.disabled"
+  style="${editor.getEditorCssStyle()}"
+  :step="<#if editor.getEditorParam('step','') != ''>${editor.getEditorParam('step','')}<#else>1</#if>"
+  :min="<#if editor.getEditorParam('min','') != ''>${editor.getEditorParam('min','')}<#else>0</#if>"
+  :max="<#if editor.getEditorParam('max','') != ''>${editor.getEditorParam('max','')}<#else>100</#if>"></app-slider>
 </#if>
\ No newline at end of file

@LOGIC/@UIACTION/系统预置/sys/拷贝/LOGIC.vue.ftl

@@ -39,7 +39,7 @@
                 <#if appde??>Object.assign(data, { ${appde.codeName?lower_case}: args[0].${appde.codeName?lower_case} });</#if>
             }
             if(!params) params = {};
-            Object.assign(params,{copymode:true});
+            Object.assign(args,{copymode:true});
             _this.opendata([{ ...data }], args, params, $event, xData);
         } else {
             Object.assign(this.viewparams,{copymode:true});

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

@@ -132,6 +132,7 @@ export default class ${srfclassname('${item.getCodeName()}')} {
                 Object.assign(itemdata,{value:item.<#if item.getValuePSAppDEField()??>${item.getValuePSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
                 Object.assign(itemdata,{text:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
                 Object.assign(itemdata,{label:item.<#if item.getTextPSAppDEField()??>${item.getTextPSAppDEField().getCodeName()?lower_case}<#else>${item.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case}</#if>});
+                <#if item.getDisablePSDEField()??>Object.assign(itemdata,{disabled:item.${item.getDisablePSDEField().getCodeName()?lower_case}? false : true});</#if>
                 <#if item.getPValuePSAppDEField()??>Object.assign(itemdata,{pvalue:item.${item.getPValuePSAppDEField().getCodeName()?lower_case}});</#if>
                 <#if item.getIconPathPSDEField()??>Object.assign(itemdata,{icon:item.${item.getIconPathPSDEField().getCodeName()?lower_case}});</#if>
                 <#if item.getIconClsPSDEField()??>Object.assign(itemdata,{iconcls:item.${item.getIconClsPSDEField().getCodeName()?lower_case}});</#if>