@vue-ui-kit/ant 2.0.9 → 2.1.1

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

@@ -43,6 +43,7 @@ declare const _default: <T extends Recordable = Recordable, B extends Recordable
         render: import('e-virt-table').Render;
         renderFooter: import('e-virt-table').Render;
         style: any;
+        domDataset: any;
         rules: import('e-virt-table/dist/lib/Validator').Rules | import('e-virt-table/dist/lib/Validator').Rule;
         message: string;
         text: string;
@@ -57,12 +58,28 @@ declare const _default: <T extends Recordable = Recordable, B extends Recordable
         drawTextColor: string;
         drawTextX: number;
         drawTextY: number;
-        drawImageX: number;
-        drawImageY: number;
-        drawImageWidth: number;
-        drawImageHeight: number;
-        drawImageName: string;
-        drawImageSource?: HTMLImageElement;
+        drawTextWidth: number;
+        drawTextHeight: number;
+        drawTreeImageX: number;
+        drawTreeImageY: number;
+        drawTreeImageWidth: number;
+        drawTreeImageHeight: number;
+        drawTreeImageName: string;
+        drawTreeImageSource?: HTMLImageElement;
+        drawSelectionImageX: number;
+        drawSelectionImageY: number;
+        drawSelectionImageWidth: number;
+        drawSelectionImageHeight: number;
+        drawSelectionImageName: string;
+        drawSelectionImageSource?: HTMLImageElement;
+        drawHoverImageX: number;
+        drawHoverImageY: number;
+        drawHoverImageWidth: number;
+        drawHoverImageHeight: number;
+        drawHoverImageName: string;
+        drawHoverImageSource?: HTMLImageElement;
+        autoRowHeight: boolean;
+        calculatedHeight: number;
         ellipsis: boolean;
         rowExpand: boolean;
         rowHasChildren: boolean;
@@ -70,6 +87,7 @@ declare const _default: <T extends Recordable = Recordable, B extends Recordable
         selectorCellValueType: import('e-virt-table').SelectorCellValueType;
         overflowTooltipMaxWidth: number;
         overflowTooltipPlacement: import('e-virt-table').OverflowTooltipPlacement;
+        maxLineClamp: import('e-virt-table').LineClampType;
         ctx: import('e-virt-table/dist/lib/Context').default;
         x: number;
         y: number;
@@ -78,6 +96,7 @@ declare const _default: <T extends Recordable = Recordable, B extends Recordable
     } | {
         cell: Cell | import('e-virt-table/dist/lib/CellHeader').default;
         align: import('e-virt-table').Align;
+        hideHeaderSelection: boolean;
         verticalAlign: import('e-virt-table').VerticalAlign;
         fixed?: import('e-virt-table').Fixed;
         minWidth?: number;
@@ -107,16 +126,31 @@ declare const _default: <T extends Recordable = Recordable, B extends Recordable
         style: Partial<CSSStyleDeclaration>;
         drawX: number;
         drawY: number;
+        sortIconName: string;
+        sortAscIconName: string;
+        sortDescIconName: string;
         visibleWidth: number;
         visibleHeight: number;
+        maxLineClampHeader: import('e-virt-table').LineClampType;
+        domDataset: any;
+        drawTextX: number;
+        drawTextY: number;
+        drawTextWidth: number;
+        drawTextHeight: number;
         drawCellBgColor: string;
         drawTextColor: string;
-        drawImageX: number;
-        drawImageY: number;
-        drawImageWidth: number;
-        drawImageHeight: number;
-        drawImageName: string;
-        drawImageSource: HTMLImageElement | undefined;
+        drawSelectionImageX: number;
+        drawSelectionImageY: number;
+        drawSelectionImageWidth: number;
+        drawSelectionImageHeight: number;
+        drawSelectionImageName: string;
+        drawSelectionImageSource?: HTMLImageElement;
+        drawSortImageX: number;
+        drawSortImageY: number;
+        drawSortImageWidth: number;
+        drawSortImageHeight: number;
+        drawSortImageName: string;
+        drawSortImageSource?: HTMLImageElement;
         ctx: import('e-virt-table/dist/lib/Context').default;
         x: number;
         y: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-ui-kit/ant",
-  "version": "2.0.9",
+  "version": "2.1.1",
   "description": "Vue3 UI Kit based on Ant Design",
   "type": "module",
   "main": "./dist/cjs/index.js",
@@ -46,7 +46,7 @@
     "email": "adoin@qq.com"
   },
   "dependencies": {
-    "e-virt-table": "^1.2.27",
+    "e-virt-table": "^1.2.35",
     "uuid": "^10.0.0",
     "xe-utils": "^3.7.6"
   },

package/src/declarations/antProxy.ts

@@ -168,6 +168,7 @@ export interface ToolbarConfig {
     code: string;
     icon: string;
     type?: ButtonType;
+    content?: string;
     disabled?: boolean;
     size?: 'small' | 'large' | 'middle';
   }>;

package/src/packages/components/CollapseCard.vue

@@ -43,4 +43,4 @@
     </template>
     <slot />
   </a-card>
-</template>
+</template>

package/src/packages/components/PCanvasGrid.vue

