From ac45194a5ff830a0f355a76a202e1d4f1d15a35b Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 26 九月 2024 13:07:15 +0800
Subject: [PATCH] #

---
 zy-asrs-admin/src/views/system/language/index.vue |   26 +++++++++++++++++++++-----
 1 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/zy-asrs-admin/src/views/system/language/index.vue b/zy-asrs-admin/src/views/system/language/index.vue
index f16883d..980687a 100644
--- a/zy-asrs-admin/src/views/system/language/index.vue
+++ b/zy-asrs-admin/src/views/system/language/index.vue
@@ -6,6 +6,7 @@
 import { logout } from '@/config.js';
 import EditView from './edit.vue'
 import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
 const context = getCurrentInstance()?.appContext.config.globalProperties;
 
 const router = useRouter();
@@ -16,8 +17,17 @@
 const searchInput = ref("")
 const editChild = ref(null)
 
+const state = reactive({
+  selectedRowKeys: [],
+  loading: false,
+});
+
 let tableData = ref([]);
 getPage();
+
+const {
+  getColumnSearchProps,
+} = useTableSearch();
 
 const columns = [
   {
@@ -25,36 +35,42 @@
     dataIndex: 'name',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('name'),
   },
   {
     title: formatMessage('db.sys_language.language_id', '鍥介檯鍖朓D'),
     dataIndex: 'languageId',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('languageId'),
   },
   {
     title: formatMessage('db.sys_language.locale', '鍦板尯'),
     dataIndex: 'locale',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('locale'),
   },
   {
     title: formatMessage('db.sys_language.create_time', '娣诲姞鏃堕棿'),
     dataIndex: 'createTime$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('createTime$'),
   },
   {
     title: formatMessage('db.sys_language.update_time', '淇敼鏃堕棿'),
     dataIndex: 'updateTime$',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('updateTime$'),
   },
   {
     title: formatMessage('db.sys_language.memo', '澶囨敞'),
     dataIndex: 'memo',
     width: 140,
     ellipsis: true,
+    ...getColumnSearchProps('memo'),
   },
 
   {
@@ -66,10 +82,6 @@
   },
 ];
 
-const state = reactive({
-  selectedRowKeys: [],
-  loading: false,
-});
 const hasSelected = computed(() => state.selectedRowKeys.length > 0);
 const start = () => {
   state.loading = true;
@@ -85,6 +97,8 @@
 };
 
 function getPage() {
+  state.loading = true;
+
   post('/api/language/page', {
     current: currentPage,
     pageSize: pageSize,
@@ -94,6 +108,8 @@
     if (result.code == 200) {
       let data = result.data;
       tableData.value = data;
+
+      state.loading = false;
     } else if (result.code === 401) {
       message.error(result.msg);
       logout()
@@ -179,7 +195,7 @@
     <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
       :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
       :pagination="{ total: tableData.total, onChange: onPageChange }"
-      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
+      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" :loading="state.loading">
       <template #bodyCell="{ column, text, record }">
         <template v-if="column.dataIndex === 'oper'">
           <div style="display: flex;justify-content: space-evenly;">

--
Gitblit v1.9.1