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

388d9503 · ibizdev · 4d80e1fb · 388d9503 · 388d9503 · 388d9503
--- a/app_Web/packages/ibiz-vue/src/components/common/app-form-item/app-form-item.vue
+++ b/app_Web/packages/ibiz-vue/src/components/common/app-form-item/app-form-item.vue
@@ -36,27 +36,26 @@
                :class="labelclasses"
            >
                <span v-if="required" style="color:red;">* </span>
-                    <span v-if="!isEmptyCaption">
-                        <el-tooltip v-if="isShowTip" placement="top" effect="light"  popper-class="app-form-item__tip">
-                            <i v-if="iconInfo && iconInfo.cssClass" :class="iconInfo.cssClass"/>
-                            <img v-else-if="iconInfo && iconInfo.imagePath" :src="iconInfo.imagePath" alt="">
-                            <span v-html="caption"></span>
-                            <template >
-                                <span slot="content" v-html="caption" ></span>
-                            </template>
-                        </el-tooltip>
-                        <template v-if="!isShowTip" class="app-form-item__show-tip">
-                            <i v-if="iconInfo && iconInfo.cssClass" :class="iconInfo.cssClass"/>
-                            <img v-else-if="iconInfo && iconInfo.imagePath" :src="iconInfo.imagePath" alt="">
-                            <span v-html="caption" ></span>
+                <span v-if="!isEmptyCaption">
+                    <el-tooltip v-if="isShowTip" placement="top" effect="light" popper-class="app-form-item__tip">
+                        <i v-if="iconInfo && iconInfo.cssClass" :class="iconInfo.cssClass"/>
+                        <img v-else-if="iconInfo && iconInfo.imagePath" :src="iconInfo.imagePath" alt="">
+                        {{caption}}
+                        <template>
+                            <span slot="content" v-html="caption"></span>
                        </template>
-                    </span>
+                    </el-tooltip>
+                    <template v-else class="app-form-item__show-tip">
+                        <i v-if="iconInfo && iconInfo.cssClass" :class="iconInfo.cssClass"/>
+                        <img v-else-if="iconInfo && iconInfo.imagePath" :src="iconInfo.imagePath" alt="">
+                        {{caption}}
+                    </template>
+                </span>
            </span>
            <div
                v-if="viewStyle !== 'STYLE2' && ( Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT') )"
                class="app-form-item__content"
-                :style="slotstyle"
-            >
+                :style="slotstyle">
                <form-item :prop="name" :error="error"  :rules="rules">
                    <slot></slot>
                </form-item>

