lxm1993 发布系统代码 [TrainSys，网页端]

app_Web/packages/ibiz-vue/src/components/common/app-style2-header-menus/app-style2-header-menus.tsx

+import { Vue, Component, Prop, Emit } from 'vue-property-decorator';
+import { Util } from 'ibiz-core';
+
+/**
+ * 应用头部菜单
+ *
+ * @export
+ * @class AppHeaderMenus
+ * @extends {Vue}
+ */
+@Component({})
+export class AppStyle2HeaderMenus extends Vue {
+    /**
+     * 部件名称
+     *
+     * @type {string}
+     * @memberof AppStyle2HeaderMenus
+     */
+    @Prop()
+    public ctrlName!: string;
+
+    /**
+     * 菜单
+     *
+     * @type {any[]}
+     * @memberof AppStyle2HeaderMenus
+     */
+    @Prop({ default: () => [] })
+    public menus!: any[];
+
+    /**
+     * 模型服务对象
+     * 
+     * @memberof AppStyle2DefaultLayout
+     */
+     @Prop() public modelService!:any;
+    
+    /**
+     * 菜单项点击
+     *
+     * @param {*} item
+     * @returns {*}
+     * @memberof AppStyle2HeaderMenus
+     */
+    @Emit('menu-click')
+    public menuClick(item: any): any {}
+
+    /**
+     * 组件创建完毕
+     *
+     * @memberof AppStyle2HeaderMenus
+     */
+    public mounted(): void {
+        this.$nextTick(() => {
+            if (this.$route.matched && this.$route.matched.length > 1) {
+                return;
+            }
+            const openDefault = this.findDefaultOpen(this.menus);
+            if (openDefault) {
+                this.menuClick(openDefault);
+            }
+        });
+    }
+
+    /**
+     * 查找默认打开视图
+     *
+     * @protected
+     * @param {any[]} items
+     * @returns {*}
+     * @memberof AppStyle2HeaderMenus
+     */
+    protected findDefaultOpen(items: any[]): any {
+        if (items) {
+            return items.find((item: any) => {
+                let data: any;
+                if (item && item.getPSAppMenuItems && Util.typeOf(item.getPSAppMenuItems) === 'array') {
+                    data = this.findDefaultOpen(item.getPSAppMenuItems);
+                } else {
+                    if (item.opendefault === true) {
+                        data = item;
+                    }
+                }
+                return data;
+            });
+        }
+    }
+
+    /**
+     * 菜单项选中
+     *
+     * @protected
+     * @param {string} name
+     * @memberof AppStyle2HeaderMenus
+     */
+    protected onSelect(name: string): void {
+        const item: any = this.findMenuByName(name);
+        if (item) {
+            this.menuClick(item);
+        }
+    }
+
+    /**
+     * 根据名称查找菜单项
+     *
+     * @protected
+     * @param {string} name
+     * @param {any[]} [menus=this.menus]
+     * @returns {*}
+     * @memberof AppStyle2HeaderMenus
+     */
+    protected findMenuByName(name: string, menus: any[] = this.menus): any {
+        let item: any;
+        menus.find((menu: any) => {
+            if (Object.is(menu.name, name)) {
+                item = menu;
+                return menu;
+            }
+            if (menu.getPSAppMenuItems) {
+                const subItem: any = this.findMenuByName(name, menu.getPSAppMenuItems);
+                if (subItem) {
+                    item = subItem;
+                    return subItem;
+                }
+            }
+        });
+        return item;
+    }
+
+    /**
+     * 绘制菜单
+     *
+     * @protected
+     * @param {*} items
+     * @returns {*}
+     * @memberof AppStyle2HeaderMenus
+     */
+    protected renderMenus(items: any[]): any {
+        return items.map((item: any) => {
+            if (item.getPSAppMenuItems) {
+                return this.renderSubMenu(item);
+            }
+            return this.renderMenuItem(item);
+        });
+    }
+
+    /**
+     * 绘制菜单项
+     *
+     * @protected
+     * @param {*} item
+     * @returns {*}
+     * @memberof AppStyle2HeaderMenus
+     */
+    protected renderMenuItem(item: any): any {
+        if (item.hidden) {
+            return;
+        }
+        return (
+            <el-menu-item title={this.$tl(item.tooltipTag, item.tooltip)} index={item.name}>
+                <menu-icon item={item} />
+                {this.$tl(item.captionTag,item.caption)}
+            </el-menu-item>
+        );
+    }
+
+    /**
+     * 绘制菜单分组
+     *
+     * @protected
+     * @param {*} item
+     * @returns {*}
+     * @memberof AppStyle2HeaderMenus
+     */
+    protected renderSubMenu(item: any): any {
+        if (item.hidden) {
+            return;
+        }
+        return (
+            <el-submenu index={item.name}>
+                <template slot="title">
+                    <menu-icon item={item} />
+                    {this.$tl(item.captionTag,item.caption)}
+                </template>
+                {this.renderMenus(item.getPSAppMenuItems)}
+            </el-submenu>
+        );
+    }
+
+    /**
+     * 绘制内容
+     *
+     * @returns {*}
+     * @memberof AppStyle2HeaderMenus
+     */
+    public render(): any {
+        return (
+            <div class="app-style2-header-menus">
+                <el-menu mode="horizontal" on-select={(menuName: any) => this.onSelect(menuName)}>
+                    {this.renderMenus(this.menus)}
+                </el-menu>
+            </div>
+        );
+    }
+}

