From 8a6ce370f1aa1c061b76fa3e9d2d4d1df53ca4c5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 21 五月 2024 16:38:09 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx | 35 ++++++++++-------------------------
1 files changed, 10 insertions(+), 25 deletions(-)
diff --git a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
index 49c4c7f..6ad02d3 100644
--- a/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/normal-table/columns/editColumn/formconfig.jsx
@@ -68,6 +68,10 @@
text: '搴忓彿'
}]
+ if (appType === 'mob') {
+ options = options.filter(item => item.value !== 'extend')
+ }
+
if (!card.linkurl && (!card.linkmenu || card.linkmenu.length === 0)) {
card.perspective = ''
}
@@ -101,6 +105,8 @@
key: 'nameField',
label: '鍚嶇О瀛楁',
initVal: card.nameField || '',
+ tooltip: '鍚嶇О瀛楁涓洪摼鎺ュ湪鐣岄潰涓樉绀虹殑鍐呭锛屽湪閾炬帴涓互@***@褰㈠紡鎷兼帴鐨勫瓧娈碉紙瀛楁鏉ユ簮浜庡瓧娈甸泦涓紝姝ゅ id銆乤ppkey銆乽serid銆丩oginUID 涓虹郴缁熷瓧娈碉級锛岃烦杞椂灏嗘浛鎹负瀵瑰簲鍊硷紝渚嬪锛歨ttp://sso.mk9h.cn/doc/index.html?appkey=@appkey@&LoginUID=@LoginUID@锛屽叾涓璦ppkey涓嶭oginUID灏嗚鏇挎崲銆�',
+ toolWidth: 350,
required: false,
options: [{uuid: 'empty', field: '', label: '绌�'}, ...fields]
},
@@ -113,20 +119,6 @@
label: '鍒楀',
initVal: card.Width || 120,
required: true
- },
- {
- type: 'radio',
- key: 'joint',
- label: '鎷兼帴鍙傛暟',
- initVal: card.joint || 'true',
- required: true,
- options: [{
- value: 'true',
- text: '鏄�'
- }, {
- value: 'false',
- text: '鍚�'
- }]
},
{
type: 'radio',
@@ -284,8 +276,8 @@
tooltip: '鏉ユ簮浜庝笂绾х粍浠剁殑瀛楁闆嗭紙涓婄骇缁勪欢涓虹┖鏃朵粠url鍙傛暟涓�夊彇锛夛紝璇ュ瓧娈靛�硷紙鐢ㄩ�楀彿鍒嗛殧锛夊彲鎺у埗鎵╁睍鍒楃殑鍒楀悕銆�',
required: false,
rules: [{
- pattern: /^[\u4E00-\u9FA50-9a-zA-Z_]*$/ig,
- message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶃�佹眽瀛椾互鍙奯'
+ pattern: /^[0-9a-zA-Z_]*$/ig,
+ message: '瀛楁鍚嶅彧鍏佽鍖呭惈鏁板瓧銆佸瓧姣嶄互鍙奯'
}]
},
{
@@ -494,16 +486,9 @@
key: 'linkurl',
label: '閾炬帴鍦板潃',
initVal: card.linkurl || '',
+ tooltip: '鍦ㄩ摼鎺ヤ腑浠***@褰㈠紡鎷兼帴鐨勫瓧娈碉紙瀛楁鏉ユ簮浜庡瓧娈甸泦涓紝姝ゅ id銆乤ppkey銆乽serid銆丩oginUID 涓虹郴缁熷瓧娈碉級锛岃烦杞椂灏嗘浛鎹负瀵瑰簲鍊硷紝渚嬪锛歨ttp://sso.mk9h.cn/doc/index.html?appkey=@appkey@&LoginUID=@LoginUID@锛屽叾涓璦ppkey涓嶭oginUID灏嗚鏇挎崲銆�',
+ toolWidth: 350,
required: true,
- forbid: appType === 'mob'
- },
- {
- type: 'multiselect',
- key: 'linkfields',
- label: '鍏宠仈瀛楁',
- initVal: card.linkfields || [],
- required: false,
- options: fields,
forbid: appType === 'mob'
},
{
--
Gitblit v1.8.0