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

app_Web/src/components/app-checkbox/app-checkbox.scss

-.app-checkbox-list {
+.app-checkbox {
     overflow: auto;
 }
\ No newline at end of file

app_Web/src/components/app-checkbox/app-checkbox.vue

 <template>
-  <div class="checkbox">
+  <div class="app-checkbox">
     <checkbox v-model="CurrentVal" :disabled="disabled"></checkbox>
   </div>
 </template>

app_Web/src/components/app-picker/app-picker.scss

 .app-picker {
     width: 100%;
-    .el-select {
-        .el-input__suffix {
-            right: 20px;
-        }
-    }
     .text-value {
         .el-icon-circle-close {
             display: none;

app_Web/src/components/dropdown-list-hidden/dropdown-list-hidden.scss

@@ -4,12 +4,5 @@
     }
     .tree-dropdown-list{
         width: 100%;
-        .el-input__inner{
-            height: 32px !important;
-            line-height: 32px !important;
-        }
-        .el-input__icon{
-            line-height: 32px;
-        }
     }
 }
\ No newline at end of file

app_Web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.scss

 .ivu-select-multiple .ivu-select-item-selected:after{
     display: none;
-}
-.dropdown-list-mpicker-container{
+  }
+  .dropdown-list-mpicker-container{
     .tree-dropdown-list-mpicker{
       width: 100%;
-    .el-input__inner{
-        height: 32px !important;
-        line-height: 32px !important;
-    }
-    .el-input__icon{
-        line-height: 32px;
     }
   }
-}
+  
\ No newline at end of file

app_Web/src/components/dropdown-list/dropdown-list.scss

@@ -4,12 +4,5 @@
     }
     .tree-dropdown-list{
         width: 100%;
-        .el-input__inner{
-            height: 32px !important;
-            line-height: 32px !important;
-        }
-        .el-input__icon{
-            line-height: 32px;
-        }
     }
 }
\ No newline at end of file

app_Web/src/components/tab-page-exp/tab-page-exp.scss

