From 8f0c2fa811c01e88a154771212a7d89ac2c3ba8c Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Fri, 19 May 2023 16:37:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=9A=90=E8=97=8F=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/BasicTable.vue       | 13 +++++++---
 .../src/components/settings/FormSetting.vue   | 24 +++++++++++++++++++
 .../src/components/settings/SizeSetting.vue   | 14 +++++------
 .../Table/src/components/settings/index.vue   |  3 +++
 .../Table/src/hooks/useTableForm.ts           | 17 ++++++++++---
 src/components/Table/src/types/table.ts       |  3 +++
 6 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 src/components/Table/src/components/settings/FormSetting.vue

diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 3cee7705..ab2a8d52 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -4,7 +4,7 @@
       ref="formRef"
       submitOnReset
       v-bind="getFormProps"
-      v-if="getBindValues.useSearchForm"
+      v-if="getShowForm() && getBindValues.useSearchForm"
       :tableAction="tableAction"
       @register="registerForm"
       @submit="handleSearchInfoChange"
@@ -203,7 +203,12 @@ const { getHeaderProps } = useTableHeader(getProps, slots, handlers)
 
 const { getFooterProps } = useTableFooter(getProps, getScrollRef, tableElRef, getDataSourceRef)
 
-const { getFormProps, replaceFormSlotKey, getFormSlotKeys, handleSearchInfoChange } = useTableForm(getProps, slots, fetch, getLoading)
+const { getFormProps, replaceFormSlotKey, getFormSlotKeys, handleSearchInfoChange, getShowForm, setShowForm } = useTableForm(
+  getProps,
+  slots,
+  fetch,
+  getLoading
+)
 
 const getBindValues = computed(() => {
   const dataSource = unref(getDataSourceRef)
@@ -295,7 +300,9 @@ const tableAction: TableActionType = {
   getSize: () => {
     return unref(getBindValues).size as SizeType
   },
-  setCacheColumns
+  setCacheColumns,
+  setShowForm,
+  getShowForm
 }
 createTableContext({ ...tableAction, wrapRef, getBindValues })
 
diff --git a/src/components/Table/src/components/settings/FormSetting.vue b/src/components/Table/src/components/settings/FormSetting.vue
new file mode 100644
index 00000000..191f485b
--- /dev/null
+++ b/src/components/Table/src/components/settings/FormSetting.vue
@@ -0,0 +1,24 @@
+<template>
+  <Tooltip placement="top">
+    <template #title>
+      <span>{{ t('common.searchText') }}</span>
+    </template>
+    <SearchOutlined @click="redo" />
+  </Tooltip>
+</template>
+<script lang="ts" setup>
+import { Tooltip } from 'ant-design-vue'
+import { SearchOutlined } from '@ant-design/icons-vue'
+import { useI18n } from '@/hooks/web/useI18n'
+import { useTableContext } from '../../hooks/useTableContext'
+
+defineOptions({ name: 'FormSetting' })
+
+const table = useTableContext()
+const { t } = useI18n()
+
+function redo() {
+  table.setShowForm(!table.getShowForm())
+  table.reload()
+}
+</script>
diff --git a/src/components/Table/src/components/settings/SizeSetting.vue b/src/components/Table/src/components/settings/SizeSetting.vue
index 74f00b4f..b2f85e50 100644
--- a/src/components/Table/src/components/settings/SizeSetting.vue
+++ b/src/components/Table/src/components/settings/SizeSetting.vue
@@ -8,15 +8,15 @@
       <ColumnHeightOutlined />
       <template #overlay>
         <Menu @click="handleTitleClick" selectable v-model:selectedKeys="selectedKeysRef">
-          <MenuItem key="default">
+          <Menu.Item key="default">
             <span>{{ t('component.table.settingDensDefault') }}</span>
-          </MenuItem>
-          <MenuItem key="middle">
+          </Menu.Item>
+          <Menu.Item key="middle">
             <span>{{ t('component.table.settingDensMiddle') }}</span>
-          </MenuItem>
-          <MenuItem key="small">
+          </Menu.Item>
+          <Menu.Item key="small">
             <span>{{ t('component.table.settingDensSmall') }}</span>
-          </MenuItem>
+          </Menu.Item>
         </Menu>
       </template>
     </Dropdown>
@@ -31,8 +31,6 @@ import { useI18n } from '@/hooks/web/useI18n'
 import { useTableContext } from '../../hooks/useTableContext'
 import { getPopupContainer } from '@/utils'
 
-const MenuItem = Menu.Item
-
 defineOptions({ name: 'SizeSetting' })
 
 const table = useTableContext()
diff --git a/src/components/Table/src/components/settings/index.vue b/src/components/Table/src/components/settings/index.vue
index cbbcf5e5..d3909a53 100644
--- a/src/components/Table/src/components/settings/index.vue
+++ b/src/components/Table/src/components/settings/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="table-settings">
     <RedoSetting v-if="getSetting.redo" :getPopupContainer="getTableContainer" />
+    <FormSetting v-if="getSetting.form" :getPopupContainer="getTableContainer" />
     <SizeSetting v-if="getSetting.size" :getPopupContainer="getTableContainer" />
     <ColumnSetting v-if="getSetting.setting" @columns-change="handleColumnChange" :getPopupContainer="getTableContainer" />
     <FullScreenSetting v-if="getSetting.fullScreen" :getPopupContainer="getTableContainer" />
@@ -10,6 +11,7 @@
 import type { TableSetting, ColumnChangeParam } from '../../types/table'
 import { computed, unref } from 'vue'
 import ColumnSetting from './ColumnSetting.vue'
+import FormSetting from './FormSetting.vue'
 import SizeSetting from './SizeSetting.vue'
 import RedoSetting from './RedoSetting.vue'
 import FullScreenSetting from './FullScreenSetting.vue'
@@ -29,6 +31,7 @@ const table = useTableContext()
 const getSetting = computed((): TableSetting => {
   return {
     redo: true,
+    form: true,
     size: true,
     setting: true,
     fullScreen: false,
diff --git a/src/components/Table/src/hooks/useTableForm.ts b/src/components/Table/src/hooks/useTableForm.ts
index 1af5b499..e5611000 100644
--- a/src/components/Table/src/hooks/useTableForm.ts
+++ b/src/components/Table/src/hooks/useTableForm.ts
@@ -1,6 +1,5 @@
-import type { ComputedRef, Slots } from 'vue'
+import { ComputedRef, Slots, ref, unref, computed } from 'vue'
 import type { BasicTableProps, FetchParams } from '../types/table'
-import { unref, computed } from 'vue'
 import type { FormProps } from '@/components/Form'
 import { isFunction } from '@/utils/is'
 
@@ -10,6 +9,8 @@ export function useTableForm(
   fetch: (opt?: FetchParams | undefined) => Promise<void>,
   getLoading: ComputedRef<boolean | undefined>
 ) {
+  const show = ref(true)
+
   const getFormProps = computed((): Partial<FormProps> => {
     const { formConfig } = unref(propsRef)
     const { submitButtonOptions } = formConfig || {}
@@ -39,10 +40,20 @@ export function useTableForm(
     fetch({ searchInfo: info, page: 1 })
   }
 
+  function getShowForm() {
+    return unref(show)
+  }
+
+  async function setShowForm(flag: boolean) {
+    show.value = flag
+  }
+
   return {
     getFormProps,
     replaceFormSlotKey,
     getFormSlotKeys,
-    handleSearchInfoChange
+    handleSearchInfoChange,
+    getShowForm,
+    setShowForm
   }
 }
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index 6fc30ad1..085cdc29 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -117,6 +117,8 @@ export interface TableActionType {
   getShowPagination: () => boolean
   setCacheColumnsByField?: (dataIndex: string | undefined, value: BasicColumn) => void
   setCacheColumns?: (columns: BasicColumn[]) => void
+  setShowForm: (show: boolean) => Promise<void>
+  getShowForm: () => boolean
 }
 
 export interface FetchSetting {
@@ -132,6 +134,7 @@ export interface FetchSetting {
 
 export interface TableSetting {
   redo?: boolean
+  form?: boolean
   size?: boolean
   setting?: boolean
   fullScreen?: boolean