app_Web/packages/ibiz-vue/src/components/common/app-style2-layout/app-style2-content/app-style2-content.tsx

@@ -87,30 +87,27 @@ export class AppStyle2Content extends Vue {
      * @returns {*}
      * @memberof AppStyle2Content
      */
-    protected renderContent(isSlot: boolean): any {
-        return (
-            <div
-                slot={isSlot ? 'right' : null}
-                class={{
-                    'app-style2-content__right': true,
-                    'is-hidden': !this.$uiState.layoutState.contentBottomShow || !this.$slots.bottom,
-                }}
-            >
-                <split mode="vertical" v-model={this.$uiState.layoutState.contentVerticalSplit} max={0.1}>
-                    <div slot="top" class="app-style2-content__right__top">
-                        {this.$slots.default}
-                    </div>
-                    {this.$slots.bottom ? (
-                        <div slot="bottom" class="app-style2-content__right__bottom">
+    protected renderContent(isSlot: boolean, className: string): any {
+        const showBottom = this.$uiState.layoutState.contentBottomShow && this.$slots.content_bottom;
+        if (showBottom && this.$slots.bottom) {
+            return (
+                <div slot={isSlot ? 'right' : null} class={className}>
+                    <split mode="vertical" v-model={this.$uiState.layoutState.contentVerticalSplit} max={0.1}>
+                        <div slot="top">
+                            {this.$slots.default}
+                        </div>
+                        {<div slot="bottom" class="app-style2-content__bottom">
                             <div class="bottom__icon" on-click={() => this.changeBottom(false)}>
                                 <icon type="ios-arrow-down" />
                             </div>
                             {this.$slots.bottom}
-                        </div>
-                    ) : null}
-                </split>
-            </div>
-        );
+                        </div>}
+                    </split>
+                </div>
+            );
+        } else {
+           return this.$slots.default;
+        }
     }
 
     /**
@@ -120,24 +117,26 @@ export class AppStyle2Content extends Vue {
      * @memberof AppStyle2Content
      */
     public render() {
+        let content = null;
+        const showLeftExp = this.$uiState.layoutState.leftExpContentShow;
         if (this.$uiState.layoutState.styleMode === 'STYLE2') {
-            return [<div class="app-style2-content__left">{this.$slots.left}</div>, this.renderContent(false)];
+            content = [<div class="app-style2-content__left">{this.$slots.left}</div>, this.renderContent(false, 'app-style2-content__right')];
         } else {
-            return this.$slots.left ? (
+            content = this.$slots.left && showLeftExp ? (
                 <split
-                    class={{ 'app-style2-content__split': true, 'is-hidden': !this.$uiState.layoutState.leftExpContentShow }}
                     v-model={this.$uiState.layoutState.contentHorizontalSplit}
                     min={0.1}
                     max={0.5}
                 >
-                    <div slot="left">
+                    <div class="app-style2-content__left" slot="left">
                         {this.$slots.left}
                     </div>
-                    {this.renderContent(true)}
+                    {this.renderContent(true, 'app-style2-content__right')}
                 </split>
             ) : (
-                this.renderContent(false)
+                this.renderContent(false,'')
             );
         }
+        return <div class="app-style2-content">{content}</div>
     }
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/components/common/app-style2-layout/app-style2-layout/app-style2-layout.tsx

@@ -20,9 +20,9 @@ export class AppStyle2Layout extends Vue {
     public render(): VNode {
         return (
             <div class='app-style2-layout'>
-                <div class="app-style2-header">{this.$slots.header}</div>
-                <div class="app-style2-content">{this.$slots.default}</div>
-                <div class="app-style2-footer">{this.$slots.footer}</div>
+                {this.$slots.header}
+                {this.$slots.default}
+                {this.$slots.footer}
             </div>
         );
     }

app_Web/packages/ibiz-vue/src/components/common/tab-page-exp-style2/tab-page-exp-style2.vue

 <template>
-  <div class="ibiz-page-tag" v-if="navHistory.historyList.length > 0">
-    <div class="move-btn ibiz-page-tag__left" @click="leftMove">
+  <div class="app-page-tag-style2" v-if="navHistory.historyList.length > 0">
+    <div class="app-page-tag-style2__left__icon" @click="leftMove">
       <icon type="ios-arrow-back" />
     </div>
-    <div ref="scrollBody" class="ibiz-page-tag__body">
+    <div ref="scrollBody" class="app-page-tag-style2__left">
       <div
         ref="scrollChild"
-        class="tags-container"
+        class="app-page-tag-style2__tags"
         :style="{ left: styleLeft + 'px' }"
       >
-        <transition-group name="tags-transition" class="ibiz-page-tag__body__tags">
+        <transition-group name="tags-transition" class="app-page-tag-style2__tag">
           <template v-for="(item, index) of navHistory.historyList">
             <Tag
               ref="tagElement"
               :key="item.tag + index"
-              :class="isActive(item) ? 'tag-is-active' : ''"
+              :class="{'is-active': isActive(item) }"
               :name="index"
               closable
               @click.native="changePage(item)"
               @on-close="onClose(item)"
             >
-              <div class="body__tags__tag-text">
-                <div
-                  :title="translate(item)"
-                  class="tag-caption-content"
-                >
-                  <i
-                    v-if="item.meta.iconCls && !Object.is(item.meta.iconCls, '')"
-                    :class="{[item.meta.iconCls]:true,'tag-caption-content__text-icon':true}"
-                  ></i>
-                  <img v-else :src="item.meta.imgPath" class="tag-caption-content__text-image" />
-                  &nbsp;{{ translate(item) }}
-                </div>
+              <div
+                :title="translate(item)"
+                class="tag__content"
+              >
+                <i
+                  v-if="item.meta.iconCls && !Object.is(item.meta.iconCls, '')"
+                  :class="{[item.meta.iconCls]:true,'tag__icon':true}"
+                ></i>
+                <img v-else :src="item.meta.imgPath" class="tag__image" />
+                &nbsp;{{ translate(item) }}
               </div>
             </Tag>
           </template>
         </transition-group>
       </div>
     </div>
-    <div class="move-btn ibiz-page-tag__right" @click="rightMove">
+    <div class="app-page-tag-style2__right__icon" @click="rightMove">
       <icon type="ios-arrow-forward" />
     </div>
     <Dropdown
       @on-click="doTagAction"
       placement="bottom-end"
-      transfer-class-name="app-page-more"
+      class="app-page-tag-style2__right"
+      transfer-class-name="app-page-style2-more"
     >
-      <div class="move-btn">
-        <icon type="ios-more" />
-      </div>
+      <icon type="ios-more" />
       <DropdownMenu slot="list">
         <template v-for="(action, index) of actions">
           <DropdownItem :key="index" :name="action.value">{{

app_Web/packages/ibiz-vue/src/components/components-register.ts

@@ -99,7 +99,7 @@ import AppPortalDesign from './common/app-portal-design/app-portal-design.vue';
 import AppNotSupportedEditor from './common/app-not-supported-editor/app-not-supported-editor.vue';
 import { AppStyle2Layout } from './common/app-style2-layout/app-style2-layout/app-style2-layout';
 import { AppStyle2Header } from './common/app-style2-layout/app-style2-header/app-style2-header';
-import { AppHeaderRightMenus } from './common/app-header-right-menus/app-header-right-menus';
+import { AppStyle2HeaderMenus } from './common/app-style2-header-menus/app-style2-header-menus';
 import { AppStyle2Content } from './common/app-style2-layout/app-style2-content/app-style2-content';
 import { AppContentLeftExp } from './common/app-style2-layout/app-content-left-exp/app-content-left-exp';
 import { AppContentLeftNavMenu } from './common/app-style2-layout/app-content-left-nav-menu/app-content-left-nav-menu';
@@ -297,7 +297,7 @@ export const ComponentsRegister = {
         v.component('tab-page-exp-style2', TabPageExpStyle2);
         v.component('app-style2-layout', AppStyle2Layout);
         v.component('app-style2-header', AppStyle2Header);
-        v.component('app-header-right-menus', AppHeaderRightMenus);
+        v.component('app-style2-header-menus', AppStyle2HeaderMenus);
         v.component('app-style2-content', AppStyle2Content);
         v.component('app-content-left-exp', AppContentLeftExp);
         v.component('app-content-left-nav-menu', AppContentLeftNavMenu);

app_Web/packages/ibiz-vue/src/components/layout/app-style2-layout/app-style2-indexview-layout/app-style2-indexview-layout.tsx

@@ -119,6 +119,38 @@ export class AppStyle2IndexViewLayout extends AppStyle2DefaultLayout {
         }, 300);
     }
 
+    /**
+     * 初始化类名
+     * 
+     * @memberof AppStyle2IndexViewLayout
+     */
+    public initRenderOptions(opts: any = {}) {
+        this.renderOptions = {};
+        const { viewType, viewStyle, codeName } = this.viewInstance;
+        const viewClassNames: any = {
+            'app-style2-container': true
+        };
+        if (viewType) {
+            Object.assign(viewClassNames, { [viewType?.toLowerCase()]: true });
+        }
+        if (viewStyle) {
+            Object.assign(viewClassNames, { [`app-style-${viewStyle.toLowerCase()}`]: true });
+        } else {
+            Object.assign(viewClassNames, { [`app-style-default`]: true });
+        }
+        if (codeName) {
+            Object.assign(viewClassNames, { [Util.srfFilePath2(codeName)]: true });
+        }
+        if (this.viewInstance?.getPSSysCss?.()?.cssName) {
+            Object.assign(viewClassNames, { [this.viewInstance.getPSSysCss()?.cssName]: true });
+        }
+        if (!this.showCaption) {
+            Object.assign(viewClassNames, { 'nocaption': true });
+        }
+        Object.assign(viewClassNames, opts);
+        this.$set(this.renderOptions, 'viewClassNames', viewClassNames);
+    }
+
     /**
      * 绘制内容
      * 
@@ -153,7 +185,7 @@ export class AppStyle2IndexViewLayout extends AppStyle2DefaultLayout {
                         <app-style2-header>
                             <template slot="left">
                                 <div class="app-style2-header__left__caption">
-                                    {true ? <span class="caption__icon" on-click={() => this.contextMenuDragVisiable = !this.contextMenuDragVisiable}><icon type="md-menu" />&nbsp;</span> : null}
+                                    {this.viewInstance.enableAppSwitch ? <span class="caption__icon" on-click={() => this.contextMenuDragVisiable = !this.contextMenuDragVisiable}><icon type="md-menu" />&nbsp;</span> : null}
                                     {this.showCaption ? this.model.srfCaption : null}
                                 </div>
                             </template>
@@ -165,15 +197,14 @@ export class AppStyle2IndexViewLayout extends AppStyle2DefaultLayout {
                                 {<app-user viewStyle={this.viewInstance.viewStyle} />}
                             </template>
                         </app-style2-header>
-                        {this.$slots.default}
-                        {true ? <context-menu-drag viewStyle={this.viewInstance.viewStyle} contextMenuDragVisiable={this.contextMenuDragVisiable}></context-menu-drag> : null}
+                        {this.viewInstance.enableAppSwitch ? <context-menu-drag viewStyle={this.viewInstance.viewStyle} contextMenuDragVisiable={this.contextMenuDragVisiable}></context-menu-drag> : null}
                     </template>
                     <app-style2-content>
                         {leftContent ?
                             <template slot="left">
                                 {leftContent}
                             </template> : null}
-                        {styleMode === 'DEFAULT' ? this.$slots.tabPageExp : null}
+                        {styleMode === 'DEFAULT' ? <div class="app-style2-content__top">{this.$slots.tabPageExp}</div> : null}
                         <div class="app-style2-content__body" on-click={() => this.contextMenuDragVisiable = false}>
                             <app-keep-alive routerList={this.routerList}>
                                 <router-view key={this.routerViewKey}></router-view>

app_Web/packages/ibiz-vue/src/components/view/app-style2-view/app-style2-indexview.tsx

@@ -310,7 +310,7 @@ export class AppStyle2IndexView extends AppIndexViewBase {
      */
     public renderHeaderMenus(){
         return (
-            <app-header-right-menus
+            <app-style2-header-menus
                 slot="headerMenus"
                 ref="headerMenus"
                 ctrlName={this.menuInstance?.codeName?.toLowerCase()}

app_Web/packages/ibiz-vue/src/styles/components/common/app-style2-header-menus.less

+// 顶部菜单样式
+.app-style2-header-menus {
+    padding: 0 20px;
+    .el-menu--horizontal {
+        overflow-y: auto;
+        overflow-x: hidden;
+        display: flex;
+        height: 50px;
+        flex-wrap: nowrap;
+        border: 0;
+        .el-menu-item,
+        .el-submenu__title {
+            height: 50px;
+            line-height: 50px;
+            overflow: visible;
+        }
+    }
+}
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/common/index.less

@@ -75,7 +75,7 @@
 @import "./app-form-part.less";
 @import "./app-format-data.less";
 @import "./app-full-scren.less";
-@import "./app-header-right-menus.less";
+@import "./app-style2-header-menus.less";
 @import "./app-lang.less";
 @import "./app-lock-scsren.less";
 @import "./app-map-position.less";
@@ -102,8 +102,6 @@
 @import "./app-content-bottom-exp-view-layout.less";
 @import "./app-content-left-exp.less";
 @import "./app-content-left-nav-menu.less";
-@import "./app-footer.less";
-@import "./app-layout.less";
 @import "./menu-icon.less";
 @import "./property-layout.less";
 @import "./studio-view.less";
@@ -118,5 +116,4 @@
 @import "./context-menu.less";
 @import "./context-menu-drag.less";
 @import "./app-studioaction.less";
-@import "./disk-image-upload.less";
-@import "./app-header.less";
+@import "./disk-image-upload.less";
\ No newline at end of file
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/common/tab-page-exp-style2.less

-// .view-style2 {
-//     .ibiz-page-tag {
-//         position: relative;
-//         box-sizing: border-box;
-//         height: 34px;
-//         padding: 0 60px 0 30px;
-//         margin: 0;
-//     }
-
-//     .ibiz-page-tag__body {
-//         position: relative;
-//         width: 100%;
-//         height: 100%;
-//         overflow: hidden;
-
-//         .ivu-tag:hover,
-//         .ivu-tag.tag-is-active {
-//             .ivu-icon-ios-close {
-//                 visibility: initial;
-//             }
-//         }
-
-//         span {
-//             .ivu-tag:last-child {
-//                 border-right: none;
-//             }
-//         }
-//     }
-
-//     .move-btn {
-//         font-size: 18px;
-//         width: 30px;
-//         height: 34px;
-//         line-height: 34px;
-//         text-align: center;
-//         cursor: pointer;
-//         border-right: none;
-//     }
-
-//     .move-btn:hover {
-//         background: #efefef;
-//     }
-
-//     .ibiz-page-tag__left,
-//     .ibiz-page-tag__right,
-//     .ivu-dropdown {
-//         position: absolute;
-//         top: 0;
-//     }
-
-//     .ibiz-page-tag__left {
-//         left: 0;
-//     }
-
-//     .ibiz-page-tag__right {
-//         right: 30px;
-//     }
-
-//     .ivu-dropdown {
-//         right: 0;
-//     }
-
-//     .ibiz-page-tag__body__tags {
-//         position: absolute;
-//         overflow: visible;
-//         white-space: nowrap;
-//         transition: left 0.3s ease;
-
-//         .ivu-tag {
-//             margin: 0;
-//             height: 34px;
-//             line-height: 34px;
-//             border: 0;
-//             border-radius: 0;
-//             font-size: 14px;
-//         }
-//         .ivu-icon-ios-close {
-//             visibility: hidden;
-//         }
-
-//         .tag-caption-content__text-icon::before {
-//                 vertical-align: initial;
-//             }
-
-//         .tags-transition-move {
-//             transition: transform 0.3s;
-//         }
-
-//         .tags-transition-enter,
-//         .tags-transition-leave-to {
-//             opacity: 0;
-//         }
-
-//         .tag-caption-content__text-image {
-//             height: 16px;
-//             margin-bottom: -3px;
-//         }
-//     }
-
-//     .body__tags__tag-text {
-//         cursor: pointer;
-//         display: table-cell;
-
-//         .ivu-tooltip {
-//             display: block;
-//         }
-
-//         .ivu-tooltip-rel {
-//             display: block;
-//             max-width: 200px;
-//             overflow: hidden;
-//             text-overflow: ellipsis;
-//         }
-
-//         .tag-caption-content {
-//             max-width: 250px;
-//             text-overflow: ellipsis;
-//             white-space: nowrap;
-//             overflow: hidden;
-//         }
-//     }
-// }
-
-// .app-theme-default {
-//     .view-style2 .ibiz-page-tag {
-//         background-color: #57A3FD;
-//     }
-// }
+.app-page-tag-style2 {
+    position: relative;
+    height: 40px;
+    padding: 0 60px 0 30px;
+    margin: 8px 0;
+}
+
+.app-page-tag-style2__tag {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+
+    .ivu-tag:hover,
+    .ivu-tag.is-active {
+        .ivu-icon-ios-close {
+            visibility: initial;
+        }
+    }
+
+    span {
+        .ivu-tag:last-child {
+            border-right: none;
+        }
+    }
+}
+
+.app-page-tag-style2__tag {
+    height: 100%;
+}
+
+.app-page-tag-style2__left__icon,
+.app-page-tag-style2__right__icon {
+    position: absolute;
+    top: 0;
+}
+
+.app-page-tag-style2__left__icon {
+    font-size: 18px;
+    width: 30px;
+    height: 34px;
+    line-height: 34px;
+    text-align: center;
+    cursor: pointer;
+    border-right: none;
+    left: 0;
+
+    &:hover {
+        background: #efefef;
+    }
+}
+
+.app-page-tag-style2__right__icon {
+    font-size: 18px;
+    width: 30px;
+    height: 34px;
+    line-height: 34px;
+    text-align: center;
+    cursor: pointer;
+    border-right: none;
+    right: 30px;
+
+    &:hover {
+        background: #efefef;
+    }
+}
+
+.app-page-tag-style2__tag {
+    position: absolute;
+    overflow: visible;
+    white-space: nowrap;
+    transition: left 0.3s ease;
+
+    .ivu-tag {
+        margin: 0;
+        height: 34px;
+        line-height: 34px;
+        border-radius: 0;
+        font-size: 14px;
+    }
+
+    .tag__content {
+        display: inline-block;
+    }
+
+    .ivu-icon-ios-close {
+        visibility: hidden;
+    }
+
+    .tag__icon::before {
+        vertical-align: initial;
+    }
+
+    .tags-transition-move {
+        transition: transform 0.3s;
+    }
+
+    .tags-transition-enter,
+    .tags-transition-leave-to {
+        opacity: 0;
+    }
+
+    .tag__image {
+        height: 16px;
+        margin-bottom: -3px;
+    }
+}
+
+.tag-caption-content {
+    max-width: 250px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    cursor: pointer;
+    display: table-cell;
+}
+
+.app-page-tag-style2__right {
+    position: absolute;
+    right: 0;
+    .ivu-dropdown-rel {
+        >.ivu-icon {
+            font-size: 18px;
+            width: 30px;
+            height: 34px;
+            line-height: 34px;
+            text-align: center;
+            cursor: pointer;
\ No newline at end of file
+            border-right: none;
+
+            &:hover {
+                background: #efefef;
+            }
+        }
+    }
+}
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/components/layout/app-default-indexview-layout.less

@@ -63,28 +63,3 @@
         }
     }
 }
-
-// .view-style2.appindexview{
-//     .app-header{
-//         .app-header-left,.app-header-center,.app-header-right{
-//             flex-grow: 1;
-//             display: flex;
-//         }
-//         .app-header-right{
-//             justify-content: end;
-//         }
-//         .ivu-dropdown{
-//             position: static;
-//             display: inline-block;
-//             font-size: 15px;
-//             padding: 0px 10px
-//         }
-//     }
-//     .app-lang{
-//         font-size: 15px;
-//         padding: 0 10px;
-//     }
-//     .ivu-split-pane{
-//         height: 100%;
-//     }
-// }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/objects/app-container.less

@@ -67,4 +67,45 @@
     .app-content__right {
         height: 100%;
     }
+}
+
+// style2视图样式
+.app-style2-container {
+    width: 100%;
+    height: 100%;
+    padding: 0px;
+    margin: 0;
+    .flex(column, normal, normal);
+    .app-style2-header {
+        height: 50px;
+        padding: 0 20px;
+        .flex(row, space-between, center);
+    }
+    .app-style2-header__left__caption {
+        display: block;
+        padding-left: 12px;
+        text-align: left;
+        font-weight: 600;
+        font-size: 16px;
+        .textellipsis;
+    }
+    .app-style2-header__right {
+        height: 100%;
+        .flex(row, space-between, center);
+    }
+    .app-style2-footer {
+        height: 50px;
+    }
+    .app-style2-content {
+        height: 0;
+        flex: auto;
+        .flex(column, normal, normal);
+    }
+    .app-style2-content__top {
+        height: 56px;
+    }
+    .app-style2-content__body {
+        height: 0;
+        flex: auto;
+    }
 }
\ No newline at end of file

app_Web/packages/ibiz-vue/src/styles/objects/view-container.less

@@ -89,4 +89,4 @@
 //  视图底部 按钮组
 .view-footer__buttons {
     text-align: right;
-}
+}
\ No newline at end of file

app_Web/public/assets/theme/default.less

@@ -414,6 +414,19 @@ body {
     }
 }
 
+// style2
+.app-style2-header {
+    background-color: @header-background-color;
+    color: @header-text-color;
+
+    i:hover {
+        color: @app-text-color-step--50;
+    }
+}
+.app-style2-content__top {
+    background-color: @app-background-color-step-50;
+}
+
 //  ----------------------------------------视图----------------------------------------
 
 .view-container {
@@ -2068,27 +2081,6 @@ body {
     }
 }
 
-.app-footer{
-    color: @app-text-color;
-    fill:  @app-text-color;
-    background: @app-background-color;
-    > .app-footer-left,
-    > .app-footer-center,
-    > .app-footer-right {
-        >.item{
-            color: @app-text-color;
-            fill:  @app-text-color;
-        }
-    }
-}
-.app-layout{
-    > .app-layout-header-warp {
-        border-bottom: 1px solid @app-divider-color;
-    }
-    > .app-layout-footer-warp {
-        border-top: 1px solid @app-divider-color;
-    }
-}
 
 .left-and-right{
     > div:nth-child(1) {
@@ -2196,8 +2188,40 @@ body {
     }
 }
 
-// .view-style2{
-//     .app-footer{
-//         background-color: @color-primary-base;
-//     }
-// }
+.view-style2{
+    .app-style2-footer{
+        background-color: @color-primary-base;
+    }
+}
\ No newline at end of file
+// style2顶部菜单
+.app-style2-header-menus {
+    background-color: @menu-item-background-color--active;
+
+    .el-menu--horizontal {
+        background-color: @menu-item-background-color--active;
+
+        .el-menu-item,
+        .el-submenu__title {
+            color: @menu-item-text-color--active;
+
+            .el-icon-arrow-down {
+                color: @menu-item-text-color--active;
+            }
+
+            &:not(.is-disabled):hover,
+            &:not(.is-disabled):focus,
+            &.is-active {
+                color: @menu-item-text-color--active;
+                background-color: @menu-item-background-color--active;
+                border-bottom: 2px solid @menu-background-color;
+            }
+        }
+
+        .el-submenu {
+            &.is-active .el-submenu__title {
+                color:  @menu-item-text-color--active;
+                border-bottom: 2px solid @menu-background-color;
+            }
+        }
+    }
+}
\ No newline at end of file

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

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-229-3">
+    <changeSet author="root" id="tab-book-231-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>
@@ -231,7 +231,7 @@
     </changeSet>
 
     <!--输出实体[REGINFOF]数据结构 -->
-    <changeSet author="root" id="tab-reginfof-41-9">
+    <changeSet author="root" id="tab-reginfof-43-9">
         <createTable tableName="T_REGINFOF">
                 <column name="REGINFOFID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_REGINFOF"/>
@@ -264,7 +264,7 @@
     </changeSet>
 
     <!--输出实体[STUDENT]数据结构 -->
-    <changeSet author="root" id="tab-student-48-10">
+    <changeSet author="root" id="tab-student-49-10">
         <createTable tableName="T_STUDENT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Book/PSFORMS/Main.json

@@ -255,8 +255,9 @@
           "name" : "bookname"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX",
+          "width" : 500
         },
         "allowEmpty" : true,
         "showCaption" : true
@@ -311,8 +312,9 @@
           "name" : "type"
         },
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX",
+          "width" : 200
         },
         "allowEmpty" : false,
         "showCaption" : true
