@ftjs/antd 0.4.3 → 0.5.0

package/dist/antd-table/type.d.ts

@@ -1,15 +1,12 @@
-import { ValueOf, FtBaseTableProps, FtTableColumn } from '@ftjs/core';
+import { ValueOf, ExtractColumnType, FtBaseTableProps, FtTableColumn } from '@ftjs/core';
 import { TableColumnType, TableProps as AntTableProps } from 'ant-design-vue';
-import { FtAntdFormSearchProps } from '../form/define-form';
+import { FtAntdFormSearchProps } from '../form';
 import { FtAntdFormColumn } from '../form/register';
 import { EditMap } from './column-edit';
-type ExtractType<T> = T extends {
-    type: infer U;
-} ? U : never;
 /**
  * 列定义
  */
-export interface FtAntdTableColumn<T extends Record<string, any>, S extends Record<string, any>> extends FtTableColumn<T, FtAntdFormColumn<S> | ExtractType<FtAntdFormColumn<S>>>, Omit<TableColumnType<T>, "title" | "dataIndex"> {
+export interface FtAntdTableColumn<T extends Record<string, any>, S extends Record<string, any>> extends FtTableColumn<T, FtAntdFormColumn<S> | ExtractColumnType<FtAntdFormColumn<S>>>, Omit<TableColumnType<T>, "title" | "dataIndex"> {
     /**
      * 行内编辑
      */

package/dist/form/form-content-item.vue.d.ts

@@ -0,0 +1,17 @@
+import { FtAntdFormColumn } from './register';
+declare const _default: <F extends Record<string, any>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
+    props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, never> & {
+        column: FtAntdFormColumn<F>;
+        isView?: boolean;
+    } & Partial<{}>> & import('vue').PublicProps;
+    expose(exposed: import('vue').ShallowUnwrapRef<{}>): void;
+    attrs: any;
+    slots: {};
+    emit: {};
+}>) => import('vue').VNode & {
+    __ctx?: Awaited<typeof __VLS_setup>;
+};
+export default _default;
+type __VLS_PrettifyLocal<T> = {
+    [K in keyof T]: T[K];
+} & {};

package/dist/form/ft-antd-form-search.vue.d.ts

@@ -1,4 +1,4 @@
-import { FtAntdFormSearchProps } from './define-form';
+import { FtAntdFormSearchProps } from './index';
 import { FormInstance } from 'ant-design-vue';
 declare const _default: <F extends Record<string, any>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, never> & FtAntdFormSearchProps<F> & Partial<{}>> & import('vue').PublicProps;

package/dist/form/ft-antd-form.vue.d.ts

@@ -1,4 +1,4 @@
-import { FtAntdFormProps } from './define-form';
+import { FtAntdFormProps } from './index';
 import { FormInstance } from 'ant-design-vue';
 declare const _default: <F extends Record<string, any>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, never> & FtAntdFormProps<F> & Partial<{}>> & import('vue').PublicProps;
@@ -9,7 +9,9 @@ declare const _default: <F extends Record<string, any>>(__VLS_props: NonNullable
         setAsDefault: import('@ftjs/core').SetAsDefault<F>;
     }>): void;
     attrs: any;
-    slots: {};
+    slots: {
+        footer?: ((props: {}) => any) | undefined;
+    };
     emit: {};
 }>) => import('vue').VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export * from './form/define-form';
+export * from './form';
 export { registerForm, defineFormItem } from './form/register';
 export type { FtAntdFormColumn, AntdColumnBase, RegisterColumnMap, } from './form/register';
 export * from './vxe-table';

package/dist/index.js

@@ -1,5 +1,5 @@
-import { getField, useFormItem, unrefs, useForm, set, get, cloneDeep, useTable } from "@ftjs/core";
-import { computed, toValue, createVNode, mergeProps, unref, createTextVNode, isVNode, defineComponent, createElementBlock, openBlock, Fragment, renderList, createBlock, resolveDynamicComponent, ref, useId, withCtx, createCommentVNode, createElementVNode, toDisplayString, reactive, watch, h, onMounted, onUnmounted, useTemplateRef, nextTick, normalizeStyle, renderSlot, createSlots, normalizeProps } from "vue";
+import { getField, useFormItem, unrefs, useFormInject, useForm, set, get, cloneDeep, useTable } from "@ftjs/core";
+import { computed, toValue, createVNode, mergeProps, unref, createTextVNode, isVNode, defineComponent, createBlock, openBlock, resolveDynamicComponent, createElementBlock, Fragment, renderList, ref, useId, withCtx, renderSlot, createCommentVNode, createElementVNode, toDisplayString, reactive, watch, h, onMounted, onUnmounted, useTemplateRef, nextTick, normalizeStyle, createSlots, normalizeProps } from "vue";
 import { FormItem, Input, Select, DatePicker, RangePicker, Radio, Textarea, Upload, Cascader, AutoComplete, CheckboxGroup, InputNumber, Mentions, Rate, Slider, Switch, TreeSelect, Form, Button, Modal, Tree, Divider, Table, Spin, Pagination } from "ant-design-vue";
 import dayjs from "dayjs";
 import { SwapOutlined, SettingOutlined } from "@ant-design/icons-vue";
