Merge remote-tracking branch 'origin/main'

This commit is contained in:
hekaiyu 2025-04-28 22:51:27 +08:00
commit 7df3e246bf
6 changed files with 18 additions and 16 deletions

View File

@ -622,10 +622,12 @@ textarea,
.ant-input-number-handler-up-inner, .ant-input-number-handler-up-inner,
.ant-input-number-handler-down-inner, .ant-input-number-handler-down-inner,
.ant-select-tree-dropdown, .ant-select-tree-dropdown,
.ant-select-dropdown-menu-item,
.ant-select-dropdown-menu-item-selected { .ant-select-dropdown-menu-item-selected {
background: @inpuitbackcolor !important; background: @inpuitbackcolor !important;
} }
.ant-select-dropdown-menu-item{
background: @backcolor !important;
}
.ant-select-dropdown-content { .ant-select-dropdown-content {
background: @backcolor !important; background: @backcolor !important;
} }

View File

@ -3,7 +3,7 @@
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" >
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="数据库名称"> <a-form-item label="数据库名称">
@ -12,7 +12,7 @@
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="数据类型"> <a-form-item label="数据类型">
<a-select placeholder="选择数据类型" option-filter-prop="children" size="large" v-model="dataTypeId"> <a-select placeholder="选择数据类型" option-filter-prop="children" v-model="dataTypeId">
<a-select-option v-for="d in dataTypedataSources" :key="d.id"> <a-select-option v-for="d in dataTypedataSources" :key="d.id">
{{ d.cnName }} {{ d.cnName }}
</a-select-option> </a-select-option>
@ -21,7 +21,7 @@
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="同步状态"> <a-form-item label="同步状态">
<a-select placeholder="选择同步状态" option-filter-prop="children" size="large" v-model="syncState"> <a-select placeholder="选择同步状态" option-filter-prop="children" v-model="syncState">
<a-select-option key=""> <a-select-option key="">
全部 全部
</a-select-option> </a-select-option>

View File

@ -131,9 +131,9 @@ export default {
getDataType() { getDataType() {
getAction("/dataType/getExistingDataTypes", {}).then((res) => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.success) { if (res.success) {
this.dataTypeList = res.result.result.DATA_CONN_STANDARD this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL
if(res.result.result.DATA_CONN_STANDARD.length > 0){ if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
this.queryParam.dataType = res.result.result.DATA_CONN_STANDARD[0].enName this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName
} }
this.getQueryPage() this.getQueryPage()
} else { } else {

View File

@ -131,9 +131,9 @@ export default {
getDataType() { getDataType() {
getAction("/dataType/getExistingDataTypes", {}).then((res) => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.success) { if (res.success) {
this.dataTypeList = res.result.result.DATA_CONN_STANDARD this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL
if(res.result.result.DATA_CONN_STANDARD.length > 0){ if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
this.queryParam.dataType = res.result.result.DATA_CONN_STANDARD[0].enName this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName
} }
this.getQueryPage() this.getQueryPage()
} else { } else {

View File

@ -153,9 +153,9 @@ export default {
getDataType() { getDataType() {
getAction("/dataType/getExistingDataTypes", {}).then((res) => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.success) { if (res.success) {
this.dataTypeList = res.result.result.DATA_CONN_STANDARD this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL
if(res.result.result.DATA_CONN_STANDARD.length > 0){ if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
this.queryParam.dataType = res.result.result.DATA_CONN_STANDARD[0].enName this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName
} }
this.getQueryPage() this.getQueryPage()
} else { } else {

View File

@ -177,9 +177,9 @@ export default {
getDataType() { getDataType() {
getAction("/dataType/getExistingDataTypes", {}).then((res) => { getAction("/dataType/getExistingDataTypes", {}).then((res) => {
if (res.success) { if (res.success) {
this.dataTypeList = res.result.result.DATA_CONN_STANDARD this.dataTypeList = res.result.result.DATA_CONN_ORIGINAL
if(res.result.result.DATA_CONN_STANDARD.length > 0){ if(res.result.result.DATA_CONN_ORIGINAL.length > 0){
this.queryParam.dataType = res.result.result.DATA_CONN_STANDARD[0].enName this.queryParam.dataType = res.result.result.DATA_CONN_ORIGINAL[0].enName
} }
this.getQueryPage() this.getQueryPage()
} else { } else {