Merge pull request #150 from shxhanxia/patch-1

fix: cl-user-select 按角色分类bug

packages/crud/src/components/table/helper/index.ts

@@ -2,11 +2,12 @@ import { inject, reactive, ref } from "vue";
 import { useConfig } from "../../../hooks";
 import { getValue, mergeConfig } from "../../../utils";
 import { ElTable } from "element-plus";
+import type { TableInstance } from "element-plus";
 
 export function useTable(props: any) {
 	const { style } = useConfig();
 
-	const Table = ref<InstanceType<typeof ElTable>>();
+	const Table = ref<TableInstance>();
 
 	// 配置
 	const config = reactive<ClTable.Config>(mergeConfig(props, inject("useTable__options") || {}));

src/plugins/crud/components/user/select.vue

@@ -223,7 +223,7 @@ async function getDept() {
 async function getRole() {
 	return service.base.sys.role.list().then(res => {
 		res.forEach(e => {
-			e.children = users.value.filter(u => u.roleIds.includes(u.id));
+			e.children = users.value.filter(u => u.roleIds.includes(e.id));
 		});
 
 		data.role = res as Item[];

src/plugins/excel/components/import-btn.vue

@@ -275,7 +275,10 @@ function open() {
 				}
 
 				if (props.onSubmit) {
-					props.onSubmit(upload, { done, close });
+					props.onSubmit({
+						...upload,
+						..._
+					}, { done, close });
 				} else {
 					ElMessage.error(t('[cl-import-btn] onSubmit is required'));
 					done();