Merge remote-tracking branch 'origin/ui' into ui

# Conflicts:
#	api/handler/admin/admin_user_handler.go

api/handler/admin/admin_user_handler.go

@@ -8,6 +8,7 @@ import (
 	"chatplus/store/vo"
 	"chatplus/utils"
 	"chatplus/utils/resp"
+
 	"github.com/gin-gonic/gin"
 	"gorm.io/gorm"
 )
@@ -73,6 +74,13 @@ func (h *SysUserHandler) Save(c *gin.Context) {
 		resp.ERROR(c, types.InvalidArgs)
 		return
 	}
+
+	// 默认id为1是超级管理员
+	if data.Id == 1 {
+		resp.ERROR(c, "超级管理员不支持更新")
+		return
+	}
+
 	var user = model.AdminUser{}
 	var res *gorm.DB
 	var userVo vo.AdminUser
@@ -143,6 +151,14 @@ func (h *SysUserHandler) Remove(c *gin.Context) {
 		return
 	}
 	if data.Id > 0 {
+
+		// 默认id为1是超级管理员
+		if data.Id == 1 {
+			resp.ERROR(c, "超级管理员不能删除")
+			return
+		}
+
+
 		res := h.db.Where("id = ?", data.Id).Delete(&model.AdminUser{})
 		if res.Error != nil {
 			resp.ERROR(c, "删除失败")

gpt-vue/projects/vue-admin/src/components/SearchTable/useAsyncTable.ts

@@ -11,7 +11,7 @@ function useAsyncTable<T extends Record<string, unknown>>(
 ): TableReturn {
   const paginationState = reactive({
     current: 1,
-    pageSize: 10,
+    pageSize: 20,
     total: 0,
   });
 

gpt-vue/projects/vue-admin/src/views/Role/RoleContainer.vue

@@ -37,7 +37,7 @@ const columns = [
 
 const expandable = reactive({
   title: "",
-  width: 80,
+  width: 50,
 });
 
 // 数据

gpt-vue/projects/vue-admin/src/views/SysAdmin/SysAdminContainer.vue

@@ -100,8 +100,9 @@ const handleRemove = async (id, reload) => {
       />
     </template>
     <template #actions="{ record, reload }">
-      <a-link @click="openFormModal(reload, record)">编辑</a-link>
       <a-link @click="openResetPWDModal(reload, record)">修改密码</a-link>
+      <template v-if="record.id !== 1">
+        <a-link @click="openFormModal(reload, record)">编辑</a-link>
         <a-popconfirm
           content="是否删除？"
           position="left"
@@ -111,5 +112,6 @@ const handleRemove = async (id, reload) => {
           <a-link status="danger">删除</a-link>
         </a-popconfirm>
       </template>
+    </template>
   </SearchTable>
 </template>

gpt-vue/projects/vue-admin/src/views/User/UserContainer.vue

@@ -37,6 +37,7 @@ const columns: SearchTableColumns[] = [
   {
     title: "过期时间",
     dataIndex: "expired_time",
+    width: 180,
     render: ({ record }) => {
       return dateFormat(record.expired_time);
     },
@@ -44,6 +45,7 @@ const columns: SearchTableColumns[] = [
   {
     title: "注册时间",
     dataIndex: "created_at",
+    width: 180,
     render: ({ record }) => {
       return dateFormat(record.created_at);
     },
@@ -51,6 +53,8 @@ const columns: SearchTableColumns[] = [
   {
     title: "操作",
     slotName: "actions",
+    width: 180,
+    fixed: "right",
   },
 ];