perf: 合并冲突

@@ -8,10 +8,10 @@ VITE_GLOB_PUBLIC_PATH = /
 # Please note that no line breaks
 
 # 本地
-VITE_PROXY = [["/api","http://localhost:8080/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]]
+VITE_PROXY = [["/api","http://222.180.200.114:30480/api"],["/thingskit-scada","http://localhost:5173/thingskit-scada"],["/large-designer", "http://localhost:5555/large-designer/"]]
 
 # 实时数据的ws地址
-VITE_GLOB_WEB_SOCKET = ws://localhost:8080/api/ws/plugins/telemetry?token=
+VITE_GLOB_WEB_SOCKET = ws://222.180.200.114:30480/api/ws/plugins/telemetry?token=
 
 # Delete console
 VITE_GLOB_DROP_CONSOLE = true

@@ -183,7 +183,7 @@ export const resetPassword = (params: ChangeAccountParams) =>
  * 清除密码
  * @param params
  */
-export const clearUserPassword = (userId: string) =>
+export const clearUserPassword = (userId: string, level: number) =>
   defHttp.post({
-    url: Api.RESET_USER_PASSWORD + userId,
+    url: Api.RESET_USER_PASSWORD + userId + '/' + level,
   });

@@ -128,6 +128,13 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
+    required: true,
+    field: 'organizationId',
+    label: '所属组织',
+    colProps: { span: 24 },
+    component: 'OrgTreeSelect',
+  },
+  {
     field: 'remark',
     label: '说明',
     component: 'InputTextArea',

@@ -8,9 +8,8 @@
 
 <script>
   import { defineComponent } from 'vue';
-  import { useRoute } from 'vue-router';
+  import { useRoute, useRouter } from 'vue-router';
   import { PageWrapper } from '/@/components/Page';
-  import { useGo } from '/@/hooks/web/usePage';
   import { Description } from '../../../components/Description';
   import { getAccountInfo } from '../../../api/system/system';
   import { accountSchema } from './account.detail.data';
@@ -22,7 +21,8 @@
     components: { PageWrapper, Description },
     setup() {
       const route = useRoute();
-      const go = useGo();
+
+      const ROUTER = useRouter();
       const { setTitle, close } = useTabs();
       const [register, { setDescProps }] = useDescription({
         title: '账号基础信息',
@@ -52,7 +52,8 @@
       function goBack() {
         // 本例的效果时点击返回始终跳转到账号列表页，实际应用时可返回上一页
         close();
-        go('/system/account');
+        ROUTER.go(-1);
+        // go('/system/account');
       }
       return { goBack, accountSchema, accountData, register };
     },

@@ -245,7 +245,10 @@
               delete postData.email;
             }
           }
-          await SaveOrUpdateUserInfo(postData as any, unref(isUpdate));
+          await SaveOrUpdateUserInfo(
+            { ...postData, roleType: 'PLATFORM_ADMIN' } as any,
+            unref(isUpdate)
+          );
           closeModal();
           emit('success');
           createMessage.success(unref(isUpdate) ? '编辑成功' : '新增成功');

@@ -209,7 +209,7 @@
       const handleClearPassword = async (record: Recordable) => {
         const { id } = record;
         if (!id) return;
-        const { message } = await clearUserPassword(id);
+        const { message } = await clearUserPassword(id, 3);
         createMessage.success(message);
       };
 

@@ -209,7 +209,7 @@
       const handleClearPassword = async (record: Recordable) => {
         const { id } = record;
         if (!id) return;
-        const { message } = await clearUserPassword(id);
+        const { message } = await clearUserPassword(id, 1);
         createMessage.success(message);
       };
 

+<template>
+  <BasicDrawer
+    v-bind="$attrs"
+    @register="registerDrawer"
+    showFooter
+    :title="getTitle"
+    width="500px"
+    @ok="handleSubmit"
+  >
+    <BasicForm @register="registerForm">
+      <template #menu>
+        <Spin :spinning="spinning">
+          <BasicTree
+            v-if="treeData.length"
+            checkable
+            toolbar
+            ref="treeRef"
+            :treeData="treeData"
+            @check="handleCheckClick"
+            :replace-fields="{ title: 'name', key: 'id' }"
+            :checkedKeys="roleMenus"
+            title="菜单分配"
+          />
+        </Spin>
+      </template>
+    </BasicForm>
+  </BasicDrawer>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, computed, unref, nextTick } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema, KeysTypeEnum, RoleMenuDictEnum } from './role.data';
+  import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
+  import { BasicTree, TreeActionType, TreeItem } from '/@/components/Tree';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  const { t } = useI18n(); // 加载国际化
+  // 加载菜单数据
+  import { getMeMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { MenuRecord } from '/@/api/sys/model/menuModel';
+  import { saveOrUpdateRoleInfoWithMenu } from '/@/api/system/system';
+  import { findDictItemByCode } from '/@/api/system/dict';
+  import { RoleEnum } from '/@/enums/roleEnum';
+  import { Spin } from 'ant-design-vue';
+  import { useRole } from '/@/hooks/business/useRole';
+  import { RoleListItem } from '/@/api/system/model/systemModel';
+
+  type TreeData = MenuRecord & TreeItem;
+
+  export default defineComponent({
+    name: 'RoleDrawer',
+    components: { BasicDrawer, BasicForm, BasicTree, Spin },
+    emits: ['success', 'register'],
+    setup(_, { emit }) {
+      const isUpdate = ref<boolean>(true);
+      const treeData = ref<TreeData[]>([]);
+      const roleMenus = ref<string[]>([]);
+      const roleId = ref<string>('');
+      const treeRef = ref<Nullable<TreeActionType>>();
+      const checked = ref<string[]>([]); //需要选中的节点
+      const spinning = ref(false);
+      const checkedKeysWithHalfChecked = ref<string[]>([]);
+
+      const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+        labelWidth: 100,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+      });
+
+      const transformName = (data: TreeData[]) => {
+        return data.map((item) => {
+          item.name = t(item.name);
+          if (item.children && item.children.length) {
+            item.children = transformName(item.children as unknown as TreeData[]);
+          }
+          return item;
+        });
+      };
+
+      const { isTenantAdmin, isSysadmin, getRole } = useRole();
+      const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(
+        async (data: { isUpdate: boolean; record: RoleListItem }) => {
+          resetFields();
+          roleId.value = '';
+          // 在打开弹窗时清除所有选择的菜单
+          treeRef.value && treeRef.value?.setCheckedKeys([]);
+          isUpdate.value = data.isUpdate;
+          let roleType = unref(getRole) || RoleEnum.SYS_ADMIN;
+
+          // 租户管理员创建角色时 菜单分配为客户菜单
+          if (unref(isTenantAdmin)) {
+            roleType = RoleEnum.TENANT_ADMIN;
+          }
+
+          try {
+            spinning.value = true;
+            // 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
+
+            // if (!unref(treeData).length) {
+            // 获取全部的菜单
+            const menuListModel = await getMeMenuList();
+            treeData.value = transformName(menuListModel as unknown as TreeData[]);
+            // }
+
+            const keys = await getPermissionByRole(roleType);
+            const { keyType } = RoleMenuDictEnum[roleType];
+            treeData.value = filterPermissionTreeData(
+              unref(treeData) as unknown as TreeData[],
+              keys,
+              keyType
+            );
+
+            // 如果编辑的是超级管理员 则不再过滤平台管理员禁用的权限
+            // 如果是超级管理员创建角色 创建角色属于平台管理员 因此过滤平台管理员禁用的权限
+            if (data?.record?.roleType !== RoleEnum.SYS_ADMIN && unref(isSysadmin)) {
+              const keys = await getPermissionByRole(RoleEnum.PLATFORM_ADMIN);
+              const { keyType } = RoleMenuDictEnum[RoleEnum.PLATFORM_ADMIN];
+              treeData.value = filterPermissionTreeData(
+                unref(treeData) as unknown as TreeData[],
+                keys,
+                keyType
+              );
+            }
+
+            // 更新
+            if (unref(isUpdate)) {
+              checked.value = [];
+              roleId.value = data.record.id;
+
+              //通过角色id去获取角色对应的菜单的ids
+              checkedKeysWithHalfChecked.value = roleMenus.value = await getMenusIdsByRoleId(
+                data.record.id
+              );
+              excludeHalfCheckedKeys(unref(treeData));
+              await nextTick();
+              unref(treeRef)?.setCheckedKeys(roleMenus.value);
+              setFieldsValue(data.record);
+            } else {
+            }
+          } catch (error) {
+            throw error;
+          } finally {
+            spinning.value = false;
+          }
+        }
+      );
+
+      const getTitle = computed(() => (!unref(isUpdate) ? '新增角色' : '编辑角色'));
+
+      async function handleSubmit() {
+        setDrawerProps({ confirmLoading: true });
+        const { createMessage } = useMessage();
+        try {
+          const values = await validate();
+          const treeCheckedKeys: string[] = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
+          const menu = [...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys])];
+          const req = {
+            id: roleId.value,
+            name: values.name,
+            remark: values.remark,
+            status: values.status,
+            menu,
+            roleType: 'TENANT_ADMIN',
+          };
+          if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
+          saveOrUpdateRoleInfoWithMenu(req).then(() => {
+            closeDrawer();
+            emit('success');
+            createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`);
+          });
+        } finally {
+          setTimeout(() => {
+            setDrawerProps({ confirmLoading: false });
+          }, 300);
+        }
+      }
+
+      const getPermissionByRole = async (roleType: RoleEnum) => {
+        try {
+          const { key } = RoleMenuDictEnum[roleType];
+          const res = await findDictItemByCode({ dictCode: key });
+          return res.map((item) => item.itemValue);
+        } catch (error) {}
+        return [];
+      };
+
+      const filterPermissionTreeData = (
+        data: MenuRecord[],
+        permissionKeys: string[],
+        keysType: KeysTypeEnum
+      ): TreeData[] => {
+        const permissionCompare = (
+          data: MenuRecord[],
+          permissionKeys: string[],
+          keysType: KeysTypeEnum
+        ): TreeData[] => {
+          return data.filter((item) => {
+            item.name = t(item.name);
+            const findFlag = permissionKeys.includes(item.permission);
+
+            item.show = findFlag ? keysType === KeysTypeEnum.ENABLED : undefined;
+
+            if (item.children && item.children.length) {
+              if (item.show) return true;
+              if (item.show === undefined) {
+                item.children = permissionCompare(item.children, permissionKeys, keysType);
+                item.show = item.children.some((item) =>
+                  keysType === KeysTypeEnum.ENABLED
+                    ? item.show
+                    : item.show === undefined
+                    ? true
+                    : item.show
+                );
+                return item.show;
+              }
+            }
+
+            return keysType === KeysTypeEnum.ENABLED
+              ? item.show
+              : item.show === undefined
+              ? true
+              : item.show;
+          }) as unknown as TreeData[];
+        };
+
+        return permissionCompare(data, permissionKeys, keysType);
+      };
+
+      const excludeHalfCheckedKeys = (treeData: MenuRecord[]) => {
+        const needExcludeKeys: string[] = [];
+        const query = (data: MenuRecord[]) => {
+          data.forEach((item) => {
+            item.checked = roleMenus.value.includes(item.id);
+            if (item.children && item.children.length) {
+              query(item.children);
+              item.checked = item.children.every((item) => item.checked);
+            }
+            if (!item.checked) {
+              needExcludeKeys.push(item.id);
+            }
+          });
+        };
+        query(treeData);
+        roleMenus.value = unref(roleMenus).filter((key) => !needExcludeKeys.includes(key));
+        return needExcludeKeys;
+      };
+
+      const handleCheckClick = (selectedKeys: string[], event: CheckEvent) => {
+        checkedKeysWithHalfChecked.value = [
+          ...selectedKeys,
+          ...(event.halfCheckedKeys as string[]),
+        ];
+      };
+
+      return {
+        spinning,
+        registerDrawer,
+        registerForm,
+        getTitle,
+        handleSubmit,
+        treeData,
+        roleMenus,
+        treeRef,
+        handleCheckClick,
+      };
+    },
+  });
+</script>
+
+<style scoped lang="less">
+  :deep(.vben-basic-tree) {
+    width: 100% !important;
+  }
+
+  :deep(.is-unflod) {
+    display: none !important;
+  }
+
+  :deep(.is-flod) {
+    display: none !important;
+  }
+</style>

@@ -69,7 +69,7 @@
   import { TOption } from '/@/views/rule/linkedge/config/config.data';
   import { PlusOutlined } from '@ant-design/icons-vue';
   import { useDrawer } from '/@/components/Drawer';
-  import RoleDrawer from '../../role/RoleDrawer.vue';
+  import RoleDrawer from './RoleDrawer.vue';
   import OrganizationDrawer from '/@/views/system/organization/OrganizationDrawer.vue';
   import { useUserStore } from '/@/store/modules/user';
   import { IsPhoneExist } from '/@/api/system/system';

@@ -196,8 +196,9 @@
   const handleClearPassword = async (record: Recordable) => {
     const { id } = record;
     if (!id) return;
-    const { message } = await clearUserPassword(id);
+    const { message } = await clearUserPassword(id, 4);
     createMessage.success(message);
+    handleSuccess();
   };
   // const handleDeleteOrBatchDelete = (record: Recordable) => {
   //   deleteTenantAdmin([record.id]).then(() => {

+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { DictEnum } from '/@/enums/dictEnum';
+import { RoleEnum } from '/@/enums/roleEnum';
+
+export enum KeysTypeEnum {
+  DISABLED = 'disabled',
+  ENABLED = 'enabled',
+}
+
+export const RoleMenuDictEnum: Recordable<{ key: string; keyType: KeysTypeEnum }> = {
+  [RoleEnum.PLATFORM_ADMIN]: {
+    key: DictEnum.DISABLED_PLATFORM_ADMIN_AUTH,
+    keyType: KeysTypeEnum.DISABLED,
+  },
+  [RoleEnum.SYS_ADMIN]: { key: DictEnum.ENABLED_SYSADMIN_AUTH, keyType: KeysTypeEnum.ENABLED },
+  [RoleEnum.TENANT_ADMIN]: { key: DictEnum.DISABLED_TENANT_AUTH, keyType: KeysTypeEnum.DISABLED },
+  [RoleEnum.CUSTOMER_USER]: { key: DictEnum.DISABLE_CUSTOMER_AUTH, keyType: KeysTypeEnum.DISABLED },
+};
+
+export const columns: BasicColumn[] = [
+  {
+    title: '角色名称',
+    dataIndex: 'name',
+    width: 200,
+  },
+  {
+    title: '角色Code',
+    dataIndex: 'code',
+    width: 200,
+  },
+  {
+    title: '状态',
+    dataIndex: 'status',
+    width: 120,
+    slots: { customRender: 'status' },
+  },
+
+  {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 240,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    width: 180,
+  },
+];
+
+export const searchFormSchema: FormSchema[] = [
+  {
+    field: 'roleName',
+    label: '角色名称',
+    component: 'Input',
+    colProps: { span: 6 },
+    componentProps: {
+      maxLength: 255,
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+    colProps: { span: 6 },
+  },
+];
+
+export const formSchema: FormSchema[] = [
+  {
+    field: 'name',
+    label: '角色名称',
+    required: true,
+    component: 'Input',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入角色名称',
+    },
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'RadioButtonGroup',
+    defaultValue: 1,
+    componentProps: {
+      options: [
+        { label: '启用', value: 1 },
+        { label: '停用', value: 0 },
+      ],
+    },
+  },
+  {
+    label: '备注',
+    field: 'remark',
+    component: 'InputTextArea',
+    componentProps: {
+      maxLength: 255,
+      placeholder: '请输入备注',
+    },
+  },
+  {
+    label: '',
+    field: 'menu',
+    slot: 'menu',
+    component: 'Input',
+  },
+];

@@ -160,6 +160,7 @@
             remark: values.remark,
             status: values.status,
             menu,
+            roleType: 'PLATFORM_ADMIN',
           };
           if (req.menu == undefined) return createMessage.error('请勾选权限菜单');
           saveOrUpdateRoleInfoWithMenu(req).then(() => {

@@ -62,7 +62,7 @@
       const spinning = ref(false);
       const checkedKeysWithHalfChecked = ref<(string | number)[]>([]);
 
-      const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
+      const [registerForm, { resetFields, setFieldsValue, validate, updateSchema }] = useForm({
         labelWidth: 90,
         schemas: formSchema,
         showActionButtonGroup: false,
@@ -80,6 +80,29 @@
 
       const { isPlatformAdmin } = useRole();
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
+        if (data?.isUpdate) {
+          updateSchema({
+            field: 'status',
+            componentProps: {
+              options: [
+                { label: '启用', value: 1 },
+                { label: '停用', value: 0 },
+              ],
+              disabled: data.record.status == 1 ? true : false,
+            },
+          });
+        } else {
+          updateSchema({
+            field: 'status',
+            componentProps: {
+              options: [
+                { label: '启用', value: 1 },
+                { label: '停用', value: 0 },
+              ],
+              disabled: false,
+            },
+          });
+        }
         resetFields();
         roleId.value = '';
         // 在打开弹窗时清除所有选择的菜单

@@ -83,7 +83,7 @@ export const formSchema: FormSchema[] = [
     field: 'status',
     label: '状态',
     component: 'RadioButtonGroup',
-    defaultValue: 0,
+    defaultValue: 1,
     componentProps: {
       options: [
         { label: '启用', value: 1 },