From d4d1fb26f65c6f6cbf987ff662177d6d5b69cb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=96=E5=BD=A6=E6=A3=8B?= <liaoyq@pvc123.com>
Date: Mon, 11 Mar 2024 12:02:20 +0800
Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E7=BB=86=E8=8A=82=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/SearchTable/SearchTable.vue   | 16 +++++++++-------
 .../vue-admin/src/composables/useSubmit.ts       |  2 +-
 .../src/views/ApiKey/ApiKeyContainer.vue         |  6 ++++++
 .../vue-admin/src/views/Chats/ChatsContainer.vue |  2 ++
 .../vue-admin/src/views/Order/OrderContainer.vue | 12 ++++++++++++
 .../src/views/System/SystemBaseConfig.vue        |  2 +-
 .../src/views/System/SystemChatConfig.vue        |  2 +-
 .../src/views/System/SystemNoticeConfig.vue      |  2 +-
 8 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/gpt-vue/projects/vue-admin/src/components/SearchTable/SearchTable.vue b/gpt-vue/projects/vue-admin/src/components/SearchTable/SearchTable.vue
index 52455147..44cd3998 100644
--- a/gpt-vue/projects/vue-admin/src/components/SearchTable/SearchTable.vue
+++ b/gpt-vue/projects/vue-admin/src/components/SearchTable/SearchTable.vue
@@ -19,11 +19,13 @@ const requestParams = computed(() => ({
 const [tableConfig, getList] = useAsyncTable(props.request, requestParams);
 
 const _columns = computed(() => {
-  return props.columns.map((item) => ({
-    ellipsis: true,
-    tooltip: true,
-    ...item,
-  }));
+  return props.columns
+    .filter((item) => !item.hideInTable)
+    .map((item) => ({
+      ellipsis: true,
+      tooltip: true,
+      ...item,
+    }));
 });
 
 const handleSearch = async (tips?: boolean) => {
@@ -46,7 +48,7 @@ onActivated(handleSearch);
     <FormSection
       v-model="formData"
       :columns="columns"
-      :submitting="(tableConfig.loading as boolean)"
+      :submitting="tableConfig.loading as boolean"
       @request="handleSearch"
     >
       <template v-for="slot in Object.keys($slots)" #[slot]="config">
@@ -60,7 +62,7 @@ onActivated(handleSearch);
           ...tableConfig,
           ...props,
           scroll: useTableScroll(_columns, tableContainerRef as HTMLElement),
-          columns: _columns
+          columns: _columns,
         }"
       >
         <template v-for="slot in Object.keys($slots)" #[slot]="config">
diff --git a/gpt-vue/projects/vue-admin/src/composables/useSubmit.ts b/gpt-vue/projects/vue-admin/src/composables/useSubmit.ts
index 64e8db0d..11665cf7 100644
--- a/gpt-vue/projects/vue-admin/src/composables/useSubmit.ts
+++ b/gpt-vue/projects/vue-admin/src/composables/useSubmit.ts
@@ -12,7 +12,7 @@ function useSubmit<T extends Record<string, any> = Record<string, any>, R = any>
       const hasError = await formRef.value?.validate();
       if (!hasError) {
         const { data, message } = await api({ ...formData ?? {}, ...unref(params) });
-        Message.success(message);
+        message && Message.success(message);
         return Promise.resolve({ formData, data });
       }
       return Promise.reject(false);
diff --git a/gpt-vue/projects/vue-admin/src/views/ApiKey/ApiKeyContainer.vue b/gpt-vue/projects/vue-admin/src/views/ApiKey/ApiKeyContainer.vue
index bef464be..e9710a85 100644
--- a/gpt-vue/projects/vue-admin/src/views/ApiKey/ApiKeyContainer.vue
+++ b/gpt-vue/projects/vue-admin/src/views/ApiKey/ApiKeyContainer.vue
@@ -19,6 +19,7 @@ const columns = [
   {
     title: "key",
     dataIndex: "value",
+    slotName: "value",
   },
   {
     title: "用途",
@@ -100,6 +101,11 @@ const handleStatusChange = ({ filed, value, record, reload }) => {
         ><template #icon> <icon-plus /> </template>新增
       </a-button>
     </template>
+    <template #value="{ record, column }">
+      <a-typography-text copyable ellipsis style="margin: 0">
+        {{ record[column.dataIndex] }}
+      </a-typography-text>
+    </template>
     <template #status="{ record, reload }">
       <a-switch
         v-model="record.enabled"
diff --git a/gpt-vue/projects/vue-admin/src/views/Chats/ChatsContainer.vue b/gpt-vue/projects/vue-admin/src/views/Chats/ChatsContainer.vue
index 6f3b5f3a..967a10e9 100644
--- a/gpt-vue/projects/vue-admin/src/views/Chats/ChatsContainer.vue
+++ b/gpt-vue/projects/vue-admin/src/views/Chats/ChatsContainer.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import { ref, h } from "vue";
 import { Message, Modal } from "@arco-design/web-vue";
+import { dateFormat } from "@gpt-vue/packages/utils";
 import SearchTable from "@/components/SearchTable/SearchTable.vue";
 import type { SearchTableColumns } from "@/components/SearchTable/type";
 import app from "@/main";
@@ -51,6 +52,7 @@ const columns: SearchTableColumns[] = [
     search: {
       valueType: "range",
     },
+    render: ({ record }) => dateFormat(record.created_at),
   },
   {
     title: "操作",
diff --git a/gpt-vue/projects/vue-admin/src/views/Order/OrderContainer.vue b/gpt-vue/projects/vue-admin/src/views/Order/OrderContainer.vue
index 6112fb2e..7f705ea7 100644
--- a/gpt-vue/projects/vue-admin/src/views/Order/OrderContainer.vue
+++ b/gpt-vue/projects/vue-admin/src/views/Order/OrderContainer.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import SearchTable from "@/components/SearchTable/SearchTable.vue";
 import type { SearchTableColumns } from "@/components/SearchTable/type";
+import { dateFormat } from "@gpt-vue/packages/utils";
 import { getList } from "./api";
 
 const columns: SearchTableColumns[] = [
@@ -10,6 +11,7 @@ const columns: SearchTableColumns[] = [
     search: {
       valueType: "input",
     },
+    width: 280,
   },
   {
     dataIndex: "username",
@@ -30,6 +32,8 @@ const columns: SearchTableColumns[] = [
   {
     dataIndex: "created_at",
     title: "下单时间",
+    render: ({ record }) => dateFormat(record.created_at),
+    width: 200,
   },
   {
     dataIndex: "status",
@@ -52,6 +56,8 @@ const columns: SearchTableColumns[] = [
     search: {
       valueType: "range",
     },
+    slotName: "pay_time",
+    width: 200,
   },
   {
     dataIndex: "pay_way",
@@ -60,11 +66,17 @@ const columns: SearchTableColumns[] = [
   {
     title: "操作",
     slotName: "actions",
+    fixed: "right",
+    width: 80,
   },
 ];
 </script>
 <template>
   <SearchTable :request="getList" :columns="columns">
+    <template #pay_time="{ record }">
+      <a-tag v-if="!record.pay_time" color="blue">未支付</a-tag>
+      <span v-else>{{ dateFormat(record.pay_time) }}</span>
+    </template>
     <template #actions="{ record }">
       <a-link :key="record.id" status="danger">删除</a-link>
     </template>
diff --git a/gpt-vue/projects/vue-admin/src/views/System/SystemBaseConfig.vue b/gpt-vue/projects/vue-admin/src/views/System/SystemBaseConfig.vue
index ae9728f2..735bf3ff 100644
--- a/gpt-vue/projects/vue-admin/src/views/System/SystemBaseConfig.vue
+++ b/gpt-vue/projects/vue-admin/src/views/System/SystemBaseConfig.vue
@@ -148,7 +148,7 @@ onMounted(async () => {
         </a-space>
       </a-form-item>
       <a-form-item>
-        <a-button type="primary" :loading="submitting" @click="handleSave">提交</a-button>
+        <a-button type="primary" :loading="submitting" @click="handleSave">保存</a-button>
       </a-form-item>
     </a-form>
   </a-card>
diff --git a/gpt-vue/projects/vue-admin/src/views/System/SystemChatConfig.vue b/gpt-vue/projects/vue-admin/src/views/System/SystemChatConfig.vue
index ff1bab52..e8d3dcc4 100644
--- a/gpt-vue/projects/vue-admin/src/views/System/SystemChatConfig.vue
+++ b/gpt-vue/projects/vue-admin/src/views/System/SystemChatConfig.vue
@@ -141,7 +141,7 @@ onMounted(reload);
         />
       </a-form-item>
       <a-form-item>
-        <a-button type="primary" :loading="submitting" @click="handleSave">提交</a-button>
+        <a-button type="primary" :loading="submitting" @click="handleSave">保存</a-button>
       </a-form-item>
     </a-form>
   </a-card>
diff --git a/gpt-vue/projects/vue-admin/src/views/System/SystemNoticeConfig.vue b/gpt-vue/projects/vue-admin/src/views/System/SystemNoticeConfig.vue
index 04e216e7..4ca8b600 100644
--- a/gpt-vue/projects/vue-admin/src/views/System/SystemNoticeConfig.vue
+++ b/gpt-vue/projects/vue-admin/src/views/System/SystemNoticeConfig.vue
@@ -61,7 +61,7 @@ onMounted(reload);
       <md-editor v-model="formData.content" @on-upload-img="onUploadImg" />
     </a-form-item>
     <a-form-item>
-      <a-button type="primary" :loading="submitting" @click="handleSave">提交</a-button>
+      <a-button type="primary" :loading="submitting" @click="handleSave">保存</a-button>
     </a-form-item>
   </a-form>
 </template>