添加select查询及新增项选择

src/components/table-custom.vue

@@ -183,6 +183,8 @@ const handleSelectionChange = (selection: any[]) => {
 
 // 当前页码变化的事件
 const handleCurrentChange = (val: number) => {
+    //console.log("currentPage:", val)
+    //console.log("props.changePage:", props.changePage)
     props.changePage(val)
 }
 

src/components/table-edit.vue

@@ -9,7 +9,7 @@
 					<el-input-number v-else-if="item.type === 'number'" v-model="form[item.prop]"
 						:disabled="item.disabled" controls-position="right"></el-input-number>
 					<el-select v-else-if="item.type === 'select'" v-model="form[item.prop]" :disabled="item.disabled"
-						:placeholder="item.placeholder" clearable :multiple="item.multiple?true:false">
+						:placeholder="item.placeholder" clearable :multiple="item.multiple?true:false" filterable :allow-create="item.allowcreate?true:false" >
 						<el-option v-for="opt in item.opts" :label="opt.label" :value="opt.value"></el-option>
 					</el-select>
 					<el-date-picker v-else-if="item.type === 'date'" type="date" v-model="form[item.prop]"

src/types/form-option.ts

@@ -16,6 +16,8 @@ export interface FormOptionList {
     format?: string;
     activeValue?: any;
     multiple?: boolean;
+    allowcreate?: boolean;
+    filterable?: boolean;
     inactiveValue?: any;
     activeText?: string;
     inactiveText?: string;

src/views/system/manage-file.vue

@@ -3,7 +3,7 @@
         <TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
         <div class="container">
             <TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
-                :delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
+                :delFunc="handleDelete" :changePage="changePage" :currentPage="page.index" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
                 <template #toolbarBtn>
                     <el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">上传文件</el-button>
                 </template>
@@ -38,6 +38,7 @@ import TableDetail from '@/components/table-detail.vue';
 import TableSearch from '@/components/table-search.vue';
 import UploadFile from '@/components/upload-file.vue';
 import { FormOption, FormOptionList } from '@/types/form-option';
+import { pa } from 'element-plus/es/locale';
 
 
 const page = reactive({
@@ -46,6 +47,7 @@ const page = reactive({
     total: 122,
 })
 const tableData = ref<File[]>([]);
+const allData = ref<File[]>([]);
 
 // 查询相关
 const query = reactive({
@@ -69,8 +71,19 @@ const handleSearch = async () => {
         return;
     }
     let result = await FindUserFileService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+    allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 
 // 表格相关
@@ -91,14 +104,34 @@ const getData = async () => {
         type: "all"
     }
     let result = await FindUserFileService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+        allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 getData();
 
 const changePage = (val: number) => {
     page.index = val;
-    getData();
+    //分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = allData.value.slice(start, end);
 };
 
 // 新增弹窗

src/views/system/manage-function.vue

@@ -3,7 +3,7 @@
         <TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
         <div class="container">
             <TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
-                :delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :refresh="getData">
+                :delFunc="handleDelete" :changePage="changePage" :currentPage="page.index" :editFunc="handleEdit" :refresh="getData">
                 <template #toolbarBtn>
                     <el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
                 </template>
@@ -58,8 +58,19 @@ const handleSearch = async () => {
         id: parseInt(query.name)
     }
     let result = await FindFunctionService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+    allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 
 // 表格相关
@@ -79,6 +90,7 @@ const page = reactive({
     total: 122,
 })
 const tableData = ref<Function[]>([]);
+const allData = ref<Function[]>([]);
 const model_select_opts = ref([]);
 const getData = async () => {
     let req={
@@ -94,14 +106,34 @@ const getData = async () => {
         })
     }
     let result = await FindFunctionService(req);
-    tableData.value = result.data;
+        page.total = result.data.length;
-    page.total = 12;
+    page.index = 1;
+        allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 getData();
 
 const changePage = (val: number) => {
     page.index = val;
-    getData();
+    //分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = allData.value.slice(start, end);
 };
 
 

src/views/system/manage-kbase.vue

@@ -3,7 +3,7 @@
         <TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
         <div class="container">
             <TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
-                :delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
+                :delFunc="handleDelete" :changePage="changePage" :currentPage="page.index" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
                 <template #toolbarBtn>
                     <el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
                 </template>
@@ -63,8 +63,19 @@ const handleSearch = async () => {
         id: parseInt(query.name)
     }
     let result = await FindKnowledgeBaseService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+    allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 
 // 表格相关
@@ -84,6 +95,7 @@ const page = reactive({
     total: 122,
 })
 const tableData = ref<KBase[]>([]);
+const allData = ref<KBase[]>([]);
 const file_ids_select_opts = ref([]);
 const getData = async () => {
     let req={
@@ -104,10 +116,10 @@ const getData = async () => {
             value: userFile.ID
         })
     }
-    tableData.value = result.data;
+    allData.value = result.data;
     //将文件id与对应文件对应的文件名拼接成字符串
-    for (let i = 0; i < tableData.value.length; i++) {
+    for (let i = 0; i < allData.value.length; i++) {
-        let file_ids = JSON.parse(tableData.value[i].FileIDs.toString())
+        let file_ids = JSON.parse(allData.value[i].FileIDs.toString())
         let file_id_list = []
         for (let j = 0; j < file_ids.length; j++) {
             file_id_list.push(file_ids[j]["file_id"])
@@ -122,16 +134,37 @@ const getData = async () => {
                 }
             }
         }
-        tableData.value[i].FileNameList = file_name_list.join(",")
+        allData.value[i].FileNameList = file_name_list.join(",")
         // console.log("file_name_list:", file_name_list)
     }
     page.total = result.data.length;
+    page.index = 1;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = allData.value.slice(start, end);
+    
 };
 getData();
 
 const changePage = (val: number) => {
     page.index = val;
-    getData();
+    //分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = allData.value.slice(start, end);
 };
 
 // 新增弹窗

src/views/system/manage-model.vue

@@ -3,7 +3,7 @@
         <TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
         <div class="container">
             <TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
-                :delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
+                :delFunc="handleDelete" :changePage="changePage2" :currentPage="page.currentPage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
                 <template #toolbarBtn>
                     <el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
                 </template>
@@ -38,6 +38,7 @@ import TableCustom from '@/components/table-custom.vue';
 import TableDetail from '@/components/table-detail.vue';
 import TableSearch from '@/components/table-search.vue';
 import { FormOption, FormOptionList } from '@/types/form-option';
+import { pa } from 'element-plus/es/locale';
 
 
 // 查询相关
@@ -63,8 +64,23 @@ const handleSearch = async () => {
         id: parseInt(query.name)
     }
     let result = await FindModelService(req);
-    tableData.value = result.data;
+    if (result["data"]==null){
+        ElMessage.error("没有该模型");
+        return;
+    }
     page.total = result.data.length;
+    page.index = 1;
+    allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 
 // 表格相关
@@ -83,30 +99,62 @@ const page = reactive({
     index: 1,
     size: 10,
     total: 122,
+    pageSizes: [10, 20, 30, 40],
+    currentPage: 1,
 })
 const tableData = ref<Model[]>([]);
+const allData = ref<Model[]>([]);
 const getData = async () => {
     let req={
         token: localStorage.getItem('token'),
         type: "UserID"
     }
     let result = await FindModelService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+    allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
+    
 };
 getData();
 
-const changePage = (val: number) => {
+const changePage = async (val: number) => {
+    console.log("page index:", page.index);
     page.index = val;
     getData();
 };
 
+const changePage2 = async (val: number) => {
+    //console.log("page index:", page.index);
+    page.index = val;
+    //分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = allData.value.slice(start, end);
+    page.currentPage = val;
+};
+
 // 新增弹窗
 let options = ref<FormOption>({
     labelWidth: '100px',
     span: 12,
     list: [
-        { type: 'select', label: '类型', prop: 'Type', required: true , opts:[{label: '本地部署模型', value: 'ollama'},{label: '星火', value: 'spark'},{label: '豆包', value: 'doubao'}]},
+        { type: 'select', label: '类型', prop: 'Type', required: true, allowcreate:true, opts:[{label: '本地部署模型', value: 'ollama'},{label: '星火', value: 'spark'},{label: '豆包', value: 'doubao'}]},
         { type: 'input', label: 'URL', prop: 'Url', required: true },
         { type: 'input', label: '参数', prop: 'Parameter', required: true },
         { type: 'input', label: '描述', prop: 'Description', required: true },

src/views/system/manage-session.vue

@@ -3,7 +3,7 @@
         <TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
         <div class="container">
             <TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
-                :delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
+                :delFunc="handleDelete" :changePage="changePage" :currentPage="page.index"  :editFunc="handleEdit" :genOperate="handleGenOperate" :refresh="getData">
                 <template #toolbarBtn>
                     <el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
                 </template>
@@ -47,6 +47,7 @@ const page = reactive({
     total: 122,
 })
 const tableData = ref<Session[]>([]);
+const allData = ref<Session[]>([]);
 
 // 查询相关
 const query = reactive({
@@ -77,8 +78,19 @@ const handleSearch = async () => {
     }
     
     let result = await FindSessionService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+    allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 
 // 表格相关
@@ -101,14 +113,35 @@ const getData = async () => {
         session_type: -1,
     }
     let result = await FindSessionService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+        allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 getData();
 
 const changePage = (val: number) => {
     page.index = val;
-    getData();
+    //分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = allData.value.slice(start, end);
+    //page.currentPage = val;
 };
 
 const handleGenOperate = async (row: File) => {

src/views/system/user.vue

@@ -3,7 +3,7 @@
         <TableSearch :query="query" :options="searchOpt" :search="handleSearch" :refresh="getData" />
         <div class="container">
             <TableCustom :columns="columns" :tableData="tableData" :total="page.total" :viewFunc="handleView"
-                :delFunc="handleDelete" :page-change="changePage" :editFunc="handleEdit">
+                :delFunc="handleDelete" :changePage="changePage" :currentPage="page.index"  :editFunc="handleEdit">
                 <!-- <template #toolbarBtn>
                     <el-button type="warning" :icon="CirclePlusFilled" @click="visible_add = true">新增</el-button>
                 </template> -->
@@ -52,11 +52,11 @@ const handleSearch = async () => {
         ElMessage.error('请输入用户名或ID');
         return;
     }
-    try{
+    // 判断query.name是否是数字
-        search_id = parseInt(query.name);
+    if (isNaN(Number(query.name))) {
-    }catch(e){
-        search_id = -1;
         keyword_ = query.name;
+    } else {
+        search_id = parseInt(query.name);
     }
     let req={
         token: localStorage.getItem('token'),
@@ -64,8 +64,19 @@ const handleSearch = async () => {
         keyword: keyword_,
     }
     let result = await SearchUserService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+    allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 
 // 表格相关
@@ -85,6 +96,7 @@ const page = reactive({
     total: 122,
 })
 const tableData = ref<UserInfo[]>([]);
+const allData = ref<UserInfo[]>([]);
 const getData = async () => {
     let req={
         token: localStorage.getItem('token'),
@@ -92,14 +104,34 @@ const getData = async () => {
         keyword: "_121",
     }
     let result = await SearchUserService(req);
-    tableData.value = result.data;
     page.total = result.data.length;
+    page.index = 1;
+    allData.value = result.data;
+    // 分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = result.data.slice(start, end);
 };
 getData();
 
 const changePage = (val: number) => {
         page.index = val;
-    getData();
+    //分页
+    let start = (page.index - 1) * page.size;
+    let end = start + page.size;
+    if (end > page.total) {
+        end = page.total;
+    }
+    if (start > page.total) {
+        start = page.total;
+    }
+    tableData.value = allData.value.slice(start, end);
 };
 
 // 新增弹窗