202.5.14 更新

@CONTROL/@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl

@@ -46,7 +46,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected name?: string;
+    @Prop() public name?: string;
 
     /**
      * 视图通讯对象
@@ -54,7 +54,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {Subject<ViewState>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected viewState!: Subject<ViewState>;
+    @Prop() public viewState!: Subject<ViewState>;
 
     /**
      * 应用上下文
@@ -62,7 +62,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected context: any;
+    @Prop() public context: any;
 
     /**
      * 视图参数
@@ -70,16 +70,16 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected viewparams: any;
+    @Prop() public viewparams: any;
 
     /**
      * 视图状态事件
      *
-     * @protected
+     * @public
      * @type {(Subscription | undefined)}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected viewStateEvent: Subscription | undefined;
+    public viewStateEvent: Subscription | undefined;
 
     /**
      * 获取部件类型
@@ -87,7 +87,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @returns {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected getControlType(): string {
+    public getControlType(): string {
         return '${ctrl.getControlType()}'
     }
 
@@ -105,7 +105,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService();
+    public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService();
 </#if>
 </#list>
 
@@ -115,7 +115,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {Array<*>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected counterServiceArray:Array<any> = [${counterRefs}];
+    public counterServiceArray:Array<any> = [${counterRefs}];
 </#if>
 
     /**
@@ -124,7 +124,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {${srfclassname('${ctrl.codeName}')}Service}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({ $store: this.$store });
+    public service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({ $store: this.$store });
 <#if appde??>
 
     /**
@@ -133,7 +133,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @type {${srfclassname('${appde.getCodeName()}')}Service}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store });
+    public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store });
 </#if>
     <#if ctrl.getPSControls?? && ctrl.getPSControls()??>
     <#list ctrl.getPSControls() as childCtrl>
@@ -148,7 +148,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
+    public ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
     <#if childCtrl.getPSControlLogics(eventName)??>
     <#list childCtrl.getPSControlLogics(eventName) as ctrlLogic>
     <#if ctrlLogic.getLogicType?? && ctrlLogic.getLogicType() == "APPVIEWENGINE" && ctrlLogic.getPSAppViewEngine()??>
@@ -194,7 +194,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
      * @param {any} args
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected closeView(args: any): void {
+    public closeView(args: any): void {
         let _this: any = this;
         _this.$emit('closeview', [args]);
     }

@CONTROL/@MACRO/CONTROL/CONTROL_PORTLET-HEADER-BASE.vue.ftl

@@ -46,7 +46,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected name?: string;
+    @Prop() public name?: string;
 
     /**
      * 视图通讯对象
@@ -54,7 +54,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @type {Subject<ViewState>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected viewState!: Subject<ViewState>;
+    @Prop() public viewState!: Subject<ViewState>;
 
     /**
      * 应用上下文
@@ -62,7 +62,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected context: any;
+    @Prop() public context: any;
 
     /**
      * 视图参数
@@ -70,16 +70,16 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected viewparams: any;
+    @Prop() public viewparams: any;
 
     /**
      * 视图状态事件
      *
-     * @protected
+     * @public
      * @type {(Subscription | undefined)}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected viewStateEvent: Subscription | undefined;
+    public viewStateEvent: Subscription | undefined;
 
     /**
      * 获取部件类型
@@ -87,7 +87,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @returns {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected getControlType(): string {
+    public getControlType(): string {
         return '${ctrl.getControlType()}'
     }
 
@@ -105,7 +105,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService();
+    public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService();
 </#if>
 </#list>
 
@@ -115,7 +115,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @type {Array<*>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected counterServiceArray:Array<any> = [${counterRefs}];
+    public counterServiceArray:Array<any> = [${counterRefs}];
 </#if>
 
     /**
@@ -124,7 +124,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @type {${srfclassname('${ctrl.codeName}')}Service}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({ $store: this.$store });
+    public service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({ $store: this.$store });
 <#if appde??>
 
     /**
@@ -133,7 +133,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @type {${srfclassname('${appde.getCodeName()}')}Service}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store });
+    public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store });
 </#if>
     <#if ctrl.getPSControls?? && ctrl.getPSControls()??>
     <#list ctrl.getPSControls() as childCtrl>
@@ -148,7 +148,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
+    public ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
     <#if childCtrl.getPSControlLogics(eventName)??>
     <#list childCtrl.getPSControlLogics(eventName) as ctrlLogic>
     <#if ctrlLogic.getLogicType?? && ctrlLogic.getLogicType() == "APPVIEWENGINE" && ctrlLogic.getPSAppViewEngine()??>
@@ -194,7 +194,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
      * @param {any} args
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected closeView(args: any): void {
+    public closeView(args: any): void {
         let _this: any = this;
         _this.$emit('closeview', [args]);
     }

@CONTROL/@MACRO/SERVICE/FORM.ts.ftl

@@ -300,8 +300,9 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
     public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
         const {data:Data,context:Context} = this.handleRequestData(action,context,data);
         //仿真主键数据
-        Data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID();
-        Data.${appde.getCodeName()?lower_case} = Data.${appde.getKeyPSAppDEField().getCodeName()?lower_case};
+        const PrimaryKey = Util.createUUID();
+        Data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = PrimaryKey;
+        Data.${appde.getCodeName()?lower_case} = PrimaryKey;
         return new Promise((resolve: any, reject: any) => {
             let result: Promise<any>;
             const _appEntityService: any = this.appEntityService;
@@ -311,6 +312,7 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
                 result = this.appEntityService.GetDraft(Context,Data, isloading);
             }
             result.then((response) => {
+                response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = PrimaryKey;
                 this.handleResponse(action, response, true);
                 resolve(response);
             }).catch(response => {

@CONTROL/分页导航面板/CONTROL-BASE.vue.ftl

@@ -48,7 +48,7 @@
      * @returns {any}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected isInit: any = {
+    public isInit: any = {
 <#list ctrl.getPSControls() as tabviewpanel>
         ${tabviewpanel.name}: <#if tabviewpanel_index == 0> true <#else> false </#if>,
 </#list>
@@ -77,11 +77,11 @@
     /**
      * 行为参数
      *
-     * @protected
+     * @public
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected action:any = '';
+    public action:any = '';
 
     /**
      * 被激活的分页面板
@@ -89,7 +89,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected activiedTabViewPanel: string = '<#list ctrl.getPSControls() as tabviewpanel><#if tabviewpanel_index==0>${tabviewpanel.name}</#if></#list>';
+    public activiedTabViewPanel: string = '<#list ctrl.getPSControls() as tabviewpanel><#if tabviewpanel_index==0>${tabviewpanel.name}</#if></#list>';
 
     /**
      * 分页视图面板数据变更
@@ -106,7 +106,7 @@
      * @returns
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -115,7 +115,14 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected afterCreated(){
+    public afterCreated(){
+        //设置分页导航srfparentdename和srfparentkey
+        <#if ctrl.getPSAppDataEntity()??>
+        <#assign appDataEntity = ctrl.getPSAppDataEntity()/>
+        if(this.context.${appDataEntity.getCodeName()?lower_case}){
+            Object.assign(this.context,{srfparentdename:'${appDataEntity.getCodeName()}',srfparentkey:this.context.${appDataEntity.getCodeName()?lower_case}})
+        }
+        </#if>
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
@@ -132,7 +139,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -141,7 +148,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -157,7 +164,7 @@
      * @returns
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected tabPanelClick($event: any) {
+    public tabPanelClick($event: any) {
         if (!$event) {
             return;
         }

@CONTROL/分页视图面板/CONTROL-BASE.vue.ftl

@@ -40,7 +40,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected isActivied: boolean = true;
+    public isActivied: boolean = true;
              
     /**
      * vue 生命周期
@@ -48,7 +48,7 @@
      * @returns
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -57,7 +57,7 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected afterCreated(){
+    public afterCreated(){
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
@@ -81,7 +81,7 @@
      *
      * @memberof  ${srfclassname('${ctrl.codeName}')}
      */
-    protected viewDatasChange($event:any){
+    public viewDatasChange($event:any){
         this.$emit('viewpanelDatasChange',$event);
     }
 
@@ -90,7 +90,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -99,7 +99,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }

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

 <template>  
     <div :class="['app-list', this.items.length > 0 ? '' : 'app-list-empty' ]">