--- a/app_Web/packages/ibiz-vue/src/styles/components/common/app-embed-picker.less
+++ b/app_Web/packages/ibiz-vue/src/styles/components/common/app-embed-picker.less
 .app-embed-picker {
+    height: 100%;
    .app-embed-picker__value,  .app-embed-picker__placeholder {
        line-height: 32px;
        height: 32px;
@@ -7,14 +8,14 @@
        color: #dcdfe6;
    }
    .view-default.view-container {
-      padding: 0;
-      .ivu-card {
-        > .ivu-card-body {
-          padding: 0;
-            > .content-container {
+        padding: 0;
+        .ivu-card {
+            > .ivu-card-body {
                padding: 0;
+                > .content-container {
+                    padding: 0;
+                }
            }
        }
    }
-    }
 }
\ No newline at end of file
--- a/app_Web/packages/ibiz-vue/src/styles/components/common/app-form-item.less
+++ b/app_Web/packages/ibiz-vue/src/styles/components/common/app-form-item.less
@@ -2,9 +2,9 @@
  height: 100%;
  padding: 0 6px;
  .app-form-item__tip,.app-form-item__show-tip{
-    i,img{
-      margin-right: 4px;
-    }
+      i,img{
+        margin-right: 4px;
+      }
  }
  .app-form-item__label {
      padding: 6px 8px 6px 0px;
@@ -15,32 +15,32 @@
      font-weight: 600;
  }
  &.label--top, &.label--bottom {
-    .app-form-item__label {
-        display: block;
-    }
+      >.app-form-item__label {
+          display: block;
+      }
  }
  &.label--left, &.label--right {
-    //todo 编辑器样式名待修改
-    .app-form-item__label, .editor {      
-        height: 100%;
-    }
+      //todo 编辑器样式名待修改
+      >.app-form-item__label {      
+          height: 36px;
+      }
  }
  &.label--left {
-    .app-form-item__label {
-        float: left;
-        text-align: right;
-    }
+      >.app-form-item__label {
+          float: left;
+          text-align: right;
+      }
  }
  &.label--right {
-    .app-form-item__label {
-        float: right;
-        padding: 6px 0px 6px 10px;
-    }
+      >.app-form-item__label {
+          float: right;
+          padding: 6px 0px 6px 10px;
+      }
  }
  &.label--none {
-    .app-form-item__label {
-        display: none;
-    }
+      >.app-form-item__label {
+          display: none;
+      }
  }
 }
 .app-form-item__content {
@@ -50,10 +50,11 @@
      height: 100%;
      min-height: 36px;
      .ivu-form-item-error-tip{
-        padding-top: 0;
+          padding-top: 0;
      }
  }
  > .ivu-form-item {
-    margin-bottom: 16px;
+      height: 100%;
+      margin-bottom: 16px;
  }
 }
\ No newline at end of file
--- a/app_Web/packages/ibiz-vue/src/styles/components/control/app-default-searchform.less
+++ b/app_Web/packages/ibiz-vue/src/styles/components/control/app-default-searchform.less
@@ -5,6 +5,13 @@
        width: 100%;
        border: 0;
    }
+    .app-form-item.label--left,
+    .app-form-item.label--right {
+        >.app-form-item__label {
+            position: relative;
+            top: -5px;
+        }
+    }
    .app-form-item__content > .ivu-form-item {
        margin-bottom: 8px;
    }

--- a/app_Web/packages/ibiz-vue/src/styles/objects/view-container2.less
+++ b/app_Web/packages/ibiz-vue/src/styles/objects/view-container2.less
 // 嵌入视图容器布局
-.view-container2{
+.view-container2 {
    padding: 4px;
+    .view-content__left,
+    .view-content__right,
+    .view-content__body {
+        flex-grow: 1;
+        min-height: 0;
+        min-width: 0;
+    }
 }
\ No newline at end of file
--- a/trainsys-core/src/main/resources/liquibase/h2_table.xml
+++ b/trainsys-core/src/main/resources/liquibase/h2_table.xml
@@ -194,7 +194,7 @@
    </changeSet>

    <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-88-8">
+    <changeSet author="root" id="tab-reginfo-91-8">
        <createTable tableName="T_REGINFO">
                <column name="UPDATEDATE" remarks="" type="DATETIME">
                </column>
@@ -303,7 +303,7 @@
    </changeSet>

    <!--输出实体[REGINFO]外键关系 -->
-    <changeSet author="root" id="fk-reginfo-88-12">
+    <changeSet author="root" id="fk-reginfo-91-12">
       <addForeignKeyConstraint baseColumnNames="STUDENTID" baseTableName="T_REGINFO" constraintName="F328B6E61632896255" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="STUDENTID" referencedTableName="T_STUDENT" validate="true"/>
    </changeSet>


--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json
@@ -807,6 +807,28 @@
    "requestPath" : "/select",
    "builtinMethod" : false
  } ],
