From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 155 ++++++++++++++++++++++++---------------------------
1 files changed, 72 insertions(+), 83 deletions(-)
diff --git a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
index 6120716..263da80 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -14,7 +14,6 @@
roleList = []
}
- // if (['picture', 'link', 'colspan'].includes(card.type)) {
if (['picture', 'link'].includes(card.type)) {
card.type = 'text'
}
@@ -34,9 +33,6 @@
}, {
value: 'colspan',
text: '鍚堝苟鍒�'
- // }, {
- // value: 'action',
- // text: '鎿嶄綔'
}, {
value: 'formula',
text: '鍏紡'
@@ -44,13 +40,6 @@
value: 'index',
text: '搴忓彿'
}]
-
- if (!card.isSub) {
- options.push({
- value: 'action',
- text: '鎿嶄綔'
- })
- }
let editCols = [
{
@@ -66,22 +55,30 @@
label: '鏃犲姩浣�'
}
]
- columns.forEach(col => {
- if (col.editable === 'true' && col.uuid !== card.uuid) {
- editCols.push({
- field: col.uuid,
- label: col.label
- })
- } else if (col.type === 'colspan') {
- col.subcols.forEach(subcol => {
- if (subcol.editable === 'true' && subcol.uuid !== card.uuid) {
- editCols.push({
- field: subcol.uuid,
- label: col.label + '-' + subcol.label
- })
- }
- })
- }
+
+ let cols = []
+ let getcols = (columns, suplabel = '') => {
+ columns.forEach(col => {
+ if (col.editable === 'true' && col.uuid !== card.uuid) {
+ cols.push({
+ field: col.uuid,
+ label: suplabel + col.label
+ })
+ } else if (col.type === 'colspan') {
+ getcols(col.subcols, col.label + '-')
+ }
+ })
+ }
+
+ getcols(columns)
+
+ editCols.push(...cols)
+
+ cols.forEach(col => {
+ editCols.push({
+ field: '$next_' + col.field,
+ label: col.label + '锛堜笅涓�琛岋級'
+ })
})
return [
@@ -148,6 +145,18 @@
},
{
type: 'radio',
+ key: 'eval',
+ label: '瑙ｆ瀽',
+ initVal: card.eval || 'false',
+ tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
+ required: false,
+ options: [
+ { value: 'true', text: '鏄�' },
+ { value: 'false', text: '鍚�' }
+ ]
+ },
+ {
+ type: 'radio',
key: 'Align',
label: '瀵归綈鏂瑰紡',
initVal: card.Align || 'left',
@@ -161,21 +170,6 @@
}, {
value: 'right',
text: '鍙冲榻�'
- }]
- },
- {
- type: 'radio',
- key: 'sum',
- label: '鏄剧ず鍚堣',
- initVal: card.sum || 'false',
- tooltip: '鍚堣淇℃伅鍙湪浣跨敤绯荤粺鏁版嵁婧愭椂鏈夋晥銆�',
- required: false,
- options: [{
- value: 'true',
- text: '鏄�'
- }, {
- value: 'false',
- text: '鍚�'
}]
},
{
@@ -260,16 +254,6 @@
}]
},
{
- type: 'select',
- key: 'editField',
- label: '缂栬緫瀛楁',
- initVal: card.editField || '',
- tooltip: '褰撳�间笌鎻愮ず鏂囧瓧涓嶅悓鏃讹紝鍙澶栨坊鍔犵紪杈戝瓧娈碉紝浣滀负瀹為檯鍊肩殑褰曞叆瀛楁銆�',
- allowClear: true,
- required: false,
- options: fields
- },
- {
type: 'options',
key: 'options',
label: '閫夐」',
@@ -281,6 +265,7 @@
key: 'dataSource',
label: '鏁版嵁婧�',
initVal: card.dataSource || '',
+ placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆�',
required: true,
},
{
@@ -370,27 +355,28 @@
type: 'select',
key: 'enter',
label: '鍥炶溅鍒囨崲',
- initVal: card.enter || '$next',
+ initVal: card.enter || '$noAct',
tooltip: '鍖呮嫭鏂囨湰鎴栨暟鍊煎洖杞︿簨浠躲�佷笅鎷夎彍鍗曢�変腑浜嬩欢銆佸紑鍏冲垏鎹簨浠躲��',
options: editCols
},
- // {
- // type: 'radio',
- // key: 'footEnter',
- // label: '鏈鍥炶溅',
- // initVal: card.footEnter || 'false',
- // tooltip: '鏂板鍔熻兘浠呭湪琛ㄦ牸鍙柊澧炴椂鏈夋晥銆�',
- // options: [{
- // value: 'sub',
- // text: '鎻愪氦'
- // }, {
- // value: 'add',
- // text: '鏂板'
- // }, {
- // value: 'false',
- // text: '鏃犲姩浣�'
- // }]
- // },
+ {
+ type: 'select',
+ key: 'ctrlField',
+ label: '绂佺敤瀛楁',
+ initVal: card.ctrlField || '',
+ tooltip: '鎺у埗鍗曞厓鏍兼槸鍚﹀彲浠ョ紪杈戙��',
+ allowClear: true,
+ required: false,
+ options: fields
+ },
+ {
+ type: 'text',
+ key: 'ctrlValue',
+ label: '绂佺敤鍊�',
+ initVal: card.ctrlValue || '',
+ tooltip: '澶氫釜鍊肩敤閫楀彿鍒嗛殧銆�',
+ required: false
+ },
{
type: 'number',
key: 'decimal',
@@ -398,7 +384,7 @@
max: 18,
precision: 0,
label: '灏忔暟浣�',
- initVal: card.decimal || 0,
+ initVal: card.decimal,
required: false
},
{
@@ -472,18 +458,6 @@
required: false,
},
{
- type: 'radio',
- key: 'eval',
- label: '瑙ｆ瀽',
- initVal: card.eval || 'true',
- tooltip: '褰撳叕寮忓唴瀹规秹鍙婅绠楁椂璇烽�夋嫨鈥滄槸鈥濓紝褰撳叕寮忓唴瀹逛负瀛楁鎷兼帴鏃惰閫夋嫨鈥滃惁鈥濄��',
- required: false,
- options: [
- { value: 'true', text: '鏄�' },
- { value: 'false', text: '鍚�' }
- ]
- },
- {
type: 'textarea',
key: 'formula',
label: '鍏紡',
@@ -501,6 +475,21 @@
options: fields
},
{
+ type: 'radio',
+ key: 'noValue',
+ label: '绌哄��',
+ initVal: card.noValue || 'show',
+ tooltip: '褰撳�间负0鏃舵槸鍚︽樉绀�',
+ required: false,
+ options: [{
+ value: 'show',
+ text: '鏄剧ず'
+ }, {
+ value: 'hide',
+ text: '闅愯棌'
+ }]
+ },
+ {
type: 'multiselect',
key: 'blacklist',
label: '榛戝悕鍗�',
--
Gitblit v1.8.0