@@ -487,6 +487,37 @@ const formRenderMap = /* @__PURE__ */ new Map([["input", input], ["textarea", te
 function registerForm(type, Component) {
   formRenderMap.set(type, Component);
 }
+const _sfc_main$5 = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "FtAntdFormContentItem",
+    inheritAttrs: false
+  },
+  __name: "form-content-item",
+  props: {
+    column: {},
+    isView: { type: Boolean }
+  },
+  setup(__props) {
+    const props = __props;
+    const { form } = useFormInject();
+    const isView = computed(() => {
+      return toValue(props.column.isView) ?? props.isView;
+    });
+    return (_ctx, _cache) => {
+      return isView.value && _ctx.column.viewRender ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.column.viewRender), {
+        key: 0,
+        formData: unref(form)
+      }, null, 8, ["formData"])) : !isView.value && _ctx.column.editRender ? (openBlock(), createBlock(resolveDynamicComponent(_ctx.column.editRender), {
+        key: 1,
+        formData: unref(form)
+      }, null, 8, ["formData"])) : (openBlock(), createBlock(resolveDynamicComponent(unref(formRenderMap).get(_ctx.column.type)), {
+        key: 2,
+        column: _ctx.column,
+        "is-view": isView.value
+      }, null, 8, ["column", "is-view"]));
+    };
+  }
+});
 const _sfc_main$4 = /* @__PURE__ */ defineComponent({
   ...{
     name: "FtAntdFormContent",
@@ -498,16 +529,12 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     isView: { type: Boolean }
   },
   setup(__props) {
-    const props = __props;
-    const isView = (column) => {
-      return toValue(column.isView) ?? props.isView;
-    };
     return (_ctx, _cache) => {
       return openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columns, (column) => {
-        return openBlock(), createBlock(resolveDynamicComponent(unref(formRenderMap).get(column.type)), {
+        return openBlock(), createBlock(_sfc_main$5, {
           key: unref(getField)(column),
           column,
-          "is-view": isView(column)
+          "is-view": _ctx.isView
         }, null, 8, ["column", "is-view"]);
       }), 128);
     };
@@ -574,7 +601,8 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
             columns: unref(visibleColumns),
             "is-view": _ctx.isView
           }, null, 8, ["columns", "is-view"]),
-          !_ctx.hideFooter ? (openBlock(), createBlock(unref(FormItem), {
+          renderSlot(_ctx.$slots, "footer"),
+          !_ctx.hideFooter && !_ctx.$slots.footer && !_ctx.isView ? (openBlock(), createBlock(unref(FormItem), {
             key: 0,
             label: " ",
             colon: false
@@ -606,7 +634,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
             _: 1
           })) : createCommentVNode("", true)
         ]),
-        _: 1
+        _: 3
       }, 16, ["name", "style"]);
     };
   }
