Skip to content

T
TrainSys
提交 2ebf1b49 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 2fbebdca
隐藏空白字符变更
内嵌 并排
正在显示 包含 112 行增加 和 105 行删除
app_Web/src/components/widgets/grid-control/grid-field-column/grid-field-column.tsx
浏览文件 @ 2ebf1b49
......@@ -21,6 +21,8 @@ export const GridFieldColumn = defineComponent({
},
setup(props) {
const ns = useNamespace('grid-field-column');
// 代码表转换文本，如果不转换则为null
const codeListText = computed(() => {
// 非前台处理，不做值转换
if (props.controller.model.source.cLConvertMode !== 'FRONT') {
......@@ -71,11 +73,16 @@ export const GridFieldColumn = defineComponent({
return ns.cssVarBlock({ 'justify-content': justContent });
});
return { ns, alignStyle, codeListText, onCellClick };
const showText = computed(() => {
return (
codeListText.value || props.row.data[props.controller.model.codeName]
);
});
return { ns, alignStyle, showText, onCellClick };
},
render() {
const c = this.controller;
const value = this.row.data[c.model.codeName];
return (
<div
class={[this.ns.b(), c.clickable && this.ns.m('clickable')]}
......@@ -83,8 +90,8 @@ export const GridFieldColumn = defineComponent({
onClick={this.onCellClick}
>
<span class={this.ns.e('text')}>
{this.codeListText || value}
{c.model.unitName}
{this.showText}
{this.showText && c.model.unitName}
</span>
</div>
);
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ 2ebf1b49
......@@ -1209,16 +1209,16 @@
"mOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ],
"rTMOSFilePath" : "pssysapps/TemplatePublish/psappviewmsggroups/VMGroup2"
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/TEST/PSFORMS/TestRules.json
浏览文件 @ 2ebf1b49
......@@ -186,37 +186,6 @@
},
"getPSDEFormItemName" : "field4",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -258,6 +227,37 @@
},
"getPSDEFormItemName" : "field6",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/TESTTestRulesEditView.json
浏览文件 @ 2ebf1b49
......@@ -315,37 +315,6 @@
},
"getPSDEFormItemName" : "field4",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -387,6 +356,37 @@
},
"getPSDEFormItemName" : "field6",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json
浏览文件 @ 2ebf1b49
......@@ -2215,16 +2215,16 @@
"mOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2",
"name" : "视图消息组2",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "视图消息2",
"name" : "视图消息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg3"
"id" : "ViewMsg2"
}
}, {
"name" : "视图消息",
"name" : "视图消息2",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg2"
"id" : "ViewMsg3"
}
} ],
"rTMOSFilePath" : "pssysapps/Web/psappviewmsggroups/VMGroup2"
......@@ -16801,37 +16801,6 @@
},
"getPSDEFormItemName" : "field4",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......@@ -16873,6 +16842,37 @@
},
"getPSDEFormItemName" : "field6",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
"getPSDEFValueRule" : {
"codeName" : "ValueRule",
"mOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"name" : "amount值规则",
"getPSDEFVRGroupCondition" : {
"condOp" : "AND",
"condType" : "GROUP",
"name" : "默认组",
"getPSDEFVRConditions" : [ {
"condOp" : "EQ",
"condType" : "SIMPLE",
"dEFName" : "AMOUNT",
"name" : "[常规条件] 等于(=) (100)",
"paramType" : "SRCENTITYFIELD",
"paramValue" : "100",
"ruleInfo" : "amount等于100"
} ],
"ruleInfo" : "amount等于100"
},
"rTMOSFilePath" : "psmodules/Test/psdataentities/TEST/psdefields/AMOUNT/psdefvaluerules/ValueRule",
"ruleInfo" : "amount等于100",
"checkDefault" : false,
"defaultMode" : false,
"enableBackend" : true,
"enableFront" : true
},
"getPSDEFormItemName" : "amount",
"valueRuleType" : "DEFVALUERULE"
}, {
"checkMode" : 3,
"name" : "表单项值规则",
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或