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

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

上级 56d44359
...@@ -13,12 +13,13 @@ export default defineComponent({ ...@@ -13,12 +13,13 @@ export default defineComponent({
setup(props) { setup(props) {
const ns = useNamespace('control-layout'); const ns = useNamespace('control-layout');
const type = props.modelData?.source.controlType.toLowerCase(); const type = props.modelData?.source.controlType.toLowerCase();
const sysCssName = props.modelData?.sysCssName;
return { ns, type }; return { ns, type, sysCssName };
}, },
render() { render() {
return ( return (
<div class={{ [this.ns.b()]: true, [this.ns.m(this.type)]: true }}> <div class={[this.ns.b(), this.ns.m(this.type), this.sysCssName]}>
{this.$slots.default} {this.$slots.default}
</div> </div>
); );
......
...@@ -31,6 +31,7 @@ export function generateColumnData(column: GridColumnModel, c: GridController) { ...@@ -31,6 +31,7 @@ export function generateColumnData(column: GridColumnModel, c: GridController) {
sortable: !c.noSort && column.source.enableSort ? 'custom' : false, sortable: !c.noSort && column.source.enableSort ? 'custom' : false,
columnType: column.source.columnType, columnType: column.source.columnType,
userParams: column.source.userParams, userParams: column.source.userParams,
className: column.codeName,
}; };
if (columnChildren.length > 0) { if (columnChildren.length > 0) {
Object.assign(columnData, { children: columnChildren }); Object.assign(columnData, { children: columnChildren });
......
...@@ -9824,16 +9824,16 @@ ...@@ -9824,16 +9824,16 @@
"codeName" : "VMGroup3", "codeName" : "VMGroup3",
"name" : "视图消息类型测试", "name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg5" "id" : "ViewMsg6"
} }
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-警告信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg6" "id" : "ViewMsg5"
} }
}, { }, {
"name" : "消息类型-常规信息", "name" : "消息类型-常规信息",
...@@ -9862,16 +9862,16 @@ ...@@ -9862,16 +9862,16 @@
"id" : "ViewMsg7" "id" : "ViewMsg7"
} }
}, { }, {
"name" : "消息位置-视图下方", "name" : "消息位置-弹出",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg8" "id" : "ViewMsg10"
} }
}, { }, {
"name" : "消息位置-弹出", "name" : "消息位置-视图下方",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg10" "id" : "ViewMsg8"
} }
}, { }, {
"name" : "消息位置-视图内容区", "name" : "消息位置-视图内容区",
...@@ -9884,16 +9884,10 @@ ...@@ -9884,16 +9884,10 @@
"codeName" : "VMGroup8", "codeName" : "VMGroup8",
"name" : "【静态测试】", "name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图内容区", "name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg13"
} }
}, { }, {
"name" : "消息类型-警告信息", "name" : "消息类型-警告信息",
...@@ -9902,12 +9896,6 @@ ...@@ -9902,12 +9896,6 @@
"id" : "ViewMsg5" "id" : "ViewMsg5"
}, },
"position" : "POPUP" "position" : "POPUP"
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, { }, {
"name" : "消息类型-错误信息", "name" : "消息类型-错误信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
...@@ -9915,12 +9903,6 @@ ...@@ -9915,12 +9903,6 @@
"id" : "ViewMsg6" "id" : "ViewMsg6"
}, },
"position" : "POPUP" "position" : "POPUP"
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
}, { }, {
"name" : "消息类型-常规信息", "name" : "消息类型-常规信息",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
...@@ -9934,15 +9916,33 @@ ...@@ -9934,15 +9916,33 @@
"modelref" : true, "modelref" : true,
"id" : "ViewMsg11" "id" : "ViewMsg11"
} }
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "关闭模式-默认删除-上方-错误",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg8"
}
} ] } ]
}, { }, {
"codeName" : "VMGroup5", "codeName" : "VMGroup5",
"name" : "视图消息关闭模式", "name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ { "getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除", "name" : "关闭模式-默认删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg13" "id" : "ViewMsg12"
} }
}, { }, {
"name" : "关闭模式-无删除", "name" : "关闭模式-无删除",
...@@ -9951,10 +9951,10 @@ ...@@ -9951,10 +9951,10 @@
"id" : "ViewMsg11" "id" : "ViewMsg11"
} }
}, { }, {
"name" : "关闭模式-默认删除", "name" : "关闭模式-本次删除",
"getPSAppViewMsg" : { "getPSAppViewMsg" : {
"modelref" : true, "modelref" : true,
"id" : "ViewMsg12" "id" : "ViewMsg13"
} }
} ] } ]
}, { }, {
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册