From da34633b25d16359cd91a656acad5e811f9972b7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 14 三月 2023 18:09:54 +0800
Subject: [PATCH] 2023-03-14
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 71 +++++++++++++----------------------
1 files changed, 26 insertions(+), 45 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index a9be7fa..859dc58 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -18,6 +18,7 @@
{ value: 'qrcode', text: '浜岀淮鐮�'},
{ value: 'currentDate', text: '褰撳墠鏃堕棿'},
{ value: 'formula', text: '鍏紡'},
+ { value: 'color', text: '棰滆壊'},
]
let anchors = []
@@ -27,27 +28,15 @@
anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
}
- if (cards.type === 'table' || (cards.type === 'card' && cards.subtype === 'datacard')) {
+ if (cards.type === 'table' || (cards.type === 'card' && cards.subtype !== 'propcard')) {
_options.push({value: 'sequence', text: '搴忓彿'})
} else if (card.eleType === 'sequence') { // 鎷栨嫿娣诲姞绫诲瀷杞崲
card.eleType = 'text'
}
-
- let appMenus = []
- const isApp = sessionStorage.getItem('appType') === 'pc'
-
- if (isApp) {
- appMenus = sessionStorage.getItem('appMenus')
- if (appMenus) {
- try {
- appMenus = JSON.parse(appMenus)
- } catch (e) {
- appMenus = []
- }
- } else {
- appMenus = []
- }
+ if (card.eleType === 'icon' && card.datatype === 'dynamic' && !card.field) { // 鎷栨嫿娣诲姞绫诲瀷杞崲
+ card.datatype = 'static'
}
+ let appType = sessionStorage.getItem('appType')
let tooltip = ''
if (cardCell.$cardType === 'extendCard') {
@@ -62,13 +51,6 @@
initVal: card.eleType,
required: true,
options: _options
- },
- {
- type: 'icon',
- key: 'icon',
- label: '鍥炬爣',
- initVal: card.icon,
- required: true
},
{
type: 'radio',
@@ -89,6 +71,13 @@
initVal: card.field || '',
required: true,
options: []
+ },
+ {
+ type: 'icon',
+ key: 'icon',
+ label: '鍥炬爣',
+ initVal: card.icon,
+ required: true
},
{
type: 'text',
@@ -234,7 +223,8 @@
key: 'tooltip',
label: '鎻愮ず淇℃伅',
initVal: card.tooltip || '',
- tooltip: '榧犳爣鎮诞鏃舵樉绀恒��',
+ tooltip: '榧犳爣鎮诞鏃舵樉绀恒�傛敞锛氬浣跨敤鍔ㄦ�佷俊鎭紝璇峰湪姝ゅ濉啓鐩稿簲鐨勫瓧娈靛悕銆�',
+ forbid: appType === 'mob',
required: false
},
{
@@ -450,6 +440,18 @@
{ value: '9:16', text: '9:16' },
]
},
+ // {
+ // type: 'radio',
+ // key: 'backgroundSize',
+ // label: '鍥惧儚澶у皬',
+ // initVal: card.backgroundSize || 'cover',
+ // required: false,
+ // options: [
+ // { value: 'cover', text: '瑕嗙洊' },
+ // { value: 'contain', text: '鍖呭惈' },
+ // { value: 'auto', text: '鑷�傚簲' },
+ // ]
+ // },
{
type: 'number',
key: 'maxWidth',
@@ -508,27 +510,6 @@
{ value: 'true', text: '鍙互' }
]
},
- {
- type: 'select',
- key: 'linkmenu',
- label: '鍏宠仈鑿滃崟',
- initVal: card.linkmenu || '',
- required: true,
- forbid: !isApp,
- options: appMenus
- },
- // {
- // type: 'radio',
- // key: 'open',
- // label: '鎵撳紑鏂瑰紡',
- // initVal: card.open || 'blank',
- // required: false,
- // forbid: !isApp,
- // options: [
- // { value: 'blank', text: '鏂伴〉闈�' },
- // { value: 'self', text: '褰撳墠椤甸潰' }
- // ]
- // },
{
type: 'select',
key: 'linkurl',
--
Gitblit v1.8.0