Merge remote-tracking branch 'origin/dev' into dev

src/views/attendance/teacherRecord/data.config.ts

@@ -128,7 +128,7 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'attendanceStatus',
     label: '考勤状态',
-    component: 'Select',
+    component: 'ApiSelect',
     componentProps: {
       getPopupContainer: () => document.body,
       api: getDataOption,

src/views/educational/graduate/index.vue

@@ -26,7 +26,7 @@
         </a-button>
       </template>
       <template #action="{ record }">
-        <div style="display: flex; justify-content: center;">
+        <div style="display: flex; justify-content: center">
           <TableAction
             :actions="[
               {
@@ -65,7 +65,7 @@
   const searchInfo = reactive<Recordable>({});
   const { hasPermission } = usePermission();
   onMounted(async () => {
-    treeData.value = ((await getStudentmanagerTree({})) as unknown) as TreeItem[];
+    treeData.value = (await getStudentmanagerTree({})) as unknown as TreeItem[];
   });
   const index = ref(0);
   const [registerModal, { openModal }] = useModal();
@@ -91,6 +91,13 @@
     //   slots: { customRender: 'action' },
     //   fixed: 'right',
     // },
+    customRow: () => {
+      return {
+        onClick: () => {
+          return false;
+        },
+      };
+    },
     rowSelection: {
       type: 'checkbox',
       onSelectAll: (selected: any, selectedRows: any, changeRows: any) => {