From 07c005cf28acf74e3afde82122e4c53e1000d70c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 六月 2023 12:06:18 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/editor/braft-editor/options.jsx | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/editor/braft-editor/options.jsx b/src/menu/components/editor/braft-editor/options.jsx
index 134bf6a..908efea 100644
--- a/src/menu/components/editor/braft-editor/options.jsx
+++ b/src/menu/components/editor/braft-editor/options.jsx
@@ -69,6 +69,7 @@
],
controlFields: [
{field: 'field', values: ['dynamic', 'public']},
+ {field: 'empty', values: ['dynamic', 'public']},
{field: 'publicId', values: ['public']},
{field: 'encryption', values: ['dynamic', 'public']},
]
@@ -79,14 +80,33 @@
label: '鏁版嵁婧�',
initval: wrap.publicId || '',
required: true,
- options: interfaces
+ options: interfaces,
+ reset_source: true,
+ callback: (map, record) => {
+ if (!record.publicId) return
+
+ let interfaces = window.GLOB.customMenu.interfaces || []
+
+ let d = interfaces.filter(m => m.uuid === record.publicId && m.status === 'true')[0]
+
+ if (!d || !d.columns) return
+
+ let columns = JSON.parse(JSON.stringify(d.columns))
+
+ let _field = map.get('field')
+
+ if (_field) {
+ _field.options = columns
+ _field.oriOptions = columns
+ map.set('field', _field)
+ }
+ }
},
{
type: 'select',
field: 'field',
label: '鏂囨湰瀛楁',
initval: wrap.field || '',
- tooltip: '閫夋嫨鍔ㄦ�佸�兼椂锛岄渶璁剧疆鏂囨湰瀛楁鎵嶅彲鐢熸晥銆�',
required: false,
options: columns
},
@@ -104,6 +124,31 @@
},
{
type: 'radio',
+ field: 'empty',
+ label: '绌哄�奸殣钘�',
+ initval: wrap.empty || 'show',
+ tooltip: '褰撴煡璇㈡暟鎹负绌烘椂锛岄殣钘忚缁勪欢銆�',
+ required: false,
+ skip: true,
+ options: [
+ {value: 'show', label: '鍚�'},
+ {value: 'hidden', label: '鏄�'},
+ ],
+ },
+ {
+ type: 'radio',
+ field: 'firstTr',
+ label: '琛ㄦ牸棣栬',
+ initval: wrap.firstTr || 'deep',
+ tooltip: '瀵屾枃鏈腑table鐨勯琛岃儗鏅鑹层��',
+ required: false,
+ options: [
+ {value: 'deep', label: '娣辫壊'},
+ {value: 'light', label: '娴呰壊'},
+ ]
+ },
+ {
+ type: 'radio',
field: 'permission',
label: '鏉冮檺楠岃瘉',
initval: wrap.permission || 'false',
--
Gitblit v1.8.0