From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 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 14981f8..263da80 100644
--- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
+++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx
@@ -55,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 [
@@ -257,6 +265,7 @@
key: 'dataSource',
label: '鏁版嵁婧�',
initVal: card.dataSource || '',
+ placeholder: '绯荤粺鍙橀噺锛歮k_departmentcode銆乵k_organization銆乵k_user_type銆�',
required: true,
},
{
--
Gitblit v1.8.0