Commit 2341bb15 authored by 田翔's avatar 田翔

fix: 代码修复

parent fb6f6073
{ {
"name": "panda-xform", "name": "panda-xform",
"version": "5.5.0", "version": "5.5.1",
"description": "5.5.0 关闭之前配置", "description": "5.5.1 隐藏显示修复",
"keywords": [ "keywords": [
"panda-xform" "panda-xform"
], ],
......
...@@ -53,37 +53,6 @@ const RelationForm = (props) => { ...@@ -53,37 +53,6 @@ const RelationForm = (props) => {
return formDataObj return formDataObj
}, [addons?.formData]) }, [addons?.formData])
const show = useMemo(() => {
console.log('str', formDataObj, defaultShow)
if (addons) {
let str = controlShow
try {
let matchArr = str ? str.match(/\{(.+?)\}/g) : []
if (Array.isArray(matchArr)) {
matchArr?.forEach(v => {
let value = v.replace(/{/g, '').replace(/}/g, '')
let valueArr = value ? value.split('.') : []
let fieldValue = formDataObj[valueArr[1]]
str = str.replace(v, `'${fieldValue}'`)
})
}
str = str.replace(/=/g, '==')
str = str.replace(/and/g, '&&')
str = str.replace(/or/, '||')
console.log('str', str)
if (str && eval(str)) {
// addons.setSchemaByPath(addons.dataPath, { ...schema, hidden: !schema.hidden })
return !defaultShow
}
return defaultShow
} catch {
return defaultShow
}
}
return defaultShow
}, [formDataObj, defaultShow])
const localForm = useMemo(() => { const localForm = useMemo(() => {
const { addFieldGroup } = config const { addFieldGroup } = config
let array = [] let array = []
...@@ -437,7 +406,7 @@ const RelationForm = (props) => { ...@@ -437,7 +406,7 @@ const RelationForm = (props) => {
}, []) }, [])
return ( return (
<div className={styles.relationForm} style={{ display: (addons && !show) ? 'none' : 'block' }}> <div className={styles.relationForm}>
<div> <div>
<div className={styles.header}> <div className={styles.header}>
<div className={styles.text}>{titleShow}</div> <div className={styles.text}>{titleShow}</div>
......
...@@ -104,12 +104,12 @@ const TextInput = (props) => { ...@@ -104,12 +104,12 @@ const TextInput = (props) => {
} else { } else {
valueNext = getValueNext() valueNext = getValueNext()
} }
}
//编辑状态下需要被覆盖 //编辑状态下需要被覆盖
if (!disabled) { if (!disabled) {
valueNext = getValueNext() valueNext = getValueNext()
} }
} }
}
if (addons) { if (addons) {
addons.setValue(addons.dataPath, valueNext || '') addons.setValue(addons.dataPath, valueNext || '')
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment