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

app_Web/package.json

@@ -72,7 +72,7 @@
         "@interactjs/actions": "^1.10.11",
         "@interactjs/modifiers": "^1.10.11",
         "@interactjs/dev-tools": "^1.10.11",
-        "@ibiz/dynamic-model-api": "1.0.7",
+        "@ibiz/dynamic-model-api": "2.0.3",
         "@ibiz/model-location": "^0.0.4",
         "xgplayer":"2.31.4",
         "xlsx": "^0.16.9"

app_Web/packages/ibiz-vue/src/components/common/app-form-item/app-form-item.vue

@@ -86,7 +86,7 @@
     </div>
 </template>
 <script lang="ts">
-import { IPSDEFormItemEx } from "node_modules/@ibiz/dynamic-model-api/dist/types";
+import { IPSDEFormItemEx } from "@ibiz/dynamic-model-api";
 import { Vue, Component, Prop, Watch } from "vue-property-decorator";
 
 @Component({})

app_Web/packages/ibiz-vue/src/components/common/app-panel-field/app-panel-field.vue

@@ -7,7 +7,7 @@
             </div>
         </div>
         <div v-if="!Object.is(labelPos,'NONE') && !isEmptyCaption" :class="dynaCationClass">
-            <span v-if="required" style="color:red;">* </span>
+            <span v-if="required">* </span>
             {{ caption }}
         </div>
         <div v-if="Object.is(labelPos,'BOTTOM') || Object.is(labelPos,'TOP') || Object.is(labelPos,'LEFT') || Object.is(labelPos,'RIGHT')" class="app-panel-field__editor">

app_Web/packages/ibiz-vue/src/components/common/app-picker/app-picker.vue

@@ -102,7 +102,7 @@
                 </template>
             </template>
         </el-select>
-        <span style="position: absolute; right: 5px; color: #c0c4cc; top: 0; font-size: 13px">
+        <span class="app-picker__select__icon">
             <i v-show="open" class="el-icon-arrow-up" @click="closeDropdown"></i>
             <i v-show="!open" class="el-icon-arrow-down" @click="openDropdown"></i>
         </span>
