ibiz4j 发布系统代码

app_web/package.json

@@ -27,7 +27,7 @@
     "file-saver": "^2.0.2",
     "font-awesome": "^4.7.0",
     "ibiz-gantt-elastic": "^1.0.17",
-    "ibiz-vue-lib": "^0.1.10",
+    "ibiz-vue-lib": "^0.1.13",
     "interactjs": "^1.9.4",
     "moment": "^2.24.0",
     "path-to-regexp": "^6.1.0",

app_web/src/app-register.ts

@@ -73,7 +73,9 @@ import AppWFApproval from './components/app-wf-approval/app-wf-approval.vue'
 import Breadcrumb from './components/app-breadcrumb/app-breadcrumb.vue'
 import AppTransfer from './components/app-transfer/app-transfer.vue'
 import ContextMenuDrag from './components/context-menu-drag/context-menu-drag.vue'
-
+import AppOrgSelect from './components/app-org-select/app-org-select.vue'
+import AppDepartmentSelect from './components/app-department-select/app-department-select.vue'
+import AppGroupSelect from './components/app-group-select/app-group-select.vue'
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
 // 全局挂载功能服务注册中心
@@ -153,10 +155,10 @@ export const AppComponents = {
         v.component('context-menu',ContextMenu);
         v.component('app-column-format',AppColumnFormat);
         v.component('app-quick-group',AppQuickGroup);
-        v.component('app-org-select',() => import('./components/app-org-select/app-org-select.vue'));
-        v.component('app-department-select',() => import('./components/app-department-select/app-department-select.vue'));
-        v.component('app-group-select',() => import('./components/app-group-select/app-group-select.vue'));
-        v.component('app-group-picker',() => import('./components/app-group-picker/app-group-picker.vue'));
+        v.component('app-org-select',AppOrgSelect);
+        v.component('app-department-select',AppDepartmentSelect);
+        v.component('app-group-select',AppGroupSelect);
+        v.component('app-group-picker',AppGroupPicker);
         v.component('app-wf-approval',AppWFApproval);
         v.component('app-breadcrumb',Breadcrumb);
         v.component('app-transfer',AppTransfer);

app_web/src/components/app-department-select/app-department-select.vue

@@ -6,8 +6,6 @@
 
 <script lang="ts">
 import { Vue, Component, Watch, Prop, Model } from 'vue-property-decorator';
-import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
-import {IBizSelectTree} from 'ibiz-vue-lib';
 @Component({
 })
 export default class AppDepartmentSelect extends Vue {

app_web/src/components/app-group-picker/app-group-picker.vue

@@ -19,17 +19,14 @@
 import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
 import { Subject } from 'rxjs';
 import { Http } from '../../utils';
-import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
-import {IBizSelectTree} from 'ibiz-vue-lib';
-import {IBizGroupCard} from 'ibiz-vue-lib';
 @Component({})
-export default class IBizGroupPicker extends Vue {
+export default class AppGroupPicker extends Vue {
 
     /**
      * 视图上下文参数
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     @Prop() viewdata: any;
 
@@ -37,7 +34,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图参数
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     @Prop() viewparam: any;
 
@@ -45,7 +42,7 @@ export default class IBizGroupPicker extends Vue {
      * 多选
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected multiple: boolean = false;
 
@@ -53,7 +50,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载树url
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeurl:any;
 
@@ -61,7 +58,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载人员url
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected url:any;
 
@@ -69,7 +66,7 @@ export default class IBizGroupPicker extends Vue {
      * 树数据集
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeItems: any[] = [];
 
@@ -77,7 +74,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表数据集
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected cardItems: any[] = [];
 
@@ -85,7 +82,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图上下文参数对象
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected viewData: any;
 
@@ -93,7 +90,7 @@ export default class IBizGroupPicker extends Vue {
      * 视图参数对象
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected viewParam: any;
 
@@ -101,7 +98,7 @@ export default class IBizGroupPicker extends Vue {
      * 树选中值
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected treeSelectVal: string = '';
 
@@ -109,7 +106,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表选中集合
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected cardSelctVal: any = [];
 
@@ -117,7 +114,7 @@ export default class IBizGroupPicker extends Vue {
      * 数据选中集合
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     protected selects: any[] = [];
 
@@ -125,7 +122,7 @@ export default class IBizGroupPicker extends Vue {
      * 是否显示树
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     get showTree() {
         if(this.viewParam) {
@@ -137,7 +134,7 @@ export default class IBizGroupPicker extends Vue {
      * 生命周期
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public created() {
         if(!this.viewdata || !this.viewparam) {
@@ -161,7 +158,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public load() {
         if(this.showTree) {
@@ -175,7 +172,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载树数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public loadTree() {
         let orgid = this.viewParam.filtervalue;
@@ -194,7 +191,7 @@ export default class IBizGroupPicker extends Vue {
      * 加载分组表数据
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public loadGroupData(key: string) {
         let tempUrl = this.url.replace('${selected-orgid}',key);
@@ -212,7 +209,7 @@ export default class IBizGroupPicker extends Vue {
      * 树选中
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public treeSelect(event: any) {
         if(!event || JSON.parse(event).length == 0) {
@@ -226,7 +223,7 @@ export default class IBizGroupPicker extends Vue {
      * 分组表选中
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public groupSelect(event: any) {
         if (!event || !event.select) {
@@ -258,7 +255,7 @@ export default class IBizGroupPicker extends Vue {
      * 确认
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public onOK() {
         this.$emit('close', this.selects);
@@ -268,7 +265,7 @@ export default class IBizGroupPicker extends Vue {
      * 取消
      *
      * @type {*}
-     * @memberof IBizGroupPicker
+     * @memberof AppGroupPicker
      */  
     public onCancel() {
         this.$emit('close');

app_web/src/components/app-group-select/app-group-select.vue

@@ -23,12 +23,12 @@ import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
 import { Subject } from 'rxjs';
 
 @Component({})
-export default class IBizGroupSelect extends Vue {
+export default class AppGroupSelect extends Vue {
     /**
      * 名称标识
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() name!: string;
 
@@ -36,7 +36,7 @@ export default class IBizGroupSelect extends Vue {
      * 树加载地址
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() treeurl?:boolean;
 
@@ -44,7 +44,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据接口地址
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() url!: string;
 
@@ -52,7 +52,7 @@ export default class IBizGroupSelect extends Vue {
      * 多选
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop({default: false}) multiple?: boolean;
 
@@ -60,7 +60,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据对象
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() data: any;
 
@@ -68,7 +68,7 @@ export default class IBizGroupSelect extends Vue {
      * 过滤属性标识
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() filter?: string;
 
@@ -76,7 +76,7 @@ export default class IBizGroupSelect extends Vue {
      * 是否启用
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() disabled?: boolean;
 
@@ -84,7 +84,7 @@ export default class IBizGroupSelect extends Vue {
      * 值
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() value: any;
 
@@ -92,7 +92,7 @@ export default class IBizGroupSelect extends Vue {
      * 上下文参数
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() context: any;
 
@@ -100,7 +100,7 @@ export default class IBizGroupSelect extends Vue {
      * 关联属性
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() valueitem: any;
 
@@ -108,7 +108,7 @@ export default class IBizGroupSelect extends Vue {
      * 填充属性
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Prop() fillmap: any;
 
@@ -116,7 +116,7 @@ export default class IBizGroupSelect extends Vue {
      * 选中项集合
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     protected selects: any[] = [];
 
@@ -124,7 +124,7 @@ export default class IBizGroupSelect extends Vue {
      * 值变化
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     @Watch('value')
     onValueChange(newVal: any) {
@@ -154,7 +154,7 @@ export default class IBizGroupSelect extends Vue {
      * 单选时选中名称
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     get selectName() {
         if(this.selects.length > 0) {
@@ -166,11 +166,11 @@ export default class IBizGroupSelect extends Vue {
      * 打开选择视图
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public openView() {
         const view: any = {
-            viewname: 'ibiz-group-picker',
+            viewname: 'app-group-picker',
             title: '分组选择'
         };
         const context: any = JSON.parse(JSON.stringify(this.context));
@@ -208,7 +208,7 @@ export default class IBizGroupSelect extends Vue {
      * 选择视图关闭
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public openViewClose(result: any) {
         this.selects = [];
@@ -222,7 +222,7 @@ export default class IBizGroupSelect extends Vue {
      * 数据删除
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public remove(item: any) {
         this.selects.splice(this.selects.indexOf(item), 1);
@@ -233,7 +233,7 @@ export default class IBizGroupSelect extends Vue {
      * 设置值
      *
      * @type {*}
-     * @memberof IBizGroupSelect
+     * @memberof AppGroupSelect
      */  
     public setValue() {
         let item: any = {};

app_web/src/components/app-org-select/app-org-select.vue

@@ -6,8 +6,6 @@
 <script lang = 'ts'>
 import { Vue, Component, Prop, Watch } from "vue-property-decorator";
 import { Http } from '@/utils';
-import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
-import {IBizSelectTree} from 'ibiz-vue-lib';
 @Component({})
 export default class AppOrgSelect extends Vue {
 

app_web/src/pages/uaa/index/main.ts

@@ -4,13 +4,14 @@ import VueRouter from 'vue-router';
 import App from '@/App.vue';
 import ElementUi from 'element-ui';
 import ViewUI from 'view-design';
+import ibizLab from 'ibiz-vue-lib';
 import { Interceptors } from '@/utils';
 import  {Print} from '@/utils/print';
 import i18n from '@/locale'
 
 import 'element-ui/lib/theme-chalk/index.css';
 import 'view-design/dist/styles/iview.css';
-
+import 'ibiz-vue-lib/lib/ibiz-vue-lib.css';
 import '@/styles/default.less';
 
 // 模拟数据
@@ -31,6 +32,7 @@ Vue.config.errorHandler = function (err: any, vm: any, info: any) {
 }
 Vue.config.productionTip = false;
 Vue.use(Print);
+Vue.use(ibizLab);
 Vue.use(Vuex);
 Vue.use(VueRouter);;
 Vue.use(ElementUi, {

app_web/src/pages/uaa/sys-app-edit-view/sys-app-edit-view-base.vue

@@ -145,7 +145,7 @@ export default class SysAppEditViewBase extends Vue {
      * @type {string}
      * @memberof SysAppEditViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-app-grid-view/sys-app-grid-view-base.vue

@@ -196,7 +196,7 @@ export default class SysAppGridViewBase extends Vue {
      * @type {string}
      * @memberof SysAppGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-auth-log-grid-view/sys-auth-log-grid-view-base.vue

@@ -141,7 +141,7 @@ export default class SysAuthLogGridViewBase extends Vue {
      * @type {string}
      * @memberof SysAuthLogGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-permissionedit-view/sys-permissionedit-view-base.vue

@@ -145,7 +145,7 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONEditViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-permissionedit-view2/sys-permissionedit-view2-base.vue

@@ -156,7 +156,7 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONEditView2Base
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-permissiongrid-view/sys-permissiongrid-view-base.vue

@@ -182,7 +182,7 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view-base.vue

@@ -139,7 +139,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONMPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-permissionpickup-grid-view/sys-permissionpickup-grid-view-base.vue

@@ -121,7 +121,7 @@ export default class SYS_PERMISSIONPickupGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONPickupGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-permissionpickup-view/sys-permissionpickup-view-base.vue

@@ -106,7 +106,7 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-permissionredirect-view/sys-permissionredirect-view-base.vue

@@ -82,7 +82,7 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
      * @type {string}
      * @memberof SYS_PERMISSIONRedirectViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-role-permission-grid-view/sys-role-permission-grid-view-base.vue

@@ -179,7 +179,7 @@ export default class SysRolePermissionGridViewBase extends Vue {
      * @type {string}
      * @memberof SysRolePermissionGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-role-permissioncustom-view/sys-role-permissioncustom-view-base.vue

@@ -88,7 +88,7 @@ export default class SYS_ROLE_PERMISSIONCustomViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLE_PERMISSIONCustomViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-role-permissionedit-view/sys-role-permissionedit-view-base.vue

@@ -145,7 +145,7 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLE_PERMISSIONEditViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-role-permissionedit-view2/sys-role-permissionedit-view2-base.vue

@@ -156,7 +156,7 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
      * @type {string}
      * @memberof SYS_ROLE_PERMISSIONEditView2Base
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-role-permissionmpickup-view/sys-role-permissionmpickup-view-base.vue

@@ -139,7 +139,7 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLE_PERMISSIONMPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-role-permissionpickup-grid-view/sys-role-permissionpickup-grid-view-base.vue

@@ -121,7 +121,7 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLE_PERMISSIONPickupGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-role-permissionpickup-view/sys-role-permissionpickup-view-base.vue

@@ -106,7 +106,7 @@ export default class SYS_ROLE_PERMISSIONPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLE_PERMISSIONPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-role-permissionredirect-view/sys-role-permissionredirect-view-base.vue

@@ -82,7 +82,7 @@ export default class SYS_ROLE_PERMISSIONRedirectViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLE_PERMISSIONRedirectViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-roleedit-view/sys-roleedit-view-base.vue

@@ -145,7 +145,7 @@ export default class SYS_ROLEEditViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLEEditViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-roleedit-view2/sys-roleedit-view2-base.vue

@@ -156,7 +156,7 @@ export default class SYS_ROLEEditView2Base extends Vue {
      * @type {string}
      * @memberof SYS_ROLEEditView2Base
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-rolegrid-view/sys-rolegrid-view-base.vue

@@ -182,7 +182,7 @@ export default class SYS_ROLEGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLEGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view-base.vue

@@ -139,7 +139,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLEMPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-rolepickup-grid-view/sys-rolepickup-grid-view-base.vue

@@ -121,7 +121,7 @@ export default class SYS_ROLEPickupGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLEPickupGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-rolepickup-view/sys-rolepickup-view-base.vue

@@ -106,7 +106,7 @@ export default class SYS_ROLEPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLEPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-roleredirect-view/sys-roleredirect-view-base.vue

@@ -82,7 +82,7 @@ export default class SYS_ROLERedirectViewBase extends Vue {
      * @type {string}
      * @memberof SYS_ROLERedirectViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-user-roleedit-view/sys-user-roleedit-view-base.vue

@@ -145,7 +145,7 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USER_ROLEEditViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-user-roleedit-view2/sys-user-roleedit-view2-base.vue

@@ -156,7 +156,7 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
      * @type {string}
      * @memberof SYS_USER_ROLEEditView2Base
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-user-rolegrid-view/sys-user-rolegrid-view-base.vue

@@ -179,7 +179,7 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USER_ROLEGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-user-rolempickup-view/sys-user-rolempickup-view-base.vue

@@ -139,7 +139,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USER_ROLEMPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-user-rolepickup-grid-view/sys-user-rolepickup-grid-view-base.vue

@@ -121,7 +121,7 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USER_ROLEPickupGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-user-rolepickup-view/sys-user-rolepickup-view-base.vue

@@ -106,7 +106,7 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USER_ROLEPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-user-roleredirect-view/sys-user-roleredirect-view-base.vue

@@ -82,7 +82,7 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USER_ROLERedirectViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-useredit-view/sys-useredit-view-base.vue

@@ -145,7 +145,7 @@ export default class SYS_USEREditViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USEREditViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-useredit-view2/sys-useredit-view2-base.vue

@@ -156,7 +156,7 @@ export default class SYS_USEREditView2Base extends Vue {
      * @type {string}
      * @memberof SYS_USEREditView2Base
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-usergrid-view/sys-usergrid-view-base.vue

@@ -182,7 +182,7 @@ export default class SYS_USERGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USERGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view-base.vue

@@ -139,7 +139,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USERMPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-userpickup-grid-view/sys-userpickup-grid-view-base.vue

@@ -121,7 +121,7 @@ export default class SYS_USERPickupGridViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USERPickupGridViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-userpickup-view/sys-userpickup-view-base.vue

@@ -106,7 +106,7 @@ export default class SYS_USERPickupViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USERPickupViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/pages/uaa/sys-userredirect-view/sys-userredirect-view-base.vue

@@ -82,7 +82,7 @@ export default class SYS_USERRedirectViewBase extends Vue {
      * @type {string}
      * @memberof SYS_USERRedirectViewBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
 	/**

app_web/src/widgets/sys-app/main-form/main-form-base.vue

@@ -211,7 +211,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
     /**

app_web/src/widgets/sys-permission/main-form/main-form-base.vue

@@ -149,7 +149,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
     /**

app_web/src/widgets/sys-role-permission/main-form/main-form-base.vue

@@ -205,7 +205,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
     /**

app_web/src/widgets/sys-role/main-form/main-form-base.vue

@@ -244,7 +244,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
     /**

app_web/src/widgets/sys-user-role/main-form/main-form-base.vue

@@ -218,7 +218,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
     /**

app_web/src/widgets/sys-user/main-form/main-form-base.vue

@@ -187,7 +187,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {string}
      * @memberof MainBase
      */
-    @Inject('navModel')
+    @Inject({from:'navModel',default: 'tab'})
     public navModel!:string;
 
     /**