feat: new feature

2022-12-23 19:47:13 +08:00
parent 17f2dc4d3c
commit 81fac9f62c
38 changed files with 1019 additions and 1486 deletions
--- a/modules/Permissions/views/departments/index.vue
+++ b/modules/Permissions/views/departments/index.vue
@@ -42,7 +42,7 @@ import { useOpen } from '/admin/composables/curd/useOpen'

 const api = 'permissions/departments'

-const { data, query, search, reset, loading } = useGetList(api)
+const { data, query, search, reset, loading } = useGetList(api, false)
 const { destroy, deleted } = useDestroy()
 const { open, close, title, visible, id } = useOpen()

--- a/modules/Permissions/views/permissions/form/create.vue
+++ b/modules/Permissions/views/permissions/form/create.vue
@@ -18,8 +18,7 @@
          </el-radio-group>
        </el-form-item>
        <el-form-item label="菜单名称" prop="permission_name" :rules="[{ required: true, message: '菜单名称必须填写' }]">
-          <Select v-model="formData.permission_name" name="permission_name" allow-create :options="actionMenuNames" v-if="isAction" />
-          <el-input v-model="formData.permission_name" name="permission_name" clearable v-else />
+          <el-input v-model="formData.permission_name" name="permission_name" clearable />
        </el-form-item>
        <el-form-item label="所属模块" prop="module" :rules="[{ required: true, message: '所属模块必须填写' }]" v-if="!isAction">
          <Select v-model="formData.module" api="modules" @clear="clearModule" />
@@ -39,7 +38,7 @@
          <el-cascader :options="permissions" name="parent_id" v-model="formData.parent_id" clearable :props="{ value: 'id', label: 'permission_name', checkStrictly: true }" class="w-full" />
        </el-form-item>
        <el-form-item label="权限标识" prop="permission_mark" :rules="[{ required: true, message: '权限标识必须填写' }]" v-if="!isTop">
-          <Select v-model="formData.permission_mark" name="permission_mark" :options="actionMenuMark" allow-create v-if="isAction" />
+          <el-input v-model="formData.permission_mark" name="permission_mark" clearable v-if="isAction" />
          <Select v-model="formData.permission_mark" placeholder="请选择" api="controllers" :query="{ module: formData.module }" v-else />
        </el-form-item>
        <el-form-item label="菜单Icon" prop="icon" v-if="!isAction">
@@ -174,28 +173,6 @@ const clearModule = () => {
  }
 }