@@ -330,13 +332,10 @@
           "getPSDEFormDetails" : [ {
             "caption" : "属性",
             "codeName" : "field",
-            "contentHeight" : 300.0,
-            "contentWidth" : 200.0,
             "dataType" : 25,
             "detailStyle" : "DEFAULT",
             "detailType" : "FORMITEM",
             "enableCond" : 3,
-            "height" : 300.0,
             "ignoreInput" : 0,
             "itemHeight" : 299.0,
             "itemWidth" : 329.0,
@@ -377,7 +376,6 @@
               "layout" : "TABLE_24COL",
               "width" : 200
             },
-            "width" : 200.0,
             "allowEmpty" : true,
             "showCaption" : true
           }, {
@@ -515,13 +513,12 @@
           "showCaption" : true
         } ],
         "getPSLayoutPos" : {
-          "colMD" : 24,
-          "layout" : "TABLE_24COL"
+          "grow" : -1,
+          "layout" : "FLEX"
         }
       } ],
       "getPSLayout" : {
-        "columnCount" : 24,
-        "layout" : "TABLE_24COL"
+        "layout" : "FLEX"
       },
       "getPSLayoutPos" : {
         "colMD" : 24,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof/PSSEARCHFORMS/Default.json

@@ -18,12 +18,47 @@
       "id" : "engine"
     }
   } ],
