Merge branch 'fengtao' into 'main_dev'

fix: DEFECT-1902 客户账号中编辑组织时，选择层级独立，再选择一个组织，报500，前端参数传入问题

See merge request yunteng/thingskit-front!1193

@@ -50,6 +50,7 @@
       'check',
       'check',
       'unSelectAll',
       'unSelectAll',
       'update:searchValue',
       'update:searchValue',
+      'strictlyStatus',
     ],
     ],
     setup(props, { attrs, slots, emit, expose }) {
     setup(props, { attrs, slots, emit, expose }) {
       const state = reactive<State>({
       const state = reactive<State>({
@@ -199,6 +200,7 @@
 
 
       function onStrictlyChange(strictly: boolean) {
       function onStrictlyChange(strictly: boolean) {
         state.checkStrictly = strictly;
         state.checkStrictly = strictly;
+        emit('strictlyStatus', strictly); //父组件接收层级关联或独立的状态 false为层级关联 true为层级独立
       }
       }
 
 
       const searchText = ref('');
       const searchText = ref('');

@@ -16,6 +16,9 @@
             :checked-keys="checkGroup"
             :checked-keys="checkGroup"
             :expandedKeys="treeExpandData"
             :expandedKeys="treeExpandData"
             ref="basicTreeRef"
             ref="basicTreeRef"
+            @check="handleCheckClick"
+            @unSelectAll="handleUnSelectAll"
+            @strictlyStatus="handleStrictlyStatus"
             checkable
             checkable
             toolbar
             toolbar
             @change="handleTreeSelect"
             @change="handleTreeSelect"
@@ -55,7 +58,7 @@
     SaveOrUpdateUserInfo,
     SaveOrUpdateUserInfo,
     filterRoleList,
     filterRoleList,
   } from '/@/api/system/system';
   } from '/@/api/system/system';
-  import { BasicTree, TreeItem } from '/@/components/Tree';
+  import { BasicTree, TreeItem, CheckKeys, CheckEvent } from '/@/components/Tree';
   import { findCurrentUserGroups } from '/@/api/system/group';
   import { findCurrentUserGroups } from '/@/api/system/group';
   import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
   import { RoleOrOrganizationParam } from '/@/api/system/model/systemModel';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { useMessage } from '/@/hooks/web/useMessage';
@@ -91,6 +94,7 @@
       const singleEditPostPhoneNumber = reactive({
       const singleEditPostPhoneNumber = reactive({
         phoneNumber: '',
         phoneNumber: '',
       });
       });
+      const checkedKeysWithHalfChecked = ref<(string | number)[]>([]);
       const getRoleList = async () => {
       const getRoleList = async () => {
         const res = await filterRoleList();
         const res = await filterRoleList();
         roleOptions.value = res.map((m) => {
         roleOptions.value = res.map((m) => {
@@ -208,10 +212,20 @@
             'organizationIds',
             'organizationIds',
             olderPhoneNumber.value === getFieldsValue().phoneNumber ? '' : 'phoneNumber',
             olderPhoneNumber.value === getFieldsValue().phoneNumber ? '' : 'phoneNumber',
           ]);
           ]);
+          let treeCheckedKeys: string[] | CheckKeys =
+            (unref(basicTreeRef)?.getCheckedKeys() as string[] | CheckKeys) || [];
+          //fix 取消层级独立后(unref(treeRef)?.getCheckedKeys() as string[])的数据不是数组，是{checked:[],halfChecked:[]}对象，迭代报错
+          if (!Array.isArray(treeCheckedKeys)) {
+            treeCheckedKeys = treeCheckedKeys?.checked;
+          }
+          const organizationIds = [
+            ...new Set([...unref(checkedKeysWithHalfChecked), ...treeCheckedKeys]),
+          ];
           values.accountExpireTime =
           values.accountExpireTime =
             typeof values.accountExpireTime != 'undefined' && values.accountExpireTime != null
             typeof values.accountExpireTime != 'undefined' && values.accountExpireTime != null
               ? values.accountExpireTime.format('YYYY-MM-DD HH:mm:ss')
               ? values.accountExpireTime.format('YYYY-MM-DD HH:mm:ss')
               : null;
               : null;
+          values.organizationIds = organizationIds;
           Object.assign(postData, values);
           Object.assign(postData, values);
           if (unref(isUpdate)) {
           if (unref(isUpdate)) {
             if (values.email == '') {
             if (values.email == '') {
@@ -232,6 +246,33 @@
           }, 300);
           }, 300);
         }
         }
       }
       }
+      // 取消全部的时候清除回显时获取的
+      const handleUnSelectAll = () => {
+        checkedKeysWithHalfChecked.value = [];
+      };
+
+      const strictlyStatus = ref(false); //层级关联或独立的状态 false为层级关联 true为层级独立
+
+      const handleStrictlyStatus = (status) => (strictlyStatus.value = status);
+
+      const handleCheckClick = (selectedKeys: CheckKeys, event: CheckEvent) => {
+        //fix 取消层级独立后selectedKeys不是数组，是{checked:[],halfChecked:[]}对象 迭代报错
+        // 层级独立
+        if (strictlyStatus.value) {
+          if (!Array.isArray(selectedKeys)) {
+            selectedKeys = selectedKeys?.checked;
+            event.halfCheckedKeys = [];
+          }
+        } else {
+          // 层级关联
+          event.halfCheckedKeys = [];
+        }
+        checkedKeysWithHalfChecked.value = [
+          ...selectedKeys,
+          ...(event.halfCheckedKeys as string[]),
+        ];
+      };
+
       return {
       return {
         registerModal,
         registerModal,
         registerForm,
         registerForm,
@@ -247,6 +288,9 @@
         handleSuccess,
         handleSuccess,
         handleRoleSelect,
         handleRoleSelect,
         handleTreeSelect,
         handleTreeSelect,
+        handleCheckClick,
+        handleUnSelectAll,
+        handleStrictlyStatus,
       };
       };
     },
     },
   });
   });