From bd9dfa6b6ff25dbab21ba9a249fc9d9f4d03dce2 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 20 二月 2024 14:08:39 +0800 Subject: [PATCH] Merge branch 'develop' --- src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 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 9f4eb5c..5a1a212 100644 --- a/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx +++ b/src/menu/components/table/edit-table/columns/editColumn/formconfig.jsx @@ -93,6 +93,16 @@ label: card.label + '锛堜笅涓�琛岋級' }) + if (wrap.commit === 'change') { + editCols.push({ + field: '$noActX', + label: '鏃犲姩浣�', + disabled: card.editType !== 'select' + }) + } else if (card.enter === '$noActX') { + card.enter = '$noAct' + } + return [ { type: 'text', @@ -431,6 +441,15 @@ }, { type: 'select', + key: 'showField', + label: '鏄剧ず瀛楁', + initVal: card.showField || '', + tooltip: '鐢ㄤ簬鎺у埗鍗曞厓鏍间腑鐨勬樉绀哄唴瀹广��', + required: false, + options: 'columns' + }, + { + type: 'select', key: 'controlField', label: '绂佺敤瀛楁', initVal: card.controlField || '', -- Gitblit v1.8.0