数据要素-数据集&文件

src/views/mallResourceDevelopment/dataSet/commonDataSet/index.vue

@@ -144,8 +144,8 @@
 </template>
 
 <script lang="ts" setup>
-import {BasicTable, useTable} from '@/components/Table';
-import {
+  import { BasicTable, useTable } from '@/components/Table';
+  import {
     Card,
     Checkbox,
     Col,
@@ -157,18 +157,18 @@ import {
     Segmented,
     Select,
     Tag,
-} from 'ant-design-vue';
-import Icon from '@/components/Icon/Icon.vue';
-import {onMounted, reactive, ref} from 'vue';
-import {cardList} from './mock';
-import {PageWrapper} from '@/components/Page';
-import {useMessage} from '@/hooks/web/useMessage';
-import {useRouter} from 'vue-router';
-import GroupTree from './GroupTree.vue';
-import {Columns} from '@/views/mallResourceDevelopment/dataSet/commonDataSet/commonDataSet.data';
-import {router} from '@/router';
+  } from 'ant-design-vue';
+  import Icon from '@/components/Icon/Icon.vue';
+  import { onMounted, reactive, ref } from 'vue';
+  import { cardList } from './mock';
+  import { PageWrapper } from '@/components/Page';
+  import { useMessage } from '@/hooks/web/useMessage';
+  import { useRouter } from 'vue-router';
+  import GroupTree from './GroupTree.vue';
+  import { Columns } from '@/views/mallResourceDevelopment/dataSet/commonDataSet/commonDataSet.data';
+  import { router } from '@/router';
 
-const { createMessage, createConfirm } = useMessage();
+  const { createMessage, createConfirm } = useMessage();
   const route = useRouter();
   const value = ref('cardList');
   const params = ref('');
@@ -194,8 +194,8 @@ const { createMessage, createConfirm } = useMessage();
   ]);
 
   const [registerTable, { reload, getRowSelection }] = useTable({
-    api: async (params) => {
-      cardListData.value = cardList.filter((item) => {
+    api: async () => {
+      let filteredList = cardList.filter((item) => {
         const titleMatch = item.title.toLowerCase().includes(params.value.toLowerCase());
         const shareMatch =
           selectValue.value === '' ? true : item.isShare.toString() === selectValue.value;
@@ -203,11 +203,18 @@ const { createMessage, createConfirm } = useMessage();
           workSpaceName.value === '' ||
           workSpaceName.value === '公共数据集' ||
           item.parentWorkSpaceName === workSpaceName.value;
-        // console.log('workSpaceName.value', workSpaceName.value);
-        // console.log('item.parentWorkSpaceName', item.parentWorkSpaceName);
-        // console.log('item.parentWorkSpaceName', item.title);
         return titleMatch && shareMatch && workspaceMatch;
       });
+      if (sortOrder.value === 'latest') {
+        filteredList.sort(
+          (a, b) => new Date(b.createdTime).getTime() - new Date(a.createdTime).getTime(),
+        );
+      } else if (sortOrder.value === 'earliest') {
+        filteredList.sort(
+          (a, b) => new Date(a.createdTime).getTime() - new Date(b.createdTime).getTime(),
+        );
+      }
+      cardListData.value = filteredList;
       const response = {
         pageNu: '1',
         pageSize: '10',
@@ -215,9 +222,9 @@ const { createMessage, createConfirm } = useMessage();
         total: cardListData.value.length,
         code: '',
         message: '',
-        data: [],
+        data: cardListData.value,
       };
-      return { ...response, data: cardListData.value };
+      return { ...response };
     },
     columns: Columns,
     rowSelection: true,
@@ -312,12 +319,8 @@ const { createMessage, createConfirm } = useMessage();
         workSpaceName.value === '' ||
         workSpaceName.value === '公共数据集' ||
         item.parentWorkSpaceName === workSpaceName.value;
-      // console.log('workSpaceName.value', workSpaceName.value);
-      // console.log('item.parentWorkSpaceName', item.parentWorkSpaceName);
-      // console.log('item.parentWorkSpaceName', item.title);
       return titleMatch && shareMatch && workspaceMatch;
     });
-
     if (sortOrder.value === 'latest') {
       filteredList.sort(
         (a, b) => new Date(b.createdTime).getTime() - new Date(a.createdTime).getTime(),

src/views/mallResourceDevelopment/file/commonFile/index.vue

@@ -191,8 +191,28 @@
   ]);
 
   const [registerTable, { reload, getRowSelection }] = useTable({
-    api: async (params) => {
-      onSearch();
+    api: async () => {
+      let filteredList = cardList.filter((item) => {
+        const titleMatch = item.title.includes(params.value);
+        const shareMatch =
+          selectValue.value === '' ? true : item.isShare.toString() === selectValue.value;
+        const workspaceMatch =
+          workSpaceName.value === '' ||
+          workSpaceName.value === '公共数据集' ||
+          item.parentWorkSpaceName === workSpaceName.value;
+        return titleMatch && shareMatch && workspaceMatch;
+      });
+
+      if (sortOrder.value === 'latest') {
+        filteredList.sort(
+          (a, b) => new Date(b.createdTime).getTime() - new Date(a.createdTime).getTime(),
+        );
+      } else if (sortOrder.value === 'earliest') {
+        filteredList.sort(
+          (a, b) => new Date(a.createdTime).getTime() - new Date(b.createdTime).getTime(),
+        );
+      }
+      cardListData.value = filteredList;
       const response = {
         pageNu: '1',
         pageSize: '10',
@@ -252,16 +272,13 @@
 
   function onSearch() {
     let filteredList = cardList.filter((item) => {
-      const titleMatch = item.title.toLowerCase().includes(params.value.toLowerCase());
+      const titleMatch = item.title.includes(params.value);
       const shareMatch =
         selectValue.value === '' ? true : item.isShare.toString() === selectValue.value;
       const workspaceMatch =
         workSpaceName.value === '' ||
         workSpaceName.value === '公共数据集' ||
         item.parentWorkSpaceName === workSpaceName.value;
-      console.log('workSpaceName.value', workSpaceName.value);
-      console.log('item.parentWorkSpaceName', item.parentWorkSpaceName);
-      console.log('item.parentWorkSpaceName', item.title);
       return titleMatch && shareMatch && workspaceMatch;
     });