From b0c7a660750a8b29e7f8b3a648296d56c50fd2ca Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 29 十一月 2022 18:43:10 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/components/normalform/modalform/mkTable/index.jsx | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/components/normalform/modalform/mkTable/index.jsx b/src/components/normalform/modalform/mkTable/index.jsx
index 6cb9b90..ae23f22 100644
--- a/src/components/normalform/modalform/mkTable/index.jsx
+++ b/src/components/normalform/modalform/mkTable/index.jsx
@@ -75,14 +75,14 @@
class EditableCell extends Component {
getInput = (form) => {
- const { inputType, options, min, max, unlimit } = this.props
+ const { inputType, options, min, max, unlimit, allowClear } = this.props
if (inputType === 'number' && unlimit) {
return <InputNumber onPressEnter={() => this.getValue(form)} />
} else if (inputType === 'number') {
return <InputNumber min={min} max={max} precision={0} onPressEnter={() => this.getValue(form)} />
} else if (inputType === 'color') {
- return <ColorSketch />
+ return <ColorSketch allowClear={allowClear}/>
} else if (inputType === 'icon') {
return <MkEditIcon allowClear/>
} else if (inputType === 'select') {
@@ -420,6 +420,7 @@
unlimit: col.unlimit,
required: col.required !== false ? true : false,
title: col.title,
+ allowClear: col.allowClear === true,
editing: this.isEditing(record),
onSave: this.execSave,
}),
--
Gitblit v1.8.0