-// 当菜单是按钮类型时, 定义两个初始值
-const actionMenuNames = [
-  { label: '列表', value: '列表' },
-  { label: '新增', value: '新增' },
-  { label: '读取', value: '读取' },
-  { label: '更新', value: '更新' },
-  { label: '删除', value: '删除' },
-  { label: '禁用/启用', value: '禁用/启用' },
-  { label: '导入', value: '导入' },
-  { label: '导出', value: '导出' },
-]
-
-const actionMenuMark = [
-  { label: 'index', value: 'index' },
-  { label: 'store', value: 'store' },
-  { label: 'show', value: 'show' },
-  { label: 'update', value: 'update' },
-  { label: 'destroy', value: 'destroy' },
-  { label: 'enable', value: 'enable' },
-  { label: 'import', value: 'import' },
-  { label: 'export', value: 'export' },
-]
 // 创建前的钩子
 beforeCreate.value = () => {
  formData.value.parent_id = getParent(formData.value.parent_id)
--- a/modules/Permissions/views/permissions/index.vue
+++ b/modules/Permissions/views/permissions/index.vue
@@ -12,16 +12,26 @@
      <el-table :data="tableData" class="mt-3" v-loading="loading" row-key="id" default-expand-all :tree-props="{ children: 'children' }">
        <el-table-column prop="permission_name" label="菜单名称" />
        <el-table-column prop="route" label="菜单路由" />
-        <el-table-column prop="permission_mark" label="权限标识" width="300">
+        <el-table-column prop="permission_mark" label="权限标识" width="330">
          <template #default="scope">
            <div v-if="scope.row.actions.length" class="flex grid gap-1 grid-cols-4">
              <el-tag v-for="action in scope.row.actions" class="cursor-pointer min-w-fit" @click="open(action.id)" closable @close="destroy(api, action.id)">{{ action.permission_name }}</el-tag>
            </div>
+            <div v-else>
+              <el-popconfirm confirm-button-text="确认" title="添加基础actions" @confirm="actionGenerate(scope.row.id)" placement="top">
+                <template #reference>
+                  <el-tag class="cursor-pointer w-8" v-if="scope.row.type === MenuType.PAGE_TYPE">
+                    <Icon name="cog-6-tooth" class="animate-spin w-5 h-5" v-if="actionLoading" />
+                    <Icon name="plus" class="w-4 h-4" v-else />
+                  </el-tag>
+                </template>
+              </el-popconfirm>
+            </div>
          </template>
        </el-table-column>
-        <el-table-column prop="hidden" label="状态">
+        <el-table-column prop="hidden" label="状态" width="100">
          <template #default="scope">
-            <Status v-model="scope.row.hidden" :id="scope.row.id" :api="api" />
+            <Status v-model="scope.row.hidden" :id="scope.row.id" :api="api" @refresh="search" />
          </template>
        </el-table-column>
        <el-table-column prop="created_at" label="创建时间" />
@@ -41,16 +51,17 @@
 </template>

 <script lang="ts" setup>
-import { computed, onMounted } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import Create from './form/create.vue'
 import { useGetList } from '/admin/composables/curd/useGetList'
 import { useDestroy } from '/admin/composables/curd/useDestroy'
 import { useOpen } from '/admin/composables/curd/useOpen'
 import { MenuType } from '/admin/enum/app'
+import http from '../../../../resources/admin/support/http'

 const api = 'permissions/permissions'

-const { data, query, search, reset, loading } = useGetList(api)
+const { data, query, search, reset, loading } = useGetList(api, false)
 const { destroy, deleted } = useDestroy()
 const { open, close, title, visible, id } = useOpen()

@@ -60,4 +71,13 @@ onMounted(() => {
  search()
  deleted(reset)
 })
+
+const actionLoading = ref<boolean>(false)
+const actionGenerate = async (id: number) => {
+  actionLoading.value = true
+  http.post(api, { parent_id: id, actions: true }).then(r => {
+    search()
+    actionLoading.value = false
+  })
+}
 </script>
--- a/modules/Permissions/views/roles/form/create.vue
+++ b/modules/Permissions/views/roles/form/create.vue
@@ -43,7 +43,18 @@
    <el-form-item label="数据权限" prop="data_range">
      <Select v-model="formData.data_range" name="data_range" clearable api="dataRange" class="w-full" />
    </el-form-item>
-    <el-form-item label="选择权限" prop="permissions">
+    <el-form-item label="自定义权限" prop="department_ids" v-if="showDepartments">
+      <el-cascader
+        :options="departments"
+        name="parent_id"
+        v-model="formData.departmetn_ids"
+        :show-all-levels="false"
+        clearable
+        :props="{ value: 'id', label: 'department_name', checkStrictly: true, multiple: true }"
+        class="w-full"
+      />
+    </el-form-item>
+    <el-form-item label="角色权限" prop="permissions">
      <el-tree
        ref="permissionTree"
        v-model="formData.permissions"
@@ -66,7 +77,7 @@
 <script lang="ts" setup>
 import { useCreate } from '/admin/composables/curd/useCreate'
 import { useShow } from '/admin/composables/curd/useShow'
-import { nextTick, onMounted, ref, unref } from 'vue'
+import { nextTick, onMounted, ref, unref, watch } from 'vue'
 import http from '/admin/support/http'

 const props = defineProps({
@@ -75,6 +86,8 @@ const props = defineProps({
  hasPermissions: Array<Object>,
 })

+const emit = defineEmits(['close'])
+
 const { formData, form, loading, submitForm, close, beforeCreate, beforeUpdate } = useCreate(props.api, props.primary)

 if (props.primary) {
@@ -92,11 +105,14 @@ if (props.primary) {
  }
 }

-const emit = defineEmits(['close'])
 const roles = ref()
 const permissions = ref()
 // 权限树对象
 const permissionTree = ref()
+//  部门
+const departments = ref()
+const showDepartments = ref<boolean>(false)
+
 const permissionLoadingText = ref<string>('加载中...')
 const getPermissions = async (value: number = 0) => {
  if (value) {
@@ -129,10 +145,23 @@ const getRoles = () => {
  })
 }

+const getDepartments = () => {
+  http.get('permissions/departments').then(r => {
+    departments.value = r.data.data
+  })
+}
 onMounted(() => {
  getRoles()
  getPermissions()
+  getDepartments()
  close(() => emit('close'))
+  watch(
+    formData,
+    function (value) {
+      showDepartments.value = value.data_range === 2
+    },
+    { deep: true },
+  )
 })

 const selectPermissions = (checkedNodes, checkedKeys) => {
--- a/modules/Permissions/views/roles/index.vue
+++ b/modules/Permissions/views/roles/index.vue
@@ -39,7 +39,7 @@ import { useOpen } from '/admin/composables/curd/useOpen'

 const api = 'permissions/roles'

-const { data, query, search, reset, loading } = useGetList(api)
+const { data, query, search, reset, loading } = useGetList(api, false)
 const { destroy, deleted } = useDestroy()
 const { open, close, title, visible, id } = useOpen()