From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/formconfig.jsx | 149 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 106 insertions(+), 43 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 0e784c6..ef844cd 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -977,11 +977,14 @@
initVal: card.funcType || '',
required: true,
options: [{
- value: 'changeuser',
- text: '鍒囨崲鐢ㄦ埛'
- }, {
value: 'print',
text: '鏍囩鎵撳嵃'
+ }, {
+ value: 'refund',
+ text: '閫�娆�'
+ }, {
+ value: 'changeuser',
+ text: '鍒囨崲鐢ㄦ埛'
}, {
value: 'closetab',
text: '鏍囩鍏抽棴'
@@ -1203,7 +1206,7 @@
type: 'radio',
key: 'callbackType',
label: '鍥炶皟鏂瑰紡',
- initVal: card.callbackType || (card.callbackFunc ? 'func' : 'script'),
+ initVal: card.callbackType || (card.callbackFunc ? 'func' : 'none'),
tooltip: '浣跨敤鍚庡彴鑴氭湰鎵ц鏃讹紝闇�瑕侀厤鍚堣鍒掍换鍔°��',
required: true,
options: [{
@@ -1624,6 +1627,9 @@
value: 'picture',
text: Formdict['model.form.picture']
}, {
+ value: 'video',
+ text: '瑙嗛'
+ }, {
value: 'link',
text: Formdict['model.form.href']
}, {
@@ -1712,6 +1718,26 @@
}]
},
{
+ type: 'number',
+ key: 'startTime',
+ precision: 0,
+ label: '寮�濮嬫椂闂�',
+ initVal: card.startTime || 0,
+ tooltip: '瑙嗛寮�濮嬫挱鏀剧殑鏃堕棿锛岀敤浜庤皟鏁磋棰戝垵濮嬪寲灞曠ず鐨勭晫闈€��',
+ required: false
+ },
+ {
+ type: 'select',
+ key: 'aspectRatio',
+ label: '闀垮姣�',
+ initVal: card.aspectRatio || '16:9',
+ required: true,
+ options: [
+ { value: '4:3', text: '4:3' },
+ { value: '16:9', text: '16:9' }
+ ]
+ },
+ {
type: 'radio',
key: 'rowspan',
label: '琛屽悎骞�',
@@ -1762,10 +1788,10 @@
type: 'select',
key: 'format',
label: Formdict['header.form.format'],
- initVal: card.format || '',
+ initVal: card.format || 'none',
options: [{
- value: '',
- text: Formdict['model.empty']
+ value: 'none',
+ text: '鏃�'
}, {
value: 'thdSeparator',
text: '鍗冨垎浣�'
@@ -1782,10 +1808,13 @@
type: 'select',
key: 'textFormat',
label: Formdict['header.form.format'],
- initVal: card.textFormat || '',
+ initVal: card.textFormat || 'none',
options: [{
- value: '',
- text: Formdict['model.empty']
+ value: 'none',
+ text: '鏃�'
+ }, {
+ value: 'encryption',
+ text: '鍔犲瘑'
}, {
value: 'YYYY-MM-DD',
text: 'YYYY-MM-DD'
@@ -1814,15 +1843,39 @@
},
{
type: 'number',
- key: 'maxHeight',
+ key: 'span',
min: 1,
- max: 1000,
- decimal: 0,
- label: '鏈�澶ч珮搴�',
- tooltip: '鍥剧墖鍦ㄨ〃鏍间腑鏄剧ず鐨勬渶澶ч珮搴�',
- tooltipClass: 'middle',
- initVal: card.maxHeight || 128,
+ max: 24,
+ precision: 0,
+ label: '鍥剧墖瀹藉害',
+ initVal: card.span || 24,
+ tooltip: '鏍呮牸甯冨眬锛岀瓑鍒嗕负24浠姐��',
required: true
+ },
+ {
+ type: 'select',
+ key: 'lenWidRadio',
+ label: '闀垮姣�',
+ initVal: card.lenWidRadio || '1:1',
+ required: true,
+ options: [
+ { value: '1:1', text: '1:1' },
+ { value: '4:3', text: '4:3' },
+ { value: '3:2', text: '3:2' },
+ { value: '16:9', text: '16:9' },
+ { value: '2:1', text: '2:1' },
+ { value: '3:1', text: '3:1' },
+ { value: '4:1', text: '4:1' },
+ { value: '5:1', text: '5:1' },
+ { value: '6:1', text: '6:1' },
+ { value: '7:1', text: '7:1' },
+ { value: '8:1', text: '8:1' },
+ { value: '9:1', text: '9:1' },
+ { value: '10:1', text: '10:1' },
+ { value: '3:4', text: '3:4' },
+ { value: '2:3', text: '2:3' },
+ { value: '9:16', text: '9:16' },
+ ]
},
{
type: 'radio',
@@ -2378,6 +2431,9 @@
value: 'select',
text: Formdict['model.form.select']
}, {
+ value: 'textarea',
+ text: '澶氳鏂囨湰'
+ }, {
value: 'multiselect',
text: Formdict['model.form.multiselect']
}, {
@@ -2407,9 +2463,6 @@
// }, {
// value: 'datetime',
// text: '鏃ユ湡锛堝垎/绉掞級'
- }, {
- value: 'textarea',
- text: Formdict['model.form.textarea']
}, {
value: 'cascader',
text: '绾ц仈鑿滃崟'
@@ -3013,8 +3066,11 @@
value: 'letter',
text: '瀛楁瘝'
}, {
+ value: 'letter_number',
+ text: '鏁板瓧鎴栧瓧姣�'
+ }, {
value: 'letter&number',
- text: '鏁板瓧銆佸瓧姣嶄互鍙奯@_.'
+ text: '鏁板瓧銆佸瓧姣嶄互鍙夽_.'
}, {
value: 'phone',
text: '鎵嬫満鍙�'
@@ -3055,15 +3111,15 @@
},
{
type: 'radio',
- key: 'allowHalf',
- label: '鍗婇��',
- initVal: card.allowHalf || 'false',
+ key: 'hidden',
+ label: "闅愯棌",
+ initVal: card.hidden || 'false',
options: [{
value: 'true',
- text: '鏀寔'
+ text: Formdict['model.true']
}, {
value: 'false',
- text: '涓嶆敮鎸�'
+ text: Formdict['model.false']
}]
},
{
@@ -3082,21 +3138,8 @@
{
type: 'radio',
key: 'required',
- label: Formdict['model.required'],
+ label: "蹇呭～",
initVal: card.required || 'true',
- options: [{
- value: 'true',
- text: Formdict['model.true']
- }, {
- value: 'false',
- text: Formdict['model.false']
- }]
- },
- {
- type: 'radio',
- key: 'hidden',
- label: Formdict['model.hidden'],
- initVal: card.hidden || 'false',
options: [{
value: 'true',
text: Formdict['model.true']
@@ -3153,14 +3196,14 @@
type: 'radio',
key: 'readin',
label: '鑷姩濉厖',
- tooltip: '鏄惁灏嗚〃鏍奸�変腑鐨勬暟鎹嚜鍔ㄥ～鍏呭埌琛ㄥ崟锛堝瓧娈电浉鍚岋級',
+ tooltip: '灏嗚〃鏍奸�変腑鐨勬暟鎹嚜鍔ㄥ～鍏呭埌琛ㄥ崟涓�傛敞锛氬湪鎵归噺鎿嶄綔鏃讹紝濡傛兂瑕佹墍閫夎锛堝綋鍓嶅瓧娈碉級鍏ㄩ儴淇敼璇疯涓哄惁鎴栭琛屻��',
initVal: card.readin || 'true',
options: [{
value: 'true',
- text: Formdict['model.true']
+ text: '鏄�'
}, {
value: 'false',
- text: Formdict['model.false']
+ text: '鍚�'
}, {
value: 'top',
text: '棣栬'
@@ -3181,6 +3224,26 @@
}]
},
{
+ type: 'radio',
+ key: 'allowHalf',
+ label: '鍗婇��',
+ initVal: card.allowHalf || 'false',
+ options: [{
+ value: 'true',
+ text: '鏀寔'
+ }, {
+ value: 'false',
+ text: '涓嶆敮鎸�'
+ }]
+ },
+ {
+ type: 'color',
+ key: 'color',
+ label: '棰滆壊',
+ initVal: card.color || '#fadb14',
+ required: true
+ },
+ {
type: 'number',
min: 1,
max: 100,
--
Gitblit v1.8.0