reactor：【system 系统管理】dept 部门管理的实现，对齐 ele 和 antd（isExpanded 放在 onRefresh 前面）

apps/web-antd/src/views/erp/product/category/index.vue

@@ -23,11 +23,6 @@ const [FormModal, formModalApi] = useVbenModal({
   destroyOnClose: true,
 });
 
-/** 刷新表格 */
-function onRefresh() {
-  gridApi.query();
-}
-
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
 function toggleExpand() {
@@ -35,6 +30,11 @@ function toggleExpand() {
   gridApi.grid.setAllTreeExpand(isExpanded.value);
 }
 
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
 /** 创建分类 */
 function handleCreate() {
   formModalApi.setData(null).open();

apps/web-antd/src/views/infra/demo/demo02/index.vue

@@ -120,11 +120,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <template #toolbar-tools>
         <TableAction
           :actions="[
-            {
-              label: isExpanded ? '收缩' : '展开',
-              type: 'primary',
-              onClick: toggleExpand,
-            },
             {
               label: $t('ui.actionTitle.create', ['菜单']),
               type: 'primary',
@@ -132,6 +127,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['infra:demo02-category:create'],
               onClick: handleCreate,
             },
+            {
+              label: isExpanded ? '收缩' : '展开',
+              type: 'primary',
+              onClick: toggleExpand,
+            },
             {
               label: $t('ui.actionTitle.export'),
               type: 'primary',

apps/web-antd/src/views/system/dept/index.vue

@@ -30,11 +30,6 @@ function getLeaderName(userId: number) {
   return userList.value.find((user) => user.id === userId)?.nickname;
 }
 
-/** 刷新表格 */
-function onRefresh() {
-  gridApi.query();
-}
-
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
 function toggleExpand() {
@@ -42,6 +37,11 @@ function toggleExpand() {
   gridApi.grid.setAllTreeExpand(isExpanded.value);
 }
 
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
 /** 创建部门 */
 function handleCreate() {
   formModalApi.setData(null).open();

apps/web-ele/src/views/infra/demo/demo02/index.vue

@@ -118,11 +118,6 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <template #toolbar-tools>
         <TableAction
           :actions="[
-            {
-              label: isExpanded ? '收缩' : '展开',
-              type: 'primary',
-              onClick: toggleExpand,
-            },
             {
               label: $t('ui.actionTitle.create', ['示例分类']),
               type: 'primary',
@@ -130,6 +125,11 @@ const [Grid, gridApi] = useVbenVxeGrid({
               auth: ['infra:demo02-category:create'],
               onClick: handleCreate,
             },
+            {
+              label: isExpanded ? '收缩' : '展开',
+              type: 'primary',
+              onClick: toggleExpand,
+            },
             {
               label: $t('ui.actionTitle.export'),
               type: 'primary',

apps/web-ele/src/views/system/dept/index.vue

@@ -30,11 +30,6 @@ function getLeaderName(userId: number) {
   return userList.value.find((user) => user.id === userId)?.nickname;
 }
 
-/** 刷新表格 */
-function onRefresh() {
-  gridApi.query();
-}
-
 /** 切换树形展开/收缩状态 */
 const isExpanded = ref(true);
 function toggleExpand() {
@@ -42,6 +37,11 @@ function toggleExpand() {
   gridApi.grid.setAllTreeExpand(isExpanded.value);
 }
 
+/** 刷新表格 */
+function onRefresh() {
+  gridApi.query();
+}
+
 /** 创建部门 */
 function handleCreate() {
   formModalApi.setData(null).open();