update：模板适配TS版本发布器

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

@@ -11,9 +11,9 @@
   xDataControlName:'{{page.xDataControlName}}',
   height: '{{page.height}}',
   width: '{{page.width}}',
-  appEntityCodeName: '{{page.appEntity.codeName}}',
-  appDeKeyFieldName: '{{lowerCase page.appEntity.keyPSAppDEField.codeName}}',
-  appDeMajorFieldName: '{{lowerCase page.appEntity.majorPSAppDEField.codeName}}',
+  appEntityCodeName: '{{page.psAppDataEntity.codeName}}',
+  appDeKeyFieldName: '{{lowerCase page.psAppDataEntity.keyPSAppDEField.codeName}}',
+  appDeMajorFieldName: '{{lowerCase page.psAppDataEntity.majorPSAppDEField.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}},
   appViewNavParams:{{> @macro/front-end/common/navparam.hbs appNavParams=page.psAppViewNavParams}},

modules/ibizlab-generator-core/src/main/resources/templ/r7/@macro/front-end/widgets/form-detail/form-druipart.hbs

@@ -12,7 +12,7 @@
   style="{{#if item.width}}width: {{item.width}}px;{{/if}}{{#if item.height}}height: {{item.height}}px;{{/if}}"
 {{/if}}
   paramItem="{{#if item.paramItem}}{{item.paramItem}}{{else}}srfkey{{/if}}"
-  deCodeName="{{lowerCase ctrl.appEntity.codeName}}"
+  deCodeName="{{lowerCase ctrl.psAppDataEntity.codeName}}"
 {{#if item.refreshItems}}
   refreshItems="{{item.refreshItems}}"
 {{/if}}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DEEDITVIEW}}/{{pages@DEEDITVIEW}}.vue.hbs

