From db942b44e0755ee1ce4bc8912be2cb1ca5f89c95 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 02 七月 2024 17:04:41 +0800 Subject: [PATCH] Merge branch 'master' into positec --- src/menu/datasource/index.jsx | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/menu/datasource/index.jsx b/src/menu/datasource/index.jsx index 92a16b3..769b314 100644 --- a/src/menu/datasource/index.jsx +++ b/src/menu/datasource/index.jsx @@ -1,7 +1,7 @@ import React, {Component} from 'react' import PropTypes from 'prop-types' import { is, fromJS } from 'immutable' -import { Modal, Button } from 'antd' +import { Modal, Button, notification } from 'antd' import { SettingOutlined } from '@ant-design/icons' import VerifyCard from './verifycard' @@ -179,6 +179,7 @@ } let maxScript = 0 + let useExec = false if (window.GLOB.funcs && window.GLOB.funcs.length > 0) { window.GLOB.funcs.forEach(m => { @@ -192,6 +193,7 @@ if (item.status === 'false') return if (/exec\s/ig.test(item.sql)) { + useExec = true maxScript = 1000 } else if (item.sql.length > maxScript) { maxScript = item.sql.length @@ -203,6 +205,7 @@ if (item.status === 'false') return if (/exec\s/ig.test(item.sql)) { + useExec = true maxScript = 1000 } else if (item.sql.length > maxScript) { maxScript = item.sql.length @@ -212,6 +215,14 @@ res.setting.maxScript = maxScript + if (useExec && res.setting.sync === 'true') { + notification.warning({ + top: 92, + message: '褰撳墠鏁版嵁婧愪娇鐢ㄤ簡鍚屾鏌ヨ涓旇嚜瀹氫箟鑴氭湰涓瓨鍦ㄥ嚱鏁癳xec锛屽閬囨帴鍙f姤閿欓渶鍏抽棴鍚屾鏌ヨ鍚庨噸鏂版祴璇曘��', + duration: 5 + }) + } + if (config.subtype !== 'dualdatacard') { delete res.subColumns if (config.type === 'interface') { -- Gitblit v1.8.0