From 28d65cf7ebfe0dd30ade6973e0634e1c8f663b63 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 十月 2020 16:12:20 +0800
Subject: [PATCH] 2020-10-28
---
src/templates/zshare/formconfig.jsx | 70 ++--------------------------------
1 files changed, 5 insertions(+), 65 deletions(-)
diff --git a/src/templates/zshare/formconfig.jsx b/src/templates/zshare/formconfig.jsx
index 911b47b..8ec08e5 100644
--- a/src/templates/zshare/formconfig.jsx
+++ b/src/templates/zshare/formconfig.jsx
@@ -1361,44 +1361,13 @@
required: true
},
{
- type: 'radio',
- key: 'over',
- label: '瓒呭嚭鏃�',
- initVal: card.over || 'whole',
- required: true,
- hidden: true,
- options: [{
- value: 'whole',
- text: '灞曠ず鍏ㄩ儴'
- }, {
- value: 'roll',
- text: '婊氬姩'
- }]
- },
- {
- type: 'radio',
- key: 'widthType',
- label: '瀹藉害璁剧疆',
- initVal: card.over === 'roll' ? 'absolute' : card.widthType || 'ratio',
- required: true,
- hidden: true,
- readonly: card.over === 'roll',
- options: [{
- value: 'ratio',
- text: '姣斾緥'
- }, {
- value: 'absolute',
- text: '缁濆鍊�'
- }]
- },
- {
type: 'number',
key: 'cardWidth',
- min: card.widthType === 'absolute' ? 50 : 1,
- max: card.widthType === 'absolute' ? 1000 : 24,
+ min: 1,
+ max: 24,
decimal: 0,
label: '鍗＄墖瀹藉害',
- tooltip: '绫诲瀷涓烘瘮渚嬫椂锛屾爡鏍煎竷灞�锛屾瘡琛岀瓑鍒嗕负24鍒楋紱绫诲瀷涓虹粷瀵瑰�硷紝鑼冨洿50-1000銆�',
+ tooltip: '鏍呮牸甯冨眬锛屾瘡琛岀瓑鍒嗕负24鍒椼��',
initVal: card.cardWidth || 6,
hidden: true,
required: true
@@ -2421,9 +2390,8 @@
* @param {array} _columns // 鏄剧ず鍒�
* @param {string} _type // 绫诲瀷锛屽崱鐗囩殑閮ㄤ綅
* @param {array} _actions // 鎸夐挳鍒楄〃
- * @param {boolean} isRatioCard // 琛ㄦ牸瀹藉害绫诲瀷锛屾槸鍚︿负姣斾緥
*/
-export function getCardDetailForm (card, _columns, _type, _actions = [], isRatioCard) {
+export function getCardDetailForm (card, _columns, _type, _actions = []) {
let actions = ''
if (_type === 'bottom') {
actions = card.actions ? card.actions.map(cell => cell.value) : []
@@ -2549,7 +2517,7 @@
label: '瀹藉害(%)',
initVal: card.width || 100,
required: true,
- forbid: !['detail'].includes(_type)
+ forbid: !['detail', 'avatar'].includes(_type)
},
{
type: 'number',
@@ -2560,34 +2528,6 @@
initVal: card.height || 1,
required: true,
forbid: !['detail'].includes(_type)
- },
- {
- type: 'radio',
- key: 'widthType',
- label: '瀹藉害璁剧疆',
- initVal: card.widthType || 'ratio',
- required: false,
- forbid: !['avatar'].includes(_type),
- hidden: true,
- readonly: !!isRatioCard,
- options: [{
- value: 'ratio',
- text: '姣斾緥'
- }, {
- value: 'absolute',
- text: '缁濆鍊�'
- }]
- },
- {
- type: 'number',
- key: 'width',
- label: '瀹藉害鍊�',
- initVal: card.width || 32,
- min: 1,
- max: card.widthType === 'ratio' ? 100 : 500,
- required: false,
- hidden: true,
- forbid: !['avatar'].includes(_type)
},
{
type: 'radio',
--
Gitblit v1.8.0