ibiz4j 部署微服务应用

.gitignore

+*volumes
 *target
 .settings
 *node_modules

app_web/src/app-register.ts

@@ -28,7 +28,6 @@ import AppCheckboxList from './components/app-checkbox-list/app-checkbox-list.vu
 import AppRadioGroup from './components/app-radio-group/app-radio-group.vue'
 import AppEmbedPicker from './components/app-embed-picker/app-embed-picker.vue'
 import AppTreePicker from './components/app-tree-picker/app-tree-picker.vue'
-import AppRichTextEditor from './components/app-rich-text-editor/app-rich-text-editor.vue'
 import AppFileUpload from './components/app-file-upload/app-file-upload.vue'
 import AppImageUpload from './components/app-image-upload/app-image-upload.vue'
 import PropertyLayout from './components/property-layout/property-layout.vue'
@@ -53,7 +52,6 @@ import AppRate from './components/app-rate/app-rate.vue'
 import AppSwitch from './components/app-switch/app-switch.vue'
 import AppSlider from './components/app-slider/app-slider.vue'
 import AppStepper from './components/app-stepper/app-stepper.vue'
-import AppPortalDesign from './components/app-portal-design/app-portal-design.vue'
 import DatePickerRange from './components/date-picker-range/date-picker-range.vue'
 import AppRangeDate from './components/app-range-date/app-range-date.vue'
 import AppActionBar from './components/app-actionbar/app-actionbar.vue'
@@ -63,7 +61,6 @@ import AppStudioAction from './components/app-studioaction/app-studioaction.vue'
 import AppDebugActions from './components/app-debug-actions/app-debug-actions.vue'
 import AppHeaderMenus from './components/app-header-menus/app-header-menus.vue'
 import AppColumnLink from './components/app-column-link/app-column-link.vue'
-import AppDataUploadView from './components/app-data-upload/app-data-upload.vue'
 import DropDownListDynamic from './components/dropdown-list-dynamic/dropdown-list-dynamic.vue'
 import AppImagePreview from './components/app-image-preview/app-image-preview.vue'
 import AppFormatData from './components/app-format-data/app-format-data.vue'
@@ -76,8 +73,9 @@ import AppDepartmentSelect from './components/app-department-select/app-departme
 import IBizGroupSelect from './components/ibiz-group-select/ibiz-group-select.vue'
 import IBizGroupPicker from './components/ibiz-group-picker/ibiz-group-picker.vue'
 import AppWFApproval from './components/app-wf-approval/app-wf-approval.vue'
