提交 c92b11d9 编写于 作者: ibizdev's avatar ibizdev

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

上级 3ca2e1f1
......@@ -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 ''
}
......
......@@ -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'];
/**
* 代码编辑器对象
......
......@@ -4,9 +4,12 @@
.editor {
display: block;
height: 100%;
.ivu-form-item-content {
height: 100%;
min-height: 36px;
.ivu-form-item {
height: 100%;
.ivu-form-item-content {
height: 100%;
min-height: 36px;
}
}
}
.app-form-item-label {
......
......@@ -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()];
}
}
......
......@@ -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);
}
......
......@@ -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>
......
......@@ -28,6 +28,10 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSSysImage" : {
"glyph" : "xf1b2@FontAwesome",
"cssClass" : "fa fa-cube"
},
"tooltip" : "学员信息管理"
}, {
"accUserMode" : 2,
......
......@@ -12,6 +12,10 @@
"modelref" : true,
"id" : "AppFunc3"
},
"getPSSysImage" : {
"glyph" : "xf1b2@FontAwesome",
"cssClass" : "fa fa-cube"
},
"tooltip" : "学员信息管理"
}, {
"accUserMode" : 2,
......
......@@ -1296,6 +1296,10 @@
"colMD" : 24,
"layout" : "TABLE_24COL"
},
"getPSSysImage" : {
"glyph" : "xf1b2@FontAwesome",
"cssClass" : "fa fa-cube"
},
"tooltip" : "学员信息管理"
}, {
"accUserMode" : 2,
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册