From fcd86fbebd0a1ff993c9ecb7da257f5931191e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=96=E5=BD=A6=E6=A3=8B?= <liaoyq@pvc123.com>
Date: Wed, 13 Mar 2024 09:54:20 +0800
Subject: [PATCH] =?UTF-8?q?fix(ui):=20ui=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gpt-vue/projects/vue-admin/.env.development   |  2 -
 new-ui/pnpm-lock.yaml                         |  2 +-
 .../components/SearchTable/SearchTable.vue    | 44 +++++++++++--------
 .../src/components/SearchTable/utils.ts       | 13 +-----
 new-ui/projects/vue-admin/src/router/index.ts |  4 +-
 .../src/views/ApiKey/ApiKeyContainer.vue      |  7 +++
 .../vue-admin/src/views/ApiKey/api.ts         |  5 ++-
 .../views/ChatModel/ChatModelContainer.vue    |  2 +
 .../vue-admin/src/views/ChatModel/api.ts      |  5 ++-
 .../src/views/Product/ProductContainer.vue    |  5 +++
 .../vue-admin/src/views/Reward/api.ts         |  6 +--
 .../projects/vue-admin/src/views/Role/api.ts  |  5 ++-
 .../projects/vue-admin/src/views/User/api.ts  |  5 ++-
 13 files changed, 59 insertions(+), 46 deletions(-)
 delete mode 100644 gpt-vue/projects/vue-admin/.env.development

diff --git a/gpt-vue/projects/vue-admin/.env.development b/gpt-vue/projects/vue-admin/.env.development
deleted file mode 100644
index 74dbd9ad..00000000
--- a/gpt-vue/projects/vue-admin/.env.development
+++ /dev/null
@@ -1,2 +0,0 @@
-VITE_PROXY_BASE_URL="/api"
-VITE_TARGET_URL="http://172.22.11.2:5678"
diff --git a/new-ui/pnpm-lock.yaml b/new-ui/pnpm-lock.yaml
index 0df63689..2f29dd63 100644
--- a/new-ui/pnpm-lock.yaml
+++ b/new-ui/pnpm-lock.yaml
@@ -1,4 +1,4 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
 
 settings:
   autoInstallPeers: true
diff --git a/new-ui/projects/vue-admin/src/components/SearchTable/SearchTable.vue b/new-ui/projects/vue-admin/src/components/SearchTable/SearchTable.vue
index 44cd3998..1e569339 100644
--- a/new-ui/projects/vue-admin/src/components/SearchTable/SearchTable.vue
+++ b/new-ui/projects/vue-admin/src/components/SearchTable/SearchTable.vue
@@ -38,30 +38,32 @@ onActivated(handleSearch);
 <template>
   <div class="search-table">
     <div class="search-table-header">
-      <div>
-        <slot name="header-title">{{ props.headerTitle }}</slot>
-      </div>
-      <div class="header-option">
-        <slot name="header-option" :formData="formData" :reload="handleSearch" />
+      <div class="search-table-header-option">
+        <div>
+          <slot name="header-title">{{ props.headerTitle }}</slot>
+        </div>
+        <div class="header-option">
+          <slot name="header-option" :formData="formData" :reload="handleSearch" />
+        </div>
       </div>
+      <FormSection
+          v-model="formData"
+          :columns="columns"
+          :submitting="tableConfig.loading as boolean"
+          @request="handleSearch"
+      >
+        <template v-for="slot in Object.keys($slots)" #[slot]="config">
+          <slot :name="slot" v-bind="{ ...config, reload: handleSearch }" />
+        </template>
+      </FormSection>
     </div>
-    <FormSection
-      v-model="formData"
-      :columns="columns"
-      :submitting="tableConfig.loading as boolean"
-      @request="handleSearch"
-    >
-      <template v-for="slot in Object.keys($slots)" #[slot]="config">
-        <slot :name="slot" v-bind="{ ...config, reload: handleSearch }" />
-      </template>
-    </FormSection>
     <div ref="tableContainerRef" class="search-table-container">
       <ATable
         v-bind="{
           ...$attrs,
           ...tableConfig,
           ...props,
-          scroll: useTableScroll(_columns, tableContainerRef as HTMLElement),
+          scroll: useTableScroll(_columns),
           columns: _columns,
         }"
       >
