优化国际化附加逻辑内容

APP/src/locale/index.ts.ftl

@@ -13,7 +13,7 @@ import iviewZhCnLocale from 'view-design/dist/locale/zh-CN';
 import elementZhLocale from 'element-ui/lib/locale/lang/zh-CN';
 
 const messages = {
-    'zh-CN': Object.assign(iviewZhCnLocale, elementZhLocale, zhCn),
+    'zh-CN': Object.assign(iviewZhCnLocale, elementZhLocale, zhCn()),
 };
 <#if app.getAllPSAppLans()??>
 
@@ -24,7 +24,7 @@ import iviewEnUsLocale from 'view-design/dist/locale/en-US';
 import elementEnLocale from 'element-ui/lib/locale/lang/en';
 
 Object.assign(messages, {
-    'en-US': Object.assign(iviewEnUsLocale, elementEnLocale, enUs),
+    'en-US': Object.assign(iviewEnUsLocale, elementEnLocale, enUs()),
 });
 </#if>
 </#list>

APP/src/locale/lang/en-US.ts.ftl

@@ -3,6 +3,10 @@ TARGET=PSSYSAPP
 </#ibiztemplate>
 import app_en_US_Base from './en-US-base';
 
-const app_en_US_OwnData = {};
-const targetData = Object.assign(app_en_US_Base, app_en_US_OwnData);
-export default targetData;
\ No newline at end of file
+function getLocaleResource(){
+    const app_en_US_OwnData = {};
+    const targetData = Object.assign(app_en_US_Base(), app_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

APP/src/locale/lang/zh-CN.ts.ftl

@@ -3,6 +3,10 @@ TARGET=PSSYSAPP
 </#ibiztemplate>
 import app_zh_CN_Base from './zh-CN-base';
 
-const app_zh_CN_OwnData = {};
-const targetData = Object.assign(app_zh_CN_Base, app_zh_CN_OwnData);
-export default targetData;
\ No newline at end of file
+function getLocaleResource(){
+    const app_zh_CN_OwnData = {};
+    const targetData = Object.assign(app_zh_CN_Base(), app_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

APP/src/locale/lanres/codelist/codelist_en_US.ts.ftl

@@ -3,6 +3,9 @@ TARGET=PSSYSAPP
 </#ibiztemplate>
 import codelist_en_US_Base from './codelist_en_US_base';
 
-const codelist_en_US_OwnData = {};
-const targetData = Object.assign(codelist_en_US_Base, codelist_en_US_OwnData);
-export default targetData;
\ No newline at end of file
+function getLocaleResource(){
+    const codelist_en_US_OwnData = {};
+    const targetData = Object.assign(codelist_en_US_Base(), codelist_en_US_OwnData);
+    return targetData;
+}
+export default getLocaleResource;
\ No newline at end of file

APP/src/locale/lanres/codelist/codelist_en_US_base.ts.ftl

@@ -4,23 +4,28 @@ TARGET=PSSYSAPP
 import commonLogic from '@/locale/logic/common/common-logic';
 <#ibizinclude>../../@MACRO/FUNC.ts</#ibizinclude>
 <#assign langrestype = 'EN'/>
-export default {
-<#if app.getAllPSAppCodeLists()??>
-  <#list app.getAllPSAppCodeLists() as codelist>
-    <#if codelist.getCodeListType() == "STATIC">
-    ${codelist.codeName}: {
-      <#if codelist.getAllPSCodeItems?? && codelist.getAllPSCodeItems()??>
-        <#list codelist.getAllPSCodeItems() as codeitem>
-        "${codeitem.getValue()?j_string}": commonLogic.appcommonhandle("<@getTextLanguage codeitem langrestype />",null),
-        </#list>
+
+function getLocaleResourceBase(){
+  const data:any = {
+  <#if app.getAllPSAppCodeLists()??>
+    <#list app.getAllPSAppCodeLists() as codelist>
+      <#if codelist.getCodeListType() == "STATIC">
+      ${codelist.codeName}: {
+        <#if codelist.getAllPSCodeItems?? && codelist.getAllPSCodeItems()??>
+          <#list codelist.getAllPSCodeItems() as codeitem>
+          "${codeitem.getValue()?j_string}": commonLogic.appcommonhandle("<@getTextLanguage codeitem langrestype />",null),
+          </#list>
+        </#if>
+          "empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null)
+      },
+      <#elseif codelist.getCodeListType() == "DYNAMIC">
+      ${codelist.codeName}: {
+          "empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null),
+      },
       </#if>
-        "empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null)
-    },
-    <#elseif codelist.getCodeListType() == "DYNAMIC">
-    ${codelist.codeName}: {
-        "empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null),
-    },
-    </#if>
-  </#list>
-</#if>
-};
\ No newline at end of file
+    </#list>
+  </#if>
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

APP/src/locale/lanres/codelist/codelist_zh_CN.ts.ftl

@@ -3,6 +3,10 @@ TARGET=PSSYSAPP
 </#ibiztemplate>
 import codelist_zh_CN_Base from './codelist_zh_CN_base';
 
-const codelist_zh_CN_OwnData = {};
-const targetData = Object.assign(codelist_zh_CN_Base, codelist_zh_CN_OwnData);
-export default targetData;
\ No newline at end of file
+function getLocaleResource(){
+    const codelist_zh_CN_OwnData = {};
+    const targetData = Object.assign(codelist_zh_CN_Base(), codelist_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

APP/src/locale/lanres/codelist/codelist_zh_CN_base.ts.ftl

@@ -4,23 +4,28 @@ TARGET=PSSYSAPP
 import commonLogic from '@/locale/logic/common/common-logic';
 <#ibizinclude>../../@MACRO/FUNC.ts</#ibizinclude>
 <#assign langrestype = 'ZH_CN'/>
-export default {
-<#if app.getAllPSAppCodeLists()??>
-  <#list app.getAllPSAppCodeLists() as codelist>
-    <#if codelist.getCodeListType() == "STATIC">
-    ${codelist.codeName}: {
-      <#if codelist.getAllPSCodeItems?? && codelist.getAllPSCodeItems()??>
-        <#list codelist.getAllPSCodeItems() as codeitem>
-        "${codeitem.getValue()?j_string}": commonLogic.appcommonhandle("<@getTextLanguage codeitem langrestype />",null),
-        </#list>
+
+function getLocaleResourceBase(){
+  const data:any = {
+  <#if app.getAllPSAppCodeLists()??>
+    <#list app.getAllPSAppCodeLists() as codelist>
+      <#if codelist.getCodeListType() == "STATIC">
+      ${codelist.codeName}: {
+        <#if codelist.getAllPSCodeItems?? && codelist.getAllPSCodeItems()??>
+          <#list codelist.getAllPSCodeItems() as codeitem>
+          "${codeitem.getValue()?j_string}": commonLogic.appcommonhandle("<@getTextLanguage codeitem langrestype />",null),
+          </#list>
+        </#if>
+          "empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null),
+      },
+      <#elseif codelist.getCodeListType() == "DYNAMIC">
+      ${codelist.codeName}: {
+          "empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null),
+      },
       </#if>
-        "empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null),
-    },
-    <#elseif codelist.getCodeListType() == "DYNAMIC">
-    ${codelist.codeName}: {
-        "empty": commonLogic.appcommonhandle("<@getEmptyTextLanguage codelist langrestype '' />",null),
-    },
-    </#if>
-  </#list>
-</#if>
-};
\ No newline at end of file
+    </#list>
+  </#if>
+  };
+  return data;
+}
+export default getLocaleResourceBase;
\ No newline at end of file

APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_en_US.ts.ftl

@@ -3,6 +3,10 @@ TARGET=PSAPPDATAENTITY
 </#ibiztemplate>
 import ${item.getCodeName()}_en_US_Base from './${srffilepath2(item.getCodeName())}_en_US_base';
 
-const ${item.getCodeName()}_en_US_OwnData = {};
-const targetData = Object.assign(${item.getCodeName()}_en_US_Base, ${item.getCodeName()}_en_US_OwnData);
-export default targetData;
\ No newline at end of file
+function getLocaleResource(){
+    const ${item.getCodeName()}_en_US_OwnData = {};
+    const targetData = Object.assign(${item.getCodeName()}_en_US_Base(), ${item.getCodeName()}_en_US_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file

APP/src/locale/lanres/entities/%DE_PKGPATH%/%DE_PKGPATH%_zh_CN.ts.ftl

@@ -3,6 +3,10 @@ TARGET=PSAPPDATAENTITY
 </#ibiztemplate>
 import ${item.getCodeName()}_zh_CN_Base from './${srffilepath2(item.getCodeName())}_zh_CN_base';
 
-const ${item.getCodeName()}_zh_CN_OwnData = {};
-const targetData = Object.assign(${item.getCodeName()}_zh_CN_Base, ${item.getCodeName()}_zh_CN_OwnData);
-export default targetData;
\ No newline at end of file
+function getLocaleResource(){
+    const ${item.getCodeName()}_zh_CN_OwnData = {};
+    const targetData = Object.assign(${item.getCodeName()}_zh_CN_Base(), ${item.getCodeName()}_zh_CN_OwnData);
+    return targetData;
+}
+
+export default getLocaleResource;
\ No newline at end of file