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 frontend/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@
"interface_url": "Interface URL",
"format_is_incorrect": "format is incorrect{msg}",
"domain_format_incorrect": ", start with http:// or https://, no trailing slash (/), multiple domains separated by semicolons",
"interface_url_incorrect": ",enter a relative path starting with /",
"interface_url_incorrect": ", enter a relative path starting with /, or an absolute path starting with http:// or https://",
"aes_enable": "Enable AES encryption",
"aes_enable_tips": "The fields (host, user, password, dataBase, schema) are all encrypted using the AES-CBC-PKCS5Padding encryption method",
"bit": "bit",
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/i18n/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
"interface_url": "인터페이스 URL",
"format_is_incorrect": "형식이 올바르지 않습니다{msg}",
"domain_format_incorrect": ", http:// 또는 https://로 시작해야 하며, 슬래시(/)로 끝날 수 없습니다. 여러 도메인은 세미콜론으로 구분합니다",
"interface_url_incorrect": ", 상대 경로를 입력해주세요. /로 시작합니다",
"interface_url_incorrect": ", 상대 경로는 /로 시작하거나, 절대 경로는 http:// 또는 https://로 시작하는 경로를 입력해 주세요.",
"aes_enable": "AES 암호화 활성화",
"aes_enable_tips": "암호화 필드 (host, user, password, dataBase, schema)는 모두 AES-CBC-PKCS5Padding 암호화 방식을 사용합니다",
"bit": "비트",
Expand Down Expand Up @@ -948,4 +948,4 @@
"to_doc": "API 보기",
"trigger_limit": "최대 {0}개의 API 키 생성 지원"
}
}
}
12 changes: 6 additions & 6 deletions frontend/src/i18n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -668,7 +668,7 @@
"interface_url": "接口 URL",
"format_is_incorrect": "格式不对{msg}",
"domain_format_incorrect": ",http或https开头,不能以 / 结尾,多个域名以分号(半角)分隔",
"interface_url_incorrect": ",请填写相对路径,以/开头",
"interface_url_incorrect": ",请填写相对路径,以/开头,或者绝对路径以http或https开头",
"aes_enable": "开启 AES 加密",
"aes_enable_tips": "加密字段 (host, user, password, dataBase, schema) 均采用 AES-CBC-PKCS5Padding 加密方式",
"bit": "位",
Expand Down Expand Up @@ -777,11 +777,11 @@
"log_question": "本次提问",
"log_answer": "AI 回答",
"log_history": "历史记录",
"find_term_title":"匹配到 {0} 个术语",
"find_sql_sample_title":"匹配到 {0} 个SQL示例",
"find_custom_prompt_title":"匹配到 {0} 个自定义提示词",
"query_count_title":"查询到 {0} 条数据",
"generate_picture_success":"已生成图片"
"find_term_title": "匹配到 {0} 个术语",
"find_sql_sample_title": "匹配到 {0} 个SQL示例",
"find_custom_prompt_title": "匹配到 {0} 个自定义提示词",
"query_count_title": "查询到 {0} 条数据",
"generate_picture_success": "已生成图片"
},
"about": {
"title": "关于",
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/views/system/embedded/iframe.vue
Original file line number Diff line number Diff line change
Expand Up @@ -325,9 +325,10 @@ const validatePass = (_: any, value: any, callback: any) => {
} else {
// var Expression = /(https?:\/\/)?([\da-z\.-]+)\.([a-z]{2,6})(:\d{1,5})?([\/\w\.-]*)*\/?(#[\S]+)?/ // eslint-disable-line
// var Expression = /^https?:\/\/[^\s/?#]+(:\d+)?/i
const absoluteUrlRegex = /^https?:\/\/[^\s/?#]+(:\d+)?(\/[^\s?#]*)?(\?[^\s#]*)?(#\S*)?$/i
var Expression = /^\/([a-zA-Z0-9_-]+\/)*[a-zA-Z0-9_-]+(\?[a-zA-Z0-9_=&-]+)?$/
var objExp = new RegExp(Expression)
if (objExp.test(value)) {
if (objExp.test(value) || absoluteUrlRegex.test(value)) {
callback()
} else {
callback(t('embedded.format_is_incorrect', { msg: t('embedded.interface_url_incorrect') }))
Expand Down
Loading