@@ -314,7 +314,7 @@
     const firstColumn: CanvasColumnProps<D> =
       staticConfig.value.selectable && staticConfig.value.tree
         ? {
-            type: 'tree-selection',
+            type: 'selection-tree',
             width: 40,
             widthFillDisable: true,
             title: '',
@@ -517,6 +517,7 @@
               :loading="loading.toolbar || (!!tool.code && codeLoadings[tool.code])"
             >
               <Icon :icon="tool.icon" />
+              {{ tool.content }}
             </a-button>
           </template>
         </span>

package/src/packages/components/PCanvasTable.vue

@@ -38,6 +38,7 @@
   const propsWithDefaults = computed(() => ({
     ...props,
     config: {
+      AUTO_ROW_HEIGHT: true,
       DISABLED: true, // 内部写死的默认配置
       ...canvasTableDefaults, // 全局配置
       ...props.config, // 用户传入的配置
@@ -299,6 +300,7 @@
               v-for="cell in view.cells"
               :key="`${cell.rowKey}_${cell.key}`"
               :style="cell.style"
+              v-bind="cell.domDataset"
             >
               <component
                 v-if="typeof cell.render === 'function'"

package/src/packages/components/PGrid.vue

@@ -578,6 +578,7 @@
               :loading="loading.toolbar || (!!tool.code && codeLoadings[tool.code])"
             >
               <Icon :icon="tool.icon" />
+              {{ tool.content }}
             </a-button>
           </template>
         </span>

package/src/packages/store/renderStore.tsx

@@ -26,7 +26,7 @@ import { ButtonProps } from 'ant-design-vue/lib/button';
 import { isBadValue, isGoodValue, valued } from '@/utils/is';
 import TableInput from '@/renders/TableInput.vue';
 import Icon from '@/renders/Icon';
-import { computed, Ref } from 'vue';
+import { computed, ref, Ref } from 'vue';
 
 interface BtnOptions extends ButtonProps {
   content?: string;
@@ -210,12 +210,20 @@ const renderBasic = (name: string) => {
     },
   };
 };
-
-const renderBtn = (btnOpt: BtnOptions, params: RenderTableParams) =>
+type GetPopupContainer = () => HTMLElement;
+const renderBtn = (
+  btnOpt: BtnOptions,
+  params: RenderTableParams,
+  getPopupContainer?: GetPopupContainer,
+) =>
   btnOpt.dropdowns &&
   btnOpt.dropdowns.length > 0 &&
   btnOpt.dropdowns.filter((f) => !f.hiddenIf?.(params)).length > 0 ? (
-    <Dropdown>
+    <Dropdown
+      getPopupContainer={
+        getPopupContainer ?? (() => document.querySelector('.p-wrapper') as HTMLElement)
+      }
+    >
       {{
         default: () => (
           <Button
@@ -236,7 +244,7 @@ const renderBtn = (btnOpt: BtnOptions, params: RenderTableParams) =>
           <div class={`dropdown-wrapper ${btnOpt?.dynamicClassName?.(params) ?? ''}`}>
             {btnOpt
               .dropdowns!.filter((f) => !f.hiddenIf?.(params))
-              .map((b) => renderBtn(b, params))}
+              .map((b) => renderBtn(b, params, getPopupContainer))}
           </div>
         ),
       }}
@@ -456,20 +464,31 @@ const renders: RenderFactory = {
   },
   ButtonTree: {
     renderDefault({ children = [], props = {} as Recordable }, params: RenderTableParams) {
+      const spanRef = ref<HTMLElement | null>(null);
       return (
-        <span class={props.noGap ? 'align-no-gap-box' : 'align-gap-box'}>
+        <span ref={spanRef} class={props.noGap ? 'align-no-gap-box' : 'align-gap-box'}>
           {(children as BtnOptions[])
             .filter((f) => !f.hiddenIf?.(params))
-            .map((item) => renderBtn(item, params)) ?? []}
+            .map((item) =>
+              renderBtn(item, params, () => {
+                return (
+                  spanRef.value?.parentElement?.parentElement?.parentElement?.parentElement ||
+                  document.body
+                );
+              }),
+            ) ?? []}
         </span>
       );
     },
   },
   $radio: {
     renderItemContent(
-      { props = {}, events = {}, options }: RenderOptions,
+      { props = {}, events = {}, options, defaultValue }: RenderOptions,
       { data, field }: RenderFormParams,
     ) {
+      if (isGoodValue(defaultValue) && valued(field) && isBadValue(data[field!])) {
+        data[field!] = defaultValue;
+      }
       return valued(field) ? (
         <RadioGroup
           v-model:value={data[field!]}
@@ -518,9 +537,12 @@ const renders: RenderFactory = {
   },
   $switch: {
     renderItemContent(
-      { props = {}, events = {} }: RenderOptions,
+      { props = {}, events = {}, defaultValue }: RenderOptions,
       { data, field }: RenderFormParams,
     ) {
+      if (isGoodValue(defaultValue) && valued(field) && isBadValue(data[field!])) {
+        data[field!] = defaultValue;
+      }
       return valued(field) ? (
         <Switch
           v-model:checked={data[field!]}
@@ -534,9 +556,12 @@ const renders: RenderFactory = {
   },
   $checkbox: {
     renderItemContent(
-      { props = {}, options, events = {} }: RenderOptions,
+      { props = {}, options, events = {}, defaultValue }: RenderOptions,
       { data, field }: RenderFormParams,
     ) {
+      if (isGoodValue(defaultValue) && valued(field) && isBadValue(data[field!])) {
+        data[field!] = defaultValue;
+      }
       return valued(field) ? (
         <CheckboxGroup
           v-model:value={data[field!]}
@@ -596,11 +621,14 @@ const renders: RenderFactory = {
   },
   PercentInput: {
     renderItemContent(
-      { props = {}, attrs = {} }: RenderOptions,
+      { props = {}, attrs = {}, defaultValue }: RenderOptions,
       { data, field }: RenderFormParams,
     ) {
       const rate = props.parse ? 100 : 1;
       if (valued(field)) {
+        if (isGoodValue(defaultValue) && isBadValue(data[field!])) {
+          data[field!] = defaultValue;
+        }
         const percentage = computed({
           get: () => (data[field!] ?? 0) * rate,
           set: (val) => {