+  "getPSDEFormItems" : [ {
+    "id" : "n_reginfofname_like",
+    "dataType" : 25,
+    "getPSAppDEField" : {
+      "name" : "REGINFOFNAME",
+      "codeName" : "ReginfofName"
+    }
+  } ],
   "getPSDEFormPages" : [ {
     "caption" : "常规条件",
     "codeName" : "formpage1",
     "detailStyle" : "DEFAULT",
     "detailType" : "FORMPAGE",
     "name" : "formpage1",
+    "getPSDEFormDetails" : [ {
+      "caption" : "学员登记信息测试fzh名称(文本包含(%))",
+      "codeName" : "n_reginfofname_like",
+      "dataType" : 25,
+      "detailStyle" : "DEFAULT",
+      "detailType" : "FORMITEM",
+      "enableCond" : 3,
+      "ignoreInput" : 0,
+      "labelPos" : "LEFT",
+      "labelWidth" : 130,
+      "name" : "n_reginfofname_like",
+      "noPrivDisplayMode" : 1,
+      "getPSAppDEField" : {
+        "name" : "REGINFOFNAME",
+        "codeName" : "ReginfofName"
+      },
+      "getPSEditor" : {
+        "editorType" : "TEXTBOX",
+        "name" : "n_reginfofname_like"
+      },
+      "getPSLayoutPos" : {
+        "colMD" : 24,
+        "layout" : "TABLE_24COL"
+      },
+      "allowEmpty" : true,
+      "showCaption" : true
+    } ],
     "getPSLayout" : {
       "columnCount" : 24,
       "layout" : "TABLE_24COL"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofStuInfoList.json

@@ -849,12 +849,47 @@
       "showBusyIndicator" : true,
       "id" : "SEARCHFORM"
     },
+    "getPSDEFormItems" : [ {
+      "id" : "n_reginfofname_like",
+      "dataType" : 25,
+      "getPSAppDEField" : {
+        "name" : "REGINFOFNAME",
+        "codeName" : "ReginfofName"
+      }
+    } ],
     "getPSDEFormPages" : [ {
       "caption" : "常规条件",
       "codeName" : "formpage1",
       "detailStyle" : "DEFAULT",
       "detailType" : "FORMPAGE",
       "name" : "formpage1",
+      "getPSDEFormDetails" : [ {
+        "caption" : "学员登记信息测试fzh名称(文本包含(%))",
+        "codeName" : "n_reginfofname_like",
+        "dataType" : 25,
+        "detailStyle" : "DEFAULT",
+        "detailType" : "FORMITEM",
+        "enableCond" : 3,
+        "ignoreInput" : 0,
+        "labelPos" : "LEFT",
+        "labelWidth" : 130,
+        "name" : "n_reginfofname_like",
+        "noPrivDisplayMode" : 1,
+        "getPSAppDEField" : {
+          "name" : "REGINFOFNAME",
+          "codeName" : "ReginfofName"
+        },
+        "getPSEditor" : {
+          "editorType" : "TEXTBOX",
+          "name" : "n_reginfofname_like"
+        },
+        "getPSLayoutPos" : {
+          "colMD" : 24,
+          "layout" : "TABLE_24COL"
+        },
+        "allowEmpty" : true,
+        "showCaption" : true
+      } ],
       "getPSLayout" : {
         "columnCount" : 24,
         "layout" : "TABLE_24COL"

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView.json

@@ -1241,8 +1241,9 @@
             "name" : "bookname"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX",
+            "width" : 500
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -1297,8 +1298,9 @@
             "name" : "type"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX",
+            "width" : 200
           },
           "allowEmpty" : false,
           "showCaption" : true
@@ -1316,13 +1318,10 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "contentHeight" : 300.0,
-              "contentWidth" : 200.0,
               "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
-              "height" : 300.0,
               "ignoreInput" : 0,
               "itemHeight" : 299.0,
               "itemWidth" : 329.0,
@@ -1363,7 +1362,6 @@
                 "layout" : "TABLE_24COL",
                 "width" : 200
               },
-              "width" : 200.0,
               "allowEmpty" : true,
               "showCaption" : true
             }, {
@@ -1501,13 +1499,12 @@
             "showCaption" : true
           } ],
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           }
         } ],
         "getPSLayout" : {
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
+          "layout" : "FLEX"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookEditView3.json

@@ -411,8 +411,9 @@
             "name" : "bookname"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX",
+            "width" : 500
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -467,8 +468,9 @@
             "name" : "type"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX",
+            "width" : 200
           },
           "allowEmpty" : false,
           "showCaption" : true
