ibiz4j 发布系统代码

app_web/src/components/tab-page-exp/tab-page-exp.vue

@@ -201,8 +201,8 @@ export default class TabPageExp extends Vue {
      * @param {*} caption
      * @memberof TabPageExp
      */
-    public setCurPageCaption(routefullpath: string, title: any, info: string) {
-        if(!Object.is(this.$route.fullPath, routefullpath)) {
+    public setCurPageCaption(caption: string, title: any, info: string) {
+        if(this.$route.meta && (!Object.is(this.$route.meta.caption, caption))) {
             return;
         }
         this.$store.commit("setCurPageCaption", { route: this.$route, caption: title, info: info });

app_web/src/engine/view/edit-view-engine.ts

@@ -247,9 +247,9 @@ export default class EditViewEngine extends ViewEngine {
      */
     public setTabCaption(info: string): void {
         let viewdata: any = this.view.model;
-        let viewParam = this.view.$store.getters['viewaction/getAppView'](this.view.viewtag);
-        if (viewdata && viewParam && info && !Object.is(info, '') && this.view.$tabPageExp) {
-            this.view.$tabPageExp.setCurPageCaption(`${viewParam.viewmodule}_${viewParam.viewname}`.toLocaleLowerCase(), viewdata.srfCaption, info);
+        if (viewdata  && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) {
+            this.view.$tabPageExp.setCurPageCaption(viewdata.srfCaption, viewdata.srfTitle, info);
+            this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
         }
     }
 

app_web/src/pages/ou/ouindex-view/page-register.ts

@@ -11,7 +11,6 @@ export const PageComponents = {
         Vue.component('ibzemployee-mpickup-view', () => import('@pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view.vue'));
         Vue.component('ibzorganization-edit-view', () => import('@pages/ou/ibzorganization-edit-view/ibzorganization-edit-view.vue'));
         Vue.component('ibzdept-member-grid-view', () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'));
-        Vue.component('ibzdepartment-edit-grid-view', () => import('@pages/ou/ibzdepartment-edit-grid-view/ibzdepartment-edit-grid-view.vue'));
         Vue.component('ibzorganization-tree-exp-view', () => import('@pages/ou/ibzorganization-tree-exp-view/ibzorganization-tree-exp-view.vue'));
         Vue.component('ibzemployee-pickup-grid-view', () => import('@pages/ou/ibzemployee-pickup-grid-view/ibzemployee-pickup-grid-view.vue'));
         Vue.component('ibzdepartment-edit-view', () => import('@pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view.vue'));

app_web/src/pages/ou/ouindex-view/router.ts

@@ -408,33 +408,6 @@ const router = new Router({
                     },
                     component: () => import('@pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view.vue'),
                 },
-                {
-                    path: 'ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/editgridview/:editgridview?',
-                    meta: {
-                        caption: 'entities.ibzdepartment.views.editgridview.caption',
-                        parameters: [
-                            { pathName: 'ouindexview', parameterName: 'ouindexview' },
-                            { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
-                            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
-                            { pathName: 'editgridview', parameterName: 'editgridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/ou/ibzdepartment-edit-grid-view/ibzdepartment-edit-grid-view.vue'),
-                },
-                {
-                    path: 'ibzdepartments/:ibzdepartment?/editgridview/:editgridview?',
-                    meta: {
-                        caption: 'entities.ibzdepartment.views.editgridview.caption',
-                        parameters: [
-                            { pathName: 'ouindexview', parameterName: 'ouindexview' },
-                            { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
-                            { pathName: 'editgridview', parameterName: 'editgridview' },
-                        ],
-                        requireAuth: true,
-                    },
-                    component: () => import('@pages/ou/ibzdepartment-edit-grid-view/ibzdepartment-edit-grid-view.vue'),
-                },
                 {
                     path: 'ibzorganizations/:ibzorganization?/treeexpview/:treeexpview?',
                     meta: {
@@ -979,31 +952,6 @@ const router = new Router({
         },
         component: () => import('@pages/ou/ibzemployee-grid-view/ibzemployee-grid-view.vue'),
     },
-    {
-        path: '/ibzorganizations/:ibzorganization?/ibzdepartments/:ibzdepartment?/editgridview/:editgridview?',
-        meta: {
-            caption: 'entities.ibzdepartment.views.editgridview.caption',
-            parameters: [
-                { pathName: 'ibzorganizations', parameterName: 'ibzorganization' },
-                { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
-                { pathName: 'editgridview', parameterName: 'editgridview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/ou/ibzdepartment-edit-grid-view/ibzdepartment-edit-grid-view.vue'),
-    },
-    {
-        path: '/ibzdepartments/:ibzdepartment?/editgridview/:editgridview?',
-        meta: {
-            caption: 'entities.ibzdepartment.views.editgridview.caption',
-            parameters: [
-                { pathName: 'ibzdepartments', parameterName: 'ibzdepartment' },
-                { pathName: 'editgridview', parameterName: 'editgridview' },
-            ],
-            requireAuth: true,
-        },
-        component: () => import('@pages/ou/ibzdepartment-edit-grid-view/ibzdepartment-edit-grid-view.vue'),
-    },
     {
         path: '/ibzorganizations/:ibzorganization?/treeexpview/:treeexpview?',
         meta: {

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

@@ -88,7 +88,7 @@ export const viewstate: any = {
             viewaction: '',
             viewdatachange: false,
             refviews: [
-                '230a2347ac7bca8734046b14777bc258',
+                'd2cc126cb4bcf523d72509bef0183ee0',
             ],
         },
         {

app_web/src/utils/uiaction-tool/uiaction-tool.ts

@@ -73,7 +73,7 @@ export class UIActionTool {
                         values.push(value);
                     });
                 }
-                Object.assign(_data, { [name]: values.length > 0 ? values.join(';') : value });
+                Object.assign(_data, { [name]: values.length > 0 ? values.join(',') : value });
             });
         }
         return _data;

app_web/src/widgets/ibzorganization/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.vue

@@ -286,7 +286,7 @@ export default class TreeExpViewtreeexpbarBase extends Vue implements ControlInt
         }
         if (Object.is(expmode, 'ORG')) {
             return {  
-                viewname: 'ibzdepartment-edit-grid-view', 
+                viewname: 'ibzdepartment-grid-view', 
                 parentdata: {"srfparentdefname":"ORGID","srfparentdename":"IBZORG","srfparentmode":"DER1N_IBZDEPT_IBZORG_ORGID"},
                 deKeyField:'ibzdepartment'
 			};

ibzou-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[IBZORG]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-443-1">
+    <changeSet author="a_A_5d9d78509" id="tab-ibzorg-444-1">
         <createTable tableName="IBZORG">
                 <column name="ORGID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_IBZORG_ORGID"/>
@@ -161,7 +161,7 @@
     </changeSet>
 
         <!--输出实体[IBZORG]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-443-5">
+    <changeSet author="a_A_5d9d78509" id="fk-ibzorg-444-5">
        <addForeignKeyConstraint baseColumnNames="PORGID" baseTableName="IBZORG" constraintName="DER1N_IBZORG_IBZORG_PORGID" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="ORGID" referencedTableName="IBZORG" validate="true"/>
     </changeSet>
         <!--输出实体[IBZEMP]外键关系 -->