From ef75701f3412976b8210e3c7cd4ca1f83f962d3a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 28 五月 2024 21:14:36 +0800
Subject: [PATCH] 2024-05-28
---
src/tabviews/zshare/mutilform/index.jsx | 6 ++++++
src/menu/components/table/base-table/columns/index.scss | 2 +-
src/menu/components/table/normal-table/columns/index.scss | 2 +-
src/menu/datasource/verifycard/settingform/index.jsx | 6 +++---
src/utils/utils-custom.js | 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/table/base-table/columns/index.scss b/src/menu/components/table/base-table/columns/index.scss
index 48aae5d..f8e6c1c 100644
--- a/src/menu/components/table/base-table/columns/index.scss
+++ b/src/menu/components/table/base-table/columns/index.scss
@@ -45,7 +45,7 @@
}
td:not(.ant-table-selection-column) {
position: relative;
- padding: 12px 8px;
+ // padding: 12px 8px;
>.profile {
position: absolute;
top: 2px;
diff --git a/src/menu/components/table/normal-table/columns/index.scss b/src/menu/components/table/normal-table/columns/index.scss
index af1deb4..534355b 100644
--- a/src/menu/components/table/normal-table/columns/index.scss
+++ b/src/menu/components/table/normal-table/columns/index.scss
@@ -42,7 +42,7 @@
}
td:not(.ant-table-selection-column) {
position: relative;
- padding: 12px 8px;
+ // padding: 12px 8px;
>.profile {
position: absolute;
top: 2px;
diff --git a/src/menu/datasource/verifycard/settingform/index.jsx b/src/menu/datasource/verifycard/settingform/index.jsx
index 560e5d9..408186c 100644
--- a/src/menu/datasource/verifycard/settingform/index.jsx
+++ b/src/menu/datasource/verifycard/settingform/index.jsx
@@ -414,7 +414,7 @@
{getFieldDecorator('primaryKey', {
initialValue: setting.primaryKey || ''
})(
- <Select>
+ <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 || option.props.value.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
{columns.map((option, i) =>
<Select.Option key={i} value={option.field}>
{option.label}
@@ -652,7 +652,7 @@
{getFieldDecorator('subKey', {
initialValue: setting.subKey || ''
})(
- <Select>
+ <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 || option.props.value.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
{this.props.subColumns.map((option, i) =>
<Select.Option key={i} value={option.field}>
{option.label}
@@ -667,7 +667,7 @@
{getFieldDecorator('subBID', {
initialValue: setting.subBID || ''
})(
- <Select>
+ <Select showSearch filterOption={(input, option) => option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0 || option.props.value.toLowerCase().indexOf(input.toLowerCase()) >= 0}>
{this.props.subColumns.map((option, i) =>
<Select.Option key={i} value={option.field}>
{option.label}
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 33ca96c..78f4aa6 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -476,6 +476,12 @@
message: '璇烽�夋嫨' + item.label + '!'
})
}
+ if (['cascader', 'checkbox', 'checkcard', 'fileupload', 'multiselect'].includes(item.type) && item.fieldlength) {
+ item.rules.push({
+ max: item.fieldlength,
+ message: formRule.input.formMessage.replace('@max', item.fieldlength)
+ })
+ }
}
if (item.rules.length === 0) {
diff --git a/src/utils/utils-custom.js b/src/utils/utils-custom.js
index 96f7b4f..d49eb33 100644
--- a/src/utils/utils-custom.js
+++ b/src/utils/utils-custom.js
@@ -957,7 +957,7 @@
let subItem = {
value: f_tab.uuid,
label: f_tab.label,
- children: this.getLinkModules(f_tab.components)
+ children: getLinkModules(f_tab.components)
}
if (!subItem.children || subItem.children.length === 0) {
--
Gitblit v1.8.0