+  "getAllPSAppDEUIActions" : [ {
+    "actionTarget" : "SINGLEKEY",
+    "caption" : "选项操作",
+    "codeName" : "openOpt",
+    "getFrontPSAppView" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
+      "viewType" : "DEOPTVIEW"
+    },
+    "frontProcessType" : "WIZARD",
+    "fullCodeName" : "Reginfo_openOpt",
+    "name" : "打开选项操作视图",
+    "getPSAppDataEntity" : {
+      "modelref" : true,
+      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+    },
+    "timeout" : 60000,
+    "uIActionMode" : "FRONT",
+    "uIActionTag" : "openOpt",
+    "uIActionType" : "DEUIACTION",
+    "id" : "openOpt@Reginfo"
+  } ],
  "getAllPSDEOPPrivs" : [ {
    "logicName" : "建立",
    "name" : "CREATE"

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json
@@ -32,6 +32,17 @@
    } ]
  } ],
  "getPSAppViewLogics" : [ {
+    "eventArg" : "tbitem1_openopt",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem1_openopt_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem1_openopt"
+    },
+    "getPSViewCtrlName" : "toolbar"
+  }, {
    "eventArg" : "tbitem3",
    "eventNames" : "CLICK",
    "logicTrigger" : "CTRLEVENT",
@@ -244,6 +255,18 @@
    }
  } ],
  "getPSAppViewUIActions" : [ {
+    "name" : "toolbar_tbitem1_openopt",
+    "getPSUIAction" : {
+      "getPSAppDataEntity" : {
+        "modelref" : true,
+        "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+      },
+      "modelref" : true,
+      "id" : "openOpt@Reginfo"
+    },
+    "uIActionTarget" : "SINGLEKEY",
+    "xDataControlName" : "grid"
+  }, {
    "name" : "toolbar_tbitem3",
    "getPSUIAction" : {
      "modelref" : true,
@@ -1057,6 +1080,16 @@
      "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
    },
    "getPSControlLogics" : [ {
+      "eventArg" : "tbitem1_openopt",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem1_openopt_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem1_openopt_click"
+      }
+    }, {
      "eventArg" : "tbitem3",
      "eventNames" : "CLICK",
      "logicTag" : "toolbar",
@@ -1191,6 +1224,45 @@
      "id" : "TOOLBAR"
    },
    "getPSDEToolbarItems" : [ {
+      "caption" : "选项操作",
+      "groupExtractMode" : "ITEM",
+      "itemType" : "DEUIACTION",
+      "name" : "tbitem1_openopt",
+      "noPrivDisplayMode" : 2,
+      "getPSAppViewUIAction" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem1_openopt"
+      },
+      "getPSUIAction" : {
+        "actionTarget" : "SINGLEKEY",
+        "caption" : "选项操作",
+        "codeName" : "openOpt",
+        "getFrontPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
+          "viewType" : "DEOPTVIEW"
+        },
+        "frontProcessType" : "WIZARD",
+        "fullCodeName" : "Reginfo_openOpt",
+        "name" : "打开选项操作视图",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+        },
+        "timeout" : 60000,
+        "uIActionMode" : "FRONT",
+        "uIActionTag" : "openOpt",
+        "uIActionType" : "DEUIACTION",
+        "id" : "openOpt@Reginfo"
+      },
+      "tooltip" : "选项操作",
+      "showCaption" : true,
+      "showIcon" : true
+    }, {
+      "itemType" : "SEPERATOR",
+      "name" : "tbitem2",
+      "spanMode" : false
+    }, {
      "getCapPSLanguageRes" : {
        "lanResTag" : "TBB.TEXT.*.NEW"
      },

--- a/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
+++ b/trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
@@ -1604,6 +1604,17 @@
        } ]
      } ],
      "getPSAppViewLogics" : [ {
+        "eventArg" : "tbitem1_openopt",
+        "eventNames" : "CLICK",
+        "logicTrigger" : "CTRLEVENT",
+        "logicType" : "APPVIEWUIACTION",
+        "name" : "toolbar_tbitem1_openopt_click",
+        "getPSAppViewUIAction" : {
+          "modelref" : true,
+          "id" : "toolbar_tbitem1_openopt"
+        },
+        "getPSViewCtrlName" : "toolbar"
+      }, {
        "eventArg" : "tbitem3",
        "eventNames" : "CLICK",
        "logicTrigger" : "CTRLEVENT",
@@ -1816,6 +1827,18 @@
        }
      } ],
      "getPSAppViewUIActions" : [ {
+        "name" : "toolbar_tbitem1_openopt",
+        "getPSUIAction" : {
+          "getPSAppDataEntity" : {
+            "modelref" : true,
+            "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+          },
+          "modelref" : true,
+          "id" : "openOpt@Reginfo"
+        },
+        "uIActionTarget" : "SINGLEKEY",
+        "xDataControlName" : "grid"
+      }, {
        "name" : "toolbar_tbitem3",
        "getPSUIAction" : {
          "modelref" : true,
@@ -2629,6 +2652,16 @@
          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
        },
        "getPSControlLogics" : [ {
+          "eventArg" : "tbitem1_openopt",
+          "eventNames" : "CLICK",
+          "logicTag" : "toolbar",
+          "logicType" : "APPVIEWLOGIC",
+          "name" : "toolbar_tbitem1_openopt_click",
+          "getPSAppViewLogic" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem1_openopt_click"
+          }
+        }, {
          "eventArg" : "tbitem3",
          "eventNames" : "CLICK",
          "logicTag" : "toolbar",
@@ -2763,6 +2796,45 @@
          "id" : "TOOLBAR"
        },
        "getPSDEToolbarItems" : [ {
+          "caption" : "选项操作",
+          "groupExtractMode" : "ITEM",
+          "itemType" : "DEUIACTION",
+          "name" : "tbitem1_openopt",
+          "noPrivDisplayMode" : 2,
+          "getPSAppViewUIAction" : {
+            "modelref" : true,
+            "id" : "toolbar_tbitem1_openopt"
+          },
+          "getPSUIAction" : {
+            "actionTarget" : "SINGLEKEY",
+            "caption" : "选项操作",
+            "codeName" : "openOpt",
+            "getFrontPSAppView" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
+              "viewType" : "DEOPTVIEW"
+            },
+            "frontProcessType" : "WIZARD",
+            "fullCodeName" : "Reginfo_openOpt",
+            "name" : "打开选项操作视图",
+            "getPSAppDataEntity" : {
+              "modelref" : true,
+              "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+            },
+            "timeout" : 60000,
+            "uIActionMode" : "FRONT",
+            "uIActionTag" : "openOpt",
+            "uIActionType" : "DEUIACTION",
+            "id" : "openOpt@Reginfo"
+          },
+          "tooltip" : "选项操作",
+          "showCaption" : true,
+          "showIcon" : true
+        }, {
+          "itemType" : "SEPERATOR",
+          "name" : "tbitem2",
+          "spanMode" : false
+        }, {
          "getCapPSLanguageRes" : {
            "lanResTag" : "TBB.TEXT.*.NEW"
          },
@@ -12894,6 +12966,28 @@
        "requestPath" : "/select",
        "builtinMethod" : false
      } ],
+      "getAllPSAppDEUIActions" : [ {
+        "actionTarget" : "SINGLEKEY",
+        "caption" : "选项操作",
+        "codeName" : "openOpt",
+        "getFrontPSAppView" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfofOptionView.json",
+          "viewType" : "DEOPTVIEW"
+        },
+        "frontProcessType" : "WIZARD",
+        "fullCodeName" : "Reginfo_openOpt",
+        "name" : "打开选项操作视图",
+        "getPSAppDataEntity" : {
+          "modelref" : true,
+          "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo.json"
+        },
+        "timeout" : 60000,
+        "uIActionMode" : "FRONT",
+        "uIActionTag" : "openOpt",
+        "uIActionType" : "DEUIACTION",
+        "id" : "openOpt@Reginfo"
+      } ],
      "getAllPSDEOPPrivs" : [ {
        "logicName" : "建立",
        "name" : "CREATE"