From 78eed586f6a0d15162c89878c53a301e7b142a8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 十月 2022 00:07:06 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/templates/zshare/formconfig.jsx | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 0195364..eeb7fbc 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -3571,6 +3571,24 @@
required: false
},
{
+ type: 'radio',
+ key: 'lenControl',
+ label: '闀垮害鎺у埗',
+ initVal: card.lenControl || 'limit',
+ tooltip: '鍦ㄨ缃瓧娈甸暱搴﹀悗锛屽闀垮害鐨勬帶鍒舵柟寮忋��',
+ required: false,
+ options: [{
+ value: 'limit',
+ text: '闄愬埗杈撳叆'
+ }, {
+ value: 'left',
+ text: '宸︽埅'
+ }, {
+ value: 'right',
+ text: '鍙虫埅'
+ }]
+ },
+ {
type: 'number',
key: 'span',
min: 1,
@@ -3602,24 +3620,6 @@
}, {
value: 6,
text: 6
- }]
- },
- {
- type: 'radio',
- key: 'lenControl',
- label: '闀垮害鎺у埗',
- initVal: card.lenControl || 'limit',
- tooltip: '鍦ㄨ缃瓧娈甸暱搴﹀悗锛屽闀垮害鐨勬帶鍒舵柟寮忋��',
- required: false,
- options: [{
- value: 'limit',
- text: '闄愬埗杈撳叆'
- }, {
- value: 'left',
- text: '宸︽埅'
- }, {
- value: 'right',
- text: '鍙虫埅'
}]
},
{
@@ -3687,6 +3687,15 @@
},
{
type: 'text',
+ key: 'regularText',
+ label: '姝ｅ垯鎻愮ず',
+ initVal: card.regularText || '',
+ tooltip: '姝ｅ垯楠岃瘉鏃剁殑鎻愮ず淇℃伅銆�',
+ required: false,
+ readonly: false
+ },
+ {
+ type: 'text',
key: 'tooltip',
label: '鎮诞鎻愮ず',
tooltip: '榧犳爣鎮诞浜庢彁绀烘枃瀛椾笂鏂规椂锛屾樉绀烘彁绀轰俊鎭��',
@@ -3722,7 +3731,7 @@
{
type: 'text',
key: 'placeholder',
- label: '鎻愮ず淇℃伅',
+ label: '杈撳叆鎻愮ず',
tooltip: '瀛楁棰勬湡鍊肩殑鎻愮ず淇℃伅銆�',
initVal: card.placeholder || '',
required: false
--
Gitblit v1.8.0