From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/menu/datasource/index.jsx | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/menu/datasource/index.jsx b/src/menu/datasource/index.jsx
index f405cf1..27d9a81 100644
--- a/src/menu/datasource/index.jsx
+++ b/src/menu/datasource/index.jsx
@@ -4,8 +4,6 @@
import { Modal } from 'antd'
import { SettingOutlined } from '@ant-design/icons'
-import zhCN from '@/locales/zh-CN/model.js'
-import enUS from '@/locales/en-US/model.js'
import VerifyCard from './verifycard'
import './index.scss'
@@ -16,7 +14,6 @@
}
state = {
- dict: sessionStorage.getItem('lang') !== 'en-US' ? zhCN : enUS,
appType: sessionStorage.getItem('appType'),
sourcelist: [],
mainSearch: [],
@@ -38,6 +35,11 @@
editDataSource = () => {
const { config } = this.props
const { appType } = this.state
+
+ if (config.type === 'interface') { // 鍏叡鏁版嵁婧愪笉浣跨敤鎼滅储
+ this.setState({visible: true})
+ return
+ }
let search = []
let menu = fromJS(window.GLOB.customMenu).toJS()
@@ -160,6 +162,8 @@
}
return item
})
+
+ res.columns.reverse()
}
let maxScript = 0
@@ -182,9 +186,31 @@
}
})
})
+ } else {
+ res.scripts.forEach(item => {
+ if (item.status === 'false') return
+
+ if (/exec\s/ig.test(item.sql)) {
+ maxScript = 1000
+ } else if (item.sql.length > maxScript) {
+ maxScript = item.sql.length
+ }
+ })
}
res.setting.maxScript = maxScript
+
+ if (config.subtype !== 'dualdatacard') {
+ delete res.subColumns
+ } else {
+ res.subColumns.reverse()
+ }
+
+ if (this.verifyRef.state.debugId) {
+ res.setting.debugId = this.verifyRef.state.debugId
+ } else {
+ delete res.setting.debugId
+ }
this.setState({loading: false, visible: false})
this.props.updateConfig({...config, ...res})
@@ -195,25 +221,24 @@
render () {
const { config } = this.props
- const { visible, dict, loading, mainSearch } = this.state
+ const { visible, loading, mainSearch } = this.state
return (
<div className="model-datasource">
<SettingOutlined title="鏁版嵁婧�" onClick={() => this.editDataSource()} />
<Modal
- wrapClassName="popview-modal"
- title={'鏁版嵁婧愰厤缃�'}
+ wrapClassName="mk-pop-modal"
+ title=""
visible={visible}
width={'75vw'}
maskClosable={false}
- okText={dict['model.submit']}
+ okText="鎻愪氦"
onOk={this.verifySubmit}
confirmLoading={loading}
- onCancel={() => { this.setState({ visible: false }) }}
+ onCancel={() => {this.setState({ visible: false }) }}
destroyOnClose
>
<VerifyCard
- dict={dict}
mainSearch={mainSearch}
config={config}
wrappedComponentRef={(inst) => this.verifyRef = inst}
--
Gitblit v1.8.0