update: 更新

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

@@ -671,8 +671,8 @@ ${gridColumn.getName()}
         return {
             <#list ctrl.getPSDEGridEditItems() as edititem>
             ${edititem.getName()}: [
-                { required: <#if edititem.isAllowEmpty()>false<#else>true</#if>, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `<#if langbase??><#noparse>${</#noparse>this.$t('${langbase}.columns.${edititem.getName()?lower_case}')<#noparse>}</#noparse><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse><#else><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse></#if>`, trigger: 'change' },
-                { required: <#if edititem.isAllowEmpty()>false<#else>true</#if>, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `<#if langbase??><#noparse>${</#noparse>this.$t('${langbase}.columns.${edititem.getName()?lower_case}')<#noparse>}</#noparse><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse><#else><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse></#if>`, trigger: 'blur' },
+                { required: <#if edititem.isAllowEmpty()>false<#else>true</#if>, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `<#if edititem.getCapPSLanguageRes()??><#noparse>${</#noparse>this.$t('${edititem.getCapPSLanguageRes().getLanResTag()}')<#noparse>}</#noparse><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse><#else><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse></#if>`, trigger: 'change' },
+                { required: <#if edititem.isAllowEmpty()>false<#else>true</#if>, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: `<#if edititem.getCapPSLanguageRes()??><#noparse>${</#noparse>this.$t('${edititem.getCapPSLanguageRes().getLanResTag()}')<#noparse>}</#noparse><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse><#else><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse></#if>`, trigger: 'blur' },
             <#if ctrl.getPSDEGridEditItemVRs?? && ctrl.getPSDEGridEditItemVRs()??>
                 <#list ctrl.getPSDEGridEditItemVRs() as fideValueRule>
                 <#if fideValueRule.getPSDEGridEditItemName() == edititem.getName()>

@MACRO/LANG_FUN.ftl

@@ -10,7 +10,7 @@
 
 <#macro getItemLanguageCaption item>
   <#if item.getCapPSLanguageRes?? && item.getCapPSLanguageRes()??>
-    $t('${item.getCapPSLanguageRes()}', '${item.getCaption()}')<#t>
+    $t('${item.getCapPSLanguageRes().getLanResTag()}', '${item.getCaption()}')<#t>
   <#else>
     '${item.getCaption()}'<#t>
   </#if>
@@ -130,8 +130,6 @@ ${navParam.getKey()}:<#if navParam.isRawValue()?? && navParam.isRawValue() == tr
 <#macro getEmptyTextLanguage obj emptyValue='暂无数据'>
   <#if obj.getEmptyTextPSLanguageRes()??>
     $t('${obj.getEmptyTextPSLanguageRes().getLanResTag()}')<#t>    
-  <#elseif obj.getEmptyText()?? && obj.getEmptyText() != '未定义'>
-    '${obj.getEmptyText()}'<#t>      
   <#else>
     ${emptyValue}<#t>
   </#if>