diff --git a/core/core-backend/src/main/resources/application-standalone.yml b/core/core-backend/src/main/resources/application-standalone.yml index dc736ca3a7..5d7dab6ffb 100644 --- a/core/core-backend/src/main/resources/application-standalone.yml +++ b/core/core-backend/src/main/resources/application-standalone.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://localhost:3306/dataease?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://localhost:3306/dataease10?autoReconnect=false&useUnicode=true&characterEncoding=UTF-8&characterSetResults=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root password: 123456 messages: diff --git a/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue b/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue index 470d20efb7..fbe5a1f4ea 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeGroup.vue @@ -67,7 +67,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot' import { layerStoreWithOut } from '@/store/modules/data-visualization/layer' import { storeToRefs } from 'pinia' -import { ElIcon, ElRow } from 'element-plus-secondary' +import { ElIcon, ElMessage, ElRow } from 'element-plus-secondary' import Icon from '../icon-custom/src/Icon.vue' import { nextTick, ref, toRefs } from 'vue' import draggable from 'vuedraggable' @@ -79,9 +79,10 @@ import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg' import RealTimeTab from '@/components/data-visualization/RealTimeTab.vue' import bulletGraphOrigin from '@/assets/svg/bullet-graph-origin.svg' import { syncViewTitle } from '@/utils/canvasUtils' +import { useI18n } from '@/hooks/web/useI18n' const dropdownMore = ref(null) const lockStore = lockStoreWithOut() - +const { t } = useI18n() const dvMainStore = dvMainStoreWithOut() const snapshotStore = snapshotStoreWithOut() const layerStore = layerStoreWithOut() @@ -141,6 +142,10 @@ const closeEditComponentName = () => { if (inputName.value.trim() === curEditComponent.name) { return } + if (inputName.value.length < 1 || inputName.value.length > 64) { + ElMessage.warning(t('components.length_1_64_characters')) + return + } curEditComponent.name = inputName.value syncViewTitle(curEditComponent) inputName.value = '' diff --git a/core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue b/core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue index db8a361598..de29f96104 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeGroupInner.vue @@ -65,7 +65,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot' import { layerStoreWithOut } from '@/store/modules/data-visualization/layer' import { storeToRefs } from 'pinia' -import { ElIcon, ElRow } from 'element-plus-secondary' +import { ElIcon, ElMessage, ElRow } from 'element-plus-secondary' import Icon from '../icon-custom/src/Icon.vue' import { nextTick, ref, toRefs } from 'vue' import draggable from 'vuedraggable' @@ -76,9 +76,10 @@ import { composeStoreWithOut } from '@/store/modules/data-visualization/compose' import circlePackingOrigin from '@/assets/svg/circle-packing-origin.svg' import bulletGraphOrigin from '@/assets/svg/bullet-graph-origin.svg' import { syncViewTitle } from '@/utils/canvasUtils' +import { useI18n } from '@/hooks/web/useI18n' const dropdownMore = ref(null) const lockStore = lockStoreWithOut() - +const { t } = useI18n() const dvMainStore = dvMainStoreWithOut() const snapshotStore = snapshotStoreWithOut() const layerStore = layerStoreWithOut() @@ -138,6 +139,10 @@ const closeEditComponentName = () => { if (inputName.value.trim() === curEditComponent.name) { return } + if (inputName.value.length < 1 || inputName.value.length > 64) { + ElMessage.warning(t('components.length_1_64_characters')) + return + } curEditComponent.name = inputName.value syncViewTitle(curEditComponent) inputName.value = '' diff --git a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue index c76c6ba1e2..fbc7ddfd7d 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeListTree.vue @@ -70,7 +70,7 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot' import { layerStoreWithOut } from '@/store/modules/data-visualization/layer' import { storeToRefs } from 'pinia' -import { ElIcon, ElRow, ElSwitch } from 'element-plus-secondary' +import { ElIcon, ElMessage, ElRow, ElSwitch } from 'element-plus-secondary' import Icon from '../icon-custom/src/Icon.vue' import { computed, nextTick, ref } from 'vue' import draggable from 'vuedraggable' @@ -222,6 +222,10 @@ const closeEditComponentName = () => { if (inputName.value.trim() === curEditComponent.name) { return } + if (inputName.value.length < 1 || inputName.value.length > 64) { + ElMessage.warning(t('components.length_1_64_characters')) + return + } curEditComponent.name = inputName.value syncViewTitle(curEditComponent) inputName.value = '' diff --git a/core/core-frontend/src/components/data-visualization/RealTimeTab.vue b/core/core-frontend/src/components/data-visualization/RealTimeTab.vue index 226a0a311a..5bedd54498 100644 --- a/core/core-frontend/src/components/data-visualization/RealTimeTab.vue +++ b/core/core-frontend/src/components/data-visualization/RealTimeTab.vue @@ -5,7 +5,7 @@ import dvExpandRight from '@/assets/svg/dv-expand-right.svg' import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapshot' import { storeToRefs } from 'pinia' -import { ElIcon, ElRow } from 'element-plus-secondary' +import { ElIcon, ElMessage, ElRow } from 'element-plus-secondary' import Icon from '../icon-custom/src/Icon.vue' import { nextTick, ref, toRefs } from 'vue' import draggable from 'vuedraggable' @@ -13,11 +13,12 @@ import { composeStoreWithOut } from '@/store/modules/data-visualization/compose' import RealTimeGroup from '@/components/data-visualization/RealTimeGroup.vue' import eventBus from '@/utils/eventBus' import { syncViewTitle } from '@/utils/canvasUtils' +import { useI18n } from '@/hooks/web/useI18n' const dvMainStore = dvMainStoreWithOut() const snapshotStore = snapshotStoreWithOut() const composeStore = composeStoreWithOut() - +const { t } = useI18n() const { areaData } = storeToRefs(composeStore) const { curTabName } = storeToRefs(dvMainStore) @@ -69,6 +70,10 @@ const closeEditComponentName = () => { if (inputName.value.trim() === curEditComponent.title) { return } + if (inputName.value.length < 1 || inputName.value.length > 64) { + ElMessage.warning(t('components.length_1_64_characters')) + return + } curEditComponent.title = inputName.value syncViewTitle(curEditComponent) inputName.value = ''