@@ -74,14 +76,18 @@ onActivated(handleSearch);
 </template>
 <style scoped>
 .search-table {
-  display: flex;
-  flex-direction: column;
+  position: relative;
   height: 100%;
 }
 .search-table-container {
-  flex: 1;
+  position: relative;
+  z-index: 1;
 }
 .search-table-header {
+  background: #fff;
+  z-index: 2;
+}
+.search-table-header-option {
   display: flex;
   align-items: center;
   justify-content: space-between;
diff --git a/new-ui/projects/vue-admin/src/components/SearchTable/utils.ts b/new-ui/projects/vue-admin/src/components/SearchTable/utils.ts
index 6376ed66..a87ba9bd 100644
--- a/new-ui/projects/vue-admin/src/components/SearchTable/utils.ts
+++ b/new-ui/projects/vue-admin/src/components/SearchTable/utils.ts
@@ -1,20 +1,11 @@
-import type { TableColumnData } from "@arco-design/web-vue";
 import type { SearchTableColumns, SearchColumns } from "./type";
 
-export function useTableXScroll(columns: TableColumnData[]) {
-  return columns.reduce((prev, curr) => {
-    const width = curr.width ?? 150;
-    return prev + width;
-  }, 0);
-}
-
-export function useTableScroll(columns: SearchTableColumns[], container?: HTMLElement) {
+export function useTableScroll(columns: SearchTableColumns[]) {
   const x = columns.reduce((prev, curr) => {
     const width = curr.hideInTable ? 0 : curr.width ?? 150;
     return prev + width;
   }, 0);
-  const y = container?.clientHeight ?? undefined;
-  return { x, y };
+  return { x };
 }
 
 export function getDefaultFormData(columns: SearchTableColumns[]) {
diff --git a/new-ui/projects/vue-admin/src/router/index.ts b/new-ui/projects/vue-admin/src/router/index.ts
index ea2a37c8..a578cbd3 100644
--- a/new-ui/projects/vue-admin/src/router/index.ts
+++ b/new-ui/projects/vue-admin/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHashHistory } from 'vue-router'
 import { useAuthStore } from "@/stores/auth";
 import CustomLayout from '@/components/CustomLayout.vue'
 import menu from './menu'
@@ -17,7 +17,7 @@ const whiteListRoutes = [
 ];
 
 const router = createRouter({
-  history: createWebHistory(import.meta.env.BASE_URL),
+  history: createWebHashHistory(import.meta.env.BASE_URL),
   routes: [
     {
       path: '/',
diff --git a/new-ui/projects/vue-admin/src/views/ApiKey/ApiKeyContainer.vue b/new-ui/projects/vue-admin/src/views/ApiKey/ApiKeyContainer.vue
index e9710a85..e56b1484 100644
--- a/new-ui/projects/vue-admin/src/views/ApiKey/ApiKeyContainer.vue
+++ b/new-ui/projects/vue-admin/src/views/ApiKey/ApiKeyContainer.vue
@@ -29,10 +29,13 @@ const columns = [
     title: "使用代理",
     dataIndex: "use_proxy",
     slotName: "proxy",
+    align: "center",
+    width: 100
   },
   {
     title: "最后使用时间",
     dataIndex: "last_used_at",
+    width: 180,
     render: ({ record }) => {
       return dateFormat(record.last_used_at);
     },
@@ -41,10 +44,14 @@ const columns = [
     title: "启用状态",
     dataIndex: "enabled",
     slotName: "status",
+    align: "center",
+    width: 100
   },
   {
     title: "操作",
     slotName: "action",
+    width: 120,
+    fixed: "right",
   },
 ];
 
diff --git a/new-ui/projects/vue-admin/src/views/ApiKey/api.ts b/new-ui/projects/vue-admin/src/views/ApiKey/api.ts
index 9c5f6b4d..a5c025b7 100644
--- a/new-ui/projects/vue-admin/src/views/ApiKey/api.ts
+++ b/new-ui/projects/vue-admin/src/views/ApiKey/api.ts
@@ -16,8 +16,9 @@ export const save = (data?: Record<string, unknown>) => {
 };
 export const deleting = (id: string | number) => {
   return http({
-    url: `/api/admin/apikey/remove?id=${id}`,
-    method: "get",
+    url: `/api/admin/apikey/remove`,
+    method: "post",
+    data: { id },
   });
 };
 export const setStatus = (data) => {
diff --git a/new-ui/projects/vue-admin/src/views/ChatModel/ChatModelContainer.vue b/new-ui/projects/vue-admin/src/views/ChatModel/ChatModelContainer.vue
index 24d88c82..5b33c70f 100644
--- a/new-ui/projects/vue-admin/src/views/ChatModel/ChatModelContainer.vue
+++ b/new-ui/projects/vue-admin/src/views/ChatModel/ChatModelContainer.vue
@@ -44,6 +44,8 @@ const columns = [
   {
     title: "操作",
     slotName: "action",
+    width: 120,
+    fixed: "right",
   },
 ];
 
diff --git a/new-ui/projects/vue-admin/src/views/ChatModel/api.ts b/new-ui/projects/vue-admin/src/views/ChatModel/api.ts
index a237661b..53a40fa3 100644
--- a/new-ui/projects/vue-admin/src/views/ChatModel/api.ts
+++ b/new-ui/projects/vue-admin/src/views/ChatModel/api.ts
@@ -16,8 +16,9 @@ export const save = (data?: Record<string, unknown>) => {
 };
 export const deleting = (id: string | number) => {
   return http({
-    url: `/api/admin/model/remove?id=${id}`,
-    method: "get",
+    url: `/api/admin/model/remove`,
+    method: "post",
+    data: { id },
   });
 };
 export const setStatus = (data) => {
diff --git a/new-ui/projects/vue-admin/src/views/Product/ProductContainer.vue b/new-ui/projects/vue-admin/src/views/Product/ProductContainer.vue
index 190a4961..64b29aff 100644
--- a/new-ui/projects/vue-admin/src/views/Product/ProductContainer.vue
+++ b/new-ui/projects/vue-admin/src/views/Product/ProductContainer.vue
@@ -40,10 +40,13 @@ const columns = [
     title: "启用状态",
     dataIndex: "enabled",
     slotName: "status",
+    align: "center",
+    width: 100
   },
   {
     title: "更新时间",
     dataIndex: "updated_at",
+    width: 180,
     render: ({ record }) => {
       return dateFormat(record.updated_at);
     },
@@ -51,6 +54,8 @@ const columns = [
   {
     title: "操作",
     slotName: "action",
+    width: 120,
+    fixed: "right"
   },
 ];
 
diff --git a/new-ui/projects/vue-admin/src/views/Reward/api.ts b/new-ui/projects/vue-admin/src/views/Reward/api.ts
index 0c7f8e34..e07c7578 100644
--- a/new-ui/projects/vue-admin/src/views/Reward/api.ts
+++ b/new-ui/projects/vue-admin/src/views/Reward/api.ts
@@ -8,10 +8,10 @@ export const getList = (params?: Record<string, unknown>) => {
   })
 }
 
-export const remove = (params?: Record<string, unknown>) => {
+export const remove = (data?: Record<string, unknown>) => {
   return http({
     url: "/api/admin/reward/remove",
-    method: "get",
-    params
+    method: "post",
+    data
   })
 }
diff --git a/new-ui/projects/vue-admin/src/views/Role/api.ts b/new-ui/projects/vue-admin/src/views/Role/api.ts
index f32eebb7..28116197 100644
--- a/new-ui/projects/vue-admin/src/views/Role/api.ts
+++ b/new-ui/projects/vue-admin/src/views/Role/api.ts
@@ -16,8 +16,9 @@ export const save = (data?: Record<string, unknown>) => {
 };
 export const deleting = (id: string | number) => {
   return http({
-    url: `/api/admin/role/remove?id=${id}`,
-    method: "get",
+    url: `/api/admin/role/remove`,
+    method: "post",
+    data: { id }
   });
 };
 export const setStatus = (data) => {
diff --git a/new-ui/projects/vue-admin/src/views/User/api.ts b/new-ui/projects/vue-admin/src/views/User/api.ts
index db2f8aca..8fe84f04 100644
--- a/new-ui/projects/vue-admin/src/views/User/api.ts
+++ b/new-ui/projects/vue-admin/src/views/User/api.ts
@@ -18,8 +18,9 @@ export const save = (data?: Record<string, unknown>) => {
 
 export const deletApi = (id: string | number) => {
   return http({
-    url: `/api/admin/user/remove?id=${id}`,
-    method: "get",
+    url: `/api/admin/user/remove`,
+    method: "post",
+    data: { id }
   });
 };