@qin-ui/element-plus-pro 1.2.2 → 1.2.4

package/es/index.js

@@ -1,7 +1,7 @@
 import "./element-plus-pro.css";
-import { inject, computed, provide, toValue, defineComponent, renderSlot, mergeProps, normalizeProps, guardReactiveProps, resolveComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode, createSlots, ref, useAttrs, createCommentVNode, resolveDynamicComponent, isVNode, createTextVNode, toDisplayString, useSlots, watchEffect, withModifiers, createElementVNode, watch, withKeys, normalizeStyle, useModel, onMounted, mergeModels, resolveDirective, normalizeClass, withDirectives, nextTick } from "vue";
-import { ElFormItem, ElCol, ElTable, ElPagination, useFormDisabled, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, ElRow, useLocale as useLocale$1, ElForm, ElSpace, ElButton, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn } from "element-plus";
-import { InjectionPathKey, isPlainObject, getObject, toPath, useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, omit, cloneDeep, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, get, pick, useTable as useTable$1 } from "@qin-ui/pro-components-core";
+import { inject, computed, provide, toValue, mergeProps, defineComponent, resolveComponent, createBlock, openBlock, unref, withCtx, createElementBlock, Fragment, renderList, createVNode, createSlots, ref, useAttrs, createCommentVNode, resolveDynamicComponent, renderSlot, normalizeProps, isVNode, createTextVNode, toDisplayString, useSlots, reactive, withModifiers, createElementVNode, onBeforeUnmount, watch, watchEffect, withKeys, normalizeStyle, nextTick, useModel, onMounted, mergeModels, resolveDirective, normalizeClass, withDirectives, guardReactiveProps } from "vue";
+import { ElTable, ElPagination, useFormDisabled, ElCol, ElFormItem, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, ElRow, useLocale as useLocale$1, ElForm, ElSpace, ElButton, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn } from "element-plus";
+import { isPlainObject, getObject, toPath, useForm as useForm$1, zhCN as zhCN$1, zhTW as zhTW$1, enUS as enUS$1, resolveLocaleName, format, omit, InjectionFormSlotsKey, cloneDeep, InjectionFormKey, camelizeProperties, useFields as useFields$1, useFormRef as useFormRef$1, get, pick, useTable as useTable$1 } from "@qin-ui/pro-components-core";
 import { useFormData } from "@qin-ui/pro-components-core";
 const tableProps = () => ElTable.props || {};
 const paginationProps = () => ElPagination.props || {};
@@ -205,41 +205,19 @@ const componentMap = {
   "tree-select": ElTreeSelect,
   "transfer": ElTransfer
 };