-            <div v-if="items.length > 0">
+            <div v-if="items.length > 0" style="height:100%;">
                 <#if ctrl.render??>
                 ${ctrl.render.code}
                 <#else>                 
@@ -51,7 +51,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: false }) protected isSelectFirstDefault!: boolean;
+    @Prop({ default: false }) public isSelectFirstDefault!: boolean;
 
     /**
      * 显示处理提示
@@ -59,7 +59,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: true }) protected showBusyIndicator?: boolean;
+    @Prop({ default: true }) public showBusyIndicator?: boolean;
 
     /**
      * 部件行为--create
@@ -67,7 +67,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected createAction!: string;
+    @Prop() public createAction!: string;
 
     /**
      * 部件行为--remove
@@ -75,7 +75,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected removeAction!: string;
+    @Prop() public removeAction!: string;
 
     /**
      * 部件行为--update
@@ -83,7 +83,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected updateAction!: string;
+    @Prop() public updateAction!: string;
 
     /**
      * 部件行为--fetch
@@ -91,7 +91,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected fetchAction!: string;
+    @Prop() public fetchAction!: string;
 
     /**
      * 当前页
@@ -99,7 +99,7 @@
      * @type {number}
      * @memberof Main
      */
-    protected curPage: number = 1;
+    public curPage: number = 1;
 
     /**
      * 数据
@@ -107,7 +107,7 @@
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected items: any[] = [];
+    public items: any[] = [];
 
     /**
      * 是否支持分页
@@ -115,7 +115,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected isEnablePagingBar: boolean = true;
+    public isEnablePagingBar: boolean = true;
 
     /**
      * 分页条数
@@ -123,7 +123,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected limit: number = 20;
+    public limit: number = 20;
 
     /**
      * 总条数
@@ -131,21 +131,21 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected totalRecord: number = 0;
+    public totalRecord: number = 0;
 
     /**
      * 选中数组
      * @type {Array<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected selections: Array<any> = [];
+    public selections: Array<any> = [];
 
      /**
      * Vue声明周期，组件挂载完毕
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected mounted () {
+    public mounted () {
         this.afterMounted();
     }
 
@@ -154,7 +154,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterMounted () {
+    public afterMounted () {
         this.$el.addEventListener('scroll', ()=> {
             if( this.$el.scrollTop +  this.$el.clientHeight  >=  this.$el.scrollHeight) {
                 this.loadMore();
@@ -167,7 +167,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected created() {
+    public created() {
         this.afterCreated()
     }
 
@@ -176,7 +176,7 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected afterCreated(){
+    public afterCreated(){
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(this.name, tag)) {
@@ -194,7 +194,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -203,7 +203,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -217,7 +217,7 @@
     *
     * @memberof Mob
     */
