From 704f82b06befe96e5f739b2dce419f76f5683a6f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 八月 2022 09:27:54 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/zshare/formconfig.jsx | 141 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 124 insertions(+), 17 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 3ad7d6b..0e784c6 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -938,6 +938,8 @@
value: 'equaltab',
text: '鍒锋柊鍚岀骇鏍囩'
})
+ } else if (card.execSuccess === 'maingrid') {
+ card.execSuccess = 'grid'
}
if (card.OpenType === 'blank') {
@@ -945,6 +947,10 @@
}
if (!card.control && card.controlField) {
card.control = 'disabled'
+ }
+
+ if (card.intertype === 'outer' && !card.procMode && !card.innerFunc) { // 鍏煎澶栭儴鍑芥暟鐩翠紶绫诲瀷
+ card.procMode = 'none'
}
return [
@@ -955,6 +961,14 @@
initVal: card.OpenType,
required: true,
options: opentypes
+ },
+ {
+ type: 'text',
+ key: 'label',
+ label: '鎸夐挳鍚嶇О',
+ initVal: card.label,
+ required: true,
+ readonly: false
},
{
type: 'select',
@@ -1018,7 +1032,8 @@
type: 'radio',
key: 'procMode',
label: '鍙傛暟澶勭悊',
- initVal: card.procMode || 'system',
+ initVal: card.procMode || (card.innerFunc ? 'inner' : 'system'),
+ tooltip: '褰撹繑鍥炲�煎瓨鍦� mk_ex_invoke 涓斿�间负 false 鏃讹紝涓嶄細璋冪敤澶栭儴鎺ュ彛銆�',
required: true,
options: [{
value: 'system',
@@ -1026,6 +1041,9 @@
}, {
value: 'inner',
text: '鍐呴儴鍑芥暟'
+ }, {
+ value: 'none',
+ text: '鏃�'
}]
},
{
@@ -1035,14 +1053,6 @@
initVal: card.sqlType || '',
required: true,
options: []
- },
- {
- type: 'text',
- key: 'label',
- label: '鎸夐挳鍚嶇О',
- initVal: card.label,
- required: true,
- readonly: false
},
{
type: 'text',
@@ -1193,7 +1203,7 @@
type: 'radio',
key: 'callbackType',
label: '鍥炶皟鏂瑰紡',
- initVal: card.callbackType || 'script',
+ initVal: card.callbackType || (card.callbackFunc ? 'func' : 'script'),
tooltip: '浣跨敤鍚庡彴鑴氭湰鎵ц鏃讹紝闇�瑕侀厤鍚堣鍒掍换鍔°��',
required: true,
options: [{
@@ -1202,6 +1212,12 @@
}, {
value: 'default',
text: '鍚庡彴鑴氭湰'
+ }, {
+ value: 'func',
+ text: '鍥炶皟鍑芥暟'
+ }, {
+ value: 'none',
+ text: '鏃�'
}]
},
{
@@ -1216,7 +1232,7 @@
key: 'callbackFunc',
label: Formdict['header.form.callbackFunc'],
initVal: card.callbackFunc || '',
- required: false,
+ required: true,
readonly: false
},
{
@@ -2931,7 +2947,7 @@
type: 'text',
key: 'separator',
label: '杩炴帴绗�',
- initVal: card.separator || card.separator === undefined ? '/' : '',
+ initVal: card.separator === undefined ? '/' : card.separator,
tooltip: '琛ㄥ崟鎻愪氦鏃朵俊鎭箣闂寸殑杩炴帴绗︺�傛敞锛氳繛鎺ョ涓虹┖鏃讹紝鍒濆鍖栨椂濉厖鍏朵粬琛ㄥ崟鏃犳晥銆�',
required: false,
readonly: false
@@ -3267,12 +3283,16 @@
key: 'encryption',
label: '鍔犲瘑浼犺緭',
initVal: card.type === 'brafteditor' ? (card.encryption || 'true') : (card.encryption || 'false'),
+ tooltip: '浣跨敤md5鍔犲瘑鏃讹紝鍔犲瘑鍓嶅唴瀹逛細杞负灏忓啓锛屽姞瀵嗗悗鐨刴d5鍊间负32浣嶅ぇ鍐欍��',
options: [{
- value: 'true',
- text: Formdict['model.true']
- }, {
value: 'false',
- text: Formdict['model.false']
+ text: '鏃�'
+ }, {
+ value: 'true',
+ text: 'base64鍔犲瘑'
+ }, {
+ value: 'md5',
+ text: 'md5鍔犲瘑'
}]
},
{
@@ -3372,13 +3392,16 @@
tooltip: '鏂囦欢鍘嬬缉鎴朾ase64蹇呴』涓哄浘鐗囷紝鍥剧墖鏍煎紡涓簀pg銆乸ng銆乬if 鎴� jpeg銆傛敞锛歜ase64鍙彲涓婁紶涓�寮犲浘鐗囥��',
options: [{
value: 'false',
- text: '鏃�'
+ text: '榛樿'
}, {
value: 'true',
text: '鍘嬬缉'
}, {
value: 'base64',
text: 'base64'
+ }, {
+ value: 'oss',
+ text: 'oss涓婁紶'
}]
},
{
@@ -3393,6 +3416,90 @@
required: true
},
{
+ type: 'radio',
+ key: 'miniSet',
+ label: '灏忕▼搴忚缃�',
+ initVal: card.miniSet || 'default',
+ options: [{
+ value: 'default',
+ text: '榛樿'
+ }, {
+ value: 'custom',
+ text: '鑷畾涔�'
+ }],
+ forbid: appType !== 'mob'
+ },
+ {
+ type: 'checkbox',
+ key: 'mediaType',
+ label: '鏂囦欢绫诲瀷',
+ initVal: card.mediaType || ['image', 'video'],
+ options: [{
+ value: 'image',
+ text: '鍥剧墖'
+ }, {
+ value: 'video',
+ text: '瑙嗛'
+ }],
+ required: true,
+ forbid: appType !== 'mob'
+ },
+ {
+ type: 'checkbox',
+ key: 'sourceType',
+ label: '鏂囦欢鏉ユ簮',
+ initVal: card.sourceType || ['album', 'camera'],
+ options: [{
+ value: 'album',
+ text: '鐩稿唽閫夋嫨'
+ }, {
+ value: 'camera',
+ text: '鐩告満鎷嶆憚'
+ }],
+ required: true,
+ forbid: appType !== 'mob'
+ },
+ {
+ type: 'radio',
+ key: 'sizeType',
+ label: '鍥剧墖鍘嬬缉',
+ initVal: card.sizeType || 'compressed',
+ options: [{
+ value: 'compressed',
+ text: '鏄�'
+ }, {
+ value: 'original',
+ text: '鍚�'
+ }],
+ forbid: appType !== 'mob'
+ },
+ {
+ type: 'number',
+ key: 'maxDuration',
+ label: '鎷嶆憚鏃堕暱',
+ initVal: card.maxDuration || 10,
+ tooltip: '鎷嶆憚瑙嗛鏈�闀挎媿鎽勬椂闂达紝鍗曚綅绉掋�傛椂闂磋寖鍥翠负 3s 鑷� 60s 涔嬮棿銆備笉闄愬埗鐩稿唽銆�',
+ min: 3,
+ max: 60,
+ precision: 0,
+ required: true,
+ forbid: appType !== 'mob'
+ },
+ {
+ type: 'radio',
+ key: 'camera',
+ label: '鎽勫儚澶�',
+ initVal: card.camera || 'back',
+ options: [{
+ value: 'back',
+ text: '鍚庣疆'
+ }, {
+ value: 'front',
+ text: '鍓嶇疆'
+ }],
+ forbid: appType !== 'mob'
+ },
+ {
type: 'number',
key: 'span',
min: 1,
--
Gitblit v1.8.0