-const TeleportComponentNamePrefix = "TeleportComponent_";
-const _sfc_main$h = /* @__PURE__ */ defineComponent({
-  __name: "index",
-  props: {
-    path: {}
-  },
-  setup(__props) {
-    const props = __props;
-    const namePath = computed(() => {
-      return Array.isArray(props.path) ? props.path.join(".") : props.path;
-    });
-    provide(InjectionPathKey, namePath);
-    return (_ctx, _cache) => {
-      return renderSlot(_ctx.$slots, "default", { path: namePath.value });
-    };
-  }
-});
-const _sfc_main$g = /* @__PURE__ */ defineComponent({
-  __name: "index",
-  props: {
-    field: {}
-  },
-  setup(__props) {
-    const formItemPropKeys = Object.keys(formItemProps());
-    const gridItemPropKeys = Object.keys(gridItemProps());
-    const props = __props;
-    const config = INJECT_CONFIG["pro-form-item"];
-    const injectFormItemProps = inject(config.injectionKey, config.default);
-    const groupedAttributes = computed(() => {
+const formItemPropKeys = Object.keys(formItemProps());
+const gridItemPropKeys = Object.keys(gridItemProps());
+function useGroupFieldAttrs(validFields) {
+  const config = INJECT_CONFIG["pro-form-item"];
+  const injectFormItemProps = inject(config.injectionKey, config.default);
+  return computed(() => {
+    return validFields.value.map((field) => {
       let gridItemProps2 = {};
       let formItemProps2 = {};
       const componentProps = { slots: {} };
       const formItemSlots = {};
-      if (isPlainObject(props.field)) {
-        const { path, name, fields, formItemClass, formItemStyle, formItemContainer, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, formItemDataAttrs = {}, componentDataAttrs = {}, extraProps, ...rest } = props.field;
+      if (isPlainObject(field)) {
+        const { path, name, fields, formItemClass, formItemStyle, formItemContainer, hidden, span, getFormItemRef, getComponentRef, getFormItemComputedProps, getComponentComputedProps, slots = {}, formItemDataAttrs = {}, componentDataAttrs = {}, extraProps, ...rest } = field;
         const {
           class: injectClassName,
           style: injectStyle,
@@ -260,7 +238,7 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
           { class: toValue(formItemClass), style: toValue(formItemStyle) },
           formItemDataAttrs
         );
-        formItemProps2.container = formItemContainer ?? injectFormItemContainer;
+        const container = formItemContainer ?? injectFormItemContainer;
         Object.keys(rest).forEach((k) => {
           if (gridItemPropKeys.includes(k)) {
             gridItemProps2[k] = rest[k];
@@ -275,17 +253,32 @@ const _sfc_main$g = /* @__PURE__ */ defineComponent({
           if (FORM_ITEM_SLOT_KEYS.includes(k)) {
             formItemSlots[k] = slots[k];
           } else {
-            componentProps["slots"][k] = slots[k];
+            componentProps.slots[k] = slots[k];
           }
         });
+        const raw2 = toValue(path) ?? toValue(name);
+        return {
+          path: Array.isArray(raw2) ? raw2.join(".") : raw2 || "",
+          gridItemProps: gridItemProps2,
+          formItemProps: formItemProps2,
+          formItemSlots,
+          componentProps,
+          container,
+          rawField: field
+        };
       }
-      return { gridItemProps: gridItemProps2, formItemProps: formItemProps2, componentProps, formItemSlots };
+      const raw = toValue(field == null ? void 0 : field.path) ?? toValue(field == null ? void 0 : field.name);
+      return {
+        path: Array.isArray(raw) ? raw.join(".") : raw || "",
+        gridItemProps: gridItemProps2,
+        formItemProps: formItemProps2,
+        formItemSlots,
+        componentProps,
+        rawField: field
+      };
     });
-    return (_ctx, _cache) => {
-      return renderSlot(_ctx.$slots, "default", normalizeProps(guardReactiveProps(groupedAttributes.value)));
-    };
-  }
-});
+  });
+}
 const _sfc_main$f = /* @__PURE__ */ defineComponent({
   ...{ name: "BaseFormItem", inheritAttrs: false },
   __name: "index",
@@ -331,81 +324,66 @@ const _sfc_main$f = /* @__PURE__ */ defineComponent({
         }
       });
     };
+    const groupedFields = useGroupFieldAttrs(validFields);
     return (_ctx, _cache) => {
       const _component_BaseFormItem = resolveComponent("BaseFormItem");
       return openBlock(), createBlock(unref(_sfc_main$d), mergeProps({
         component: enableGrid.value ? unref(ElRow) : void 0
       }, computedGridProps.value, { style: { "width": "100%" } }), {
         default: withCtx(() => [
-          (openBlock(true), createElementBlock(Fragment, null, renderList(validFields.value, ({ path: _path, ...field }, index2) => {
-            return openBlock(), createBlock(_sfc_main$h, mergeProps({
-              key: unref(toPath)(toValue(_path ?? index2)).join(".") || index2
-            }, { ref_for: true }, { path: _path }), {
-              default: withCtx(({ path }) => [
-                createVNode(_sfc_main$g, { field }, {
-                  default: withCtx(({
-                    gridItemProps: gridItemProps2,
-                    formItemProps: { container, ...formItemProps2 },
-                    componentProps,
-                    formItemSlots
-                  }) => [
-                    createVNode(unref(_sfc_main$d), mergeProps({
-                      component: enableGrid.value ? unref(ElCol) : void 0
-                    }, { ref_for: true }, gridItemProps2), {
+          (openBlock(true), createElementBlock(Fragment, null, renderList(unref(groupedFields), (item, index2) => {
+            return openBlock(), createBlock(unref(_sfc_main$d), mergeProps({
+              key: item.path || index2,
+              component: enableGrid.value ? unref(ElCol) : void 0
+            }, { ref_for: true }, item.gridItemProps), {
+              default: withCtx(() => [
+                createVNode(unref(_sfc_main$d), {
+                  component: item.container,
+                  path: item.path
+                }, {
+                  default: withCtx(() => [
+                    createVNode(unref(ElFormItem), mergeProps({ ref_for: true }, item.formItemProps, {
+                      ref_for: true,
+                      ref: (el) => formItemRefs[index2] = el,
+                      prop: unref(toPath)(item.path).join("."),
+                      path: item.path,
+                      onVnodeMounted: ($event) => onFormItemMounted(index2, item.formItemProps)
+                    }), createSlots({
                       default: withCtx(() => [
-                        createVNode(unref(_sfc_main$d), {
-                          component: container,
-                          path
-                        }, {
-                          default: withCtx(() => [
-                            createVNode(unref(ElFormItem), mergeProps({ ref_for: true }, formItemProps2, {
-                              ref_for: true,
-                              ref: (el) => formItemRefs[index2] = el,
-                              prop: unref(toPath)(path).join("."),
-                              path,
-                              onVnodeMounted: ($event) => onFormItemMounted(index2, formItemProps2)
-                            }), createSlots({
-                              default: withCtx(() => [
-                                field.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
-                                  key: 0,
-                                  grid: field.grid ?? __props.grid,
-                                  fields: field.fields,
-                                  disabled: toValue(field.disabled)
-                                }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(unref(_sfc_main$e), mergeProps({
-                                  key: 1,
-                                  ref_for: true,
-                                  ref: (el) => componentRefs[index2] = el
-                                }, { ref_for: true }, componentProps, {
-                                  path,
-                                  onVnodeMounted: ($event) => onComponentMounted(index2)
-                                }), null, 16, ["path", "onVnodeMounted"]))
-                              ]),
-                              _: 2
-                            }, [
-                              renderList(formItemSlots, (slot, name) => {
-                                return {
-                                  name,
-                                  fn: withCtx((scoped) => [
-                                    createVNode(unref(_sfc_main$c), mergeProps({
-                                      path,
-                                      component: slot
-                                    }, { ref_for: true }, scoped), null, 16, ["path", "component"])
-                                  ])
-                                };
-                              })
-                            ]), 1040, ["prop", "path", "onVnodeMounted"])
-                          ]),
-                          _: 2
-                        }, 1032, ["component", "path"])
+                        item.rawField.fields ? (openBlock(), createBlock(_component_BaseFormItem, {
+                          key: 0,
+                          grid: item.rawField.grid ?? __props.grid,
+                          fields: item.rawField.fields,
+                          disabled: toValue(item.rawField.disabled)
+                        }, null, 8, ["grid", "fields", "disabled"])) : (openBlock(), createBlock(unref(_sfc_main$e), mergeProps({
+                          key: 1,
+                          ref_for: true,
+                          ref: (el) => componentRefs[index2] = el
+                        }, { ref_for: true }, item.componentProps, {
+                          path: item.path,
+                          onVnodeMounted: ($event) => onComponentMounted(index2)
+                        }), null, 16, ["path", "onVnodeMounted"]))
                       ]),
                       _: 2
-                    }, 1040, ["component"])
+                    }, [
+                      renderList(item.formItemSlots, (slot, name) => {
+                        return {
+                          name,
+                          fn: withCtx((scoped) => [
+                            createVNode(unref(_sfc_main$c), mergeProps({
+                              path: item.path,
+                              component: slot
+                            }, { ref_for: true }, scoped), null, 16, ["path", "component"])
+                          ])
+                        };
+                      })
+                    ]), 1040, ["prop", "path", "onVnodeMounted"])
                   ]),
                   _: 2
-                }, 1032, ["field"])
+                }, 1032, ["component", "path"])
               ]),
               _: 2
-            }, 1040);
+            }, 1040, ["component"]);
           }), 128))
         ]),
         _: 1
@@ -420,7 +398,7 @@ const _export_sfc = (sfc, props) => {
   }
   return target;
 };
-const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-d52742ce"]]);
+const BaseFormItem = /* @__PURE__ */ _export_sfc(_sfc_main$f, [["__scopeId", "data-v-295cd434"]]);
 function useForm(...args) {
   return useForm$1(...args);
 }
@@ -600,13 +578,11 @@ const _sfc_main$e = /* @__PURE__ */ defineComponent({
         valueFormatter
       };
     });
-    const teleportComponent = inject(
-      `${TeleportComponentNamePrefix}${__props.path}`,
-      void 0
-    );
+    const formSlots = inject(InjectionFormSlotsKey, void 0);
     const customComponents = inject(INJECT_COMPONENTS, {});
     const is = computed(() => {
-      if (teleportComponent) return teleportComponent;
+      const teleportSlot = __props.path && (formSlots == null ? void 0 : formSlots[__props.path]);
+      if (teleportSlot) return teleportSlot;
       if (typeof __props.component === "string") {
         return customComponents[__props.component] || componentMap[__props.component] || __props.component;
       }
@@ -693,12 +669,7 @@ const _sfc_main$b = /* @__PURE__ */ defineComponent({
       config.default
     );
     const slots = useSlots();
-    watchEffect(() => {
-      Object.keys(slots).forEach((name) => {
-        if (name === "default") return;
-        provide(`${TeleportComponentNamePrefix}${name}`, slots[name]);
-      });
-    });
+    provide(InjectionFormSlotsKey, reactive(slots));
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElForm), mergeProps({
         ref: (el) => {
@@ -766,7 +737,22 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const proFormHeight = ref("unset");
     const collapseHeight = ref(0);
-    let rowHeight = 32;
+    const rowHeight = ref(32);
+    let resizeObserver = null;
+    let intersectionObserver = null;
+    const cleanupObservers = () => {
+      if (resizeObserver) {
+        resizeObserver.disconnect();
+        resizeObserver = null;
+      }
+      if (intersectionObserver) {
+        intersectionObserver.disconnect();
+        intersectionObserver = null;
+      }
+    };
+    onBeforeUnmount(() => {
+      cleanupObservers();
+    });
     const computedExpand = computed(() => {
       if (!__props.expand) return false;
       if (__props.expand === true) return { minExpandRows: 2, expandStatus: false };
@@ -777,33 +763,57 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     });
     const showExpandToggle = ref(false);
     const expandStatus = ref(true);
+    const { formRef, getFormData } = __props.form;
+    const updateHeights = () => {
+      var _a, _b, _c, _d, _e, _f;
+      if (!__props.expand || !formRef.value) return;
+      const proFormEl = (_a = formRef.value) == null ? void 0 : _a.$el;
+      if (!proFormEl) return;
+      const itemHeight = (_d = (_c = (_b = proFormEl == null ? void 0 : proFormEl.querySelector("[class*='-form-item']")) == null ? void 0 : _b.getBoundingClientRect) == null ? void 0 : _c.call(_b)) == null ? void 0 : _d.height;
+      if (itemHeight && itemHeight > 0) {
+        rowHeight.value = itemHeight;
+      }
+      const naturalHeight = proFormEl.scrollHeight || ((_f = (_e = proFormEl.getBoundingClientRect) == null ? void 0 : _e.call(proFormEl)) == null ? void 0 : _f.height) || 0;
+      if (naturalHeight > 0) {
+        proFormHeight.value = naturalHeight;
+      }
+    };
     const changeExpandStatus = () => {
       expandStatus.value = !expandStatus.value;
+      nextTick(() => {
+        updateHeights();
+      });
     };
-    const { formRef, getFormData } = __props.form;
+    const hasFieldValue = (val) => val !== null && val !== void 0 && val !== "" && !(Array.isArray(val) && val.length === 0) && !(typeof val === "object" && Object.keys(val).length === 0);
     const setInitExpandStatus = () => {
+      var _a;
       expandStatus.value = false;
       if (formRef.value && __props.expand) {
         const formEl = formRef.value.$el;
-        const formItemsEl = formEl.querySelectorAll(
+        const formItemsEl = (_a = formEl == null ? void 0 : formEl.querySelectorAll) == null ? void 0 : _a.call(
+          formEl,
           "[class*='-form-item'] > [path]"
         );
-        const observer = new IntersectionObserver(
+        if (!formItemsEl || formItemsEl.length === 0) return;
+        if (intersectionObserver) {
+          intersectionObserver.disconnect();
+        }
+        intersectionObserver = new IntersectionObserver(
           (entries) => {
             expandStatus.value = entries.some((e) => {
               if (e.intersectionRatio === 0) {
                 const path = e.target.getAttribute("path");
                 const searchFieldValue = path ? getFormData == null ? void 0 : getFormData(path) : void 0;
-                return ![null, void 0].includes(searchFieldValue);
+                return hasFieldValue(searchFieldValue);
               }
               return __props.expand.expandStatus;
             });
-            observer.disconnect();
+            intersectionObserver == null ? void 0 : intersectionObserver.disconnect();
           },
           { root: formEl }
         );
         formItemsEl.forEach((element) => {
-          observer.observe(element);
+          intersectionObserver == null ? void 0 : intersectionObserver.observe(element);
         });
       }
     };
@@ -817,22 +827,34 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
         () => __props.expand
       ],
       () => {
-        var _a, _b, _c, _d, _e;
-        if (!__props.expand || !expandStatus.value || !formRef.value) return;
-        const proFormEl = (_a = formRef.value) == null ? void 0 : _a.$el;
-        const { height = 0 } = ((_b = proFormEl == null ? void 0 : proFormEl.getBoundingClientRect) == null ? void 0 : _b.call(proFormEl)) || {};
-        proFormHeight.value = height;
-        rowHeight = (_e = (_d = (_c = proFormEl == null ? void 0 : proFormEl.querySelector("[class*='-form-item']")) == null ? void 0 : _c.getBoundingClientRect) == null ? void 0 : _d.call(_c)) == null ? void 0 : _e.height;
+        updateHeights();
       },
       { flush: "post", immediate: true }
     );
+    watch(
+      () => formRef.value,
+      (val) => {
+        if (resizeObserver) {
+          resizeObserver.disconnect();
+          resizeObserver = null;
+        }
+        const formEl = val == null ? void 0 : val.$el;
+        if (formEl && typeof ResizeObserver !== "undefined") {
+          resizeObserver = new ResizeObserver(() => {
+            updateHeights();
+          });
+          resizeObserver.observe(formEl);
+        }
+      },
+      { immediate: true }
+    );
     watchEffect(
       () => {
         if (typeof proFormHeight.value !== "number") return;
         if (__props.layout === "grid" && computedExpand.value) {
           const { minExpandRows } = computedExpand.value;
           collapseHeight.value = Math.min(
-            minExpandRows * rowHeight + (minExpandRows - 1) * __props.rowGap,
+            minExpandRows * rowHeight.value + (minExpandRows - 1) * __props.rowGap,
             +proFormHeight.value
           );
           showExpandToggle.value = +proFormHeight.value - collapseHeight.value > 1;
@@ -953,7 +975,7 @@ const _sfc_main$9 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-5db62420"]]);
+const SearchForm = /* @__PURE__ */ _export_sfc(_sfc_main$9, [["__scopeId", "data-v-20c91e48"]]);
 const _sfc_main$8 = {};
 const _hoisted_1$4 = { class: "pro-table_search-form-container" };
 function _sfc_render$3(_ctx, _cache) {
@@ -1073,7 +1095,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     const indeterminate = ref(false);
     const getColumnKey = (column, index2) => {
       const key = column.key ?? column.prop;
-      if (key === void 0 || key === null) return `__idx_${index2}`;
+      if (key === void 0 || key === null) return `__col_${index2}`;
       return Array.isArray(key) ? key.join(".") : String(key);
     };
     const checkedColumnsOptions = computed(
@@ -1087,7 +1109,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           (dk) => String(dk) === key
         );
         const label = String(
-          item.label ?? item.prop ?? t("table.columnFallback", { index: index2 + 1 })
+          item.label ?? item.title ?? item.prop ?? t("table.columnFallback", { index: index2 + 1 })
         );
         return {
           label,
@@ -1238,7 +1260,7 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-58a57bcb"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__scopeId", "data-v-97c582f9"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   ...{ name: "TableColumnRenderer" },
   __name: "TableColumnRenderer",
@@ -1248,7 +1270,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   setup(__props) {
     const getColumnKey = (column, index2) => {
       const key = column.key ?? column.prop;
-      if (key === void 0 || key === null) return `__idx_${index2}`;
+      if (key === void 0 || key === null) return `__col_${index2}`;
       return Array.isArray(key) ? key.join(".") : String(key);
     };
     const getCellValue = (row, column) => {
@@ -1260,34 +1282,53 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       return __props.columns.filter((column) => !column.hidden);
     });
     const getColumnProps = (column) => {
-      const { hidden, render, key, ...rest } = column;
+      const { hidden, render, key, children, ...rest } = column;
       const prop = column.prop ? String(column.prop) : void 0;
       return {
         ...rest,
+        label: column.label ?? column.title,
         prop,
         columnKey: key ? String(key) : prop
       };
     };
     return (_ctx, _cache) => {
+      const _component_TableColumnRenderer = resolveComponent("TableColumnRenderer", true);
       return openBlock(true), createElementBlock(Fragment, null, renderList(normalizedColumns.value, (column, index2) => {
-        return openBlock(), createBlock(unref(ElTableColumn), mergeProps({
-          key: getColumnKey(column, index2),
-          ref_for: true
-        }, getColumnProps(column)), {
-          default: withCtx((scope) => {
-            var _a;
-            return [
-              typeof column.render === "function" ? (openBlock(), createBlock(resolveDynamicComponent(
-                (_a = column.render) == null ? void 0 : _a.call(column, {
-                  ...scope,
-                  column,
-                  cellValue: getCellValue(scope.row, column)
-                })
-              ), { key: 0 })) : createCommentVNode("", true)
-            ];
-          }),
-          _: 2
-        }, 1040);
+        return openBlock(), createElementBlock(Fragment, {
+          key: getColumnKey(column, index2)
+        }, [
+          column.children && column.children.length > 0 ? (openBlock(), createBlock(unref(ElTableColumn), mergeProps({
+            key: 0,
+            ref_for: true
+          }, getColumnProps(column)), {
+            default: withCtx(() => [
+              createVNode(_component_TableColumnRenderer, {
+                columns: column.children
+              }, null, 8, ["columns"])
+            ]),
+            _: 2
+          }, 1040)) : typeof column.render === "function" ? (openBlock(), createBlock(unref(ElTableColumn), mergeProps({
+            key: 1,
+            ref_for: true
+          }, getColumnProps(column)), {
+            default: withCtx((scope) => {
+              var _a;
+              return [
+                (openBlock(), createBlock(resolveDynamicComponent(
+                  (_a = column.render) == null ? void 0 : _a.call(column, {
+                    ...scope,
+                    column,
+                    cellValue: getCellValue(scope.row, column)
+                  })
+                )))
+              ];
+            }),
+            _: 2
+          }, 1040)) : (openBlock(), createBlock(unref(ElTableColumn), mergeProps({
+            key: 2,
+            ref_for: true
+          }, getColumnProps(column)), null, 16))
+        ], 64);
       }), 128);
     };
   }
@@ -1452,16 +1493,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     });
     const normalizedRawColumns = computed(() => {
       const source = __props.columns ?? (tableColumns == null ? void 0 : tableColumns.value) ?? [];
-      const normalized = source.map((item, index2) => {
-        const current = { ...item };
-        if (current.label === void 0 && current.title !== void 0) {
-          current.label = current.title;
-        }
-        if (current.key === void 0) {
-          current.key = current.prop ?? (typeof current.columnKey === "string" ? current.columnKey : void 0) ?? `col-${index2}`;
-        }
-        return current;
-      });
       if (__props.addIndexColumn ?? injectProps.addIndexColumn) {
         return [
           {
@@ -1470,10 +1501,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             label: t("table.index"),
             width: 80
           },
-          ...normalized
+          ...source
         ];
       }
-      return normalized;
+      return source;
     });
     const computedDataSource = computed(() => {
       const attrsData = attrsTableProps.value.data;
@@ -1540,8 +1571,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       const _directive_loading = resolveDirective("loading");
       return openBlock(), createElementBlock("div", {
-        class: normalizeClass(["pro-table", _ctx.$attrs.class]),
-        style: normalizeStyle(_ctx.$attrs.style)
+        class: normalizeClass(["pro-table", unref(attrs).class]),
+        style: normalizeStyle(unref(attrs).style)
       }, [
         showSearch.value ? (openBlock(), createBlock(unref(_sfc_main$d), {
           key: 0,
@@ -1620,20 +1651,13 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-d66ea9cf"]]);
+const ProTable = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-127db81d"]]);
 function useTable(params = {}) {
   const { data, columns, ...rest } = params;
   const coreTable = useTable$1({
     ...rest,
     dataSource: data,
-    // 补齐列 key（key ?? prop ?? columnKey），
-    // 使 setColumn 等按 key 匹配的 API 对 Element Plus 的 prop 列生效
-    columns: columns == null ? void 0 : columns.map((column) => {
-      if (column.key !== void 0 && column.key !== null) return column;
-      const prop = column.prop;
-      const fallback = prop ?? (typeof column.columnKey === "string" ? column.columnKey : void 0);
-      return { ...column, key: fallback };
-    })
+    columns
   });
   const { dataSource, ...tableWithoutDataSource } = coreTable;
   const table = {