From 437c6d72f76072e5ab1b09e78101370805113c4b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 01 十月 2023 18:46:37 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/datasource/index.jsx | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/menu/datasource/index.jsx b/src/menu/datasource/index.jsx
index eda176e..759e84e 100644
--- a/src/menu/datasource/index.jsx
+++ b/src/menu/datasource/index.jsx
@@ -6,6 +6,7 @@
import VerifyCard from './verifycard'
import CreateFunc from '@/templates/zshare/createfunc'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
class DataSource extends Component {
@@ -146,6 +147,14 @@
res.setting.supModule = ['empty']
}
+ if (!res.setting.primaryKey && res.columns && res.columns.length > 0) {
+ res.columns.forEach(col => {
+ if (col.field.toLowerCase() === 'id') {
+ res.setting.primaryKey = col.field
+ }
+ })
+ }
+
if (res.columns) {
res.columns = res.columns.map(item => {
@@ -226,8 +235,13 @@
} else {
delete res.cols
}
-
this.props.updateConfig({...config, ...res})
+
+ if (res.setting && res.setting.tableName && config.setting && !config.setting.tableName) {
+ setTimeout(() => {
+ MKEmitter.emit('publicTableChange', res.setting.tableName, 'init')
+ }, 150)
+ }
}, () => {
this.setState({loading: false})
})
--
Gitblit v1.8.0