-    protected loadMore(){
+    public loadMore(){
         if(this.totalRecord>this.items.length)
         {
             this.curPage = ++this.curPage;
@@ -231,7 +231,7 @@
      * @param {*} [opt={}]
      * @memberof Main
      */
-    protected refresh(opt: any = {}) {
+    public refresh(opt: any = {}) {
         this.curPage = 1;
         this.items = [];
         this.load(opt);
@@ -240,11 +240,11 @@
     /**
      * 列表数据加载
      *
-     * @private
+     * @public
      * @param {*} [arg={}]
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private load(opt: any = {}): void {
+    public load(opt: any = {}): void {
         if(!this.fetchAction){
             this.$Notice.error({ title: '错误', desc: '${view.getName()}视图列表fetchAction参数未配置' });
             return;
@@ -296,7 +296,7 @@
      * @returns {Promise<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected async remove(datas: any[]): Promise<any> {
+    public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
             this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表格removeAction参数未配置' });
             return;
@@ -382,7 +382,7 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}
      *
      */
-    protected handleClick(args: any) {
+    public handleClick(args: any) {
         this.clearSelection();
         args.isselected = !args.isselected;
         this.selectchange();
@@ -393,7 +393,7 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}
      *
      */
-    protected handleDblClick(args: any) {
+    public handleDblClick(args: any) {
         this.$emit('rowdblclick', args);
     }
 
@@ -402,7 +402,7 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}
      *
      */
-    protected selectchange() {
+    public selectchange() {
         this.selections = [];
         this.items.map((item: any) => {
             if (item.isselected) {
@@ -417,7 +417,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected clearSelection(){
+    public clearSelection(){
         this.items.map((item: any) => {
             Object.assign(item, { isselected: false });
         }); 

@CONTROL/列表/CONTROL.less.ftl

@@ -3,6 +3,7 @@
 </#ibizinclude>
 
 .app-list {
+    height:100%;
     flex-grow: 1;
     overflow-y: auto;
     .app-list-item {
@@ -16,6 +17,7 @@
     }
 }
 .app-list-empty {
+    height:100%;
     color: #909399;
     display: flex;
     justify-content: center;

@CONTROL/列表导航/CONTROL-BASE.vue.ftl

@@ -62,25 +62,25 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop() protected viewUID!:string;
+    @Prop() public viewUID!:string;
 
     /**
      * 是否单选
      * 
-     * @protected
+     * @public
      * @type {(boolean)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected isSingleSelect:boolean = true;
+    public isSingleSelect:boolean = true;
 
     /**
      * 呈现模式，可选值：horizontal或者vertical
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
+    public showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
 
     /**
      * 控件宽度
@@ -88,7 +88,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
+    public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
 
     /**
      * 控件高度
@@ -96,16 +96,16 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
+    public ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
 
     /**
      * 搜素值
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected searchText:string = "";
+    public searchText:string = "";
 
     /**
      * 分割宽度
@@ -113,7 +113,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected split: number = 0.5;
+    public split: number = 0.5;
 
 <#if ctrl.getXDataPSControl()??>
 <#assign xDataControl = ctrl.getXDataPSControl() />
@@ -124,7 +124,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
+    public navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
 
     /**
      * 导航视图参数
@@ -132,7 +132,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
+    public navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
 
     /**
      * 导航过滤项
@@ -140,7 +140,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
+    public navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
 </#if>
 
     /**
@@ -149,7 +149,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop({ default: true }) protected showBusyIndicator!: boolean;
+    @Prop({ default: true }) public showBusyIndicator!: boolean;
 
     <#if ctrl.getPSControls()??>
     <#assign controls = ctrl.getPSControls()/>
@@ -187,7 +187,7 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected selection: any = {};
+    public selection: any = {};
 
     /**
      * split值变化事件
@@ -266,7 +266,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -275,7 +275,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -289,7 +289,7 @@
      * 
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
+    public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         let data:any = {};
         if (args.length === 0) {
             return ;
@@ -317,7 +317,7 @@
      * 
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
+    public ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
         this.$emit('load',args);
     }
 
@@ -326,7 +326,7 @@
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
-    protected onSearch($event:any) {
+    public onSearch($event:any) {
 <#if ctrl.getPSDEList()??>
   <#assign list = ctrl.getPSDEList()/>
         this.viewState.next({ tag: '${list.name}', action: "load", data: {query : this.searchText}});

@CONTROL/卡片视图导航/CONTROL-BASE.vue.ftl

@@ -62,25 +62,25 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop() protected viewUID!:string;
+    @Prop() public viewUID!:string;
 
     /**
      * 是否单选
      * 
-     * @protected
+     * @public
      * @type {(boolean)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected isSingleSelect:boolean = true;
+    public isSingleSelect:boolean = true;
 
     /**
      * 呈现模式，可选值：horizontal或者vertical
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
+    public showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
 
     /**
      * 控件宽度
@@ -88,7 +88,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
+    public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
 
     /**
      * 控件高度
@@ -96,16 +96,16 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
+    public ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
 
     /**
      * 搜素值
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected searchText:string = "";
+    public searchText:string = "";
 
     /**
      * 分割宽度
@@ -113,7 +113,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected split: number = 0.5;
+    public split: number = 0.5;
 
 <#if ctrl.getXDataPSControl()??>
 <#assign xDataControl = ctrl.getXDataPSControl() />
@@ -124,7 +124,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
+    public navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
 
     /**
      * 导航视图参数
@@ -132,7 +132,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
+    public navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
 
     /**
      * 导航过滤项
@@ -140,7 +140,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
+    public navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
 </#if>
 
     /**
@@ -149,7 +149,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop({ default: true }) protected showBusyIndicator!: boolean;
+    @Prop({ default: true }) public showBusyIndicator!: boolean;
 
     <#if ctrl.getPSControls()??>
     <#assign controls = ctrl.getPSControls()/>
@@ -187,7 +187,7 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected selection: any = {};
+    public selection: any = {};
 
     /**
      * split值变化事件
@@ -266,7 +266,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -275,7 +275,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -293,7 +293,7 @@
      * @returns {void}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
+    public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         let data:any = {};
         if (args.length === 0) {
             return ;
@@ -325,7 +325,7 @@
      * @returns {void}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
+    public ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
         this.$emit('load',args);
     }
 
@@ -334,7 +334,7 @@
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
-    protected onSearch() {
+    public onSearch() {
         <#if ctrl.getPSDEDataView()??>
         <#assign dataview = ctrl.getPSDEDataView()/>
         this.viewState.next({ tag: '${dataview.name}', action: 'filter', data: { query: this.searchText} });

@CONTROL/向导面板/CONTROL-BASE.vue.ftl

@@ -47,7 +47,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected initAction!: string;
+    @Prop() public initAction!: string;
     
     /**
      * 部件行为--finish
@@ -55,7 +55,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected finishAction!: string;
+    @Prop() public finishAction!: string;
 
     /**
      * 显示处理提示
@@ -63,7 +63,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: true }) protected showBusyIndicator?: boolean;
+    @Prop({ default: true }) public showBusyIndicator?: boolean;
 
     /**
       * 获取多项数据
@@ -88,11 +88,11 @@
     /**
      * 视图状态订阅对象
      *
-     * @private
+     * @public
      * @type {Subject<{action: string, data: any}>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private wizardState: Subject<ViewState> = new Subject();
+    public wizardState: Subject<ViewState> = new Subject();
 
     /**
      * 当前激活表单
@@ -118,7 +118,7 @@
     /**
      * 执行过的表单
      *
-     * @private
+     * @public
      * @type {Array<string>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */

@CONTROL/多编辑视图面板/CONTROL-BASE.vue.ftl

@@ -52,7 +52,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: true }) protected showBusyIndicator?: boolean;
+    @Prop({ default: true }) public showBusyIndicator?: boolean;
 
     /**
      * 部件行为--update
@@ -60,7 +60,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected updateAction!: string;
+    @Prop() public updateAction!: string;
     
     /**
      * 部件行为--fetch
@@ -68,7 +68,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected fetchAction!: string;
+    @Prop() public fetchAction!: string;
     
     /**
      * 部件行为--remove
@@ -76,7 +76,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected removeAction!: string;
+    @Prop() public removeAction!: string;
     
     /**
      * 部件行为--load
@@ -84,7 +84,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected loadAction!: string;
+    @Prop() public loadAction!: string;
     
     /**
      * 部件行为--loaddraft
@@ -92,7 +92,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected loaddraftAction!: string;
+    @Prop() public loaddraftAction!: string;
     
     /**
      * 部件行为--create
@@ -100,7 +100,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected createAction!: string;
+    @Prop() public createAction!: string;
 
     /**
      * 刷新数据
@@ -108,7 +108,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected saveRefView?: number;
+    @Prop() public saveRefView?: number;
 
     /**
      * 刷新数据
@@ -132,18 +132,18 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected toString(item:any): string{
+    public toString(item:any): string{
         return JSON.stringify(item);
     }
 
      /**
      * 面板状态订阅对象
      *
-     * @private
+     * @public
      * @type {Subject<{action: string, data: any}>}
      * @memberof Meditviewpanel
      */
-    protected panelState: Subject<ViewState> = new Subject();
+    public panelState: Subject<ViewState> = new Subject();
 
     /**
      * 视图名称
@@ -151,7 +151,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected viewname: string = '<#if ctrl.getEmbeddedPSAppView()??>${srffilepath2(ctrl.getEmbeddedPSAppView().getCodeName())}</#if>';
+    public viewname: string = '<#if ctrl.getEmbeddedPSAppView()??>${srffilepath2(ctrl.getEmbeddedPSAppView().getCodeName())}</#if>';
 
     /**
      * 获取数据对象
@@ -159,7 +159,7 @@
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected items: any[] = [];
+    public items: any[] = [];
 
     /**
      * 计数器
@@ -167,7 +167,7 @@
      * @type number
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected count: number = 0;
+    public count: number = 0;
 
     <#--  BEGIN：参数处理  -->
 <#list ctrl.getAllRelatedPSAppViews() as dataview>
@@ -176,20 +176,20 @@
     /**
      * 关系实体参数对象
      *
-     * @private
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private deResParameters: any[] = [];
+    public deResParameters: any[] = [];
 
     /**
      * 当前应用视图参数对象
      *
-     * @private
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private parameters: any[] = [];
+    public parameters: any[] = [];
 <#else>
 <#--  <#assign dataview = ctrl.getAllRelatedPSAppViews()[0]>  -->
 <#assign appDataEntity = dataview.getPSAppDataEntity()/>
@@ -197,11 +197,11 @@
     /**
      * 关系实体参数对象
      *
-     * @private
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private deResParameters: any[] = [
+    public deResParameters: any[] = [
         <#--  BEGIN：存在父关系路径  -->
         <#if dataview.getPSAppDERSPathCount() gt 0>
         <#list dataview.getPSAppDERSPath(dataview.getPSAppDERSPathCount() - 1) as deRSPath>
@@ -215,11 +215,11 @@
     /**
      * 当前应用视图参数对象
      *
-     * @private
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private parameters: any[] = [
+    public parameters: any[] = [
         { pathName: '${srfpluralize(appDataEntity.codeName)?lower_case}', parameterName: '${appDataEntity.getCodeName()?lower_case}' },
     ];
 </#if>
@@ -231,7 +231,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -240,7 +240,7 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected afterCreated(){
+    public afterCreated(){
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
@@ -261,7 +261,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -270,7 +270,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -284,7 +284,7 @@
       *
       * @memberof Meditviewpanel
       */
-    protected saveData(data?: any) {
+    public saveData(data?: any) {
         this.count = 0;
         if(this.items.length >0){
             Object.assign(data,{showResultInfo:false});
@@ -297,11 +297,11 @@
     /**
      * 处理数据
      *
-     * @private
+     * @public
      * @param {any[]} datas
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private doItems(datas: any[]): void {
+    public doItems(datas: any[]): void {
         const [{ pathName, parameterName }] = this.parameters;
         datas.forEach((arg: any) => {
             let id: string = arg[parameterName] ? arg[parameterName] : this.$util.createUUID();
@@ -335,11 +335,11 @@
     /**
      * 数据加载
      *
-     * @private
+     * @public
      * @param {*} data
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private load(data: any): void {
+    public load(data: any): void {
         if(!this.fetchAction){
             this.$Notice.error({ title: '错误', desc: '${view.getName()}视图多编辑视图面板fetchAction参数未配置' });
             return;
@@ -374,7 +374,7 @@
      * 
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected handleAdd(){
+    public handleAdd(){
         if(!this.loaddraftAction){
             this.$Notice.error({ title: '错误', desc: '${view.getName()}视图多编辑视图面板loaddraftAction参数未配置' });
             return;
@@ -404,7 +404,7 @@
      * @param {boolean} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected setViewDirty(item: any, $event: boolean) {
+    public setViewDirty(item: any, $event: boolean) {
         let index: number = this.items.findIndex((_item: any) => Object.is(_item.id, item.id));
         if (index === -1) {
             return;
@@ -423,7 +423,7 @@
      * 部件抛出事件
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected viewDataChange($event:any){
+    public viewDataChange($event:any){
         if($event){
             try{
                 $event = JSON.parse($event);
@@ -458,7 +458,7 @@
      * @returns
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected viewload($event:any){
+    public viewload($event:any){
         console.log('视图加载完成');
     }
 
@@ -468,7 +468,7 @@
      * @returns
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected viewdirty(item:any,$event:any){
+    public viewdirty(item:any,$event:any){
         // editview9 视图数据变化;
         this.setViewDirty(item, $event);
     }

@CONTROL/工具栏/CONTROL.html#ITEM_DEUIACTION.ftl

@@ -2,14 +2,19 @@
 <#ibizinclude>
 ../@MACRO/CONTROL/LANGBASE.vue.ftl
 </#ibizinclude>
+<#if ctrl.getName() != 'toolbar'>
+  <#assign ModelsName>${ctrl.getCodeName()?lower_case}Models</#assign>
+<#else>
+  <#assign ModelsName = 'toolBarModels' />
+</#if>
 <#assign deuiaction=item.getPSUIAction()>
 <#if item.getTooltip()?? && item.getTooltip() != ''>
 <tooltip :transfer="true" :max-width="600">
     <#if deuiaction.getUIActionTag() == 'ExportExcel'>
-    <app-export-excel :item="toolBarModels.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
+    <app-export-excel :item="${ModelsName}.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
     <#else>
     <@badge item>
-        <i-button v-show="toolBarModels.${item.name}.visabled" :disabled="toolBarModels.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
+        <i-button v-show="${ModelsName}.${item.name}.visabled" :disabled="${ModelsName}.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
             <#if item.isShowIcon()><i class='<#if item.getPSSysImage()??><#assign img=item.getPSSysImage()><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>${img.getCssClass()}</#if></#if>'></i></#if>
             <#if item.isShowCaption()><span class='caption'>{{<#if langbase??>$t('${langbase}.${item.name}.caption')<#else>'${item.getCaption()}'</#if>}}</span></#if>
         </i-button>
@@ -19,10 +24,10 @@
 </tooltip>
 <#else>
 <#if deuiaction.getUIActionTag() == 'ExportExcel'>
-<app-export-excel :item="toolBarModels.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
+<app-export-excel :item="${ModelsName}.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
 <#else>
 <@badge item>
-    <i-button v-show="toolBarModels.${item.name}.visabled" :disabled="toolBarModels.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
+    <i-button v-show="${ModelsName}.${item.name}.visabled" :disabled="${ModelsName}.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
         <#if item.isShowIcon()><i class='<#if item.getPSSysImage()??><#assign img=item.getPSSysImage()><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>${img.getCssClass()}</#if></#if>'></i></#if>
         <#if item.isShowCaption()><span class='caption'>{{<#if langbase??>$t('${langbase}.${item.name}.caption')<#else>'${item.getCaption()}'</#if>}}</span></#if>
     </i-button>

@CONTROL/工具栏/CONTROL.html#ITEM_ITEMS.ftl

@@ -2,7 +2,12 @@
 <#ibizinclude>
 ../@MACRO/CONTROL/LANGBASE.vue.ftl
 </#ibizinclude>
-<dropdown v-show="toolBarModels.${item.name}.visabled" trigger='click'>
+<#if ctrl.getName() != 'toolbar'>
+  <#assign ModelsName>${ctrl.getCodeName()?lower_case}Models</#assign>
+<#else>
+  <#assign ModelsName = 'toolBarModels' />
+</#if>
+<dropdown v-show="${ModelsName}.${item.name}.visabled" trigger='click'>
     <#if item.getTooltip()?? && item.getTooltip() != ''>
     <tooltip :transfer="true" :max-width="600">
         <@badge item>

@CONTROL/工具栏/CONTROL.html.ftl

+<#if ctrl.getName() != 'toolbar'>
+  <#assign ModelsName>${ctrl.getCodeName()?lower_case}Models</#assign>
+<#else>
+  <#assign ModelsName = 'toolBarModels' />
+</#if>
 <div class='toolbar-container'>
     <#if (view.getPSWorkflow?? && view.getPSWorkflow()??) && (view.isWFIAMode?? && view.isWFIAMode()) && (view.getWFStepValue?? && view.getWFStepValue() == "") && (view.getViewType?? && (view.getViewType() == 'DEWFEDITVIEW3' || view.getViewType() == 'DEWFEDITVIEW'))><#t>
     <template v-for="item in containerModel.wflinks">

@CONTROL/工具栏/CONTROL.vue.ftl

     <#--  工具栏模型  -->
+<#if ctrl.getName() != 'toolbar'>
+  <#assign ModelsName>${ctrl.getCodeName()?lower_case}Models</#assign>
+<#else>
+  <#assign ModelsName = 'toolBarModels' />
+</#if>
     /**
      * 工具栏模型
      *
      * @type {*}
      * @memberof ${srfclassname('${view.name}')}
      */
-    public toolBarModels: any = {
+    public ${ModelsName}: any = {
         <#if ctrl.getPSDEToolbarItems()??>
         <#list ctrl.getPSDEToolbarItems() as item>
         ${P.getPartCode(item).code}

@CONTROL/应用菜单/MODEL.ts.ftl

@@ -5,11 +5,11 @@
     /**
      * 菜单项集合
      *
-     * @private
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}Model
      */
-    private items: any[] = [
+    public items: any[] = [
         <#list ctrl.getPSAppMenuItems() as child>
         ${P.getPartCode(child,"ITEM").code},
         </#list>
@@ -18,11 +18,11 @@
 	/**
 	 * 应用功能集合
 	 *
-	 * @private
+	 * @public
 	 * @type {any[]}
 	 * @memberof ${srfclassname('${ctrl.codeName}')}Model
 	 */
-	private funcs: any[] = [
+	public funcs: any[] = [
         <#if view.isDefaultPage?? && view.isDefaultPage()>
         <#list ctrl.getPSAppFuncs() as appFuncs>
         {

@CONTROL/搜索表单/CONTROL-BASE.vue#FORM.ftl

@@ -4,7 +4,7 @@
 <i-form :model="this.data" class='app-search-form<#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if><#if ctrl.isInfoFormMode?? && ctrl.isInfoFormMode()> info-form-mode</#if>' ref='${ctrl.name}' style="<#if ctrl.getFormWidth() gt 1>width: ${ctrl.getFormWidth()?c}px;</#if>">
   <input style="display:none;"/>
   <row>
-    <i-col span="20">
+    <i-col span="20" class="form-content">
       <row>
     <#if ctrl.isNoTabHeader()>
     <#list ctrl.getPSDEFormPages() as formmenber>
@@ -49,11 +49,13 @@
     </#if>
       </row>
     </i-col>
-    <i-col span="4">
+    <#if ctrl.getFormStyle() != "SEARCHBAR">
+    <i-col span="4" class="search-button">
       <row v-show="Object.keys(data).length>0">
         <i-button class='search_reset'  size="default" type="primary"  @click="onSearch">{{$t('app.searchButton.search')}}</i-button>
         <i-button class='search_reset'  size="default"  @click="onReset">{{this.$t('app.searchButton.reset')}}</i-button>
       </row>
     </i-col>
+    </#if>
   </row>
 </i-form>
\ No newline at end of file

@CONTROL/搜索表单/CONTROL.html.ftl

@@ -2,10 +2,11 @@
 <#assign content>
     :showBusyIndicator="${ctrl.isShowBusyIndicator()?c}"
     <#if view.isExpandSearchForm??>
-    v-show="isExpandSearchForm"
+    v-show="<#if ctrl.getFormStyle() == "SEARCHBAR">true<#else>isExpandSearchForm</#if>"
     </#if>
     loaddraftAction="<#if ctrl.getGetDraftPSControlAction()?? && ctrl.getGetDraftPSControlAction().getPSAppDEMethod()??>${ctrl.getGetDraftPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
     loadAction="<#if ctrl.getGetPSControlAction()?? && ctrl.getGetPSControlAction().getPSAppDEMethod()??>${ctrl.getGetPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
+<#if ctrl.getFormStyle() == "SEARCHBAR">@valuechange="qucikFormValueChange"</#if>
 </#assign>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl

@CONTROL/搜索表单/CONTROL.less.ftl

@@ -13,6 +13,9 @@
       margin-right: 12px;
       margin-bottom: 8px;
   }
+  .search-button{
+      text-align: right;
+  }
 }
 .app-search-form-flex {
     height: 100%;

@CONTROL/数据关系分页部件/CONTROL-BASE.vue.ftl

@@ -34,7 +34,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop({default:true}) protected isShowSlot?: boolean;
+    @Prop({default:true}) public isShowSlot?: boolean;
 
     /**
      *  应用实体参数名称
@@ -42,7 +42,7 @@
      * @type string
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop() protected parentName!: string;
+    @Prop() public parentName!: string;
     
     /**
      * 获取多项数据
@@ -70,16 +70,16 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected selection: any = {};
+    public selection: any = {};
 
     /**
      * 父数据
      *
-     * @private
+     * @public
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    private parentData: any = {};
+    public parentData: any = {};
 
     /**
      * 关系栏数据项
@@ -87,7 +87,7 @@
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected items: any[] = [
+    public items: any[] = [
         <#list ctrl.getRootItem().getAllItems() as dritem>
         {
             index: ${dritem_index?c}, 
@@ -104,7 +104,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected created(): void {
+    public created(): void {
         this.afterCreated();
     }
 
@@ -113,7 +113,7 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}Base
      */    
-    protected afterCreated(){
+    public afterCreated(){
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
@@ -135,7 +135,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -144,7 +144,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -156,12 +156,12 @@
     /**
      * 获取关系项
      *
-     * @private
+     * @public
      * @param {*} [arg={}]
      * @returns {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    private getDRTabItem(arg: any = {}): any {
+    public getDRTabItem(arg: any = {}): any {
         let expmode = arg.nodetype.toUpperCase();
         if (!expmode) {
             expmode = '';
@@ -186,7 +186,7 @@
      * @param {boolean} state
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected setItemDisabled(state: boolean): void {
+    public setItemDisabled(state: boolean): void {
         this.items.forEach((item: any) => {
             if (Object.is(item.name, 'form')) {
                 item.disabled = false;
@@ -199,12 +199,12 @@
     /**
      * 获取数据项
      *
-     * @private
+     * @public
      * @param {string} id
      * @returns {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    private getItem(id: string): any {
+    public getItem(id: string): any {
         const arr: any[] = this.items.filter((_item: any) => Object.is(_item.id, id));
         if (arr) {
             return arr[0];
@@ -218,7 +218,7 @@
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected tabPanelClick($event: any): void {
+    public tabPanelClick($event: any): void {
         const item = this.getItem($event);
         if (Object.is(item.id, this.selection.id)) {
             return;

@CONTROL/数据关系栏/CONTROL-BASE.vue.ftl

@@ -104,11 +104,11 @@
     /**
      * 父数据
      *
-     * @private
+     * @public
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private parentData: any = {};
+    public parentData: any = {};
 
     /**
      * 宽度
@@ -158,12 +158,12 @@
     /**
      * 获取关系项
      *
-     * @private
+     * @public
      * @param {*} [arg={}]
      * @returns {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private getDRBarItem(arg: any = {}): any {
+    public getDRBarItem(arg: any = {}): any {
         let expmode = arg.nodetype;
         if (!expmode) {
             expmode = '';
@@ -185,11 +185,11 @@
     /**
      * 处理数据
      *
-     * @private
+     * @public
      * @param {any[]} items
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private dataProcess(items: any[]): void {
+    public dataProcess(items: any[]): void {
         items.forEach((_item: any) => {
             if (_item.expanded) {
                 this.defaultOpeneds.push(_item.id);

@CONTROL/数据图表 (新)/CONTROL-BASE.vue.ftl

@@ -45,7 +45,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: true }) protected showBusyIndicator!: boolean;
+    @Prop({ default: true }) public showBusyIndicator!: boolean;
 
     /**
      * 部件行为--fetch
@@ -53,7 +53,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected fetchAction!: string;  
+    @Prop() public fetchAction!: string;  
 
     /**
     * Vue声明周期(组件初始化完毕)
@@ -87,7 +87,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -96,7 +96,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -248,7 +248,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
      * @param {*} [opt={}]
      * @memberof ${srfclassname('${ctrl.name}')}Base
      */
-    protected refresh(opt: any = {}) {
+    public refresh(opt: any = {}) {
         this.load(opt);
     }
 
@@ -594,7 +594,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
             let curCodeList:Map<number,any> = allCodeList.get(groupField[0].codelist.tag);
             curCodeList.forEach((codelist:any) =>{
                 arr.forEach((item:any) =>{
-                    if(Object.is(item.planetype,codelist)){
+                    if(Object.is(item[groupField[0].name],codelist)){
                         returnArray.push(item);
                         item.hasused = true;
                     }
@@ -640,8 +640,8 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
     public handleSortGroupData(arr:Array<any>,groupField:any,label:string){
         arr.forEach((item:any) =>{
             let sortFieldValue:Array<any> = item[groupField[0].name].split("-");
-            Object.assign(item,{sortField:Number(sortFieldValue[0]+sortFieldValue[1])});
-            item[groupField[0].name] = sortFieldValue[0]+"年第"+sortFieldValue[1]+label;
+            Object.assign(item,{sortField:Number(sortFieldValue[0])*10000+Number(sortFieldValue[1])});
+            item[groupField[0].name] = sortFieldValue[0]+"年"+sortFieldValue[1]+label;
         })
         arr.sort((a:any, b:any) => {
             return Number(a.sortField) - Number(b.sortField);

@CONTROL/数据图表/CONTROL-BASE.vue.ftl

@@ -42,7 +42,7 @@ import echarts from 'echarts';
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: true }) protected showBusyIndicator!: boolean;
+    @Prop({ default: true }) public showBusyIndicator!: boolean;
 
     /**
      * 部件行为--fetch
@@ -50,7 +50,7 @@ import echarts from 'echarts';
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected fetchAction!: string;  
+    @Prop() public fetchAction!: string;  
 
     /**
     * Vue声明周期(组件初始化完毕)
@@ -84,7 +84,7 @@ import echarts from 'echarts';
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -93,7 +93,7 @@ import echarts from 'echarts';
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -241,7 +241,7 @@ import echarts from 'echarts';
      * @param {*} [opt={}]
      * @memberof ${srfclassname('${ctrl.name}')}
      */
-    protected refresh(opt: any = {}) {
+    public refresh(opt: any = {}) {
         this.load(opt);
     }
 

@CONTROL/数据看板/CONTROL-BASE.vue.ftl

@@ -18,7 +18,7 @@
         </#if>
         <#if layout == 'TABLE_24COL' && LayoutPos??><#t>
       <i-col<#if LayoutPos.getColXS() != -1> :xs="{ span: ${LayoutPos.getColXS()}, offset: <#if LayoutPos.getColXSOffset() != -1>${LayoutPos.getColXSOffset()}<#else>0</#if>}"</#if><#if LayoutPos.getColSM() != -1> :sm="{ span: ${LayoutPos.getColSM()}, offset: <#if LayoutPos.getColSMOffset() != -1>${LayoutPos.getColSMOffset()}<#else>0</#if>}"</#if><#if LayoutPos.getColMD() != -1> :md="{ span: ${LayoutPos.getColMD()}, offset: <#if LayoutPos.getColMDOffset() != -1>${LayoutPos.getColMDOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :lg="{ span: ${LayoutPos.getColLG()}, offset: <#if LayoutPos.getColLGOffset() != -1>${LayoutPos.getColLGOffset()}<#else>0</#if> }"</#if>>
-        <card :bordered="false" dis-hover :padding="0">
+        <card class="portlet-card" :bordered="false" dis-hover :padding="0">
           <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content>
           <p slot='title'>
             ${portlet.getTitle()}
@@ -34,7 +34,7 @@ ${P.getCtrlCode(portlet, 'CONTROL.html').code}
         </card>
       </i-col>
         <#else>
-      <card :bordered="false" dis-hover :padding="0">
+      <card class="portlet-card" :bordered="false" dis-hover :padding="0">
         <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
         <p slot='title'>
           ${portlet.getTitle()}
@@ -49,7 +49,7 @@ ${P.getCtrlCode(portlet, 'CONTROL.html').code}
       </card>
         </#if>
         <#if layout == 'FLEX'>
-      <card :bordered="false" dis-hover :padding="0">
+      <card class="portlet-card" :bordered="false" dis-hover :padding="0">
         <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
         <p slot='title'>
           ${portlet.getTitle()}

@CONTROL/数据视图/CONTROL-BASE.vue.ftl

@@ -86,7 +86,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: false }) protected isSelectFirstDefault!: boolean;
+    @Prop({ default: false }) public isSelectFirstDefault!: boolean;
 
     /**
      * 显示处理提示
@@ -94,7 +94,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: true }) protected showBusyIndicator?: boolean;
+    @Prop({ default: true }) public showBusyIndicator?: boolean;
 
     /**
      * 部件行为--create
@@ -102,7 +102,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected createAction!: string;
+    @Prop() public createAction!: string;
 
     /**
      * 部件行为--remove
@@ -110,7 +110,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected removeAction!: string;
+    @Prop() public removeAction!: string;
 
     /**
      * 部件行为--update
@@ -118,7 +118,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected updateAction!: string;
+    @Prop() public updateAction!: string;
 
     /**
      * 部件行为--fetch
@@ -126,7 +126,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected fetchAction!: string;
+    @Prop() public fetchAction!: string;
 
     /**
      * 是否单选
@@ -134,7 +134,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected isSingleSelect?: boolean;
+    @Prop() public isSingleSelect?: boolean;
 
     /**
      * 数据
@@ -142,7 +142,7 @@
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected items: any[] = [];
+    public items: any[] = [];
 
     /**
      * 是否支持分页
@@ -150,7 +150,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected isEnablePagingBar: boolean = ${ctrl.isEnablePagingBar()?c};;
+    public isEnablePagingBar: boolean = ${ctrl.isEnablePagingBar()?c};;
 
     /**
      * 总条数
@@ -158,14 +158,14 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected totalRecord: number = 0;
+    public totalRecord: number = 0;
 
     /**
      * 选中数组
      * @type {Array<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected selections: Array<any> = [];
+    public selections: Array<any> = [];
 
     /**
      * 当前页
@@ -173,7 +173,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected curPage: number = 1;
+    public curPage: number = 1;
 
     /**
      * 分页条数
@@ -181,7 +181,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected limit: number = ${ctrl.getPagingSize()?c};
+    public limit: number = ${ctrl.getPagingSize()?c};
 
     /**
      * 排序方向
@@ -189,7 +189,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected sortDir:string = '';
+    public sortDir:string = '';
 
     /**
      * 排序字段
@@ -197,7 +197,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected sortField: string = '';
+    public sortField: string = '';
 
     /**
      * 排序点击事件
@@ -205,7 +205,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected sortClick(field:string) {
+    public sortClick(field:string) {
         if(this.sortField !== field){
             this.sortField = field;
             this.sortDir = 'asc';
@@ -225,7 +225,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected getsortClass(field:string) {
+    public getsortClass(field:string) {
         if(this.sortField !== field || this.sortDir === ''){
             return '';
         }else if(this.sortDir === 'asc'){
@@ -240,7 +240,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected mounted () {
+    public mounted () {
         this.afterMounted();
     }
 
@@ -249,7 +249,7 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected afterMounted(){
+    public afterMounted(){
         <#if !ctrl.isEnablePagingBar()>
         this.$el.addEventListener('scroll', ()=> {
             if( this.$el.scrollTop +  this.$el.clientHeight  >=  this.$el.scrollHeight) {
@@ -264,7 +264,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -273,7 +273,7 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected afterCreated(){
+    public afterCreated(){
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(this.name, tag)) {
@@ -294,7 +294,7 @@
 	 *
 	 * @memberof ${srfclassname('${ctrl.codeName}')}
 	 */
-    protected loadMore(){
+    public loadMore(){
         if(this.totalRecord>this.items.length)
         {
             this.curPage = ++this.curPage;
@@ -308,7 +308,7 @@
      * @param {*} [opt={}]
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected refresh(opt: any = {}) {
+    public refresh(opt: any = {}) {
         this.curPage = 1;
         this.load(opt, true);
     }
@@ -318,7 +318,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -327,7 +327,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -339,12 +339,12 @@
     /**
      * 表格数据加载
      *
-     * @private
+     * @public
      * @param {*} [arg={}]
      * @param {boolean} [isReset=false] 是否重置items
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private load(opt: any = {}, isReset: boolean = false): void {
+    public load(opt: any = {}, isReset: boolean = false): void {
         if(!this.fetchAction){
             this.$Notice.error({ title: '错误', desc: '${view.getName()}视图列表fetchAction参数未配置' });
             return;
@@ -405,7 +405,7 @@
      * @returns {Promise<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected async remove(datas: any[]): Promise<any> {
+    public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
             this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表格removeAction参数未配置' });
             return;
@@ -504,7 +504,7 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}
      *
      */
-    protected handleClick(args: any) {
+    public handleClick(args: any) {
         args.isselected = !args.isselected;
         if(this.isSingleSelect) {
             this.items.forEach((item:any) =>{
@@ -521,7 +521,7 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}
      *
      */
-    protected handleDblClick(args: any) {
+    public handleDblClick(args: any) {
         this.$emit('rowdblclick', args);
     }
 
@@ -530,7 +530,7 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}
      *
      */
-    protected selectchange() {
+    public selectchange() {
         this.selections = [];
         this.items.map((item: any) => {
             if (item.isselected) {

@CONTROL/日历导航/CONTROL-BASE.vue.ftl

@@ -62,25 +62,25 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop() protected viewUID!:string;
+    @Prop() public viewUID!:string;
 
     /**
      * 是否单选
      * 
-     * @protected
+     * @public
      * @type {(boolean)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected isSingleSelect:boolean = true;
+    public isSingleSelect:boolean = true;
 
     /**
      * 呈现模式，可选值：horizontal或者vertical
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
+    public showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
 
     /**
      * 控件宽度
@@ -88,7 +88,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
+    public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
 
     /**
      * 控件高度
@@ -96,16 +96,16 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
+    public ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
 
     /**
      * 搜素值
      * 
-     * @protected
+     * @public
      * @type {(string)}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected searchText:string = "";
+    public searchText:string = "";
 
     /**
      * 分割宽度
@@ -113,7 +113,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected split: number = 0.5;
+    public split: number = 0.5;
 
 <#if ctrl.getXDataPSControl()??>
 <#assign xDataControl = ctrl.getXDataPSControl() />
@@ -124,7 +124,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected navViewName: any = {
+    public navViewName: any = {
 <#if xDataControl.getPSSysCalendarItems()??>
   <#list xDataControl.getPSSysCalendarItems() as calendarItem>
         ${calendarItem.getItemType()}: "<#if calendarItem.getNavPSAppView?? && calendarItem.getNavPSAppView()??><#assign navPSAppView = calendarItem.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>",
@@ -138,7 +138,7 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected navViewParam: any = {
+    public navViewParam: any = {
 <#if xDataControl.getPSSysCalendarItems()??>
   <#list xDataControl.getPSSysCalendarItems() as calendarItem>
         ${calendarItem.getItemType()}: '<#if calendarItem.getNavViewParamJO?? && calendarItem.getNavViewParamJO()??>${calendarItem.getNavViewParamJO()}</#if>',
@@ -153,7 +153,7 @@
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
 </#if>
-    protected navFilter: any = {
+    public navFilter: any = {
 <#if xDataControl.getPSSysCalendarItems()??>
   <#list xDataControl.getPSSysCalendarItems() as calendarItem>
         ${calendarItem.getItemType()}: "<#if calendarItem.getNavFilter?? && calendarItem.getNavFilter()??>${calendarItem.getNavFilter()}</#if>",
@@ -167,7 +167,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop({ default: true }) protected showBusyIndicator!: boolean;
+    @Prop({ default: true }) public showBusyIndicator!: boolean;
 
     <#if ctrl.getPSControls()??>
     <#assign controls = ctrl.getPSControls()/>
@@ -205,7 +205,7 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected selection: any = {};
+    public selection: any = {};
 
     /**
      * split值变化事件
@@ -295,7 +295,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -304,7 +304,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -318,7 +318,7 @@
      * 
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
+    public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         let data:any = {};
         if (args.length === 0) {
             return ;
@@ -351,7 +351,7 @@
      * 
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
+    public ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
         this.$emit('load',args);
     }
 
@@ -360,7 +360,7 @@
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}Base
     */
-    protected onSearch($event:any) {
+    public onSearch($event:any) {
         <#if ctrl.getXDataPSControl()??>
         <#assign xDataControl = ctrl.getXDataPSControl()/>
         let calendar:any = this.$refs.${xDataControl.getName()};

@CONTROL/日历部件/CONTROL-BASE.vue.ftl

@@ -64,7 +64,7 @@ FullCalendar,
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: false }) protected isSelectFirstDefault!: boolean;
+    @Prop({ default: false }) public isSelectFirstDefault!: boolean;
 
     /**
      * 显示处理提示
@@ -72,7 +72,7 @@ FullCalendar,
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop({ default: true }) protected showBusyIndicator?: boolean;
+    @Prop({ default: true }) public showBusyIndicator?: boolean;
 
     /**
      * 部件行为--load
@@ -80,34 +80,34 @@ FullCalendar,
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    @Prop() protected loadAction!: string;
+    @Prop() public loadAction!: string;
 
     /**
      * 日历部件样式名
      *
-     * @protected
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected calendarClass: string = "calendar";
+    public calendarClass: string = "calendar";
 
     /**
      * 选中事件element元素
      *
-     * @protected
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected selectedEventElement:any;
+    public selectedEventElement:any;
 
     /**
      * 引用插件集合
      *
-     * @protected
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected calendarPlugins: any[] = [
+    public calendarPlugins: any[] = [
         dayGridPlugin, 
         timeGridPlugin, 
         listPlugin, 
@@ -117,11 +117,11 @@ FullCalendar,
     /**
      * 设置头部显示
      *
-     * @protected
+     * @public
      * @type {}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected header: any = {
+    public header: any = {
         left: 'prev,next today gotoDate',
         center: 'title',
         right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek'
@@ -130,11 +130,11 @@ FullCalendar,
     /**
      * 按钮文本集合
      *
-     * @protected
+     * @public
      * @type {}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected buttonText: any = {
+    public buttonText: any = {
         today: '今天',
         month: '月',
         week: '周',
@@ -145,11 +145,11 @@ FullCalendar,
     /**
      * 自定义按钮集合
      *
-     * @protected
+     * @public
      * @type {}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected customButtons: any = {
+    public customButtons: any = {
         gotoDate: {
           text: "跳转",
           click: this.openDateSelect
@@ -159,38 +159,38 @@ FullCalendar,
     /**
      * 模态显示控制变量
      *
-     * @protected
+     * @public
      * @type boolean
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected modalVisible: boolean = false;
+    public modalVisible: boolean = false;
 
     /**
      * 跳转日期
      *
-     * @protected
+     * @public
      * @type Date
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected selectedGotoDate: Date = new Date();
+    public selectedGotoDate: Date = new Date();
 
     /**
      * 打开时间选择模态
      *
-     * @protected
+     * @public
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected openDateSelect(){
+    public openDateSelect(){
         this.modalVisible = true;
     }
 
     /**
      * 跳转到指定时间
      *
-     * @protected
+     * @public
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected gotoDate(){
+    public gotoDate(){
         let appCalendar: any = this.$refs.calendar;
         let api = appCalendar.getApi();
         api.gotoDate(this.selectedGotoDate);
@@ -199,11 +199,11 @@ FullCalendar,
     /**
      * 有效日期范围
      *
-     * @protected
+     * @public
      * @type {}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected validRange: any = {
+    public validRange: any = {
         start:"0000-01-01",
         end:"9999-12-31"
     };
@@ -211,19 +211,19 @@ FullCalendar,
     /**
      * 默认加载日期
      *
-     * @protected
+     * @public
      * @type {}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected defaultDate: any = this.$util.dateFormat(new Date());
+    public defaultDate: any = this.$util.dateFormat(new Date());
 
     /**
      * 设置按钮文本
      *
-     * @protected
+     * @public
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected setButtonText(){
+    public setButtonText(){
         this.buttonText.today = this.$t('app.calendar.today'),
         this.buttonText.month = this.$t('app.calendar.month'),
         this.buttonText.week = this.$t('app.calendar.week'),
@@ -235,31 +235,31 @@ FullCalendar,
     /**
      * 监听语言变化
      *
-     * @protected
+     * @public
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     @Watch('$i18n.locale')
-    protected onLocaleChange(newval: any, val: any) {
+    public onLocaleChange(newval: any, val: any) {
         this.setButtonText();
     }
 
     /**
      * 日程事件集合
      *
-     * @protected
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected events: any[] = [];
+    public events: any[] = [];
 
     /**
      * 日历样式类型
      *
-     * @protected
+     * @public
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected calendarType: string = "${ctrl.getCalendarStyle()}";
+    public calendarType: string = "${ctrl.getCalendarStyle()}";
 
     /**
      * 搜索获取日程事件
@@ -267,7 +267,7 @@ FullCalendar,
      * @param {*} $event 日期信息
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected searchEvents(fetchInfo?:any, successCallback?:any, failureCallback?:any ) {
+    public searchEvents(fetchInfo?:any, successCallback?:any, failureCallback?:any ) {
         let start = (fetchInfo && fetchInfo.start) ? this.$util.dateFormat(fetchInfo.start) : null;
         let end = (fetchInfo && fetchInfo.end) ? this.$util.dateFormat(fetchInfo.end) : null;
         let arg = { start: start, end: end };
@@ -315,7 +315,7 @@ FullCalendar,
      * @param {*} $event 日期信息
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected onDateClick($event: any) {
+    public onDateClick($event: any) {
         let date = $event.date;
         let datestr = $event.dateStr;
     }
@@ -326,7 +326,7 @@ FullCalendar,
      * @param {*} $event 事件信息
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected getEditView(deName: string) {
+    public getEditView(deName: string) {
         let view: any = {};
         switch(deName){
 <#if view.getAllRelatedPSAppViews?? && view.getAllRelatedPSAppViews()??>
@@ -377,7 +377,7 @@ FullCalendar,
      * @param {*} $event timeline事件对象
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected onEventClick($event: any, isOriginData:boolean = false, $event2?: any) {
+    public onEventClick($event: any, isOriginData:boolean = false, $event2?: any) {
         // 处理event数据
         let event: any = {};
         if(isOriginData){
@@ -453,7 +453,7 @@ FullCalendar,
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected refresh() {
+    public refresh() {
         if(Object.is(this.calendarType,"TIMELINE")){
             this.searchEvents();
         } else {
@@ -468,7 +468,7 @@ FullCalendar,
      * @param {*} $event 事件信息
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected onEventDrop($event: any) {
+    public onEventDrop($event: any) {
         if(this.isSelectFirstDefault){
           return;
         }
@@ -541,7 +541,7 @@ FullCalendar,
      * @returns
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected created() {
+    public created() {
 <#if ctrl.getCalendarStyle?? && ctrl.getCalendarStyle() == 'TIMELINE'>
         this.searchEvents();
 <#else>
@@ -555,7 +555,7 @@ FullCalendar,
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected afterCreated(){
+    public afterCreated(){
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
@@ -570,7 +570,7 @@ FullCalendar,
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -579,7 +579,7 @@ FullCalendar,
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }

@CONTROL/日历部件/SERVICE.ts.ftl

@@ -38,11 +38,11 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
     /**
      * 事件配置集合
      *
-     * @protected
+     * @public
      * @type {any[]}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected eventsConfig: any[] = [
+    public eventsConfig: any[] = [
 <#if ctrl.getPSSysCalendarItems()??>
   <#list ctrl.getPSSysCalendarItems() as calendarItem>
         {

@CONTROL/树视图导航栏/CONTROL-BASE.vue.ftl

@@ -52,7 +52,7 @@
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    @Prop() protected viewUID!:string;
+    @Prop() public viewUID!:string;
 
     /**
      * 获取多项数据
@@ -80,7 +80,7 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected selection: any = {};
+    public selection: any = {};
 
     /**
      * 控件宽度
@@ -88,7 +88,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
+    public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
 
     /**
      * 过滤值
@@ -96,25 +96,25 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected srfnodefilter: string = '';
+    public srfnodefilter: string = '';
 
     /**
      * 刷新标识
      *
-     * @protected
+     * @public
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected counter:number = 0;
+    public counter:number = 0;
 
     /**
      * 是否加载默认关联视图
      *
-     * @protected
+     * @public
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected istLoadDefaultRefView: boolean = false;
+    public istLoadDefaultRefView: boolean = false;
 
     /**
      * 分割宽度
@@ -122,7 +122,7 @@
      * @type {number}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected split: number = 0.2;
+    public split: number = 0.2;
 
     /**
      * split值变化事件
@@ -142,7 +142,7 @@
      * @returns {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected getExpItemView(arg: any = {}): any {
+    public getExpItemView(arg: any = {}): any {
         let expmode = arg.nodetype.toUpperCase();
         if (!expmode) {
             expmode = '';
@@ -173,7 +173,7 @@
      * @returns {void}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
+    public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
         if (args.length === 0) {
             return ;
         }
@@ -230,7 +230,6 @@
         if(arg.srfparentkey){
             Object.assign(tempContext,{srfparentkey:arg.srfparentkey});
         }
-        Object.assign(tempContext,this.context);
         this.selection = {};
         Object.assign(this.selection, { view: { viewname: refview.viewname } });
         Object.assign(this.selection,{'viewparam':tempViewparam,'context':tempContext});
@@ -247,7 +246,7 @@
      * @returns {void}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
+    public ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
         this.$emit('load',args);
     }
 
@@ -256,7 +255,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected onSearch(): void {
+    public onSearch(): void {
         if (!this.viewState) {
             return;
         }
@@ -272,7 +271,7 @@
      *
      * @memberof @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -281,7 +280,7 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}Base
      */    
-    protected afterCreated(){
+    public afterCreated(){
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
@@ -328,7 +327,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -337,7 +336,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -352,7 +351,7 @@
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected onViewDatasChange($event: any): void {
+    public onViewDatasChange($event: any): void {
         this.$emit('selectionchange', $event);
     }
 
@@ -362,7 +361,7 @@
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected viewDatasActivated($event: any): void {
+    public viewDatasActivated($event: any): void {
         this.$emit('activated', $event);
     }
 
@@ -372,7 +371,7 @@
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
-    protected onViewLoad($event: any): void {
+    public onViewLoad($event: any): void {
         this.$emit('load', $event);
     }
     

@CONTROL/流程导航栏/CONTROL-BASE.vue.ftl

@@ -76,7 +76,7 @@
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected selection: any = {};
+    public selection: any = {};
 
 
     /**
@@ -85,16 +85,16 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected srffilter: string = '';
+    public srffilter: string = '';
 
     /**
      * 关联视图信息集合
      *
-     * @private
+     * @public
      * @type {boolean}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    private refViews: any = [
+    public refViews: any = [
 <#list view.getAllRelatedPSAppViews() as refview>
   <#if refview.getWFStepValue??>
         {
@@ -112,8 +112,8 @@
      * @type {string}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    <#--  protected split: string = '<#if ctrl.getWidth() gt 0>${ctrl.getWidth()?c}<#else>200</#if>px';  -->
-    protected split: number = 0.2;
+    <#--  public split: string = '<#if ctrl.getWidth() gt 0>${ctrl.getWidth()?c}<#else>200</#if>px';  -->
+    public split: number = 0.2;
 
     /**
      * 获取关系项视图
@@ -122,7 +122,7 @@
      * @returns {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected select(index: any, indexs: any[]) {
+    public select(index: any, indexs: any[]) {
         this.refViews.some((item:any) =>{
             if(Object.is("wfstep-"+item.wfstepValue, index)){
                 this.selection = { viewName: item.viewName };
@@ -136,7 +136,7 @@
      *
      * @memberof  ${srfclassname('${ctrl.codeName}')}
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -145,7 +145,7 @@
      *
      *  @memberof ${srfclassname('${ctrl.codeName}')}
      */    
-    protected afterCreated(){
+    public afterCreated(){
         if (this.viewState) {
             this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                 if (!Object.is(tag, this.name)) {
@@ -160,7 +160,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected destroyed() {
+    public destroyed() {
         this.afterDestroy();
     }
 
@@ -169,7 +169,7 @@
      *
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected afterDestroy() {
+    public afterDestroy() {
         if (this.viewStateEvent) {
             this.viewStateEvent.unsubscribe();
         }
@@ -184,7 +184,7 @@
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected onViewDatasChange($event: any): void {
+    public onViewDatasChange($event: any): void {
         this.$emit('selectionchange', $event);
     }
 
@@ -194,7 +194,7 @@
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected viewDatasActivated($event: any): void {
+    public viewDatasActivated($event: any): void {
         this.$emit('activated', $event);
     }
 
@@ -204,7 +204,7 @@
      * @param {*} $event
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
-    protected onViewLoad($event: any): void {
+    public onViewLoad($event: any): void {
         this.$emit('load', $event);
     }
     

@CONTROL/表单/CONTROL-BASE.vue#DETAIL_DRUIPART.ftl

@@ -7,6 +7,7 @@ ${item.render.code}
 <app-form-druipart
     <#if item.getPSSysCss?? && item.getPSSysCss()??>class="${item.getPSSysCss().getCssName()}"</#if>
     :formState="formState"
+    :isForbidLoad="this.data.srfuf === '0'"
     paramItem='<#if item.getParamItem()??>${item.getParamItem()}<#else>${appde.getCodeName()?lower_case}</#if>' 
     :parentdata='<#if dritem.getParentDataJO?? && dritem.getParentDataJO()??>${dritem.getParentDataJO()}<#else>{}</#if>'
     :parameters="[

@CONTROL/表格/CONTROL.less.ftl

@@ -29,17 +29,13 @@
       display: inline;
     }
     .el-table {
-      th{
-        padding: 0px;
-        .cell{
-          font-size: 14px;
-        }
+      .quick-toolbar{
+          display: inline-block;
+          button{
+            background: #ebf3fb;
+            color: #2575ca;
+            border: 0;
         }
-      td{
-        padding: 3px 0;
-      }
-      tr .el-table-column--selection .cell{
-        padding: 0;
       }
       .el-tooltip{
         .ivu-form-item{
@@ -69,12 +65,23 @@
             position: absolute;
             left: 0;
         }
+        .batch-toolbar{
+            position: absolute;
+            left: 105px;
+          >.toolbar-container{
+              button  {
+                  font-size: 16px;
+                  min-width: 32px;
+                  height: 32px;
+                  margin-right: 4px;
+                  margin-top: 0;
+                  margin-bottom: 0;
+              }
           }
-    .el-table__body-wrapper{
-      height: calc(100% - 36px) !important;
         }
-    .el-table__empty-block{
-      height: auto !important;
+    }
+    .el-table__body-wrapper{
+      height: calc(100% - 45px) !important;
     }
 }
 .ivu-modal-content{
@@ -86,6 +93,7 @@
 }
 
 
+
 <#ibizinclude>
 ../@MACRO/CSS/DEFAULT.less.ftl
 </#ibizinclude>
\ No newline at end of file

@CONTROL/表格/SERVICE.ts.ftl

@@ -39,12 +39,12 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
     /**
      * 处理数据
      *
-     * @private
+     * @public
      * @param {Promise<any>} promise
      * @returns {Promise<any>}
      * @memberof ${srfclassname('${ctrl.codeName}')}Service
      */
-    private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
+    public doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
         return new Promise((resolve, reject) => {
             promise.then((response: any) => {
                 if (response && response.status === 200) {
@@ -309,7 +309,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
                 if(response.data){
                     Object.assign(response.data,{srfuf:'0'});
                     //仿真主键数据
-                    response.data.${appde.getCodeName()?lower_case} = Util.createUUID();
+                    response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID();
                 }
                 this.handleResponse(action, response, true);
                 this.mergeDefaults(response);

@CONTROL/视图布局面板/实体工作流代理应用启动视图/VIEW.vue.ftl

 <div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
-    <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
+    <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
         <div class="content-container">
             <iframe :src="iframeUrl" height="100%" width="100%" seamless="seamless" frameborder="0" scrolling="auto"></iframe>
         </div>

@CONTROL/视图布局面板/实体工作流代理数据视图/VIEW.vue.ftl

 <div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
-    <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
+    <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
         <div class="content-container">
             <iframe :src="iframeUrl" height="100%" width="100%" seamless="seamless" frameborder="0" scrolling="auto"></iframe>
         </div>

@CONTROL/视图布局面板/实体工作流动态导航表格视图/VIEW.vue.ftl

 <div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
-    <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
+    <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION.vue.ftl
     </#ibizinclude>

@CONTROL/视图布局面板/实体工作流动态编辑视图/VIEW.vue.ftl

 <div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
-    <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
+    <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION.vue.ftl
     </#ibizinclude>

@CONTROL/视图布局面板/实体工作流动态编辑视图（分页关系）/VIEW.vue.ftl

 <div class="view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>">
     <app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
-    <card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if>' :disHover="true" :padding="0" :bordered="false">
+    <card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
     <#ibizinclude>
     ../@MACRO/VIEW_CAPTION.vue.ftl
     </#ibizinclude>