From 9da660a4da94b1385069118e489f57e25d572879 Mon Sep 17 00:00:00 2001 From: wujingjing <gersonwu@qq.com> Date: 星期四, 31 十月 2024 11:27:09 +0800 Subject: [PATCH] Merge branch 'test' of http://47.103.154.90:83/r/WI/Web.Admin.V1.0 into test --- src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue index 0fdb2af..0a2e4f3 100644 --- a/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue +++ b/src/views/project/yw/lowCode/sqlAmis/SqlAmis.vue @@ -25,9 +25,11 @@ <template #header> <el-form ref="queryFormRef" :inline="true" :model="queryParams"> <el-form-item label="鏍囬" prop="title"> - <el-input v-model="queryParams.title" style="width: 226.4px" placeholder="鏍囬" clearable /> + <el-input v-model="queryParams.title" style="width: 226.4px" placeholder="鏍囬" clearable @input="debounceQueryTable"/> </el-form-item> + <el-form-item> + <!-- <el-button type="primary" icon="ele-Search" @click="handleQueryTable"> 鏌ヨ </el-button> --> <el-button icon="ele-Refresh" @click="resetQuery">閲嶇疆 </el-button> <el-button icon="ele-Plus" @click="openOptDlg()"> 娣诲姞 </el-button> </el-form-item> @@ -44,7 +46,7 @@ class="flex-auto" border :row-class-name="isDragStatus ? 'cursor-move' : 'cursor-pointer'" - :data="showPageList" + :data="displayTableData" highlight-current-row > <template v-for="item in columnList" :key="item.prop"> @@ -196,10 +198,17 @@ <script setup lang="ts"> import { useDraggable } from '@vueuse/core'; +import { debounce, travelTree } from '/@/utils/util'; + +import { computed, onMounted, ref } from 'vue'; +import { usePageDisplay } from '/@/hooks/usePageDisplay'; +import { useQueryTable } from '/@/hooks/useQueryTable'; +// import { useTableSort } from '/@/hooks/useTableSort'; +// import { useValidateUniqueness } from '/@/hooks/useValidateUniqueness'; import axios, { CancelTokenSource } from 'axios'; import type { FormInstance, FormRules } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus'; -import { computed, nextTick, onMounted, ref, watch } from 'vue'; +import { nextTick } from 'vue'; import SqlAmisEdit from './edit/SqlAmisEdit.vue'; import OptDlg from './optDlg/OptDlg.vue'; import { SupervisorPublished, supervisorPublishedMap } from './types'; @@ -212,16 +221,14 @@ import ColFilter from '/@/components/table/colFilter/ColFilter.vue'; import { TableCol } from '/@/components/table/colFilter/types'; import LeftTreeByMgr from '/@/components/tree/leftTreeByMgr.vue'; -import { usePageDisplay } from '/@/hooks/usePageDisplay'; -import { useQueryTable } from '/@/hooks/useQueryTable'; -import { useSearch } from '/@/hooks/useSearch'; import { useUpdateData } from '/@/hooks/useUpdateData'; import emitter from '/@/utils/mitt'; import { deepClone } from '/@/utils/other'; import { gotoRoute } from '/@/utils/route'; import { useCompRef } from '/@/utils/types'; -import { convertListToTree, debounce, travelTree } from '/@/utils/util'; +import { convertListToTree } from '/@/utils/util'; import { OptClassificationMap, classificationEnum } from '/@/views/types/metrics'; + const columnList = ref<TableCol[]>([ { prop: 'title', label: '鏍囬', width: 300, fixed: 'left' }, { prop: 'published', label: '鍙戝竷鐘舵��', width: 85 }, @@ -239,6 +246,7 @@ const listData = ref([]); const currentListID = computed(() => currentNode.value?.group_id); const currentNode = ref(null); + const listTreeData = computed(() => { const byParentData = convertListToTree(listData.value, { ID: 'group_id', @@ -408,17 +416,10 @@ const queryParams = ref({ title: '', }); -const { query: queryTerminology, queryData: showPageList } = useSearch(tableData, queryParams); -const pageQuery = debounce(queryTerminology); -watch( - () => queryParams.value.title, - (val) => { - pageQuery(); - } -); -const { resetQuery, handleQueryTable } = useQueryTable(tableData, queryParams, () => { - showPageList.value = tableData.value; +const { resetQuery, handleQueryTable, displayTableData } = useQueryTable(tableData, queryParams, () => { + displayTableData.value = tableData.value; }); +const debounceQueryTable = debounce(handleQueryTable,400) //#endregion //#region ====================== 鏌ヨ蹇嵎閿� ====================== @@ -581,4 +582,3 @@ }); </script> <style scoped lang="scss"></style> -, watch -- Gitblit v1.9.3