update：统一实体名称

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/views/view-base-config.hbs

@@ -12,7 +12,7 @@
   xDataControlName:'{{page.xDataControlName}}',
   height: '{{page.height}}',
   width: '{{page.width}}',
-  appEntityName: '{{page.appEntity.codeName}}',
+  appEntityCodeName: '{{page.appEntity.codeName}}',
   keyPSDEField: '{{lowerCase page.appEntity.codeName}}',
   isLoadDefault: {{#if (or page.loadDefault (eq page.loadDefault false))}}{{page.loadDefault}}{{else}}true{{/if}},
   appViewNavContexts:{{> @macro/front-end/common/navparam.hbs appNavParams=page.psAppViewNavContexts}},

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/app/config/app-view-config.ts.hbs

@@ -5,7 +5,7 @@ export const AppViewConfig:IParam = {
   "{{appView.codeName}}":{
     "name": "{{appView.name}}",
     "codeName": "{{appView.codeName}}",
-    "appEntityName":"{{appView.appEntity.codeName}}",
+    "appEntityCodeName":"{{appView.appEntity.codeName}}",
     "openMode": "{{#if appView.openMode}}{{appView.openMode}}{{else}}INDEXVIEWTAB{{/if}}",
     "redirectView": {{appView.redirectView}},
     "deResPaths": [

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/logic/app-ui-action/app-action-base.ts

@@ -60,7 +60,7 @@ export class AppActionBase {
      * @memberof AppActionBase
      */
     public static async getUIService(actionEnvironment: IParam) {
-        const entityName = actionEnvironment?.state?.appEntityName;
+        const entityName = actionEnvironment?.state?.appEntityCodeName;
         if (!entityName) {
             console.log("实体名称不存在");
             return;

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/logic/app-ui-action/app-backend-action.ts

@@ -18,7 +18,7 @@ export class AppBackendAction extends AppActionBase {
     try {
       const { actionEnvironment } = params;
       const { context } = actionParams;
-      const entityName = actionEnvironment?.state?.appEntityName;
+      const entityName = actionEnvironment?.state?.appEntityCodeName;
       if (!entityName) {
         console.log("实体名称不存在");
         return { ok: false, result: null };

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/main-view/main-view-state.ts

@@ -21,7 +21,7 @@ export interface MainViewState extends ViewStateBase {
    * @type {string}
    * @memberof MainViewState
    */
-  appEntityName: string;
+  appEntityCodeName: string;
 
   /**
    * 视图逻辑配置

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/view-base/view-base.ts

@@ -189,9 +189,9 @@ export class ViewBase {
    * @memberof ViewBase
    */
   public useUIService() {
-    const { appEntityName, context } = this.state;
-    if (appEntityName) {
-      App.getUIService(appEntityName.toLowerCase(), context).then((service: IParam) => {
+    const { appEntityCodeName, context } = this.state;
+    if (appEntityCodeName) {
+      App.getUIService(appEntityCodeName.toLowerCase(), context).then((service: IParam) => {
         this.appUIService = service;
       })
     }
@@ -203,9 +203,9 @@ export class ViewBase {
    * @memberof ViewBase
    */
   public useDataService() {
-    const { appEntityName, context } = this.state;
-    if (appEntityName) {
-      App.getDataService(appEntityName.toLowerCase(), context).then((service: IParam) => {
+    const { appEntityCodeName, context } = this.state;
+    if (appEntityCodeName) {
+      App.getDataService(appEntityCodeName.toLowerCase(), context).then((service: IParam) => {
         this.appDataService = service;
       })
     }

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/service/control-service/tree-service.ts

@@ -373,7 +373,7 @@ export class TreeService<T extends ControlVOBase> extends ControlServiceBase<T>
                 Object.assign(treeNode, { nodeid: treeNode.srfkey });
                 Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
 
-                Object.assign(treeNode, { nodeType: node.nodeType, appEntityName: deCodeName });
+                Object.assign(treeNode, { nodeType: node.nodeType, appEntityCodeName: deCodeName });
                 list.push(treeNode);
                 resolve(list);
                 bFirst = false;

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@PORTLET}}-portlet/{{ctrls@PORTLET}}-portlet-state.ts.hbs

@@ -14,7 +14,6 @@ export const ctrlState = {
   {{/if}}
   {{#if ctrl.psAppDataEntity}}
   // 实体名称
-  appEntityName: '{{ctrl.psAppDataEntity.codeName}}',
   appEntityCodeName: '{{ctrl.psAppDataEntity.codeName}}',
   {{/if}}
   {{#if ctrl.psUIActionGroup.psUIActionGroupDetails}}