This commit is contained in:
limengnan 2025-07-01 10:15:07 +08:00
parent 406b0ba5f6
commit f88b612191
3 changed files with 43 additions and 5 deletions

View File

@ -9,10 +9,48 @@ export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
ElCard: typeof import('element-plus-secondary/es')['ElCard']
ElBreadcrumb: typeof import('element-plus-secondary/es')['ElBreadcrumb']
ElBreadcrumbItem: typeof import('element-plus-secondary/es')['ElBreadcrumbItem']
ElButton: typeof import('element-plus-secondary/es')['ElButton']
ElCheckbox: typeof import('element-plus-secondary/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus-secondary/es')['ElCheckboxGroup']
ElCol: typeof import('element-plus-secondary/es')['ElCol']
ElCollapse: typeof import('element-plus-secondary/es')['ElCollapse']
ElCollapseItem: typeof import('element-plus-secondary/es')['ElCollapseItem']
ElColorPicker: typeof import('element-plus-secondary/es')['ElColorPicker']
ElContainer: typeof import('element-plus-secondary/es')['ElContainer']
ElDatePicker: typeof import('element-plus-secondary/es')['ElDatePicker']
ElDialog: typeof import('element-plus-secondary/es')['ElDialog']
ElDivider: typeof import('element-plus-secondary/es')['ElDivider']
ElDropdown: typeof import('element-plus-secondary/es')['ElDropdown']
ElDropdownItem: typeof import('element-plus-secondary/es')['ElDropdownItem']
ElDropdownMenu: typeof import('element-plus-secondary/es')['ElDropdownMenu']
ElEmpty: typeof import('element-plus-secondary/es')['ElEmpty']
ElForm: typeof import('element-plus-secondary/es')['ElForm']
ElFormItem: typeof import('element-plus-secondary/es')['ElFormItem']
ElHeader: typeof import('element-plus-secondary/es')['ElHeader']
ElIcon: typeof import('element-plus-secondary/es')['ElIcon']
ElTimeline: typeof import('element-plus-secondary/es')['ElTimeline']
ElTimelineItem: typeof import('element-plus-secondary/es')['ElTimelineItem']
ElInput: typeof import('element-plus-secondary/es')['ElInput']
ElInputNumber: typeof import('element-plus-secondary/es')['ElInputNumber']
ElMain: typeof import('element-plus-secondary/es')['ElMain']
ElOption: typeof import('element-plus-secondary/es')['ElOption']
ElOptionGroup: typeof import('element-plus-secondary/es')['ElOptionGroup']
ElPopover: typeof import('element-plus-secondary/es')['ElPopover']
ElRadio: typeof import('element-plus-secondary/es')['ElRadio']
ElRadioGroup: typeof import('element-plus-secondary/es')['ElRadioGroup']
ElRow: typeof import('element-plus-secondary/es')['ElRow']
ElScrollbar: typeof import('element-plus-secondary/es')['ElScrollbar']
ElSelect: typeof import('element-plus-secondary/es')['ElSelect']
ElSelectV2: typeof import('element-plus-secondary/es')['ElSelectV2']
ElSpace: typeof import('element-plus-secondary/es')['ElSpace']
ElSwitch: typeof import('element-plus-secondary/es')['ElSwitch']
ElTabPane: typeof import('element-plus-secondary/es')['ElTabPane']
ElTabs: typeof import('element-plus-secondary/es')['ElTabs']
ElTimePicker: typeof import('element-plus-secondary/es')['ElTimePicker']
ElTooltip: typeof import('element-plus-secondary/es')['ElTooltip']
ElTree: typeof import('element-plus-secondary/es')['ElTree']
ElTreeSelect: typeof import('element-plus-secondary/es')['ElTreeSelect']
ElUpload: typeof import('element-plus-secondary/es')['ElUpload']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
}

View File

@ -280,7 +280,7 @@ const initWatermark = (waterDomId = 'editor-canvas-main') => {
try {
if (
dvInfo.value.watermarkInfo &&
dvInfo.value.watermarkInfo.settingContent &&
dvInfo.value.watermarkInfo?.settingContent &&
isMainCanvas(canvasId.value)
) {
activeWatermarkCheckUser(waterDomId, canvasId.value, curScale.value)

View File

@ -54,7 +54,7 @@ export default defineConfig({
cors: true,
proxy: {
'/api': {
target: 'http://192.168.1.58:8080',
target: 'http://192.168.1.38:8083',
changeOrigin: true,
secure: false,
rewrite: path => path.replace(/^\/api/, '')