@pubinfo/module-rbac 2.0.0-beta.10

package/src/assets/styles/vxe-table.css

@@ -0,0 +1,13 @@
+@import "vxe-table/lib/style.css";
+
+html.dark [data-theme="dark"],
+html.dark [data-theme="dark"] *,
+html.dark [data-theme="dark"]::before,
+html.dark [data-theme="dark"]::after {
+  --vxe-table-header-background-color: #1d1d1d;
+  --vxe-table-body-background-color: #141414;
+  --vxe-table-border-color: rgb(253 253 253 / 12%);
+  --vxe-table-header-font-color: rgb(255 255 255 / 85%);
+  --vxe-font-color: rgb(255 255 255 / 85%);
+  --vxe-table-row-hover-background-color: #1d1d1d;
+}

package/src/components/GroupSelector/index.vue

@@ -0,0 +1,305 @@
+<script setup lang="ts">
+import type { IOption } from './interface';
+import { postGroupList } from '@/api/modules/assist';
+import { GROUP_TYPE } from '@/views/group/enum';
+import { useToggle } from '@vueuse/core';
+
+defineOptions({
+  name: 'GroupSelector',
+});
+
+const emit = defineEmits(['select']);
+
+const currentTab = ref('OrgGroup');
+const isOrgMode = computed(() => currentTab.value === 'OrgGroup');
+const orgGroupList = ref<IOption[]>([]);
+const userGroupList = ref<IOption[]>([]);
+const selectedOrgGroups = ref<string[]>([]);
+const selectedUserGroups = ref<string[]>([]);
+const selectedData = computed(() => {
+  const list = isOrgMode.value ? orgGroupList : userGroupList;
+  const selectedKeys = isOrgMode.value ? selectedOrgGroups : selectedUserGroups;
+  return list.value.filter(item => selectedKeys.value.includes(item.value));
+});
+
+const open = defineModel<boolean>('open');
+const setOpen = useToggle(open);
+
+getData();
+
+function getData() {
+  getGroupsData(GROUP_TYPE.ORG);
+  getGroupsData(GROUP_TYPE.PER);
+}
+
+function getGroupsData(type: GROUP_TYPE.ORG | GROUP_TYPE.PER) {
+  postGroupList({ type }).then((res) => {
+    if (res && res.data && res.data.length) {
+      const list = res.data.map((item) => {
+        const { name = '', id = '' } = item;
+        const shortName = name.length > 20 ? `${name.substring(0, 20)}...` : name;
+        return {
+          label: shortName,
+          value: id,
+          name,
+          id,
+        };
+      });
+
+      if (type === GROUP_TYPE.ORG) {
+        orgGroupList.value = list;
+      }
+      else {
+        userGroupList.value = list;
+      }
+    }
+  });
+}
+
+function onOpen(selectedGroups: IOption[]) {
+  if (selectedGroups && selectedGroups.length) {
+    const groups = selectedGroups.map((item) => {
+      return item.value;
+    });
+    if (isOrgMode.value) {
+      selectedOrgGroups.value = groups;
+    }
+    else {
+      selectedUserGroups.value = groups;
+    }
+  }
+  else {
+    selectedOrgGroups.value = [];
+    selectedUserGroups.value = [];
+  }
+  setOpen(true);
+}
+
+function onClearAll() {
+  if (isOrgMode.value) {
+    clearOrgGroups();
+  }
+  else {
+    clearUserGroups();
+  }
+}
+
+function clearOrgGroups() {
+  selectedOrgGroups.value = [];
+}
+
+function clearUserGroups() {
+  selectedUserGroups.value = [];
+}
+
+function onRemoveGroup(value: string) {
+  const selectedKeys = isOrgMode.value ? selectedOrgGroups : selectedUserGroups;
+  const index = selectedKeys.value.findIndex(item => item === value);
+  if (index !== -1) {
+    selectedKeys.value.splice(index, 1);
+  }
+}
+
+function notifySelect() {
+  emit('select', selectedData.value);
+  setOpen(false);
+}
+
+defineExpose({
+  open: onOpen,
+});
+</script>
+
+<template>
+  <a-modal
+    v-model:open="open"
+    class="group-modal"
+    title="编辑群组"
+    :mask-closable="false"
+    :width="750"
+  >
+    <div class="h-340px border-1px border-solid flex flex-row border_color">
+      <div class="w-360px">
+        <a-tabs v-model:active-key="currentTab" class="h-full overflow-hidden">
+          <a-tab-pane key="OrgGroup" tab="组织群组">
+            <a-checkbox-group v-model:value="selectedOrgGroups" :options="orgGroupList" />
+          </a-tab-pane>
+          <a-tab-pane key="UserGroup" tab="用户群组" force-render>
+            <a-checkbox-group v-model:value="selectedUserGroups" :options="userGroupList" />
+          </a-tab-pane>
+        </a-tabs>
+      </div>
+
+      <div class="flex-1 flex flex-col border-solid border-0px border-l-1px border_color">
+        <div class="w-full h-38px bg-[rgb(245,245,245)] flex px-15px items-center justify-between text-[#1D2129] dark:bg-[#000] dark:text-[#F2F3F5]">
+          <div class="">
+            已选群组
+          </div>
+          <div class="cursor-pointer text-[#165DFF]" @click="onClearAll">
+            清空
+          </div>
+        </div>
+        <div class="flex-1 p-10px overflow-auto">
+          <div v-for="item in selectedData" :key="item.value" class="inline-block mb-6px max-w-300px">
+            <a-tooltip v-if="item.name && item.name.length > 20" :title="item.name">
+              <a-tag class="custom_tag bg-[#e8f3ff] dark:bg-[#141414]" closable @close="onRemoveGroup(item.value)">
+                {{ item.label }}
+              </a-tag>
+            </a-tooltip>
+            <a-tag
+              v-else
+              class="custom_tag bg-[#e8f3ff] dark:bg-[#141414]"
+              closable
+              @close="onRemoveGroup(item.value)"
+            >
+              {{ item.label }}
+            </a-tag>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <template #footer>
+      <a-button @click="setOpen(false)">
+        取消
+      </a-button>
+      <a-button type="primary" @click="notifySelect">
+        确定
+      </a-button>
+    </template>
+  </a-modal>
+</template>
+
+<style lang="scss">
+.group-modal {
+  .ant-tabs-content-holder {
+    padding: 0 16px 8px;
+    overflow: auto;
+  }
+
+  .ant-tabs-nav::before {
+    display: none;
+  }
+
+  .ant-tabs-nav-wrap {
+    height: 38px;
+    background: rgb(245 245 245);
+  }
+
+  .ant-tabs-tab {
+    padding: 0 12px;
+    margin: 0;
+
+    & + .ant-tabs-tab {
+      margin-left: 0 !important;
+    }
+  }
+
+  .ant-tabs-tab-active {
+    background: white;
+  }
+
+  .ant-checkbox-group {
+    display: block;
+  }
+
+  .ant-checkbox-wrapper {
+    display: flex;
+    margin-bottom: 8px;
+  }
+
+  .ant-tabs-ink-bar {
+    display: none;
+  }
+}
+
+.dark .group-modal {
+  .ant-tabs-nav-wrap {
+    color: #f2f3f5;
+    background: #000;
+  }
+
+  .ant-tabs-tab-active {
+    background: rgb(20 20 20);
+  }
+}
+</style>
+
+<style lang='scss' scoped>
+.group-modal {
+  :deep(.ant-modal-content) {
+    padding: 0;
+    border-radius: 0;
+  }
+
+  :deep(.ant-modal-header) {
+    padding: 12px 16px;
+    margin-bottom: 0;
+    border-bottom: 1px solid #e5e6eb;
+  }
+
+  :deep(.ant-modal-title) {
+    font-size: 16px;
+    font-weight: 500;
+    color: #1d2129;
+  }
+
+  :deep(.ant-modal-body) {
+    padding: 16px;
+  }
+
+  :deep(.ant-modal-footer) {
+    padding: 16px;
+    border-top: 1px solid #e5e6eb;
+
+    .ant-btn {
+      border-radius: 2px;
+    }
+  }
+}
+
+:deep(.ant-tree-checkbox) {
+  margin-block-start: 0;
+  margin-inline-end: 2px;
+}
+
+:deep(.ant-tree-checkbox + span .ant-tree-iconEle) {
+  margin-right: 4px;
+}
+
+.custom_tag {
+  padding: 3px 8px;
+  border-width: 0;
+  border-radius: 2px;
+
+  :deep(.ant-tag-close-icon) {
+    color: rgb(22 93 255 / 60%);
+
+    &:hover {
+      color: #165dff;
+    }
+  }
+}
+
+.border_color {
+  border-color: #e5e6eb;
+}
+
+[data-theme="dark"] {
+  .border_color {
+    border-color: rgb(253 253 253 / 12%);
+  }
+}
+
+.border_c {
+  border: 1px dashed #ccc;
+  border-radius: 10px;
+}
+
+:deep(.ant-dropdown-link) {
+  padding: 4px 6px;
+  font-size: 12px;
+  border-radius: 2px;
+  transform: scale(0.7);
+}
+</style>

