diff --git a/frontend/src/views/dashboard/canvas/CanvasCore.vue b/frontend/src/views/dashboard/canvas/CanvasCore.vue index a45a8243..62b81b63 100644 --- a/frontend/src/views/dashboard/canvas/CanvasCore.vue +++ b/frontend/src/views/dashboard/canvas/CanvasCore.vue @@ -11,28 +11,26 @@ const dashboardStore = dashboardStoreWithOut() const canvasLocked = ref(false) // Is the canvas movement locked， Default false const emits = defineEmits(['parentAddItemBox']) const { curComponentId, curComponent } = storeToRefs(dashboardStore) -// @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment -let currentInstance -// Props +let currentInstance: any const props = defineProps({ canvasId: { type: String, default: 'canvas-main', }, - // eslint-disable-next-line vue/require-default-prop parentConfigItem: { type: Object as PropType, required: false, + default: null, }, - // eslint-disable-next-line vue/require-default-prop dashboardInfo: { type: Object, required: false, + default: null, }, - // eslint-disable-next-line vue/require-default-prop canvasStyleData: { type: Object, required: false, + default: null, }, canvasComponentData: { type: Array as PropType, @@ -122,7 +120,6 @@ const coordinates = ref([]) const infoBox = ref() // Position data (non-reactive) - let lastTask: (() => void) | undefined = undefined let isOverlay = false let itemMaxX = 0 @@ -193,9 +190,9 @@ function addItemToPositionBox(item: CanvasItem) { for (let i = item.x - 1; i < item.x - 1 + item.sizeX; i++) { for (let j = item.y - 1; j < item.y - 1 + item.sizeY; j++) { if (pb[j] && pb[j][i]) { - // Ensure the target location is valid + // Ensure the target location is valid & Place the item in the corresponding position // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment - pb[j][i].el = item // Place the item in the corresponding position + pb[j][i].el = item } } } @@ -935,7 +932,6 @@ function startMove(e: MouseEvent, item: CanvasItem, index: number) { if (curActiveMoveInSQTab) { if (curActiveMoveInSQTab.moveInActive) { const refTabInstance = - // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment currentInstance.refs['shape_component_' + curActiveMoveInSQTab.id][0] refTabInstance.addTabItem(moveItem) removeItemById(moveItem.id) diff --git a/frontend/src/views/dashboard/canvas/ResizeHandle.vue b/frontend/src/views/dashboard/canvas/ResizeHandle.vue index 7f2097f7..00ddef36 100644 --- a/frontend/src/views/dashboard/canvas/ResizeHandle.vue +++ b/frontend/src/views/dashboard/canvas/ResizeHandle.vue @@ -49,7 +49,7 @@ function getPointStyle(point: string) { marginTop: '-4px', left: `${newLeft}`, top: `${newTop}`, - // @ts-expect-error + // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment cursor: `${cursors[point]}-resize`, } } diff --git a/frontend/src/views/dashboard/common/ResourceGroupOpt.vue b/frontend/src/views/dashboard/common/ResourceGroupOpt.vue index b4e33ace..86611b7a 100644 --- a/frontend/src/views/dashboard/common/ResourceGroupOpt.vue +++ b/frontend/src/views/dashboard/common/ResourceGroupOpt.vue @@ -62,7 +62,6 @@ const optInit = (params: any) => { state.targetInfo = params.data state.nodeType = params.nodeType || 'folder' resourceDialogShow.value = true - // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment resourceForm.name = params.name || getResourceNewName(params.opt) resourceForm.pid = params.pid || 'root' if (params.parentSelect) { diff --git a/frontend/src/views/dashboard/common/ResourceTree.vue b/frontend/src/views/dashboard/common/ResourceTree.vue index dbe46c0f..5eef9ab3 100644 --- a/frontend/src/views/dashboard/common/ResourceTree.vue +++ b/frontend/src/views/dashboard/common/ResourceTree.vue @@ -209,7 +209,6 @@ onMounted(() => { getTree() }) -// @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment const addOperation = (params: any) => { if (params.opt === 'newLeaf') { const newCanvasUrl = '#/canvas?opt=create' + (params?.id ? `&pid=${params?.id}` : '') diff --git a/frontend/src/views/dashboard/components/sq-tab/index.vue b/frontend/src/views/dashboard/components/sq-tab/index.vue index e8b5311d..09d60bac 100644 --- a/frontend/src/views/dashboard/components/sq-tab/index.vue +++ b/frontend/src/views/dashboard/components/sq-tab/index.vue @@ -72,7 +72,6 @@ function addTab() { } configItem.value.propValue.push(newTab) configItem.value.activeSubTabIndex = configItem.value.propValue.length - 1 - // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment editableTabsValue.value = newTab.name } diff --git a/frontend/src/views/dashboard/editor/DashboardEditor.vue b/frontend/src/views/dashboard/editor/DashboardEditor.vue index b84d379c..f85311ab 100644 --- a/frontend/src/views/dashboard/editor/DashboardEditor.vue +++ b/frontend/src/views/dashboard/editor/DashboardEditor.vue @@ -88,7 +88,6 @@ onMounted(() => { nextTick(() => { if (dashboardEditorRef.value) { sizeInit() - // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment nextTick(() => { if (canvasCoreRef.value) { // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment diff --git a/frontend/src/views/dashboard/editor/Toolbar.vue b/frontend/src/views/dashboard/editor/Toolbar.vue index 6abd3ff8..ec310fad 100644 --- a/frontend/src/views/dashboard/editor/Toolbar.vue +++ b/frontend/src/views/dashboard/editor/Toolbar.vue @@ -13,6 +13,7 @@ import icon_undo_outlined from '@/assets/svg/icon_undo_outlined.svg' import icon_redo_outlined from '@/assets/svg/icon_redo_outlined.svg' import icon_left_outlined from '@/assets/svg/icon_left_outlined.svg' import { saveDashboardResource } from '@/views/dashboard/utils/canvasUtils.ts' +import ChatChartSelection from '@/views/dashboard/editor/ChatChartSelection.vue' const { t } = useI18n() const dashboardStore = dashboardStoreWithOut() @@ -73,6 +74,8 @@ const groupOptFinish = (result: any) => { window.history.replaceState({ path: url }, '', url) } +const chartSelectionFinish = () => {} + const editCanvasName = () => { nameEdit.value = true // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment @@ -207,6 +210,10 @@ const backToMain = () => { /> + diff --git a/frontend/src/views/dashboard/editor/index.vue b/frontend/src/views/dashboard/editor/index.vue index c06dc655..87148545 100644 --- a/frontend/src/views/dashboard/editor/index.vue +++ b/frontend/src/views/dashboard/editor/index.vue @@ -24,7 +24,6 @@ const dashboardEditorRef = ref(null) const addComponent = (componentType: string) => { const component = cloneDeep(findNewComponentFromList(componentType)) if (component && dashboardEditorRef.value) { - // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment component.id = guid() if (component.component === 'SQTab') { const subTabName = guid('tab') diff --git a/frontend/src/views/dashboard/preview/SQPreviewShow.vue b/frontend/src/views/dashboard/preview/SQPreviewShow.vue index b8a24022..fb4b01f9 100644 --- a/frontend/src/views/dashboard/preview/SQPreviewShow.vue +++ b/frontend/src/views/dashboard/preview/SQPreviewShow.vue @@ -55,7 +55,6 @@ const loadCanvasData = (params: any) => { dataInitState.value = false load_resource_prepare( { id: params.id }, - // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment function ({ dashboardInfo, canvasDataResult, canvasStyleResult, canvasViewInfoPreview }) { state.canvasDataPreview = canvasDataResult state.canvasStylePreview = canvasStyleResult @@ -196,8 +195,8 @@ defineExpose({ } .close-side { - width: 0px !important; - padding: 0px !important; + width: 0 !important; + padding: 0 !important; } .flexible-button-area { diff --git a/frontend/src/views/dashboard/preview/SQPreviewSingle.vue b/frontend/src/views/dashboard/preview/SQPreviewSingle.vue index 08e48472..20da4fe3 100644 --- a/frontend/src/views/dashboard/preview/SQPreviewSingle.vue +++ b/frontend/src/views/dashboard/preview/SQPreviewSingle.vue @@ -28,7 +28,6 @@ const loadCanvasData = (params: any) => { dataInitState.value = false load_resource_prepare( { id: params.id }, - // @ts-expect-error eslint-disable-next-line @typescript-eslint/ban-ts-comment function ({ dashboardInfo, canvasDataResult, canvasStyleResult, canvasViewInfoPreview }) { state.canvasDataPreview = canvasDataResult state.canvasStylePreview = canvasStyleResult