From a99caad99c3c19e85edd03f2fe425a0630033ac5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 20 十一月 2024 16:09:11 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/editor/braft-editor/options.jsx | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/src/menu/components/editor/braft-editor/options.jsx b/src/menu/components/editor/braft-editor/options.jsx
index 922cc66..44defce 100644
--- a/src/menu/components/editor/braft-editor/options.jsx
+++ b/src/menu/components/editor/braft-editor/options.jsx
@@ -7,14 +7,15 @@
let isprint = sessionStorage.getItem('MenuType') === 'billPrint'
let ispop = sessionStorage.getItem('editMenuType') === 'popview'
let menu = window.GLOB.customMenu
-
let interfaces = []
+
if (menu.interfaces) {
menu.interfaces.forEach(item => {
if (item.status === 'true') {
interfaces.push({
value: item.uuid,
- label: item.name
+ label: item.name,
+ columns: JSON.parse(JSON.stringify(item.columns))
})
}
})
@@ -84,23 +85,15 @@
required: true,
options: interfaces,
reset_source: true,
- callback: (map, record) => {
+ callback: (record) => {
if (!record.publicId) return
- let interfaces = window.GLOB.customMenu.interfaces || []
-
- let d = interfaces.filter(m => m.uuid === record.publicId && m.status === 'true')[0]
+ let d = interfaces.filter(m => m.value === record.publicId)[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)
+ return {
+ field: d.columns
}
}
},
@@ -109,6 +102,7 @@
field: 'field',
label: '鏂囨湰瀛楁',
initval: wrap.field || '',
+ timestamp: new Date().getTime(),
required: false,
options: columns
},
@@ -131,24 +125,39 @@
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鐨勯琛岃儗鏅鑹层��',
+ type: 'checkbox',
+ field: 'tbStyle',
+ label: '琛ㄦ牸鏍峰紡',
+ initval: wrap.tbStyle ? wrap.tbStyle.split(' ') : [],
+ tooltip: '瀵屾枃鏈腑琛ㄦ牸鐨勬牱寮忥紝娉細閫夋嫨鈥滆竟妗嗗姞绮椻�濇垨鈥滆竟妗嗛鑹插姞娣扁�濇椂鈥滄棤杈规鈥濇棤鏁堛��',
required: false,
options: [
- {value: 'deep', label: '娣辫壊'},
- {value: 'light', label: '娴呰壊'},
- ]
+ {value: 'th-light', label: '琛ㄥご閫忔槑'},
+ {value: 'tb-flex', label: '鍒楃瓑瀹�'},
+ {value: 'no-border', label: '鏃犺竟妗�'},
+ {value: 'bold-border', label: '杈规鍔犵矖'},
+ {value: 'deep-border', label: '杈规棰滆壊鍔犳繁'},
+ ],
+ span: 24
},
+ // {
+ // type: 'radio',
+ // field: 'firstTr',
+ // label: '琛ㄦ牸棣栬',
+ // initval: wrap.firstTr || 'deep',
+ // tooltip: '瀵屾枃鏈腑table鐨勯琛岃儗鏅鑹层��',
+ // required: false,
+ // options: [
+ // {value: 'deep', label: '娣辫壊'},
+ // {value: 'light', label: '娴呰壊'},
+ // ]
+ // },
{
type: 'radio',
field: 'permission',
--
Gitblit v1.8.0