Merge remote-tracking branch 'local/master' into dev fix3

@CONTROL/应用菜单/CONTROL-BASE.vue.ftl

@@ -151,10 +151,6 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
      */
     protected click(item: any) {
         if (item) {
-            let navDataService = NavDataService.getInstance(this.$store);
-            if(Object.is(this.navModel,"route")){
-                navDataService.removeNavData(this.viewtag);
-            }
             switch (item.appfunctag) {
                 <#if ctrl.getPSAppFuncs()??>
                 <#assign appFuncs = ctrl.getPSAppFuncs()>

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

@@ -261,184 +261,6 @@ import CodeListService from "@service/app/codelist-service";
             }
         }
 
-    /**
-     * 数据模型对象
-     *
-     * @type {${srfclassname('${ctrl.codeName}')}Model}
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public dataModel:${srfclassname('${ctrl.codeName}')}Model = new ${srfclassname('${ctrl.codeName}')}Model();
-
-    /**
-     * UI数据对象
-     *
-     * @type {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public data:any = {};
-
-    /**
-     * 面板数据对象
-     *
-     * @type {*}
-     * @memberof Mob
-     */
-    public panelData:any = null;
-
-    /**
-     * 监听数据对象
-     *
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    @Watch('inputData',{immediate:true,deep: true})
-    public onInputDataChange(newVal: any, oldVal: any){
-        if(newVal){
-            this.computedUIData(newVal);
-            this.panelLogic({ name: '', newVal: null, oldVal: null });
-            this.$forceUpdate();
-        }
-    }
-
-    /**
-     * 计算UI展示数据
-     * 
-     * @param codelistArray 代码表模型数组
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public computedUIData(newVal:any){
-        if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
-            this.dataModel.getDataItems().forEach((item:any) =>{
-                this.data[item.name] = newVal[item.prop];
-            })
-        }
-    }
-
-    /**
-     * 计算面板数据
-     * 
-     * @memberof Mob
-     */
-    public computeOutputData(){
-        let panelData:any = {};
-        if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
-            this.dataModel.getDataItems().forEach((item:any) =>{
-                panelData[item.prop] = this.data[item.name];
-            }) 
-        }
-        this.panelData = Object.assign(JSON.parse(JSON.stringify(this.inputData)),panelData);
-    }
-
-    /**
-     * 界面行为
-     *
-     * @param {*} row
-     * @param {*} tag
-     * @param {*} $event
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public async uiAction(row: any, tag: any, $event: any) {
-        await this.computeOutputData();
-        <#if ctrl.getPSAppViewLogics()??>
-        <#list ctrl.getPSAppViewLogics() as logic>
-        <#if logic.getPSAppViewUIAction().getPSUIAction()??>
-        <#assign action = logic.getPSAppViewUIAction().getPSUIAction()>
-        if(Object.is('${action.getUIActionTag()}', tag)) {
-            this.${logic.getName()}(row, tag, $event);
-        }
-        </#if>
-        </#list>
-        </#if>
-    }
-
-    /**
-     * 打开编辑数据视图
-     *
-     * @type {any}
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public opendata(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any){
-        if (this.parentRef.opendata && this.parentRef.opendata instanceof Function) {
-            this.parentRef.opendata(args,fullargs,params, $event, xData);
-        }
-    }
-
-    /**
-     * 打开新建数据视图
-     *
-     * @type {any}
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
-        if (this.parentRef.newdata && this.parentRef.newdata instanceof Function) {
-            this.parentRef.newdata(args,fullargs,params, $event, xData);
-        }
-    }
-    
-    /**
-     * 删除
-     *
-     * @param {any[]} datas
-     * @returns {Promise<any>}
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public async remove(datas: any[]): Promise<any> {
-        if (this.parentRef.remove && this.parentRef.remove instanceof Function) {
-            return this.parentRef.remove(datas);
-        }
-    }
-
-    /**
-     * 刷新
-     *
-     * @param {*} [opt={}]
-     * @memberof Main
-     */
-    public refresh(opt: any = {}) {
-        if (this.parentRef.refresh && this.parentRef.refresh instanceof Function) {
-            this.parentRef.refresh(opt);
-        }
-    }
-
-    
-    /**
-     * 设置变更面板编辑项的值
-     *  
-     * @param data 面板数据
-     * @param {{ name: string, value: any }} $event
-     * @returns {void}
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public onPanelItemValueChange(data: any,$event: { name: string, value: any }): void {
-        if (!$event) {
-            return;
-        }
-        if (!$event.name || Object.is($event.name, '') || !data.hasOwnProperty($event.name)) {
-            return;
-        }
-        data[$event.name] = $event.value;
-        this.panelEditItemChange(data, $event.name, $event.value);
-    }
-
-    /**
-     * 面板编辑项值变化后续操作
-     *
-     * @public
-     * @param data 面板数据
-     * @param property 编辑项名
-     * @param value 编辑项值
-     * @returns {void}
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public panelEditItemChange(data: any, property: string, value: any){
-        // 面板数据变化事件
-        if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
-            let modelitem =this.dataModel.getDataItems().find((item:any) =>{
-                return item.name === property;
-            }) 
-            if(modelitem){
-                this.$emit('panelDataChange',{[modelitem.prop]: value});
-            }
-        }
     }
 
 <#ibizinclude>