添加权限角色编辑

api/api.go

@@ -5,6 +5,7 @@ import (
 	"encoding/hex"
 	"fmt"
 	"github.com/veypi/OneAuth/api/app"
+	"github.com/veypi/OneAuth/api/auth"
 	"github.com/veypi/OneAuth/api/resource"
 	"github.com/veypi/OneAuth/api/role"
 	"github.com/veypi/OneAuth/api/token"
@@ -41,6 +42,7 @@ func Router(r OneBD.Router) {
 	app.Router(r.SubRouter("app"))
 	appRouter := r.SubRouter("/app/:uuid")
 	role.Router(appRouter.SubRouter("role"))
+	auth.Router(appRouter.SubRouter("auth"))
 	resource.Router(appRouter.SubRouter("resource"))
 	token.Router(appRouter.SubRouter("token"))
 

api/app/app.go

@@ -5,13 +5,12 @@ import (
 	"github.com/veypi/OneAuth/libs/auth"
 	"github.com/veypi/OneAuth/libs/base"
 	"github.com/veypi/OneAuth/libs/oerr"
+	"github.com/veypi/OneAuth/libs/tools"
 	"github.com/veypi/OneAuth/models"
 	"github.com/veypi/OneBD"
 	"github.com/veypi/OneBD/rfc"
 	"github.com/veypi/utils"
-	"github.com/veypi/utils/log"
 	"gorm.io/gorm"
-	"reflect"
 )
 
 var appHandlerP = OneBD.NewHandlerPool(func() OneBD.Handler {
@@ -120,22 +119,6 @@ func (h *appHandler) Post() (interface{}, error) {
 	return a, nil
 }
 
-func Struct2Map(obj interface{}) (data map[string]interface{}) {
-	data = make(map[string]interface{})
-	objT := reflect.TypeOf(obj)
-	objV := reflect.ValueOf(obj)
-	var item reflect.Value
-	var k reflect.StructField
-	for i := 0; i < objT.NumField(); i++ {
-		k = objT.Field(i)
-		item = objV.Field(i)
-		if !item.IsNil() {
-			data[k.Name] = item.Interface()
-		}
-	}
-	return
-}
-
 func (h *appHandler) Patch() (interface{}, error) {
 	uid := h.Meta().Params("uuid")
 	if uid == "" || !h.Payload.GetAuth(auth.APP, uid).CanUpdate() {
@@ -152,8 +135,7 @@ func (h *appHandler) Patch() (interface{}, error) {
 	if err := h.Meta().ReadJson(&opts); err != nil {
 		return nil, err
 	}
-	query := Struct2Map(opts)
+	query := tools.Struct2Map(opts)
-	log.Warn().Msgf("%#v", query)
 	if len(query) == 0 {
 		return nil, nil
 	}

api/auth/auth.go

@@ -0,0 +1,140 @@
+package auth
+
+import (
+	"github.com/veypi/OneAuth/cfg"
+	"github.com/veypi/OneAuth/libs/auth"
+	"github.com/veypi/OneAuth/libs/base"
+	"github.com/veypi/OneAuth/libs/oerr"
+	"github.com/veypi/OneAuth/models"
+	"github.com/veypi/OneAuth/oalib"
+	"github.com/veypi/OneBD"
+	"github.com/veypi/OneBD/core"
+	"strconv"
+)
+
+var authP = OneBD.NewHandlerPool(func() core.Handler {
+	return &authHandler{}
+})
+
+type authHandler struct {
+	base.AppHandler
+}
+
+func (h *authHandler) Get() (interface{}, error) {
+	if !h.GetAuth(auth.Auth, h.UUID).CanRead() {
+		return nil, oerr.NoAuth
+	}
+	var err error
+	id, _ := strconv.Atoi(h.Meta().Query("rid"))
+	rid := uint(id)
+	id, _ = strconv.Atoi(h.Meta().Query("uid"))
+	uid := uint(id)
+	if rid == 0 && uid == 0 {
+		return nil, err
+	}
+	query := &models.Auth{
+		AppUUID: h.UUID,
+	}
+	if rid != 0 {
+		query.RoleID = &rid
+	} else if uid != 0 {
+		query.UserID = &uid
+	}
+	l := make([]*models.Auth, 0, 10)
+	err = cfg.DB().Where(query).Find(&l).Error
+	return l, err
+}
+
+func (h *authHandler) Post() (interface{}, error) {
+	if !h.GetAuth(auth.Auth, h.UUID).CanCreate() {
+		return nil, oerr.NoAuth
+	}
+	query := &models.Auth{}
+	err := h.Meta().ReadJson(query)
+	if err != nil {
+		return nil, err
+	}
+	if query.ResourceID == 0 {
+		return nil, oerr.ApiArgsError
+	}
+	query.AppUUID = h.UUID
+	res := &models.Resource{}
+	res.ID = query.ResourceID
+	err = cfg.DB().First(res).Error
+	if err != nil {
+		return nil, err
+	}
+	query.RID = res.Name
+	err = cfg.DB().Create(query).Error
+	return query, err
+}
+
+func (h *authHandler) Patch() (interface{}, error) {
+	if !h.GetAuth(auth.Auth, h.UUID).CanUpdate() {
+		return nil, oerr.NoAuth
+	}
+	id := h.Meta().ParamsInt("id")
+	if id <= 0 {
+		return nil, oerr.ApiArgsError
+	}
+	a := &models.Auth{}
+	a.ID = uint(id)
+	err := cfg.DB().First(a).Error
+	if err != nil {
+		return nil, err
+	}
+	opts := struct {
+		ResourceID *uint `gorm:"not null"`
+		RUID       *string
+		Level      *oalib.AuthLevel
+	}{}
+	err = h.Meta().ReadJson(&opts)
+	if err != nil {
+		return nil, err
+	}
+	if a.AppUUID != h.UUID {
+		return nil, oerr.ApiArgsError
+	}
+	query := map[string]interface{}{}
+	if opts.ResourceID != nil && a.ResourceID != *opts.ResourceID {
+		query["ResourceID"] = *opts.ResourceID
+		res := &models.Resource{}
+		res.ID = *opts.ResourceID
+		err = cfg.DB().First(res).Error
+		if err != nil {
+			return nil, err
+		}
+		query["RID"] = res.Name
+		a.ResourceID = *opts.ResourceID
+	}
+	if opts.RUID != nil {
+		query["RUID"] = *opts.RUID
+		a.RUID = *opts.RUID
+	}
+	if opts.Level != nil {
+		query["Level"] = *opts.Level
+		a.Level = *opts.Level
+	}
+	err = cfg.DB().Model(a).Where("id = ?", id).Updates(query).Error
+	return a, err
+}
+
+func (h *authHandler) Delete() (interface{}, error) {
+	if !h.GetAuth(auth.Auth, h.UUID).CanDelete() {
+		return nil, oerr.NoAuth
+	}
+	id := h.Meta().ParamsInt("id")
+	if id <= 0 {
+		return nil, oerr.ApiArgsError
+	}
+	a := &models.Auth{}
+	a.ID = uint(id)
+	err := cfg.DB().First(a).Error
+	if err != nil {
+		return nil, err
+	}
+	if a.AppUUID != h.UUID {
+		return nil, oerr.ApiArgsError
+	}
+	return nil, cfg.DB().Delete(a).Error
+}

api/auth/router.go

@@ -0,0 +1,11 @@
+package auth
+
+import (
+	"github.com/veypi/OneBD"
+	"github.com/veypi/OneBD/rfc"
+)
+
+func Router(r OneBD.Router) {
+	r.Set("/", authP, rfc.MethodGet, rfc.MethodPost)
+	r.Set("/:id", authP, rfc.MethodPatch, rfc.MethodDelete)
+}

api/resource/resource.go

@@ -6,6 +6,7 @@ import (
 	"github.com/veypi/OneAuth/libs/auth"
 	"github.com/veypi/OneAuth/libs/base"
 	"github.com/veypi/OneAuth/libs/oerr"
+	"github.com/veypi/OneAuth/libs/tools"
 	"github.com/veypi/OneAuth/models"
 	"github.com/veypi/OneBD"
 )
@@ -55,6 +56,29 @@ func (h *resourceHandler) Post() (interface{}, error) {
 	return res, err
 }
 
+func (h *resourceHandler) Patch() (interface{}, error) {
+	if !h.GetAuth(auth.Res, h.UUID).CanUpdate() {
+		return nil, oerr.NoAuth
+	}
+	props := struct {
+		Des *string
+	}{}
+	err := h.Meta().ReadJson(&props)
+	if err != nil {
+		return nil, err
+	}
+
+	query := tools.Struct2Map(props)
+	id := h.Meta().ParamsInt("id")
+	if len(query) == 0 || id <= 0 {
+		return nil, oerr.ApiArgsMissing
+	}
+	if err := cfg.DB().Table("Resources").Where("id = ?", id).Updates(query).Error; err != nil {
+		return nil, err
+	}
+	return nil, nil
+}
+
 func (h *resourceHandler) Delete() (interface{}, error) {
 	if !h.GetAuth(auth.Res, h.UUID).CanDelete() {
 		return nil, oerr.NoAuth

api/resource/router.go

@@ -13,5 +13,5 @@ import (
 
 func Router(r OneBD.Router) {
 	r.Set("/", resP, rfc.MethodGet, rfc.MethodPost)
-	r.Set("/:id", resP, rfc.MethodDelete)
+	r.Set("/:id", resP, rfc.MethodDelete, rfc.MethodPatch)
 }

api/role/auth.go

@@ -1,60 +0,0 @@
-package role
-
-import (
-	"github.com/veypi/OneAuth/cfg"
-	"github.com/veypi/OneAuth/libs/auth"
-	"github.com/veypi/OneAuth/libs/base"
-	"github.com/veypi/OneAuth/libs/oerr"
-	"github.com/veypi/OneAuth/models"
-	"github.com/veypi/OneAuth/oalib"
-	"github.com/veypi/OneBD"
-	"github.com/veypi/OneBD/core"
-	"strconv"
-)
-
-var authP = OneBD.NewHandlerPool(func() core.Handler {
-	return &authHandler{}
-})
-
-type authHandler struct {
-	base.ApiHandler
-}
-
-func (h *authHandler) Get() (interface{}, error) {
-	if !h.GetAuth(auth.Auth).CanRead() {
-		return nil, oerr.NoAuth
-	}
-	aid := h.Meta().ParamsInt("id")
-	query := &models.Auth{}
-	var err error
-	if aid > 0 {
-		err = cfg.DB().Where("ID = ?", aid).First(query).Error
-		return query, err
-	}
-	id, _ := strconv.Atoi(h.Meta().Query("id"))
-	uuid := h.Meta().Query("uuid")
-	if id == 0 || uuid == "" {
-		return nil, oerr.ApiArgsMissing
-	}
-	target := &models.App{}
-	err = cfg.DB().Where("UUID = ?", uuid).First(target).Error
-	if err != nil {
-		return nil, err
-	}
-	u := &models.User{}
-	err = cfg.DB().Preload("Roles.Auths").Preload("Auths").Where("ID = ?", id).First(u).Error
-	if err != nil {
-		return nil, err
-	}
-	l := make([]*oalib.SimpleAuth, 0, 10)
-	for _, as := range u.GetAuths() {
-		if as.AppUUID == uuid {
-			l = append(l, &oalib.SimpleAuth{
-				RID:   as.RID,
-				RUID:  as.RUID,
-				Level: as.Level,
-			})
-		}
-	}
-	return l, nil
-}

api/role/role.go

@@ -42,7 +42,9 @@ func (h *roleHandler) Post() (interface{}, error) {
 	if !h.GetAuth(auth.Role).CanCreate() {
 		return nil, oerr.NoAuth
 	}
-	role := &models.Role{}
+	role := &models.Role{
+		AppUUID: h.UUID,
+	}
 	err := h.Meta().ReadJson(role)
 	if err != nil {
 		return nil, err

api/role/roleAuth.go

@@ -1,42 +0,0 @@
-package role
-
-import (
-	"github.com/veypi/OneAuth/libs/auth"
-	"github.com/veypi/OneAuth/libs/base"
-	"github.com/veypi/OneAuth/libs/oerr"
-	"github.com/veypi/OneBD"
-)
-
-/**
-* @name: roleAuth
-* @author: veypi <i@veypi.com>
-* @date: 2021-11-17 15:20
-* @description：roleAuth
-* @update: 2021-11-17 15:20
- */
-
-var rap = OneBD.NewHandlerPool(func() OneBD.Handler {
-	return &roleAuthHandler{}
-})
-
-type roleAuthHandler struct {
-	base.AppHandler
-	id  uint
-	aid uint
-}
-
-func (h *roleAuthHandler) Init(m OneBD.Meta) error {
-	id := uint(m.ParamsInt("id"))
-	aid := uint(m.ParamsInt("aid"))
-	if id == 0 || aid == 0 {
-		return oerr.ApiArgsError
-	}
-	return h.ApiHandler.Init(m)
-}
-
-func (h *roleAuthHandler) Post() (interface{}, error) {
-	if !h.Payload.GetAuth(auth.Auth, h.UUID).CanCreate() {
-		return nil, oerr.NoAuth
-	}
-	return nil, nil
-}

api/role/router.go

@@ -9,6 +9,4 @@ func Router(r OneBD.Router) {
 	r.Set("/", roleP, rfc.MethodGet, rfc.MethodPost)
 	r.Set("/:id", roleP, rfc.MethodGet, rfc.MethodDelete, rfc.MethodPatch)
 	r.Set("/:id/auth/:aid", roleP, rfc.MethodGet)
-	r.Set("/auth/", authP, rfc.MethodGet)
-	r.Set("/auth/:id", authP, rfc.MethodGet)
 }

libs/tools/tools.go

@@ -5,6 +5,7 @@ import (
 	"github.com/veypi/OneBD"
 	"net/http"
 	"net/url"
+	"reflect"
 )
 
 type Initer interface {
@@ -42,3 +43,19 @@ func Query(addr string, query map[string]string, res interface{}) error {
 	}
 	return json.NewDecoder(resp.Body).Decode(res)
 }
+
+func Struct2Map(obj interface{}) (data map[string]interface{}) {
+	data = make(map[string]interface{})
+	objT := reflect.TypeOf(obj)
+	objV := reflect.ValueOf(obj)
+	var item reflect.Value
+	var k reflect.StructField
+	for i := 0; i < objT.NumField(); i++ {
+		k = objT.Field(i)
+		item = objV.Field(i)
+		if !item.IsNil() {
+			data[k.Name] = item.Interface()
+		}
+	}
+	return
+}

models/app.go

@@ -1,12 +1,14 @@
 package models
 
+import "gorm.io/gorm"
+
 var AppKeys = map[string]string{}
 
 type App struct {
 	UUID      string `gorm:"primaryKey;size:32"`
 	CreatedAt JSONTime
 	UpdatedAt JSONTime
-	DeletedAt *JSONTime `sql:"index"`
+	DeletedAt gorm.DeletedAt `gorm:"index"`
 	Name      string
 	Icon      string
 	Des       string

models/init.go

@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"github.com/veypi/OneAuth/cfg"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -98,5 +99,5 @@ type BaseModel struct {
 	ID        uint           `gorm:"primaryKey"`
 	CreatedAt JSONTime       ``
 	UpdatedAt JSONTime       ``
-	DeletedAt *JSONTime `sql:"index"`
+	DeletedAt gorm.DeletedAt `gorm:"index"`
 }

models/role.go

@@ -1,6 +1,8 @@
 package models
 
-import "github.com/veypi/OneAuth/oalib"
+import (
+	"github.com/veypi/OneAuth/oalib"
+)
 
 type UserRole struct {
 	BaseModel
@@ -28,7 +30,7 @@ type Auth struct {
 	AppUUID string `gorm:"size:32"`
 	App     *App   `gorm:"association_foreignkey:UUID"`
 	// 权限绑定只能绑定一个
-	RoleID *uint `gorm:""`
+	RoleID *uint
 	Role   *Role
 	UserID *uint
 	User   *User

oaf/src/api/auth.ts

@@ -8,8 +8,30 @@ export default (uuid: string) => {
         get(id: number) {
             return new Interface(ajax.get, this.local + id)
         },
-        list(appUUID: string, user_id: number) {
+        del(id: number) {
-            return new Interface(ajax.get, this.local, {uuid: appUUID, id: user_id})
+            return new Interface(ajax.delete, this.local + id)
+        },
+        update(id: number, ResourceID: number, RUID: string, Level: number) {
+            return new Interface(ajax.patch, this.local + id, {
+                ResourceID,
+                RUID,
+                Level,
+            })
+        },
+        create(ResourceID: number, UserID: number | null, RoleID: number | null, RUID: string, Level: number) {
+            return new Interface(ajax.post, this.local, {
+                ResourceID,
+                UserID,
+                RoleID,
+                RUID,
+                Level,
+            })
+        },
+        listOfUser(user_id: number) {
+            return new Interface(ajax.get, this.local, {uid: user_id})
+        },
+        listOfRole(id: number) {
+            return new Interface(ajax.get, this.local, {rid: id})
         },
     }
 }

oaf/src/api/resource.ts

@@ -15,6 +15,9 @@ export default (uuid: string) => {
         list() {
             return new Interface(ajax.get, this.local)
         },
+        update(id: number, props: {}) {
+            return new Interface(ajax.patch, this.local + id, props)
+        },
         create(Name: string, Des: string) {
             return new Interface(ajax.post, this.local, {Name, Des})
         },

oaf/src/api/role.ts

@@ -11,10 +11,12 @@ export default (uuid: string) => {
         list() {
             return new Interface(ajax.get, this.local)
         },
-        create(uuid: string, name: string) {
+        update(id: number, props) {
+            return new Interface(ajax.patch, this.local + id, props)
+        },
+        create(Name: string, Tag: string) {
             return new Interface(ajax.post, this.local, {
-                uuid: uuid,
+                Name,Tag
-                name: name,
             })
         },
         bind(id: number, aid: number) {

oaf/src/components/connectors/roleauths.vue

@@ -0,0 +1,131 @@
+<template>
+  <div>
+    <slot></slot>
+    <n-modal @after-leave="emit('update:modelValue', false)" v-model:show="modelValue">
+      <n-card class="w-4/5 md:w-1/2 rounded-2xl" :title="role.Name" :bordered="false"
+              size="huge">
+        <template #header-extra>
+        <n-button @click="auths.push({edit: true})">添加权限</n-button>
+        </template>
+        <div class="grid grid-cols-5 gap-1 gap-y-8" style="line-height: 34px">
+          <div>ID</div>
+          <div>作用资源</div>
+          <div>作用ID</div>
+          <div>权限等级</div>
+          <div></div>
+          <template :key="key" v-for="(item, key) in auths">
+          <template v-if="item.edit">
+          <div>{{ item.ID }}</div>
+          <div>
+            <n-select v-model:value="item.ResourceID" :options="RIDOptions"/>
+          </div>
+          <div>
+            <n-input v-model:value="item.RUID"></n-input>
+          </div>
+          <div>
+            <n-select v-model:value="item.Level" :options="levelOptions()"></n-select>
+          </div>
+          <div>
+            <n-button @click="update(item)">保存</n-button>
+          </div>
+          </template>
+          <template v-else>
+          <div>{{ item.ID }}</div>
+          <div>{{ item.RID }}</div>
+          <div>{{ item.RUID }}</div>
+          <div>{{ item.Level }}</div>
+          <div>
+            <n-button @click="item.edit=true">编辑</n-button>
+            <n-button @click="del(item.ID, key)">删除</n-button>
+          </div>
+          </template>
+          </template>
+        </div>
+        <template #footer>
+        <n-alert type="warning">
+          请谨慎操作， 操作不当可能使所有用户无法正常使用
+        </n-alert>
+        </template>
+      </n-card>
+    </n-modal>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {computed, ref, watch} from 'vue'
+import {modelsAuth, modelsResource, modelsRole} from '@/models'
+import api from '@/api'
+import {useMessage} from 'naive-ui'
+
+let props = withDefaults(defineProps<{
+  uuid: string
+  role: modelsRole
+  res: modelsResource[]
+  modelValue: boolean
+}>(), {})
+let emit = defineEmits<{
+  (e: 'update:modelValue', v: boolean): void
+}>()
+
+let msg = useMessage()
+let id = computed(() => {
+  return props.role.ID || 0
+})
+let auths = ref<modelsAuth[]>([])
+let RIDOptions = computed(() => {
+  let l = []
+  for (let r of props.res) {
+    l.push({
+      label: r.Name,
+      value: r.ID,
+    })
+  }
+  return l
+})
+
+let levelOptions = () => {
+  let l = []
+  for (let i = 0; i < 7; i++) {
+    l.push({
+      label: i,
+      value: i,
+    })
+  }
+  return l
+}
+
+watch(id, () => {
+  if (id.value > 0) {
+    api.auth(props.uuid).listOfRole(id.value).Start(e => {
+      auths.value = e
+    })
+  }
+})
+
+function del(id: number, index: number) {
+  api.auth(props.uuid).del(id).Start(e => {
+    auths.value.splice(index, 1)
+    msg.success('删除成功')
+  })
+}
+
+function update(row: modelsAuth) {
+  if (row.ID > 0) {
+    api.auth(props.uuid).update(row.ID, row.ResourceID, row.RUID, row.Level).Start(e => {
+      Object.assign(row, e)
+      msg.success('更新成功')
+    })
+  } else {
+    api.auth(props.uuid).create(row.ResourceID, null, id.value, row.RUID, row.Level).Start(e => {
+      Object.assign(row, e)
+      msg.success('添加成功')
+    })
+  }
+  // @ts-ignore
+  row.edit = false
+}
+</script>
+
+<style scoped>
+
+</style>

oaf/src/components/connectors/roleusers.vue

@@ -0,0 +1,10 @@
+<template>
+  <div></div>
+</template>
+
+<script lang="ts" setup>
+</script>
+
+<style scoped>
+
+</style>

oaf/src/components/editor/resource.vue

@@ -0,0 +1,64 @@
+<template>
+  <div>
+    <slot></slot>
+    <n-modal @after-leave="emit('update:modelValue',false)" v-model:show="modelValue">
+      <n-card class="w-4/5 md:w-1/2 rounded-2xl" :title="res.ID > 0 ? res.Name:' '" :bordered="false"
+              size="huge">
+        <template #header-extra>{{ res.ID > 0 ? '编辑' : '创建' }}</template>
+        <div class="grid grid-cols-5 gap-1 gap-y-8" style="line-height: 34px">
+          <div>资源名</div>
+          <div class="col-span-4">
+            <n-input :disabled="res.ID> 0" v-model:value="res.Name"></n-input>
+          </div>
+          <div>资源描述</div>
+          <div class="col-span-4">
+            <n-input type="textarea" v-model:value="res.Des"></n-input>
+          </div>
+        </div>
+        <template #footer>
+        <div class="flex justify-end">
+          <n-button class="mx-3" @click="emit('update:modelValue', false)">取消</n-button>
+          <n-button @click="update">{{ res.ID > 0 ? '更新' : '创建' }}</n-button>
+        </div>
+        </template>
+      </n-card>
+    </n-modal>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {modelsResource} from '@/models'
+import api from '@/api'
+
+let props = withDefaults(defineProps<{
+  res: modelsResource
+  modelValue: boolean
+  uuid: string
+}>(), {
+  res: {} as any,
+  modelValue: false,
+  uuid: '',
+})
+
+let emit = defineEmits<{
+  (e: 'update:modelValue', v: boolean): void
+  (e: 'ok', v: modelsResource)
+}>()
+
+function update() {
+  if (props.res.ID > 0) {
+    emit('update:modelValue', false)
+    api.resource(props.uuid).update(props.res.ID, props.res).Start(e => {
+    })
+    return
+  }
+  api.resource(props.uuid).create(props.res.Name, props.res.Des).Start(e => {
+    emit('ok', e)
+    emit('update:modelValue', false)
+  })
+}
+</script>
+
+<style scoped>
+
+</style>

oaf/src/components/editor/role.vue

@@ -0,0 +1,68 @@
+<template>
+  <div>
+    <slot></slot>
+    <n-modal @after-leave="emit('update:modelValue',false)" v-model:show="modelValue">
+      <n-card class="w-4/5 md:w-1/2 rounded-2xl" :title="res.ID > 0 ? res.Name:' '" :bordered="false"
+              size="huge">
+        <template #header-extra>{{ res.ID > 0 ? '编辑' : '创建' }}</template>
+        <div class="grid grid-cols-5 gap-1 gap-y-8" style="line-height: 34px">
+          <div>角色名</div>
+          <div class="col-span-4">
+            <n-input :disabled="res.ID> 0" v-model:value="res.Name"></n-input>
+          </div>
+          <div>角色标签</div>
+          <div class="col-span-4">
+            <n-input type="textarea" v-model:value="res.Tag"></n-input>
+          </div>
+        </div>
+        <template #footer>
+        <div class="flex justify-end">
+          <n-button class="mx-3" @click="emit('update:modelValue', false)">取消</n-button>
+          <n-button @click="update">{{ res.ID > 0 ? '更新' : '创建' }}</n-button>
+        </div>
+        </template>
+      </n-card>
+    </n-modal>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import {modelsRole} from '@/models'
+import api from '@/api'
+import {useMessage} from 'naive-ui'
+
+let props = withDefaults(defineProps<{
+  res: modelsRole
+  modelValue: boolean
+  uuid: string
+}>(), {
+  res: {} as any,
+  modelValue: false,
+  uuid: '',
+})
+
+let msg = useMessage()
+let emit = defineEmits<{
+  (e: 'update:modelValue', v: boolean): void
+  (e: 'ok', v: modelsRole)
+}>()
+
+function update() {
+  if (props.res.ID > 0) {
+    emit('update:modelValue', false)
+    api.role(props.uuid).update(props.res.ID, props.res).Start(e => {
+      msg.success('更新成功')
+    })
+    return
+  }
+  api.role(props.uuid).create(props.res.Name, props.res.Tag).Start(e => {
+    msg.success('添加成功')
+    emit('ok', e)
+    emit('update:modelValue', false)
+  })
+}
+</script>
+
+<style scoped>
+
+</style>

oaf/src/models/index.ts

@@ -66,6 +66,24 @@ export interface modelsSimpleAuth {
     RUID: string
 }
 
+export interface modelsAuth {
+    App?: modelsApp
+    AppUUID: string
+    CreatedAt: string
+    DeletedAt: null
+    ID: number
+    Level: number
+    RID: string
+    RUID: string
+    Resource?: modelsResource
+    ResourceID: number
+    Role?: modelsRole
+    RoleID: number
+    UpdatedAt: string
+    User?: modelsUser
+    UserID?: number
+}
+
 export interface modelsRole {
     App?: modelsApp
     AppUUID: string

oaf/src/views/app/roles.vue

@@ -1,6 +1,14 @@
 <template>
   <div>
+    <div class="flex justify-between">
       <h1 class="page-h1">角色管理</h1>
+      <div class="my-5 mr-10">
+        <EditorRole @ok="roles.push($event)" v-model="roleFlag" :res="tmp" :uuid="uuid">
+          <n-button @click="tmp={};roleFlag=true">添加角色</n-button>
+        </EditorRole>
+      </div>
+    </div>
+    <RoleAuths :res="resources" v-model="raFlag" :uuid="uuid" :role="tmp"></RoleAuths>
     <n-data-table
       :bordered="false"
       :columns="columns"
@@ -9,33 +17,13 @@
     <div class="flex justify-between">
       <h1 class="page-h1">资源管理</h1>
       <div class="my-5 mr-10">
-        <n-button @click="tmp_res={};tr_flag=true">添加资源</n-button>
+        <EditorRes @ok="resources.push($event)" v-model="trFlag" :res="tmp" :uuid="uuid">
+          <n-button @click="tmp={};trFlag=true">添加资源</n-button>
+        </EditorRes>
       </div>
     </div>
     <n-data-table class="mb-96" :bordered="false" :data="resources" :columns="resCols">
     </n-data-table>
-    <n-modal v-model:show="tr_flag">
-      <n-card class="w-4/5 md:w-96 rounded-2xl" :title="tmp_res.index >= 0 ? tmp_res.Name:' '" :bordered="false"
-              size="huge">
-        <template #header-extra>{{ tmp_res.index >= 0 ? '编辑' : '创建' }}</template>
-        <div class="grid grid-cols-5 gap-1 gap-y-8" style="line-height: 34px">
-          <div>资源名</div>
-          <div class="col-span-4">
-            <n-input v-model:value="tmp_res.Name"></n-input>
-          </div>
-          <div>资源描述</div>
-          <div class="col-span-4">
-            <n-input type="textarea" v-model:value="tmp_res.Des"></n-input>
-          </div>
-        </div>
-        <template #footer>
-        <div class="flex justify-end">
-          <n-button class="mx-3" @click="tr_flag=false">取消</n-button>
-          <n-button @click="add_res">创建</n-button>
-        </div>
-        </template>
-      </n-card>
-    </n-modal>
   </div>
 </template>
 
@@ -46,6 +34,9 @@ import {NButton, useMessage} from 'naive-ui'
 import {modelsBread, modelsResource, modelsRole} from '@/models'
 import {useStore} from '@/store'
 import {useRoute} from 'vue-router'
+import EditorRes from '@/components/editor/resource.vue'
+import EditorRole from '@/components/editor/role.vue'
+import RoleAuths from '@/components/connectors/roleauths.vue'
 
 let store = useStore()
 let route = useRoute()
@@ -66,15 +57,18 @@ const columns = [
         h(NButton, {
             class: 'mr-1',
             size: 'small',
-            onClick: () => console.log(row),
+            onClick: () => {
+              raFlag.value = true
+              tmp.value = row
+            },
           },
-          {default: () => '查看权限'}),
+          {default: () => '权限'}),
         h(NButton, {
             class: 'mr-1',
             size: 'small',
             onClick: () => console.log(row),
           },
-          {default: () => '查看用户'},
+          {default: () => '用户'},
         ),
       ]
     },
@@ -104,10 +98,18 @@ const resCols = [
   {
     title: '操作',
     key: '',
-    width: 100,
+    width: 200,
     fixed: 'right',
     render(row, i) {
-      return h(NButton, {
+      return [h(NButton, {
+          class: 'mr-1',
+          size: 'small',
+          onClick: () => {
+            trFlag.value = true
+            tmp.value = row
+          },
+        }, {default: () => '编辑'},
+      ), h(NButton, {
         class: 'mr-1',
         size: 'small',
         onClick: () => {
@@ -116,28 +118,17 @@ const resCols = [
             msg.success('删除成功')
           })
         },
-        }, {default: () => '删除'},
+      }, {default: () => '删除'}),
-      )
+      ]
     },
   },
 ]
 
-let tmp_res = ref({
+let tmp = ref({})
-  index: -1,
+let trFlag = ref(false)
-  Name: '',
+let roleFlag = ref(false)
-  Des: '',
+let raFlag = ref(false)
-})
-let tr_flag = ref(false)
 
-function add_res() {
-  if (tmp_res.value.index >= 0) {
-    return
-  }
-  api.resource(uuid.value).create(tmp_res.value.Name, tmp_res.value.Des).Start(e => {
-    resources.value.push(e)
-    tr_flag.value = false
-  })
-}
 </script>
 
 <style scoped>