releases 4.7.18

x-extends · Jun 17, 2024 · 6426b47 · 6426b47
1 parent 4f2afa6
commit 6426b47
Show file tree

Hide file tree

Showing 13 changed files with 725 additions and 597 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "4.7.17",
+  "version": "4.7.18",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟树、列拖拽，懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
   "style": "lib/style.css",
   "typings": "types/index.d.ts",
   "dependencies": {
-    "vxe-pc-ui": "^4.0.16"
+    "vxe-pc-ui": "^4.0.18"
   },
   "devDependencies": {
     "@types/resize-observer-browser": "^0.1.11",

diff --git a/packages/colgroup/index.ts b/packages/colgroup/index.ts
@@ -16,5 +16,7 @@ if (VxeUI.dynamicApp) {
   VxeUI.dynamicApp.component('VxeTableColgroup', VxeColgroupComponent)
 }
 
+VxeUI.component(VxeColgroupComponent)
+
 export const Colgroup = VxeColgroup
 export default VxeColgroup
diff --git a/packages/column/index.ts b/packages/column/index.ts
@@ -16,5 +16,7 @@ if (VxeUI.dynamicApp) {
   VxeUI.dynamicApp.component('VxeTableColumn', VxeColumnComponent)
 }
 
+VxeUI.component(VxeColumnComponent)
+
 export const Column = VxeColumn
 export default VxeColumn
diff --git a/packages/grid/index.ts b/packages/grid/index.ts
@@ -12,5 +12,7 @@ if (VxeUI.dynamicApp) {
   VxeUI.dynamicApp.component(VxeGridComponent.name as string, VxeGridComponent)
 }
 
+VxeUI.component(VxeGridComponent)
+
 export const Grid = VxeGrid
 export default VxeGrid
diff --git a/packages/grid/src/grid.ts b/packages/grid/src/grid.ts
@@ -1,4 +1,4 @@
-import { defineComponent, h, PropType, ref, Ref, computed, provide, resolveComponent, reactive, onUnmounted, watch, nextTick, VNode, ComponentPublicInstance, onMounted, createCommentVNode } from 'vue'
+import { defineComponent, h, PropType, ref, Ref, computed, provide, reactive, onUnmounted, watch, nextTick, VNode, ComponentPublicInstance, onMounted, createCommentVNode } from 'vue'
 import XEUtils from 'xe-utils'
 import { getLastZIndex, nextZIndex, isEnableConf } from '../../ui/src/utils'
 import { getOffsetHeight, getPaddingTopBottomSize, getDomNode } from '../../ui/src/dom'
@@ -53,6 +53,10 @@ export default defineComponent({
 
     const xID = XEUtils.uniqueId()
 
+    // 使用已安装的组件，如果未安装则不渲染
+    const VxeUIFormComponent = VxeUI.getComponent<VxeFormComponent>('VxeForm')
+    const VxeUIPagerComponent = VxeUI.getComponent<VxePagerComponent>('VxePager')
+
     const { computeSize } = useFns.useSize(props)
 
     const reactData = reactive({
@@ -427,18 +431,20 @@ export default defineComponent({
                 }
               })
             })
-            slotVNs.push(
-              h(resolveComponent('vxe-form') as VxeFormComponent, {
-                ref: refForm,
-                ...Object.assign({}, formOpts, {
-                  data: proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data
-                }),
-                onSubmit: submitFormEvent,
-                onReset: resetFormEvent,
-                onSubmitInvalid: submitInvalidEvent,
-                onCollapse: collapseEvent
-              }, formSlots)
-            )
+            if (VxeUIFormComponent) {
+              slotVNs.push(
+                h(VxeUIFormComponent, {
+                  ref: refForm,
+                  ...Object.assign({}, formOpts, {
+                    data: proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data
+                  }),
+                  onSubmit: submitFormEvent,
+                  onReset: resetFormEvent,
+                  onSubmitInvalid: submitInvalidEvent,
+                  onCollapse: collapseEvent
+                }, formSlots)
+              )
+            }
           }
         }
         return h('div', {
@@ -604,14 +610,16 @@ export default defineComponent({
               pagerSlots.right = rightSlot
             }
           }
-          slotVNs.push(
-            h(resolveComponent('vxe-pager') as VxePagerComponent, {
-              ref: refPager,
-              ...pagerOpts,
-              ...(proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {}),
-              onPageChange: pageChangeEvent
-            }, pagerSlots)
-          )
+          if (VxeUIPagerComponent) {
+            slotVNs.push(
+              h(VxeUIPagerComponent, {
+                ref: refPager,
+                ...pagerOpts,
+                ...(proxyConfig && isEnableConf(proxyOpts) ? reactData.tablePage : {}),
+                onPageChange: pageChangeEvent
+              }, pagerSlots)
+            )
+          }
         }
         return h('div', {
           ref: refPagerWrapper,

diff --git a/packages/table/index.ts b/packages/table/index.ts
@@ -20,5 +20,7 @@ if (VxeUI.dynamicApp) {
   VxeUI.dynamicApp.component(VxeTableComponent.name as string, VxeTableComponent)
 }
 
+VxeUI.component(VxeTableComponent)
+
 export const Table = VxeTable
 export default VxeTable