package/src/components/GroupSelector/interface.ts

@@ -0,0 +1,6 @@
+export interface IOption {
+  label: string
+  value: string
+  name: string
+  id: string
+};

package/src/components/OrgTree/index.vue

@@ -0,0 +1,91 @@
+<script setup lang="ts">
+import type { EventDataNode, TreeProps } from 'ant-design-vue/es/tree';
+import { getRbacOrgOrgListByParentId } from '@/api/modules/rbac';
+import { useToggle } from '@vueuse/core';
+
+defineOptions({
+  name: 'OrgTree',
+});
+
+const props = defineProps<{
+  auth?: string
+}>();
+
+type TreeNode = API.PubOrg & { isLeaf?: boolean, children?: TreeNode[] };
+
+const treeData = ref<TreeProps['treeData'] & TreeNode[]>([]);
+const [loading, setLoading] = useToggle(false);
+
+function onLoadData(treeNode?: EventDataNode) {
+  return new Promise<void>((resolve, reject) => {
+    if (treeNode?.dataRef?.children) {
+      resolve();
+      return;
+    }
+
+    setLoading(true);
+    getRbacOrgOrgListByParentId(
+      {
+        parentId: treeNode?.dataRef?.id, enable: true,
+      },
+      {
+        headers: { 'X-ResourceMark': props.auth },
+      })
+      .then((res) => {
+        if (res.success) {
+          const data = res?.data?.map(formatTreeNode) ?? [];
+          if (treeNode?.dataRef) {
+            treeNode.dataRef.children = data;
+          }
+          else {
+            treeData.value = data;
+          }
+        }
+        treeData.value = [...treeData.value];
+        resolve();
+      })
+      .catch(reject)
+      .finally(() => setLoading(false));
+  });
+}
+
+function formatTreeNode(data: API.PubOrg) {
+  return {
+    key: data.id!,
+    isLeaf: data.leaf,
+    ...data,
+  };
+}
+
+onMounted(() => {
+  onLoadData();
+});
+</script>
+
+<template>
+  <a-card :body-style="{ padding: '16px' }" class="w-full h-full overflow-y-auto overflow-x-hidden">
+    <a-spin :spinning="loading">
+      <a-empty v-if="treeData.length === 0" />
+      <a-tree
+        v-else
+        v-bind="$attrs"
+        block-node
+        :load-data="onLoadData"
+        :tree-data="treeData"
+        :field-names="{ children: 'children', title: 'name', key: 'id' }"
+      >
+        <template #title="node">
+          <div class="flex w-full items-center overflow-hidden">
+            <span :title="node.name" class="truncate">{{ node.name }}</span>
+          </div>
+        </template>
+      </a-tree>
+    </a-spin>
+  </a-card>
+</template>
+
+<style scoped>
+:deep(.ant-tree .ant-tree-node-content-wrapper) {
+  overflow: hidden;
+}
+</style>

