From ad328dea146ab06dcaadb69d6cefb5ce658d659f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 07 二月 2022 17:39:44 +0800
Subject: [PATCH] 2022-02-07
---
src/menu/sysinterface/settingform/simplescript/index.jsx | 2
src/menu/components/table/edit-table/columns/tableIn/index.jsx | 2
src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx | 2
src/menu/components/form/tab-form/index.jsx | 16 +++++++
src/menu/components/form/tab-form/index.scss | 6 +++
src/templates/zshare/customscript/index.jsx | 2
src/templates/zshare/verifycard/index.jsx | 6 +-
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 17 ++++++--
src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx | 2
src/menu/components/form/normal-form/index.scss | 6 +++
src/menu/datasource/verifycard/index.jsx | 2
11 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 4d259c2..94e19cd 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -62,15 +62,19 @@
if (item.key === 'field' || item.key === 'linkurl') {
item.options = []
config.columns.forEach(col => {
+ let label = col.label
+ if (label !== col.field) {
+ label = col.field + ' ' + col.label
+ }
if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
} else if (/^(Nvarchar|date)/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
}
})
@@ -154,15 +158,20 @@
if (item.key === 'field') {
item.options = []
config.columns.forEach(col => {
+ let label = col.label
+ if (label !== col.field) {
+ label = col.field + ' ' + col.label
+ }
+
if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
} else if (/^(Nvarchar|date)/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
item.options.push({
value: col.field,
- text: col.label
+ text: label
})
}
})
diff --git a/src/menu/components/form/normal-form/index.scss b/src/menu/components/form/normal-form/index.scss
index 0fb6111..ff50139 100644
--- a/src/menu/components/form/normal-form/index.scss
+++ b/src/menu/components/form/normal-form/index.scss
@@ -36,6 +36,9 @@
}
.form-area {
position: relative;
+ .page-card {
+ background: transparent;
+ }
>.plus {
color: #26C281;
cursor: pointer;
@@ -65,6 +68,9 @@
padding-top: 10px;
padding-bottom: 30px;
}
+ .am-list-item {
+ background-color: transparent;
+ }
}
}
.menu-normal-form-edit-box::after {
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index 5939b12..e9cf69f 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -76,7 +76,21 @@
scripts: [],
subcards: [{
uuid: Utils.getuuid(),
- setting: {title: '绗竴姝�', align: 'left_right'},
+ setting: {title: '鍒嗙粍1', align: 'left_right'},
+ sort: 1,
+ style: {},
+ fields: [],
+ subButton: {label: '鎻愪氦', type: 'submit', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ }, {
+ uuid: Utils.getuuid(),
+ setting: {title: '鍒嗙粍2', align: 'left_right'},
+ sort: 1,
+ style: {},
+ fields: [],
+ subButton: {label: '鎻愪氦', type: 'submit', enable: 'true', style: {backgroundColor: '#1890ff', color: '#ffffff', paddingLeft: '25px', paddingRight: '25px', paddingTop: '5px', paddingBottom: '5px'}},
+ }, {
+ uuid: Utils.getuuid(),
+ setting: {title: '鍒嗙粍3', align: 'left_right'},
sort: 1,
style: {},
fields: [],
diff --git a/src/menu/components/form/tab-form/index.scss b/src/menu/components/form/tab-form/index.scss
index 0fb6111..ff50139 100644
--- a/src/menu/components/form/tab-form/index.scss
+++ b/src/menu/components/form/tab-form/index.scss
@@ -36,6 +36,9 @@
}
.form-area {
position: relative;
+ .page-card {
+ background: transparent;
+ }
>.plus {
color: #26C281;
cursor: pointer;
@@ -65,6 +68,9 @@
padding-top: 10px;
padding-bottom: 30px;
}
+ .am-list-item {
+ background-color: transparent;
+ }
}
}
.menu-normal-form-edit-box::after {
diff --git a/src/menu/components/table/edit-table/columns/tableIn/index.jsx b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
index a3fc34a..a3ad95c 100644
--- a/src/menu/components/table/edit-table/columns/tableIn/index.jsx
+++ b/src/menu/components/table/edit-table/columns/tableIn/index.jsx
@@ -104,7 +104,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
diff --git a/src/menu/datasource/verifycard/index.jsx b/src/menu/datasource/verifycard/index.jsx
index b0c2770..8f8afd6 100644
--- a/src/menu/datasource/verifycard/index.jsx
+++ b/src/menu/datasource/verifycard/index.jsx
@@ -105,7 +105,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
diff --git a/src/menu/sysinterface/settingform/simplescript/index.jsx b/src/menu/sysinterface/settingform/simplescript/index.jsx
index 6f0a519..ea519cb 100644
--- a/src/menu/sysinterface/settingform/simplescript/index.jsx
+++ b/src/menu/sysinterface/settingform/simplescript/index.jsx
@@ -41,7 +41,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
diff --git a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
index 959ca42..b28fe2c 100644
--- a/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
+++ b/src/templates/sharecomponent/actioncomponent/verifyexcelin/index.jsx
@@ -179,7 +179,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
diff --git a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
index 2455159..61ac6e4 100644
--- a/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
+++ b/src/templates/sharecomponent/settingcomponent/settingform/simplescript/index.jsx
@@ -44,7 +44,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
diff --git a/src/templates/zshare/customscript/index.jsx b/src/templates/zshare/customscript/index.jsx
index 2caa82b..8daf4ab 100644
--- a/src/templates/zshare/customscript/index.jsx
+++ b/src/templates/zshare/customscript/index.jsx
@@ -44,7 +44,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
diff --git a/src/templates/zshare/verifycard/index.jsx b/src/templates/zshare/verifycard/index.jsx
index 93e19b9..463b981 100644
--- a/src/templates/zshare/verifycard/index.jsx
+++ b/src/templates/zshare/verifycard/index.jsx
@@ -233,7 +233,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
@@ -303,7 +303,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
@@ -372,7 +372,7 @@
return (
<div>
- {title ? <span style={{color: '#a50'}}>{title}</span> : null}
+ {title ? <span style={{color: '#a50'}}>{title}<span style={{fontSize: '12px', marginLeft: '5px'}}>{_text.length}</span></span> : null}
<Paragraph copyable={{ text: text }} ellipsis={{ rows: 4, expandable: true }}>{_text}</Paragraph>
</div>
)
--
Gitblit v1.8.0