@vue-ui-kit/ant 1.7.2 → 1.7.3

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

@@ -11,7 +11,7 @@ declare const _default: <F = Recordable<any>>(__VLS_props: NonNullable<Awaited<t
         activeKey: import('vue').ComputedRef<number>;
         setActiveKey: (key: number) => void;
         validateAll: () => Promise<any[]>;
-        validate: (index: any) => any;
+        validate: (__index: number) => any;
     }>): void;
     attrs: any;
     slots: ReturnType<() => {

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

@@ -44,6 +44,7 @@ declare const _default: <D = Recordable<any>, F = Recordable<any>>(__VLS_props:
             field?: string;
         }>;
         grid: import('vue').Ref<PGridInstance<D, Recordable<any>> | undefined, PGridInstance<D, Recordable<any>> | undefined>;
+        hide: () => void;
     }>): void;
     attrs: any;
     slots: ReturnType<() => {}>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-ui-kit/ant",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": "Vue3 UI Kit based on Ant Design",
   "type": "module",
   "types": "./dist/index.d.ts",

package/src/declarations/antProxy.ts

@@ -108,8 +108,10 @@ export interface PFormGroupProps<F = Recordable> {
   tabLabel?: string;
   editAble?: boolean;
   showAdd?: boolean;
+  forceRender?: boolean;
   /* 是否保持连续编号 */
   keepSerial?: boolean;
+  loading?: boolean;
   itemMenus?: Array<GroupMenuItem<F>>;
   creatItem?: ({ list }: { list?: Partial<F>[] }) => Promise<Partial<F>>;
   max?: number;
@@ -144,7 +146,7 @@ export interface ToolbarButtonProps extends PButtonProps {
 
 export interface ToolbarConfig {
   buttons?: Array<ToolbarButtonProps>;
-  tools?: Array<{ code: string; icon: string; type?: ButtonType; disabled?: boolean }>;
+  tools?: Array<{ code: string; icon: string; type?: ButtonType; disabled?: boolean; size?: 'small' | 'large' | 'middle' }>;
   disabled?: boolean;
 }
 
@@ -279,7 +281,8 @@ export interface PFormInstance {
 export interface PromisePickerInstance<D = Recordable> {
   pick: () => Promise<{ row: D; field?: string }>;
   pickMultiple: () => Promise<D[]>;
-  grid: PGridInstance<D>
+  grid: PGridInstance<D>;
+  hide: () => void;
 }
 
 export interface PFormBlockInstance {

package/src/packages/components/PFormGroup.vue

@@ -2,6 +2,7 @@
   import { computed, nextTick, PropType, ref, watchEffect } from 'vue';
   import { PFormGroupProps, PFormBlockInstance } from '#/antProxy';
   import { MoreOutlined } from '@ant-design/icons-vue';
+  import { Form } from 'ant-design-vue'
   import { cloneDeep, toString, isFunction, omit, maxBy, debounce } from 'lodash-es';
   import PGroupBlock from '@/components/PGroupBlock.vue';
   import {
@@ -15,7 +16,9 @@
   } from 'ant-design-vue';
   import { valued } from '@/utils/is';
   import { MenuInfo } from 'ant-design-vue/es/menu/src/interface';
-
+  import { $warning } from '@/hooks/useMessage';
+  
+  const useForm = Form.useForm
   const props = defineProps<PFormGroupProps<F>>();
   const model = defineModel({
     type: Array as PropType<Partial<F & { __index: number }>[]>,
@@ -44,6 +47,15 @@
     { content: '复制', code: 'copy' },
     { content: '删除', code: 'delete' },
   ];
+  // 实际是否强制渲染
+  const fr = computed(() => {
+    return props.forceRender || model.value.length <= 5
+  })
+  const handleTabChange = () => {
+    nextTick().then(() => {
+      blockInstance.value[activeKey.value]?.$form?.validate()
+    })
+  }
   watchEffect(() => {
     if (!props.keepSerial) {
       const unSortItems = model.value.filter((f) => !valued(f.__index));
@@ -70,6 +82,10 @@
           });
           break;
         case 'copy':
+          if (model.value.length >= maxLen.value) {
+            $warning('已达到最大数量')
+            return
+          }
           model.value = [
             ...model.value,
             cloneDeep({
@@ -93,18 +109,22 @@
     activeKey: computed(() => activeKey.value),
     setActiveKey,
     validateAll: () => {
-      return Promise.all(
-        blockInstance.value.map((block) => block.$form?.validate() ?? Promise.resolve()),
-      );
+      return Promise.all(blockInstance.value.map((block, idx) =>
+        fr.value ? (block.$form?.validate() ?? Promise.resolve()) : (useForm(model.value[idx], props.getFormSetting(model.value[idx]).rules)?.validate() ?? Promise.resolve()),
+      ))
     },
-    validate: (index) => {
-      return blockInstance.value[index]?.$form?.validate()
+    validate: (__index: number) => {
+      const index = model.value.findIndex(f => f.__index === __index)
+      return fr.value
+        ? (blockInstance.value[index]?.$form?.validate() ?? Promise.resolve())
+        : (useForm(model.value[index], props.getFormSetting(model.value[index]).rules)?.validate() ?? Promise.resolve())
     },
   });
 </script>
 <template>
   <a-card :title="title" size="small">
-    <a-tabs type="editable-card" v-model:activeKey="activeKey" hide-add>
+    <a-spin v-if="loading" class="w-full" />
+    <a-tabs v-else type="editable-card" v-model:activeKey="activeKey" hide-add @change="handleTabChange">
       <template #rightExtra>
         <slot name="rightExtra">
           <a-button
@@ -120,7 +140,7 @@
         v-for="(item, idx) in model"
         :key="idx"
         :tab="`${tabLabel} ${keepSerial ? idx + 1 : (item.__index ?? 0) + 1}`"
-        force-render
+        :force-render="fr"
       >
         <template #closeIcon>
           <a-dropdown v-if="editAble && itemMenus?.length">

package/src/packages/components/PGrid.vue

@@ -592,7 +592,7 @@
               v-for="(tool, idx) in toolbarConfig.tools"
               :key="idx"
               :type="tool.type"
-              :size="btn.size ?? 'middle'"
+              :size="tool.size ?? 'middle'"
               :disabled="toolbarConfig.disabled || tool.disabled"
               @click="debounceToolToolClick(tool.code)"
               :loading="loading.toolbar || (!!tool.code && codeLoadings[tool.code])"
@@ -603,7 +603,7 @@
         </span>
       </div>
       <div :class="`p-pane flex-1 ${enoughSpacing ? 'h-0' : ''} p-${scrollMode ?? 'inner'}-scroll`">
-        <div v-if="selectConfig?.multiple && selectConfig.showCount" class="w-100p text-slate-5 pl-4">
+        <div v-if="selectConfig?.multiple && selectConfig.showCount" class="w-full text-slate-5 pl-4">
           已选：{{ selectedRowKeys.length }}
         </div>
         <a-table

package/src/packages/components/PromisePicker.vue

@@ -78,7 +78,10 @@
         rejectPromise = reject;
         visible.modal = true;
       }),
-  grid: gridEl,
+    grid: gridEl,
+    hide: () => {
+      visible.modal = false;
+    }
   });
 </script>
 <template>

package/src/packages/store/renderStore.tsx

@@ -34,6 +34,7 @@ interface BtnOptions extends ButtonProps {
   dynamicClassName?: (p: RenderTableParams) => string;
   dropdowns?: BtnOptions[];
   clickEvt?: (p: RenderTableParams) => any;
+  hiddenIf?: (p: RenderTableParams) => boolean;
 }
 
 const antDefaultProps = {
@@ -236,8 +237,8 @@ const renders = {
             events.click?.({ data, field })
             if (props.htmlType === 'reset' && defaultHandler?.reset) {
               if (props.beforeClick && isFunction(props.beforeClick)) {
-                props.beforeClick({ data, field }).then(() => {
-                  defaultHandler.reset({ data, field })
+                props.beforeClick({ data, field }).then((res: void | Recordable) => {
+                  defaultHandler.reset(res ? { data: res, field } : { data, field })
                 })
               }
               else {
@@ -268,8 +269,8 @@ const renders = {
             if (props.htmlType === 'reset' && defaultHandler?.reset) {
               if (props.beforeClick && isFunction(props.beforeClick)) {
                 defaultHandler?.setLoadings?.(true)
-                props.beforeClick({ row, field }).then(() => {
-                  defaultHandler.reset({ row, field })
+                props.beforeClick({ row, field }).then((res: void | Recordable) => {
+                  defaultHandler.reset(res ? { row: res, field } : { row, field })
                 }).finally(() => {
                   defaultHandler?.setLoadings?.(false)
                 })
@@ -281,8 +282,8 @@ const renders = {
             if (props.htmlType === 'pick' && defaultHandler?.pick) {
               if (props.beforeClick && isFunction(props.beforeClick)) {
                 defaultHandler?.setLoadings?.(true)
-                props.beforeClick({ row, field }).then(() => {
-                  defaultHandler.pick({ row, field })
+                props.beforeClick({ row, field }).then((res: void | Recordable) => {
+                  defaultHandler.pick(res ? { row: res, field } : { row, field })
                 }).finally(() => {
                   defaultHandler?.setLoadings?.(false)
                 })
@@ -318,8 +319,8 @@ const renders = {
                     m.events?.click?.({ data, field })
                     if (m.props.htmlType === 'reset' && defaultHandler?.reset) {
                       if (props.beforeClick && isFunction(props.beforeClick)) {
-                        props.beforeClick({ data, field }).then(() => {
-                          defaultHandler.reset({ data, field })
+                        props.beforeClick({ data, field }).then((res: void | Recordable) => {
+                          defaultHandler.reset(res ? { data: res, field } : { data, field })
                         })
                       }
                       else {
@@ -328,8 +329,8 @@ const renders = {
                     }
                     if (m.props.htmlType === 'pick' && defaultHandler?.pick) {
                       if (props.beforeClick && isFunction(props.beforeClick)) {
-                        props.beforeClick({ data, field }).then(() => {
-                          defaultHandler.pick({ data, field })
+                        props.beforeClick({ data, field }).then((res: void | Recordable) => {
+                          defaultHandler.pick(res ? { data: res, field } : { data, field })
                         })
                       }
                       else {
@@ -369,8 +370,8 @@ const renders = {
                   if (m.props.htmlType === 'reset' && defaultHandler?.reset) {
                     if (props.beforeClick && isFunction(props.beforeClick)) {
                       defaultHandler?.setLoadings?.(true)
-                      props.beforeClick({ row, field }).then(() => {
-                        defaultHandler.reset({ row, field })
+                      props.beforeClick({ row, field }).then((res: void | Recordable) => {
+                        defaultHandler.reset(res ? { row: res, field } : { row, field })
                       }).finally(() => {
                         defaultHandler?.setLoadings?.(false)
                       })
@@ -382,8 +383,8 @@ const renders = {
                   if (m.props.htmlType === 'pick' && defaultHandler?.pick) {
                     if (props.beforeClick && isFunction(props.beforeClick)) {
                       defaultHandler?.setLoadings?.(true)
-                      props.beforeClick({ row, field }).then(() => {
-                        defaultHandler.pick({ row, field })
+                      props.beforeClick({ row, field }).then((res: void | Recordable) => {
+                        defaultHandler.pick(res ? { row: res, field } : { row, field })
                       }).finally(() => {
                         defaultHandler?.setLoadings?.(false)
                       })