@vue-ui-kit/ant 2.4.0 → 2.4.2

package/dist/index.d.ts

@@ -8,7 +8,7 @@ import { default as PGroupBlock } from './packages/components/PGroupBlock.vue';
 import { default as PromisePicker } from './packages/components/PromisePicker.vue';
 import { addFormatter } from './packages/utils/AFormatters';
 import { addRender } from './packages/store/renderStore';
-import { setUIKitConfig, getUIKitConfig, resetUIKitConfig, UIKitConfig } from './packages/utils/config';
+import { setUIKitConfig, getUIKitConfig, resetUIKitConfig, getTooltipRenderer, UIKitConfig } from './packages/utils/config';
 declare function setup(config?: Partial<UIKitConfig>): void;
 declare const _default: {
     install(app: App): void;
@@ -19,5 +19,5 @@ declare const _default: {
 export default _default;
 export * from './declarations/antProxy';
 export * from './packages/utils/core';
-export { setup, setUIKitConfig, getUIKitConfig, resetUIKitConfig, type UIKitConfig };
+export { setup, setUIKitConfig, getUIKitConfig, resetUIKitConfig, getTooltipRenderer, type UIKitConfig, };
 export { PForm, PGrid, PCanvasTable, PCanvasGrid, PFormGroup, PGroupBlock, PromisePicker, addFormatter, addRender, };

package/dist/packages/components/RenderAntCell.d.ts

@@ -1,10 +1,28 @@
-declare const _default: import('vue').DefineSetupFnComponent<{
-    cellRender: any;
-    renderTableParams: any;
-    defaultHandler: any;
-}, {}, {}, {
-    cellRender: any;
-    renderTableParams: any;
-    defaultHandler: any;
-} & {}, import('vue').PublicProps>;
+import { CellRender, RenderTableParams } from '../../declarations/antProxy';
+declare const _default: new <D extends Recordable = Recordable<any>>(props: {
+    cellRender: CellRender;
+    renderTableParams: RenderTableParams<D>;
+    defaultHandler: {
+        [key: string]: (...args: any[]) => any;
+    };
+} & {} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps) => import('vue').CreateComponentPublicInstanceWithMixins<{
+    cellRender: CellRender;
+    renderTableParams: RenderTableParams<D>;
+    defaultHandler: {
+        [key: string]: (...args: any[]) => any;
+    };
+} & {}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {}, false, {}, {}, {}, {}, string, {}, any, import('vue').ComponentProvideOptions, {
+    P: {};
+    B: {};
+    D: {};
+    C: {};
+    M: {};
+    Defaults: {};
+}, {
+    cellRender: CellRender;
+    renderTableParams: RenderTableParams<D>;
+    defaultHandler: {
+        [key: string]: (...args: any[]) => any;
+    };
+} & {}, {}, {}, {}, {}, {}>;
 export default _default;

package/dist/packages/components/RenderDefaultSlots.d.ts

@@ -1,14 +1,34 @@
-declare const _default: import('vue').DefineSetupFnComponent<{
-    row: any;
-    column: any;
-    rowIndex: any;
-    defaultHandler: any;
-    tableData: any;
-}, {}, {}, {
-    row: any;
-    column: any;
-    rowIndex: any;
-    defaultHandler: any;
-    tableData: any;
-} & {}, import('vue').PublicProps>;
+import { ColumnProps } from '../../declarations/antProxy';
+declare const _default: new <D extends Recordable = Recordable<any>>(props: {
+    tableData: D[];
+    row: D;
+    column: ColumnProps<D>;
+    rowIndex: number;
+    defaultHandler?: {
+        [key: string]: (...args: any[]) => any;
+    };
+} & {} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps) => import('vue').CreateComponentPublicInstanceWithMixins<{
+    tableData: D[];
+    row: D;
+    column: ColumnProps<D>;
+    rowIndex: number;
+    defaultHandler?: {
+        [key: string]: (...args: any[]) => any;
+    };
+} & {}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {}, false, {}, {}, {}, {}, string, {}, any, import('vue').ComponentProvideOptions, {
+    P: {};
+    B: {};
+    D: {};
+    C: {};
+    M: {};
+    Defaults: {};
+}, {
+    tableData: D[];
+    row: D;
+    column: ColumnProps<D>;
+    rowIndex: number;
+    defaultHandler?: {
+        [key: string]: (...args: any[]) => any;
+    };
+} & {}, {}, {}, {}, {}, {}>;
 export default _default;

package/dist/packages/components/RenderEditCell.d.ts

@@ -1,10 +1,25 @@
-declare const _default: import('vue').DefineSetupFnComponent<{
-    cellRender: any;
-    renderTableParams: any;
-}, "blur"[], {}, {
-    cellRender: any;
-    renderTableParams: any;
+import { CellRender, RenderTableParams } from '../../declarations/antProxy';
+declare const _default: new <D extends Recordable = Recordable<any>>(props: {
+    cellRender: CellRender;
+    renderTableParams: RenderTableParams<D>;
 } & {
     onBlur?: ((...args: any[]) => any) | undefined;
-}, import('vue').PublicProps>;
+} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps) => import('vue').CreateComponentPublicInstanceWithMixins<{
+    cellRender: CellRender;
+    renderTableParams: RenderTableParams<D>;
+} & {
+    onBlur?: ((...args: any[]) => any) | undefined;
+}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, "blur"[], import('vue').PublicProps, {}, false, {}, {}, {}, {}, string, {}, any, import('vue').ComponentProvideOptions, {
+    P: {};
+    B: {};
+    D: {};
+    C: {};
+    M: {};
+    Defaults: {};
+}, {
+    cellRender: CellRender;
+    renderTableParams: RenderTableParams<D>;
+} & {
+    onBlur?: ((...args: any[]) => any) | undefined;
+}, {}, {}, {}, {}, {}>;
 export default _default;

package/dist/packages/components/RenderItemSlots.d.ts

@@ -1,12 +1,25 @@
-declare const _default: import('vue').DefineSetupFnComponent<{
-    item: any;
-    formData: any;
-    passTrigger: any;
-    passDelayTrigger: any;
-}, {}, {}, {
-    item: any;
-    formData: any;
-    passTrigger: any;
-    passDelayTrigger: any;
-} & {}, import('vue').PublicProps>;
+import { PFormItemProps } from '../../declarations/antProxy';
+declare const _default: new <F extends Recordable = Recordable<any>>(props: {
+    formData: F;
+    item: PFormItemProps<F>;
+    passTrigger: (cusFields?: string | string[]) => void;
+    passDelayTrigger: (cusFields?: string | string[], time?: number) => void;
+} & {} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps) => import('vue').CreateComponentPublicInstanceWithMixins<{
+    formData: F;
+    item: PFormItemProps<F>;
+    passTrigger: (cusFields?: string | string[]) => void;
+    passDelayTrigger: (cusFields?: string | string[], time?: number) => void;
+} & {}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {}, false, {}, {}, {}, {}, string, {}, any, import('vue').ComponentProvideOptions, {
+    P: {};
+    B: {};
+    D: {};
+    C: {};
+    M: {};
+    Defaults: {};
+}, {
+    formData: F;
+    item: PFormItemProps<F>;
+    passTrigger: (cusFields?: string | string[]) => void;
+    passDelayTrigger: (cusFields?: string | string[], time?: number) => void;
+} & {}, {}, {}, {}, {}, {}>;
 export default _default;

package/dist/packages/components/RenderTitleSlots.d.ts

@@ -1,6 +1,16 @@
-declare const _default: import('vue').DefineSetupFnComponent<{
-    column: any;
-}, {}, {}, {
-    column: any;
-} & {}, import('vue').PublicProps>;
+import { ColumnProps } from '../../declarations/antProxy';
+declare const _default: new <D extends Recordable = Recordable<any>>(props: {
+    column: ColumnProps<D>;
+} & {} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps) => import('vue').CreateComponentPublicInstanceWithMixins<{
+    column: ColumnProps<D>;
+} & {}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, import('vue').PublicProps, {}, false, {}, {}, {}, {}, string, {}, any, import('vue').ComponentProvideOptions, {
+    P: {};
+    B: {};
+    D: {};
+    C: {};
+    M: {};
+    Defaults: {};
+}, {
+    column: ColumnProps<D>;
+} & {}, {}, {}, {}, {}, {}>;
 export default _default;

package/dist/packages/utils/config.d.ts

@@ -1,5 +1,6 @@
 import { PFormProps, PGridProps } from '../../declarations/antProxy';
 import { ConfigType } from 'e-virt-table';
+import { VNode } from 'vue';
 export interface UIKitConfig {
     form?: {
         labelCol?: any;
@@ -13,8 +14,15 @@ export interface UIKitConfig {
         striped?: boolean;
     };
     canvasTable?: ConfigType;
+    /**
+     * 自定义 tooltip 渲染函数，替换全局所有 a-tooltip。
+     * @param defaultSlot 原 tooltip 触发元素（图标等）
+     * @param content tooltip 内容，字符串或返回 VNode 的函数
+     */
+    renderTooltip?: (defaultSlot: () => VNode, content: string | (() => VNode)) => VNode;
 }
 export declare function setUIKitConfig(config: Partial<UIKitConfig>): void;
+export declare function getTooltipRenderer(): UIKitConfig['renderTooltip'];
 export declare function getUIKitConfig(): UIKitConfig;
 export declare function getFormDefaults(): Partial<PFormProps>;
 export declare function getGridDefaults(): Partial<PGridProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-ui-kit/ant",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Vue3 UI Kit based on Ant Design",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -29,7 +29,7 @@
   "scripts": {
     "dev": "vue-tsc --noEmit --skipLibCheck & vite",
     "build": "ts-patch install && vite build",
-    "prepack": "rimraf dist && yarn build",
+    "prepack": "rimraf dist && pnpm build",
     "prepare": "husky",
     "lint:lint-staged": "lint-staged",
     "lint:prettier": "prettier --write  \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\""

package/src/declarations/antProxy.ts

@@ -75,11 +75,13 @@ export interface PFormItemProps<F extends Recordable = Recordable> {
 }
 
 export interface PFormProps<F extends Recordable = Recordable> extends FormProps {
+  name?: string;
   items: PFormItemProps<F>[];
   customReset?: () => void;
 }
 
 export interface PBlockProps<F extends Recordable = Recordable> {
+  name?: string;
   getFormSetting: (data: Partial<F>) => PFormProps<Partial<F>>;
   source: Partial<F>;
 }
@@ -114,6 +116,7 @@ export interface GroupMenuItem<F extends Recordable = Recordable> {
 }
 
 export interface PFormGroupProps<F extends Recordable = Recordable> {
+  name?: string;
   getFormSetting: (data: Partial<F>) => PFormProps<Partial<F>>;
   title?: string;
   tabLabel?: string;

package/src/index.ts

@@ -8,7 +8,13 @@ import PGroupBlock from '@/components/PGroupBlock.vue';
 import PromisePicker from '@/components/PromisePicker.vue';
 import { addFormatter } from '@/utils/AFormatters';
 import { addRender } from '@/store/renderStore';
-import { setUIKitConfig, getUIKitConfig, resetUIKitConfig, UIKitConfig } from '@/utils/config';
+import {
+  setUIKitConfig,
+  getUIKitConfig,
+  resetUIKitConfig,
+  getTooltipRenderer,
+  UIKitConfig,
+} from '@/utils/config';
 
 // 创建setup方法
 function setup(config?: Partial<UIKitConfig>) {
@@ -37,7 +43,14 @@ export * from '#/antProxy';
 export * from '@/utils/core';
 
 // 导出配置方法
-export { setup, setUIKitConfig, getUIKitConfig, resetUIKitConfig, type UIKitConfig };
+export {
+  setup,
+  setUIKitConfig,
+  getUIKitConfig,
+  resetUIKitConfig,
+  getTooltipRenderer,
+  type UIKitConfig,
+};
 
 // 直接导出组件，使用户可以直接导入使用
 export {

package/src/packages/components/PForm.vue

@@ -75,7 +75,14 @@
     v-if="items.some((s: PFormItemProps<F>) => (s.field && s.itemRender) || s.slots?.default)"
     class="p-pane p-wrapper"
   >
-    <a-form :key="renderFormKey" ref="formEl" :model="formData" v-bind="fc" @submit="handleSubmit">
+    <a-form
+      :name="name"
+      :key="renderFormKey"
+      ref="formEl"
+      :model="formData"
+      v-bind="fc"
+      @submit="handleSubmit"
+    >
       <a-row :gutter="[6, 12]">
         <p-form-col
           v-for="(item, idx) in items"

package/src/packages/components/PFormCol.vue

@@ -4,9 +4,11 @@
   import RenderAntItem from '@/components/RenderAntItem';
   import RenderItemSlots from '@/components/RenderItemSlots';
   import { InfoCircleOutlined } from '@ant-design/icons-vue';
+  import { Tooltip as ATooltip } from 'ant-design-vue';
   import { v4 as uuid_v4 } from 'uuid';
-  import { ref } from 'vue';
+  import { ref, computed, h } from 'vue';
   import { isEqual, debounce, isFunction, omit } from 'xe-utils';
+  import { getTooltipRenderer } from '@/utils/config';
 
   const props = defineProps<{
     item: PFormItemProps<T>;
@@ -36,6 +38,31 @@
     renderFormKey.value = uuid_v4();
   };
   const debounceRefreshCol = debounce(refreshCol, 100);
+
+  // 将 tooltipConfig 统一渲染为函数式组件，支持全局 renderTooltip 替换
+  const tooltipNode = computed<(() => any) | null>(() => {
+    if (!props.item.tooltipConfig) return null;
+    const config = props.item.tooltipConfig;
+    const renderTooltip = getTooltipRenderer();
+    const defaultSlot = () => h(InfoCircleOutlined, { class: 'cursor-pointer py-4 px-2' });
+    const content: string | (() => any) = isFunction(config.title)
+      ? config.title
+      : String(config.title ?? '');
+
+    if (renderTooltip) {
+      return () => renderTooltip(defaultSlot, content);
+    }
+
+    // 默认使用 a-tooltip
+    return () =>
+      isFunction(config.title)
+        ? h(ATooltip, omit(config, ['title']) as any, {
+            default: defaultSlot,
+            title: () => h('div', { innerHTML: config.title!() }),
+          })
+        : h(ATooltip, config as any, { default: defaultSlot });
+  });
+
   watchPreviousDeep(
     () => props.item,
     (cur, old) => {
@@ -96,19 +123,8 @@
         @trigger="handleTrigger"
       />
       <span v-else />
-      <template v-if="item.tooltipConfig" #tooltip>
-        <a-tooltip
-          v-if="isFunction(item.tooltipConfig.title)"
-          v-bind="omit(item.tooltipConfig, ['title'])"
-        >
-          <info-circle-outlined class="cursor-pointer py-4 px-2" />
-          <template #title>
-            <div v-html="item.tooltipConfig.title()" />
-          </template>
-        </a-tooltip>
-        <a-tooltip v-else v-bind="item.tooltipConfig">
-          <info-circle-outlined class="cursor-pointer py-4 px-2" />
-        </a-tooltip>
+      <template v-if="tooltipNode" #tooltip>
+        <component :is="tooltipNode" />
       </template>
     </a-form-item>
   </a-col>

package/src/packages/components/PFormGroup.vue

@@ -310,6 +310,7 @@
           ref="blockInstance"
           :key="idx"
           :source="item"
+          :name="name ? `${name}_${idx}` : undefined"
           :get-form-setting="getFormSetting"
           @focus.capture="debounceHandleBlockFocus(idx)"
           @click.capture="debounceHandleBlockFocus(idx)"

package/src/packages/components/PGrid.vue

@@ -537,6 +537,7 @@
       >
         <a-spin :spinning="loading.form">
           <a-form
+            :name="formConfig?.name"
             :key="renderFormKey"
             ref="formEl"
             :model="queryFormData"

package/src/packages/components/PGroupBlock.vue

@@ -13,5 +13,5 @@
   });
 </script>
 <template>
-  <p-form ref="formEl" v-bind="formSetting" :data="source!" />
+  <p-form :name="name" ref="formEl" v-bind="formSetting" :data="source!" />
 </template>

package/src/packages/utils/config.ts

@@ -1,6 +1,7 @@
 import { PFormProps, PGridProps } from '#/antProxy';
 import { ConfigType } from 'e-virt-table';
 import { clone } from 'xe-utils';
+import type { VNode } from 'vue';
 
 // 全局配置接口
 export interface UIKitConfig {
@@ -16,6 +17,12 @@ export interface UIKitConfig {
     striped?: boolean;
   };
   canvasTable?: ConfigType;
+  /**
+   * 自定义 tooltip 渲染函数，替换全局所有 a-tooltip。
+   * @param defaultSlot 原 tooltip 触发元素（图标等）
+   * @param content tooltip 内容，字符串或返回 VNode 的函数
+   */
+  renderTooltip?: (defaultSlot: () => VNode, content: string | (() => VNode)) => VNode;
 }
 
 // 默认配置
@@ -55,9 +62,15 @@ export function setUIKitConfig(config: Partial<UIKitConfig>): void {
       ...currentConfig.canvasTable,
       ...config.canvasTable,
     },
+    renderTooltip: config.renderTooltip ?? currentConfig.renderTooltip,
   };
 }
 
+// 获取自定义 tooltip 渲染函数
+export function getTooltipRenderer(): UIKitConfig['renderTooltip'] {
+  return currentConfig.renderTooltip;
+}
+
 // 获取配置
 export function getUIKitConfig(): UIKitConfig {
   return currentConfig;