From e7286a74d9cd98039c00322259e25809a48d1370 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十二月 2021 13:23:04 +0800
Subject: [PATCH] 2021-12-08
---
src/tabviews/zshare/mutilform/index.jsx | 4 +++-
src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx | 2 +-
src/menu/components/card/data-card/options.jsx | 24 ++++++++++++------------
src/menu/components/share/actioncomponent/formconfig.jsx | 8 ++++----
src/templates/modalconfig/dragelement/card.jsx | 4 +++-
5 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/src/menu/components/card/data-card/options.jsx b/src/menu/components/card/data-card/options.jsx
index b449ed9..bbdc7d6 100644
--- a/src/menu/components/card/data-card/options.jsx
+++ b/src/menu/components/card/data-card/options.jsx
@@ -131,18 +131,18 @@
],
forbid: subtype !== 'propcard'
},
- {
- type: 'radio',
- field: 'checkAll',
- label: '鍏ㄩ��',
- initval: wrap.checkAll || 'hidden',
- required: false,
- options: [
- {value: 'hidden', label: '闅愯棌'},
- {value: 'show', label: '鏄剧ず'},
- ],
- forbid: subtype !== 'datacard' || appType !== 'mob'
- },
+ // {
+ // type: 'radio',
+ // field: 'checkAll',
+ // label: '鍏ㄩ��',
+ // initval: wrap.checkAll || 'hidden',
+ // required: false,
+ // options: [
+ // {value: 'hidden', label: '闅愯棌'},
+ // {value: 'show', label: '鏄剧ず'},
+ // ],
+ // forbid: subtype !== 'datacard' || appType !== 'mob'
+ // },
{
type: 'radio',
field: 'cardFloat',
diff --git a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
index f3b35e2..5a05c54 100644
--- a/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
+++ b/src/menu/components/chart/antv-bar/chartcompile/formconfig.jsx
@@ -460,7 +460,7 @@
key: 'selectColor',
label: '閫変腑棰滆壊',
initVal: card.selectColor || '',
- tooltip: '閫変腑鏌卞舰鍥剧殑棰滆壊锛屽湪浜や簰鏁堟灉銆婂厓绱犻�変腑锛堝閫夛級銆嬪拰銆婂厓绱犻�変腑锛堝崟閫夛級銆嬩腑鏈夋晥锛岃嚜瀹氫箟璁剧疆涓棤鏁堛��',
+ tooltip: '閫変腑鏌卞舰鍥剧殑棰滆壊锛屽湪浜や簰鏁堟灉銆婂厓绱犻�変腑锛堝閫夛級銆嬪拰銆婂厓绱犻�変腑锛堝崟閫夛級銆嬩腑鏈夋晥锛屽惎鐢ㄨ嚜瀹氫箟璁剧疆鏃舵棤鏁堛��',
forbid: !['bar'].includes(card.chartType),
allowClear: true,
required: false
diff --git a/src/menu/components/share/actioncomponent/formconfig.jsx b/src/menu/components/share/actioncomponent/formconfig.jsx
index 559c61c..f910a4e 100644
--- a/src/menu/components/share/actioncomponent/formconfig.jsx
+++ b/src/menu/components/share/actioncomponent/formconfig.jsx
@@ -484,13 +484,13 @@
type: 'radio',
key: 'swipe',
label: "婊戝姩鏄剧ず",
- initVal: card.swipe || 'false',
+ initVal: card.swipe === 'false' ? 'left' : (card.swipe || 'left'), // 绉诲姩绔粎淇濈暀婊戝姩鏄剧ず鎸夐挳
required: false,
forbid: (type !== 'datacard' || appType !== 'mob'),
options: [{
- value: 'false',
- text: '鍚�'
- }, {
+ // value: 'false',
+ // text: '鍚�'
+ // }, {
value: 'left',
text: '宸︽粦'
}, {
diff --git a/src/tabviews/zshare/mutilform/index.jsx b/src/tabviews/zshare/mutilform/index.jsx
index 22a92aa..e652120 100644
--- a/src/tabviews/zshare/mutilform/index.jsx
+++ b/src/tabviews/zshare/mutilform/index.jsx
@@ -376,7 +376,9 @@
if (item.enter === 'tab' || item.enter === 'sub') {
if (fieldMap.has(item.tabField)) {
item.tabUuid = fieldMap.get(item.tabField).uuid
- } else {
+ } else if (item.enter === 'tab') {
+ item.enter = 'false'
+ } else if (item.enter === 'sub') {
item.tabUuid = item.uuid
}
}
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index be3919f..796dcc8 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -154,7 +154,9 @@
wrapperCol={card.labelwidth ? {style: {width: (100 - card.labelwidth) + '%'}} : null}
>
{formItem}
- {showField ? <div className="field-name">{card.field}{card.hidden === 'true' ? '(闅愯棌)' : ''}</div> : ''}
+ {showField ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
+ {card.field}{card.hidden === 'true' ? '锛堥殣钘忥級' : ''}
+ </div> : ''}
</Form.Item>}
</div>
</div>
--
Gitblit v1.8.0