@@ -486,13 +488,10 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "contentHeight" : 300.0,
-              "contentWidth" : 200.0,
               "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
-              "height" : 300.0,
               "ignoreInput" : 0,
               "itemHeight" : 299.0,
               "itemWidth" : 329.0,
@@ -533,7 +532,6 @@
                 "layout" : "TABLE_24COL",
                 "width" : 200
               },
-              "width" : 200.0,
               "allowEmpty" : true,
               "showCaption" : true
             }, {
@@ -671,13 +669,12 @@
             "showCaption" : true
           } ],
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           }
         } ],
         "getPSLayout" : {
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
+          "layout" : "FLEX"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookOptionView.json

@@ -363,8 +363,9 @@
             "name" : "bookname"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX",
+            "width" : 500
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -419,8 +420,9 @@
             "name" : "type"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX",
+            "width" : 200
           },
           "allowEmpty" : false,
           "showCaption" : true
@@ -438,13 +440,10 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "contentHeight" : 300.0,
-              "contentWidth" : 200.0,
               "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
-              "height" : 300.0,
               "ignoreInput" : 0,
               "itemHeight" : 299.0,
               "itemWidth" : 329.0,
@@ -485,7 +484,6 @@
                 "layout" : "TABLE_24COL",
                 "width" : 200
               },
