From 907eb67dc7aca9f06acda6c0357b3550a7ad91fc Mon Sep 17 00:00:00 2001
From: u2nyakim <u2nyakim@gmail.com>
Date: Mon, 25 Aug 2025 18:01:25 +0800
Subject: [PATCH] up.

---
 .../admin/system/ConfigController.php         |  4 ++-
 z_ele/src/views/system/config/index.vue       | 30 +++++++++++--------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/controller/admin/system/ConfigController.php b/app/controller/admin/system/ConfigController.php
index 327c311..8e79fe9 100644
--- a/app/controller/admin/system/ConfigController.php
+++ b/app/controller/admin/system/ConfigController.php
@@ -16,7 +16,9 @@ class ConfigController extends BaseController
                 'group'=> $this->request->get('group/s','')
             ]);
 
-        $data = CurdService::getList($this->request, $model);
+        $list = CurdService::getList($this->request, $model)->toArray();
+
+        $data = list_build_tree($list);
 
         return $this->writeSuccess('success', $data);
     }
diff --git a/z_ele/src/views/system/config/index.vue b/z_ele/src/views/system/config/index.vue
index e5ac2ae..e41c098 100644
--- a/z_ele/src/views/system/config/index.vue
+++ b/z_ele/src/views/system/config/index.vue
@@ -35,16 +35,22 @@
             添加
           </el-button>
         </template>
-        <template #action="{ row }">
-          <el-link type="primary" underline="never" @click="openEdit(row)">
-            修改
-          </el-link>
-          <template v-if="row.group != 'system'">
-            <el-divider direction="vertical"/>
-            <el-link type="danger" underline="never" @click="remove(row)">
-              删除
-            </el-link>
-          </template>
+        <template #action="d">
+          {{ d }}
+<!--          <template v-if="['tabs'].indexOf(row.type) != -1">-->
+<!--            {{ row }}-->
+<!--            <el-link type="primary" underline="never" @click="openEdit(row)">添加子项</el-link>-->
+<!--            <el-divider direction="vertical"/>-->
+<!--          </template>-->
+<!--          <el-link type="primary" underline="never" @click="openEdit(row)">-->
+<!--            修改-->
+<!--          </el-link>-->
+<!--          <template v-if="row.group != 'system'">-->
+<!--            <el-divider direction="vertical"/>-->
+<!--            <el-link type="danger" underline="never" @click="remove(row)">-->
+<!--              删除-->
+<!--            </el-link>-->
+<!--          </template>-->
         </template>
         <template #status="{ row }">
           <el-switch
@@ -92,7 +98,6 @@ const columns = ref<Columns>([
   {
     prop: 'name',
     label: '名称',
-    sortable: 'custom',
     minWidth: 120
   },
   {
@@ -110,7 +115,6 @@ const columns = ref<Columns>([
     label: '状态',
     width: 90,
     align: 'center',
-    sortable: 'custom',
     slot: 'status',
     formatter: (row) => (row.status == 0 ? '正常' : '冻结')
   },
@@ -128,7 +132,7 @@ const columns = ref<Columns>([
     columnKey: 'action',
     label: '操作',
     width: 200,
-    align: 'center' /* ,
+    align: 'right' /* ,
       fixed: 'right' */,
     slot: 'action',
     hideInPrint: true,