Merge branch 'ft' into 'main_dev'

Ft

See merge request yunteng/thingskit-front!846

@@ -66,7 +66,7 @@ export interface RoleReqDTO {
   name?: string;
   remark?: string;
   status: number;
-  menu: Array<string>;
+  menu: Array<string | number>;
 }
 
 export interface ChangeAccountParams {

@@ -102,7 +102,12 @@
 <template>
   <StepContainer>
     <div class="">设备文件</div>
-    <Upload.Dragger :fileList="fileList" :customRequest="handleParseFile" accept=".csv" name="file">
+    <Upload.Dragger
+      v-model:fileList="fileList"
+      :customRequest="handleParseFile"
+      accept=".csv"
+      name="file"
+    >
       <section class="cursor-pointer flex flex-col justify-center items-center">
         <InboxOutlined class="text-[4rem] !text-blue-400" />
         <div class="text-gray-500">点击上传或拖拽上传</div>

@@ -68,7 +68,7 @@ export const formSchemas: FormSchema[] = [
     componentProps: {
       placeholder: '请输入标识符',
     },
-    colProps: { span: 6 },
+    colProps: { span: 7 },
   },
   {
     field: 'eventType',
@@ -83,7 +83,7 @@ export const formSchemas: FormSchema[] = [
       labelField: 'itemText',
       valueField: 'itemValue',
     },
-    colProps: { span: 6 },
+    colProps: { span: 7 },
   },
   {
     field: 'dateRange',
@@ -94,6 +94,6 @@ export const formSchemas: FormSchema[] = [
         defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
       },
     },
-    colProps: { span: 6 },
+    colProps: { span: 7 },
   },
 ];

@@ -110,14 +110,20 @@ export const tenantFormSchema: FormSchema[] = [
     label: '租户角色',
     component: 'ApiSelect',
     required: true,
-    componentProps: {
-      mode: 'multiple',
-      api: getAllRoleList,
-      params: {
-        roleType: RoleEnum.TENANT_ADMIN,
-      },
-      labelField: 'name',
-      valueField: 'id',
+    componentProps: () => {
+      return {
+        api: async () => {
+          const res = await getAllRoleList({ roleType: RoleEnum.TENANT_ADMIN });
+          return res;
+        },
+        mode: 'multiple',
+        showSearch: true,
+        labelField: 'name',
+        valueField: 'id',
+        filterOption: (inputValue: string, options: Record<'label' | 'value', string>) => {
+          return options.label.toLowerCase().includes(inputValue.toLowerCase());
+        },
+      };
     },
   },
   {

@@ -32,7 +32,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from './role.data';
   import { BasicDrawer, useDrawerInner } from '/@/components/Drawer';
-  import { BasicTree, CheckEvent, TreeActionType, TreeItem } from '/@/components/Tree';
+  import { BasicTree, CheckEvent, TreeActionType, TreeItem, CheckKeys } from '/@/components/Tree';
   const { t } = useI18n(); //加载国际化
   // 加载菜单数据
   import { getAdminMenuList, getMenuList, getMenusIdsByRoleId } from '/@/api/sys/menu';
@@ -60,7 +60,7 @@
       const treeRef = ref<Nullable<TreeActionType>>(null);
       const checked = ref<string[]>([]); //需要选中的节点
       const spinning = ref(false);
-      const checkedKeysWithHalfChecked = ref<string[]>([]);
+      const checkedKeysWithHalfChecked = ref<(string | number)[]>([]);
 
       const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
         labelWidth: 90,
@@ -137,7 +137,12 @@
       async function handleSubmit() {
         setDrawerProps({ loading: true, confirmLoading: true });
         const { createMessage } = useMessage();
-        const treeCheckedKeys: string[] = (unref(treeRef)?.getCheckedKeys() as string[]) || [];
+        let treeCheckedKeys: string[] | CheckKeys =
+          (unref(treeRef)?.getCheckedKeys() as string[] | CheckKeys) || [];
+        //fix 取消层级独立后(unref(treeRef)?.getCheckedKeys() as string[])的数据不是数组，是{checked:[],halfChecked:[]}对象，迭代报错
+        if (!Array.isArray(treeCheckedKeys)) {
+          treeCheckedKeys = treeCheckedKeys?.checked;
+        }
         const menu = [...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys])];
         try {
           const values = await validate();
@@ -237,7 +242,12 @@
         return needExcludeKeys;
       };
 
-      const handleCheckClick = (selectedKeys: string[], event: CheckEvent) => {
+      const handleCheckClick = (selectedKeys: CheckKeys, event: CheckEvent) => {
+        //fix 取消层级独立后selectedKeys不是数组，是{checked:[],halfChecked:[]}对象 迭代报错
+        if (!Array.isArray(selectedKeys)) {
+          selectedKeys = selectedKeys?.checked;
+          event.halfCheckedKeys = [];
+        }
         checkedKeysWithHalfChecked.value = [
           ...selectedKeys,
           ...(event.halfCheckedKeys as string[]),