package/src/components/OrgUserSelector/OrgSelector.vue

@@ -0,0 +1,135 @@
+<script setup lang="ts">
+import { ContentSelector, OrgProvider } from '@pubinfo/headlessui';
+import { useToggle } from '@vueuse/core';
+import { Form, Modal } from 'ant-design-vue';
+import { orgFieldNames, useOrgAPIs } from './provider';
+import '@pubinfo/headlessui/style.css';
+
+export interface ModelValue extends Record<string, any> {
+  orgId?: string
+  orgName?: string
+}
+
+export interface OrgSelectorProps {
+  /** 标题 */
+  title?: string
+  /** 多选 */
+  multiple?: boolean
+  /** 数据权限 */
+  auth?: string
+  /** 替换接口 */
+  apis?: ReturnType<typeof useOrgAPIs>
+  /** Tab页 */
+  tabs?: Array<{ value: string, label: string }>
+  /** 禁用数据 */
+  disabledData?: (node: any) => boolean
+  /** 过滤组织数据 */
+  filter?: (node: any) => boolean
+  /** 提交 */
+  onSubmit?: (selected: ModelValue[]) => void
+}
+
+defineOptions({
+  name: 'OrgSelector',
+});
+
+const props = withDefaults(
+  defineProps<OrgSelectorProps>(),
+  {
+    title: '选择组织',
+    multiple: false,
+    apis: () => ({}),
+    tabs: () => [
+      { value: 'RecentlyUsed', label: '最近常用' },
+      { value: 'Favorites', label: '收藏' },
+      { value: 'OrgTree', label: '全部' },
+      { value: 'Groups', label: '群组' },
+    ],
+    disabledData: () => false,
+    filter: () => true,
+  },
+);
+
+const attrs = useAttrs();
+
+const orgAPIs = {
+  ...useOrgAPIs({ auth: props.auth, filter: props.filter }),
+  ...props.apis,
+};
+
+// 双向绑定
+const open = defineModel<boolean>('open');
+const modelValue = defineModel<ModelValue[]>({ default: [] });
+
+const selectValue = ref<ModelValue[]>([]);
+const setOpen = useToggle(open);
+const { onFieldChange } = Form.useInjectFormItemContext();
+
+function onOpen() {
+  setOpen(true);
+}
+watch(open, async (_open) => {
+  if (!_open) {
+    return;
+  }
+
+  if (!modelValue.value.length) {
+    selectValue.value = [];
+    return;
+  }
+
+  try {
+    // 回显选中项
+    selectValue.value = await orgAPIs?.getSelectedData?.(modelValue.value) ?? modelValue.value;
+  }
+  catch {
+    selectValue.value = modelValue.value;
+  }
+}, { immediate: true });
+
+function onSubmit() {
+  modelValue.value = selectValue.value;
+  props.onSubmit?.(selectValue.value);
+  onFieldChange();
+  setOpen(false);
+
+  // 添加最近常用
+  orgAPIs?.addRecentlyUsed?.(selectValue.value);
+}
+
+defineExpose({
+  open: onOpen,
+});
+</script>
+
+<template>
+  <div>
+    <span v-if="$slots.trigger" @click="onOpen()">
+      <slot name="trigger" />
+    </span>
+
+    <Modal
+      v-bind="attrs"
+      v-model:open="open"
+      :title="title"
+      :width="760"
+      :z-index="1001"
+      ok-text="确认"
+      cancel-text="取消"
+      @ok="onSubmit()"
+    >
+      <OrgProvider
+        :apis="orgAPIs"
+        :field-names="orgFieldNames"
+      >
+        <ContentSelector
+          v-model="selectValue"
+          default-tab="OrgTree"
+          :tabs="tabs"
+          :multiple="multiple"
+          :disabled-data="disabledData"
+        />
+      </OrgProvider>
+    </Modal>
+  </div>
+</template>

