@ftjs/antd 0.1.0 → 0.1.2

package/dist/antd-table/column-edit.d.ts

@@ -10,3 +10,4 @@ export interface EditMap<_TableData extends Record<string, any>> {
     select: Edit<"select", SelectProps>;
 }
 export declare const editMap: Map<keyof EditMap<any>, Component>;
+export declare const registerEdit: (type: keyof EditMap<any>, component: Component) => void;

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

@@ -92,11 +92,6 @@ interface ExtendedProps<TableData extends Record<string, any>, SearchData extend
      * @default 210
      */
     minHeight?: number;
-    /**
-     * 是否隐藏搜索
-     * @default false
-     */
-    hideSearch?: boolean;
     /**
      * 是否隐藏分页
      * @default false

package/dist/index.d.ts

@@ -3,3 +3,4 @@ export { registerForm } from './form/register';
 export type { FormColumn, AntdColumnBase, RegisterColumnMap, } from './form/register';
 export * from './antd-table/define-table';
 export * from './vxe-table/define-vxe-table';
+export * from './antd-table/column-edit';

package/dist/index.js

@@ -1,7 +1,7 @@
 import { computed, toValue, createVNode, mergeProps, unref, isVNode, ref, useId, Fragment, createTextVNode, watchEffect, onMounted, onUnmounted, nextTick, reactive, watch, h } from "vue";
 import { SwapOutlined, SettingOutlined } from "@ant-design/icons-vue";
 import { getField, defineFormComponent, useFormItem, unrefs, defineFtForm, useFormInject, set, defineFtTable, useTableInject, get, cloneDeep } from "@ftjs/core";
-import { FormItem, Input, Select, DatePicker, RangePicker, Radio, Textarea, Upload, Cascader, AutoComplete, CheckboxGroup, InputNumber, Mentions, Rate, Slider, Switch, TreeSelect, Modal, Tree, Button, Form, Table, Spin, Pagination } from "ant-design-vue";
+import { FormItem, Input, Select, DatePicker, RangePicker, Radio, Textarea, Upload, Cascader, AutoComplete, CheckboxGroup, InputNumber, Mentions, Rate, Slider, Switch, TreeSelect, Modal, Tree, Button, Form, Divider, Table, Spin, Pagination } from "ant-design-vue";
 import dayjs from "dayjs";
 import { VxeGrid } from "vxe-table";
 const useFormItemProps = (column) => {
@@ -266,7 +266,8 @@ const inputNumber = defineFormComponent((props) => {
     return createVNode(FormItem, formItemProps.value, {
       default: () => [toValue(isView.value) ? createVNode("div", null, [valueComputed.value]) : createVNode(InputNumber, mergeProps({
         "value": valueComputed.value,
-        "onUpdate:value": ($event) => valueComputed.value = $event
+        "onUpdate:value": ($event) => valueComputed.value = $event,
+        "placeholder": `请输入${formItemProps.value.label}`
       }, _props), null)]
     });
   };
@@ -441,7 +442,7 @@ const FtForm = /* @__PURE__ */ defineFtForm((_, ctx) => {
     "ref": formRef,
     "name": id,
     "style": {
-      width
+      width: width.value
     }
   }, ctx.attrs, formProps.value), {
     default: () => [ctx.slots.formContent(), !hideFooter.value && createVNode(FormItem, {
@@ -685,6 +686,9 @@ const editMap = /* @__PURE__ */ new Map([
   ["input", Input],
   ["select", Select]
 ]);
+const registerEdit = (type, component) => {
+  editMap.set(type, component);
+};
 const FtTable = defineFtTable((_p, ctx) => {
   const {
     formColumns,
@@ -700,7 +704,6 @@ const FtTable = defineFtTable((_p, ctx) => {
     initSearch,
     fitFlexHeight,
     minHeight,
-    hideSearch,
     hidePagination,
     onSearch,
     onChange,
@@ -717,7 +720,7 @@ const FtTable = defineFtTable((_p, ctx) => {
     if (!pagination && !hidePagination.value) {
       pagination = {
         page: 1,
-        pageSize: defaultPageSize.value ?? 20
+        pageSize: defaultPageSize.value
       };
     }
     onSearch(formData, {
@@ -745,7 +748,7 @@ const FtTable = defineFtTable((_p, ctx) => {
       bordered: true,
       pagination: hidePagination.value ? false : {
         total: total.value,
-        defaultPageSize: defaultPageSize.value ?? 20,
+        defaultPageSize: defaultPageSize.value,
         current: currentPage.value,
         onChange: (page, pageSize) => {
           currentPage.value = page;
@@ -779,6 +782,7 @@ const FtTable = defineFtTable((_p, ctx) => {
   };
   let tableStyle;
   const containerRef = ref();
+  const tableRef = ref();
   const calcTableHeight = () => {
     const container = containerRef.value;
     const table = container == null ? void 0 : container.querySelector(".ant-table-wrapper");
@@ -789,7 +793,7 @@ const FtTable = defineFtTable((_p, ctx) => {
     let y = table.clientHeight - // pagination不是立即渲染的，其高度为64
     // 多减去2px，避免出现小数
     64 - 2 - ((header == null ? void 0 : header.clientHeight) ?? 0) - ((footer == null ? void 0 : footer.clientHeight) ?? 0);
-    const minHeightValue = minHeight.value ?? 210;
+    const minHeightValue = minHeight.value;
     if (y < minHeightValue) y = minHeightValue;
     _scrollY.value = y;
   };
@@ -807,6 +811,7 @@ const FtTable = defineFtTable((_p, ctx) => {
     let prevHeight;
     let timer;
     onMounted(() => {
+      var _a;
       resizeObserver = new ResizeObserver((entries) => {
         const height = entries[0].contentRect.height;
         if (prevHeight === height) return;
@@ -818,7 +823,7 @@ const FtTable = defineFtTable((_p, ctx) => {
           calcTableHeight();
         }, 100);
       });
-      resizeObserver.observe(containerRef.value);
+      resizeObserver.observe((_a = tableRef.value) == null ? void 0 : _a.$el);
     });
     onUnmounted(() => {
       resizeObserver.disconnect();
@@ -871,13 +876,17 @@ const FtTable = defineFtTable((_p, ctx) => {
     return createVNode("div", {
       "ref": containerRef,
       "style": containerStyle
-    }, [!hideSearch.value && createVNode(FtFormSearch, mergeProps({
+    }, [formColumns.value.length > 0 && createVNode(Fragment, null, [createVNode(FtFormSearch, mergeProps({
       "exposed": formExposed.value,
       "onUpdate:exposed": ($event) => formExposed.value = $event,
       "cache": cache.value,
       "columns": formColumns.value,
       "onSubmit": () => handleSearch()
-    }, internalFormProps.value), null), (ctx.slots.buttons || ctx.slots.tools) && createVNode("div", null, [(_b = (_a = ctx.slots).buttons) == null ? void 0 : _b.call(_a), (_d = (_c = ctx.slots).tools) == null ? void 0 : _d.call(_c)]), createVNode(Table, mergeProps({
+    }, internalFormProps.value), null), createVNode(Divider, {
+      "dashed": true,
+      "style": "margin: 0"
+    }, null)]), (ctx.slots.buttons || ctx.slots.tools) && createVNode("div", null, [(_b = (_a = ctx.slots).buttons) == null ? void 0 : _b.call(_a), (_d = (_c = ctx.slots).tools) == null ? void 0 : _d.call(_c)]), createVNode(Table, mergeProps({
+      "ref": tableRef,
       "style": tableStyle,
       "columns": columns.value,
       "loading": loading.value,
@@ -896,11 +905,12 @@ const FtTable = defineFtTable((_p, ctx) => {
 }, ["onChange", "onExpand", "onExpandedRowsChange", "onResizeColumn", "onSearch", ["initSearch", {
   type: Boolean,
   default: true
-}], "fitFlexHeight", "minHeight", ["hidePagination", {
-  type: Boolean
-}], "exposed", "onUpdate:exposed", ["hideSearch", {
+}], "fitFlexHeight", ["minHeight", {
+  type: Number,
+  default: 210
+}], ["hidePagination", {
   type: Boolean
-}]]);
+}], "exposed", "onUpdate:exposed"]);
 function useEdit(tableData) {
   const editRowMap = reactive(/* @__PURE__ */ new Map());
   const createBodyCell = (bodyCellDefault) => {
@@ -986,7 +996,6 @@ const FtVxeTable = defineFtTable((_, ctx) => {
     initSearch,
     fitFlexHeight,
     minHeight,
-    hideSearch,
     hidePagination,
     rowConfig: _rowConfig,
     customConfig: _customConfig,
@@ -1005,7 +1014,7 @@ const FtVxeTable = defineFtTable((_, ctx) => {
     if (!pagination && !hidePagination.value) {
       pagination = {
         page: 1,
-        pageSize: defaultPageSize.value ?? 20
+        pageSize: defaultPageSize.value
       };
     }
     await onSearch(formData, {
@@ -1138,13 +1147,16 @@ const FtVxeTable = defineFtTable((_, ctx) => {
   return () => createVNode("div", {
     "ref": containerRef,
     "style": containerStyle
-  }, [!hideSearch.value && createVNode(FtFormSearch, mergeProps({
+  }, [formColumns.value.length > 0 && createVNode(Fragment, null, [createVNode(FtFormSearch, mergeProps({
     "exposed": formExposed.value,
     "onUpdate:exposed": ($event) => formExposed.value = $event,
     "cache": cache.value,
     "columns": formColumns.value,
     "onSubmit": () => handleSearch()
-  }, internalFormProps.value), null), createVNode("div", {
+  }, internalFormProps.value), null), createVNode(Divider, {
+    "dashed": true,
+    "style": "margin: 0"
+  }, null)]), createVNode("div", {
     "style": tableStyle
   }, [createVNode(VxeGrid, mergeProps({
     "ref": (ref2) => tableExposed.value = ref2,
@@ -1172,8 +1184,9 @@ const FtVxeTable = defineFtTable((_, ctx) => {
         "onUpdate:current": ($event) => current.value = $event,
         "showQuickJumper": true,
         "showSizeChanger": true,
+        "showLessItems": true,
         "total": total.value,
-        "defaultPageSize": defaultPageSize.value ?? 20,
+        "defaultPageSize": defaultPageSize.value,
         "showTotal": (total2) => {
           if (total2 === 0) return null;
           return `共 ${total2} 条数据`;
@@ -1198,14 +1211,14 @@ const FtVxeTable = defineFtTable((_, ctx) => {
   default: true
 }], "fitFlexHeight", "minHeight", ["hidePagination", {
   type: Boolean
-}], "exposed", "onUpdate:exposed", ["hideSearch", {
-  type: Boolean
-}], "rowConfig", "treeConfig", "customConfig", "toolbarConfig", "columnConfig"]);
+}], "exposed", "onUpdate:exposed", "rowConfig", "treeConfig", "customConfig", "toolbarConfig", "columnConfig"]);
 export {
   FtForm,
   FtFormSearch,
   FtTable,
   FtVxeTable,
+  editMap,
+  registerEdit,
   registerForm,
   useRules
 };

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

@@ -92,11 +92,6 @@ interface VxeExtendedProps<TableData extends Record<string, any>, SearchData ext
      * vxe-table 列配置
      */
     columnConfig?: VxeGridProps<TableData>["columnConfig"];
-    /**
-     * 是否隐藏搜索
-     * @default false
-     */
-    hideSearch?: boolean;
     /**
      * 是否隐藏分页
      * @default false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ftjs/antd",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "keywords": [],
   "author": "",
   "license": "MIT",
@@ -23,14 +23,14 @@
     "dayjs": "^1.11.13",
     "vue": "^3.5.13",
     "vue-component-type-helpers": "^2.2.0",
-    "vxe-table": "4.11.10",
+    "vxe-table": "4.11.15",
     "@vitejs/plugin-vue": "^5.2.1",
     "@vitejs/plugin-vue-jsx": "^4.1.1",
     "typescript": "^5.7.3",
     "vite": "^6.1.0",
     "vite-plugin-dts": "^4.5.0",
     "vue-tsc": "2.2.0",
-    "@ftjs/core": "0.1.0"
+    "@ftjs/core": "0.1.2"
   },
   "peerDependencies": {
     "@ant-design/icons-vue": ">=7.0.0",