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 | 130 ++++++++++++++++++++-----------------------
1 files changed, 60 insertions(+), 70 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 8635568..859dc58 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -1,14 +1,11 @@
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
-
-const Formdict = sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS
+import MenuUtils from '@/utils/utils-custom.js'
/**
* @description 鑾峰彇鍏冪礌閰嶇疆淇℃伅
* @param {*} card
* @param {*} type
*/
-export function getCardCellForm (card, type, subtype, cardCell, anchors) {
+export function getCardCellForm (card, cards, cardCell) {
let _options = [
{ value: 'text', text: '鏂囨湰'},
{ value: 'number', text: '鏁板��'},
@@ -21,27 +18,25 @@
{ value: 'qrcode', text: '浜岀淮鐮�'},
{ value: 'currentDate', text: '褰撳墠鏃堕棿'},
{ value: 'formula', text: '鍏紡'},
+ { value: 'color', text: '棰滆壊'},
]
- if (type === 'table' || (type === 'card' && subtype === 'datacard')) {
+ let anchors = []
+ if (window.GLOB.customMenu.Template === 'BaseTable') {
+ anchors = null
+ } else {
+ anchors = MenuUtils.getAnchors(window.GLOB.customMenu.components, cards.uuid) || []
+ }
+
+ 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') {
@@ -56,13 +51,6 @@
initVal: card.eleType,
required: true,
options: _options
- },
- {
- type: 'icon',
- key: 'icon',
- label: '鍥炬爣',
- initVal: card.icon,
- required: true
},
{
type: 'radio',
@@ -85,12 +73,19 @@
options: []
},
{
+ type: 'icon',
+ key: 'icon',
+ label: '鍥炬爣',
+ initVal: card.icon,
+ required: true
+ },
+ {
type: 'text',
key: 'value',
min: 0,
label: '鍐呭',
initVal: card.value || '',
- tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂login_city@銆丂appname@銆�',
+ tooltip: '鏂囨湰绫诲瀷锛屼細鏇挎崲鍐呭涓殑@username@銆丂fullName@銆丂mk_city@銆丂appname@銆丂bid@銆�',
required: true
},
{
@@ -161,6 +156,16 @@
required: true
},
{
+ type: 'number',
+ key: 'decimal',
+ min: 0,
+ max: 18,
+ decimal: 0,
+ label: '灏忔暟浣�',
+ initVal: card.decimal === undefined ? '' : card.decimal,
+ required: false
+ },
+ {
type: 'select',
key: 'format',
label: '鏍煎紡鍖�',
@@ -172,6 +177,7 @@
{ value: 'percent', text: '鐧惧垎鏁�' },
{ value: 'thdSeparator', text: '鍗冨垎浣�' },
{ value: 'abs', text: '缁濆鍊�' },
+ { value: 'encryption', text: '鍔犲瘑'},
{ value: 'YYYY-MM-DD', text: 'YYYY-MM-DD' },
{ value: 'YYYY-MM-DD HH:mm', text: 'YYYY-MM-DD HH:mm' },
{ value: 'YYYY-MM-DD HH:mm:ss', text: 'YYYY-MM-DD HH:mm:ss' },
@@ -199,16 +205,6 @@
]
},
{
- type: 'number',
- key: 'decimal',
- min: 0,
- max: 18,
- decimal: 0,
- label: '灏忔暟浣�',
- initVal: card.decimal === undefined ? '' : card.decimal,
- required: false
- },
- {
type: 'text',
key: 'prefix',
label: '鍓嶇紑',
@@ -227,7 +223,8 @@
key: 'tooltip',
label: '鎻愮ず淇℃伅',
initVal: card.tooltip || '',
- tooltip: '榧犳爣鎮诞鏃舵樉绀恒��',
+ tooltip: '榧犳爣鎮诞鏃舵樉绀恒�傛敞锛氬浣跨敤鍔ㄦ�佷俊鎭紝璇峰湪姝ゅ濉啓鐩稿簲鐨勫瓧娈靛悕銆�',
+ forbid: appType === 'mob',
required: false
},
{
@@ -346,7 +343,7 @@
max: 10,
label: '楂樺害(琛�)',
initVal: card.height !== undefined ? card.height : 1,
- tooltip: '鍐呭鏄剧ず琛屾暟锛屽�间负绌烘椂楂樺害鑷�傚簲锛屾敞锛氳嚜閫傚簲楂樺害浠呭湪璁剧疆鍗＄墖楂樺害鍚庢湁鏁堛��',
+ tooltip: '鍐呭鏄剧ず琛屾暟锛屽�间负绌烘椂楂樺害鑷�傚簲銆�',
required: false
},
{
@@ -366,7 +363,8 @@
initVal: card.anchors || [],
tooltip: sessionStorage.getItem('appType') === 'mob' ? '娉細灏忕▼搴忎腑鏃犳晥' : '',
required: false,
- options: anchors
+ options: anchors,
+ forbid: !anchors
},
{
type: 'number',
@@ -413,7 +411,8 @@
min: 0,
max: 50,
label: '绾垮',
- initVal: card.borderWidth || 1,
+ initVal: card.borderWidth === undefined ? 1 : card.borderWidth,
+ tooltip: '绾垮涓�0鏃讹紝涓烘柟渚垮湪寮�鍙戞椂閫変腑榛樿楂樺害涓�10px锛岃娉ㄦ剰璋冩暣鍐呭杈硅窛銆�',
required: true
},
{
@@ -441,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',
@@ -501,27 +512,6 @@
},
{
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',
label: '閾炬帴鍦板潃',
initVal: card.linkurl || '',
@@ -531,15 +521,15 @@
{
type: 'radio',
key: 'joint',
- label: Formdict['model.form.paramJoint'],
+ label: '鎷兼帴鍙傛暟',
initVal: card.joint || 'true',
required: false,
options: [{
value: 'true',
- text: Formdict['model.true']
+ text: '鏄�'
}, {
value: 'false',
- text: Formdict['model.false']
+ text: '鍚�'
}]
},
{
@@ -551,10 +541,10 @@
required: false,
options: [{
value: 'true',
- text: Formdict['model.true']
+ text: '鏄�'
}, {
value: 'false',
- text: Formdict['model.false']
+ text: '鍚�'
}]
},
{
@@ -571,7 +561,7 @@
key: 'noValue',
label: '绌哄��',
initVal: card.noValue || 'show',
- tooltip: '褰撳厓绱犲唴瀹逛负绌烘椂锛屾槸鍚︽樉绀哄綋鍓嶅厓绱犮��',
+ tooltip: '褰撳厓绱犲唴瀹逛负绌烘椂锛屾槸鍚︽樉绀哄綋鍓嶅厓绱犮�傛敞锛氭暟鍊肩被鍨嬪厓绱犲寘鎷暟瀛�0锛堥潪鏂囨湰锛夈��',
required: false,
options: [
{ value: 'show', text: '鏄剧ず' },
--
Gitblit v1.8.0