diff --git a/snowy-admin-web/src/views/gen/steps.vue b/snowy-admin-web/src/views/gen/steps.vue index d5f9737a..f956c3ee 100644 --- a/snowy-admin-web/src/views/gen/steps.vue +++ b/snowy-admin-web/src/views/gen/steps.vue @@ -67,7 +67,7 @@ import genPreview from './preview.vue' import genBasicApi from '@/api/gen/genBasicApi' - const emit = defineEmits({ closed: null, successful: null }) + const emit = defineEmits({ closed: null, successful: null }) const current = ref(0) const recordData = ref() const submitLoading = ref(false) @@ -95,19 +95,19 @@ .catch(() => {}) current.value-- } - if (current.value === 2) { - configRef.value - .onSubmit(recordData.value) - .then((data) => { - // 配置保存成功后,通知父组件刷新列表 - emit('successful', data) - current.value++ - }) - .catch((err) => { - message.warning(err) - }) - current.value-- - } + if (current.value === 2) { + configRef.value + .onSubmit(recordData.value) + .then((data) => { + // 配置保存成功后,通知父组件刷新列表 + emit('successful', data) + current.value++ + }) + .catch((err) => { + message.warning(err) + }) + current.value-- + } } // 上一步 const prev = () => { diff --git a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java index 514386b7..8b62ce48 100644 --- a/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java +++ b/snowy-plugin/snowy-plugin-mobile/src/main/java/vip/xiaonuo/mobile/modular/resource/service/impl/MobileMenuServiceImpl.java @@ -33,6 +33,7 @@ import vip.xiaonuo.common.exception.CommonException; import vip.xiaonuo.mobile.modular.resource.entity.MobileMenu; import vip.xiaonuo.mobile.modular.resource.entity.MobileModule; import vip.xiaonuo.mobile.modular.resource.enums.MobileResourceCategoryEnum; +import vip.xiaonuo.mobile.modular.resource.enums.MobileResourceMenuStatusEnum; import vip.xiaonuo.mobile.modular.resource.mapper.MobileMenuMapper; import vip.xiaonuo.mobile.modular.resource.param.menu.*; import vip.xiaonuo.mobile.modular.resource.service.MobileMenuService; @@ -296,6 +297,7 @@ public class MobileMenuServiceImpl extends ServiceImpl allModuleAndMenuAndSpaList = this.list(new LambdaQueryWrapper() .in(MobileMenu::getCategory, MobileResourceCategoryEnum.MODULE.getValue(), MobileResourceCategoryEnum.MENU.getValue()) + .eq(MobileMenu::getStatus, MobileResourceMenuStatusEnum.ENABLE.getValue()) .orderByAsc(CollectionUtil.newArrayList(MobileMenu::getCategory, MobileMenu::getSortCode))); // 全部以菜单承载 List allModuleList = CollectionUtil.newArrayList();