From f128d679cacda2a6b5b730ad0368b5fe73f887f7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 14 二月 2025 15:27:02 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/prop-card/index.jsx | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/menu/components/card/prop-card/index.jsx b/src/menu/components/card/prop-card/index.jsx
index c0b2914..ec54ba9 100644
--- a/src/menu/components/card/prop-card/index.jsx
+++ b/src/menu/components/card/prop-card/index.jsx
@@ -6,7 +6,7 @@
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-import { resetStyle, getTables, checkComponent } from '@/utils/utils-custom.js'
+import { resetStyle, getTables, checkComponent, getInterfaces } from '@/utils/utils-custom.js'
import MKEmitter from '@/utils/events.js'
import Utils from '@/utils/utils.js'
import getWrapForm from '../data-card/options'
@@ -50,7 +50,7 @@
name: card.name,
subtype: card.subtype,
setting: { interType: 'system' },
- wrap: { name: card.name, width: card.width || 24, title: '', datatype: 'static' },
+ wrap: { name: card.name, width: card.width || 24, title: '', datatype: 'static', cardType: 'radio' },
style: { marginLeft: '0px', marginRight: '0px', marginTop: '8px', marginBottom: '8px' },
headerStyle: { fontSize: '16px', borderBottomWidth: '1px', borderBottomColor: '#e8e8e8' },
columns: [],
@@ -135,6 +135,10 @@
card.$tables = getTables(card)
}
+ delete card.$c_ds
+ delete card.$c_ac
+ delete card.$c_sc
+
this.setState({
card: card
})
@@ -161,14 +165,14 @@
*/
deleteCard = (cell) => {
let card = fromJS(this.state.card).toJS()
- let _this = this
+ let that = this
confirm({
content: '纭畾鍒犻櫎鍗＄墖鍚楋紵',
onOk() {
card.subcards = card.subcards.filter(item => item.uuid !== cell.uuid)
- _this.updateComponent(card)
+ that.updateComponent(card)
},
onCancel() {}
})
@@ -331,9 +335,9 @@
_card.setting.supModule = ''
}
} else if (res.datatype === 'public') {
- let interfaces = window.GLOB.customMenu.interfaces || []
+ let interfaces = getInterfaces()
- let d = interfaces.filter(m => m.uuid === res.publicId && m.status === 'true')[0]
+ let d = interfaces.filter(m => m.value === res.publicId)[0]
if (d) {
_card.columns = fromJS(d.columns).toJS()
--
Gitblit v1.8.0