|
|
@@ -3,7 +3,8 @@ import { Row } from 'antd'
|
|
|
import EditableFormItem from './editableFormItem'
|
|
|
import { isNullOrUnDef } from '@/utils/is'
|
|
|
|
|
|
-const EditableForm = ({ dataSource, columns, type, tartgetUrl }) => {
|
|
|
+const EditableForm = ({ dataSource, columns, type, tartgetUrl, editable }) => {
|
|
|
+ console.log('editable', editable)
|
|
|
// console.log(store)
|
|
|
const newColumns = columns.map(item => {
|
|
|
const newItem = { ...item }
|
|
|
@@ -13,8 +14,11 @@ const EditableForm = ({ dataSource, columns, type, tartgetUrl }) => {
|
|
|
newItem.span = 24
|
|
|
}
|
|
|
|
|
|
- // 默认编辑
|
|
|
- if (isNullOrUnDef(item.editable)) {
|
|
|
+ // 默认取用全局-editable
|
|
|
+ if (!isNullOrUnDef(editable)) {
|
|
|
+ newItem.editable = editable
|
|
|
+ } else if (isNullOrUnDef(item.editable)) {
|
|
|
+ // 采用布局-editable 默认为true
|
|
|
newItem.editable = true
|
|
|
}
|
|
|
|