diff --git a/package.json b/package.json index 54d05bbe..7af6267f 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "vue-router": "^4.3.0", "vue-types": "^5.1.1", "vuedraggable": "^4.1.0", - "vxe-table": "^4.5.21", + "vxe-table": "4.5.21", "web-storage-cache": "^1.1.1", "xe-utils": "^3.5.22", "xml-js": "^1.6.11" @@ -125,7 +125,7 @@ "vite-plugin-progress": "^0.0.7", "vite-plugin-purge-icons": "^0.10.0", "vite-plugin-svg-icons": "^2.0.1", - "vite-plugin-top-level-await": "^1.3.1", + "vite-plugin-top-level-await": "1.3.1", "vue-eslint-parser": "^9.3.2", "vue-tsc": "^1.8.27" }, diff --git a/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue index 639c1cb2..0c8f1d57 100644 --- a/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue +++ b/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue @@ -68,13 +68,11 @@ const resetBaseInfo = () => { console.log(bpmnElement.value, 'bpmnElement') bpmnElement.value = bpmnInstances()?.bpmnElement - console.log(bpmnElement.value, 'resetBaseInfo11111111111') elementBaseInfo.value = bpmnElement.value.businessObject needProps.value['type'] = bpmnElement.value.businessObject.$type // elementBaseInfo.value['typess'] = bpmnElement.value.businessObject.$type // elementBaseInfo.value = JSON.parse(JSON.stringify(bpmnElement.value.businessObject)) - console.log(elementBaseInfo.value, 'elementBaseInfo22222222222') } const handleKeyUpdate = (value) => { // 校验 value 的值，只有 XML NCName 通过的情况下，才进行赋值。否则，会导致流程图报错，无法绘制的问题 @@ -121,7 +119,6 @@ const updateBaseInfo = (key) => { // id: elementBaseInfo.value[key] // // di: { id: `${elementBaseInfo.value[key]}_di` } // } - console.log(elementBaseInfo, 'elementBaseInfo11111111111') needProps.value = { ...elementBaseInfo.value, ...needProps.value } if (key === 'id') { @@ -144,14 +141,12 @@ onMounted(() => { console.log(props.model, 'props.model') handleKeyUpdate(props.model.key) handleNameUpdate(props.model.name) - console.log(props, 'propsssssssssssssssssssss') }, 1000) }) watch( () => props.businessObject, (val) => { - console.log(val, 'val11111111111111111111') if (val) { // nextTick(() => { resetBaseInfo() diff --git a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue index 06df9a68..75b9e9cc 100644 --- a/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue +++ b/src/components/bpmnProcessDesigner/package/penal/properties/ElementProperties.vue @@ -77,7 +77,6 @@ const attributeFormRef = ref() const bpmnInstances = () => (window as any)?.bpmnInstances const resetAttributesList = () => { - console.log(window, 'windowwindowwindowwindowwindowwindowwindow') bpmnElement.value = bpmnInstances().bpmnElement otherExtensionList.value = [] // 其他扩展配置 bpmnElementProperties.value = diff --git a/src/layout/components/TagsView/src/helper.ts b/src/layout/components/TagsView/src/helper.ts index 22f6a507..322c8581 100644 --- a/src/layout/components/TagsView/src/helper.ts +++ b/src/layout/components/TagsView/src/helper.ts @@ -7,7 +7,7 @@ export const filterAffixTags = (routes: AppRouteRecordRaw[], parentPath = '') => const meta = route.meta as RouteMeta const tagPath = pathResolve(parentPath, route.path) if (meta?.affix) { - tags.push({ ...route, path: tagPath, fullPath: tagPath } as RouteLocationNormalizedLoaded) + tags.push({ ...route, path: tagPath, fullPath: tagPath, matched: [ {}, { meta } ] } as RouteLocationNormalizedLoaded) } if (route.children) { const tempTags: RouteLocationNormalizedLoaded[] = filterAffixTags(route.children, tagPath) diff --git a/src/layout/components/UserInfo/src/components/LockDialog.vue b/src/layout/components/UserInfo/src/components/LockDialog.vue index f4ab7d4f..037cca17 100644 --- a/src/layout/components/UserInfo/src/components/LockDialog.vue +++ b/src/layout/components/UserInfo/src/components/LockDialog.vue @@ -21,7 +21,8 @@ const props = defineProps({ }) const userStore = useUserStore() -const avatar = computed(() => userStore.user.avatar ?? avatarImg) +const avatar = computed(() => (userStore.user?.avatar != null && userStore.user?.avatar != '') ? + userStore.user?.avatar : avatarImg) const userName = computed(() => userStore.user.nickname ?? 'Admin') const emit = defineEmits(['update:modelValue']) diff --git a/src/layout/components/UserInfo/src/components/LockPage.vue b/src/layout/components/UserInfo/src/components/LockPage.vue index 497dd37b..6b9bada5 100644 --- a/src/layout/components/UserInfo/src/components/LockPage.vue +++ b/src/layout/components/UserInfo/src/components/LockPage.vue @@ -22,7 +22,8 @@ const showDate = ref(true) const { getPrefixCls } = useDesign() const prefixCls = getPrefixCls('lock-page') -const avatar = computed(() => userStore.user.avatar ?? avatarImg) +const avatar = computed(() => (userStore.user?.avatar != null && userStore.user?.avatar != '') ? + userStore.user?.avatar : avatarImg) const userName = computed(() => userStore.user.nickname ?? 'Admin') const lockStore = useLockStore() diff --git a/src/views/infra/dbDoc/index.vue b/src/views/infra/dbDoc/index.vue index 85eff615..c60dbb3b 100644 --- a/src/views/infra/dbDoc/index.vue +++ b/src/views/infra/dbDoc/index.vue @@ -1,6 +1,4 @@