mirror of
https://github.com/vxcontrol/ncform.git
synced 2026-07-18 16:24:27 -04:00
fix: 流程 bug 修改 (#6)
* feat: 业务流程的支持 * fix: 流程bug修改 * fix: 修复了隐藏属性会被验证的bug,修复了隐藏的表格还显示的bug * fix: 修复了使用流程后,隐藏失效的bug,修复了使用流程后,对于隐藏字段还进行校验的bug
This commit is contained in:
@@ -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(
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user