-              "width" : 200.0,
               "allowEmpty" : true,
               "showCaption" : true
             }, {
@@ -623,13 +621,12 @@
             "showCaption" : true
           } ],
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           }
         } ],
         "getPSLayout" : {
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
+          "layout" : "FLEX"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/bookUsr2EditView2.json

@@ -380,8 +380,9 @@
             "name" : "bookname"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX",
+            "width" : 500
           },
           "allowEmpty" : true,
           "showCaption" : true
@@ -436,8 +437,9 @@
             "name" : "type"
           },
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX",
+            "width" : 200
           },
           "allowEmpty" : false,
           "showCaption" : true
@@ -455,13 +457,10 @@
             "getPSDEFormDetails" : [ {
               "caption" : "属性",
               "codeName" : "field",
-              "contentHeight" : 300.0,
-              "contentWidth" : 200.0,
               "dataType" : 25,
               "detailStyle" : "DEFAULT",
               "detailType" : "FORMITEM",
               "enableCond" : 3,
-              "height" : 300.0,
               "ignoreInput" : 0,
               "itemHeight" : 299.0,
               "itemWidth" : 329.0,
@@ -502,7 +501,6 @@
                 "layout" : "TABLE_24COL",
                 "width" : 200
               },
-              "width" : 200.0,
               "allowEmpty" : true,
               "showCaption" : true
             }, {
@@ -640,13 +638,12 @@
             "showCaption" : true
           } ],
           "getPSLayoutPos" : {
-            "colMD" : 24,
-            "layout" : "TABLE_24COL"
+            "grow" : -1,
+            "layout" : "FLEX"
           }
         } ],
         "getPSLayout" : {
-          "columnCount" : 24,
-          "layout" : "TABLE_24COL"
+          "layout" : "FLEX"
         },
         "getPSLayoutPos" : {
           "colMD" : 24,