Merge branch 'main' of http://113.45.157.195:3003/insiinc/re-mooc

apps/web/src/components/models/department/department-list.tsx

@@ -76,7 +76,7 @@ export default function DepartmentList() {
 			},
 			{
 				headerName: "操作",
-				sortable: true,
+				// sortable: true,
 				cellRenderer: (props: CustomCellRendererProps) => (
 					<OpreationRenderer props={props} />
 				),

apps/web/src/components/models/role/role-editor/assign-list.tsx

@@ -83,7 +83,7 @@ export default function AssignList() {
 
         {
             headerName: "操作",
-            sortable: true,
+            // sortable: true,
 
             cellRenderer: (props) => <OpreationRenderer props={props}></OpreationRenderer>, // 指定 cellRenderer
             maxWidth: 100,

apps/web/src/components/models/staff/staff-list.tsx

@@ -171,7 +171,7 @@ const StaffList = ({
 		},
 		{
 			headerName: "操作",
-			sortable: true,
+			// sortable: true,
 
 			cellRenderer: (props) => (
 				<OpreationRenderer props={props}></OpreationRenderer>

apps/web/src/components/models/term/term-list.tsx

@@ -13,7 +13,7 @@ import { ObjectType, Term, TreeDataNode } from "@nice/common";
 import DepartmentSelect from "../department/department-select";
 import { TermEditorContext } from "./term-editor";
 import { useAuth } from "@web/src/providers/auth-provider";
-import { api } from "@nice/client"
+import { api } from "@nice/client";
 import { Menu, MenuItem } from "../../presentation/dropdown-menu";
 import AgServerTable from "../../presentation/ag-server-table";
 
@@ -42,7 +42,7 @@ const OpreationRenderer = ({ props }: { props: CustomCellRendererProps }) => {
 				label="添加子节点"
 				icon={<PlusOutlined></PlusOutlined>}
 				onClick={() => {
-					setParentId(props?.data?.id)
+					setParentId(props?.data?.id);
 					// setEditId(data?.id)
 					setTermModalOpen(true);
 				}}></MenuItem>
@@ -57,14 +57,21 @@ const OpreationRenderer = ({ props }: { props: CustomCellRendererProps }) => {
 			<MenuItem
 				label="移除"
 				onClick={() => {
-					softDeleteByIds.mutateAsync({
+					softDeleteByIds.mutateAsync(
-						ids: [props?.data?.id],
+						{
-					}, {
+							ids: [props?.data?.id],
-						onSettled: () => {
-							message.success("删除成功");
-							emitDataChange(ObjectType.TERM, props.data as any, CrudOperation.DELETED)
 						},
-					});
+						{
+							onSettled: () => {
+								message.success("删除成功");
+								emitDataChange(
+									ObjectType.TERM,
+									props.data as any,
+									CrudOperation.DELETED
+								);
+							},
+						}
+					);
 				}}
 				icon={<DeleteOutlined></DeleteOutlined>}></MenuItem>
 		</Menu>
@@ -86,27 +93,31 @@ export default function TermList() {
 			setDomainId(user.domainId);
 		}
 	}, [user]);
-	const [params, setParams] = useState({ parentId: null, domainId: null, taxonomyId: null });
+	const [params, setParams] = useState({
+		parentId: null,
+		domainId: null,
+		taxonomyId: null,
+	});
 	useEffect(() => {
 		if (taxonomyId) {
-			setParams((prev) => ({ ...prev, taxonomyId }))
+			setParams((prev) => ({ ...prev, taxonomyId }));
 		}
 		if (domainId) {
-			setParams((prev) => ({ ...prev, domainId }))
+			setParams((prev) => ({ ...prev, domainId }));
 		} else {
-			setParams((prev) => ({ ...prev, domainId: null }))
+			setParams((prev) => ({ ...prev, domainId: null }));
 		}
-	}, [taxonomyId, domainId])
+	}, [taxonomyId, domainId]);
 	const columnDefs = useMemo<ColDef[]>(() => {
 		return [
 			{
 				field: "order",
 				hide: true,
-				sort: "asc" as SortDirection
+				sort: "asc" as SortDirection,
 			},
 			{
 				headerName: "操作",
-				sortable: true,
+				// sortable: true,
 				cellRenderer: (props: CustomCellRendererProps) => (
 					<OpreationRenderer props={props} />
 				),
@@ -115,12 +126,15 @@ export default function TermList() {
 		].filter(Boolean);
 	}, []);
 
-	const autoGroupColumnDef = useMemo(() => ({
+	const autoGroupColumnDef = useMemo(
-		rowDrag: true,
+		() => ({
-		headerName: "术语名",
+			rowDrag: true,
-		field: "name",
+			headerName: "术语名",
-		filter: "agTextColumnFilter",
+			field: "name",
-	}), []);
+			filter: "agTextColumnFilter",
+		}),
+		[]
+	);
 
 	const getServerSideGroupKey = useCallback((item) => item.id, []);
 	const isServerSideGroup = useCallback((item) => item.has_children, []);
@@ -163,11 +177,10 @@ export default function TermList() {
 				columnDefs={columnDefs}
 				objectType={ObjectType.TERM}
 				treeData={true}
-				params={params}  // 使用 state 中的 params
+				params={params} // 使用 state 中的 params
 				getServerSideGroupKey={getServerSideGroupKey}
 				isServerSideGroup={isServerSideGroup}
-				autoGroupColumnDef={autoGroupColumnDef}
+				autoGroupColumnDef={autoGroupColumnDef}></AgServerTable>
-			></AgServerTable>
 			{/* <div
 				className="p-2"
 				style={{ height: "calc(100vh - 49px - 48px - 49px)" }}>