@@ -1543,9 +1571,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         ..._ctx.$attrs,
         ...internalTableProps.value
       }), createSlots({
-        pager: withCtx(() => [_ctx.$slots.pager ? renderSlot(_ctx.$slots, "pager", {
+        pager: withCtx((slotData) => [_ctx.$slots.pager ? renderSlot(_ctx.$slots, "pager", normalizeProps(mergeProps({
           key: 0
-        }) : !_ctx.hidePagination ? (openBlock(), createElementBlock("div", _hoisted_1, [createVNode(unref(Pagination), {
+        }, slotData))) : !_ctx.hidePagination ? (openBlock(), createElementBlock("div", _hoisted_1, [createVNode(unref(Pagination), {
           current: current.value,
           "onUpdate:current": _cache[0] || (_cache[0] = ($event) => current.value = $event),
           pageSize: pageSize.value,
@@ -1560,9 +1588,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             return (_a = _ctx.onSearch) == null ? void 0 : _a.call(_ctx);
           })
         }, null, 8, ["current", "pageSize", "total", "defaultPageSize"])])) : createCommentVNode("", true)]),
-        loading: withCtx(() => [_ctx.$slots.loading ? renderSlot(_ctx.$slots, "loading", {
+        loading: withCtx((slotData) => [_ctx.$slots.loading ? renderSlot(_ctx.$slots, "loading", normalizeProps(mergeProps({
           key: 0
-        }) : (openBlock(), createElementBlock("div", _hoisted_2, [createVNode(unref(Spin))]))]),
+        }, slotData))) : (openBlock(), createElementBlock("div", _hoisted_2, [createVNode(unref(Spin))]))]),
         _: 2
       }, [renderList(_ctx.$slots, (_, name) => {
         return {

package/dist/vxe-table/ft-vxe-table.vue.d.ts

@@ -1,5 +1,5 @@
 import { FtVxeTableProps } from './types';
-import { VxeGridInstance } from 'vxe-table';
+import { VxeGridInstance, VxeGridSlots } from 'vxe-table';
 declare const _default: <T extends Record<string, any>, S extends Record<string, any>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps, never>, never> & FtVxeTableProps<T, S> & Partial<{}>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{
@@ -34,60 +34,7 @@ declare const _default: <T extends Record<string, any>, S extends Record<string,
         refresh: () => Promise<void>;
     }>): void;
     attrs: any;
-    slots: {
-        [x: string]: ((props: {
-            [key: string]: any;
-            $table: import('vxe-table').VxeTableConstructor<any>;
-            $grid: import('vxe-table').VxeGridConstructor<any> | null | undefined;
-            rowid: string;
-            row: any;
-            rowIndex: number;
-            $rowIndex: number;
-            _rowIndex: number;
-            column: import("vxe-table").VxeTableDefines.ColumnInfo<any>;
-            columnIndex: number;
-            $columnIndex: number;
-            _columnIndex: number;
-            type: string;
-            fixed: import("vxe-table").VxeColumnPropTypes.Fixed;
-            checked?: boolean;
-            indeterminate?: boolean;
-            seq: string | number;
-            level: number;
-            isEdit: boolean;
-            isHidden: boolean;
-            visibleData: any[];
-            data: any[];
-            items: any[];
-        }) => any) | undefined;
-        [x: number]: ((props: {
-            [key: string]: any;
-            $table: import('vxe-table').VxeTableConstructor<any>;
-            $grid: import('vxe-table').VxeGridConstructor<any> | null | undefined;
-            rowid: string;
-            row: any;
-            rowIndex: number;
-            $rowIndex: number;
-            _rowIndex: number;
-            column: import("vxe-table").VxeTableDefines.ColumnInfo<any>;
-            columnIndex: number;
-            $columnIndex: number;
-            _columnIndex: number;
-            type: string;
-            fixed: import("vxe-table").VxeColumnPropTypes.Fixed;
-            checked?: boolean;
-            indeterminate?: boolean;
-            seq: string | number;
-            level: number;
-            isEdit: boolean;
-            isHidden: boolean;
-            visibleData: any[];
-            data: any[];
-            items: any[];
-        }) => any) | undefined;
-        pager?: ((props: {}) => any) | undefined;
-        loading?: ((props: {}) => any) | undefined;
-    };
+    slots: VxeGridSlots<any>;
     emit: {};
 }>) => import('vue').VNode & {
     __ctx?: Awaited<typeof __VLS_setup>;

package/dist/vxe-table/types.d.ts

@@ -1,15 +1,12 @@
-import { FtBaseTableProps, FtTableColumn, ValueOf } from '@ftjs/core';
+import { ExtractColumnType, FtBaseTableProps, FtTableColumn, ValueOf } from '@ftjs/core';
 import { VxeGridProps, VxeGridPropTypes } from 'vxe-table';
-import { FtAntdFormSearchProps } from '../form/define-form';
+import { FtAntdFormSearchProps } from '../form';
 import { FtAntdFormColumn } from '../form/register';
 import { EditMap } from '../antd-table/column-edit';
-type ExtractType<T> = T extends {
-    type: infer U;
-} ? U : never;
 /**
  * 列定义
  */
-type VxeTableColumn<T extends Record<string, any>, S extends Record<string, any>> = FtTableColumn<T, FtAntdFormColumn<S> | ExtractType<FtAntdFormColumn<S>>> & Omit<VxeGridPropTypes.Column<T>, "title" | "editRender"> & {
+type VxeTableColumn<T extends Record<string, any>, S extends Record<string, any>> = FtTableColumn<T, FtAntdFormColumn<S> | ExtractColumnType<FtAntdFormColumn<S>>> & Omit<VxeGridPropTypes.Column<T>, "title" | "editRender"> & {
     /**
      * 行内编辑
      */
@@ -46,6 +43,6 @@ export interface FtVxeTableProps<T extends Record<string, any>, S extends Record
     hidePagination?: boolean;
     internalTableProps?: InternalVxeTableProps<T>;
     internalFormProps?: FtAntdFormSearchProps<S>;
-    onSearch: () => Promise<void> | void;
+    onSearch?: () => Promise<void> | void;
 }
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ftjs/antd",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "keywords": [],
   "author": "",
   "license": "MIT",
@@ -30,7 +30,7 @@
     "vite": "^6.1.0",
     "vite-plugin-dts": "^4.5.0",
     "vue-tsc": "2.2.0",
-    "@ftjs/core": "0.4.3"
+    "@ftjs/core": "0.5.0"
   },
   "peerDependencies": {
     "@ant-design/icons-vue": ">=7.0.0",