feat: post form

apps/web-antd/src/api/system/post/index.ts

@@ -0,0 +1,46 @@
+import type { Post } from './model';
+
+import type { ID, IDS, PageQuery } from '#/api/common';
+
+import { commonExport } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+enum Api {
+  postExport = '/system/post/export',
+  postList = '/system/post/list',
+  postSelect = '/system/post/optionselect',
+  root = '/system/post',
+}
+
+/**
+ * 获取岗位列表
+ * @param params 参数
+ * @returns Post[]
+ */
+export function postList(params?: PageQuery) {
+  return requestClient.get<Post[]>(Api.postList, { params });
+}
+
+export function postExport(data: any) {
+  return commonExport(Api.postExport, data);
+}
+
+export function postInfo(postId: ID) {
+  return requestClient.get<Post>(`${Api.root}/${postId}`);
+}
+
+export function postAdd(data: any) {
+  return requestClient.postWithMsg<void>(Api.root, data);
+}
+
+export function postUpdate(data: any) {
+  return requestClient.putWithMsg<void>(Api.root, data);
+}
+
+export function postRemove(postIds: IDS) {
+  return requestClient.deleteWithMsg<void>(`${Api.root}/${postIds}`);
+}
+
+export function postOptionSelect(deptId: ID) {
+  return requestClient.get(Api.postSelect, { params: { deptId } });
+}

apps/web-antd/src/api/system/post/model.d.ts

@@ -0,0 +1,12 @@
+/**
+ * @description: Post interface
+ */
+export interface Post {
+  postId: number;
+  postCode: string;
+  postName: string;
+  postSort: number;
+  status: string;
+  remark: string;
+  createTime: string;
+}

apps/web-antd/src/api/system/profile/index.ts

@@ -1,7 +1,8 @@
 import type { FileCallBack, UpdatePasswordParam, UserProfile } from './model';
 
+import { buildUUID } from '@vben/utils';
+
 import { requestClient } from '#/api/request';
