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

app_Web/packages/ibiz-core/src/utils/util/layout-tool.ts

@@ -49,7 +49,7 @@ export class LayoutTool {
             let grow = !layoutPos?.grow || layoutPos.grow < 0 ? 0 : layoutPos.grow;
             let width = this.clacStyleSize(layoutPos.width);
             let height = this.clacStyleSize(layoutPos.height);
-            return `flex-grow: ${grow}; ${width ? `width: ${width};` : 'min-width: 0'}; height: ${height};`
+            return `flex-grow: ${grow}; ${width ? `width: ${width}` : 'min-width: 0'}; ${height ? `height: ${height}` : 'min-height: 0'};`
         }
         return ''
     }

app_Web/packages/ibiz-plugin/src/components/app-code-editor/app-code-editor.tsx

@@ -42,7 +42,7 @@ export class AppCodeEditor extends Vue {
      * @memberof AppCodeEditor
      */
     @Prop({ type: String, default: 'typescript' })
-    language!: 'json' | 'javascript' | 'typescript' | 'css' | 'less' | 'sass' | 'java';
+    language!: 'json' | 'javascript' | 'typescript' | 'css' | 'less' | 'sass' | 'java' | 'yaml';
 
     /**
      * 只读模式
@@ -85,7 +85,7 @@ export class AppCodeEditor extends Vue {
      * @type {string[]}
      * @memberof AppCodeEditor
      */
-    languages: string[] = ['json', 'javascript', 'typescript', 'css', 'less', 'sass', 'java', 'sql'];
+    languages: string[] = ['json', 'javascript', 'typescript', 'css', 'less', 'sass', 'java', 'sql', 'yaml'];
 
     /**
      * 代码编辑器对象

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

@@ -3,12 +3,15 @@
   padding: 0 6px;
   .editor {
       display: block;
+      height: 100%;
+      .ivu-form-item {
         height: 100%;
         .ivu-form-item-content {
             height: 100%;
             min-height: 36px;
         }
       }
+  }
   .app-form-item-label {
       padding: 6px 8px 6px 0px;
       overflow: hidden;

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

@@ -242,7 +242,8 @@ export default class AppModelButton extends Vue {
     dataChange(newVal: any, oldVal: any) {
         let { captionItemName } = this.modelJson;
         if (captionItemName && newVal[captionItemName.toLowerCase()]) {
-            this.caption = newVal[captionItemName];
+            this.caption = newVal[captionItemName.toLowerCase()];
+            this.tooltip = newVal[captionItemName.toLowerCase()];
         }
     }
 

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

@@ -60,6 +60,9 @@ export default class CodeEditor extends EditorBase {
         if (params.isChangeLanguage) {
             param.isChangeLanguage = this.handleBoolean(params.isChangeLanguage);
         }
+        if (params.LANGUAGE) {
+            param.language = params.LANGUAGE;
+        }
         return Object.assign(params, param);
     }
 

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

@@ -264,7 +264,7 @@
     </changeSet>
 
     <!--输出实体[STUDENT]数据结构 -->
-    <changeSet author="root" id="tab-student-38-10">
+    <changeSet author="root" id="tab-student-39-10">
         <createTable tableName="T_STUDENT">
                 <column name="CREATEMAN" remarks="" type="VARCHAR(60)">
                 </column>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPINDEXVIEWS/AppIndex.json

@@ -28,6 +28,10 @@
         "colMD" : 24,
         "layout" : "TABLE_24COL"
       },
+      "getPSSysImage" : {
+        "glyph" : "xf1b2@FontAwesome",
+        "cssClass" : "fa fa-cube"
+      },
       "tooltip" : "学员信息管理"
     }, {
       "accUserMode" : 2,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPMENUS/AppIndex.json

@@ -12,6 +12,10 @@
       "modelref" : true,
       "id" : "AppFunc3"
     },
+    "getPSSysImage" : {
+      "glyph" : "xf1b2@FontAwesome",
+      "cssClass" : "fa fa-cube"
+    },
     "tooltip" : "学员信息管理"
   }, {
     "accUserMode" : 2,

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

@@ -1296,6 +1296,10 @@
             "colMD" : 24,
             "layout" : "TABLE_24COL"
           },
+          "getPSSysImage" : {
+            "glyph" : "xf1b2@FontAwesome",
+            "cssClass" : "fa fa-cube"
+          },
           "tooltip" : "学员信息管理"
         }, {
           "accUserMode" : 2,