@ftjs/antd 0.2.0 → 0.2.1

package/dist/form/components/upload.d.ts

@@ -1,6 +1,5 @@
-import { Refs } from '@ftjs/core';
+import { CommonSlots, Refs } from '@ftjs/core';
 import { UploadProps } from 'ant-design-vue';
-import { VNodeChild } from 'vue';
 import { AntdColumnBase } from '../register';
 export interface FtFormColumnUpload<T extends Record<string, any>> extends AntdColumnBase<T> {
     /**
@@ -8,12 +7,7 @@ export interface FtFormColumnUpload<T extends Record<string, any>> extends AntdC
      */
     type: "upload";
     props?: Refs<UploadProps>;
-    slots: {
-        default: (ctx: {
-            value: any;
-            isView: boolean;
-        }) => VNodeChild;
-    };
+    slots: CommonSlots<["default"]>;
 }
 declare const _default: import('vue').DefineSetupFnComponent<import('@ftjs/core').CommonFormItemProps<FtFormColumnUpload<any>>, import('vue').EmitsOptions, {}, import('@ftjs/core').CommonFormItemProps<FtFormColumnUpload<any>> & ({
     [x: `on${Capitalize<string>}`]: ((...args: any[]) => any) | undefined;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { computed, toValue, createVNode, mergeProps, unref, createTextVNode, ref, useId, Fragment, watchEffect, onMounted, onUnmounted, nextTick, reactive, watch, h } from "vue";
+import { computed, toValue, createVNode, mergeProps, unref, createTextVNode, isVNode, ref, useId, Fragment, 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, Divider, Table, Spin, Pagination } from "ant-design-vue";
@@ -186,9 +186,13 @@ const textarea = defineFormComponent((props) => {
     });
   };
 });
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
 const upload = defineFormComponent((props) => {
   const {
-    valueComputed
+    valueComputed,
+    slots
   } = useFormItem({
     props
   });
@@ -200,16 +204,22 @@ const upload = defineFormComponent((props) => {
   return () => {
     const _props = unrefs(props.column.props);
     return createVNode(FormItem, formItemProps.value, {
-      default: () => [createVNode(Upload, mergeProps({
+      default: () => [props.isView ? createVNode(Upload, mergeProps({
+        "file-list": valueComputed.value
+      }, _props, {
+        "disabled": true
+      }), {
+        default: () => {
+          var _a;
+          return [!((_a = valueComputed.value) == null ? void 0 : _a.length) && createVNode("div", null, [createTextVNode("-")])];
+        }
+      }) : createVNode(Upload, mergeProps({
         "file-list": valueComputed.value,
         "onUpdate:file-list": ($event) => valueComputed.value = $event
       }, _props, {
         "disabled": disabled.value
-      }), {
-        default: () => [props.isView ? !valueComputed.value || valueComputed.value.length === 0 ? createVNode("div", null, [createTextVNode("-")]) : null : props.column.slots.default({
-          value: valueComputed.value,
-          isView: props.isView
-        })]
+      }), _isSlot(slots) ? slots : {
+        default: () => [slots]
       })]
     });
   };

package/package.json

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