Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/apps/system/crud/assistant.py
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def get_ds_engine(ds: AssistantOutDsSchema) -> Engine:
password=ds.password,
database=ds.dataBase,
driver='',
extraJdbc=ds.extraParams,
extraJdbc=ds.extraParams or '',
dbSchema=ds.db_schema or ''
)
conf.extraJdbc = ''
Expand Down
29 changes: 27 additions & 2 deletions frontend/public/assistant.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
const getChatContainerHtml = (data) => {
return `
<div id="sqlbot-assistant-chat-container">
<iframe id="sqlbot-assistant-chat-iframe-${data.id}" allow="microphone;clipboard-read 'src'; clipboard-write 'src'" src="${data.domain_url}/#/assistant?id=${data.id}&online=${!!data.online}&name=${encodeURIComponent(data.name)}"></iframe>
<iframe id="sqlbot-assistant-chat-iframe-${data.id}" allow="microphone;clipboard-read 'src'; clipboard-write 'src'" src="${data.domain_url}/#/assistant?id=${data.id}&online=${!!data.online}&name=${encodeURIComponent(data.name)}&userFlag=${data.userFlag || ''}"></iframe>
<div class="sqlbot-assistant-operate">
<div class="sqlbot-assistant-closeviewport sqlbot-assistant-viewportnone">
<svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
Expand Down Expand Up @@ -498,6 +498,7 @@
function loadScript(src, id) {
const domain_url = getDomain(src)
const online = getParam(src, 'online')
const userFlag = getParam(src, 'userFlag')
let url = `${domain_url}/api/v1/system/assistant/info/${id}`
if (domain_url.includes('5173')) {
url = url.replace('5173', '8000')
Expand Down Expand Up @@ -534,6 +535,7 @@
}

tempData['online'] = online && online.toString().toLowerCase() == 'true'
tempData['userFlag'] = userFlag
initsqlbot_assistant(tempData)
if (data.type == 1) {
registerMessageEvent(id, tempData)
Expand Down Expand Up @@ -708,7 +710,7 @@
contentWindow.postMessage(params, url)
}
}
window.sqlbot_assistant_handler[id]['refresh'] = (online) => {
window.sqlbot_assistant_handler[id]['refresh'] = (online, userFlag) => {
if (online != null && typeof online != 'boolean') {
throw new Error('The parameter can only be of type boolean')
}
Expand All @@ -719,12 +721,35 @@
if (online != null) {
new_url = updateParam(new_url, 'online', online)
}
if (userFlag != null) {
new_url = updateParam(new_url, 'userFlag', userFlag)
}
iframe.src = 'about:blank'
setTimeout(() => {
iframe.src = new_url
}, 500)
}
}
window.sqlbot_assistant_handler[id]['destroy'] = () => {
const sqlbot_root_id = 'sqlbot-assistant-root-' + id
const container_div = document.getElementById(sqlbot_root_id)
if (container_div) {
const root_div = container_div.parentNode
if (root_div?.parentNode) {
root_div.parentNode.removeChild(root_div)
}
}

const scriptDom = document.getElementById(`sqlbot-assistant-float-script-${id}`)
if (scriptDom) {
scriptDom.parentNode.removeChild(scriptDom)
}
const propName = script_id_prefix + id + '-state'
if (window[propName]) {
delete window[propName]
}
delete window.sqlbot_assistant_handler[id]
}
}
// window.addEventListener('load', init)
const executeWhenReady = (fn) => {
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/utils/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ export function colorStringToHex(colorStr: any) {

export const setCurrentColor = (color: any, element: HTMLElement = document.documentElement) => {
const currentColor = colorStringToHex(color) as any
if (!currentColor) {
return
}
element.style.setProperty('--ed-color-primary', currentColor)
element.style.setProperty('--van-blue', currentColor)
element.style.setProperty(
Expand Down