tony001 发布系统代码 [后台服务，演示应用]

app_Web/public/assets/json/view-config.json

@@ -2463,6 +2463,14 @@
         "viewname": "AppPortalView",
         "viewtag": "96bc1e4d0d5d6b66d639f401966b375b"
     },
+    "apppanelview2": {
+        "title": "工作流待办",
+        "caption": "工作流待办",
+        "viewtype": "APPPANELVIEW",
+        "viewmodule": "Ungroup",
+        "viewname": "AppPanelView2",
+        "viewtag": "C1022CE5-B44E-467C-86F0-6EDD0940B339"
+    },
     "apploginview": {
         "title": "应用登录视图",
         "caption": "应用登录视图",

app_Web/src/locale/lang/BO-CN-base.ts

@@ -179,6 +179,10 @@ function getAppLocale(){
                     caption: commonLogic.appcommonhandle("工作台",null),
                     title: commonLogic.appcommonhandle("工作台",null),
                 },
+                apppanelview2: {
+                    caption: commonLogic.appcommonhandle("工作流待办",null),
+                    title: commonLogic.appcommonhandle("工作流待办",null),
+                },
                 apploginview: {
                     caption: commonLogic.appcommonhandle("应用登录视图",null),
                     title: commonLogic.appcommonhandle("应用登录视图",null),
@@ -345,6 +349,7 @@ function getAppLocale(){
                     menuitem30: commonLogic.appcommonhandle("工作流动态导航视图",null),
                     menuitem31: commonLogic.appcommonhandle("工作流启动",null),
                     menuitem21: commonLogic.appcommonhandle("工作流动态操作视图",null),
+                    menuitem214: commonLogic.appcommonhandle("统一待办",null),
                     menuitem11: commonLogic.appcommonhandle("其他视图",null),
                     menuitem98: commonLogic.appcommonhandle("自定义视图",null),
                     menuitem212: commonLogic.appcommonhandle("自定义实现表格视图",null),

app_Web/src/locale/lang/en-US-base.ts

@@ -179,6 +179,10 @@ function getAppLocale(){
                     caption: commonLogic.appcommonhandle("Work bench",null),
                     title: commonLogic.appcommonhandle("工作台",null),
                 },
+                apppanelview2: {
+                    caption: commonLogic.appcommonhandle("工作流待办",null),
+                    title: commonLogic.appcommonhandle("工作流待办",null),
+                },
                 apploginview: {
                     caption: commonLogic.appcommonhandle("应用登录视图",null),
                     title: commonLogic.appcommonhandle("应用登录视图",null),
@@ -345,6 +349,7 @@ function getAppLocale(){
                     menuitem30: commonLogic.appcommonhandle("Workflow Dynamic Navigation View",null),
                     menuitem31: commonLogic.appcommonhandle("Workflow Start",null),
                     menuitem21: commonLogic.appcommonhandle("工作流动态操作视图",null),
+                    menuitem214: commonLogic.appcommonhandle("统一待办",null),
                     menuitem11: commonLogic.appcommonhandle("Other Views",null),
                     menuitem98: commonLogic.appcommonhandle("Custom View",null),
                     menuitem212: commonLogic.appcommonhandle("自定义实现表格视图",null),

app_Web/src/locale/lang/zh-CN-base.ts

@@ -179,6 +179,10 @@ function getAppLocale(){
                     caption: commonLogic.appcommonhandle("工作台",null),
                     title: commonLogic.appcommonhandle("工作台",null),
                 },
+                apppanelview2: {
+                    caption: commonLogic.appcommonhandle("工作流待办",null),
+                    title: commonLogic.appcommonhandle("工作流待办",null),
+                },
                 apploginview: {
                     caption: commonLogic.appcommonhandle("应用登录视图",null),
                     title: commonLogic.appcommonhandle("应用登录视图",null),
@@ -345,6 +349,7 @@ function getAppLocale(){
                     menuitem30: commonLogic.appcommonhandle("工作流动态导航视图",null),
                     menuitem31: commonLogic.appcommonhandle("工作流启动",null),
                     menuitem21: commonLogic.appcommonhandle("工作流动态操作视图",null),
+                    menuitem214: commonLogic.appcommonhandle("统一待办",null),
                     menuitem11: commonLogic.appcommonhandle("其他视图",null),
                     menuitem98: commonLogic.appcommonhandle("自定义视图",null),
                     menuitem212: commonLogic.appcommonhandle("自定义实现表格视图",null),

app_Web/src/mock/app/main-menu-appmenu/main-menu-appmenu.ts

@@ -2447,6 +2447,24 @@ mock.onGet('v7/main-menuappmenu').reply((config: any) => {
 	textcls: '',
 	appfunctag: 'AppFunc94',
 	resourcetag: '',
+},
+		{
+	id: 'BEBA14E9-03D6-4F09-9FED-50790A0B2EB4',
+	name: 'menuitem214',
+	text: '统一待办',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '统一待办',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: '',
+	icon: '',
+	textcls: '',
+	appfunctag: 'AppFunc130',
+	resourcetag: '',
 },
 	],
 },

app_Web/src/mock/viewconfig/viewconfig.ts

@@ -2471,6 +2471,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
             "viewname": "AppPortalView",
             "viewtag": "96bc1e4d0d5d6b66d639f401966b375b"
         },
+        "apppanelview2": {
+            "title": "工作流待办",
+            "caption": "工作流待办",
+            "viewtype": "APPPANELVIEW",
+            "viewmodule": "Ungroup",
+            "viewname": "AppPanelView2",
+            "viewtag": "C1022CE5-B44E-467C-86F0-6EDD0940B339"
+        },
         "apploginview": {
             "title": "应用登录视图",
             "caption": "应用登录视图",

app_Web/src/pages/sample/index/page-register.ts

@@ -227,6 +227,7 @@ export const PageComponents = {
         Vue.component('ibizsample0018-grid-view', () => import('@pages/sample/ibizsample0018-grid-view/ibizsample0018-grid-view.vue'));
         Vue.component('ibizsample0014-grid-view', () => import('@pages/sample/ibizsample0014-grid-view/ibizsample0014-grid-view.vue'));
         Vue.component('app-panel-view', () => import('@pages/ungroup/app-panel-view/app-panel-view.vue'));
+        Vue.component('app-panel-view2', () => import('@pages/ungroup/app-panel-view2/app-panel-view2.vue'));
         Vue.component('app-login-view', () => import('@pages/ungroup/app-login-view/app-login-view.vue'));
     }
 };
\ No newline at end of file

app_Web/src/pages/sample/index/router.ts

@@ -1426,6 +1426,19 @@ const router = new Router({
                     },
                     component: () => import('@pages/sample/ibizsample0021-wfdyna-action-view/ibizsample0021-wfdyna-action-view.vue'),
                 },
+                {
+                    path: 'apppanelview2/:apppanelview2?',
+                    meta: {
+                        caption: 'app.views.apppanelview2.caption',
+                        info:'',
+                        parameters: [
+                            { pathName: 'index', parameterName: 'index' },
+                            { pathName: 'apppanelview2', parameterName: 'apppanelview2' },
+                        ],
+                        requireAuth: true,
+                    },
+                    component: () => import('@pages/ungroup/app-panel-view2/app-panel-view2.vue'),
+                },
                 {
                     path: 'ibizbooks/:ibizbook?/customview/:customview?',
                     meta: {
@@ -6627,6 +6640,18 @@ const router = new Router({
             requireAuth: true,
         },
         component: () => import('@pages/ungroup/app-portal-view/app-portal-view.vue'),
+    },
+    {
+        path: '/apppanelview2/:apppanelview2?',
+        meta: {
+            caption: 'app.views.apppanelview2.caption',
+            info:'',
+            parameters: [
+                { pathName: 'apppanelview2', parameterName: 'apppanelview2' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/ungroup/app-panel-view2/app-panel-view2.vue'),
     },
         ...globalRoutes,
         {

app_Web/src/pages/ungroup/app-index-view/page-register.ts

@@ -4,6 +4,7 @@ export const PageComponents = {
                 Vue.component('ibizsample0018-grid-view', () => import('@pages/sample/ibizsample0018-grid-view/ibizsample0018-grid-view.vue'));
         Vue.component('ibizsample0014-grid-view', () => import('@pages/sample/ibizsample0014-grid-view/ibizsample0014-grid-view.vue'));
         Vue.component('app-panel-view', () => import('@pages/ungroup/app-panel-view/app-panel-view.vue'));
+        Vue.component('app-panel-view2', () => import('@pages/ungroup/app-panel-view2/app-panel-view2.vue'));
         Vue.component('app-login-view', () => import('@pages/ungroup/app-login-view/app-login-view.vue'));
     }
 };
\ No newline at end of file

app_Web/src/pages/ungroup/app-index-view/router.ts

@@ -3253,6 +3253,18 @@ const router = new Router({
             requireAuth: true,
         },
         component: () => import('@pages/ungroup/app-portal-view/app-portal-view.vue'),
+    },
+    {
+        path: '/apppanelview2/:apppanelview2?',
+        meta: {
+            caption: 'app.views.apppanelview2.caption',
+            info:'',
+            parameters: [
+                { pathName: 'apppanelview2', parameterName: 'apppanelview2' },
+            ],
+            requireAuth: true,
+        },
+        component: () => import('@pages/ungroup/app-panel-view2/app-panel-view2.vue'),
     },
         ...globalRoutes,
         {

app_Web/src/pages/ungroup/app-panel-view2/app-panel-view2-base.vue

+<template>
+<div class='view-container apppanelview app-panel-view2 '>
+    <app-studioaction :viewTitle="$t(model.srfCaption)" viewName="apppanelview2"></app-studioaction>
+    <card class='view-card   view-no-toolbar' dis-hover :bordered="false">
+<div slot='title' class="header-container">
+    <span class='caption-info' :title="$t(model.srfCaption)">{{$t(model.srfCaption)}}</span>
+</div>
+        <div class='content-container'>
+            <div class='view-top-messages'>
+            </div>
+            <div class='view-bottom-messages'>
+            </div>
+        </div>
+    </card>
+</div>
+</template>
+// 基于 @VIEW/应用面板视图/VIEW-BASE.vue.ftl 生成
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch,Inject } from 'vue-property-decorator';
+import { UIActionTool, Util } from '@/utils';
+import axios from 'axios';
+import { AppMessageBox } from '@/utils/app-message-box/app-message-box';
+import NavDataService from '@/service/app/navdata-service';
+import { Subject,Subscription } from 'rxjs';
+
+
+
+
+@Component({
+    components: {
+    },
+})
+export default class AppPanelView2Base extends Vue {
+    
+    /**
+     * 数据变化
+     *
+     * @param {*} val
+     * @returns {*}
+     * @memberof AppPanelView2Base
+     */
+    @Emit() 
+    public viewDatasChange(val: any):any {
+        return val;
+    }
+
+    /**
+     * 传入视图上下文
+     *
+     * @type {string}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public viewdata!: string;
+
+    /**
+     * 传入视图参数
+     *
+     * @type {string}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public viewparam!: string;
+
+    /**
+     * 视图默认使用
+     *
+     * @type {boolean}
+     * @memberof AppPanelView2Base
+     */
+    @Prop({ default: true }) public viewDefaultUsage!: boolean;
+
+    /**
+     * 视图默认使用
+     *
+     * @type {string}
+     * @memberof AppPanelView2Base
+     */
+    @Inject({from:'navModel',default: 'tab'})
+    public navModel!:string;
+
+	/**
+	 * 视图标识
+	 *
+	 * @type {string}
+	 * @memberof AppPanelView2Base
+	 */
+	public viewtag: string = 'C1022CE5-B44E-467C-86F0-6EDD0940B339';
+
+    /**
+	 * 视图类型
+	 *
+	 * @type {string}
+	 * @memberof AppPanelView2Base
+	 */
+	public viewType: string = 'APPPANELVIEW';
+
+	/**
+	 * 自定义视图导航上下文集合
+	 *
+	 * @type {*}
+	 * @memberof AppPanelView2Base
+	 */
+    public customViewNavContexts:any ={
+    };
+
+	/**
+	 * 自定义视图导航参数集合
+	 *
+	 * @type {*}
+	 * @memberof AppPanelView2Base
+	 */
+    public customViewParams:any ={
+    };
+
+    /**
+     * 视图模型数据
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    public model: any = {
+        srfCaption: 'app.views.apppanelview2.caption',
+        srfTitle: 'app.views.apppanelview2.title',
+        srfSubTitle: 'app.views.apppanelview2.subtitle',
+        dataInfo: ''
+    }
+
+    /**
+     * 视图参数变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof AppPanelView2Base
+     */
+    @Watch('viewparam',{immediate: true, deep: true})
+    onParamData(newVal: any, oldVal: any) {
+        if(newVal){
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
+                Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
+            }
+            
+        } 
+    }
+
+    /**
+     * 处理应用上下文变化
+     *
+     * @param {*} newVal
+     * @param {*} oldVal
+     * @memberof AppPanelView2Base
+     */
+    @Watch('viewdata')
+    onViewData(newVal: any, oldVal: any) {
+        const _this: any = this;
+        
+        if (!Object.is(newVal, oldVal) && _this.engine) {
+            this.$nextTick(()=>{
+              _this.parseViewParam();
+              _this.engine.load();
+            });
+        } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
+            _this.refresh();
+        }
+    }
+
+    /**
+     * 容器模型
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    public containerModel: any = {
+        view_panel: { name: 'panel', type: 'PANEL' },
+    };
+
+    /**
+     * 视图操作参数
+     *
+     * @type {*}
+     * @readonly
+     * @memberof AppPanelView2Base
+     */
+    public viewCtx: any = {};
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof AppPanelView2Base
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+
+    /**
+     * 视图状态订阅对象
+     *
+     * @public
+     * @type {Subject<{action: string, data: any}>}
+     * @memberof AppPanelView2Base
+     */
+    public viewState: Subject<ViewState> = new Subject();
+
+
+
+    /**
+     * 引擎初始化
+     *
+     * @public
+     * @memberof AppPanelView2Base
+     */
+    public engineInit(): void {
+    }
+
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    public  navDataService = NavDataService.getInstance();
+
+    /**
+    * 导航服务事件
+    *
+    * @public
+    * @type {(Subscription | undefined)}
+    * @memberof AppPanelView2Base
+    */
+    public serviceStateEvent: Subscription | undefined;
+
+    /**
+     * 门户部件状态对象
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public portletState?: any;
+
+   /**
+   * 门户部件状态事件
+   *
+   * @public
+   * @type {(Subscription | undefined)}
+   * @memberof AppPanelView2Base
+   */
+    public portletStateEvent: Subscription | undefined;
+
+    /**
+    * 门户部件状态事件
+    *
+    * @public
+    * @type {(Subscription | undefined)}
+    * @memberof AppPanelView2Base
+    */
+    public formDruipartEvent: Subscription | undefined;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    public context:any = {};
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    public viewparams:any = {};
+
+    /**
+     * 视图缓存数据
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    public viewCacheData:any;
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof AppPanelView2Base
+     */    
+    public counterServiceArray:Array<any> = [];
+
+    /**
+     * 解析视图参数
+     *
+     * @public
+     * @memberof AppPanelView2Base
+     */
+    public parseViewParam(inputvalue:any = null): void {
+        for(let key in this.context){
+            delete this.context[key];
+        }
+        if(this.$store.getters.getAppData() && this.$store.getters.getAppData().context){
+            Object.assign(this.context,this.$store.getters.getAppData().context);
+        }
+        if (!this.viewDefaultUsage && this.viewdata && !Object.is(this.viewdata, '')) {
+            if(typeof this.viewdata == 'string') {
+                Object.assign(this.context, JSON.parse(this.viewdata));
+            }
+            if(this.context && this.context.srfparentdename){
+                Object.assign(this.viewparams,{srfparentdename:this.context.srfparentdename});
+            }
+            if(this.context && this.context.srfparentkey){
+                Object.assign(this.viewparams,{srfparentkey:this.context.srfparentkey});
+            }
+            this.handleCustomViewData();
+            return;
+        }
+        const path = (this.$route.matched[this.$route.matched.length - 1]).path;
+        const keys: Array<any> = [];
+        const curReg = this.$pathToRegExp.pathToRegexp(path, keys);
+        const matchArray = curReg.exec(this.$route.path);
+        let tempValue: Object = {};
+        keys.forEach((item: any, index: number) => {
+            if(matchArray[index + 1]){
+                Object.defineProperty(tempValue, item.name, {
+                    enumerable: true,
+                    value: decodeURIComponent(matchArray[index + 1])
+                });
+            }
+        });
+        this.$viewTool.formatRouteParams(tempValue,this.$route,this.context,this.viewparams);
+        this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavDataWithRoute();
+    }
+
+    /**
+     * 处理自定义视图数据
+     *
+     * @memberof AppPanelView2Base
+     */
+	public handleCustomViewData(){
+		if(Object.keys(this.customViewNavContexts).length > 0){
+			Object.keys(this.customViewNavContexts).forEach((item:any) =>{
+				let tempContext:any = {};
+				let curNavContext:any = this.customViewNavContexts[item];
+				this.handleCustomDataLogic(curNavContext,tempContext,item);
+				Object.assign(this.context,tempContext);
+			})
+		}
+		if(Object.keys(this.customViewParams).length > 0){
+			Object.keys(this.customViewParams).forEach((item:any) =>{
+				let tempParam:any = {};
+				let curNavParam:any = this.customViewParams[item];
+				this.handleCustomDataLogic(curNavParam,tempParam,item);
+				Object.assign(this.viewparams,tempParam);
+			})
+		}
+	}
+
+    /**
+     * 处理自定义视图数据逻辑
+     *
+     * @memberof AppPanelView2Base
+     */
+	public handleCustomDataLogic(curNavData:any,tempData:any,item:string){
+		// 直接值直接赋值
+		if(curNavData.isRawValue){
+			if(Object.is(curNavData.value,"null") || Object.is(curNavData.value,"")){
+                Object.defineProperty(tempData, item.toLowerCase(), {
+                    value: null,
+                    writable : true,
+                    enumerable : true,
+                    configurable : true
+                });
+            }else{
+                Object.defineProperty(tempData, item.toLowerCase(), {
+                    value: curNavData.value,
+                    writable : true,
+                    enumerable : true,
+                    configurable : true
+                });
+            }
+		}else{
+			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
+			if(this.context[(curNavData.value).toLowerCase()] != null){
+				Object.defineProperty(tempData, item.toLowerCase(), {
+					value: this.context[(curNavData.value).toLowerCase()],
+					writable : true,
+					enumerable : true,
+					configurable : true
+				});
+			}else{
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
+					Object.defineProperty(tempData, item.toLowerCase(), {
+						value: this.viewparams[(curNavData.value).toLowerCase()],
+						writable : true,
+						enumerable : true,
+						configurable : true
+					});
+				}else{
+					Object.defineProperty(tempData, item.toLowerCase(), {
+						value: null,
+						writable : true,
+						enumerable : true,
+						configurable : true
+					});
+				}
+			}
+		}
+	}
+
+    /**
+     * 初始化导航数据(路由模式)
+     *
+     * @memberof AppPanelView2Base
+     */
+    public initNavDataWithRoute(data:any = null, isNew:boolean = false,  isAlways:boolean = false){
+        if( isAlways || (this.viewDefaultUsage && Object.is(this.navModel,"route")) ){
+            this.navDataService.addNavData({id:'app-panel-view2',tag:this.viewtag,srfkey:isNew ? null : null,title:this.$t(this.model.srfCaption),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+
+    /**
+     * 初始化导航数据(分页模式)
+     *
+     * @memberof AppPanelView2Base
+     */
+    public initNavDataWithTab(data:any = null,isOnlyAdd:boolean = true, isAlways:boolean = false){
+        if( isAlways || (this.viewDefaultUsage && !Object.is(this.navModel,"route")) ){
+            this.navDataService.addNavDataByOnly({id:'app-panel-view2',tag:this.viewtag,srfkey:null,title:this.$t(this.model.srfCaption),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath},isOnlyAdd);
+        }
+    }
+	
+
+    /**
+     * Vue声明周期
+     *
+     * @memberof AppPanelView2Base
+     */
+    public created() {
+        this.afterCreated();
+    }
+
+    /**
+     * 执行created后的逻辑
+     *
+     * @memberof AppPanelView2Base
+     */    
+    public afterCreated(){
+        let _this:any = this;
+        const secondtag = _this.$util.createUUID();
+        _this.$store.commit('viewaction/createdView', { viewtag: _this.viewtag, secondtag: secondtag });
+        _this.viewtag = secondtag;
+        _this.parseViewParam();
+        _this.serviceStateEvent = _this.navDataService.serviceState.subscribe(({ action,name, data }:{ action:string,name:any,data:any }) => {
+            if(!Object.is(name,'app-panel-view2')){
+                return;
+            }
+            if (Object.is(action, 'viewrefresh')) {
+                _this.$nextTick(()=>{
+                    _this.parseViewParam(data);
+                    if(_this.engine){
+                        _this.engine.load();
+                    }
+                }); 
+            }
+        });
+        if(_this.portletState){
+            _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
+                if(!Object.is(res.name,'AppPanelView2')){
+                    return;
+                }
+                if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){
+                    _this.refresh();
+                }
+            })
+        }
+        _this.initViewCtx();
+    }
+
+    /**
+     * 初始化视图操作参数
+     *
+     * @memberof AppPanelView2Base
+     */  
+    initViewCtx() {
+        Object.assign(this.viewCtx, {
+            app: this.$root,
+            view: this,
+            viewGlobal: {},
+            viewNavData: {},
+            viewNavContext: this.context,
+            viewNavParam: this.viewparams,
+            messagebox: AppMessageBox.getInstance(),
+        });
+        Object.assign(this.viewCtx, { appGlobal: this.$store.getters.getAppGlobal() });
+        if (this.$store.getters.getRouteViewGlobal(this.context.srfsessionid)) {
+            Object.assign(this.viewCtx, { routeViewGlobal: this.$store.getters.getRouteViewGlobal(this.context.srfsessionid) });
+        } else {
+            this.$store.commit('addRouteViewGlobal', { tag: this.context.srfsessionid, param: {} });
+            Object.assign(this.viewCtx, { routeViewGlobal: this.$store.getters.getRouteViewGlobal(this.context.srfsessionid) });
+        }
+        if (!this.viewDefaultUsage && this.viewdata && !Object.is(this.viewdata, '')) {
+            //  嵌入视图
+            Object.assign(this.viewCtx, {
+                topview: this.$store.getters.getView(this.context.srfsessionid)
+            });
+        } else {
+            //  顶层视图
+            this.$store.commit('addView', { tag: this.context.srfsessionid, param: this });
+            Object.assign(this.viewCtx, { topview: this });
+        }
+    }
+
+    /**
+     * 销毁之前
+     *
+     * @memberof AppPanelView2Base
+     */
+    public beforeDestroy() {
+        this.$store.commit('viewaction/removeView', this.viewtag);
+
+        let _this: any = this
+        if (_this.serviceStateEvent) {
+            _this.serviceStateEvent.unsubscribe();
+        }
+        if (_this.portletStateEvent) {
+            _this.portletStateEvent.unsubscribe();
+        }
+        if (_this.formDruipartEvent) {
+            _this.formDruipartEvent.unsubscribe();
+        }
+        if (_this.engine) {
+            _this.engine.destroy();
+        }
+    }
+
+    /**
+     * Vue声明周期(组件初始化完毕)
+     *
+     * @memberof AppPanelView2Base
+     */
+    public mounted() {
+        this.afterMounted();
+    }
+
+    /**
+     * 执行mounted后的逻辑
+     * 
+     * @memberof AppPanelView2Base
+     */
+    public afterMounted(){
+        const _this: any = this;
+        _this.engineInit();
+            if (_this.loadModel && _this.loadModel instanceof Function) {
+                _this.loadModel();
+            }
+    }
+
+
+
+
+    /**
+     * 关闭视图
+     *
+     * @param {any[]} args
+     * @memberof AppPanelView2Base
+     */
+    public closeView(args: any[]): void {
+        let _view: any = this;
+        if (_view.viewdata) {
+            _view.$emit('viewdataschange', Array.isArray(args)?args:[args]);
+            _view.$emit('close', Array.isArray(args)?args:[args]);
+        } else if (_view.$tabPageExp) {
+            _view.$tabPageExp.onClose(_view.$route.fullPath);
+        }
+    }
+
+}
+</script>
+
+<style lang='less'>
+@import './app-panel-view2.less';
+</style>
\ No newline at end of file

app_Web/src/pages/ungroup/app-panel-view2/app-panel-view2.less

+// 基于 @VIEW/应用面板视图/VIEW.less.ftl 生成
+.app-panel-view2{
+    position: relative;
+}
+
+
+.app-panel-view2{
+    display: block;
+}

app_Web/src/pages/ungroup/app-panel-view2/app-panel-view2.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import AppPanelView2Base from './app-panel-view2-base.vue';
+
+import view_panel from '@widgets/app/app-panel-view2-panel/app-panel-view2-panel.vue';
+// 基于 @VIEW/@MACRO/VIEW.vue.ftl 生成
+@Component({
+    components: {
+        view_panel, 
+    },
+    beforeRouteEnter: (to: any, from: any, next: any) => {
+        next((vm: any) => {
+            if(!Object.is(vm.navModel,"route")){
+                vm.initNavDataWithTab(vm.viewCacheData);
+            }
+            vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
+        });
+    },
+})
+export default class AppPanelView2 extends AppPanelView2Base {
+
+}
+</script>
\ No newline at end of file

app_Web/src/store/modules/view-action/state.ts

@@ -912,6 +912,7 @@ export const viewstate: any = {
                 '270a2cdf7072febc156805c6c967c010',
                 'abe2803e82d60899ed92c9578f0bf9d7',
                 '0f4df2881b94c291b6e268dd172bdb67',
+                'C1022CE5-B44E-467C-86F0-6EDD0940B339',
                 'a9ac702e20306caf5a733545d652cfa9',
                 'F25AC36D-6D69-43FA-89B4-BE7552CE99E2',
                 '4e142abbc82a33d405dd609368612421',
@@ -2518,6 +2519,15 @@ export const viewstate: any = {
                 'ff1c15c4e1ab04ec44c1ad38a794a843',
             ],
         },
+        {
+            viewtag: 'C1022CE5-B44E-467C-86F0-6EDD0940B339',
+            viewmodule: 'Ungroup',
+            viewname: 'AppPanelView2',
+            viewaction: '',
+            viewdatachange: false,
+            refviews: [
+            ],
+        },
         {
             viewtag: 'DDD1152C-0A9F-44C5-82FA-7F6A469C5569',
             viewmodule: 'Ungroup',

app_Web/src/widgets/app/app-panel-view2-panel/app-panel-view2-panel-base.vue

+<template>
+        <div class="app-layoutpanel AppPanelView2" v-loading="isLayoutLoadding" :style="{width: '100%', height: '100%',  overflow: 'auto'}">
+        <div v-show="!isLayoutLoadding" :style="{height: '100%', width: '100%'}">
+        </div>
+    </div>
+
+</template>
+// 基于 @CONTROL/面板/CONTROL-BASE.vue.ftl 生成
+<script lang='tsx'>
+import { Vue, Component, Prop, Provide, Emit, Watch, Model,Inject } from 'vue-property-decorator';
+import { CreateElement } from 'vue';
+import { Subject, Subscription } from 'rxjs';
+import { ControlInterface } from '@/interface/control';
+import { UIActionTool,Util,ViewTool } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
+import AppCenterService from "@service/app/app-center-service";
+import AppPanelView2Service from './app-panel-view2-panel-service';
+import { PanelDetailModel,PanelRawitemModel,PanelTabPanelModel,PanelTabPageModel,PanelFieldModel,PanelContainerModel,PanelControlModel,PanelUserControlModel,PanelButtonModel } from '@/model/panel-detail';
+import AppPanelView2Model from './app-panel-view2-panel-model';
+import CodeListService from "@/codelist/codelist-service";
+import UIService from '@/uiservice/ui-service';
+
+
+@Component({
+    components: {
+      
+    }
+})
+export default class AppPanelView2Base extends Vue implements ControlInterface {
+
+    /**
+     * 名称
+     *
+     * @type {string}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public name?: string;
+
+    /**
+     * 视图通讯对象
+     *
+     * @type {Subject<ViewState>}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public viewState!: Subject<ViewState>;
+
+    /**
+     * 应用上下文
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public context!: any;
+
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 视图操作参数(父级)
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public pViewCtx!: any;
+
+    /**
+     * 视图操作参数
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    public viewCtx: any = {};
+
+    /**
+     * 监听视图操作参数变化
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    @Watch('pViewCtx', { immediate: true })
+    public onViewCtxChange(newVal: any, oldVal: any) {
+        Object.assign(this.viewCtx, newVal, { xData: this, ctrl: this });
+    }
+
+    /**
+     * 视图状态事件
+     *
+     * @public
+     * @type {(Subscription | undefined)}
+     * @memberof AppPanelView2Base
+     */
+    public viewStateEvent: Subscription | undefined;
+
+    /**
+     * 获取部件类型
+     *
+     * @returns {string}
+     * @memberof AppPanelView2Base
+     */
+    public getControlType(): string {
+        return 'PANEL'
+    }
+
+
+
+    /**
+     * 计数器服务对象集合
+     *
+     * @type {Array<*>}
+     * @memberof AppPanelView2Base
+     */    
+    public counterServiceArray:Array<any> = [];
+
+    /**
+     * 建构部件服务对象
+     *
+     * @type {AppPanelView2Service}
+     * @memberof AppPanelView2Base
+     */
+    public service: AppPanelView2Service = new AppPanelView2Service({ $store: this.$store });
+    
+
+
+    /**
+     * 关闭视图
+     *
+     * @param {any} args
+     * @memberof AppPanelView2Base
+     */
+    public closeView(args: any): void {
+        let _this: any = this;
+        _this.$emit('closeview', [args]);
+    }
+
+    /**
+     *  计数器刷新
+     *
+     * @memberof AppPanelView2Base
+     */
+    public counterRefresh(){
+        const _this:any =this;
+        if(_this.counterServiceArray && _this.counterServiceArray.length >0){
+            _this.counterServiceArray.forEach((item:any) =>{
+                if(item.refreshData && item.refreshData instanceof Function){
+                    item.refreshData();
+                }
+            })
+        }
+    }
+    /**
+     *  处理部件事件
+     *
+     * @memberof AppPanelView2Base
+     */
+    public async handleCtrlEvents(eventName: string, args: any = {}): Promise<boolean> {
+        const actionData = {
+            data: this.getData() || {},
+            context: Util.deepCopy(this.context),
+            viewparams: Util.deepCopy(this.viewparams),
+            xData: this
+        }
+        let result: boolean = true;
+        Object.assign(actionData, args);
+        if (!result) {
+            return false;
+        }
+        this.$emit(eventName, actionData);
+        return true;
+    }
+
+
+
+    /**
+     * 接口实现
+     *
+     * @returns {any[]}
+     * @memberof AppPanelView2Base
+     */
+    getDatas(): any[] {
+        if (!this.layoutData) {
+            return [];
+        }
+        return [this.layoutData];
+    }
+
+    /**
+     * 接口实现
+     *
+     * @returns {*}
+     * @memberof AppPanelView2Base
+     */
+    getData() {
+        return this.layoutData;
+    }
+
+    /**
+     * 父级部件引用
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public parentRef?: any;
+
+    /**
+     * 面板数据对象
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public inputData?: any;
+
+    /**
+     * 操作栏模型数据
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    @Prop() public actionModel?: any;
+
+    /**
+     * UI数据对象
+     *
+     * @type {*}
+     * @memberof AppPanelView2Base
+     */
+    public data:any = {};
+
+    /**
+     * 数据模型对象
+     *
+     * @type {AppPanelView2Model}
+     * @memberof AppPanelView2Base
+     */
+    public dataModel:AppPanelView2Model = new AppPanelView2Model();
+
+    /**
+     * 代码表服务对象
+     *
+     * @type {CodeListService}
+     * @memberof AppPanelView2Base
+     */
+    public codeListService:CodeListService = new CodeListService();
+
+    /**
+     * 界面UI服务对象
+     *
+     * @type {UIService}
+     * @memberof AppPanelView2Base
+     */  
+    public appUIService:UIService = new UIService();
+
+    /**
+     * 视图布局顶级成员名称
+     *
+     * @public
+     * @memberof PanelBase
+     */
+    public rootLayoutDetailNames: string[] = [ ];
+
+    /**
+     * 视图布局面板项模型对象
+     *
+     * @public
+     * @memberof PanelBase
+     */
+    public layoutItems:any = {
+    }
+
+    /**
+     * 布局面板是否加载
+     *
+     * @public
+     * @memberof PanelBase
+     */
+    public isLayoutLoadding: boolean = true;
+
+    /**
+     * 布局面板数据
+     *
+     * @public
+     * @memberof PanelBase
+     */
+    public layoutData:any = {};
+
+    /**
+     * 布局面板模型对象
+     *
+     * @public
+     * @memberof PanelBase
+     */
+    public layoutModelDetails:any = {};
+
+    /**
+     *  初始化布局
+     *
+     *  @public
+     *  @memberof PanelBase
+     */
+    public async initLayout() {
+        if (this.rootLayoutDetailNames.length > 0) {
+            for (let i = 0; i < this.rootLayoutDetailNames.length; i++) {
+                const name = this.rootLayoutDetailNames[i];
+                const rootItem = this.layoutItems[name];
+                if (!rootItem) {
+                    return;
+                }
+                await this.initLayoutItem(rootItem);
+            }
+        }
+        return true;
+    }
+
+    /**
+     *  初始化布局项
+     *
+     *  @public
+     *  @memberof PanelBase
+     */
+    public async initLayoutItem(layoutModelItem: any, index?: number) {
+        const { name } = layoutModelItem;
+        const layoutModelDetail = Util.getLayoutItemInstance(layoutModelItem);
+        if (!(index || index === 0)) {
+            await layoutModelDetail.load(this.context, this.viewparams);
+            this.$set(this.layoutModelDetails, name, layoutModelDetail);
+            this.$set(this.layoutData, name, layoutModelDetail.getData());
+        } else {
+            layoutModelDetail.setIndex(index);
+            await layoutModelDetail.load(this.context, this.viewparams);
+            this.$set(this.layoutModelDetails, `${name}_${index}`, layoutModelDetail);
+            this.$set(this.layoutData, `${name}_${index}`, layoutModelDetail.getData());
+        }
+        if (layoutModelDetail && layoutModelDetail.details) {
+            if (layoutModelDetail.dataRegionType === 'MULTIDATA') {
+                const multiData = layoutModelDetail.getData();
+                if (multiData && multiData.length > 0) {
+                    for (let i = 0; i < multiData.length; i++) {
+                        for (let j = 0; j < layoutModelDetail.details.length; j++) {
+                            const key = layoutModelDetail.details[j];
+                            if (this.layoutItems[key]) {
+                                await this.initLayoutItem(this.layoutItems[key], i);
+                            }
+                        }
+                    }
+                }
+            } else {
+                for (let i = 0; i < layoutModelDetail.details.length; i++) {
+                    const key = layoutModelDetail.details[i];
+                    if (this.layoutItems[key]) {
+                        await this.initLayoutItem(this.layoutItems[key], index);
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * 计算面板按钮权限状态
+     *
+     * @public
+     * @memberof PanelBase
+     */
+    public computeButtonAuthState() {
+        Object.values(this.layoutModelDetails).forEach((layoutModel: any) => {
+            if (layoutModel.itemType == 'BUTTON') {
+                layoutModel.computeActionAuthState();
+            }
+        })
+    }
+
+
+    /**
+     * 监听数据对象
+     *
+     * @memberof AppPanelView2Base
+     */
+    @Watch('inputData', { deep: true, immediate: true } )
+    public onInputDataChange(newVal: any, oldVal: any){
+        if(newVal){
+            this.computedUIData(newVal);
+        }
+    }
+
+    /**
+     * 生命周期
+     *
+     * @memberof AppPanelView2Base
+     */
+    public mounted () {
+        this.afterMounted();
+    }
+
+    /**
+     * 执行mounted后的逻辑
+     *
+     * @memberof AppPanelView2Base
+     */
+    public afterMounted () {
+        const _this: any = this;
+        _this.initLayout().then((result: any) => {
+            _this.isLayoutLoadding = false;
+        });
+    }
+
+    /**
+     * 计算UI展示数据
+     * 
+     * @param codelistArray 代码表模型数组
+     * @memberof AppPanelView2Base
+     */
+    public computedUIData(newVal:any){
+        if((this.dataModel.getDataItems instanceof Function) && this.dataModel.getDataItems().length >0){
+            this.dataModel.getDataItems().forEach((item:any) =>{
+                this.data[item.prop] = newVal[item.prop];
+            })
+        }
+    }
+
+    /**
+     * 打开编辑数据视图
+     *
+     * @type {any}
+     * @memberof AppPanelView2Base
+     */
+    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 AppPanelView2Base
+     */
+    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 AppPanelView2Base
+     */
+    public async remove(datas: any[]): Promise<any> {
+        if (this.parentRef.remove && this.parentRef.remove instanceof Function) {
+            return this.parentRef.remove(datas);
+        }
+    }
+
+    /**
+     * 刷新
+     *
+     * @param {*} [args={}]
+     * @memberof AppPanelView2Base
+     */
+    public refresh(args: any = {}) {
+        if (this.parentRef.refresh && this.parentRef.refresh instanceof Function) {
+            this.parentRef.refresh(args);
+        }
+    }
+
+    /**
+     * 处理值改变
+     *
+     * @public
+     * @params args 改变数据
+     * @params index 多数据容器下标
+     * @memberof PanelBase
+     */
+    public handleValueChange(args: { name: string, value: any }, index?: number) {
+        const { name, value } = args;
+        let fullName = (index || index === 0) ? `${name}_${index}` : name;
+        if (!fullName || !this.layoutData.hasOwnProperty(fullName)) {
+            return;
+        }
+        this.layoutData[fullName] = value;
+        this.layoutModelDetails[fullName].setData(value);
+        this.panelLogic(name, index);
+        this.computeButtonAuthState();
+        this.panelEditItemChange(name, value);
+    }
+
+    /**
+     * 面板编辑项值变化后续操作
+     *
+     * @public
+     * @param property 编辑项名
+     * @param value 编辑项值
+     * @returns {void}
+     * @memberof AppPanelView2Base
+     */
+    public panelEditItemChange(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});
+            }
+        }
+    }
+
+
+    /**
+     * 面板逻辑
+     *
+     * @public
+     * @params name 改变项名称
+     * @params index 多数据容器下标
+     * @memberof AppPanelView2Base
+     */
+    public panelLogic(name: string, index?: number): void {
+    }
+
+    /**
+     * 处理按钮点击
+     *
+     * @public
+     * @params name 按钮项名称
+     * @params index 多数据容器下标
+     * @memberof PanelBase
+     */
+    public handleButtonClick(name: string, index?: number) {
+        let datas: any[] = [];
+        let fullName = (index || index === 0) ? `${name}_${index}` : name;
+        const data: any = this.layoutModelDetails[fullName].getData();
+        if (data) {
+            if (data instanceof Array) {
+                datas = [...data];
+            } else {
+                datas = [data];
+            }
+        }
+        const xData: any = this.layoutModelDetails[fullName].getDataArea();
+        const paramJO: any = {};
+        const contextJO: any = {};
+        const _this: any = this;
+    }
+
+
+}
+</script>
+
+<style lang='less'>
+@import './app-panel-view2-panel.less';
+</style>
+

app_Web/src/widgets/app/app-panel-view2-panel/app-panel-view2-panel-model.ts

+// 基于 @CONTROL/面板/MODEL.ts.ftl 生成
+/**
+ * AppPanelView2 部件模型
+ *
+ * @export
+ * @class AppPanelView2Model
+ */
+export default class AppPanelView2Model {
+
+  /**
+    * 获取数据项集合
+    *
+    * @returns {any[]}
+    * @memberof AppPanelView2Model
+    */
+  public getDataItems(): any[] {
+    return [
+    ]
+  }
+}
\ No newline at end of file

app_Web/src/widgets/app/app-panel-view2-panel/app-panel-view2-panel-service.ts

+// 基于 @CONTROL/面板/SERVICE.ts.ftl 生成
+import { Http } from '@/utils';
+import ControlService from '@/widgets/control-service';
+
+/**
+ * AppPanelView2 部件服务对象
+ *
+ * @export
+ * @class AppPanelView2Service
+ */
+export default class AppPanelView2Service extends ControlService {
+}
\ No newline at end of file

app_Web/src/widgets/app/app-panel-view2-panel/app-panel-view2-panel.less

+// 基于 @CONTROL/面板/CONTROL.less.ftl 生成
+.app-layoutpanel {
+    
+}
\ No newline at end of file

app_Web/src/widgets/app/app-panel-view2-panel/app-panel-view2-panel.vue

+<script lang='tsx'>
+import { Component } from 'vue-property-decorator';
+import AppPanelView2Base from './app-panel-view2-panel-base.vue';
+
+ 
+// 基于 @CONTROL/@MACRO/CONTROL/CONTROL.vue.ftl 生成
+@Component({
+    components: {
+         
+    }
+})
+export default class AppPanelView2 extends AppPanelView2Base {
+
+}
+</script>
\ No newline at end of file

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-base.vue

@@ -923,6 +923,9 @@ export default class MainMenuBase extends Vue implements ControlInterface {
                     case 'AppFunc94': 
                         this.clickAppFunc94(item);
                         return;
+                    case 'AppFunc130': 
+                        this.clickAppFunc130(item);
+                        return;
                     case 'AppFunc22': 
                         this.clickAppFunc22(item);
                         return;
@@ -3209,6 +3212,28 @@ export default class MainMenuBase extends Vue implements ControlInterface {
         });
     }
     
+    /**
+     * 工作流待办
+     *
+     * @param {*} [item={}]
+     * @memberof MainMenu
+     */
+    public clickAppFunc130(item: any = {}) {
+        const viewparam: any = {};
+        Object.assign(viewparam, {});
+        const deResParameters: any[] = [];
+        const parameters: any[] = [
+            { pathName: 'apppanelview2', parameterName: 'apppanelview2' },
+        ];
+        const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
+        if(Object.is(this.$route.fullPath,path)){
+            return;
+        }
+        this.$nextTick(function(){
+            this.$router.push(path);
+        })
+    }
+    
     /**
      * 自定义视图
      *

app_Web/src/widgets/app/main-menu-appmenu/main-menu-appmenu-model.ts

@@ -2585,6 +2585,25 @@ export default class MainMenuModel {
 	appfunctag: 'AppFunc94',
 	resourcetag: '',
 	authtag:'Web-MainMenu-menuitem21',
+},
+		{
+	id: 'BEBA14E9-03D6-4F09-9FED-50790A0B2EB4',
+	name: 'menuitem214',
+	text: '统一待办',
+	type: 'MENUITEM',
+	counterid: '',
+	tooltip: '统一待办',
+	expanded: false,
+	separator: false,
+	hidden: false,
+	hidesidebar: false,
+	opendefault: false,
+	iconcls: '',
+	icon: '',
+	textcls: '',
+	appfunctag: 'AppFunc130',
+	resourcetag: '',
+	authtag:'Web-MainMenu-menuitem214',
 },
 	],
 },
@@ -5121,6 +5140,17 @@ export default class MainMenuModel {
                 { pathName: 'wfdynaactionview', parameterName: 'wfdynaactionview' },
             ],
         },
+        {
+            appfunctag: 'AppFunc130',
+            appfuncyype: 'APPVIEW',
+            openmode: '',
+            codename: 'apppanelview2',
+            deResParameters: [],
+            routepath: '/index/:index?/apppanelview2/:apppanelview2?',
+            parameters: [
+                { pathName: 'apppanelview2', parameterName: 'apppanelview2' },
+            ],
+        },
         {
             appfunctag: 'AppFunc22',
             appfuncyype: 'APPVIEW',

app_Web/src/widgets/ibizbook/guide-borrow-form-form/guide-borrow-form-form-base.vue

@@ -1378,7 +1378,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1425,7 +1425,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1495,7 +1495,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1603,7 +1603,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1695,7 +1695,7 @@ export default class GuideBorrowFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-return-form-form/guide-return-form-form-base.vue

@@ -1344,7 +1344,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1391,7 +1391,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1461,7 +1461,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1569,7 +1569,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1661,7 +1661,7 @@ export default class GuideReturnFormBase extends Vue implements ControlInterface
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/guide-view-form-form/guide-view-form-form-base.vue

@@ -1447,7 +1447,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loadaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loadaction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -1494,7 +1494,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {}): Promise<any> {
         if (!this.loaddraftAction) {
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.loaddraftaction') as string) });
             return;
         }
         const arg: any = { ...opt } ;
@@ -1564,7 +1564,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
         const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
         if(!action){
             let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
             return;
         }
         Object.assign(arg,{viewparams:this.viewparams});
@@ -1672,7 +1672,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
             const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
             if(!action){
                 let actionName:any = Object.is(data.srfuf, '1')?"updateAction":"createAction";
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.actionname') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.actionname') as string) });
                 return;
             }
             Object.assign(arg, { viewparams: this.viewparams });
@@ -1764,7 +1764,7 @@ export default class GuideViewFormBase extends Vue implements ControlInterface {
     public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
         return new Promise((resolve: any, reject: any) => {
             if(!this.removeAction){
-                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView_layout' + (this.$t('app.formpage.notconfig.removeaction') as string) });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKWizardView' + (this.$t('app.formpage.notconfig.removeaction') as string) });
                 return;
             }
             const arg: any = opt[0];

app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-base.vue

@@ -48,18 +48,18 @@
                     <div v-show="flag" class="batch-toolbar">
                                 <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction1.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="usr2dataviewdataview_batchtoolbarModels.deuiaction2.visabled" :disabled="usr2dataviewdataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.visabled" :disabled="dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="dataviewexpbar_dataview_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.usr2dataviewdataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.dataviewexpviewdataviewexpbar_dataview_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
                     </div>
@@ -202,18 +202,18 @@ export default class Usr2Base extends Vue implements ControlInterface {
     public appEntityService: IBIZBOOKEntityService = new IBIZBOOKEntityService({ $store: this.$store });
 
     /**
-     * dataview_batchtoolbar 部件 click 事件
+     * dataviewexpbar_dataview_batchtoolbar 部件 click 事件
      *
      * @param {*} [args={}]
      * @param {*} $event
      * @memberof Usr2Base
      */
-    public dataview_batchtoolbar_click($event: any, $event2?: any) {
+    public dataviewexpbar_dataview_batchtoolbar_click($event: any, $event2?: any) {
         if (Object.is($event.tag, 'deuiaction1')) {
-            this.dataview_batchtoolbar_deuiaction1_click(null, 'dataview_batchtoolbar', $event2);
+            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
         }
         if (Object.is($event.tag, 'deuiaction2')) {
-            this.dataview_batchtoolbar_deuiaction2_click(null, 'dataview_batchtoolbar', $event2);
+            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(null, 'dataviewexpbar_dataview_batchtoolbar', $event2);
         }
     }
     
@@ -226,7 +226,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
+    public dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -254,7 +254,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
+    public dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -282,7 +282,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
+    public dataviewexpbar_dataview_memo1_u37f11a8_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -309,7 +309,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event]
      * @memberof 
      */
-    public dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
+    public dataviewexpbar_dataview_memo1_uc365542_click(params: any = {}, tag?: any, $event?: any) {
         // 取数
         let datas: any[] = [];
         let xData: any = null;
@@ -337,7 +337,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr2DataViewBase
+     * @memberof IBIZBOOKDataViewExpViewBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -363,7 +363,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKUsr2DataViewBase
+     * @memberof IBIZBOOKDataViewExpViewBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -427,6 +427,12 @@ export default class Usr2Base extends Vue implements ControlInterface {
         }
         let result: boolean = true;
         Object.assign(actionData, args);
+        if ('selectionchange'.indexOf(eventName) !== -1) {
+            result = await this.execute_dataviewexpbar_selectionchange_ctrl_logic(actionData) && result;
+        }
+        if ('load'.indexOf(eventName) !== -1) {
+            result = await this.execute_dataviewexpbar_load_ctrl_logic(actionData) && result;
+        }
         if (!result) {
             return false;
         }
@@ -434,6 +440,30 @@ export default class Usr2Base extends Vue implements ControlInterface {
         return true;
     }
 
+    /**
+     * 部件逻辑 -- dataviewexpbar_selectionchange
+     *
+     * @param {string} eventName 部件事件名称
+     * @param {any[]} data 数据
+     * @param {*} event 源事件对象
+     * @memberof Usr2Base
+     */
+    public async execute_dataviewexpbar_selectionchange_ctrl_logic(actionData: any): Promise<boolean> {
+        console.log('暂未支持 CUSTOM 类型');
+        return true;
+    }
+    /**
+     * 部件逻辑 -- dataviewexpbar_load
+     *
+     * @param {string} eventName 部件事件名称
+     * @param {any[]} data 数据
+     * @param {*} event 源事件对象
+     * @memberof Usr2Base
+     */
+    public async execute_dataviewexpbar_load_ctrl_logic(actionData: any): Promise<boolean> {
+        console.log('暂未支持 CUSTOM 类型');
+        return true;
+    }
 
 
 
@@ -678,9 +708,9 @@ export default class Usr2Base extends Vue implements ControlInterface {
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKUsr2DataView
+     * @memberof IBIZBOOKDataViewExpView
      */
-    public usr2dataviewdataview_batchtoolbarModels: any = {
+    public dataviewexpviewdataviewexpbar_dataview_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -1005,7 +1035,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -1100,7 +1130,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -1217,7 +1247,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1225,7 +1255,7 @@ export default class Usr2Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr2DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKDataViewExpView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){
@@ -1327,16 +1357,16 @@ export default class Usr2Base extends Vue implements ControlInterface {
 	public uiAction(data: any, tag: any, $event: any) {
         $event.stopPropagation();
         if(Object.is('Edit', tag)) {
-            this.dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
+            this.dataviewexpbar_dataview_batchtoolbar_deuiaction1_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
+            this.dataviewexpbar_dataview_batchtoolbar_deuiaction2_click(data, tag, $event);
         }
         if(Object.is('Edit', tag)) {
-            this.dataview_memo1_u37f11a8_click(data, tag, $event);
+            this.dataviewexpbar_dataview_memo1_u37f11a8_click(data, tag, $event);
         }
         if(Object.is('Remove', tag)) {
-            this.dataview_memo1_uc365542_click(data, tag, $event);
+            this.dataviewexpbar_dataview_memo1_uc365542_click(data, tag, $event);
         }
     }
 

app_Web/src/widgets/ibizbook/usr2-dataview/usr2-dataview-model.ts

@@ -11,7 +11,7 @@ export default class Usr2Model {
 	 * 获取数据项集合
 	 *
 	 * @returns {any[]}
-	 * @memberof Usr2DataViewMode
+	 * @memberof Usr2Dataviewexpbar_dataviewMode
 	 */
 	public getDataItems(): any[] {
 		return [
@@ -40,17 +40,6 @@ export default class Usr2Model {
 				dataType: 'FONTKEY',
 			},
 
-      {
-        name: 'n_ibizbookname_like',
-        prop: 'n_ibizbookname_like',
-        dataType: 'QUERYPARAM'
-      },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
-
 
       {
         name:'size',

config.xml

@@ -55,23 +55,6 @@
 	  git clone -b master $para2 demosys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd demosys/
-      cd demo-boot
-      mvn ibizlabcli:code
-      cd ..
-      set +e
-      git config user.name "ibizdev"
-      git add .
-      git commit -m "generator before deploy $para5"
-      git push origin master
-      git config user.name "root"
-      set -e
-      mvn package -Pboot
-      cd demo-boot
-      sed -i "s#dstimage#$para5#g" pom.xml
-      sed -i "s#dstimage#$para5#g" src/main/docker/demo-boot-demoapi.yaml
-      mvn -Pboot docker:build
-      mvn -Pboot docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/demo-boot-demoapi.yaml iBizDemo --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

demo-boot/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /demo-boot.jar
 
-EXPOSE 52000
+EXPOSE 8081
 
 ADD demo-boot.jar /demo-boot.jar

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPINDEXVIEWS/index.json

@@ -3031,6 +3031,24 @@
               "layout" : "TABLE_24COL"
             },
             "tooltip" : "工作流动态操作视图"
+          }, {
+            "accUserMode" : 0,
+            "caption" : "统一待办",
+            "itemType" : "MENUITEM",
+            "name" : "menuitem214",
+            "getPSAppFunc" : {
+              "modelref" : true,
+              "id" : "AppFunc130"
+            },
+            "getPSLayout" : {
+              "columnCount" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "getPSLayoutPos" : {
+              "colMD" : 24,
+              "layout" : "TABLE_24COL"
+            },
+            "tooltip" : "统一待办"
           } ],
           "getPSLayout" : {
             "columnCount" : 24,

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPMENUS/MainMenu.json

@@ -1677,6 +1677,16 @@
           "id" : "AppFunc94"
         },
         "tooltip" : "工作流动态操作视图"
+      }, {
+        "accUserMode" : 0,
+        "caption" : "统一待办",
+        "itemType" : "MENUITEM",
+        "name" : "menuitem214",
+        "getPSAppFunc" : {
+          "modelref" : true,
+          "id" : "AppFunc130"
+        },
+        "tooltip" : "统一待办"
       } ],
       "tooltip" : "工作流"
     }, {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPPANELVIEWS/AppPanelView2.json

+{
+  "accUserMode" : 0,
+  "caption" : "工作流待办",
+  "codeName" : "AppPanelView2",
+  "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPPANELVIEWS/AppPanelView2.json",
+  "name" : "AppPanelView2",
+  "getPSControls" : [ {
+    "codeName" : "AppPanelView2",
+    "controlType" : "PANEL",
+    "layoutMode" : "TABLE_24COL",
+    "logicName" : "工作流待办默认面板",
+    "name" : "panel",
+    "getPSControlParam" : { },
+    "getPSLayout" : {
+      "columnCount" : 24,
+      "layout" : "TABLE_24COL"
+    },
+    "modelid" : "A5ED9C2D-6898-463E-B740-88CE35ADF65B",
+    "modeltype" : "PSSYSVIEWPANEL"
+  } ],
+  "getPSViewLayoutPanel" : {
+    "codeName" : "Layoutpanel",
+    "controlStyle" : "APPPANELVIEW",
+    "controlType" : "VIEWLAYOUTPANEL",
+    "name" : "layoutpanel",
+    "getPSControlParam" : { },
+    "layoutBodyOnly" : true,
+    "layoutPanel" : true,
+    "useDefaultLayout" : true
+  },
+  "title" : "工作流待办",
+  "viewStyle" : "DEFAULT",
+  "viewType" : "APPPANELVIEW",
+  "enableDP" : false,
+  "modelid" : "C1022CE5-B44E-467C-86F0-6EDD0940B339",
+  "modeltype" : "PSAPPPANELVIEW"
+}
\ No newline at end of file

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSSYSAPP.json

@@ -2739,6 +2739,16 @@
       "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKUsr8GridView.json",
       "viewType" : "DEGRIDVIEW"
     }
+  }, {
+    "appFuncType" : "APPVIEW",
+    "codeName" : "AppFunc130",
+    "name" : "工作流待办",
+    "openMode" : "INDEXVIEWTAB",
+    "getPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPPANELVIEWS/AppPanelView2.json",
+      "viewType" : "APPPANELVIEW"
+    }
   }, {
     "appFuncType" : "APPVIEW",
     "codeName" : "Auto159",
@@ -15073,6 +15083,11 @@
     "path" : "PSSYSAPPS/Web/PSAPPPORTALVIEWS/AppPortalView.json",
     "viewType" : "APPPORTALVIEW",
     "view" : "AppPortalView"
+  }, {
+    "modelref" : true,
+    "path" : "PSSYSAPPS/Web/PSAPPPANELVIEWS/AppPanelView2.json",
+    "viewType" : "APPPANELVIEW",
+    "view" : "AppPanelView2"
   }, {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPUTILVIEWS/AppLoginView.json",
@@ -18165,6 +18180,24 @@
                   "layout" : "TABLE_24COL"
                 },
                 "tooltip" : "工作流动态操作视图"
+              }, {
+                "accUserMode" : 0,
+                "caption" : "统一待办",
+                "itemType" : "MENUITEM",
+                "name" : "menuitem214",
+                "getPSAppFunc" : {
+                  "modelref" : true,
+                  "id" : "AppFunc130"
+                },
+                "getPSLayout" : {
+                  "columnCount" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "getPSLayoutPos" : {
+                  "colMD" : 24,
+                  "layout" : "TABLE_24COL"
+                },
+                "tooltip" : "统一待办"
               } ],
               "getPSLayout" : {
                 "columnCount" : 24,

demo-core/pom.xml

@@ -10,8 +10,8 @@
     </parent>
 
     <artifactId>demo-core</artifactId>
-    <name>Demo Core</name>
-    <description>后台服务 Core，模板生成代码，再次发布会覆盖，建议不要直接修改，修改请在demo-boot项目中继承或覆盖重写</description>
+    <name>后台服务 Core</name>
+    <description>后台服务 Core</description>
 
     <dependencies>
 
@@ -20,14 +20,6 @@
 			<artifactId>ibizlab-boot-starter-data</artifactId>
 			<version>2.4.0-SNAPSHOT</version>
 		</dependency>
-
-        <!--  MySQL驱动包 -->
-        <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
-        </dependency>
-
-
 	</dependencies>
 
     <properties>

demo-core/src/main/resources/sysmodel/RuntimeDict.json

 [    
+
+
+
+
+
+
+
+
+            
    {
-        "name": "年度",
-        "code": "Years",
-        "group": "",
-        "memo": "",
+        "name":"年度",
+        "code":"Years",
+        "group":"",
+        "memo":"",
+        "enable":"",
    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ]

pom.xml

@@ -6,8 +6,8 @@
     <artifactId>demo</artifactId>
     <groupId>cn.ibizlab</groupId>
     <version>1.0.0.0</version>
-    <name>Demo</name>
-    <description>后台服务</description>
+    <name>后台服务</name>
+    <description></description>
     <packaging>pom</packaging>
 
     <parent>