@ftjs/antd 0.2.1 → 0.3.0

package/dist/index.js

@@ -1129,7 +1129,7 @@ const FtVxeTable = defineFtTable((_, ctx) => {
   const {
     formColumns,
     tableColumns,
-    internalTableProps,
+    internalTableProps: _internalTableProps,
     internalFormProps,
     tableData,
     loading,
@@ -1141,11 +1141,6 @@ const FtVxeTable = defineFtTable((_, ctx) => {
     fitFlexHeight,
     minHeight,
     hidePagination,
-    rowConfig: _rowConfig,
-    customConfig: _customConfig,
-    toolbarConfig: _toolbarConfig,
-    columnConfig: _columnConfig,
-    treeConfig,
     onSearch,
     "onUpdate:exposed": onUpdateExposed
   } = useTableInject();
@@ -1170,12 +1165,6 @@ const FtVxeTable = defineFtTable((_, ctx) => {
       handleSearch();
     }
   });
-  const rowConfig = computed(() => {
-    return {
-      keyField: keyField.value,
-      ..._rowConfig.value
-    };
-  });
   const enableEdit = computed(() => {
     return tableColumns.value.some((column) => {
       var _a;
@@ -1250,34 +1239,42 @@ const FtVxeTable = defineFtTable((_, ctx) => {
       };
     });
   });
-  const customConfig = computed(() => {
-    return {
-      storage: true,
-      enabled: cache.value != null,
-      ..._customConfig.value
-    };
-  });
-  const toolbarConfig = computed(() => {
-    return {
-      custom: true,
-      zoom: true,
-      ..._toolbarConfig.value
-    };
-  });
-  const editConfig = computed(() => {
-    if (!enableEdit.value) return void 0;
-    return {
-      mode: "row",
-      showStatus: true,
-      trigger: "manual",
-      autoClear: false,
-      autoPos: true
-    };
-  });
-  const columnConfig = computed(() => {
+  const internalTableProps = computed(() => {
+    const {
+      columnConfig,
+      editConfig,
+      toolbarConfig,
+      customConfig,
+      rowConfig
+    } = _internalTableProps.value ?? {};
     return {
-      resizable: true,
-      ..._columnConfig.value
+      ..._internalTableProps.value,
+      columnConfig: {
+        resizable: true,
+        ...columnConfig
+      },
+      editConfig: enableEdit.value ? {
+        mode: "row",
+        showStatus: true,
+        trigger: "manual",
+        autoClear: false,
+        autoPos: true,
+        ...editConfig
+      } : void 0,
+      toolbarConfig: {
+        custom: true,
+        zoom: true,
+        ...toolbarConfig
+      },
+      customConfig: {
+        storage: true,
+        enabled: cache.value != null,
+        ...customConfig
+      },
+      rowConfig: {
+        keyField: keyField.value,
+        ...rowConfig
+      }
     };
   });
   let containerStyle = {
@@ -1335,14 +1332,8 @@ const FtVxeTable = defineFtTable((_, ctx) => {
     "loading": loading.value,
     "data": tableData.value,
     "minHeight": minHeight.value ?? 310,
-    "rowConfig": rowConfig.value,
-    "treeConfig": treeConfig.value,
     "id": cache.value,
-    "toolbarConfig": toolbarConfig.value,
-    "customConfig": customConfig.value,
-    "columnConfig": columnConfig.value,
-    "keepSource": enableEdit.value,
-    "editConfig": editConfig.value
+    "keepSource": enableEdit.value
   }, internalTableProps.value), {
     pager() {
       return hidePagination.value ? null : createVNode("div", {
@@ -1379,7 +1370,7 @@ const FtVxeTable = defineFtTable((_, ctx) => {
   default: true
 }], "fitFlexHeight", "minHeight", ["hidePagination", {
   type: Boolean
-}], "exposed", "onUpdate:exposed", "rowConfig", "treeConfig", "customConfig", "toolbarConfig", "columnConfig"]);
+}], "exposed", "onUpdate:exposed"]);
 export {
   FtForm,
   FtFormSearch,

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

@@ -46,7 +46,7 @@ type VxeTableColumn<TableData extends Record<string, any>> = FtTableColumn<Table
 /**
  * 内部表格 props
  */
-interface InternalVxeTableProps<TableData extends Record<string, any>> extends Omit<VxeGridProps<TableData>, "columns" | "minHeight" | "treeConfig" | "rowConfig" | "customConfig" | "toolbarConfig" | "columnConfig"> {
+interface InternalVxeTableProps<TableData extends Record<string, any>> extends Omit<VxeGridProps<TableData>, "columns" | "minHeight"> {
 }
 /**
  * 表格插槽
@@ -72,26 +72,6 @@ interface VxeExtendedProps<TableData extends Record<string, any>, SearchData ext
      * @default 310
      */
     minHeight?: number;
-    /**
-     * vxe-table 树形配置
-     */
-    treeConfig?: VxeGridProps<TableData>["treeConfig"];
-    /**
-     * vxe-table 行配置
-     */
-    rowConfig?: VxeGridProps<TableData>["rowConfig"];
-    /**
-     * vxe-table 自定义配置
-     */
-    customConfig?: VxeGridProps<TableData>["customConfig"];
-    /**
-     * vxe-table 工具栏配置
-     */
-    toolbarConfig?: VxeGridProps<TableData>["toolbarConfig"];
-    /**
-     * vxe-table 列配置
-     */
-    columnConfig?: VxeGridProps<TableData>["columnConfig"];
     /**
      * 是否隐藏分页
      * @default false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ftjs/antd",
-  "version": "0.2.1",
+  "version": "0.3.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.2.1"
+    "@ftjs/core": "0.3.0"
   },
   "peerDependencies": {
     "@ant-design/icons-vue": ">=7.0.0",