-import { buildUUID } from '#/utils/uuid';
 
 enum Api {
   root = '/system/user/profile',

apps/web-antd/src/api/system/user/index.ts

@@ -0,0 +1,164 @@
+import type {
+  DeptTree,
+  ResetPwdParam,
+  User,
+  UserImportParam,
+  UserInfoResponse,
+} from './model';
+
+import type { ID, IDS, PageQuery, PageResult } from '#/api/common';
+
+import { commonExport, ContentTypeEnum } from '#/api/helper';
+import { requestClient } from '#/api/request';
+
+enum Api {
+  deptTree = '/system/user/deptTree',
+  listDeptUsers = '/system/user/list/dept',
+  root = '/system/user',
+  userAuthRole = '/system/user/authRole',
+  userExport = '/system/user/export',
+  userImport = '/system/user/importData',
+  userImportTemplate = '/system/user/importTemplate',
+  userList = '/system/user/list',
+  userResetPassword = '/system/user/resetPwd',
+  userStatusChange = '/system/user/changeStatus',
+}
+
+/**
+ *  获取用户列表
+ * @param params
+ * @returns User
+ */
+export function userList(params?: PageQuery) {
+  return requestClient.get<PageResult<User>>(Api.userList, { params });
+}
+
+/**
+ * 导出excel
+ * @param data data
+ * @returns blob
+ */
+export function userExport(data: any) {
+  return commonExport(Api.userExport, data);
+}
+
+/**
+ * 从excel导入用户
+ * @param data
+ * @returns void
+ */
+export function userImportData(data: UserImportParam) {
+  return requestClient.post<void>(Api.userImport, data, {
+    // 返回的msg包含<br> 用modal显示
+    errorMessageMode: 'modal',
+    headers: {
+      'Content-Type': ContentTypeEnum.FORM_DATA,
+    },
+    successMessageMode: 'modal',
+  });
+}
+
+/**
+ * 下载用户导入模板
+ * @returns blob
+ */
+export function downloadImportTemplate() {
+  return requestClient.post<Blob>(
+    Api.userImportTemplate,
+    {},
+    {
+      isTransformResponse: false,
+      responseType: 'blob',
+    },
+  );
+}
+
+/**
+ * 可以不传ID  返回部门和角色options 需要获得原始数据
+ * @param userId 用户ID
+ * @returns 用户信息
+ */
+export function findUserInfo(userId?: ID) {
+  const url = userId ? `${Api.root}/${userId}` : `${Api.root}`;
+  return requestClient.get<UserInfoResponse>(url);
+}
+
+/**
+ * 新增用户
+ * @param data data
+ * @returns void
+ */
+export function userAdd(data: any) {
+  return requestClient.postWithMsg<void>(Api.root, data);
+}
+
+/**
+ * 更新用户
+ * @param data data
+ * @returns void
+ */
+export function userUpdate(data: any) {
+  return requestClient.putWithMsg<void>(Api.root, data);
+}
+
+/**
+ * 更新用户状态
+ * @param data data
+ * @returns void
+ */
+export function userStatusChange(data: any) {
+  return requestClient.putWithMsg<void>(Api.userStatusChange, data);
+}
+
+/**
+ * 删除用户
+ * @param userIds 用户ID数组
+ * @returns void
+ */
+export function userRemove(userIds: IDS) {
+  return requestClient.deleteWithMsg<void>(`${Api.root}/${userIds}`);
+}
+
+/**
+ * 重置用户密码 需要加密
+ * @param data
+ * @returns void
+ */
+export function userResetPassword(data: ResetPwdParam) {
+  return requestClient.putWithMsg<void>(Api.userResetPassword, data, {
+    encrypt: true,
+  });
+}
+
+/**
+ * 这个方法未调用过
+ * @param userId
+ * @returns void
+ */
+export function getUserAuthRole(userId: ID) {
+  return requestClient.get(`${Api.userAuthRole}/${userId}`);
+}
+
+/**
+ * 这个方法未调用过
+ * @param userId
+ * @returns void
+ */
+export function userAuthRoleUpdate(userId: ID, roleIds: number[]) {
+  return requestClient.putWithMsg(Api.userAuthRole, { roleIds, userId });
+}
+
+/**
+ * 获取部门树
+ * @returns 部门树数组
+ */
+export function getDeptTree() {
+  return requestClient.get<DeptTree[]>(Api.deptTree);
+}
+
+/**
+ * 获取部门下的所有用户信息
+ */
+export function listUserByDeptId(deptId: ID) {
+  return requestClient.get<User[]>(`${Api.listDeptUsers}/${deptId}`);
+}

apps/web-antd/src/api/system/user/model.d.ts

@@ -0,0 +1,116 @@
+/**
+ * @description: 用户导入
+ * @param updateSupport 是否覆盖数据
+ * @param file excel文件
+ */
+export interface UserImportParam {
+  updateSupport: boolean;
+  file: Blob | File;
+}
+
+/**
+ * @description: 重置密码
+ */
+export interface ResetPwdParam {
+  userId: string;
+  password: string;
+}
+
+export interface Dept {
+  deptId: number;
+  parentId: number;
+  parentName?: string;
+  ancestors: string;
+  deptName: string;
+  orderNum: number;
+  leader: string;
+  phone?: string;
+  email?: string;
+  status: string;
+  createTime?: string;
+}
+
+export interface Role {
+  roleId: string;
+  roleName: string;
+  roleKey: string;
+  roleSort: number;
+  dataScope: string;
+  menuCheckStrictly?: boolean;
+  deptCheckStrictly?: boolean;
+  status: string;
+  remark: string;
+  createTime?: string;
+  flag: boolean;
+  superAdmin: boolean;
+}
+
+export interface User {
+  userId: string;
+  tenantId: string;
+  deptId: number;
+  userName: string;
+  nickName: string;
+  userType: string;
+  email: string;
+  phonenumber: string;
+  sex: string;
+  avatar?: string;
+  status: string;
+  loginIp: string;
+  loginDate: string;
+  remark: string;
+  createTime: string;
+  dept: Dept;
+  roles: Role[];
+  roleIds?: string[];
+  postIds?: number[];
+  roleId: string;
+}
+
+export interface Post {
+  postId: number;
+  postCode: string;
+  postName: string;
+  postSort: number;
+  status: string;
+  remark: string;
+  createTime: string;
+}
+
+/**
+ * @description 用户信息
+ * @param user 用户个人信息
+ * @param roleIds 角色IDS 不传id为空
+ * @param roles 所有的角色
+ * @param postIds 岗位IDS 不传id为空
+ * @param posts 所有的岗位
+ */
+export interface UserInfoResponse {
+  user?: User;
+  roleIds?: string[];
+  roles: Role[];
+  postIds?: number[];
+  posts: Post[];
+}
+
+/**
+ * @description: 部门树
+ */
+export interface DeptTree {
+  id: number;
+  /**
+   * antd组件必须要这个属性 实际是没有这个属性的
+   */
+  key: string;
+  parentId: number;
+  label: string;
+  weight: number;
+  children?: DeptTree[];
+}
+
+export interface DeptTreeData {
+  id: number;
+  label: string;
+  children?: DeptTreeData[];
+}

apps/web-antd/src/components/tinymce/src/editor.vue

@@ -17,12 +17,12 @@ import {
 } from 'vue';
 
 import { preferences, usePreferences } from '@vben/preferences';
+import { buildShortUUID } from '@vben/utils';
 
 import Editor from '@tinymce/tinymce-vue';
 import { isNumber } from 'lodash-es';
 
 import { uploadApi, type UploadResult } from '#/api/core/upload';
-import { buildShortUUID } from '#/utils/uuid';
 
 import { bindHandlers } from './helper';
 import ImgUpload from './img-upload.vue';

apps/web-antd/src/views/system/client/secret-input.vue

@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { Icon } from '@vben/icons';
+import { buildUUID } from '@vben/utils';
 
 import { Input } from 'ant-design-vue';
 
-import { buildUUID } from '#/utils/uuid';
-
 defineOptions({ name: 'SecretInput' });
 
 defineProps({

apps/web-antd/src/views/system/post/data.ts

@@ -0,0 +1,85 @@
+import { DictEnum } from '@vben/constants';
+import { getPopupContainer } from '@vben/utils';
+
+import { type FormSchemaGetter } from '#/adapter';
+import { getDictOptions } from '#/utils/dict';
+
+export const drawerSchema: FormSchemaGetter = () => [
+  {
+    component: 'Input',
+    dependencies: {
+      show: () => false,
+      triggerFields: [''],
+    },
+    fieldName: 'id',
+    label: 'id',
+  },
+  {
+    component: 'TreeSelect',
+    componentProps: {
+      class: 'w-full',
+      getPopupContainer,
+      placeholder: '请选择',
+    },
+    fieldName: 'deptId',
+    label: '所属部门',
+    rules: 'required',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入',
+    },
+    fieldName: 'postName',
+    label: '岗位名称',
+    rules: 'required',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入',
+    },
+    fieldName: 'postCode',
+    label: '岗位编码',
+    rules: 'required',
+  },
+  {
+    component: 'Input',
+    componentProps: {
+      placeholder: '请输入',
+    },
+    fieldName: 'postCategory',
+    label: '类别编码',
+  },
+  {
+    component: 'InputNumber',
+    componentProps: {
+      class: 'w-full',
+      placeholder: '请输入',
+    },
+    fieldName: 'postSort',
+    label: '岗位排序',
+    rules: 'required',
+  },
+  {
+    component: 'RadioGroup',
+    componentProps: {
+      buttonStyle: 'solid',
+      options: getDictOptions(DictEnum.SYS_NORMAL_DISABLE),
+      optionType: 'button',
+    },
+    defaultValue: '0',
+    fieldName: 'postStatus',
+    label: '岗位状态',
+    rules: 'required',
+  },
+  {
+    component: 'Textarea',
+    componentProps: {
+      placeholder: '请输入',
+    },
+    fieldName: 'remark',
+    formItemClass: 'items-baseline',
+    label: '备注',
+  },
+];

apps/web-antd/src/views/system/post/index.vue

@@ -1,9 +1,21 @@
 <script setup lang="ts">
-import CommonSkeleton from '#/views/common';
+import { Page, useVbenDrawer } from '@vben/common-ui';
+
+import postDrawer from './post-drawer.vue';
+
+const [PostDrawer, drawerApi] = useVbenDrawer({
+  connectedComponent: postDrawer,
+});
+
+function handleAdd() {
+  drawerApi.setData({ update: false });
+  drawerApi.open();
+}
 </script>
 
 <template>
-  <div>
-    <CommonSkeleton />
-  </div>
+  <Page>
+    <a-button type="primary" @click="handleAdd">add</a-button>
+    <PostDrawer />
+  </Page>
 </template>

apps/web-antd/src/views/system/post/post-drawer.vue

@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue';
+
+import { useVbenDrawer } from '@vben/common-ui';
+import { $t } from '@vben/locales';
+import { addFullName } from '@vben/utils';
+
+import { useVbenForm } from '#/adapter';
+import { postAdd, postUpdate } from '#/api/system/post';
+import { getDeptTree } from '#/api/system/user';
+
+import { drawerSchema } from './data';
+
+const emit = defineEmits<{ reload: [] }>();
+
+interface DrawerProps {
+  update: boolean;
+  record?: any;
+}
+
+const isUpdate = ref(false);
+const title = computed(() => {
+  return isUpdate.value ? $t('pages.common.edit') : $t('pages.common.add');
+});
+
+const [BasicForm, formApi] = useVbenForm({
+  commonConfig: {
+    formItemClass: 'col-span-2',
+  },
+  schema: drawerSchema(),
+  showDefaultActions: false,
+  wrapperClass: 'grid-cols-2',
+});
+
+async function initDeptSelect() {
+  const deptTree = await getDeptTree();
+  // 选中后显示在输入框的值 即父节点 / 子节点
+  addFullName(deptTree, 'label', ' / ');
+  formApi.setState((prev) => {
+    return {
+      ...prev,
+      schema: prev.schema?.map((item) => {
+        // 部门树
+        if (item.fieldName === 'deptId') {
+          return {
+            ...item,
+            componentProps: {
+              ...item.componentProps,
+              fieldNames: { label: 'label', value: 'id' },
+              treeData: deptTree,
+              treeDefaultExpandAll: true,
+              treeLine: { showLeafIcon: false },
+              // 选中后显示在输入框的值
+              treeNodeLabelProp: 'fullName',
+            },
+          };
+        }
+        return item;
+      }),
+    };
+  });
+}
+
+const [BasicDrawer, drawerApi] = useVbenDrawer({
+  onCancel: handleCancel,
+  onConfirm: handleConfirm,
+  async onOpenChange(isOpen) {
+    if (!isOpen) {
+      return null;
+    }
+    drawerApi.drawerLoading(true);
+    const { record, update } = drawerApi.getData() as DrawerProps;
+    isUpdate.value = update;
+    // 初始化
+    await initDeptSelect();
+    // 更新 && 赋值
+    if (update && record) {
+      for (const key in record) {
+        await formApi.setFieldValue(key, record[key]);
+      }
+    }
+    drawerApi.drawerLoading(false);
+  },
+});
+
+async function handleConfirm() {
+  try {
+    drawerApi.drawerLoading(true);
+    const { valid } = await formApi.validate();
+    if (!valid) {
+      return;
+    }
+    const data = await formApi.getValues();
+    console.log(data);
+    await (isUpdate.value ? postUpdate(data) : postAdd(data));
+    emit('reload');
+    await handleCancel();
+  } catch (error) {
+    console.error(error);
+  } finally {
+    drawerApi.drawerLoading(false);
+  }
+}
+
+async function handleCancel() {
+  drawerApi.close();
+  await formApi.resetForm();
+}
+</script>
+
+<template>
+  <BasicDrawer :title="title" class="w-[600px]">
+    <BasicForm />
+  </BasicDrawer>
+</template>