package/src/components/OrgUserSelector/UserSelector.vue

@@ -0,0 +1,164 @@
+<script setup lang="ts">
+import { ContentSelector, OrgProvider, UserProvider } from '@pubinfo/headlessui';
+import { useToggle } from '@vueuse/core';
+import { Form, Modal } from 'ant-design-vue';
+import { omit, pick } from 'lodash-es';
+import { orgFieldNames, resolveId, useOrgAPIs, userFieldNames, useUserAPIs } from './provider';
+import '@pubinfo/headlessui/style.css';
+
+export interface ModelValue extends Record<string, any> {
+  orgId?: string
+  userId?: string
+  userName?: string
+}
+
+interface SelectValue extends Record<string, any> {
+  /** userFieldNames.value */
+  orgUserId?: string
+  userName?: string
+}
+
+export interface UserSelectorProps {
+  /** 标题 */
+  title?: string
+  /** 多选 */
+  multiple?: boolean
+  /** 数据权限 */
+  auth?: string
+  /** 替换接口 */
+  apis?: ReturnType<typeof useUserAPIs> & Pick<ReturnType<typeof useOrgAPIs>, 'orgTree' | 'orgList'>
+  /** Tab页 */
+  tabs?: Array<{ value: string, label: string }>
+  /** 禁用数据 */
+  disabledData?: (node: any) => boolean
+  /** 过滤组织数据 */
+  filterOrg?: (node: any) => boolean
+  /** 过滤用户数据 */
+  filterUser?: (node: any) => boolean
+  /** 提交 */
+  onSubmit?: (selected: ModelValue[]) => void
+}
+
+defineOptions({
+  name: 'UserSelector',
+});
+
+const props = withDefaults(
+  defineProps<UserSelectorProps>(),
+  {
+    title: '选择用户',
+    multiple: false,
+    apis: () => ({}),
+    tabs: () => [
+      { value: 'RecentlyUsed', label: '最近常用' },
+      { value: 'Favorites', label: '收藏' },
+      { value: 'TreeUserList', label: '全部' },
+      { value: 'Groups', label: '群组' },
+    ],
+    disabledData: () => false,
+    filterOrg: () => true,
+    filterUser: () => true,
+  },
+);
+
+const attrs = useAttrs();
+
+const orgAPIs = {
+  ...useOrgAPIs({ auth: props.auth, filter: props.filterOrg }),
+  ...pick(props.apis, ['orgTree', 'orgList']),
+};
+const userAPIs = {
+  ...useUserAPIs({ auth: props.auth, filter: props.filterUser }),
+  ...omit(props.apis, ['orgTree', 'orgList']),
+};
+
+// 双向绑定
+const open = defineModel<boolean>('open');
+const modelValue = defineModel<ModelValue[]>({ default: [] });
+
+const selectValue = ref<SelectValue[]>([]);
+const setOpen = useToggle(open);
+const { onFieldChange } = Form.useInjectFormItemContext();
+
+function onOpen() {
+  setOpen(true);
+}
+watch(open, async (_open) => {
+  if (!_open) {
+    return;
+  }
+
+  if (!modelValue.value.length) {
+    selectValue.value = [];
+    return;
+  }
+
+  try {
+    // 回显选中项
+    selectValue.value = await userAPIs?.getSelectedData?.(modelValue.value) ?? modelValue.value;
+  }
+  catch {
+    selectValue.value = modelValue.value;
+  }
+}, { immediate: true });
+
+function onSubmit() {
+  const finalValue = selectValue.value?.map((item) => {
+    const ids = resolveId(item[userFieldNames.value]);
+    return {
+      ...item,
+      orgId: ids.orgId,
+      userId: ids.userId,
+    };
+  });
+
+  modelValue.value = finalValue;
+  props.onSubmit?.(finalValue);
+  onFieldChange();
+  setOpen(false);
+
+  // 添加最近常用
+  userAPIs?.addRecentlyUsed?.(finalValue);
+}
+
+defineExpose({
+  open: onOpen,
+});
+</script>
+
+<template>
+  <div>
+    <span v-if="$slots.trigger" @click="onOpen()">
+      <slot name="trigger" />
+    </span>
+
+    <Modal
+      v-bind="attrs"
+      v-model:open="open"
+      :title="title"
+      :width="760"
+      :z-index="1001"
+      ok-text="确认"
+      cancel-text="取消"
+      @ok="onSubmit()"
+    >
+      <OrgProvider
+        :apis="orgAPIs"
+        :field-names="orgFieldNames"
+      >
+        <UserProvider
+          :apis="userAPIs"
+          :field-names="userFieldNames"
+        >
+          <ContentSelector
+            v-model="selectValue"
+            default-tab="TreeUserList"
+            :tabs="tabs"
+            :multiple="multiple"
+            :disabled-data="disabledData"
+          />
+        </UserProvider>
+      </OrgProvider>
+    </Modal>
+  </div>
+</template>