@vue-ui-kit/ant 2.0.5 → 2.0.6

package/package.json

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

package/src/declarations/antProxy.ts

@@ -338,7 +338,11 @@ export interface PCanvasGridProps<
   D extends Recordable = Recordable,
   F extends Recordable = Recordable,
 > {
-  selectConfig?: SelectConfig<D>;
+  staticConfig?: {
+    selectable?: boolean;
+    showCount?: boolean;
+    tree?: boolean;
+  };
   manualFetch?: boolean;
   formConfig?: PFormProps<F>;
   columns: CanvasColumnProps<D>[];

package/src/packages/components/PCanvasGrid.vue

@@ -65,7 +65,7 @@
     (event: 'resetQuery'): void;
   }>();
 
-  const { formConfig, pageConfig, columns, toolbarConfig, proxyConfig, config, selectConfig } =
+  const { formConfig, pageConfig, columns, toolbarConfig, proxyConfig, config, staticConfig } =
     toRefs(props);
   const gridDefaults = getGridDefaults();
   const canvasTableDefaults = getCanvasTableDefaults();
@@ -307,19 +307,40 @@
         break;
     }
   };
-  const finalColumns = computed<CanvasColumnProps<D>[]>(() =>
-    selectConfig.value?.multiple
-      ? [
-          {
-            type: 'selection',
+  const finalColumns = computed<CanvasColumnProps<D>[]>(() => {
+    if (!staticConfig.value || (!staticConfig.value.selectable && !staticConfig.value.tree)) {
+      return columns.value;
+    }
+    const firstColumn: CanvasColumnProps<D> =
+      staticConfig.value.selectable && staticConfig.value.tree
+        ? {
+            type: 'tree-selection',
             width: 40,
             widthFillDisable: true,
             title: '',
-          },
-          ...columns.value,
-        ]
-      : columns.value,
-  );
+          }
+        : staticConfig.value.selectable
+          ? {
+              type: 'selection',
+              width: 40,
+              widthFillDisable: true,
+              title: '',
+            }
+          : staticConfig.value.tree
+            ? {
+                type: 'tree',
+                width: 40,
+                widthFillDisable: true,
+                title: '',
+              }
+            : {
+                type: 'index',
+                width: 40,
+                widthFillDisable: true,
+                title: '',
+              };
+    return [firstColumn, ...columns.value];
+  });
   const resetQueryFormData = (lazy?: boolean) => {
     if (formConfig.value && formConfig.value.items.length > 0) {
       if (formConfig.value.customReset) {
@@ -364,7 +385,7 @@
     const formHeight = formOriginHeight.includes('px')
       ? toNumber(formOriginHeight.replace('px', ''))
       : 0;
-    const showCountHeight = selectConfig.value?.showCount ? 22 : 0;
+    const showCountHeight = staticConfig.value?.showCount ? 22 : 0;
     renderHeight.value =
       toNumber(ph.replace('px', '')) -
       propsWithDefaults.value.fitCanvasHeight -
@@ -502,7 +523,7 @@
       </div>
       <div :class="`p-pane flex-1 h-0 p-inner-scroll`">
         <div
-          v-if="selectConfig?.multiple && selectConfig.showCount"
+          v-if="staticConfig?.selectable && staticConfig.showCount"
           class="w-full text-slate-5 pl-4"
         >
           已选：{{ selectedRowKeys.length }}

package/src/packages/components/PFormGroup.vue

@@ -52,7 +52,10 @@
     { content: '复制', code: 'copy' },
     { content: '删除', code: 'delete' },
   ];
-  const getPopupContainer = () => rootRef.value?.$el ?? document.body;
+  const getPopupContainer = (el) =>
+    el?.parentElement?.parentElement?.parentElement?.parentElement?.parentElement?.parentElement ??
+    rootRef.value?.$el ??
+    document.body;
   // 实际是否强制渲染
   const fr = computed(() => {
     return props.forceRender || model.value.length <= 5;