@vue-ui-kit/ant 1.9.3 → 1.9.4

package/dist/packages/components/PromisePicker.vue.d.ts

@@ -1,44 +1,11 @@
-import { PropType } from 'vue';
-import { PGridInstance, PGridProps } from '../../declarations/antProxy';
+import { PGridInstance, PromisePickerProps } from '../../declarations/antProxy';
 declare const _default: <D = Recordable<any>, F = Recordable<any>>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_Prettify<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
-    props: __VLS_Prettify<Pick<Partial<{
-        title: string;
-        width: string | number;
-        bodyStyle: Record<string, any>;
-        multipleAllowEmpty: boolean;
-    }> & Omit<{
-        readonly title: string;
-        readonly width: string | number;
-        readonly bodyStyle: Record<string, any>;
-        readonly gridSetting: PGridProps<D, F>;
-        readonly multipleAllowEmpty: boolean;
-    } & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & Readonly<import('vue').ExtractPropTypes<{
-        gridSetting: {
-            type: PropType<PGridProps<D, F>>;
-            required: true;
-        };
-        title: {
-            type: PropType<string>;
-            default: string;
-        };
-        width: {
-            type: PropType<string | number>;
-            default: string;
-        };
-        multipleAllowEmpty: {
-            type: BooleanConstructor;
-            default: boolean;
-        };
-        bodyStyle: {
-            type: ObjectConstructor;
-            default: () => {};
-        };
-    }>> & Readonly<{}>, "title" | "width" | "bodyStyle" | "multipleAllowEmpty">, "gridSetting" | ("title" | "width" | "bodyStyle" | "multipleAllowEmpty")> & {}> & import('vue').PublicProps;
+    props: __VLS_Prettify<Pick<Partial<{}> & Omit<{} & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & Readonly<{}> & Readonly<{}>, never>, never> & PromisePickerProps<D, F>> & import('vue').PublicProps;
     expose(exposed: import('vue').ShallowUnwrapRef<{
-        pick: () => Promise<{
+        pick: () => Promise<D[] | {
             row: D;
             field?: string;
-        } | D[]>;
+        }>;
         pickMultiple: () => Promise<D[] | {
             row: D;
             field?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-ui-kit/ant",
-  "version": "1.9.3",
+  "version": "1.9.4",
   "description": "Vue3 UI Kit based on Ant Design",
   "type": "module",
   "main": "./dist/cjs/index.js",

package/src/declarations/antProxy.ts

@@ -86,6 +86,9 @@ export interface PromisePickerProps<D = Recordable, F = Recordable> {
   gridSetting: PGridProps<D, F>;
   title?: string;
   width?: string | number;
+  multipleAllowEmpty?: boolean;
+  bodyStyle?: Recordable;
+  beforePick?: (rowOrRows: D | Array<D>) => Promise<void>;
 }
 
 export type GroupMenuItemHandler<F = Recordable> = ({

package/src/packages/components/PromisePicker.vue

@@ -1,32 +1,18 @@
 <script lang="ts" setup name="PromisePicker" generic="D = Recordable, F = Recordable">
-  import { PropType, reactive, ref, computed } from 'vue';
-  import { PGridInstance, PGridProps } from '#/antProxy';
+  import { reactive, ref, computed } from 'vue';
+  import { PGridInstance, PromisePickerProps } from '#/antProxy';
   import PGrid from '@/components/PGrid.vue';
   import { $warning } from '@/hooks/useMessage';
   import { Button as AButton, Modal as AModal } from 'ant-design-vue';
 
   const gridEl = ref<PGridInstance<D>>();
-  const props = defineProps({
-    gridSetting: {
-      type: Object as PropType<PGridProps<D, F>>,
-      required: true,
-    },
-    title: {
-      type: String as PropType<string>,
-      default: '数据选择',
-    },
-    width: {
-      type: [String, Number] as PropType<string | number>,
-      default: '70%',
-    },
-    multipleAllowEmpty: {
-      type: Boolean,
-      default: false,
-    },
-    bodyStyle: {
-      type: Object,
-      default: () => ({}),
-    },
+
+  const props = withDefaults(defineProps<PromisePickerProps<D, F>>(), {
+    title: '数据选择',
+    width: '70%',
+    multipleAllowEmpty: false,
+    bodyStyle: () => ({}),
+    beforePick: () => Promise.resolve(),
   });
   const isMultiple = computed(() => props.gridSetting.selectConfig?.multiple);
   let resolvePromise: (
@@ -52,8 +38,10 @@
   const selectRow = ({ row, field }: { row: D; field?: string }) => {
     // 单选才关闭结束选择
     if (resolvePromise && !isMultiple.value) {
-      visible.modal = false;
-      resolvePromise({ row, field });
+      props.beforePick(row).then(() => {
+        visible.modal = false;
+        resolvePromise({ row, field });
+      });
     }
   };
   const endMultiplePicker = () => {
@@ -61,8 +49,10 @@
     if (records.length === 0 && !props.multipleAllowEmpty) {
       $warning('请选择数据');
     } else {
-      visible.modal = false;
-      multipleResolver(records);
+      props.beforePick(records).then(() => {
+        visible.modal = false;
+        multipleResolver(records);
+      });
     }
   };
   defineExpose({
@@ -81,7 +71,7 @@
     grid: gridEl,
     hide: () => {
       visible.modal = false;
-    }
+    },
   });
 </script>
 <template>