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

.gitignore

@@ -12,4 +12,4 @@
 **.iml
 *.jar
 *.log
-.DS_Store
+.DS_Store
\ No newline at end of file

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.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-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-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/java/cn/ibizlab/BootApplication.java

@@ -51,4 +51,4 @@ public class BootApplication extends WebMvcConfigurerAdapter {
         super.addArgumentResolvers(argumentResolvers);
         argumentResolvers.add(resolver);
     }
-}
+}
\ No newline at end of file

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>
@@ -101,4 +93,4 @@
         </profile>
     </profiles>
 
-</project>
+</project>
\ No newline at end of file

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

-[
-    {
-        "name": "年度",
-        "code": "Years",
-        "group": "",
-        "memo": "",
-    }
-]
+[    
+
+
+
+
+
+
+
\ No newline at end of file
+
+            
+   {
+        "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>
@@ -105,7 +105,7 @@
                     <generateBackupPoms>false</generateBackupPoms>
                 </configuration>
             </plugin>
-	        <plugin>
+			<plugin>
 				<groupId>cn.ibizlab</groupId>
 				<artifactId>ibizlab-generator-plugin</artifactId>
 				<version>1.0-SNAPSHOT</version>
@@ -137,4 +137,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
\ No newline at end of file