public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-19 10:18:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 拼写错误

Browse Source
This commit is contained in:
taojinlong
2024-12-13 16:49:14 +08:00
committed by dataeaseShu
parent 06739df896
commit 3463517a54
8 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/datasource/server/EngineServer.java
View File

@@ -86,7 +86,7 @@ public class EngineServer implements EngineApi {
}
@Override
public boolean surportSetKey() throws Exception {
public boolean supportSetKey() throws Exception {
return !getEngine().getType().equalsIgnoreCase("h2");
}
}

2
core/core-frontend/src/api/datasource.ts
View File

@@ -175,4 +175,4 @@ export const listSyncRecord = (page: number, limit: number, dsId: number | strin
export const getDeEngine = () => request.get({ url: '/engine/getEngine' })
export const surportSetKey = () => request.get({ url: '/engine/surportSetKey' })
export const supportSetKey = () => request.get({ url: '/engine/supportSetKey' })

8
core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue
View File

@@ -109,7 +109,7 @@ const columns = shallowRef([])
const valueList = shallowRef([])
const tableData = shallowRef([])
const apiItemBasicInfo = ref<FormInstance>()
const isSurportSetKey = ref(false)
const isSupportSetKey = ref(false)
const isNumber = (rule, value, callback) => {
if (!value) {
callback(new Error(t('datasource.please_input_query_timeout')))
@@ -168,10 +168,10 @@ const editItem = ref(false)
const copyItem = ref(false)
const copyDs = ref(false)
provide('api-active-name', activeName)
const initApiItem = (val: ApiItem, from, name, edit, surportSetKey) => {
const initApiItem = (val: ApiItem, from, name, edit, supportSetKey) => {
copyItem.value = val.copy
copyDs.value = from.copy
isSurportSetKey.value = surportSetKey
isSupportSetKey.value = supportSetKey
activeName.value = name
editItem.value = edit
apiItemList = from.apiConfiguration
@@ -819,7 +819,7 @@ defineExpose({
prop="primaryKey"
class-name="checkbox-table"
:label="t('datasource.set_key')"
v-if="apiItem.type !== 'params' && isSurportSetKey"
v-if="apiItem.type !== 'params' && isSupportSetKey"
width="100"
>
<template #default="scope">

6
core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue
View File

@@ -58,13 +58,13 @@ const prop = defineProps({
default: 1,
type: Number
},
isSurportSetKey: {
isSupportSetKey: {
type: boolean,
required: true
}
})
const { form, activeStep, isSurportSetKey } = toRefs(prop)
const { form, activeStep, isSupportSetKey } = toRefs(prop)
const state = reactive({
itemRef: []
@@ -419,7 +419,7 @@ const addApiItem = item => {
form.value,
activeName.value,
editItem,
isSurportSetKey.value
isSupportSetKey.value
)
})
}

6
core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue
View File

@@ -65,13 +65,13 @@ const props = defineProps({
},
type: Object
},
isSurportSetKey: {
isSupportSetKey: {
type: boolean,
required: true
}
})
const { param, isSurportSetKey } = toRefs(props)
const { param, isSupportSetKey } = toRefs(props)
const { t } = useI18n()
const { emitter } = useEmitt()
@@ -742,7 +742,7 @@ defineExpose({
class-name="checkbox-table"
:label="t('datasource.set_key')"
width="100"
v-if="param.editType === 0 && isSurportSetKey"
v-if="param.editType === 0 && isSupportSetKey"
>
<template #default="scope">
<el-checkbox

10
core/core-frontend/src/views/visualized/data/datasource/form/index.vue
View File

@@ -80,7 +80,7 @@ const currentDsType = ref('')
const emits = defineEmits(['refresh'])
const { emitter } = useEmitt()
const isPlugin = ref(false)
const isSurportSetKey = ref(false)
const isSupportSetKey = ref(false)
const selectDsType = (type: string) => {
currentDsType.value = type
activeStep.value = 1
@@ -583,10 +583,10 @@ watch(
{ deep: true }
)
const init = (nodeInfo: Form | Param, id?: string, res?: object, surportSetKey: boolean) => {
const init = (nodeInfo: Form | Param, id?: string, res?: object, supportSetKey: boolean) => {
isPlugin.value = nodeInfo?.isPlugin
pluginIndex.value = isPlugin.value ? nodeInfo?.staticMap?.index : null
isSurportSetKey.value = surportSetKey
isSupportSetKey.value = supportSetKey
editDs.value = !!nodeInfo
showFinishPage.value = false
@@ -801,7 +801,7 @@ defineExpose({
:form="form"
:editDs="editDs"
:active-step="activeApiStep"
:is-surportSetKey="isSurportSetKey"
:is-supportSetKey="isSupportSetKey"
v-if="
activeStep !== 0 && currentDsType && currentDsType !== 'Excel' && visible && !isPlugin
"
@@ -821,7 +821,7 @@ defineExpose({
<template v-if="activeStep !== 0 && currentDsType == 'Excel'">
<excel-detail
:editDs="editDs"
:is-surportSetKey="isSurportSetKey"
:is-supportSetKey="isSupportSetKey"
ref="excel"
:param="form2"
></excel-detail>

22
core/core-frontend/src/views/visualized/data/datasource/index.vue
View File

@@ -48,7 +48,7 @@ import {
uploadFile,
perDeleteDatasource,
getSimpleDs,
surportSetKey
supportSetKey
} from '@/api/datasource'
import CreatDsGroup from './form/CreatDsGroup.vue'
import type { Tree } from '../dataset/form/CreatDsGroup.vue'
@@ -473,7 +473,7 @@ const saveDsFolder = (params, successCb, finallyCb, cmd) => {
const dsLoading = ref(false)
const mounted = ref(false)
const isSurportSetKey = ref(false)
const isSupportSetKey = ref(false)
const symmetricKey = ref('')
const listDs = () => {
@@ -512,10 +512,10 @@ const listDs = () => {
})
}
const setSurportSetKey = () => {
surportSetKey()
const setSupportSetKey = () => {
supportSetKey()
.then(response => {
isSurportSetKey.value = response.data
isSupportSetKey.value = response.data
})
.catch(error => {
console.warn(error?.message)
@@ -638,7 +638,7 @@ const handleNodeClick = data => {
})
}
const createDatasource = (data?: Tree) => {
datasourceEditor.value.init(null, data?.id, null, isSurportSetKey.value)
datasourceEditor.value.init(null, data?.id, null, isSupportSetKey.value)
}
const showRecord = ref(false)
const dsListTree = ref()
@@ -758,7 +758,7 @@ const editDatasource = (editType?: number) => {
isPlugin: arr && arr.length > 0,
staticMap: arr[0]?.staticMap
})
datasourceEditor.value.init(datasource, null, null, isSurportSetKey.value)
datasourceEditor.value.init(datasource, null, null, isSupportSetKey.value)
})
}
@@ -829,7 +829,7 @@ const handleCopy = async data => {
datasource.apiConfiguration[i].deTableName = ''
}
}
datasourceEditor.value.init(datasource, null, null, isSurportSetKey.value)
datasourceEditor.value.init(datasource, null, null, isSupportSetKey.value)
})
}
@@ -990,7 +990,7 @@ const uploadExcel = editType => {
return
}
nodeInfo.editType = editType
datasourceEditor.value.init(nodeInfo, nodeInfo.id, res, isSurportSetKey.value)
datasourceEditor.value.init(nodeInfo, nodeInfo.id, res, isSupportSetKey.value)
})
.finally(() => {
replaceLoading.value = false
@@ -1016,10 +1016,10 @@ onMounted(() => {
wsCache.delete('ds-info-id')
loadInit()
listDs()
setSurportSetKey()
setSupportSetKey()
const { opt } = router.currentRoute.value.query
if (opt && opt === 'create') {
datasourceEditor.value.init(null, null, null, isSurportSetKey.value)
datasourceEditor.value.init(null, null, null, isSupportSetKey.value)
}
querySymmetricKey().then(res => {
symmetricKey.value = res.data

4
sdk/api/api-base/src/main/java/io/dataease/api/ds/EngineApi.java
View File

@@ -25,6 +25,6 @@ public interface EngineApi {
@PostMapping("/validate/{id}")
void validateById(@PathVariable Long id) throws Exception;
@GetMapping("/surportSetKey")
boolean surportSetKey() throws Exception;
@GetMapping("/supportSetKey")
boolean supportSetKey() throws Exception;
}