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

package/es/component-provider/index.js

@@ -1,5 +1,5 @@
 import { defineComponent, provide, renderSlot } from "vue";
-import { g as getObject } from "../core/index-VQxpXgLX.js";
+import { g as getObject } from "../core/index-DVXUNE-L.js";
 const INJECT_CONFIG = {
   "pro-table": {
     injectionKey: Symbol(""),

package/es/core/{index-VQxpXgLX.js → index-DVXUNE-L.js}

@@ -268,8 +268,6 @@ const useTable = (params) => {
       } else if (columnItem.dataIndex) {
         const dataIndexKey = Array.isArray(columnItem.dataIndex) ? columnItem.dataIndex.join(".") : columnItem.dataIndex;
         matched = dataIndexKey === key;
-      } else {
-        matched = key === i;
       }
       if (matched) {
         updater({

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-ce445821] {
   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-ce445821] svg {
   transform: scale(1.2, 1.4);
 }
-.pro-table_header[data-v-c5989f58] {
+.pro-table_header[data-v-890fd0f5] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table_header[data-v-c5989f58]:empty {
+.pro-table_header[data-v-890fd0f5]:empty {
   display: none;
 }
-.pro-table_header + .pro-table_header_content[data-v-c5989f58] {
+.pro-table_header + .pro-table_header_content[data-v-890fd0f5] {
   margin-top: 16px;
 }
-.pro-table_header_button-bar[data-v-c5989f58] {
+.pro-table_header_button-bar[data-v-890fd0f5] {
   flex: 1;
 }
-.pro-table_header_toolbar[data-v-c5989f58] {
+.pro-table_header_toolbar[data-v-890fd0f5] {
   margin-left: 12px;
 }
-.pro-table_pagination[data-v-c5989f58] {
+.pro-table_pagination[data-v-890fd0f5] {
   justify-content: flex-end;
   padding: 16px 0;
 }

package/es/form/{index-BvqMIOZ8.js → index-CWHWUZhj.js}

@@ -1,7 +1,7 @@
 import { inject, computed, provide, toValue, defineComponent, useAttrs, useSlots, watchEffect, createBlock, openBlock, unref, mergeProps, withModifiers, withCtx, createVNode, renderSlot, normalizeProps, guardReactiveProps, resolveComponent, createElementBlock, Fragment, renderList, createSlots, ref, createCommentVNode, resolveDynamicComponent, isVNode, createTextVNode, toDisplayString } from "vue";
 import { ElFormItem, ElCol, ElTable, ElPagination, useFormDisabled, ElForm, ElTransfer, ElTreeSelect, ElSlider, ElSwitch, ElRadioGroup, ElCheckboxGroup, ElTimeSelect, ElTimePicker, ElDatePicker, ElCascader, ElSelect, ElAutocomplete, ElInputNumber, ElInput, ElRow } from "element-plus";
 import { INJECT_CONFIG, getInjectConfig, INJECT_COMPONENTS } from "../component-provider/index.js";
-import { I as InjectionFormKey, c as camelizeProperties, a as InjectionPathKey, g as getObject, u as useForm$1, b as useFields$1, d as useFormRef$1 } from "../core/index-VQxpXgLX.js";
+import { I as InjectionFormKey, c as camelizeProperties, a as InjectionPathKey, g as getObject, u as useForm$1, b as useFields$1, d as useFormRef$1 } from "../core/index-DVXUNE-L.js";
 import { i as isPlainObject, t as toPath, o as omit, c as cloneDeep } from "../vendor/utils/lodash-es-p6jau26B.js";
 const tableProps = () => ElTable.props || {};
 const paginationProps = () => ElPagination.props || {};
@@ -10,10 +10,16 @@ const formItemProps = () => ElFormItem.props || {};
 const DisabledContextKey = Symbol("pro-form-disabled-context");
 const useDisabledContext = () => {
   const formDisabled = useFormDisabled();
-  return inject(DisabledContextKey, computed(() => !!formDisabled.value));
+  return inject(
+    DisabledContextKey,
+    computed(() => !!formDisabled.value)
+  );
 };
 const useDisabledContextProvider = (disabled) => {
-  provide(DisabledContextKey, computed(() => !!toValue(disabled)));
+  provide(
+    DisabledContextKey,
+    computed(() => !!toValue(disabled))
+  );
 };
 const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },

package/es/form/index.js

@@ -1,5 +1,5 @@
-import { c, a, B, b, F, d, T, e, a as a2, h, f, u, g } from "./index-BvqMIOZ8.js";
-import { I, a as a3, e as e2 } from "../core/index-VQxpXgLX.js";
+import { c, a, B, b, F, d, T, e, a as a2, h, f, u, g } from "./index-CWHWUZhj.js";
+import { I, a as a3, e as e2 } from "../core/index-DVXUNE-L.js";
 export {
   c as BaseField,
   a as BaseForm,

package/es/index.d.ts

@@ -106,8 +106,8 @@ declare type AdditionalMethods<FormItemInstance> = {
 };
 
 declare type AllowStringKey<T, Prefix extends string = ''> = {
-    [K in keyof T]: K extends string ? T[K] extends (infer U)[] ? `${Prefix}${K}` | (IsRecord<U> extends true ? AllowStringKey<U, `${Prefix}${K}[index].`> : never) : IsRecord<T[K]> extends true ? `${Prefix}${K}` | AllowStringKey<T[K], `${Prefix}${K}.`> : `${Prefix}${K}` : never;
-}[keyof T];
+    [K in keyof T as string extends K ? never : number extends K ? never : K extends string ? K : never]: T[K] extends (infer U)[] ? `${Prefix}${K & string}` | (IsRecord<U> extends true ? AllowStringKey<U, `${Prefix}${K & string}[index].`> : never) : IsRecord<T[K]> extends true ? `${Prefix}${K & string}` | AllowStringKey<T[K], `${Prefix}${K & string}.`> : `${Prefix}${K & string}`;
+} extends infer Obj ? Obj[keyof Obj] : never;
 
 /**
  * @type {Object} Base - 基础公共字段类型
@@ -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;
@@ -908,8 +911,8 @@ declare type WithCommonBase<T = unknown> = T & Omit<FormItemProps, 'label'> & Co
  * @template D - 数据对象类型
  */
 declare type WithComponent<T extends abstract new (...args: any) => any, D extends Data = Data> = WithCommon<{
-    slots?: ComponentSlots<T>;
-} & Omit<ComponentProps<T>, keyof VNodeProps>, D>;
+    slots?: Partial<ComponentSlots<T>>;
+} & Partial<Omit<ComponentProps<T>, keyof VNodeProps>>, D>;
 
 declare type WithFields<D extends Data = Data> = WithRef<WithCommonBase & BaseWithFields<D>>;
 

package/es/index.js

@@ -1,7 +1,7 @@
 import "./element-plus-pro.css";
-import { a as _sfc_main } from "./form/index-BvqMIOZ8.js";
-import { c, B, b, F, d, T, e, h, f, u, g } from "./form/index-BvqMIOZ8.js";
-import { I, a, e as e2 } from "./core/index-VQxpXgLX.js";
+import { a as _sfc_main } from "./form/index-CWHWUZhj.js";
+import { c, B, b, F, d, T, e, h, f, u, g } from "./form/index-CWHWUZhj.js";
+import { I, a, e as e2 } from "./core/index-DVXUNE-L.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";

package/es/table/index.js

@@ -1,8 +1,8 @@
-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 { _ as _export_sfc, a as _sfc_main$a, t as tableProps, p as paginationProps, b as _sfc_main$b } from "../form/index-CWHWUZhj.js";
 import { INJECT_CONFIG } from "../component-provider/index.js";
-import { c as camelizeProperties, g as getObject, f as useTable$1 } from "../core/index-VQxpXgLX.js";
+import { c as camelizeProperties, g as getObject, f as useTable$1 } from "../core/index-DVXUNE-L.js";
 import { g as get, t as toPath, p as pick } from "../vendor/utils/lodash-es-p6jau26B.js";
 const _sfc_main$9 = {};
 const _hoisted_1$5 = {
@@ -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,
@@ -368,12 +359,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       set(val) {
         checkedColumnsOptions.value.forEach((item) => {
           var _a;
-          (_a = __props.table) == null ? void 0 : _a.setColumn(
-            item.value,
-            {
-              hidden: !val.includes(item.value)
-            }
-          );
+          (_a = __props.table) == null ? void 0 : _a.setColumn(item.value, {
+            hidden: !val.includes(item.value)
+          });
         });
       }
     });
@@ -385,7 +373,9 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
     const toggleColumnsItem = (val) => {
       if (checkedColumnKeys.value.includes(val)) {
-        checkedColumnKeys.value = checkedColumnKeys.value.filter((item) => item !== val);
+        checkedColumnKeys.value = checkedColumnKeys.value.filter(
+          (item) => item !== val
+        );
       } else {
         checkedColumnKeys.value = [...checkedColumnKeys.value, val];
       }
@@ -466,7 +456,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-ce445821"]]);
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   ...{ name: "TableColumnRenderer" },
   __name: "TableColumnRenderer",
@@ -485,19 +475,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 +487,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 +495,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 +669,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 +831,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-890fd0f5"]]);
 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.2",
   "description": "基于 element-plus 的二次封装组件",
   "type": "module",
   "module": "es/index.js",