From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/sysinterface/index.jsx | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/menu/sysinterface/index.jsx b/src/menu/sysinterface/index.jsx
index e957516..5952f9c 100644
--- a/src/menu/sysinterface/index.jsx
+++ b/src/menu/sysinterface/index.jsx
@@ -74,11 +74,6 @@
copy = (item) => {
let msg = { key: 'interface', type: 'line', data: item }
- let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
- if (srcid) {
- msg.$srcId = srcid
- }
-
try {
msg = window.btoa(window.encodeURIComponent(JSON.stringify(msg)))
} catch (e) {
@@ -176,7 +171,7 @@
let trimreg = /(from|update|insert\s+into)\s+(@db@)?/ig
if (record.setting.interType === 'system') {
- if (record.setting.execute !== 'false') {
+ if (record.setting.execute !== 'false' && record.setting.dataresource) {
let tbs = record.setting.dataresource.match(cutreg)
tbs && cuts.push(...tbs)
}
@@ -185,7 +180,7 @@
let tbs = script.sql.match(cutreg)
tbs && cuts.push(...tbs)
})
- } else {
+ } else if (record.setting.tableName) {
let tb = record.setting.tableName.replace(/@db@|\s+/ig, '')
if (/[a-z_]+/ig.test(tb)) {
tables.push(tb)
@@ -211,6 +206,8 @@
record.name = record.setting.name
record.$tables = this.getTables(record)
+ delete record.subColumns
+
let interfaces = this.state.interfaces.map(item => {
if (item.uuid !== record.uuid) {
return item
@@ -221,6 +218,7 @@
this.setState({ interfaces })
this.props.updateConfig({...config, interfaces})
+ MKEmitter.emit('editLineId', record.uuid)
setTimeout(() => {
MKEmitter.emit('mkUpdateInter', record, {delay: 0})
}, 10)
@@ -252,7 +250,7 @@
const { visible, columns, interfaces } = this.state
return (
- <div className="mk-sys-interface" style={{display: 'inline-block'}}>
+ <>
<Button className="mk-border-danger" onClick={this.trigger}><DatabaseOutlined /> 鍏叡鏁版嵁婧�</Button>
<Modal
title="鍏叡鏁版嵁婧�"
@@ -271,7 +269,7 @@
<PlusOutlined key="add-interface" onClick={this.addInterface}/>
<EditTable key="manage-interface" actions={['copy']} type="interface" data={interfaces} columns={columns} onChange={this.changeScripts}/>
</Modal>
- </div>
+ </>
)
}
}
--
Gitblit v1.8.0