From ba4d6e414fbb37121e80815d3f5ab1aca7a60b08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 28 十月 2024 13:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/menu/sysinterface/index.jsx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/menu/sysinterface/index.jsx b/src/menu/sysinterface/index.jsx
index 6c88dcc..3c61833 100644
--- a/src/menu/sysinterface/index.jsx
+++ b/src/menu/sysinterface/index.jsx
@@ -74,7 +74,7 @@
copy = (item) => {
let msg = { key: 'interface', type: 'line', data: item }
- let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
+ let srcid = localStorage.getItem(window.GLOB.sysSign + 'srcId')
if (srcid) {
msg.$srcId = srcid
}
@@ -176,7 +176,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 +185,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 +211,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
--
Gitblit v1.8.0