From 944730f2794b87aa053f53084f0d082d4af6fd41 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 十月 2020 19:03:30 +0800
Subject: [PATCH] 2020-10-29
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 5f8e47e..a98f0b7 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -9,13 +9,13 @@
import './index.scss'
const cardTypeOptions = {
- text: ['eleType', 'datatype', 'format', 'fontSize', 'fontWeight', 'width', 'height', 'align', 'padding', 'prefix', 'postfix'],
- number: ['eleType', 'datatype', 'format', 'fontSize', 'fontWeight', 'width', 'height', 'align', 'padding', 'prefix', 'postfix'],
- picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'radius', 'padding', 'url'],
- icon: ['eleType', 'icon', 'datatype', 'fontSize', 'width', 'align', 'padding'],
- link: ['eleType', 'datatype', 'labelfield', 'fontSize', 'width', 'height', 'align', 'padding', 'prefix'],
- slider: ['eleType', 'datatype', 'width', 'color', 'padding', 'maxValue'],
- splitline: ['eleType', 'color', 'width', 'padding'],
+ text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix'],
+ number: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix'],
+ picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'url'],
+ icon: ['eleType', 'icon', 'datatype', 'width'],
+ link: ['eleType', 'datatype', 'label', 'width', 'height', 'joint'],
+ slider: ['eleType', 'datatype', 'width', 'color', 'maxValue'],
+ splitline: ['eleType', 'color', 'width'],
}
class MainSearch extends Component {
@@ -53,16 +53,6 @@
text: col.label
})
} else if (/^Nvarchar/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
- item.options.push({
- value: col.field,
- text: col.label
- })
- }
- })
- } else if (item.key === 'labelfield') {
- item.options = []
- config.columns.forEach(col => {
- if (/^Nvarchar/ig.test(col.datatype)) {
item.options.push({
value: col.field,
text: col.label
@@ -195,13 +185,6 @@
if (item.type === 'text') { // 鏂囨湰鎼滅储
let rules = []
-
- if (item.key === 'padding') {
- rules = [{
- pattern: /^\d+px$|^\d+px\s\d+px$|^\d+px\s\d+px\s\d+px$|^\d+px\s\d+px\s\d+px\s\d+px$/ig,
- message: '璇锋纭緭鍏ュ唴杈硅窛锛�'
- }]
- }
fields.push(
<Col span={12} key={index}>
--
Gitblit v1.8.0