From 4cc738e535d1a20701d206e12cf9de8cc5a01170 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 01 六月 2024 15:24:12 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/components/form/step-form/options.jsx | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/menu/components/form/step-form/options.jsx b/src/menu/components/form/step-form/options.jsx
index 647d7a0..aca8cd7 100644
--- a/src/menu/components/form/step-form/options.jsx
+++ b/src/menu/components/form/step-form/options.jsx
@@ -35,7 +35,8 @@
if (item.status === 'true') {
interfaces.push({
value: item.uuid,
- label: item.name
+ label: item.name,
+ columns: JSON.parse(JSON.stringify(item.columns))
})
}
})
@@ -87,23 +88,15 @@
required: true,
options: interfaces,
reset_source: config.subtype !== 'tabform',
- 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 _sCtrl = map.get('statusControl')
-
- if (_sCtrl && !_sCtrl.forbid) {
- _sCtrl.options = columns
- _sCtrl.oriOptions = columns
- map.set('statusControl', _sCtrl)
+ return {
+ statusControl: d.columns
}
}
},
@@ -113,6 +106,7 @@
label: '鐘舵�佹帶鍒�',
initval: wrap.statusControl || '',
tooltip: '琛ㄥ崟鍔犺浇鏃剁殑鐘舵�侊紝褰撳瓧娈靛�间笌琛ㄥ崟缁勭殑鐘舵�佸�间竴鑷存椂锛屽惎鐢ㄥ搴旂殑琛ㄥ崟缁勩��',
+ timestamp: new Date().getTime(),
required: false,
options: config.columns,
forbid: config.subtype === 'tabform'
--
Gitblit v1.8.0