@@ -4,7 +4,7 @@ import { EditView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 {{#page.ctrls}}
 {{#eq controlType "FORM"}}
-import { {{codeName}}Form } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-form';
+import { {{codeName}}Form } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-form';
 {{/eq}}
 {{/page.ctrls}}
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DEGRIDVIEW}}/{{pages@DEGRIDVIEW}}.vue.hbs

@@ -5,16 +5,16 @@ import { GridView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 {{#page.ctrls}}
 {{#eq controlType "GRID"}}
-import { {{codeName}}Grid } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-grid';
+import { {{codeName}}Grid } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-grid';
 {{/eq}}
 {{#if (and (eq controlType "SEARCHFORM") (eq name 'searchform'))}}
-import { {{codeName}}SearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-search-form';
+import { {{codeName}}SearchForm } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-search-form';
 {{/if}}
 {{#if (and (eq controlType "SEARCHFORM") (eq name 'quicksearchform'))}}
-import { {{codeName}}QuickSearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-quick-search-form';
+import { {{codeName}}QuickSearchForm } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-quick-search-form';
 {{/if}}
 {{#eq controlType "SEARCHBAR"}}
-import { {{codeName}}SearchBar } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-searchBar';
+import { {{codeName}}SearchBar } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-searchBar';
 {{/eq}}
 {{/page.ctrls}}
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DEMPICKUPVIEW}}/{{pages@DEMPICKUPVIEW}}.vue.hbs

@@ -5,7 +5,7 @@ import { MPickupView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 {{#page.ctrls}}
 {{#eq controlType "PICKUPVIEWPANEL"}}
-import { {{codeName}}PickupViewPanel } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-pickup-view-panel';
+import { {{codeName}}PickupViewPanel } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-pickup-view-panel';
 {{/eq}}
 {{/page.ctrls}}
 // props声明和默认值处理

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DEPICKUPGRIDVIEW}}/{{pages@DEPICKUPGRIDVIEW}}.vue.hbs

@@ -5,13 +5,13 @@ import { PickupGridView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 {{#each page.ctrls as |control|}}
 {{#if (eq control.controlType 'GRID') }}
-import { {{control.codeName}}Grid } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-grid';
+import { {{control.codeName}}Grid } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-grid';
 {{/if}}
 {{#if (and (eq controlType "SEARCHFORM") (eq name 'searchform'))}}
-import { {{codeName}}SearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-search-form';
+import { {{codeName}}SearchForm } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-search-form';
 {{/if}}
 {{#if (and (eq controlType "SEARCHFORM") (eq name 'quicksearchform'))}}
-import { {{codeName}}QuickSearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-quick-search-form';
+import { {{codeName}}QuickSearchForm } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-quick-search-form';
 {{/if}}     
 {{/each}}
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DEPICKUPVIEW}}/{{pages@DEPICKUPVIEW}}.vue.hbs

@@ -4,7 +4,7 @@ import { PickupView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 {{#page.ctrls}}
 {{#eq controlType "PICKUPVIEWPANEL"}}
-import { {{codeName}}PickupViewPanel } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-pickup-view-panel';
+import { {{codeName}}PickupViewPanel } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-pickup-view-panel';
 {{/eq}}
 {{/page.ctrls}}
 // props声明和默认值处理

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DETABEXPVIEW}}/{{pages@DETABEXPVIEW}}.vue.hbs

@@ -4,7 +4,7 @@ import { TabExpView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 {{#page.ctrls}}
 {{#eq controlType "TABEXPPANEL"}}
-import { {{codeName}}TabExpPanel } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-tab-exp-panel';
+import { {{codeName}}TabExpPanel } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-tab-exp-panel';
 {{/eq}}
 {{/page.ctrls}}
 // props声明和默认值处理

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DETREEEXPVIEW}}/{{pages@DETREEEXPVIEW}}.vue.hbs

@@ -4,7 +4,7 @@ import { TreeExpView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 {{#page.ctrls}}
 {{#eq controlType "TREEEXPBAR"}}
-import { {{codeName}}TreeExpBar } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-tree-exp-bar';
+import { {{codeName}}TreeExpBar } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-tree-exp-bar';
 {{/eq}}
 {{/page.ctrls}}
 interface Props {

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/views/{{appModules}}/{{pages@DETREEVIEW}}/{{pages@DETREEVIEW}}.vue.hbs

@@ -4,16 +4,16 @@ import { TreeView, IActionParam, IParam, IContext } from '@core';
 import { viewState } from './{{spinalCase page.codeName}}-state';
 {{#page.ctrls}}
 {{#eq controlType "TREEVIEW"}}
-import { {{codeName}}Tree } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-tree';
+import { {{codeName}}Tree } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-tree';
 {{/eq}}
 {{#if (and (eq controlType "SEARCHFORM") (eq name 'searchform'))}}
-import { {{codeName}}SearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-search-form';
+import { {{codeName}}SearchForm } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-search-form';
 {{/if}}
 {{#if (and (eq controlType "SEARCHFORM") (eq name 'quicksearchform'))}}
-import { {{codeName}}QuickSearchForm } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-quick-search-form';
+import { {{codeName}}QuickSearchForm } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-quick-search-form';
 {{/if}}
 {{#eq controlType "SEARCHBAR"}}
-import { {{codeName}}SearchBar } from '@widgets/{{spinalCase appEntity.codeName}}/{{spinalCase codeName}}-searchBar';
+import { {{codeName}}SearchBar } from '@widgets/{{spinalCase psAppDataEntity.codeName}}/{{spinalCase codeName}}-searchBar';
 {{/eq}}
 {{/page.ctrls}}
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@TABVIEWPANEL}}-tab-view-panel/{{ctrls@TABVIEWPANEL}}-tab-view-panel-state.ts.hbs

 export const ctrlState = {
   controlCodeName: '{{ctrl.codeName}}',
   controlName: '{{ctrl.name}}',
-  appDeCodeName: '{{ctrl.appEntity.codeName}}',
+  appDeCodeName: '{{ctrl.psAppDataEntity.codeName}}',
   navFilter: "{{ctrl.navFilter}}",
 {{#if ctrl.psNavigateContexts}}
   navContexts:{{> @macro/front-end/common/navparam.hbs appNavParams=ctrl.psNavigateContexts}},

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

@@ -185,11 +185,11 @@ export class ControlVO extends ControlVOBase implements TreeControlVO {
 }
 
 export const ctrlState = {
-  appEntityCodeName: '{{ctrl.appEntity.codeName}}',
-  appDeCodeName:'{{ctrl.appEntity.codeName}}',
-  appDeLogicName: '{{ctrl.appEntity.logicName}}',
-  appDeKeyFieldName: '{{#if ctrl.appEntity.keyPSAppDEField}}{{ctrl.appEntity.keyPSAppDEField.codeName}}{{/if}}',
-  appDeMajorFieldName: '{{#if ctrl.appEntity.majorPSAppDEField}}{{ctrl.appEntity.majorPSAppDEField.codeName}}{{/if}}',
+  appEntityCodeName: '{{ctrl.psAppDataEntity.codeName}}',
+  appDeCodeName:'{{ctrl.psAppDataEntity.codeName}}',
+  appDeLogicName: '{{ctrl.psAppDataEntity.logicName}}',
+  appDeKeyFieldName: '{{#if ctrl.psAppDataEntity.keyPSAppDEField}}{{ctrl.psAppDataEntity.keyPSAppDEField.codeName}}{{/if}}',
+  appDeMajorFieldName: '{{#if ctrl.psAppDataEntity.majorPSAppDEField}}{{ctrl.psAppDataEntity.majorPSAppDEField.codeName}}{{/if}}',
   {{#and ctrl.psAppCounterRef ctrl.psAppCounterRef.psAppCounter}}
   appCounterRef: {
     {{#with ctrl.psAppCounterRef.psAppCounter as | counter |}}