From 228305c587db00a3ffc76832917fb1b04889ee63 Mon Sep 17 00:00:00 2001 From: RedPig97 <1978141412@qq.com> Date: Tue, 31 Jan 2023 18:43:39 +0800 Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E6=90=9C=E7=B4=A2=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=80=BC=E8=A7=84=E5=88=99=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CONTROL-BASE.vue.ftl" | 4 ++-- APP/src/locale/lang/en-US.ts.ftl | 4 ++++ APP/src/locale/lang/zh-CN.ts.ftl | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git "a/@CONTROL/\346\220\234\347\264\242\350\241\250\345\215\225/CONTROL-BASE.vue.ftl" "b/@CONTROL/\346\220\234\347\264\242\350\241\250\345\215\225/CONTROL-BASE.vue.ftl" index 1e8b7b5c..9360eef4 100644 --- "a/@CONTROL/\346\220\234\347\264\242\350\241\250\345\215\225/CONTROL-BASE.vue.ftl" +++ "b/@CONTROL/\346\220\234\347\264\242\350\241\250\345\215\225/CONTROL-BASE.vue.ftl" @@ -145,8 +145,8 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators'; <#list ctrl.getAllPSDEFormDetails() as formdetail> <#if formdetail.getDetailType?? && formdetail.getDetailType() == 'FORMITEM'> ${formdetail.getName()}: [ - { type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>string</#if>', message: '${formdetail.getCaption()} 鍊煎繀椤讳负<#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>鏁板€�<#else>瀛楃涓�</#if>绫诲瀷', trigger: 'change' }, - { type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>string</#if>', message: '${formdetail.getCaption()} 鍊煎繀椤讳负<#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>鏁板€�<#else>瀛楃涓�</#if>绫诲瀷', trigger: 'blur' }, + { type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>string</#if>', message: '`<#if formdetail.getCapPSLanguageRes()??><#noparse>${</#noparse>this.$t('${formdetail.getCapPSLanguageRes().getLanResTag()}', '${formdetail.getCaption()}')<#noparse>}</#noparse><#else>${formdetail.getCaption()}</#if>` this.$t('app.commonWords.valueMustBe')<#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>this.$t('app.commonWords.number')<#else>this.$t('app.commonWords.string')</#if>this.$t('app.commonWords.kind')', trigger: 'change' }, + { type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>string</#if>', message: '`<#if formdetail.getCapPSLanguageRes()??><#noparse>${</#noparse>this.$t('${formdetail.getCapPSLanguageRes().getLanResTag()}', '${formdetail.getCaption()}')<#noparse>}</#noparse><#else>${formdetail.getCaption()}</#if>` this.$t('app.commonWords.valueMustBe')<#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>this.$t('app.commonWords.number')<#else>this.$t('app.commonWords.string')</#if>this.$t('app.commonWords.kind')', trigger: 'blur' }, { required: this.detailsModel.${formdetail.getName()}.required, type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>string</#if>', message: `<#if formdetail.getCapPSLanguageRes()??><#noparse>${</#noparse>this.$t('${formdetail.getCapPSLanguageRes().getLanResTag()}', '${formdetail.getCaption()}')<#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: this.detailsModel.${formdetail.getName()}.required, type: '<#assign datatype=srfjavatype(formdetail.getStdDataType())><#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>number<#else>string</#if>', message: `<#if formdetail.getCapPSLanguageRes()??><#noparse>${</#noparse>this.$t('${formdetail.getCapPSLanguageRes().getLanResTag()}', '${formdetail.getCaption()}')<#noparse>}</#noparse><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse><#else><#noparse>${</#noparse>this.$t('app.commonWords.valueNotEmpty')<#noparse>}</#noparse></#if>`, trigger: 'blur' }, ], diff --git a/APP/src/locale/lang/en-US.ts.ftl b/APP/src/locale/lang/en-US.ts.ftl index eca3604c..dad48d15 100644 --- a/APP/src/locale/lang/en-US.ts.ftl +++ b/APP/src/locale/lang/en-US.ts.ftl @@ -31,6 +31,10 @@ function getLocaleResource(){ 'app.commonWords.other': 'other', 'app.commonWords.isExist': 'is exist', 'app.commonWords.valueNotEmpty': 'The value cannot be null', + 'app.commonWords.valueMustBe': "The value must be", + 'app.commonWords.number': "number", + 'app.commonWords.string': "string", + 'app.commonWords.kind': "type", 'app.local.new': 'New', 'app.local.add': 'Add', 'app.grid.exportexcel.error': 'Export Failed', diff --git a/APP/src/locale/lang/zh-CN.ts.ftl b/APP/src/locale/lang/zh-CN.ts.ftl index b5e0ef01..598b3784 100644 --- a/APP/src/locale/lang/zh-CN.ts.ftl +++ b/APP/src/locale/lang/zh-CN.ts.ftl @@ -31,6 +31,10 @@ function getLocaleResource(){ 'app.commonWords.other': "鍏朵粬", 'app.commonWords.isExist': '宸茬粡瀛樺湪', 'app.commonWords.valueNotEmpty': "鍊间笉鑳戒负绌�", + 'app.commonWords.valueMustBe': "鍊煎繀椤讳负", + 'app.commonWords.number': "鏁板€�", + 'app.commonWords.string': "瀛楃涓�", + 'app.commonWords.kind': "绫诲瀷", 'app.local.new': "鏂板缓", 'app.local.add': "澧炲姞", 'app.grid.exportexcel.error': '瀵煎嚭澶辫触', -- 2.21.0