From da34633b25d16359cd91a656acad5e811f9972b7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 三月 2023 18:09:54 +0800
Subject: [PATCH] 2023-03-14
---
src/mob/components/formdragelement/card.jsx | 9 +++++++--
src/menu/components/form/simple-form/index.jsx | 2 ++
src/templates/modalconfig/index.jsx | 3 +++
src/mob/components/formdragelement/index.scss | 5 +++++
src/menu/components/form/step-form/index.jsx | 2 ++
src/menu/modalconfig/index.jsx | 2 ++
src/mob/modalconfig/index.jsx | 3 +++
src/menu/components/form/tab-form/index.jsx | 2 ++
src/templates/modalconfig/dragelement/card.jsx | 4 ++++
src/templates/modalconfig/dragelement/index.scss | 5 +++++
10 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/form/simple-form/index.jsx b/src/menu/components/form/simple-form/index.jsx
index 2b1e483..58a05f4 100644
--- a/src/menu/components/form/simple-form/index.jsx
+++ b/src/menu/components/form/simple-form/index.jsx
@@ -462,6 +462,8 @@
return
}
+ window.GLOB.formId = res.uuid
+
if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
diff --git a/src/menu/components/form/step-form/index.jsx b/src/menu/components/form/step-form/index.jsx
index 3f37ddf..186c17c 100644
--- a/src/menu/components/form/step-form/index.jsx
+++ b/src/menu/components/form/step-form/index.jsx
@@ -564,6 +564,8 @@
return
}
+ window.GLOB.formId = res.uuid
+
if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
diff --git a/src/menu/components/form/tab-form/index.jsx b/src/menu/components/form/tab-form/index.jsx
index 65b84aa..0f280e2 100644
--- a/src/menu/components/form/tab-form/index.jsx
+++ b/src/menu/components/form/tab-form/index.jsx
@@ -569,6 +569,8 @@
return
}
+ window.GLOB.formId = res.uuid
+
if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
diff --git a/src/menu/modalconfig/index.jsx b/src/menu/modalconfig/index.jsx
index c0da35b..4aab297 100644
--- a/src/menu/modalconfig/index.jsx
+++ b/src/menu/modalconfig/index.jsx
@@ -257,6 +257,8 @@
return
}
+ window.GLOB.formId = res.uuid
+
if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index 1ca1c3b..db21a71 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -216,6 +216,12 @@
formItem = <div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control"><span style={{color: '#bcbcbc'}}>{card.placeholder || ''}</span></div><div className="am-list-extra" style={{width: 'auto', height: 'auto', backgroundColor: '#fafafa', padding: '0 15px'}}>鑾峰彇楠岃瘉鐮�</div></div></div>
}
+ let className = `${card.required === 'true' ? 'required' : ''} ${card.type === 'split' ? 'split-wrap' : ''} ${card.splitline === 'false' ? 'no-boder' : ''}`
+
+ if (window.GLOB.formId === card.uuid) {
+ className += ' actived'
+ }
+
let style = {...card.style}
if (card.marginTop && !style.marginTop) { // 澶栬竟璺濊缃浆绉�
@@ -238,8 +244,7 @@
<div ref={node => drag(drop(node))} style={{ border: '0.5px solid transparent'}} onDoubleClick={edit}>
<Form.Item
style={style}
- // style={{marginTop: card.marginTop || 0, marginBottom: card.marginBottom || 0}}
- className={(card.required === 'true' ? ' required' : '') + (card.type === 'split' ? ' split-wrap' : '') + (card.splitline === 'false' ? ' no-boder' : '')}
+ className={className}
>
{formItem}
<div></div>
diff --git a/src/mob/components/formdragelement/index.scss b/src/mob/components/formdragelement/index.scss
index 436e4e2..23151e5 100644
--- a/src/mob/components/formdragelement/index.scss
+++ b/src/mob/components/formdragelement/index.scss
@@ -107,6 +107,11 @@
}
}
}
+ .ant-form-item.actived {
+ .am-input-label {
+ color: #1890ff;
+ }
+ }
.am-list-item.check-card {
height: auto;
.am-list-line {
diff --git a/src/mob/modalconfig/index.jsx b/src/mob/modalconfig/index.jsx
index 8bcad78..062c54e 100644
--- a/src/mob/modalconfig/index.jsx
+++ b/src/mob/modalconfig/index.jsx
@@ -61,6 +61,7 @@
}
componentDidMount () {
+ window.GLOB.formId = ''
MKEmitter.addListener('submitStyle', this.getStyle)
MKEmitter.addListener('completeSave', this.completeSave)
}
@@ -253,6 +254,8 @@
return
}
+ window.GLOB.formId = res.uuid
+
if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index dad19c1..84118ae 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -158,6 +158,10 @@
_label = ' '
}
+ if (window.GLOB.formId === card.uuid) {
+ className += ' actived'
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
diff --git a/src/templates/modalconfig/dragelement/index.scss b/src/templates/modalconfig/dragelement/index.scss
index df834a2..3d99524 100644
--- a/src/templates/modalconfig/dragelement/index.scss
+++ b/src/templates/modalconfig/dragelement/index.scss
@@ -33,6 +33,11 @@
line-height: 1;
}
}
+ .ant-form-item.actived {
+ .mk-form-label {
+ color: #1890ff;
+ }
+ }
.mk-form-label::after {
content: ':';
position: relative;
diff --git a/src/templates/modalconfig/index.jsx b/src/templates/modalconfig/index.jsx
index b4d6d8b..7d746e8 100644
--- a/src/templates/modalconfig/index.jsx
+++ b/src/templates/modalconfig/index.jsx
@@ -126,6 +126,7 @@
}
componentDidMount() {
+ window.GLOB.formId = ''
MKEmitter.addListener('submitStyle', this.getStyle)
document.onkeydown = (event) => {
let e = event || window.event
@@ -391,6 +392,8 @@
_config.fields = _config.fields.filter(item => !item.origin)
+ window.GLOB.formId = res.uuid
+
if (['select', 'multiselect', 'link', 'checkbox', 'radio', 'checkcard'].includes(res.type) && res.resourceType === '1' && /\s/.test(res.dataSource)) {
this.setState({
sqlVerifing: true
--
Gitblit v1.8.0