@vue-ui-kit/ant 2.3.7 → 2.3.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-ui-kit/ant",
-  "version": "2.3.7",
+  "version": "2.3.9",
   "description": "Vue3 UI Kit based on Ant Design",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -76,7 +76,7 @@
     "ts-patch": "^3.2.1",
     "typescript-transform-paths": "^3.5.0",
     "vite": "^5.4.2",
-    "vite-plugin-dts": "^4.1.0",
+    "vite-plugin-dts": "^5.0.0-beta.6",
     "vue": "^3.4.38"
   }
 }

package/src/declarations/antProxy.ts

@@ -3,7 +3,6 @@ import { ButtonProps } from 'ant-design-vue/lib/button';
 import { ColProps } from 'ant-design-vue/lib/grid/Col';
 import { FormProps } from 'ant-design-vue/lib/form/Form';
 import { TableColumnType, TableProps, TooltipProps } from 'ant-design-vue';
-import { ButtonType } from 'ant-design-vue/lib/button/buttonTypes';
 import type { ConfigType, Column as EVirtColumn } from 'e-virt-table';
 import EVirtTable from 'e-virt-table';
 
@@ -157,13 +156,14 @@ export interface ColumnProps<D extends Recordable = Recordable>
   cellRender?: CellRender;
 }
 
-export interface PButtonProps extends ButtonProps {
-  content?: string;
+export interface PButtonProps extends Omit<ButtonProps, 'type'> {
+  content?: string | (() => any);
   icon?: string;
+  type?: string;
 }
 
 export interface ToolbarButtonProps extends PButtonProps {
-  code: string;
+  code?: string;
   dropdowns?: ToolbarButtonProps[];
 }
 export interface ToolbarToolProps extends PButtonProps {

package/src/packages/components/PGrid.vue

@@ -482,6 +482,16 @@
     }
     resetQueryFormData(props.manualFetch);
   });
+  const renderContent = (content: string | (() => any)) => {
+    if (isFunction(content)) {
+      return content();
+    } else {
+      return content;
+    }
+  };
+  const isStringContent = (content: any) => {
+    return isString(content);
+  };
   const passFields = ['align'];
   const passDefaultColumnProps = (columns: ColumnProps<D>[]) =>
     columns.map((c) => ({
@@ -537,8 +547,11 @@
               <a-dropdown v-if="btn.dropdowns && btn.dropdowns.length">
                 <template #overlay>
                   <a-menu @click="toolBtnMenuClick">
-                    <a-menu-item v-for="sub in btn.dropdowns" :key="sub.code"
-                      >{{ sub.content }}
+                    <a-menu-item v-for="sub in btn.dropdowns" :key="sub.code">
+                      <template v-if="sub.content && isStringContent(renderContent(sub.content))">
+                        {{ renderContent(sub.content) }}
+                      </template>
+                      <component v-else-if="sub.content" :is="renderContent(sub.content)" />
                     </a-menu-item>
                   </a-menu>
                 </template>
@@ -553,7 +566,10 @@
                   :block="btn.block"
                 >
                   <Icon v-if="btn.icon" :icon="btn.icon" />
-                  {{ btn.content }}
+                  <template v-if="btn.content && isStringContent(renderContent(btn.content))">
+                    {{ renderContent(btn.content) }}
+                  </template>
+                  <component v-else-if="btn.content" :is="renderContent(btn.content)" />
                   <DownOutlined />
                 </a-button>
               </a-dropdown>
@@ -570,7 +586,10 @@
                 @click="debounceToolBtnClick(btn.code)"
               >
                 <Icon v-if="btn.icon" :icon="btn.icon" />
-                {{ btn.content }}
+                <template v-if="btn.content && isStringContent(renderContent(btn.content))">
+                  {{ renderContent(btn.content) }}
+                </template>
+                <component v-else-if="btn.content" :is="renderContent(btn.content)" />
               </a-button>
               <div v-else></div>
             </template>
@@ -592,7 +611,10 @@
               :loading="loading.toolbar || (!!tool.code && codeLoadings[tool.code])"
             >
               <Icon v-if="tool.icon" :icon="tool.icon" />
-              {{ tool.content }}
+              <template v-if="tool.content && isStringContent(renderContent(tool.content))">
+                {{ renderContent(tool.content) }}
+              </template>
+              <component v-else-if="tool.content" :is="renderContent(tool.content)" />
             </a-button>
           </template>
         </span>

package/src/packages/store/renderStore.tsx

@@ -28,8 +28,9 @@ import TableInput from '@/renders/TableInput.vue';
 import Icon from '@/renders/Icon';
 import { computed, ref, Ref } from 'vue';
 
-interface BtnOptions extends ButtonProps {
+interface BtnOptions extends Omit<ButtonProps, 'type'> {
   content?: string;
+  type?: string;
   getContent?: (p: RenderTableParams) => string;
   dynamicClassName?: (p: RenderTableParams) => string;
   dropdowns?: BtnOptions[];

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

@@ -1,29 +0,0 @@
-interface Props {
-    /** 是否默认折叠 */
-    defaultCollapsed?: boolean;
-    title?: string;
-    /** 是否可以折叠 */
-    collapsible?: boolean;
-}
-declare function __VLS_template(): {
-    attrs: Partial<{}>;
-    slots: any;
-    refs: {};
-    rootEl: any;
-};
-type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<Props, {
-    collapse: () => void;
-    expand: () => void;
-}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<Props> & Readonly<{}>, {
-    title: string;
-    defaultCollapsed: boolean;
-    collapsible: boolean;
-}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
-declare const _default: __VLS_WithTemplateSlots<typeof __VLS_component, __VLS_TemplateResult["slots"]>;
-export default _default;
-type __VLS_WithTemplateSlots<T, S> = T & {
-    new (): {
-        $slots: S;
-    };
-};