diff --git a/packages/ncform-common/src/mixins/vue/control-mixin.js b/packages/ncform-common/src/mixins/vue/control-mixin.js index 745653e..00cadd8 100755 --- a/packages/ncform-common/src/mixins/vue/control-mixin.js +++ b/packages/ncform-common/src/mixins/vue/control-mixin.js @@ -99,7 +99,11 @@ export default { return this._analyzeVal(this.config.hidden); } let nodeCodeArr = this.globalConst.nodeCodeArr || [] - return !(nodeCodeArr.includes(this.schema.ui.process) || this.schema.ui.process === this.globalConst.nodeUId); + if ((nodeCodeArr.includes(this.schema.ui.process) || this.schema.ui.process === this.globalConst.nodeUId)) { + return this._analyzeVal(this.config.hidden) + } else { + return true + } }, mergeConfig() { let newConfig = extend( diff --git a/packages/ncform/src/components/vue-ncform/ncform.vue b/packages/ncform/src/components/vue-ncform/ncform.vue index 3054902..9ece0b0 100755 --- a/packages/ncform/src/components/vue-ncform/ncform.vue +++ b/packages/ncform/src/components/vue-ncform/ncform.vue @@ -211,18 +211,23 @@ export default { _get(this.dataFormSchema, 'globalConfig.ignoreRulesWhenHidden', true) ) { let isHidden = false + let snapIsHidden = ncformUtils.smartAnalyzeVal(schema.ui.hidden, { + idxChain: __idxChain, + data: { + rootData: this.$data.formData, + constData: this.dataFormSchema.globalConfig.constants + } + }); if (!schema || schema.ui.process === true || schema.ui.process === undefined) { // 如果开启了忽略隐藏字段规则 - isHidden = ncformUtils.smartAnalyzeVal(schema.ui.hidden, { - idxChain: __idxChain, - data: { - rootData: this.$data.formData, - constData: this.dataFormSchema.globalConfig.constants - } - }); + isHidden = snapIsHidden } else { let { constants } = this.dataFormSchema.globalConfig - isHidden = !(constants.nodeCodeArr.includes(schema.ui.process) || schema.ui.process === constants.nodeUId); + if ((constants.nodeCodeArr.includes(schema.ui.process) || schema.ui.process === constants.nodeUId)) { + isHidden = snapIsHidden + } else { + isHidden = true + } } // 如果是隐藏,则忽略校验规则 if (isHidden)