From 7be96dea0bd16cabc0f1b9b0b1274dee70de97f1 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 13 Apr 2023 16:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9setProps=EF=BC=8C=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E8=B5=8B=E5=80=BC=E7=9A=84=E6=97=B6=E5=80=99=E4=BF=9D?=
 =?UTF-8?q?=E7=95=99=E6=97=A7=E5=80=BC=EF=BC=8C=E5=A6=82=E6=9E=9C=E6=9C=89?=
 =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=80=BC=E5=88=99=E8=A6=86=E7=9B=96,?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89option.height=E4=BD=BF=E7=94=A8=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/XTable/src/XTable.vue | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/components/XTable/src/XTable.vue b/src/components/XTable/src/XTable.vue
index fac292d46..1cbe69faf 100644
--- a/src/components/XTable/src/XTable.vue
+++ b/src/components/XTable/src/XTable.vue
@@ -1,11 +1,11 @@
 <template>
-  <VxeGrid v-bind="getProps" ref="xGrid" :class="`${prefixCls}`" class="xtable-scrollbar">
-    <template #[item]="data" v-for="item in Object.keys($slots)" :key="item">
+  <VxeGrid ref="xGrid" :class="`${prefixCls}`" class="xtable-scrollbar" v-bind="getProps">
+    <template v-for="item in Object.keys($slots)" :key="item" #[item]="data">
       <slot :name="item" v-bind="data || {}"></slot>
     </template>
   </VxeGrid>
 </template>
-<script setup lang="ts" name="XTable">
+<script lang="ts" name="XTable" setup>
 import { PropType } from 'vue'
 import { SizeType, VxeGridInstance } from 'vxe-table'
 import { useAppStore } from '@/store/modules/app'
@@ -37,7 +37,6 @@ const removeStyles = () => {
       allsuspects[i].getAttribute(targetattr) != null &&
       allsuspects[i].getAttribute(targetattr)?.indexOf(filename) != -1
     ) {
-      console.log(allsuspects[i], 'node')
       allsuspects[i].parentNode?.removeChild(allsuspects[i])
     }
   }
@@ -90,7 +89,6 @@ const innerProps = ref<Partial<XTableProps>>()
 const getProps = computed(() => {
   const options = innerProps.value || props.options
   options.size = currentSize as any
-  options.height = 700
   getOptionInitConfig(options)
   getColumnsConfig(options)
   getProxyConfig(options)
@@ -254,7 +252,7 @@ const getPageConfig = (options: XTableProps) => {
         background: false, // 带背景颜色
         perfect: false, // 配套的样式
         pageSize: 10, // 每页大小
-        pagerCount: 7, // 显示页码按钮的数量
+        pagerCount: 5, // 显示页码按钮的数量
         autoHidden: false, // 当只有一页时自动隐藏
         pageSizes: [5, 10, 20, 30, 50, 100], // 每页大小选项列表
         layouts: [
@@ -272,7 +270,7 @@ const getPageConfig = (options: XTableProps) => {
   }
 }
 
-// tool bar
+// toolbar
 const getToolBarConfig = (options: XTableProps) => {
   const { toolBar, toolbarConfig, topActionSlots } = options
   if (toolbarConfig) return
@@ -421,7 +419,8 @@ const getCheckboxRecords = () => {
   return g.getCheckboxRecords(false)
 }
 const setProps = (prop: Partial<XTableProps>) => {
-  innerProps.value = { ...unref(innerProps), ...prop }
+  // 重新赋值的时候保留旧值，如果有新的值则覆盖
+  innerProps.value = { ...innerProps.value, ...prop, ...props.options }
 }
 
 defineExpose({ reload, Ref: xGrid, getSearchData, deleteData, exportList })