优化菜单、省市区树结构排序，修复部门搜索空指针问题

web/src/views/permission/menu/menu.vue

@@ -375,7 +375,7 @@
 </template>
 <script lang="ts" setup>
   import { onMounted, reactive, ref, unref } from 'vue';
-  import { FormItemRule, TreeSelectOption, useDialog, useMessage } from 'naive-ui';
+  import { FormItemRule, useDialog, useMessage } from 'naive-ui';
   import {
     AlignLeftOutlined,
     FormOutlined,
@@ -406,19 +406,6 @@
     return s;
   });
 
-  const switchStatusMap = [
-    {
-      value: 2,
-      label: '关闭',
-    },
-    {
-      value: 1,
-      label: '开启',
-    },
-  ].map((s) => {
-    return s;
-  });
-
   const statusMap = [
     {
       value: 0,
@@ -472,8 +459,6 @@
   const createDrawerRef = ref();
   const message = useMessage();
   const dialog = useDialog();
-  let treeItemKey = ref([]);
-  let expandedKeys = ref([]);
   const treeData = ref([]);
   const loading = ref(true);
   const subLoading = ref(false);
@@ -482,9 +467,11 @@
   const pattern = ref('');
   const drawerTitle = ref('');
   const optionTreeData = ref<any>([]);
-
   const formParams = reactive<State>(newState(null));
 
+  let treeItemKey = ref([]);
+  let expandedKeys = ref([]);
+
   function openCreateDrawer() {
     drawerTitle.value = '添加菜单';
     const { openDrawer } = createDrawerRef.value;
@@ -562,10 +549,7 @@
   }
 
   // 处理选项更新
-  function handleUpdateValue(
-    value: string | number | Array<string | number> | null,
-    _option: TreeSelectOption | null | Array<TreeSelectOption | null>
-  ) {
+  function handleUpdateValue(value) {
     formParams.pid = value as number;
   }
 

web/src/views/permission/role/columns.ts

@@ -13,7 +13,6 @@ export const columns = [
         h(
           NButton,
           {
-            ghost: true,
             strong: true,
             size: 'small',
             text: true,