Merge branch 'main' into multi-tenant

src/views/system/menu/index.vue

@@ -1119,6 +1119,21 @@ onMounted(() => {
           </a-col>
         </a-row>
 
+        <a-form-item
+          :label="t('views.system.menu.menuStatus')"
+          name="status"
+          :label-col="{ span: 3 }"
+          :label-wrap="true"
+          v-if="modalState.from.menuType === MENU_TYPE_BUTTON"
+        >
+          <a-select
+            v-model:value="modalState.from.status"
+            default-value="0"
+            :options="dict.sysNormalDisable"
+          >
+          </a-select>
+        </a-form-item>
+
         <a-form-item
           :label="t('views.system.menu.formLoc')"
           name="component"