-import Breadcrumb from './components/app-breadcrumb/app-breadcrumb.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'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -115,7 +113,7 @@ export const AppComponents = {
         v.component('app-radio-group',AppRadioGroup);
         v.component('app-embed-picker', AppEmbedPicker);
         v.component('app-tree-picker', AppTreePicker);
-        v.component('app-rich-text-editor',AppRichTextEditor);
+        v.component('app-rich-text-editor', () => import('./components/app-rich-text-editor/app-rich-text-editor.vue'));
         v.component('app-file-upload',AppFileUpload);
         v.component('app-image-upload',AppImageUpload);
         v.component('property-layout',PropertyLayout);
@@ -140,7 +138,7 @@ export const AppComponents = {
         v.component('app-switch', AppSwitch);
         v.component('app-slider', AppSlider);
         v.component('app-stepper', AppStepper);
-        v.component('app-portal-design',AppPortalDesign);
+        v.component('app-portal-design', () => import('./components/app-portal-design/app-portal-design.vue'));
         v.component('date-picker-range',DatePickerRange);
         v.component('app-range-date', AppRangeDate);
         v.component('app-actionbar', AppActionBar);
@@ -150,7 +148,7 @@ export const AppComponents = {
         v.component('app-debug-actions', AppDebugActions);
         v.component('app-header-menus', AppHeaderMenus);
         v.component('app-column-link', AppColumnLink);
-        v.component('app-data-upload', AppDataUploadView);
+        v.component('app-data-upload', () => import('./components/app-data-upload/app-data-upload.vue'));
         v.component('dropdown-list-dynamic', DropDownListDynamic);
         v.component('app-image-preview', AppImagePreview);
         v.component('app-format-data', AppFormatData);
@@ -165,5 +163,6 @@ export const AppComponents = {
         v.component('app-wf-approval',AppWFApproval);
         v.component('app-breadcrumb',Breadcrumb);
         v.component('app-transfer',AppTransfer);
+        v.component('context-menu-drag',ContextMenuDrag);
     },
 };
\ No newline at end of file

app_web/src/components/app-breadcrumb/app-breadcrumb.vue

 <template>
-  <el-breadcrumb
-    class="app-breadcrumb"
-    separator="/"
-  >
+    <el-breadcrumb class="app-breadcrumb"  separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item
-        v-for="(item, index) in breadcrumbs"
-        :key="item.path"
-      >
-        <span
-          v-if="index === breadcrumbs.length-1"
-          class="no-redirect"
-        >{{  $t(item.meta.caption) }}</span>
-        <a
-          v-else
-          @click.prevent="handleLink(item)"
-        >{{  $t(item.meta.caption) }}</a>
+      <el-breadcrumb-item v-for="(item, index) in breadcrumbs"  :key="item.id">
+        <span v-if="index === breadcrumbs.length-1" class="no-redirect">{{ item.title }}</span>
+        <a v-else @click.prevent="handleLink(item)">{{ item.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>
@@ -24,24 +12,49 @@
 <script lang="ts">
 import { Component, Vue, Watch, Prop } from 'vue-property-decorator'
 import { RouteRecord, Route } from 'vue-router'
+import NavDataService from '@/service/app/navdata-service';
+import {Subscription } from 'rxjs';
 
 @Component({
 })
 export default class Breadcrumb extends Vue {
 
-  private breadcrumbs: RouteRecord[] = [];  //面包屑列表
+  /**
+   * 面包屑列表
+   *
+   * @memberof Breadcrumb
+   */
+  private breadcrumbs: Array<any> = [];
+
+  /**
+   * 导航服务
+   *
+   * @memberof Breadcrumb
+   */
+  private navDataService = NavDataService.getInstance(this.$store);
   
-  @Prop() public defPSAppView: any; //默认视图
+  /**
+   * 默认视图标识
+   *
+   * @memberof Breadcrumb
+   */
+  @Prop() public indexViewTag!: string;
 
   /**
-   * 监听路由
+   * 首页路径
    *
    * @memberof Breadcrumb
    */
-  @Watch('$route')
-  private onRouteChange(route: Route) {
-    this.getBreadcrumb()
-  }
+  @Prop() public indexViewPath!: string;
+
+  /**
+    * 导航服务事件
+    *
+    * @public
+    * @type {(Subscription | undefined)}
+    * @memberof Dev
+    */
+  public serviceStateEvent: Subscription | undefined;
 
   /**
    * vue  生命周期
@@ -49,7 +62,12 @@ export default class Breadcrumb extends Vue {
    * @memberof Breadcrumb
    */
   created() {
-    this.getBreadcrumb()
+    this.getBreadcrumb();
+    this.serviceStateEvent = this.navDataService.serviceState.subscribe(({ action, data }) => {
+      if (Object.is(action, 'refresh')) {
+          this.getBreadcrumb();
+      }
+    });
   }
 
   /**
@@ -58,24 +76,41 @@ export default class Breadcrumb extends Vue {
    * @memberof Breadcrumb
    */
   private getBreadcrumb() {
-    this.breadcrumbs = this.$route.matched.filter((item) => {
-        return item.meta && item.meta.caption
-      })
-    if(this.defPSAppView){
-      /**如果配置了默认视图,给面包屑第一级赋值默认视图为首页 */
-    }
+    this.breadcrumbs = this.navDataService.getNavData();
+    this.$forceUpdate();
   }
 
   /**
-   * 单机面包屑
+   * 面包屑点击行为
    * 
    * @memberof Breadcrumb
    */
   private handleLink(item: any) {
-    this.$router.push(item).catch(err => {
+    // 首页
+    if(Object.is(item.id,this.indexViewTag)){
+      if(this.$route.matched && this.$route.matched.length >0){
+        this.$router.push(`/${this.indexViewPath}`);
+      }
+    }else{
+      // 非首页
+      this.$router.push(item.path).catch(err => {
         console.warn(err);
       });
     }
+    this.navDataService.removeNavData(item.id);
+  }
+
+    /**
+     * 组件销毁
+     *
+     * @memberof Breadcrumb
+     */
+    public destroyed() {
+        if (this.serviceStateEvent) {
+            this.serviceStateEvent.unsubscribe();
+        }
+    }
+
 }
 </script>
 

app_web/src/components/app-file-upload/app-file-upload.vue

@@ -313,15 +313,16 @@ export default class AppFileUpload extends Vue {
 
         let param:any = this.viewparams;
         let context:any = this.context;
+        let _data:any = JSON.parse(this.data);
 
         if (this.uploadparams && !Object.is(this.uploadparams, '')) {
             uploadparams = this.uploadparams;
-            upload_params = this.$util.computedNavData(this.data,param,context,uploadparams);    
+            upload_params = this.$util.computedNavData(_data,param,context,uploadparams);    
         }
 
         if (this.exportparams && !Object.is(this.exportparams, '')) {
             exportparams = this.exportparams;
-            export_params = this.$util.computedNavData(this.data,param,context,exportparams);
+            export_params = this.$util.computedNavData(_data,param,context,exportparams);
         }
 
         for (const item in upload_params) {

app_web/src/components/app-form/app-form.less

@@ -15,7 +15,7 @@
               overflow: auto;
               > .ivu-tabs-tabpane {
                   height: 100%;
-                  overflow: auto;
+                  overflow: initial;
               }
           }
       }

app_web/src/components/app-image-upload/app-image-upload.vue

@@ -98,6 +98,22 @@ export default class AppImageUpload extends Vue {
      */
     @Prop() public data!: string;
 
+    /**
+     * 视图参数
+     *
+     * @type {*}
+     * @memberof AppFormDRUIPart
+     */
+    @Prop() public viewparams!: any;
+
+    /**
+     * 视图上下文
+     *
+     * @type {*}
+     * @memberof AppAutocomplete
+     */
+    @Prop() public context!: any;
+
     /**
      * 初始化值
      *
@@ -185,20 +201,20 @@ export default class AppImageUpload extends Vue {
     @Provide() public files = [];
 
     /**
-     * 上传keys
+     * 上传params
      *
      * @type {Array<any>}
      * @memberof AppImageUpload
      */
-    public upload_keys: Array<any> = [];
+    public upload_params: Array<any> = [];
 
     /**
-     * 导出keys
+     * 导出params
      *
      * @type {Array<any>}
      * @memberof AppImageUpload
      */
-    public export_keys: Array<any> = [];
+    public export_params: Array<any> = [];
 
     /**
      * 自定义数组
@@ -238,26 +254,31 @@ export default class AppImageUpload extends Vue {
      * @memberof AppImageUpload
      */
     private dataProcess(): void {
-        let upload_arr: Array<string> = [];
-        let export_arr: Array<string> = [];
-        const _data: any = JSON.parse(this.data);
-        this.upload_keys.forEach((key: string) => {
-            upload_arr.push(`${key}=${_data[key]}`);
-        });
-        this.export_keys.forEach((key: string) => {
-            export_arr.push(`${key}=${_data[key]}`);
-        });
 
         let _url = `${Environment.BaseUrl}${Environment.UploadFile}`;
-        if (upload_arr.length > 0 || this.custom_arr.length > 0) {
-            _url = `${_url}?${upload_arr.join('&')}${upload_arr.length > 0 ? '&' : ''}${this.custom_arr.join('&')}`;
+        if (this.upload_params.length > 0 ) {
+            _url +='?';
+            this.upload_params.forEach((item:any,i:any)=>{
+                _url += `${Object.keys(item)[0]}=${Object.values(item)[0]}`;
+                if(i<this.upload_params.length-1){
+                    _url += '&';
                 }
+            })
+            
+        }
+        
         this.uploadUrl = _url;
         
         this.files.forEach((file: any) => {
             let url = `${this.downloadUrl}/${file.id}`;
-            if (upload_arr.length > 0 || this.custom_arr.length > 0) {
-                url = `${url}?${upload_arr.join('&')}${upload_arr.length > 0 ? '&' : ''}${this.custom_arr.join('&')}`;
+            if (this.export_params.length > 0) {
+                url +='?';
+                this.export_params.forEach((item:any,i:any)=>{
+                    url += `${Object.keys(item)[0]}=${Object.values(item)[0]}`;
+                    if(i<this.export_params.length-1){
+                        url += '&';
+                    }
+                })
             }
             file.url = url;
         });
@@ -288,28 +309,35 @@ export default class AppImageUpload extends Vue {
     public mounted() {
         this.appData = this.$store.getters.getAppData();
 
-        let uploadparams: string = '';
-        let exportparams: string = '';
+        let uploadparams: any = {};
+        let exportparams: any = {};
 
-        let upload_keys: Array<string> = [];
-        let export_keys: Array<string> = [];
+        let upload_params: Array<string> = [];
+        let export_params: Array<string> = [];
         let custom_arr: Array<string> = [];
+
+        let param:any = this.viewparams;
+        let context:any = this.context;
+        let _data:any = JSON.parse(this.data);
         if (this.uploadparams && !Object.is(this.uploadparams, '')) {
             uploadparams = this.uploadparams;
-            upload_keys = uploadparams.split(';');
+            upload_params = this.$util.computedNavData(_data,param,context,uploadparams);
         }
         if (this.exportparams && !Object.is(this.exportparams, '')) {
             exportparams = this.exportparams;
-            export_keys = exportparams.split(';');
+            export_params = this.$util.computedNavData(_data,param,context,exportparams);
         }
-        if (this.customparams && !Object.is(this.customparams, '')) {
-            Object.keys(this.customparams).forEach((name: string) => {
-                custom_arr.push(`${name}=${this.customparams[name]}`);
-            });
+        
+        for (const item in upload_params) {
+            this.upload_params.push({
+                [item]:upload_params[item]
+            })
+        }
+        for (const item in export_params) {
+            this.export_params.push({
+                [item]:export_params[item]
+            })
         }
-        this.upload_keys = upload_keys;
-        this.export_keys = export_keys;
-        this.custom_arr = custom_arr;
 
         this.setFiles(this.value);
         this.dataProcess();

app_web/src/components/app-picker-select-view/app-picker-select-view.vue

@@ -324,11 +324,11 @@ export default class AppPickerSelectView extends Vue {
                         this.items.push({ srfmajortext : item.srfmajortext, srfkey: item.srfkey });
                     }
                 });
+            }
             let _viewparam = JSON.parse(this.viewparam);
             _viewparam.selectedData = this.selectItems;
             this.viewparam = JSON.stringify(_viewparam);
         }
-        }
         this.$forceUpdate();
     }
 

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

@@ -242,7 +242,7 @@ export default class AppPicker extends Vue {
      * @param {*} oldVal
      * @memberof AppPicker
      */
-    @Watch('value')
+    @Watch('value',{immediate: true})
     public onValueChange(newVal: any, oldVal: any) {
         this.curvalue = newVal;
         if (Object.is(this.editortype, 'dropdown') && this.valueitem) {

app_web/src/components/app-span/app-span.vue

@@ -148,13 +148,21 @@ export default class AppSpan extends Vue {
         if(this.tag){
             return;  //代码表走codelist组件
         }else if(this.editorType === "ADDRESSPICKUP"){
+            if(this.$util.isEmpty(this.value)){
+                this.text = '';
+            }else{
                 JSON.parse(this.value).forEach((item:any,index:number) => {
                   this.text += index === 0 ? item.srfmajortext : ","+item.srfmajortext;
                 });
+            }
+        }else{
+            if(this.$util.isEmpty(this.value)){
+                this.text = '';
             }else{
                 this.text = this.value;
             }
         }
+    }
     
 }
 </script>

app_web/src/components/context-menu-drag/context-menu-drag.vue

+<template>
+  <Drawer
+    class-name="sider-drawer"
+    placement="left"
+    :closable="false"
+    :mask="false"
+    width="240"
+    v-model="visiable"
+  >
+    <div class="context-menu-drag">
+      <div class="menu-list">
+        <div
+          class="menu-header"
+          @mouseover="showMenuDrawer"
+          @click="drawerVisiable=!drawerVisiable"
+        >
+          <div class="menuicon">
+            <Icon type="md-apps" />
+          </div>
+          <div class="content">
+            <span>服务</span>
+          </div>
+          <div class="forward">
+            <Icon type="ios-arrow-forward" />
+          </div>
+        </div>
+        <div style="padding:8px 0px;" class="col-6">
+          <draggable
+            class="list-group"
+            tag="ul"
+            v-model="selectlist"
+            v-bind="dragOptionsVal"
+            @start="onStart"
+            @end="onEnd"
+            :animation="250"
+            handle=".handle"
+            ghost-class="ghost"
+          >
+            <transition-group type="transition" :name="!drag ? 'flip-list' : null">
+              <li class="list-group-item" v-for="(item,index) in selectlist" :key="item.id">
+                <el-row>
+                  <el-col class="menuicon" :span="4">
+                    <span>
+                      <Icon v-if="item.icon" :type="item.icon" />
+                      <Icon v-else type="md-menu" />
+                    </span>
+                  </el-col>
+                  <el-col :span="14">
+                    <span>{{ item.label }}</span>
+                  </el-col>
+                  <el-col :span="6">
+                    <div class="bar">
+                      <div>
+                        <Icon type="ios-close" @click="removeAt(index)" />
+                      </div>
+                      <div>
+                        <Icon type="ios-move handle" />
+                      </div>
+                    </div>
+                  </el-col>
+                </el-row>
+              </li>
+            </transition-group>
+          </draggable>
+        </div>
+      </div>
+      <Drawer
+        class-name="menu-drawer"
+        width="60"
+        :closable="true"
+        :mask="false"
+        placement="left"
+        v-model="drawerVisiable"
+      >
+        <div class="menuItems">
+          <div class="item" v-for="(item,index) in list" :key="item.id">
+            <span class="title">{{item.label}}</span>
+            <span v-if="isStar(item.id)" class="star" @click="outStar(item)">
+              <Icon type="ios-star" />
+            </span>
+            <span v-else class="star" @click="onStar(item)">
+              <Icon type="ios-star-outline" />
+            </span>
+          </div>
+        </div>
+      </Drawer>
+    </div>
+  </Drawer>
+</template>
+
+<script lang="ts">
+import draggable from "vuedraggable";
+import {
+  Vue,
+  Component,
+  Provide,
+  Watch,
+  Prop,
+  Model
+} from "vue-property-decorator";
+
+// tslint:disable-next-line:max-classes-per-file
+@Component({
+  components: {
+    draggable
+  }
+})
+export default class ContextMenuDrag extends Vue {
+  drawerVisiable: boolean = false;
+
+  current: number = 0;
+
+  list: Array<any> = [];
+
+  selectlist: Array<any> = [];
+
+  drag: boolean = false;
+
+  @Model("change") dragOptions: any;
+
+  @Prop() contextMenuDragVisiable?: boolean;
+
+  visiable: boolean = false;
+
+  @Watch("contextMenuDragVisiable")
+  public onVisiableChange(newVal: any, oldVal: any) {
+    if (newVal) {
+      this.visiable = newVal;
+    } else {
+      let that: any = this;
+      let params: any = {};
+      params.model = this.selectlist;
+      const put: Promise<any> = this.$http.put("uaa/access-center/app-switcher/default",params);
+      put.then((response: any) => {
+        if(response){
+          console.log(response);
+        }
+      }).catch((e) => {
+        console.log(e);
+      });
+      this.drawerVisiable = false;
+      setTimeout(() => {
+        that.visiable = false;
+      }, 300);
+    }
+  }
+
+  public showMenuDrawer() {
+    let that: any = this;
+    if(this.contextMenuDragVisiable){
+      setTimeout(() => {
+        that.drawerVisiable = true;
+      }, 300);
+    }
+  }
+
+  public menuDrawerClose() {}
+
+  public onStart(evt: any) {
+    this.drag = true;
+  }
+
+  public onEnd(evt: any) {
+    this.drag = false;
+    console.log(...this.selectlist);
+  }
+
+  /**
+   *  判断是否已加入列表
+   */
+  public isStar(id: any) {
+    let istar: boolean = false;
+    this.selectlist.forEach((item: any) => {
+      if (Object.is(item.id, id)) {
+        istar = true;
+      }
+    });
+    return istar;
+  }
+
+  /**
+   * 加入列表
+   */
+  public onStar(item: any) {
+    item.visabled = 1;
+    this.selectlist.push(item);
+  }
+
+  /**
+   * 从列表中删除
+   */
+  public outStar(item: any) {
+    item.visabled = 0;
+    let index: number = 0;
+    let that: any = this;
+    this.selectlist.forEach((select: any, index: number) => {
+      if (Object.is(item.id, select.id)) {
+        that.selectlist.splice(index,1);
+      }
+    });
+  }
+
+  get dragOptionsVal() {
+    return {
+      animation: 200,
+      group: "description",
+      disabled: false,
+      ghostClass: "ghost"
+    };
+  }
+  removeAt(index: any) {
+    this.selectlist.splice(index, 1);
+  }
+  sort() {
+    this.selectlist = this.selectlist.sort((a, b) => a.order - b.order);
+  }
+  listFilter() {
+    let that: any = this;
+    that.selectlist = [];
+    this.list.forEach((item: any) => {
+      if (item.visabled === 1) {
+        that.selectlist.push(item);
+      }
+    });
+  }
+  mounted() {
+    let that: any = this;
+    const get: Promise<any> = this.$http.get(
+      "uaa/access-center/app-switcher/default"
+    );
+    get
+      .then((response: any) => {
+        if (response) {
+          that.list = response.data.model;
+          that.listFilter();
+          console.log(response);
+        }
+      })
+      .catch(e => {
+        console.log(e);
+      });
+  }
+}
+</script>
+
+<style lang='less'>
+.menu-drawer {
+  .ivu-drawer-left {
+    left: 241px !important;
+  }
+  .ivu-drawer {
+    top: 64px !important;
+  }
+  .ivu-drawer-body {
+    padding: 32px !important;
+    .menuItems {
+      display: flex;
+      flex-wrap: wrap;
+      > .item {
+        margin: 0px 10px;
+        width: calc(33.333% - 20px);
+        padding: 0px 15px;
+        font-size: 13px;
+        transition: all 0.3s;
+        display: flex;
+        justify-content: space-between;
+        height: 32px;
+        align-items: center;
+        .star {
+          display: flex;
+          height: 100%;
+          width: 30px;
+          font-size: 15px;
+          align-items: center;
+          justify-content: center;
+          .ivu-icon-ios-star-outline{
+            display: none;
+          }
+        }
+      }
+      > .item:hover {
+        background-color: #eaeaea;
+        cursor: pointer;
+          .ivu-icon-ios-star-outline{
+            display: inline;
+          }
+      }
+    }
+  }
+}
+.sider-drawer {
+  .ivu-drawer {
+    background-color: #ffffff !important;
+  }
+  .ivu-drawer-body {
+    padding: 0px !important;
+  }
+  .ivu-drawer {
+    top: 64px !important;
+  }
+  .context-menu-drag {
+    display: flex;
+    .flip-list-move {
+      transition: transform 0.3s;
+    }
+    .menu-list {
+      width: 100%;
+      height: 100%;
+      .menu-header {
+        cursor: pointer;
+        border-bottom: 1px solid rgb(222, 222, 222);
+        height: 48px;
+        line-height: 48px;
+        display: flex;
+        align-items: center;
+        .menuicon {
+          display: inline-block;
+          width: 50px;
+          font-size: 16px;
+          text-align: center;
+          font-size: 22px;
+        }
+        .content {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          flex: 1 1 0%;
+          overflow: hidden;
+          font-size: 13px;
+        }
+        .forward {
+          margin: 0px 8px 0px 4px;
+          color: rgb(222, 222, 222);
+          font-size: 15px;
+        }
+      }
+      .list-group-item {
+        transition: background 1s;
+        -webkit-transition: background 1s;
+        .menuicon {
+          text-align: center;
+        }
+        .el-row {
+          height: 100%;
+          display: flex;
+          align-items: center;
+          padding: 0px 5px;
+        }
+        height: 40px;
+        cursor: pointer;
+        position: relative;
+        display: block;
+        margin-bottom: -1px;
+        transition: background-color 0.5s;
+        transition-timing-function: ease-in-out;
+        .handle {
+          cursor: move;
+        }
+        .bar {
+          display: flex;
+          .ivu-icon-ios-close {
+            cursor: pointer;
+            font-size: 25px;
+          }
+        }
+      }
+      .list-group-item:hover {
+        background-color: #f5f5f5;
+        .ivu-icon-ios-star-outline{
+          display: inline;
+        }
+      }
+    }
+  }
+}
+</style>

app_web/src/components/input-box/input-box.vue

@@ -6,6 +6,7 @@
       :type="type"
       v-model="CurrentVal"
       :disabled="disabled ? true : false"
+      :autosize="autoSize"
       @on-enter="enter"
     ></i-input>
     <div class="unit-text">{{unit}}</div>
@@ -62,6 +63,14 @@ export default class InputBox extends Vue {
    */
   @Prop() public type?: string;
 
+  /**
+   * 多行文本行数
+   *
+   * @type {string}
+   * @memberof InputBox
+   */
+  @Prop() public autoSize?: any;
+
   /**
    * 当前值
    *

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

@@ -247,12 +247,15 @@ export default class EditViewEngine extends ViewEngine {
      */
     public setTabCaption(info: string): void {
         let viewdata: any = this.view.model;
-        if (viewdata  && info && !Object.is(info, '') && this.view.$tabPageExp && (viewdata.srfTitle.indexOf(" - ") === -1)) {
+        if (viewdata  && info && !Object.is(info, '') && (viewdata.srfTitle.indexOf("-") === -1)) {
+            if(this.view.$tabPageExp){
                 this.view.$tabPageExp.setCurPageCaption(viewdata.srfTitle, viewdata.srfTitle, info);
+            }
             if(this.view.$route){
                 this.view.$route.meta.info = info;
             }
-            this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
+            this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)}-${viewdata.dataInfo}`;
+            this.view.initNavData();
         }
     }
 

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

@@ -367,6 +367,13 @@ export default class MDViewEngine extends ViewEngine {
      * @memberof MDViewEngine
      */
     public MDCtrlLoad(args: any[]) {
+        let cacheArray:Array<any> = [];
+        if(args.length >0){
+            args.forEach((item:any) =>{
+                cacheArray.push({srfkey:item.srfkey,srfmajortext:item.srfmajortext});
+            })
+        }
+        this.view.initNavData(cacheArray);
         if (this.view) {
             this.view.$emit('viewload', args);
         }

app_web/src/pages/uaa/index/index-base.vue

@@ -5,7 +5,7 @@
         <layout>
             <sider :width="collapseChange ? 64 : 200" hide-trigger v-model="collapseChange">
                 <div class="sider-top">
-                    <div class="page-logo">
+                    <div class="page-logo" @click="contextMenuDragVisiable=!contextMenuDragVisiable">
                         <img v-show="collapseChange" src="../../../assets/img/logo.png" height="16" />
                         <span v-show="!collapseChange" style="display: block;text-align: center;font-weight: 300;font-size: 20px;">{{$t(model.srfCaption)}}</span>
                     </div>
@@ -17,6 +17,8 @@
     :showBusyIndicator="true"  
     v-model="collapseChange"  
     :mode="mode"
+    :navModel="navModel"
+    viewtag="index"
     :selectTheme="selectTheme"  
     :isDefaultPage="isDefaultPage"  
     :defPSAppView="defPSAppView" 
@@ -24,14 +26,15 @@
     ref='appmenu' 
     @closeview="closeView($event)">
 </view_appmenu>
+                <context-menu-drag :contextMenuDragVisiable="contextMenuDragVisiable"></context-menu-drag>
             </sider>
             <layout>
                 <header class="index_header">
                     <div class="header-left" >
-                        <div class="page-logo">
+                        <div class="page-logo" v-if="Object.is(navModel,'route')">
                             <i v-show="!collapseChange" class="ivu-icon el-icon-s-fold" @click="handleClick"></i>
                             <i v-show="collapseChange" class="ivu-icon el-icon-s-unfold" @click="handleClick"></i>
-                            <app-breadcrumb :defPSAppView="defPSAppView"></app-breadcrumb>
+                            <app-breadcrumb indexViewTag="index" indexViewPath="index"></app-breadcrumb>
                         </div>
                     </div>
                     <div class="header-right" style="display: flex;align-items: center;justify-content: space-between;">
@@ -42,8 +45,8 @@
                         <app-theme style="width:45px;display: flex;justify-content: center;"></app-theme>
                     </div>
                 </header>
-                <content class="index_content" :style="{'width':this.collapseChange ? 'calc(100vw - 64px)' : 'calc(100vw - 200px)' }">
-                    <tab-page-exp></tab-page-exp>
+                <content :class="{'index_content':true,'index_tab_content':Object.is(navModel,'tab')?true:false,'index_route_content':Object.is(navModel,'route')?true:false}" :style="{'width':this.collapseChange ? 'calc(100vw - 64px)' : 'calc(100vw - 200px)' }">
+                    <tab-page-exp v-if="Object.is(navModel,'tab')"></tab-page-exp>
                     <app-keep-alive :routerList="getRouterList">
                         <router-view :key="getRouterViewKey"></router-view>
                     </app-keep-alive>
@@ -58,6 +61,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 
 
@@ -237,6 +241,14 @@ export default class IndexBase extends Vue {
     public engineInit(): void {
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof IndexBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -293,6 +305,8 @@ export default class IndexBase extends Vue {
             Object.assign(this.context,this.$store.getters.getAppData().context);
         }
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -371,6 +385,17 @@ export default class IndexBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof IndexBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'index',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期
@@ -457,6 +482,22 @@ export default class IndexBase extends Vue {
      */
     public mode: string ='vertical';
 
+    /**
+     * 导航模式(route:面包屑模式、tab:分页导航模式)
+     *
+     * @type {string}
+     * @memberof IndexBase
+     */
+    public navModel:string = "route";
+
+    /**
+     * 抽屉状态
+     *
+     * @type {boolean}
+     * @memberof IndexBase
+     */
+    public contextMenuDragVisiable: boolean = false;
+
     /**
      * 当前主题
      *

app_web/src/pages/uaa/index/index.less

@@ -3,7 +3,9 @@
 }
 
 
-
+.index{
+    position: relative;
+}
 .index_view{
     margin-bottom: 1px;
     width: 100%;
@@ -19,6 +21,7 @@
         display: flex;
         align-items: center;
         justify-content: space-between;
+        background-color: #fff;
         .page-logo{
           display: flex;
           align-items: center;

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

@@ -75,6 +75,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysAppService from '@/service/sys-app/sys-app-service';
 
@@ -300,6 +301,14 @@ export default class SysAppEditViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SysAppEditViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -358,6 +367,8 @@ export default class SysAppEditViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -436,6 +447,17 @@ export default class SysAppEditViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SysAppEditViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-app-edit-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -121,6 +121,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysAppService from '@/service/sys-app/sys-app-service';
 
@@ -366,6 +367,14 @@ export default class SysAppGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SysAppGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -424,6 +433,8 @@ export default class SysAppGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -502,6 +513,17 @@ export default class SysAppGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SysAppGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-app-grid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -66,6 +66,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysAuthLogService from '@/service/sys-auth-log/sys-auth-log-service';
 
@@ -281,6 +282,14 @@ export default class SYS_AUTHLOGGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_AUTHLOGGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -339,6 +348,8 @@ export default class SYS_AUTHLOGGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -417,6 +428,17 @@ export default class SYS_AUTHLOGGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_AUTHLOGGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-authloggrid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -75,6 +75,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysPermissionService from '@/service/sys-permission/sys-permission-service';
 
@@ -300,6 +301,14 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_PERMISSIONEditViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -358,6 +367,8 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -436,6 +447,17 @@ export default class SYS_PERMISSIONEditViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_PERMISSIONEditViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-permissionedit-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -83,6 +83,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysPermissionService from '@/service/sys-permission/sys-permission-service';
 
@@ -309,6 +310,14 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_PERMISSIONEditView2Base
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -367,6 +376,8 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -445,6 +456,17 @@ export default class SYS_PERMISSIONEditView2Base extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_PERMISSIONEditView2Base
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-permissionedit-view2',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -107,6 +107,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysPermissionService from '@/service/sys-permission/sys-permission-service';
 
@@ -347,6 +348,14 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_PERMISSIONGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -405,6 +414,8 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -483,6 +494,17 @@ export default class SYS_PERMISSIONGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_PERMISSIONGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-permissiongrid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -66,6 +66,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysPermissionService from '@/service/sys-permission/sys-permission-service';
 
@@ -279,6 +280,14 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_PERMISSIONMPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -337,6 +346,8 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -415,6 +426,17 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_PERMISSIONMPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-permissionmpickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -48,6 +48,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysPermissionService from '@/service/sys-permission/sys-permission-service';
 
@@ -253,6 +254,14 @@ export default class SYS_PERMISSIONPickupGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_PERMISSIONPickupGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -311,6 +320,8 @@ export default class SYS_PERMISSIONPickupGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -389,6 +400,17 @@ export default class SYS_PERMISSIONPickupGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_PERMISSIONPickupGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-permissionpickup-grid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -33,6 +33,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysPermissionService from '@/service/sys-permission/sys-permission-service';
 
@@ -246,6 +247,14 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_PERMISSIONPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -304,6 +313,8 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -382,6 +393,17 @@ export default class SYS_PERMISSIONPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_PERMISSIONPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-permissionpickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -8,6 +8,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysPermissionService from '@/service/sys-permission/sys-permission-service';
 
@@ -196,6 +197,14 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
     public engineInit(): void {
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_PERMISSIONRedirectViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -254,6 +263,8 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -332,6 +343,17 @@ export default class SYS_PERMISSIONRedirectViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_PERMISSIONRedirectViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-permissionredirect-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -104,6 +104,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRolePermissionService from '@/service/sys-role-permission/sys-role-permission-service';
 
@@ -344,6 +345,14 @@ export default class SysRolePermissionGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SysRolePermissionGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -402,6 +411,8 @@ export default class SysRolePermissionGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -480,6 +491,17 @@ export default class SysRolePermissionGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SysRolePermissionGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-role-permission-grid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -16,6 +16,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRolePermissionService from '@/service/sys-role-permission/sys-role-permission-service';
 
@@ -202,6 +203,14 @@ export default class SYS_ROLE_PERMISSIONCustomViewBase extends Vue {
     public engineInit(): void {
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLE_PERMISSIONCustomViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -260,6 +269,8 @@ export default class SYS_ROLE_PERMISSIONCustomViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -338,6 +349,17 @@ export default class SYS_ROLE_PERMISSIONCustomViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLE_PERMISSIONCustomViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-role-permissioncustom-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -75,6 +75,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRolePermissionService from '@/service/sys-role-permission/sys-role-permission-service';
 
@@ -300,6 +301,14 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLE_PERMISSIONEditViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -358,6 +367,8 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -436,6 +447,17 @@ export default class SYS_ROLE_PERMISSIONEditViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLE_PERMISSIONEditViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-role-permissionedit-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -83,6 +83,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRolePermissionService from '@/service/sys-role-permission/sys-role-permission-service';
 
@@ -309,6 +310,14 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLE_PERMISSIONEditView2Base
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -367,6 +376,8 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -445,6 +456,17 @@ export default class SYS_ROLE_PERMISSIONEditView2Base extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLE_PERMISSIONEditView2Base
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-role-permissionedit-view2',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -66,6 +66,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRolePermissionService from '@/service/sys-role-permission/sys-role-permission-service';
 
@@ -279,6 +280,14 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLE_PERMISSIONMPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -337,6 +346,8 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -415,6 +426,17 @@ export default class SYS_ROLE_PERMISSIONMPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLE_PERMISSIONMPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-role-permissionmpickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -48,6 +48,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRolePermissionService from '@/service/sys-role-permission/sys-role-permission-service';
 
@@ -253,6 +254,14 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLE_PERMISSIONPickupGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -311,6 +320,8 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -389,6 +400,17 @@ export default class SYS_ROLE_PERMISSIONPickupGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLE_PERMISSIONPickupGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-role-permissionpickup-grid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -33,6 +33,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRolePermissionService from '@/service/sys-role-permission/sys-role-permission-service';
 
@@ -246,6 +247,14 @@ export default class SYS_ROLE_PERMISSIONPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLE_PERMISSIONPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -304,6 +313,8 @@ export default class SYS_ROLE_PERMISSIONPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -382,6 +393,17 @@ export default class SYS_ROLE_PERMISSIONPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLE_PERMISSIONPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-role-permissionpickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -8,6 +8,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRolePermissionService from '@/service/sys-role-permission/sys-role-permission-service';
 
@@ -196,6 +197,14 @@ export default class SYS_ROLE_PERMISSIONRedirectViewBase extends Vue {
     public engineInit(): void {
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLE_PERMISSIONRedirectViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -254,6 +263,8 @@ export default class SYS_ROLE_PERMISSIONRedirectViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -332,6 +343,17 @@ export default class SYS_ROLE_PERMISSIONRedirectViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLE_PERMISSIONRedirectViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-role-permissionredirect-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -75,6 +75,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRoleService from '@/service/sys-role/sys-role-service';
 
@@ -300,6 +301,14 @@ export default class SYS_ROLEEditViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLEEditViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -358,6 +367,8 @@ export default class SYS_ROLEEditViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -436,6 +447,17 @@ export default class SYS_ROLEEditViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLEEditViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-roleedit-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -83,6 +83,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRoleService from '@/service/sys-role/sys-role-service';
 
@@ -309,6 +310,14 @@ export default class SYS_ROLEEditView2Base extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLEEditView2Base
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -367,6 +376,8 @@ export default class SYS_ROLEEditView2Base extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -445,6 +456,17 @@ export default class SYS_ROLEEditView2Base extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLEEditView2Base
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-roleedit-view2',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -107,6 +107,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRoleService from '@/service/sys-role/sys-role-service';
 
@@ -347,6 +348,14 @@ export default class SYS_ROLEGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLEGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -405,6 +414,8 @@ export default class SYS_ROLEGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -483,6 +494,17 @@ export default class SYS_ROLEGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLEGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-rolegrid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -66,6 +66,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRoleService from '@/service/sys-role/sys-role-service';
 
@@ -279,6 +280,14 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLEMPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -337,6 +346,8 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -415,6 +426,17 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLEMPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-rolempickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -48,6 +48,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRoleService from '@/service/sys-role/sys-role-service';
 
@@ -253,6 +254,14 @@ export default class SYS_ROLEPickupGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLEPickupGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -311,6 +320,8 @@ export default class SYS_ROLEPickupGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -389,6 +400,17 @@ export default class SYS_ROLEPickupGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLEPickupGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-rolepickup-grid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -33,6 +33,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRoleService from '@/service/sys-role/sys-role-service';
 
@@ -246,6 +247,14 @@ export default class SYS_ROLEPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLEPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -304,6 +313,8 @@ export default class SYS_ROLEPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -382,6 +393,17 @@ export default class SYS_ROLEPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLEPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-rolepickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -8,6 +8,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysRoleService from '@/service/sys-role/sys-role-service';
 
@@ -196,6 +197,14 @@ export default class SYS_ROLERedirectViewBase extends Vue {
     public engineInit(): void {
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_ROLERedirectViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -254,6 +263,8 @@ export default class SYS_ROLERedirectViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -332,6 +343,17 @@ export default class SYS_ROLERedirectViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_ROLERedirectViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-roleredirect-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -75,6 +75,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserRoleService from '@/service/sys-user-role/sys-user-role-service';
 
@@ -300,6 +301,14 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USER_ROLEEditViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -358,6 +367,8 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -436,6 +447,17 @@ export default class SYS_USER_ROLEEditViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USER_ROLEEditViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-user-roleedit-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -83,6 +83,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserRoleService from '@/service/sys-user-role/sys-user-role-service';
 
@@ -309,6 +310,14 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USER_ROLEEditView2Base
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -367,6 +376,8 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -445,6 +456,17 @@ export default class SYS_USER_ROLEEditView2Base extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USER_ROLEEditView2Base
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-user-roleedit-view2',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -104,6 +104,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserRoleService from '@/service/sys-user-role/sys-user-role-service';
 
@@ -344,6 +345,14 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USER_ROLEGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -402,6 +411,8 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -480,6 +491,17 @@ export default class SYS_USER_ROLEGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USER_ROLEGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-user-rolegrid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -66,6 +66,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserRoleService from '@/service/sys-user-role/sys-user-role-service';
 
@@ -279,6 +280,14 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USER_ROLEMPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -337,6 +346,8 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -415,6 +426,17 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USER_ROLEMPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-user-rolempickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -48,6 +48,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserRoleService from '@/service/sys-user-role/sys-user-role-service';
 
@@ -253,6 +254,14 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USER_ROLEPickupGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -311,6 +320,8 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -389,6 +400,17 @@ export default class SYS_USER_ROLEPickupGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USER_ROLEPickupGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-user-rolepickup-grid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -33,6 +33,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserRoleService from '@/service/sys-user-role/sys-user-role-service';
 
@@ -246,6 +247,14 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USER_ROLEPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -304,6 +313,8 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -382,6 +393,17 @@ export default class SYS_USER_ROLEPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USER_ROLEPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-user-rolepickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -8,6 +8,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserRoleService from '@/service/sys-user-role/sys-user-role-service';
 
@@ -196,6 +197,14 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
     public engineInit(): void {
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USER_ROLERedirectViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -254,6 +263,8 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -332,6 +343,17 @@ export default class SYS_USER_ROLERedirectViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USER_ROLERedirectViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-user-roleredirect-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -75,6 +75,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserService from '@/service/sys-user/sys-user-service';
 
@@ -300,6 +301,14 @@ export default class SYS_USEREditViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USEREditViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -358,6 +367,8 @@ export default class SYS_USEREditViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -436,6 +447,17 @@ export default class SYS_USEREditViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USEREditViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-useredit-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -83,6 +83,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserService from '@/service/sys-user/sys-user-service';
 
@@ -309,6 +310,14 @@ export default class SYS_USEREditView2Base extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USEREditView2Base
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -367,6 +376,8 @@ export default class SYS_USEREditView2Base extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -445,6 +456,17 @@ export default class SYS_USEREditView2Base extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USEREditView2Base
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-useredit-view2',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -107,6 +107,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserService from '@/service/sys-user/sys-user-service';
 
@@ -347,6 +348,14 @@ export default class SYS_USERGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USERGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -405,6 +414,8 @@ export default class SYS_USERGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -483,6 +494,17 @@ export default class SYS_USERGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USERGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-usergrid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -66,6 +66,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserService from '@/service/sys-user/sys-user-service';
 
@@ -279,6 +280,14 @@ export default class SYS_USERMPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USERMPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -337,6 +346,8 @@ export default class SYS_USERMPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -415,6 +426,17 @@ export default class SYS_USERMPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USERMPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-usermpickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -48,6 +48,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserService from '@/service/sys-user/sys-user-service';
 
@@ -253,6 +254,14 @@ export default class SYS_USERPickupGridViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USERPickupGridViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -311,6 +320,8 @@ export default class SYS_USERPickupGridViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -389,6 +400,17 @@ export default class SYS_USERPickupGridViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USERPickupGridViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-userpickup-grid-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -33,6 +33,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserService from '@/service/sys-user/sys-user-service';
 
@@ -246,6 +247,14 @@ export default class SYS_USERPickupViewBase extends Vue {
         });
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USERPickupViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -304,6 +313,8 @@ export default class SYS_USERPickupViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -382,6 +393,17 @@ export default class SYS_USERPickupViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USERPickupViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-userpickup-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

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

@@ -8,6 +8,7 @@
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { UIActionTool,Util } from '@/utils';
+import NavDataService from '@/service/app/navdata-service';
 import { Subject } from 'rxjs';
 import SysUserService from '@/service/sys-user/sys-user-service';
 
@@ -196,6 +197,14 @@ export default class SYS_USERRedirectViewBase extends Vue {
     public engineInit(): void {
     }
 
+    /**
+     * 应用导航服务
+     *
+     * @type {*}
+     * @memberof SYS_USERRedirectViewBase
+     */
+    public  navDataService = NavDataService.getInstance(this.$store);
+
     /**
      * 应用上下文
      *
@@ -254,6 +263,8 @@ export default class SYS_USERRedirectViewBase extends Vue {
         //初始化视图唯一标识
         Object.assign(this.context,{srfsessionid:this.$util.createUUID()});
         this.handleCustomViewData();
+        //初始化导航数据
+        this.initNavData();
     }
 
     /**
@@ -332,6 +343,17 @@ export default class SYS_USERRedirectViewBase extends Vue {
 		}
 	}
 
+    /**
+     * 初始化导航数据
+     *
+     * @memberof SYS_USERRedirectViewBase
+     */
+    public initNavData(data:any = null){
+        if(this.viewDefaultUsage){
+            this.navDataService.addNavData({id:'sys-userredirect-view',title:this.$t(this.model.srfTitle),data:data,context:this.context,viewparams:this.viewparams,path:this.$route.fullPath});
+        }
+    }
+	
 
     /**
      * Vue声明周期

app_web/src/service/app/navdata-service.ts

+export interface NavDataElement {
+
+    /**
+     * 主键标识
+     *
+     * @memberof NavDataElement
+     */
+    id: string;
+
+    /**
+     * 视图标题
+     *
+     * @memberof NavDataElement
+     */
+    title: any;
+
+    /**
+     * 上下文
+     *
+     * @memberof NavDataElement
+     */
+    context:any;
+
+    /**
+     * 视图参数
+     *
+     * @memberof NavDataElement
+     */
+    viewparams:any;
+
+    /**
+     * 视图数据
+     *
+     * @memberof NavDataElement
+     */   
+    data:any;
+
+    /**
+     * 视图路径
+     *
+     * @memberof NavDataElement
+     */ 
+    path:string;
+
+}
+
+export interface ServiceState {
+
+    /**
+     * 行为
+     *
+     * @memberof ServiceState
+     */
+    action: string;
+
+    /**
+     * 数据
+     *
+     * @memberof ServiceState
+     */
+    data: any;
+
+}
+
+import { Subject } from 'rxjs';
+
+/**
+ * 导航数据服务
+ * 
+ * @export
+ * @class CodeListService
+ */
+export default class NavDataService {
+
+    /**
+     * 单例变量声明
+     *
+     * @private
+     * @static
+     * @type {NavDataService}
+     * @memberof NavDataService
+     */
+    private static navDataService: NavDataService;
+
+    /**
+     * 缓存对象
+     *
+     * @private
+     * @type {(any)}
+     * @memberof NavDataService
+     */
+    private static store: any;
+
+    /**
+     * 服务状态
+     * 
+     * @memberof NavDataService
+     */
+    public serviceState: Subject<ServiceState> = new Subject();
+
+    /**
+     * 导航数据栈
+     * 
+     * @memberof NavDataService
+     */
+    public navDataStack:Array<NavDataElement> = [];
+
+    /**
+     * 导航数据存储仓库
+     * 
+     * @memberof NavDataService
+     */
+    public sessionStore:any;
+
+    /**
+     * 初始化实例
+     * 
+     * @memberof NavDataService
+     */
+    constructor(opts:any = {}){
+        this.sessionStore = window.sessionStorage;
+        this.initNavData();
+    }
+
+    /**
+     * 获取 NavDataService 单例对象
+     *
+     * @static
+     * @returns {NavDataService}
+     * @memberof NavDataService
+     */
+    public static getInstance(store: any): NavDataService {
+        if (!NavDataService.navDataService) {
+            NavDataService.navDataService = new NavDataService();
+        }
+        this.store = store;
+        return this.navDataService;
+    }
+
+    /**
+     * 初始化基础导航数据
+     * 
+     * @memberof NavDataService
+     */
+    public initNavData(){
+        if(this.sessionStore && this.sessionStore.getItem('srfnavdata')){
+            this.navDataStack = JSON.parse(this.sessionStore.getItem('srfnavdata'));
+        }
+    }
+
+    /**
+     * 添加基础导航数据到栈中
+     * 
+     * @memberof NavDataService
+     */
+    public addNavData(curNavData:NavDataElement){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,curNavData.id);
+            })
+            if(tempIndex === -1){
+                this.navDataStack.push(curNavData);
+                this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+                return curNavData;
+            }else{
+                this.setNavDataById(curNavData.id,curNavData);
+            }
+        }else{
+            this.navDataStack.push(curNavData);
+            this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+            return curNavData;
+        }
+        this.serviceState.next({action:'refresh', data:this.navDataStack});
+    }
+
+    /**
+     * 设置指定数据到基础导航数据栈中
+     * 
+     * @memberof NavDataService
+     */
+    public setNavDataById(id:string,curNavData:NavDataElement){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,id);
+            })
+            this.navDataStack[tempIndex] = curNavData;
+            this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+            return curNavData;
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 从导航数据栈中删除指定数据上层数据
+     * 
+     * @memberof NavDataService
+     */
+    public removeNavData(id:string){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,id);
+            })
+            let removeNavData = this.navDataStack.splice(tempIndex+1);
+            if(removeNavData && removeNavData.length >0){
+                removeNavData.forEach((navData:any) =>{
+                    NavDataService.store.commit("deletePage", navData.path);
+                })
+            }
+            this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+            return removeNavData;
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 从导航数据栈中获取指定数据
+     * 
+     * @memberof NavDataService
+     */
+    public getNavDataById(id:string){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,id);
+            })
+            return this.navDataStack[tempIndex];
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 从导航数据栈中获取指定数据的前一条数据
+     * 
+     * @memberof NavDataService
+     */
+    public getPreNavDataById(id:string){
+        if(this.navDataStack.length >0){
+            let tempIndex:number = this.navDataStack.findIndex((element:NavDataElement) =>{
+                return Object.is(element.id,id);
+            })
+            return this.navDataStack[tempIndex-1];
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * 清空导航数据栈数据
+     * 
+     * @memberof NavDataService
+     */
+    public clearNavData(id:string){
+        this.navDataStack = [];
+        this.sessionStore.setItem('srfnavdata',JSON.stringify(this.navDataStack));
+    }
+
+    /**
+     * 从导航数据栈中获取数据
+     * 
+     * @memberof NavDataService
+     */
+    public getNavData(){
+        if(this.navDataStack && this.navDataStack.length >0){
+            this.navDataStack.forEach((item:any,index) =>{
+                if(item && item.data && this.navDataStack[index+1]){
+                    this.navDataStack[index+1] = Object.assign(this.navDataStack[index+1],{isselected:true});
+                }
+            })
+            return this.navDataStack;
+        }else{
+            return [];
+        }
+    }
+}
\ No newline at end of file

app_web/src/styles/default.less

@@ -62,10 +62,23 @@
     border-top-color: #909399;
 }
 
-.view-container {
+// tab分页模式首页布局
+.index_tab_content{
+    .view-container {
         height: calc(100% - 65px);
-    padding: 0 12px;
         margin: 0px 12px;
+    }
+}
+// 面包屑模式首页布局
+.index_route_content{
+    .view-container {
+        height: calc(100% - 36px);
+        margin: 12px;
+    }
+}
+
+.view-container {
+    padding: 0 12px;
     background: white;
     box-shadow: 0 2px 4px 0 rgba(0,0,0,.12), 0 0 6px 0 rgba(0,0,0,.04);
     // flex-direction: column;
@@ -237,12 +250,6 @@
   }
 }
 
-// 清除看板里视图的阴影
-.dashboard .portlet .view-container{
-  -webkit-box-shadow: none ;
-  box-shadow: none;
-}
-
 /***    END:多数据视图属性布局    ***/
 
 // 看板视图，卡片模式

app_web/src/theme/blue.theme.less

@@ -4,29 +4,6 @@
       .app-theme-icon {
           color: #6ba1d1;
       }
-      /* .el-menu.el-menu--horizontal {
-          > .el-menu-item, > .el-submenu > .el-submenu__title {
-              background: #2d5f8b;
-              color: #6ba1d1;
-              i {
-                  color: #6ba1d1;
-              }
-          }
-          > .el-menu-item.is-active, > .el-submenu.is-active > .el-submenu__title {
-              background-color: #4276a4;
-              color: #f1f1f1;
-              i {
-                  color: #f1f1f1;
-              }
-          }
-          > .el-menu-item:hover, > .el-submenu:hover > .el-submenu__title {
-              background-color: #3c6c95;
-              color: #f1f1f1 !important;
-              i {
-                  color: #f1f1f1;
-              }
-          }
-      } */
   }
   
   > .ivu-layout {

app_web/src/theme/dark-blue.theme.less

@@ -3,30 +3,7 @@
     > .ivu-layout-has-sider > .ivu-layout > header{
         .app-theme-icon {
             color: #606d80;
-        }/* 
-        .el-menu.el-menu--horizontal {
-            > .el-menu-item, > .el-submenu > .el-submenu__title {
-                background: #20222A;
-                color: #606d80;
-                i {
-                    color: #606d80;
-                }
-            }
-            > .el-menu-item.is-active, > .el-submenu.is-active > .el-submenu__title {
-                background-color: #20222A;
-                color: #f1f1f1;
-                i {
-                    color: #f1f1f1;
-                }
-            }
-            > .el-menu-item:hover, > .el-submenu:hover > .el-submenu__title {
-                background-color: #3e4b5c;
-                color: #f1f1f1 !important;
-                i {
-                    color: #f1f1f1;
-                }
         }
-        } */
     }
     > .ivu-layout {
         > .ivu-layout-sider {

app_web/src/theme/default.theme.less

@@ -4,29 +4,6 @@
         .app-theme-icon {
             color: #aaaaaa;
         }
-       /*  .el-menu.el-menu--horizontal {
-            > .el-menu-item, > .el-submenu > .el-submenu__title {
-                background: #e1e1e1;
-                color: #aaaaaa;
-                i {
-                    color: #aaaaaa;
-                }
-            }
-            > .el-menu-item.is-active, > .el-submenu.is-active > .el-submenu__title {
-                background-color: #f6f6f6;
-                color: #666666;
-                i {
-                    color: #666666;
-                }
-            }
-            > .el-menu-item:hover, > .el-submenu:hover > .el-submenu__title {
-                background-color: #e9e9e9;
-                color: #666666 !important;
-                i {
-                    color: #666666;
-                }
-            }
-        } */
     }
     > .ivu-layout {
         > .ivu-layout-sider {

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

@@ -99,6 +99,7 @@ export class ViewTool {
         let routePath: string = '';
         let [arg] = args;
         arg = arg ? arg : {};
+        if(deResParameters && deResParameters.length >0){
             deResParameters.forEach(({ pathName, parameterName }: { pathName: string, parameterName: string }) => {
                 let value:any = null;
                 if (viewParam[parameterName] && !Object.is(viewParam[parameterName], '') && !Object.is(viewParam[parameterName], 'null')) {
@@ -108,6 +109,7 @@ export class ViewTool {
                 }
                 routePath = `${routePath}/${pathName}/${value}`;
             });
+        }
         return routePath;
     }
 
@@ -124,6 +126,7 @@ export class ViewTool {
     public static getActiveRoutePath(parameters: any[], args: any[], data: any): string {
         let routePath: string = '';
         // 不存在应用实体
+        if(parameters && parameters.length >0){
             if (parameters.length === 1) {
                 const [{ pathName, parameterName }] = parameters;
                 routePath = `/${pathName}`;
@@ -141,6 +144,7 @@ export class ViewTool {
                     routePath = `${routePath}?${qs.stringify(data, { delimiter: ';' })}`;
                 }
             }
+        }
         return routePath;
     }
 

app_web/src/widgets/app/main-appmenu/main-appmenu-base.vue

@@ -127,6 +127,7 @@ import MainService from './main-appmenu-service';
 
 import MainModel from './main-appmenu-model';
 import { Environment } from '@/environments/environment';
+import NavDataService from '@/service/app/navdata-service';
 
 
 @Component({
@@ -247,6 +248,22 @@ export default class MainBase extends Vue implements ControlInterface {
         return null;
     }
 
+    /**
+     * 导航模式(route:面包屑模式、tab:分页导航模式)
+     *
+     * @type {string}
+     * @memberof Main
+     */
+    @Prop({default:'tab'}) public navModel?:string;
+
+    /**
+     * 视图标识
+     *
+     * @type {string}
+     * @memberof Main
+     */
+    @Prop() public viewtag!:string;
+
     /**
      * 菜单模型
      *
@@ -558,6 +575,10 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public click(item: any) {
         if (item) {
+            if(Object.is(this.navModel,"route")){
+                let navDataService = NavDataService.getInstance(this.$store);
+                navDataService.removeNavData(this.viewtag);
+            }
             switch (item.appfunctag) {
                 case 'Auto10': 
                     this.clickAuto10(item);

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

@@ -1692,9 +1692,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public drdatasaved($event:any){
         let _this = this;
         this.drcounter--;
-        if(this.drcounter > 0){
-            return;
-        }
+        if(this.drcounter === 0){
             this.save(this.drsaveopt, undefined, false).then((res) =>{
                 this.saveState(res);
                 this.drsaveopt = {};
@@ -1708,6 +1706,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }
+    }
 
     /**
      * 新建默认值

app_web/src/widgets/sys-app/main-form/main-form.less

@@ -6,17 +6,33 @@
 }
 .app-form {
     overflow: auto;
+    .app-form-group:nth-child(1){
+        margin-top: 16px;
+        .app-form-item:nth-child(1){
+                margin-top: 0;
+        }
+    }
+    .app-form-item:nth-child(1){
+        margin-top: 16px;
+    }
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
             display: flex;
             flex-direction: column;
+            > .ivu-tabs-bar {
+                margin-bottom: 0px;
+            }
             > .ivu-tabs-content {
+                margin-top: 16px;
                 flex-grow: 1;
                 overflow: auto;
                 > .ivu-tabs-tabpane {
                     height: 100%;
                 }
+                .app-form-group{
+                    margin-top: 0px;
+                }
             }
         }
     }

app_web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue

@@ -1500,6 +1500,120 @@ export default class MainBase extends Vue implements ControlInterface {
         return successItems;
     }
 
+    /**
+     * 新建行
+     *
+     * @param {*} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
+        if(!this.loaddraftAction){
+            this.$Notice.error({ title: '错误', desc: 'SYS_AUTHLOGGridView视图表格loaddraftAction参数未配置' });
+            return;
+        }
+        let _this = this;
+        Object.assign(args[0],{viewparams:this.viewparams});
+        let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.errorMessage) {
+                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                }
+                return;
+            }
+            const data = response.data;
+            this.createDefault(data);
+            data.rowDataState = "create";
+            _this.items.push(data);
+            _this.gridItemsModel.push(_this.getGridRowModel());
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
+
+    /**
+     * 表格编辑项值变更
+     *  
+     * @param row 行数据
+     * @param {{ name: string, value: any }} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public onGridItemValueChange(row: any,$event: { name: string, value: any },rowIndex: number): void {
+        if (!$event) {
+            return;
+        }
+        if (!$event.name || Object.is($event.name, '') || !row.hasOwnProperty($event.name)) {
+            return;
+        }
+        row[$event.name] = $event.value;
+        this.gridEditItemChange(row, $event.name, $event.value, rowIndex);
+    }
+
+    /**
+     * 表格编辑项值变化
+     *
+     * @public
+     * @param row 行数据
+     * @param property 列编辑项名
+     * @param row 列编辑项值
+     * @returns {void}
+     * @memberof Main
+     */
+    public gridEditItemChange(row: any, property: string, value: any, rowIndex: number){
+        row.rowDataState = row.rowDataState ? row.rowDataState : "update" ;
+        this.validate(property,row,rowIndex);
+    }
+
+    /**
+     * 表格编辑项更新
+     *
+     * @param {string} mode 界面行为名称
+     * @param {*} [data={}] 请求数据
+     * @param {string[]} updateDetails 更新项
+     * @param {boolean} [showloading] 是否显示加载状态
+     * @returns {void}
+     * @memberof Main
+     */
+    public updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
+        if (!mode || (mode && Object.is(mode, ''))) {
+            return;
+        }
+        const arg: any = JSON.parse(JSON.stringify(data));
+        Object.assign(arg,{viewparams:this.viewparams});
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response || response.status !== 200) {
+                this.$Notice.error({ title: '错误', desc: '表单项更新失败' });
+                return;
+            }
+            const _data: any = response.data;
+            if(!_data){
+                return;
+            }
+            updateDetails.forEach((name: string) => {
+                if (!_data.hasOwnProperty(name)) {
+                    return;
+                }
+                data[name] = _data[name];
+            });
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
 
     /**
      * 获取对应行class

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

@@ -1495,9 +1495,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public drdatasaved($event:any){
         let _this = this;
         this.drcounter--;
-        if(this.drcounter > 0){
-            return;
-        }
+        if(this.drcounter === 0){
             this.save(this.drsaveopt, undefined, false).then((res) =>{
                 this.saveState(res);
                 this.drsaveopt = {};
@@ -1511,6 +1509,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }
+    }
 
     /**
      * 新建默认值

app_web/src/widgets/sys-permission/main-form/main-form.less

@@ -6,17 +6,33 @@
 }
 .app-form {
     overflow: auto;
+    .app-form-group:nth-child(1){
+        margin-top: 16px;
+        .app-form-item:nth-child(1){
+                margin-top: 0;
+        }
+    }
+    .app-form-item:nth-child(1){
+        margin-top: 16px;
+    }
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
             display: flex;
             flex-direction: column;
+            > .ivu-tabs-bar {
+                margin-bottom: 0px;
+            }
             > .ivu-tabs-content {
+                margin-top: 16px;
                 flex-grow: 1;
                 overflow: auto;
                 > .ivu-tabs-tabpane {
                     height: 100%;
                 }
+                .app-form-group{
+                    margin-top: 0px;
+                }
             }
         }
     }

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

@@ -1362,6 +1362,120 @@ export default class MainBase extends Vue implements ControlInterface {
         return successItems;
     }
 
+    /**
+     * 新建行
+     *
+     * @param {*} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
+        if(!this.loaddraftAction){
+            this.$Notice.error({ title: '错误', desc: 'SYS_PERMISSIONPickupGridView视图表格loaddraftAction参数未配置' });
+            return;
+        }
+        let _this = this;
+        Object.assign(args[0],{viewparams:this.viewparams});
+        let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.errorMessage) {
+                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                }
+                return;
+            }
+            const data = response.data;
+            this.createDefault(data);
+            data.rowDataState = "create";
+            _this.items.push(data);
+            _this.gridItemsModel.push(_this.getGridRowModel());
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
+
+    /**
+     * 表格编辑项值变更
+     *  
+     * @param row 行数据
+     * @param {{ name: string, value: any }} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public onGridItemValueChange(row: any,$event: { name: string, value: any },rowIndex: number): void {
+        if (!$event) {
+            return;
+        }
+        if (!$event.name || Object.is($event.name, '') || !row.hasOwnProperty($event.name)) {
+            return;
+        }
+        row[$event.name] = $event.value;
+        this.gridEditItemChange(row, $event.name, $event.value, rowIndex);
+    }
+
+    /**
+     * 表格编辑项值变化
+     *
+     * @public
+     * @param row 行数据
+     * @param property 列编辑项名
+     * @param row 列编辑项值
+     * @returns {void}
+     * @memberof Main
+     */
+    public gridEditItemChange(row: any, property: string, value: any, rowIndex: number){
+        row.rowDataState = row.rowDataState ? row.rowDataState : "update" ;
+        this.validate(property,row,rowIndex);
+    }
+
+    /**
+     * 表格编辑项更新
+     *
+     * @param {string} mode 界面行为名称
+     * @param {*} [data={}] 请求数据
+     * @param {string[]} updateDetails 更新项
+     * @param {boolean} [showloading] 是否显示加载状态
+     * @returns {void}
+     * @memberof Main
+     */
+    public updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
+        if (!mode || (mode && Object.is(mode, ''))) {
+            return;
+        }
+        const arg: any = JSON.parse(JSON.stringify(data));
+        Object.assign(arg,{viewparams:this.viewparams});
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response || response.status !== 200) {
+                this.$Notice.error({ title: '错误', desc: '表单项更新失败' });
+                return;
+            }
+            const _data: any = response.data;
+            if(!_data){
+                return;
+            }
+            updateDetails.forEach((name: string) => {
+                if (!_data.hasOwnProperty(name)) {
+                    return;
+                }
+                data[name] = _data[name];
+            });
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
 
     /**
      * 获取对应行class

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

@@ -1620,9 +1620,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public drdatasaved($event:any){
         let _this = this;
         this.drcounter--;
-        if(this.drcounter > 0){
-            return;
-        }
+        if(this.drcounter === 0){
             this.save(this.drsaveopt, undefined, false).then((res) =>{
                 this.saveState(res);
                 this.drsaveopt = {};
@@ -1636,6 +1634,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }
+    }
 
     /**
      * 新建默认值

app_web/src/widgets/sys-role-permission/main-form/main-form.less

@@ -6,17 +6,33 @@
 }
 .app-form {
     overflow: auto;
+    .app-form-group:nth-child(1){
+        margin-top: 16px;
+        .app-form-item:nth-child(1){
+                margin-top: 0;
+        }
+    }
+    .app-form-item:nth-child(1){
+        margin-top: 16px;
+    }
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
             display: flex;
             flex-direction: column;
+            > .ivu-tabs-bar {
+                margin-bottom: 0px;
+            }
             > .ivu-tabs-content {
+                margin-top: 16px;
                 flex-grow: 1;
                 overflow: auto;
                 > .ivu-tabs-tabpane {
                     height: 100%;
                 }
+                .app-form-group{
+                    margin-top: 0px;
+                }
             }
         }
     }

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

@@ -1395,6 +1395,120 @@ export default class MainBase extends Vue implements ControlInterface {
         return successItems;
     }
 
+    /**
+     * 新建行
+     *
+     * @param {*} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
+        if(!this.loaddraftAction){
+            this.$Notice.error({ title: '错误', desc: 'SYS_ROLE_PERMISSIONPickupGridView视图表格loaddraftAction参数未配置' });
+            return;
+        }
+        let _this = this;
+        Object.assign(args[0],{viewparams:this.viewparams});
+        let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.errorMessage) {
+                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                }
+                return;
+            }
+            const data = response.data;
+            this.createDefault(data);
+            data.rowDataState = "create";
+            _this.items.push(data);
+            _this.gridItemsModel.push(_this.getGridRowModel());
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
+
+    /**
+     * 表格编辑项值变更
+     *  
+     * @param row 行数据
+     * @param {{ name: string, value: any }} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public onGridItemValueChange(row: any,$event: { name: string, value: any },rowIndex: number): void {
+        if (!$event) {
+            return;
+        }
+        if (!$event.name || Object.is($event.name, '') || !row.hasOwnProperty($event.name)) {
+            return;
+        }
+        row[$event.name] = $event.value;
+        this.gridEditItemChange(row, $event.name, $event.value, rowIndex);
+    }
+
+    /**
+     * 表格编辑项值变化
+     *
+     * @public
+     * @param row 行数据
+     * @param property 列编辑项名
+     * @param row 列编辑项值
+     * @returns {void}
+     * @memberof Main
+     */
+    public gridEditItemChange(row: any, property: string, value: any, rowIndex: number){
+        row.rowDataState = row.rowDataState ? row.rowDataState : "update" ;
+        this.validate(property,row,rowIndex);
+    }
+
+    /**
+     * 表格编辑项更新
+     *
+     * @param {string} mode 界面行为名称
+     * @param {*} [data={}] 请求数据
+     * @param {string[]} updateDetails 更新项
+     * @param {boolean} [showloading] 是否显示加载状态
+     * @returns {void}
+     * @memberof Main
+     */
+    public updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
+        if (!mode || (mode && Object.is(mode, ''))) {
+            return;
+        }
+        const arg: any = JSON.parse(JSON.stringify(data));
+        Object.assign(arg,{viewparams:this.viewparams});
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response || response.status !== 200) {
+                this.$Notice.error({ title: '错误', desc: '表单项更新失败' });
+                return;
+            }
+            const _data: any = response.data;
+            if(!_data){
+                return;
+            }
+            updateDetails.forEach((name: string) => {
+                if (!_data.hasOwnProperty(name)) {
+                    return;
+                }
+                data[name] = _data[name];
+            });
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
 
     /**
      * 获取对应行class

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

@@ -1630,9 +1630,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public drdatasaved($event:any){
         let _this = this;
         this.drcounter--;
-        if(this.drcounter > 0){
-            return;
-        }
+        if(this.drcounter === 0){
             this.save(this.drsaveopt, undefined, false).then((res) =>{
                 this.saveState(res);
                 this.drsaveopt = {};
@@ -1646,6 +1644,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }
+    }
 
     /**
      * 新建默认值

app_web/src/widgets/sys-role/main-form/main-form.less

@@ -6,17 +6,33 @@
 }
 .app-form {
     overflow: auto;
+    .app-form-group:nth-child(1){
+        margin-top: 16px;
+        .app-form-item:nth-child(1){
+                margin-top: 0;
+        }
+    }
+    .app-form-item:nth-child(1){
+        margin-top: 16px;
+    }
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
             display: flex;
             flex-direction: column;
+            > .ivu-tabs-bar {
+                margin-bottom: 0px;
+            }
             > .ivu-tabs-content {
+                margin-top: 16px;
                 flex-grow: 1;
                 overflow: auto;
                 > .ivu-tabs-tabpane {
                     height: 100%;
                 }
+                .app-form-group{
+                    margin-top: 0px;
+                }
             }
         }
     }

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

@@ -1414,6 +1414,120 @@ export default class MainBase extends Vue implements ControlInterface {
         return successItems;
     }
 
+    /**
+     * 新建行
+     *
+     * @param {*} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
+        if(!this.loaddraftAction){
+            this.$Notice.error({ title: '错误', desc: 'SYS_ROLEGridView视图表格loaddraftAction参数未配置' });
+            return;
+        }
+        let _this = this;
+        Object.assign(args[0],{viewparams:this.viewparams});
+        let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.errorMessage) {
+                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                }
+                return;
+            }
+            const data = response.data;
+            this.createDefault(data);
+            data.rowDataState = "create";
+            _this.items.push(data);
+            _this.gridItemsModel.push(_this.getGridRowModel());
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
+
+    /**
+     * 表格编辑项值变更
+     *  
+     * @param row 行数据
+     * @param {{ name: string, value: any }} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public onGridItemValueChange(row: any,$event: { name: string, value: any },rowIndex: number): void {
+        if (!$event) {
+            return;
+        }
+        if (!$event.name || Object.is($event.name, '') || !row.hasOwnProperty($event.name)) {
+            return;
+        }
+        row[$event.name] = $event.value;
+        this.gridEditItemChange(row, $event.name, $event.value, rowIndex);
+    }
+
+    /**
+     * 表格编辑项值变化
+     *
+     * @public
+     * @param row 行数据
+     * @param property 列编辑项名
+     * @param row 列编辑项值
+     * @returns {void}
+     * @memberof Main
+     */
+    public gridEditItemChange(row: any, property: string, value: any, rowIndex: number){
+        row.rowDataState = row.rowDataState ? row.rowDataState : "update" ;
+        this.validate(property,row,rowIndex);
+    }
+
+    /**
+     * 表格编辑项更新
+     *
+     * @param {string} mode 界面行为名称
+     * @param {*} [data={}] 请求数据
+     * @param {string[]} updateDetails 更新项
+     * @param {boolean} [showloading] 是否显示加载状态
+     * @returns {void}
+     * @memberof Main
+     */
+    public updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
+        if (!mode || (mode && Object.is(mode, ''))) {
+            return;
+        }
+        const arg: any = JSON.parse(JSON.stringify(data));
+        Object.assign(arg,{viewparams:this.viewparams});
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response || response.status !== 200) {
+                this.$Notice.error({ title: '错误', desc: '表单项更新失败' });
+                return;
+            }
+            const _data: any = response.data;
+            if(!_data){
+                return;
+            }
+            updateDetails.forEach((name: string) => {
+                if (!_data.hasOwnProperty(name)) {
+                    return;
+                }
+                data[name] = _data[name];
+            });
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
 
     /**
      * 获取对应行class

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

@@ -1633,9 +1633,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public drdatasaved($event:any){
         let _this = this;
         this.drcounter--;
-        if(this.drcounter > 0){
-            return;
-        }
+        if(this.drcounter === 0){
             this.save(this.drsaveopt, undefined, false).then((res) =>{
                 this.saveState(res);
                 this.drsaveopt = {};
@@ -1649,6 +1647,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }
+    }
 
     /**
      * 新建默认值

app_web/src/widgets/sys-user-role/main-form/main-form.less

@@ -6,17 +6,33 @@
 }
 .app-form {
     overflow: auto;
+    .app-form-group:nth-child(1){
+        margin-top: 16px;
+        .app-form-item:nth-child(1){
+                margin-top: 0;
+        }
+    }
+    .app-form-item:nth-child(1){
+        margin-top: 16px;
+    }
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
             display: flex;
             flex-direction: column;
+            > .ivu-tabs-bar {
+                margin-bottom: 0px;
+            }
             > .ivu-tabs-content {
+                margin-top: 16px;
                 flex-grow: 1;
                 overflow: auto;
                 > .ivu-tabs-tabpane {
                     height: 100%;
                 }
+                .app-form-group{
+                    margin-top: 0px;
+                }
             }
         }
     }

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

@@ -1390,6 +1390,120 @@ export default class MainBase extends Vue implements ControlInterface {
         return successItems;
     }
 
+    /**
+     * 新建行
+     *
+     * @param {*} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
+        if(!this.loaddraftAction){
+            this.$Notice.error({ title: '错误', desc: 'SYS_USER_ROLEGridView视图表格loaddraftAction参数未配置' });
+            return;
+        }
+        let _this = this;
+        Object.assign(args[0],{viewparams:this.viewparams});
+        let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.errorMessage) {
+                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                }
+                return;
+            }
+            const data = response.data;
+            this.createDefault(data);
+            data.rowDataState = "create";
+            _this.items.push(data);
+            _this.gridItemsModel.push(_this.getGridRowModel());
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
+
+    /**
+     * 表格编辑项值变更
+     *  
+     * @param row 行数据
+     * @param {{ name: string, value: any }} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public onGridItemValueChange(row: any,$event: { name: string, value: any },rowIndex: number): void {
+        if (!$event) {
+            return;
+        }
+        if (!$event.name || Object.is($event.name, '') || !row.hasOwnProperty($event.name)) {
+            return;
+        }
+        row[$event.name] = $event.value;
+        this.gridEditItemChange(row, $event.name, $event.value, rowIndex);
+    }
+
+    /**
+     * 表格编辑项值变化
+     *
+     * @public
+     * @param row 行数据
+     * @param property 列编辑项名
+     * @param row 列编辑项值
+     * @returns {void}
+     * @memberof Main
+     */
+    public gridEditItemChange(row: any, property: string, value: any, rowIndex: number){
+        row.rowDataState = row.rowDataState ? row.rowDataState : "update" ;
+        this.validate(property,row,rowIndex);
+    }
+
+    /**
+     * 表格编辑项更新
+     *
+     * @param {string} mode 界面行为名称
+     * @param {*} [data={}] 请求数据
+     * @param {string[]} updateDetails 更新项
+     * @param {boolean} [showloading] 是否显示加载状态
+     * @returns {void}
+     * @memberof Main
+     */
+    public updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
+        if (!mode || (mode && Object.is(mode, ''))) {
+            return;
+        }
+        const arg: any = JSON.parse(JSON.stringify(data));
+        Object.assign(arg,{viewparams:this.viewparams});
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response || response.status !== 200) {
+                this.$Notice.error({ title: '错误', desc: '表单项更新失败' });
+                return;
+            }
+            const _data: any = response.data;
+            if(!_data){
+                return;
+            }
+            updateDetails.forEach((name: string) => {
+                if (!_data.hasOwnProperty(name)) {
+                    return;
+                }
+                data[name] = _data[name];
+            });
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
 
     /**
      * 获取对应行class

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

@@ -1536,9 +1536,7 @@ export default class MainBase extends Vue implements ControlInterface {
     public drdatasaved($event:any){
         let _this = this;
         this.drcounter--;
-        if(this.drcounter > 0){
-            return;
-        }
+        if(this.drcounter === 0){
             this.save(this.drsaveopt, undefined, false).then((res) =>{
                 this.saveState(res);
                 this.drsaveopt = {};
@@ -1552,6 +1550,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             });
         }
+    }
 
     /**
      * 新建默认值

app_web/src/widgets/sys-user/main-form/main-form.less

@@ -6,17 +6,33 @@
 }
 .app-form {
     overflow: auto;
+    .app-form-group:nth-child(1){
+        margin-top: 16px;
+        .app-form-item:nth-child(1){
+                margin-top: 0;
+        }
+    }
+    .app-form-item:nth-child(1){
+        margin-top: 16px;
+    }
     > .ivu-row {
         > .ivu-tabs {
             height: 100%;
             display: flex;
             flex-direction: column;
+            > .ivu-tabs-bar {
+                margin-bottom: 0px;
+            }
             > .ivu-tabs-content {
+                margin-top: 16px;
                 flex-grow: 1;
                 overflow: auto;
                 > .ivu-tabs-tabpane {
                     height: 100%;
                 }
+                .app-form-group{
+                    margin-top: 0px;
+                }
             }
         }
     }

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

@@ -1395,6 +1395,120 @@ export default class MainBase extends Vue implements ControlInterface {
         return successItems;
     }
 
+    /**
+     * 新建行
+     *
+     * @param {*} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
+        if(!this.loaddraftAction){
+            this.$Notice.error({ title: '错误', desc: 'SYS_USERGridView视图表格loaddraftAction参数未配置' });
+            return;
+        }
+        let _this = this;
+        Object.assign(args[0],{viewparams:this.viewparams});
+        let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.errorMessage) {
+                    this.$Notice.error({ title: '错误', desc: response.errorMessage });
+                }
+                return;
+            }
+            const data = response.data;
+            this.createDefault(data);
+            data.rowDataState = "create";
+            _this.items.push(data);
+            _this.gridItemsModel.push(_this.getGridRowModel());
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
+
+    /**
+     * 表格编辑项值变更
+     *  
+     * @param row 行数据
+     * @param {{ name: string, value: any }} $event
+     * @returns {void}
+     * @memberof Main
+     */
+    public onGridItemValueChange(row: any,$event: { name: string, value: any },rowIndex: number): void {
+        if (!$event) {
+            return;
+        }
+        if (!$event.name || Object.is($event.name, '') || !row.hasOwnProperty($event.name)) {
+            return;
+        }
+        row[$event.name] = $event.value;
+        this.gridEditItemChange(row, $event.name, $event.value, rowIndex);
+    }
+
+    /**
+     * 表格编辑项值变化
+     *
+     * @public
+     * @param row 行数据
+     * @param property 列编辑项名
+     * @param row 列编辑项值
+     * @returns {void}
+     * @memberof Main
+     */
+    public gridEditItemChange(row: any, property: string, value: any, rowIndex: number){
+        row.rowDataState = row.rowDataState ? row.rowDataState : "update" ;
+        this.validate(property,row,rowIndex);
+    }
+
+    /**
+     * 表格编辑项更新
+     *
+     * @param {string} mode 界面行为名称
+     * @param {*} [data={}] 请求数据
+     * @param {string[]} updateDetails 更新项
+     * @param {boolean} [showloading] 是否显示加载状态
+     * @returns {void}
+     * @memberof Main
+     */
+    public updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
+        if (!mode || (mode && Object.is(mode, ''))) {
+            return;
+        }
+        const arg: any = JSON.parse(JSON.stringify(data));
+        Object.assign(arg,{viewparams:this.viewparams});
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response || response.status !== 200) {
+                this.$Notice.error({ title: '错误', desc: '表单项更新失败' });
+                return;
+            }
+            const _data: any = response.data;
+            if(!_data){
+                return;
+            }
+            updateDetails.forEach((name: string) => {
+                if (!_data.hasOwnProperty(name)) {
+                    return;
+                }
+                data[name] = _data[name];
+            });
+        }).catch((response: any) => {
+            if (response && response.status === 401) {
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: '错误', desc: '系统异常' });
+                return;
+            }
+        });
+    }
 
     /**
      * 获取对应行class

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzuaa/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzuaa/
-      mvn clean package -Papi
-      cd ibzuaa-provider/ibzuaa-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-provider-api.yaml ibzlab-rt --with-registry-auth      
+      mvn clean package -Pweb
+      cd ibzuaa-app/ibzuaa-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzuaa-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzuaa-app/ibzuaa-app-web/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-app-web.jar
 
-EXPOSE 8080
+EXPOSE 30002
 
 ADD ibzuaa-app-web.jar /ibzuaa-app-web.jar

ibzuaa-app/ibzuaa-app-web/src/main/docker/ibzuaa-app-web.yaml

@@ -3,9 +3,24 @@ services:
   ibzuaa-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-app-web:latest
     ports:
-      - "8080:8080"
+      - "30002:30002"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30002
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - ABC=1
+      - DEC=2
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzuaa-boot/src/main/docker/mysql.yml

+version: "3.2"
+services:
+    ibzuaa-mysql:
+    image: mysql:5.7.20
+    volumes:
+      - $PWD/../../../../volumes/mysql/:/var/lib/mysql/
+    networks:
+      - agent_network
+    environment:
+      - TZ=Asia/Shanghai
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=a_A_5d9d78509
+    ports:
+      - 3306:3306
+    command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8 --explicit_defaults_for_timestamp
+networks:
+  agent_network:
+    attachable: true

ibzuaa-boot/src/main/docker/nacos.yml

+version: "3.2"
+services:
+  ibzuaa-nacos:
+    image: nacos/nacos-server:latest
+    container_name: nacos-standalone
+    environment:
+      - PREFER_HOST_MODE=hostname
+      - MODE=standalone
+    ports:
+      - "8848:8848"
+    networks:
+      - agent_network
+networks:
+  agent_network:
+    attachable: true
+

ibzuaa-boot/src/main/docker/redis.yml

+version: "3.2"
+services:
+  ibzuaa-redis:
+    image: redis
+    ports:
+      - 6379:6379
+    environment:
+      - TZ=Asia/Shanghai
+    logging:
+      driver: "json-file"
+    command: redis-server
+    networks:
+      - agent_network
+networks:
+  agent_network:
+    attachable: true
+

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysAuthLog.java

@@ -43,7 +43,7 @@ public class SysAuthLog extends EntityMP implements Serializable {
      * 标识
      */
     @DEField(isKeyField=true)
-    @TableId(value= "logid",type=IdType.UUID)
+    @TableId(value= "logid",type=IdType.ASSIGN_UUID)
     @JSONField(name = "logid")
     @JsonProperty("logid")
     private String logid;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysPermission.java

@@ -43,7 +43,7 @@ public class SysPermission extends EntityMP implements Serializable {
      * 资源标识
      */
     @DEField(name = "sys_permissionid" , isKeyField=true)
-    @TableId(value= "sys_permissionid",type=IdType.UUID)
+    @TableId(value= "sys_permissionid",type=IdType.ASSIGN_UUID)
     @JSONField(name = "permissionid")
     @JsonProperty("permissionid")
     private String permissionid;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRole.java

@@ -43,7 +43,7 @@ public class SysRole extends EntityMP implements Serializable {
      * 角色标识
      */
     @DEField(name = "sys_roleid" , isKeyField=true)
-    @TableId(value= "sys_roleid",type=IdType.UUID)
+    @TableId(value= "sys_roleid",type=IdType.ASSIGN_UUID)
     @JSONField(name = "roleid")
     @JsonProperty("roleid")
     private String roleid;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysRolePermission.java

@@ -43,7 +43,7 @@ public class SysRolePermission extends EntityMP implements Serializable {
      * 角色权限关系表标识
      */
     @DEField(name = "sys_role_permissionid" , isKeyField=true)
-    @TableId(value= "sys_role_permissionid",type=IdType.UUID)
+    @TableId(value= "sys_role_permissionid",type=IdType.ASSIGN_UUID)
     @JSONField(name = "rolepermissionid")
     @JsonProperty("rolepermissionid")
     private String rolepermissionid;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUser.java

@@ -43,7 +43,7 @@ public class SysUser extends EntityMP implements Serializable {
      * 用户标识
      */
     @DEField(isKeyField=true)
-    @TableId(value= "userid",type=IdType.UUID)
+    @TableId(value= "userid",type=IdType.ASSIGN_UUID)
     @JSONField(name = "userid")
     @JsonProperty("userid")
     private String userid;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SysUserRole.java

@@ -43,7 +43,7 @@ public class SysUserRole extends EntityMP implements Serializable {
      * 用户角色关系标识
      */
     @DEField(name = "sys_user_roleid" , isKeyField=true)
-    @TableId(value= "sys_user_roleid",type=IdType.UUID)
+    @TableId(value= "sys_user_roleid",type=IdType.ASSIGN_UUID)
     @JSONField(name = "userroleid")
     @JsonProperty("userroleid")
     private String userroleid;

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysAuthLogServiceImpl.java

@@ -155,6 +155,8 @@ public class SysAuthLogServiceImpl extends ServiceImpl<SysAuthLogMapper, SysAuth
 
 
 
+
+
     @Override
     public List<JSONObject> select(String sql, Map param){
         return this.baseMapper.selectBySQL(sql,param);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPSSystemServiceImpl.java

@@ -164,6 +164,8 @@ public class SysPSSystemServiceImpl extends ServiceImpl<SysPSSystemMapper, SysPS
 
 
 
+
+
     @Override
     public List<JSONObject> select(String sql, Map param){
         return this.baseMapper.selectBySQL(sql,param);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysPermissionServiceImpl.java

@@ -158,6 +158,8 @@ public class SysPermissionServiceImpl extends ServiceImpl<SysPermissionMapper, S
 
 
 
+
+
     @Override
     public List<JSONObject> select(String sql, Map param){
         return this.baseMapper.selectBySQL(sql,param);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRolePermissionServiceImpl.java

@@ -216,6 +216,8 @@ public class SysRolePermissionServiceImpl extends ServiceImpl<SysRolePermissionM
     }
 
 
+
+
     @Override
     public List<JSONObject> select(String sql, Map param){
         return this.baseMapper.selectBySQL(sql,param);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysRoleServiceImpl.java

@@ -161,6 +161,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
 
 
+
+
     @Override
     public List<JSONObject> select(String sql, Map param){
         return this.baseMapper.selectBySQL(sql,param);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserRoleServiceImpl.java

@@ -214,6 +214,8 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
     }
 
 
+
+
     @Override
     public List<JSONObject> select(String sql, Map param){
         return this.baseMapper.selectBySQL(sql,param);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SysUserServiceImpl.java

@@ -158,6 +158,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
 
 
+
+
     @Override
     public List<JSONObject> select(String sql, Map param){
         return this.baseMapper.selectBySQL(sql,param);

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/Dockerfile

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzuaa-provider-api.jar
 
-EXPOSE 40002
+EXPOSE 8081
 
 ADD ibzuaa-provider-api.jar /ibzuaa-provider-api.jar

ibzuaa-provider/ibzuaa-provider-api/src/main/docker/ibzuaa-provider-api.yaml

@@ -3,21 +3,9 @@ services:
   ibzuaa-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzuaa-provider-api:latest
     ports:
-      - "40002:40002"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40002
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
     deploy:
       resources:
            limits: