🐛-序号排序问题

后台管理/src/pages/A2ZSort/index.tsx

@@ -101,17 +101,14 @@ function A2ZSort() {
     }, 100);
   }, []);
 
-  const sortValueChange = useCallback(
-    (val: string) => {
-      if (Number(val) > dataAll.total) val = dataAll.total + "";
-      setSortValue(val.replace(/^(0+)|[^\d]+/g, ""));
-    },
-    [dataAll.total]
-  );
+  const sortValueChange = useCallback((val: string) => {
+    // if (Number(val) > dataAll.total) val = dataAll.total + "";
+    setSortValue(val.replace(/^(0+)|[^\d]+/g, ""));
+  }, []);
 
   const sortOkFu = useCallback(
     async (sort: number) => {
-      if (!sortValue) return MessageFu.warning("请输入序号值!");
+      if (!sortValue) return MessageFu.warning("请输入排序标识!");
 
       let oldId = 0;
       let newId = 0;
@@ -121,15 +118,18 @@ function A2ZSort() {
         if (Number(sortValue) === v.sort) newId = v.id;
       });
 
-      if (oldId === newId) return MessageFu.warning("不能和之前的序号一样!");
+      if (oldId === newId)
+        return MessageFu.warning("不能和之前的排序标识一样!");
 
-      const res = await A2_APIsort(oldId, newId);
+      if (dataAll.list.some((v) => v.sort === Number(sortValue))) {
+        const res = await A2_APIsort(oldId, newId);
 
-      if (res.code === 0) {
-        MessageFu.success("修改序号成功!");
-        setSortClickNum(-1);
-        getListFu();
-      }
+        if (res.code === 0) {
+          MessageFu.success("修改排序标识成功!");
+          setSortClickNum(-1);
+          getListFu();
+        }
+      } else MessageFu.warning("找不到该排序标识!");
     },
     [dataAll.list, getListFu, sortValue]
   );
@@ -146,13 +146,12 @@ function A2ZSort() {
 
   const columns = useMemo(() => {
     return [
-      {
-        title: "序号",
-        width: 100,
-        dataIndex: "sort",
-        // render: (text: any, record: any, index: any) =>
-        //   index + 1 + (fromData.pageNum - 1) * fromData.pageSize,
-      },
+      // {
+      //   title: "序号",
+      //   width: 100,
+      //   render: (text: any, record: any, index: any) =>
+      //     index + 1 + (fromData.pageNum - 1) * fromData.pageSize,
+      // },
       {
         title: "展览名称",
         dataIndex: "name",
@@ -174,6 +173,11 @@ function A2ZSort() {
         dataIndex: "address",
       },
       {
+        title: "排序标识",
+        width: 100,
+        dataIndex: "sort",
+      },
+      {
         title: "操作",
         width: 200,
         render: (item: A2TableType) => (
@@ -214,14 +218,13 @@ function A2ZSort() {
           onChange={(e) => nameChange(e)}
         />
 
-        <div className="sortTit" hidden={!dataAll.total}>
+        <div className="sortTit" hidden={dataAll.total <= 1}>
           <Tooltip
             title={
               <>
                 点击 &emsp;
                 <SortAscendingOutlined />
-                &emsp;输入&emsp;1-{dataAll.total}
-                &emsp;的整数，按&emsp;Enter键&emsp;交换序号
+                &emsp;输入&emsp;排序标识，按&emsp;Enter键&emsp;交换序号（序号标识会累加，删除的序号标识不会在出现）
               </>
             }
           >