@@ -16,7 +16,7 @@
         justify-content: center;
     }
     >.tag-tabs{
-        background-color: #F0F0F0 !important;
+        background-color: var(--app-color-gray-400) !important;
         .el-tabs{
             .el-tabs__nav{
                 padding:0px 10px;

app_Web/src/layout/grid-view-layout/grid-view-layout.scss

-.degridview {
+.grid-view-layout {
     // height: 100%;
     background-color: transparent;
     box-shadow: none;
-    .grid-header-content {
+    .view-header-content {
         display: flex;
         flex-direction: column;
         padding: 16px 4px 20px 7px;
@@ -24,7 +24,7 @@
             z-index: 0;
         }
     }
-    .grid-header-bottom {
+    .view-header-bottom {
         display: flex;
         justify-content: flex-end;
         height: 74px;
@@ -43,7 +43,7 @@
             z-index: 0;
         }
     }
-    .grid-content {
+    .view-content {
 
     }
 }
\ No newline at end of file

app_Web/src/layout/grid-view-layout/grid-view-layout.vue

 <template>
-    <layout class="view-container degridview">
-        <header class="grid-header">
-            <div class="grid-header-top">
+    <layout class="grid-view-layout view-layout">
+        <header class="view-header">
+            <div class="view-header__top">
                 <slot name="headerTop" />
             </div>
-            <div class="grid-header-content">
+            <div class="view-header__content">
                 <slot name="headerContent" />
             </div>
-            <div class="grid-header-bottom">
+            <div class="view-header__bottom">
                 <slot name="headerBottom" />
             </div>   
         </header>
-        <content class="grid-content content-container">
+        <content class="view-content content-container">
             <slot />
         </content>
-        <footer  class="grid-footer">
+        <footer  class="view-footer">
             <slot name="footer" />
         </footer>
     </layout>

app_Web/src/layout/index-view-layout-left/index-view-layout-left.scss

@@ -58,13 +58,13 @@
 
         >.view-container {
             overflow: auto;
-            background-color: var(--app-color-gray-400);
+            margin: 0 12px;
         }
 
         &.index-view-layout-content--tab {
 
             >.view-container {
-                height: calc(100% - 55px);
+                height: calc(100% - 65px);
             }
         }
     }

app_Web/src/styles/element/autocomplete.scss

+.el-autocomplete{
+    .el-input{
+        font-size: 14px;
+        input{
+            border-radius: 0;
+        }
+        input:hover{
+            border-color: var(--app-color-blue);            
+        }        
+    }
+}
\ No newline at end of file

app_Web/src/styles/element/index.scss

 @import './radio-group.scss';
 @import './menu.scss';
+@import './autocomplete.scss';
+@import './input.scss';
\ No newline at end of file

app_Web/src/styles/element/input.scss

+.el-input{
+    input{
+        border-radius: 0;
+    }
+    .el-input__inner{
+        height: 34px;
+        line-height: 34px;
+    }
+}
\ No newline at end of file

app_Web/src/styles/element/menu.scss

@@ -44,5 +44,20 @@
 .el-menu--vertical {
     .el-menu-item, .el-submenu__title {
         height: 57px;
+        color: var(--app-color-gray-100) !important;
+        &:hover, &.is-active {
+            color: var(--app-color-blue) !important;
+        }
+        &.is-active {
+            border-left: 4px solid var(--app-color-blue);
+            background-color: var(--app-color-white) !important;
+        }
+    }
+    .el-submenu {
+        &.is-active {
+            >.el-submenu__title {
+                color: var(--app-color-blue) !important;
+            }
+        }
     }
 }
\ No newline at end of file

app_Web/src/styles/iview/checkbox-group.scss

+.ivu-checkbox-group{
+    .ivu-checkbox-group-item{
+        margin-right: 24px;
+        .ivu-checkbox{
+            width: 16px;
+            height: 16px;
+            margin-right: 6px;
+            &.ivu-checkbox-checked{
+                border-color: var(--app-color-blue);
+                background-color: var(--app-color-blue);
+            }
+        }
+        .ivu-checkbox:hover .ivu-checkbox-inner{
+            border-color: var(--app-color-blue);            
+        }
+    }
+}
\ No newline at end of file

app_Web/src/styles/iview/checkbox.scss

+.ivu-checkbox-wrapper{
+    .ivu-checkbox{    
+        .ivu-checkbox-inner{
+            border-radius: 0;
+        } 
+        &.ivu-checkbox-checked {
+            .ivu-checkbox-inner{
+                border-color: var(--app-color-blue);
+                background-color: var(--app-color-blue);
+            }
+        }
+    }
+    .ivu-checkbox:hover .ivu-checkbox-inner{
+        border-color: var(--app-color-blue);            
+    }    
+}
\ No newline at end of file

app_Web/src/styles/iview/index.scss

 @import './radio-group.scss';
+@import './checkbox.scss';
+@import './checkbox-group.scss';
+@import './select.scss';
+@import './input.scss';
\ No newline at end of file

app_Web/src/styles/iview/input.scss

+.ivu-input{
+    height: 34px;
+    line-height: 34px;
+    border-radius: 0;
+}
\ No newline at end of file

app_Web/src/styles/iview/radio-group.scss

 .ivu-radio-group{
     .ivu-radio-group-item{
+        margin-right: 24px;
         .ivu-radio{
             margin-right: 6px;
+            width: 16px;
+            height: 16px;            
             &.ivu-radio-checked{
                 .ivu-radio-inner{
                     border-color: var(--app-color-blue);
                     &.ivu-radio-inner:after{
-                        background-color: #188CE5;
+                        background-color: var(--app-color-blue);
                     }
                 }
             }

app_Web/src/styles/iview/select.scss

+.ivu-select{
+    .ivu-select-selection{
+        height: 34px;
+        border-radius: 0;
+        input::-webkit-input-placeholder{
+            color:var(--app-color-gray-200);
+        }
+    }
+    .ivu-select-input[disabled]{
+        color: var(--app-color-gray-200);
+        -webkit-text-fill-color: var(--app-color-gray-200);
+    }
+}
+
+.ivu-select-dropdown{
+    padding: 10px 0 10px;
+    .ivu-select-dropdown-list{
+        .ivu-select-item{
+            &.ivu-select-item-selected{
+                color: var(--app-color-blue);
+                background-color: transparent;
+            }
+        }
+    }
+}
\ No newline at end of file

app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue

 <template>
-    <i-form :model="this.data" class='app-search-form' ref='quicksearchform' style="">
+    <i-form :model="this.data" class='app-search-form' ref='searchform' style="">
   <input style="display:none;"/>
   <row>
     <i-col span="20" class="form-content">
@@ -516,7 +516,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      * @memberof QUICKSEARCHFORMBase
      */
     public formValidateStatus(): boolean {
-        const form: any = this.$refs.quicksearchform;
+        const form: any = this.$refs.searchform;
         let validatestate: boolean = true;
         form.validate((valid: boolean) => {
             validatestate = valid ? true : false;
@@ -670,7 +670,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrListView_plugin' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -706,7 +706,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsrListView_plugin' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

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

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

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -23,18 +23,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "mOSFilePath" : "psdetreecols/returntime",
-    "name" : "returntime",
-    "rTMOSFilePath" : "psdetreecols/returntime",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   }, {
     "caption" : "图书名称",
     "codeName" : "ibizbookname",
@@ -47,6 +35,18 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "归还日期",
+    "codeName" : "returntime",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "returntime",
+    "mOSFilePath" : "psdetreecols/returntime",
+    "name" : "returntime",
+    "rTMOSFilePath" : "psdetreecols/returntime",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   }, {
     "caption" : "出版社",
     "codeName" : "press",

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json

@@ -20,6 +20,18 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "mOSFilePath" : "psdetreecols/ibizbookname",
+    "name" : "ibizbookname",
+    "rTMOSFilePath" : "psdetreecols/ibizbookname",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
     "caption" : "图书描述",
     "codeName" : "subtext",
     "columnType" : "DEFGRIDCOLUMN",
@@ -43,18 +55,6 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
-  }, {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "mOSFilePath" : "psdetreecols/ibizbookname",
-    "name" : "ibizbookname",
-    "rTMOSFilePath" : "psdetreecols/ibizbookname",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

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

@@ -53,18 +53,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "mOSFilePath" : "psdetreecols/returntime",
-      "name" : "returntime",
-      "rTMOSFilePath" : "psdetreecols/returntime",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     }, {
       "caption" : "图书名称",
       "codeName" : "ibizbookname",
@@ -77,6 +65,18 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "归还日期",
+      "codeName" : "returntime",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "returntime",
+      "mOSFilePath" : "psdetreecols/returntime",
+      "name" : "returntime",
+      "rTMOSFilePath" : "psdetreecols/returntime",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     }, {
       "caption" : "出版社",
       "codeName" : "press",

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

@@ -88,6 +88,18 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "mOSFilePath" : "psdetreecols/ibizbookname",
+      "name" : "ibizbookname",
+      "rTMOSFilePath" : "psdetreecols/ibizbookname",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
       "caption" : "图书描述",
       "codeName" : "subtext",
       "columnType" : "DEFGRIDCOLUMN",
@@ -111,18 +123,6 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
-    }, {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "mOSFilePath" : "psdetreecols/ibizbookname",
-      "name" : "ibizbookname",
-      "rTMOSFilePath" : "psdetreecols/ibizbookname",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSSEQUENCES/Sequence.json

+{
+  "codeName" : "Sequence",
+  "dynaModelFilePath" : "PSSYSSEQUENCES/Sequence.json",
+  "mOSFilePath" : "pssyssequences/Sequence",
+  "name" : "序列",
+  "rTMOSFilePath" : "pssyssequences/Sequence",
+  "sequenceType" : "DB"
+}
\ No newline at end of file

demo-boot/src/main/resources/static/remotemodel/PSSYSTEM.json

@@ -1471,6 +1471,10 @@
     "modelref" : true,
     "path" : "PSSYSSAMPLEVALUES/SampleValue4.json"
   } ],
+  "getAllPSSysSequences" : [ {
+    "modelref" : true,
+    "path" : "PSSYSSEQUENCES/Sequence.json"
+  } ],
   "getAllPSSysServiceAPIs" : [ {
     "modelref" : true,
     "path" : "PSSYSSERVICEAPIS/DemoAPI.json"

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

@@ -528,7 +528,7 @@
 
 
     <!--输出实体[IBIZSAMPLE0001]数据结构 -->
-    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-19-19">
+    <changeSet author="a_LAB01_df847bdfd" id="tab-ibizsample0001-20-19">
         <createTable tableName="T_IBIZSAMPLE0001">
                 <column name="FIELD01" remarks="" type="VARCHAR(100)">
                 </column>
@@ -1473,7 +1473,7 @@
         <!--输出实体[IBIZQJ]外键关系 -->
         <!--输出实体[IBIZSAMPLE]外键关系 -->
         <!--输出实体[IBIZSAMPLE0001]外键关系 -->
-    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-19-48">
+    <changeSet author="a_LAB01_df847bdfd" id="fk-ibizsample0001-20-48">
        <addForeignKeyConstraint baseColumnNames="IBIZSAMPLE0002ID" baseTableName="T_IBIZSAMPLE0001" constraintName="DER1N_IBIZSAMPLE0001_IBIZSAMPL" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="IBIZSAMPLE0002ID" referencedTableName="T_IBIZSAMPLE0002" validate="true"/>
     </changeSet>
         <!--输出实体[IBIZSAMPLE0002]外键关系 -->

demo-core/src/main/resources/liquibase/view.xml

@@ -67,7 +67,7 @@
          </createView>
      </changeSet>
         <!--输出实体[IBIZSAMPLE0001]视图结构信息 runOnChange="true"  当视图发生变更时，通过liquibase强刷prod的视图，实现视图的同步-->
-     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-19-13" runOnChange="true">
+     <changeSet author="a_LAB01_df847bdfd" id="view-ibizsample0001-20-13" runOnChange="true">
          <createView fullDefinition="false" replaceIfExists="true" viewName="V_IBIZSAMPLE0001">
                <![CDATA[ SELECT t1.[CREATEDATE], t1.[CREATEMAN], t1.[FIELD01], t1.[FIELD02], t1.[FIELD05], t1.[FIELD06], t1.[FIELD07], t1.[FIELD08], t1.[FIELD09], t1.[FIELD10], t1.[FIELD11], t1.[FIELD12], t1.[FIELD13], t1.[FIELD14], t1.[FIELD15], t1.[FIELD16], t1.[FIELD17], t1.[FIELD18], t1.[FIELD19], t1.[FIELD20], t1.[FIELD21], t1.[FIELD22], t1.[FIELD23], t1.[FIELD24], t1.[FIELD25], t1.[FIELD26], t1.[FIELD27], t1.[IBIZSAMPLE0001ID], t1.[IBIZSAMPLE0001NAME], t1.[UPDATEDATE], t1.[UPDATEMAN] FROM [T_IBIZSAMPLE0001] t1  ]]>
          </createView>