From 9e2c857c3269da044afffb968469bf8dd680a9b7 Mon Sep 17 00:00:00 2001 From: Guard <35839602+Guard-233@users.noreply.github.com> Date: Tue, 12 May 2020 14:02:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=9A=90=E8=97=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A4=96=E9=83=A8=E8=BD=AE=E5=BB=93=E4=B8=8D?= =?UTF-8?q?=E9=9A=90=E8=97=8F=20(#7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 业务流程的支持 * fix: 流程bug修改 * fix: 修复了隐藏属性会被验证的bug,修复了隐藏的表格还显示的bug * fix: 修复了使用流程后,隐藏失效的bug,修复了使用流程后,对于隐藏字段还进行校验的bug * fix: 修复了隐藏数据时,外部轮廓不隐藏的bug --- .../src/components/layout-comps/object.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/ncform-theme-elementui/src/components/layout-comps/object.vue b/packages/ncform-theme-elementui/src/components/layout-comps/object.vue index 0bd3ba4..3dce748 100755 --- a/packages/ncform-theme-elementui/src/components/layout-comps/object.vue +++ b/packages/ncform-theme-elementui/src/components/layout-comps/object.vue @@ -197,11 +197,15 @@ export default { return fieldSchema.ui && fieldSchema.ui.showLegend && fieldSchema.ui.legend; }, hidden(fieldSchema) { - if (!fieldSchema || fieldSchema.ui.process === true || fieldSchema.ui.process === undefined) { + if (fieldSchema || !fieldSchema.ui || fieldSchema.ui.process === true || fieldSchema.ui.process === undefined) { return this._analyzeVal(fieldSchema.ui.hidden); } let nodeCodeArr = this.globalConst.nodeCodeArr || [] - return !(nodeCodeArr.includes(fieldSchema.ui.process) || fieldSchema.ui.process === this.globalConst.nodeUId); + if ((nodeCodeArr.includes(fieldSchema.ui.process) || fieldSchema.ui.process === this.globalConst.nodeUId)) { + return this._analyzeVal(fieldSchema.ui.hidden) + } else { + return true + } }, }, mixins: [layoutObjectMixin]