From cdd5b449130ea4d7223fde4f414a11a7d0c33d6d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 三月 2024 17:52:16 +0800
Subject: [PATCH] 2024-03-07
---
src/menu/components/table/base-table/columns/editColumn/index.jsx | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/editColumn/index.jsx b/src/menu/components/table/base-table/columns/editColumn/index.jsx
index 3c5bc6b..8af9c30 100644
--- a/src/menu/components/table/base-table/columns/editColumn/index.jsx
+++ b/src/menu/components/table/base-table/columns/editColumn/index.jsx
@@ -13,7 +13,7 @@
number: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'decimal', 'format', 'prefix', 'postfix', 'blacklist', 'perspective', 'sum', 'rowspan'],
link: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'joint', 'Width', 'fieldlength', 'blacklist', 'nameField'],
textarea: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'prefix', 'postfix', 'blacklist'],
- picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'blacklist', 'scale', 'lenWidRadio', 'backgroundSize', 'span'],
+ picture: ['label', 'field', 'type', 'Align', 'Hide', 'IsSort', 'Width', 'fieldlength', 'blacklist', 'scale', 'lenWidRadio', 'backgroundSize', 'span', 'lostTip'],
video: ['label', 'field', 'type', 'Align', 'Hide', 'startTime', 'Width', 'fieldlength', 'blacklist', 'aspectRatio'],
colspan: ['label', 'type', 'Align', 'Hide', 'blacklist'],
custom: ['label', 'type', 'Align', 'Width', 'blacklist', 'IsSort'],
@@ -101,6 +101,14 @@
_options.push('sortField')
}
+ if (this.record.Hide !== 'true') {
+ if (['number', 'formula'].includes(this.record.type)) {
+ _options.push('noValue')
+ } else if (this.record.type === 'text' && ['YYYY-MM-DD', 'YYYY-MM-DD HH:mm:ss'].includes(this.record.textFormat)) {
+ _options.push('noValue')
+ }
+ }
+
return _options
}
@@ -177,7 +185,7 @@
}
} else if (key === 'format' && value === 'percent') {
this.props.form.setFieldsValue({postfix: '%'})
- } else if (['perspective', 'eval', 'IsSort'].includes(key)) {
+ } else if (['perspective', 'eval', 'IsSort', 'textFormat'].includes(key)) {
let _options = this.getOptions()
this.setState({
--
Gitblit v1.8.0