@qin-ui/element-plus-pro 1.0.0 → 1.0.1

package/es/element-plus-pro.css

@@ -34,33 +34,33 @@
 .pro-table_size-control_button[data-v-7af52d04] svg {
   transform: scale(1.3);
 }
-.pro-table_column-control_button[data-v-e45d2d29] {
+.pro-table_column-control_button[data-v-5a488a1c] {
   display: flex;
   align-items: center;
   padding-right: 12px;
   padding-left: 12px;
 }
-.pro-table_column-control_button[data-v-e45d2d29] svg {
+.pro-table_column-control_button[data-v-5a488a1c] svg {
   transform: scale(1.2, 1.4);
 }
-.pro-table_header[data-v-c5989f58] {
+.pro-table_header[data-v-05f75d0b] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table_header[data-v-c5989f58]:empty {
+.pro-table_header[data-v-05f75d0b]:empty {
   display: none;
 }
-.pro-table_header + .pro-table_header_content[data-v-c5989f58] {
+.pro-table_header + .pro-table_header_content[data-v-05f75d0b] {
   margin-top: 16px;
 }
-.pro-table_header_button-bar[data-v-c5989f58] {
+.pro-table_header_button-bar[data-v-05f75d0b] {
   flex: 1;
 }
-.pro-table_header_toolbar[data-v-c5989f58] {
+.pro-table_header_toolbar[data-v-05f75d0b] {
   margin-left: 12px;
 }
-.pro-table_pagination[data-v-c5989f58] {
+.pro-table_pagination[data-v-05f75d0b] {
   justify-content: flex-end;
   padding: 16px 0;
 }

package/es/index.d.ts

@@ -316,16 +316,19 @@ declare type BaseWithoutFields<D extends Data = Data> = BaseCommon<D> & {
     modelProp?: string;
 };
 
+declare type BivariantRender<D extends Data = Data> = {
+    bivarianceHack(scope: ColumnScope<D>): any;
+}['bivarianceHack'];
+
 declare type ButtonProps = {
     onClick: () => void;
 };
 
-export declare type Column<D extends Data = Data> = Partial<Omit<TableColumnCtx<ExtendWithAny<D>>, 'prop' | 'property' | 'children'>> & {
+export declare type Column<D extends Data = Data> = Partial<Omit<TableColumnCtx<any>, 'prop' | 'property' | 'children' | 'render'>> & {
     key?: Path<D>;
     prop?: KeyExpandString<Extract<keyof D, string>> | Paths<D>;
     hidden?: boolean;
-    children?: Columns<D>;
-    render?: (scope: ColumnScope<D>) => any;
+    render?: BivariantRender<D>;
 };
 
 declare type ColumnFindBy<D extends Data, C extends BaseColumn<D> = BaseColumn<D>> = (column: Readonly<C>) => boolean;

package/es/table/index.js

@@ -1,4 +1,4 @@
-import { createElementBlock, openBlock, createElementVNode, defineComponent, ref, computed, watch, watchEffect, createBlock, unref, mergeProps, withKeys, withCtx, createVNode, renderSlot, resolveDynamicComponent, createTextVNode, createCommentVNode, Fragment, toDisplayString, normalizeStyle, useModel, renderList, withModifiers, resolveComponent, mergeModels, inject, useAttrs, useSlots, onMounted, resolveDirective, normalizeClass, withDirectives, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
+import { createElementBlock, openBlock, createElementVNode, defineComponent, ref, computed, watch, watchEffect, createBlock, unref, mergeProps, withKeys, withCtx, createVNode, renderSlot, resolveDynamicComponent, createTextVNode, createCommentVNode, Fragment, toDisplayString, normalizeStyle, useModel, renderList, withModifiers, mergeModels, inject, useAttrs, useSlots, onMounted, resolveDirective, normalizeClass, withDirectives, createSlots, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { ElSpace, ElButton, ElDropdown, ElDropdownMenu, ElDropdownItem, ElCheckbox, ElTableColumn, ElTable, ElPagination } from "element-plus";
 import { _ as _export_sfc, a as _sfc_main$a, t as tableProps, p as paginationProps, b as _sfc_main$b } from "../form/index-BvqMIOZ8.js";
 import { INJECT_CONFIG } from "../component-provider/index.js";
@@ -337,22 +337,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const open = ref(false);
     const checkAll = ref(false);
     const indeterminate = ref(false);
-    const flattenColumns = (cols) => {
-      return cols.flatMap((item) => {
-        var _a;
-        if ((_a = item.children) == null ? void 0 : _a.length) {
-          return flattenColumns(item.children);
-        }
-        return item;
-      });
-    };
     const getColumnKey = (column, index) => {
       const key = column.key ?? column.prop;
       if (key === void 0 || key === null) return `__idx_${index}`;
       return Array.isArray(key) ? key.join(".") : String(key);
     };
     const checkedColumnsOptions = computed(
-      () => flattenColumns(__props.columns).map((item, index) => ({
+      () => __props.columns.map((item, index) => ({
         label: String(item.label ?? item.prop ?? `列${index + 1}`),
         value: getColumnKey(item, index),
         checked: !item.hidden,
@@ -466,7 +457,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-e45d2d29"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-5a488a1c"]]);
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   ...{ name: "TableColumnRenderer" },
   __name: "TableColumnRenderer",
@@ -485,19 +476,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       return get(row, toPath(path));
     };
     const normalizedColumns = computed(() => {
-      const loop = (source) => {
-        return source.flatMap((column) => {
-          if (column.hidden) return [];
-          const children = column.children || [];
-          const visibleChildren = children.length > 0 ? loop(children) : [];
-          if (children.length > 0 && visibleChildren.length === 0) return [];
-          return [{ ...column, children: visibleChildren }];
-        });
-      };
-      return loop(__props.columns);
+      return __props.columns.filter((column) => !column.hidden);
     });
     const getColumnProps = (column) => {
-      const { children, hidden, render, key, ...rest } = column;
+      const { hidden, render, key, ...rest } = column;
       const prop = Array.isArray(column.prop) ? column.prop.join(".") : column.prop ? String(column.prop) : void 0;
       return {
         ...rest,
@@ -506,7 +488,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       };
     };
     return (_ctx, _cache) => {
-      const _component_TableColumnRenderer = resolveComponent("TableColumnRenderer", true);
       return openBlock(true), createElementBlock(Fragment, null, renderList(normalizedColumns.value, (column, index) => {
         return openBlock(), createBlock(unref(ElTableColumn), mergeProps({
           key: getColumnKey(column, index),
@@ -515,16 +496,13 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           default: withCtx((scope) => {
             var _a;
             return [
-              (column.children || []).length > 0 ? (openBlock(), createBlock(_component_TableColumnRenderer, {
-                key: 0,
-                columns: column.children || []
-              }, null, 8, ["columns"])) : typeof column.render === "function" ? (openBlock(), createBlock(resolveDynamicComponent(
+              typeof column.render === "function" ? (openBlock(), createBlock(resolveDynamicComponent(
                 (_a = column.render) == null ? void 0 : _a.call(column, {
                   ...scope,
                   column,
                   cellValue: getCellValue(scope.row, column)
                 })
-              ), { key: 1 })) : createCommentVNode("", true)
+              ), { key: 0 })) : createCommentVNode("", true)
             ];
           }),
           _: 2
@@ -692,25 +670,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const normalizedRawColumns = computed(() => {
       const source = __props.columns ?? (tableColumns == null ? void 0 : tableColumns.value) ?? [];
-      const normalize = (list, prefix = "col") => {
-        return list.map((item, index) => {
-          const current = { ...item };
-          if (current.label === void 0 && current.title !== void 0) {
-            current.label = current.title;
-          }
-          if (current.prop === void 0 && current.dataIndex !== void 0) {
-            current.prop = Array.isArray(current.dataIndex) ? current.dataIndex.join(".") : current.dataIndex;
-          }
-          if (current.key === void 0) {
-            current.key = current.prop ?? (typeof current.columnKey === "string" ? current.columnKey : void 0) ?? `${prefix}-${index}`;
-          }
-          if (Array.isArray(current.children)) {
-            current.children = normalize(current.children, `${prefix}-${index}`);
-          }
-          return current;
-        });
-      };
-      const normalized = normalize(source);
+      const normalized = source.map((item, index) => {
+        const current = { ...item };
+        if (current.label === void 0 && current.title !== void 0) {
+          current.label = current.title;
+        }
+        if (current.prop === void 0 && current.dataIndex !== void 0) {
+          current.prop = Array.isArray(current.dataIndex) ? current.dataIndex.join(".") : current.dataIndex;
+        }
+        if (current.key === void 0) {
+          current.key = current.prop ?? (typeof current.columnKey === "string" ? current.columnKey : void 0) ?? `col-${index}`;
+        }
+        return current;
+      });
       if (__props.addIndexColumn ?? injectProps.addIndexColumn) {
         return [
           {
@@ -860,7 +832,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-c5989f58"]]);
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-05f75d0b"]]);
 const useTable = (params = {}) => {
   const { data, ...rest } = params;
   const coreTable = useTable$1({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/element-plus-pro",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "基于 element-plus 的二次封装组件",
   "type": "module",
   "module": "es/index.js",