@@ -454,7 +454,7 @@ export default class AppPicker extends Vue {
      * @memberof AppPicker
      */
     public mounted() {
-        const dropdownDom: any = this.$el.getElementsByClassName('app-picker-dropdown')[0];
+        const dropdownDom: any = this.$el.getElementsByClassName('app-picker__select')[0];
         this.dropdownDom = dropdownDom;
     }
 

app_Web/packages/ibiz-vue/src/components/common/app-quick-search/app-quick-search.vue

@@ -59,7 +59,11 @@ export default class AppQuickSearch extends Vue {
             quickSearchFields.forEach((field: IPSAppDEField, index: number) => {
                 const _field: IPSAppDEField | null | undefined = this.appDataEntity?.findPSAppDEField(field.codeName);
                 if (_field) {
-                    placeholder += (_this.$tl(_field.getLNPSLanguageRes()?.lanResTag, _field.logicName) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    if(_field.quickSearchPlaceHolder){
+                        placeholder += (this.$tl(_field.getQSPHPSLanguageRes()?.lanResTag, _field.quickSearchPlaceHolder) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    }else{
+                        placeholder += (_this.$tl(_field.getLNPSLanguageRes()?.lanResTag, _field.logicName) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    }
                 }
             })
         }

app_Web/packages/ibiz-vue/src/components/control/app-common-control/app-tab-view-panel-base.tsx

 import { Emit, Prop, Watch } from 'vue-property-decorator';
 import { Util } from 'ibiz-core';
 import { TabViewPanelBase } from '../../../widgets';
-import { IPSAppDEView } from '@ibiz/dynamic-model-api/dist/types/exports';
+import { IPSAppDEView } from '@ibiz/dynamic-model-api';
 
 /**
  * 分页视图面板部件基类

app_Web/packages/ibiz-vue/src/components/control/view-toolbar/view-toolbar.tsx

@@ -85,7 +85,6 @@ export class ViewToolbar extends Vue {
         if (this.toolbarModels) {
             this.items = [];
             this.format();
-            console.log(this.items);
         }
     }
 

app_Web/packages/ibiz-vue/src/components/editor/textbox-editor/textbox-editor.tsx

-import { IPSAppDEField, IPSDEEditFormItem, IPSDEGridEditItem, IPSNumberEditor } from '@ibiz/dynamic-model-api';
+import { IPSAppDEField } from '@ibiz/dynamic-model-api';
 import { DataTypes, ModelTool, Util } from 'ibiz-core';
-import { Vue, Component, Prop, Inject } from 'vue-property-decorator';
+import { Component, Prop } from 'vue-property-decorator';
 import { VueLifeCycleProcessing } from '../../../decorators';
 import { EditorBase } from '../editor-base/editor-base';
 
@@ -45,20 +45,10 @@ export default class TextboxEditor extends EditorBase {
                 this.customProps.enableShowPwd = this.editorInstance.editorParams?.['enableShowPwd'] ? JSON.parse(this.editorInstance.editorParams['enableShowPwd'] as string) : false;
                 break;
             case 'TEXTAREA':
-                this.customProps.isDebounce = this.isDebounce;
-                this.customProps.type = 'textarea';
-                this.customProps.textareaId = Util.createUUID();
-                if (this.parentItem.contentHeight) {
-                  this.customProps.textareaStyle = `height: ${this.parentItem.contentHeight}px`
-                }
+                this.initTextAreaParams();
                 break;
             case 'TEXTAREA_10':
-                this.customProps.isDebounce = this.isDebounce;
-                this.customProps.type = 'textarea';
-                this.customProps.textareaId = Util.createUUID();
-                if (this.parentItem.contentHeight) {
-                  this.customProps.textareaStyle = `height: ${this.parentItem.contentHeight}px`
-                }
+                this.initTextAreaParams();
                 this.customProps.rows = 10;
                 break;
             case 'NUMBER':
@@ -74,10 +64,26 @@ export default class TextboxEditor extends EditorBase {
         this.initFormatParams();
     }
 
+    /**
+     * 初始化多行文本输入框参数
+     *
+     * @memberof TextboxEditor
+     */
+    initTextAreaParams() {
+        this.customProps.isDebounce = this.isDebounce;
+        this.customProps.type = 'textarea';
+        this.customProps.textareaId = Util.createUUID();
+        if (this.editorInstance.editorHeight) {
+            this.customProps.textareaStyle = `height: ${this.editorInstance.editorHeight}px; max-height: ${this.editorInstance.editorHeight}px`
+        }
+        if (this.parentItem.contentHeight) {
+            this.customProps.textareaStyle = `height: ${this.parentItem.contentHeight}px; max-height: ${this.parentItem.contentHeight}px`
+        }
+    }
+
     /**
      * 初始化格式化参数
      *
-     * @param {*} value
      * @memberof TextboxEditor
      */
     public initFormatParams() {
@@ -158,6 +164,9 @@ export default class TextboxEditor extends EditorBase {
         if (params.fontSize) {
             param.fontSize = this.handleNumber(params.fontSize);
         }
+        if (params.enableShowPwd) {
+            param.enableShowPwd = this.handleBoolean(params.enableShowPwd);
+        }
         return Object.assign(params, param);
     }
 

app_Web/packages/ibiz-vue/src/ctrl-model/app-list-model.ts

@@ -37,19 +37,23 @@ export class AppListModel {
         let modelArray: any[] = [
             {
                 name: 'size',
-                prop: 'size'
+                prop: 'size',
+                dataType: 'QUERYPARAM'
             },
             {
                 name: 'query',
-                prop: 'query'
+                prop: 'query',
+                dataType: 'QUERYPARAM'
             },
             {
                 name: 'sort',
-                prop: 'sort'
+                prop: 'sort',
+                dataType: 'QUERYPARAM'
             },
             {
                 name: 'page',
-                prop: 'page'
+                prop: 'page',
+                dataType: 'QUERYPARAM'
             },
             // 前端新增修改标识，新增为"0",修改为"1"或未设值
             {

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

 .app-button.ivu-button {
-  height: 28px;
   font-size: 12px;
 
   > span {

app_Web/packages/ibiz-vue/src/styles/components/common/app-content-bottom-exp.less

@@ -16,13 +16,7 @@
             img {
                 padding-right: 3px;
             }
-        }
-
-        .ivu-tabs-tab.ivu-tabs-tab-active {
-            .tab-exp-title {
-                // border-bottom: 1px solid var(--view-font-color-bright);
-            }
-        }
+        }       
 
         > .ivu-tabs-content {
             width: 100%;
@@ -32,14 +26,14 @@
             > .ivu-tabs-tabpane {
                 width: 100%;
                 height: 100%;
-
-                > .tab-exp-item-content {
-                    width: 100%;
-                    height: 100%;
-                    overflow-x: hidden;
-                    overflow-y: auto;
-                }
             }
         }
+        > .tab-exp-item-content {
+            width: 100%;
+            height: 100%;
+            overflow-x: hidden;
+            overflow-y: auto;
+        }
     }
+    
 }

app_Web/packages/ibiz-vue/src/styles/components/common/app-content-left-exp.less

@@ -5,9 +5,6 @@
     > .exp-actions {
         height: 100%;
         width: 48px;
-        // color: var(--leftsidebar-font-color);
-        // background: var(--leftsidebar-background-color);
-
         > .action-item {
             position: relative;
             height: 48px;
@@ -33,8 +30,6 @@
         }
 
         > .action-item.active {
-            // color: var(--leftsidebar-font-color-bright);
-            // background-color: var(--leftsidebar-background-color-bright);
             > .active-item-indicator::before {
                 content: '';
                 position: absolute;
@@ -44,14 +39,8 @@
                 height: 100%;
                 width: 0;
                 border-left: 2px solid;
-                // border-left-color: var(--leftsidebar-font-color-bright);
             }
         }
-
-        > .action-item:hover {
-            // color: var(--leftsidebar-font-color-bright);
-            // background-color: var(--leftsidebar-background-color-bright);
-        }
     }
 
     > .exp-content {
@@ -65,7 +54,7 @@
             overflow-x: hidden;
             overflow-y: auto;
             .ivu-card-body{
-                height: calc(100% - 57px) !important;
+                height: calc(100% - 57px) ;
             }
             .view-header {
                 > .quick-search {

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

@@ -2,77 +2,73 @@
     height: 100%;
     width: 100%;
 
-    > .ivu-split-wrapper.app-content-split.hidden-left {
-        > .ivu-split-horizontal {
-            > .left-pane.ivu-split-pane {
-                right: calc(100vw - 48px) !important;
+    .app-content-left {
+        height: 100%;
+        width: 100%;
+    }
+}
+.app-content-right.hidden-bottom {
+    > .ivu-split-wrapper {
+        > .ivu-split-vertical {
+            > .top-pane.ivu-split-pane {
+                bottom: 0px ;
             }
 
             > .ivu-split-trigger-con {
-                display: none !important;
+                display: none;
             }
 
-            > .right-pane.ivu-split-pane {
-                left: 48px !important;
+            > .bottom-pane.ivu-split-pane {
+                display: none;
             }
         }
     }
+}
+.ivu-split-wrapper.app-content-split.hidden-left {
+    > .ivu-split-horizontal {
+        > .left-pane.ivu-split-pane {
+            right: calc(100vw - 48px);
+        }
 
-    .app-content-left {
-        height: 100%;
-        width: 100%;
+        > .ivu-split-trigger-con {
+            display: none;
+        }
+
+        > .right-pane.ivu-split-pane {
+            left: 48px;
+        }
     }
+}
 
-    .app-content-right {
+.app-content-right {
+    height: 100%;
+    width: 100%;
+
+    .app-content-exp {
         height: 100%;
         width: 100%;
+        overflow: hidden;
 
-        .app-content-exp {
-            height: 100%;
-            width: 100%;
-            overflow: hidden;
-
-            > .view-warp {
-                height: calc(100% - 34px);
-            }
-        }
-
-        .app-content-bottom {
-            position: relative;
-            height: 100%;
-            width: 100%;
-
-            > .app-content-bottom-close {
-                position: absolute;
-                cursor: pointer;
-                // color: var(--view-button-background-color);
-                top: 2px;
-                right: 5px;
-                font-size: 16px;
-                z-index: 1;
-            }
+        > .view-warp {
+            height: calc(100% - 34px);
         }
     }
 
-    .app-content-right.hidden-bottom {
-        > .ivu-split-wrapper {
-            > .ivu-split-vertical {
-                > .top-pane.ivu-split-pane {
-                    bottom: 0px !important;
-                }
-
-                > .ivu-split-trigger-con {
-                    display: none;
-                }
+    .app-content-bottom {
+        position: relative;
+        height: 100%;
+        width: 100%;
 
-                > .bottom-pane.ivu-split-pane {
-                    display: none;
-                }
-            }
+        > .app-content-bottom-close {
+            position: absolute;
+            cursor: pointer;
+            top: 2px;
+            right: 5px;
+            font-size: 16px;
+            z-index: 1;
         }
     }
 }
-
 // 样式二布局修正
 .app-layout.style2 {
     .app-content {

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

@@ -4,10 +4,6 @@
     align-items: center;
     height: 100%;
     padding: 0;
-    // color: var(--app-background-color);
-    // fill: var(--app-background-color);
-    // background: var(--app-footer-background-color);
-
     > .app-footer-left,
     > .app-footer-center,
     > .app-footer-right {
@@ -18,8 +14,6 @@
         > .item {
             cursor: pointer;
             padding: 0px 6px;
-            // color: var(--app-background-color);
-            // fill: var(--app-background-color);
             font-size: 14px;
 
             > .action-item {

app_Web/packages/ibiz-vue/src/styles/components/common/app-form-item.less

@@ -13,6 +13,7 @@
         white-space: nowrap;
         font-size: 14px;
         font-weight: 600;
+        line-height: 24px;
     }
     &.label--top, &.label--bottom {
         >.app-form-item__label {

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

@@ -8,12 +8,9 @@ body {
     width: 100vw;
     height: 100vh;
     overflow: hidden;
-    // background: var(--app-background-color);
-    // color: var(--app-font-color);
 
     > .app-layout-header-warp {
         height: 42px;
-        // border-bottom: 1px solid var(--app-font-color-light);
     }
 
     > .app-layout-content-warp {
@@ -22,6 +19,5 @@ body {
 
     > .app-layout-footer-warp {
         height: 22px;
-        // border-top: 1px solid var(--app-font-color-light);
     }
 }

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

 .app-picker {
     width: 100%;
     position: relative;
+    .app-picker__select__icon {
+        top: 1px;
+        right: 5px;
+        font-size: 13px;
+        position: absolute;
+    }
 }
 
 .app-picker__ac {
@@ -23,7 +29,12 @@
             display: inline-block;
         }
     }
-} 
+}
+.app-picker__select {
+    .el-input__suffix {
+        right: 14px;
+    }
+}
 // 下拉列表的远程加载样式
 .app-picker__select__popper {
     .is-empty {

app_Web/packages/ibiz-vue/src/styles/components/common/app-quick-search.less

 .view-header__right__quicksearch {
     .ivu-btn {
-        height: 28px;
         border-top-left-radius: 0px;
         border-bottom-left-radius: 0px;
         margin-left: -1px;
@@ -15,17 +14,7 @@
     }
 }
 .app-quick-search {
-    height: 28px;
     max-width: 400px;
-    .ivu-icon-ios-search {
-        width: 28px;
-        height: 28px;
-        line-height: 28px;
-    }
-    .ivu-input {
-        height: 28px;
-        line-height: 28px;
-    }
     &.is-filter {
         .ivu-input {
             border-top-right-radius: 0px;

app_Web/packages/ibiz-vue/src/styles/components/common/app-wf-opinion.less

 .wf-opinion-container {
     height: 0px;
     background-color: #F5F5F5;
-
-    .opinion-container__header {
-        width: 100%;
-        height: 40px;
-        background-color: #E2EEFE;
-        border-radius: 4px 4px 0px 0px;
+    .opinion-container__content {
+        height: calc(100% - 40px);
         display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        color: #57A3FD;
-
-        .opinion-container__header__title {
-            font-size: 14px;
-            line-height: 20px;
-            padding: 10px 0px 10px 12px;
+    }
+    .opinion-container__content__textarea {
+        background-color: #fff;
+        width: 80%;
+        margin: 10px 5px 26px 10px;
+        border-radius: 4px;
+
+        >.ivu-form-item,
+        >.ivu-form-item>.ivu-form-item-content {
+            height: 100%;
         }
 
-        >.opinion-container__header__icon-container {
-            line-height: 20px;
-            // padding: 10px 12px 10px 0px;
-            padding: 10px 0px;
-
-            .icon {
-                cursor: pointer;
-            }
-
-            .icon.enable {
-                cursor: no-drop;
-            }
-
-            & :first-child {
-                padding-right: 12px;
-            }
+        .input-unit {
+            height: 100%;
+            padding: 0px;
         }
     }
+}
+.opinion-container__header {
+    width: 100%;
+    height: 40px;
+    background-color: #E2EEFE;
+    border-radius: 4px 4px 0px 0px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    color: #57A3FD;
+
+    .opinion-container__header__title {
+        font-size: 14px;
+        line-height: 20px;
+        padding: 10px 0px 10px 12px;
+    }
 
-    .opinion-container__content {
-        height: calc(100% - 40px);
-        display: flex;
+    >.opinion-container__header__icon-container {
+        line-height: 20px;
+        padding: 10px 0px;
 
-        .opinion-container__content__textarea {
-            background-color: #fff;
-            width: 80%;
-            margin: 10px 5px 26px 10px;
-            border-radius: 4px;
-
-            >.ivu-form-item,
-            >.ivu-form-item>.ivu-form-item-content {
-                height: 100%;
-            }
-
-            .input-unit {
-                height: 100%;
-                padding: 0px;
-            }
+        .icon {
+            cursor: pointer;
         }
 
-        .opinion-container__content__navbar {
-            border-radius: 4px;
-            width: 20%;
-            background-color: #fff;
-            margin: 10px 10px 26px 5px;
-
-            >.navbar__header {
-                padding: 8px 6px 2px 6px;
-            }
-
-            >.navbar__items {
-                display: flex;
-                flex-direction: column;
-                margin: 6px;
-                height: 100%;
-                //需要搜索框时恢复注释
-                // padding: 0px 8px;
-                // height: calc(100% - 42px);
-                overflow: auto;
-
-                .filter-item {
-                    height: 28px;
-                    font-size: 10px;
-                    line-height: 28px;
-                    padding-left: 11px;
-                    cursor: pointer;
-                }
-
-                .filter-item.select-item,
-                .filter-item:hover {
-                    background: #EFF6FF;
-                    color: #57A3FD;
-                }
-            }
+        .icon.enable {
+            cursor: no-drop;
+        }
+
+        & :first-child {
+            padding-right: 12px;
         }
     }
 }
@@ -111,6 +71,42 @@
 
 }
 
+.opinion-container__content__navbar {
+    border-radius: 4px;
+    width: 20%;
+    background-color: #fff;
+    margin: 10px 10px 26px 5px;
+
+    >.navbar__header {
+        padding: 8px 6px 2px 6px;
+    }
+
+    >.navbar__items {
+        display: flex;
+        flex-direction: column;
+        margin: 6px;
+        height: 100%;
+        //需要搜索框时恢复注释
+        // padding: 0px 8px;
+        // height: calc(100% - 42px);
+        overflow: auto;
+
+        .filter-item {
+            height: 28px;
+            font-size: 10px;
+            line-height: 28px;
+            padding-left: 11px;
+            cursor: pointer;
+        }
+
+        .filter-item.select-item,
+        .filter-item:hover {
+            background: #EFF6FF;
+            color: #57A3FD;
+        }
+    }
+}
+
 .view-default .app-wf-opinion {
     .el-button {
         position: fixed;

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

@@ -8,7 +8,6 @@
     > div:nth-child(1) {
         flex-grow: 1;
         padding-left: 0;
-        // border-right: 1px solid var(--item-font-color);
         display: flex;
         flex-direction: column;
     }

app_Web/packages/ibiz-vue/src/styles/components/control/app-default-searchform.less

@@ -13,14 +13,13 @@
         width: 100px;
         .flex(row, right, center);
         > .ivu-btn {
-            height: 28px;
             width: 80px;
             border-radius: 4px 0 0 4px;
         }
     }
     .app-control-searchform__dropdown__icon {
         width: 20px;
-        height: 28px;
+        height: 32px;
         border-radius: 0 4px 4px 0;
         .flex(row, center, center);
     }

app_Web/packages/ibiz-vue/src/view/mdview-base.tsx

@@ -141,7 +141,11 @@ export class MDViewBase extends MainViewBase implements MDViewInterface {
             quickSearchFields.forEach((field: IPSAppDEField, index: number) => {
                 const _field: IPSAppDEField | null | undefined = (this.viewInstance as IPSAppDEMultiDataView).getPSAppDataEntity()?.findPSAppDEField(field.codeName);
                 if (_field) {
-                    this.placeholder += (this.$tl(_field.getLNPSLanguageRes()?.lanResTag, _field.logicName) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    if(_field.quickSearchPlaceHolder){
+                        this.placeholder += (this.$tl(_field.getQSPHPSLanguageRes()?.lanResTag, _field.quickSearchPlaceHolder) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    }else{
+                        this.placeholder += (this.$tl(_field.getLNPSLanguageRes()?.lanResTag, _field.logicName) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    }
                 }
             })
         }

app_Web/packages/ibiz-vue/src/view/wfdynaexpgridview-base.tsx

@@ -239,7 +239,11 @@ export class WfDynaExpGridViewBase extends MainViewBase implements WFDynaExpGrid
             quickSearchFields.forEach((field: IPSAppDEField, index: number) => {
                 const _field: IPSAppDEField | null | undefined = (this.viewInstance as any).getPSAppDataEntity()?.findPSAppDEField(field.codeName);
                 if (_field) {
-                    this.placeholder += (this.$tl(_field.getLNPSLanguageRes()?.lanResTag, _field.logicName) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    if(_field.quickSearchPlaceHolder){
+                        this.placeholder += (this.$tl(_field.getQSPHPSLanguageRes()?.lanResTag, _field.quickSearchPlaceHolder) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    }else{
+                        this.placeholder += (this.$tl(_field.getLNPSLanguageRes()?.lanResTag, _field.logicName) + (index === quickSearchFields.length - 1 ? '' : ', '));
+                    }
                 }
             })
         }

app_Web/packages/ibiz-vue/src/widgets/map-exp-bar-control-base.ts

 import { IPSDERBase, IPSMapExpBar, IPSSysMap, IPSSysMapItem } from '@ibiz/dynamic-model-api';
-import { IPSAppDataEntity } from '@ibiz/dynamic-model-api/dist/types/app/dataentity/ipsapp-data-entity';
+import { IPSAppDataEntity } from '@ibiz/dynamic-model-api';
 import { MapExpBarControlInterface, Util } from 'ibiz-core';
 import { ExpBarControlBase } from './expbar-control-base';
 /**

app_Web/public/assets/theme/default.less

@@ -116,7 +116,7 @@
 //  项文本色
 @item-text-color: @app-text-color;
 //  项边框色
-@item-border-color: mix(@app-text-color, @app-background-color, 70%);
+@item-border-color: mix(@app-background-color, @app-text-color, 85%);
 
 //  项背景色（激活）
 @item-background-color--active: mix(@primary, #FFF, 20%);
@@ -343,7 +343,9 @@ body {
 }
 // 表格样式
 .app-control-grid {
-    // 表格默认样式
+    .el-table td {
+        border-bottom: 1px solid @item-border-color;
+    }
     .ascending .sort-caret.ascending {
         border-bottom-color: @color-primary-base !important;
     }
@@ -2132,4 +2134,60 @@ body {
     .approval-content-item-info-item{
         border-bottom:1px solid @color-primary-base;
     }
+}
+
+.app-content-right{
+    .app-content-bottom{
+        > .app-content-bottom-close{
+            color: @color-primary-base;
+        }
+    }  
+}
+
+.app-content-bottom-exp{
+    .ivu-tabs-tab.ivu-tabs-tab-active {
+        .tab-exp-title {
+            border-bottom: 1px solid @color-primary-base;
+        }
+    }
+}
+
+.app-content-left-exp{
+    .action-item.active {
+        > .active-item-indicatorbefore {
+            border-left-color: @app-divider-color;
+        }
+        > .action-item:hover {
+            color: @item-text-color--hover;
+            background-color: @item-background-color--hover;
+        }
+    }
+}
+
+.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) {
+        border-right: 1px solid @app-divider-color;
+    }
 }
\ No newline at end of file

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

@@ -231,7 +231,7 @@
     </changeSet>
 
     <!--输出实体[REGINFOF]数据结构 -->
-    <changeSet author="root" id="tab-reginfof-40-9">
+    <changeSet author="root" id="tab-reginfof-41-9">
         <createTable tableName="T_REGINFOF">
                 <column name="REGINFOFID" remarks="" type="VARCHAR(100)">
                     <constraints primaryKey="true" primaryKeyName="PK_REGINFOF"/>

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

@@ -4,6 +4,7 @@
   "codeName" : "ReginfofOptionView",
   "dynaModelFilePath" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
   "name" : "ReginfofOptionView",
+  "openMode" : "POPUPMODAL",
   "getPSAppDataEntity" : {
     "modelref" : true,
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfof.json"