ow

WebVue/src/components/basic/ColumnModal.vue

@@ -4,7 +4,7 @@
         <br />
         <a-row :wrap="false">
             <a-col :lg="24">
-                <a-input flex="none" readonly value="视图" class="site-input-split" style="
+                <a-input flex="none" readonly value="当前视图" class="site-input-split" style="
             width: 80px;
             border-radius: 0;
             border-top-left-radius: 5pt 5pt;

WebVue/src/components/basic/DraggList.vue

@@ -60,6 +60,10 @@ const emit = defineEmits<EmitsType>();
 const sortable = ref<Sortable | null>(null);
 
 onMounted(() => {
+    let i: number = 0;
+    props.list.forEach((element: Column) => {
+        element.sequence = i++;
+    });
     initDraggable();
 });
 
@@ -82,13 +86,13 @@ const initDraggable = () => {
         onUpdate(e: any) {
             if (e.oldIndex !== undefined && e.newIndex !== undefined) {
                 // 删除拖拽的元素
-                const list = [...props.list];
+                let list = [...props.list];
                 const item = list.splice(e.oldIndex, 1)[0];
                 // 把删除的元素放到新的位置
                 list.splice(e.newIndex, 0, item);
                 let i: number = 0;
-                list.forEach((element: Column) => {
-                    element.sequence = i++;
+                list = list.map((element: Column) => {
+                    return { ...element, sequence: i++ };
                 });
                 emit('update:list', list);
                 emit('onChangeList', list);

WebVue/src/components/basic/Search.vue

@@ -115,7 +115,7 @@ import {
 } from "vue";
 import { usePagination, type PaginationQueryResult } from "vue-request";
 import type { TablePaginationConfig, TableProps } from "ant-design-vue";
-import type { ATable } from "ant-design-vue";
+import { Table as ATable } from 'ant-design-vue';
 import searchCriteria from "@/components/basic/SearchCriteria.vue";
 import { SearchFilter } from "@/data/auto/searchFilter";
 import { SearchCriteriaResultData } from "@/data/auto/searchCriteriaResultData";
@@ -387,10 +387,10 @@ const onSelectChange = (changableRowKeys: any[]) => {
   emit("onSelectChange", selected.value);
 };
 
-const rowSelection = computed(() => {
+const rowSelection = computed<TableProps["rowSelection"]>(() => {
   return {
     columnWidth: "4%",
-    type: rowSelectionType.value,
+    type: rowSelectionType.value as "radio" | "checkbox",
     selectedRowKeys: unref(selected),
     onChange: onSelectChange,
   };