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

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-5a488a1c] {
+.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-5a488a1c] svg {
+.pro-table_column-control_button[data-v-ce445821] svg {
   transform: scale(1.2, 1.4);
 }
-.pro-table_header[data-v-05f75d0b] {
+.pro-table_header[data-v-890fd0f5] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table_header[data-v-05f75d0b]:empty {
+.pro-table_header[data-v-890fd0f5]:empty {
   display: none;
 }
-.pro-table_header + .pro-table_header_content[data-v-05f75d0b] {
+.pro-table_header + .pro-table_header_content[data-v-890fd0f5] {
   margin-top: 16px;
 }
-.pro-table_header_button-bar[data-v-05f75d0b] {
+.pro-table_header_button-bar[data-v-890fd0f5] {
   flex: 1;
 }
-.pro-table_header_toolbar[data-v-05f75d0b] {
+.pro-table_header_toolbar[data-v-890fd0f5] {
   margin-left: 12px;
 }
-.pro-table_pagination[data-v-05f75d0b] {
+.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 - 基础公共字段类型
@@ -410,8 +410,8 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
             container?: ContainerComponent | false;
         };
         tableContainer?: ContainerComponent | false;
-        columns?: Columns<T extends Table<any, infer R extends object> ? R : any>;
-        data?: (T extends Table<any, infer R extends object> ? R : any)[];
+        columns?: Columns<T extends Table<any, infer R extends Data> ? R : any>;
+        data?: (T extends Table<any, infer R extends Data> ? R : any)[];
         pagination?: false | Partial<PaginationProps>;
     } & Omit<TableProps, "data">) & Partial<{}>> & PublicProps;
     expose(exposed: ShallowUnwrapRef<    {}>): void;
@@ -739,7 +739,7 @@ declare type SearchFormProps = {
     expandButton?: Component<ExpandButtonProps> | DefineComponent<ExpandButtonProps>;
 } & /* @vue-ignore */ _FormProps & AllowedComponentProps;
 
-declare type SetColumn<D extends Data = Data, C extends BaseColumn<D> = BaseColumn<D>> = (key: Path<D>, column: C | ((pre: Readonly<C>) => C), options?: {
+declare type SetColumn<T extends Data = Data, C extends BaseColumn<T> = BaseColumn<T>> = (key: Path<T>, column: C | ((pre: Readonly<C>) => C), options?: {
     updateType?: 'rewrite' | 'merge';
 } & UpdateColumnOptions) => void;
 
@@ -762,24 +762,24 @@ export declare type Slots = {
 };
 
 /**
- * 重新定义 Table 类型，将 Column 类型绑定为 element-plus-pro 的 Column<D>
+ * 重新定义 Table 类型，将 Column 类型绑定为 element-plus-pro 的 Column<T>
  */
-export declare type Table<D extends Data = Data, T extends object = ExtendWithAny<D>> = Omit<Table_2<D, T, Column<D>>, 'dataSource'> & {
+export declare type Table<D extends Data = Data, T extends Data = ExtendWithAny<D>> = Omit<Table_2<D, T, Column<T>>, 'dataSource'> & {
     /**
      * element-plus table 数据源
      */
     data: Ref<T[]>;
 };
 
-declare type Table_2<D extends Data = Data, T extends object = ExtendWithAny<D>, C extends BaseColumn<D> = BaseColumn<D>> = {
-    columns: Ref<Columns_2<D, C>>;
+declare type Table_2<D extends Data = Data, T extends Data = ExtendWithAny<D>, C extends BaseColumn<T> = BaseColumn<T>> = {
+    columns: Ref<Columns_2<T, C>>;
     dataSource: Ref<T[]>;
     pageParam: Reactive<PageParam>;
     searchForm: Form_2<D>;
-    setColumn: SetColumn<D, C>;
-    deleteColumn: (path: Path<D> | ColumnFindBy<D, C>, options?: UpdateColumnOptions) => void;
-    appendColumn: (path: Path<D> | ColumnFindBy<D, C> | undefined, column: C | Columns_2<D, C>, options?: UpdateColumnOptions) => void;
-    prependColumn: (path: Path<D> | ColumnFindBy<D, C> | undefined, column: C | Columns_2<D, C>, options?: UpdateColumnOptions) => void;
+    setColumn: SetColumn<T, C>;
+    deleteColumn: (path: Path<T> | ColumnFindBy<T, C>, options?: UpdateColumnOptions) => void;
+    appendColumn: (path: Path<T> | ColumnFindBy<T, C> | undefined, column: C | Columns_2<T, C>, options?: UpdateColumnOptions) => void;
+    prependColumn: (path: Path<T> | ColumnFindBy<T, C> | undefined, column: C | Columns_2<T, C>, options?: UpdateColumnOptions) => void;
     setPageParam: SetPageParam;
     resetQueryParams: () => void;
 };
@@ -879,10 +879,10 @@ declare const useFormRef_2: <F = any>() => {
     setFormRef: (inst: F) => void;
 };
 
-export declare const useTable: <D extends Data = Data, T extends object = ExtendWithAny<D>>(params?: UseTableParams<D, T>) => Table<D, T>;
+export declare const useTable: <D extends Data = Data, T extends Data = ExtendWithAny<D>>(params?: UseTableParams<D, T>) => Table<D, T>;
 
-declare type UseTableParams<D extends Data = Data, T extends object = ExtendWithAny<D>> = {
-    columns?: Columns<D>;
+declare type UseTableParams<D extends Data = Data, T extends Data = ExtendWithAny<D>> = {
+    columns?: Columns<T>;
     data?: T[];
     pageParam?: PageParam;
     searchParam?: ExtendWithAny<DeepPartial<D>>;
@@ -911,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, 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 = {
@@ -359,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)
+          });
         });
       }
     });
@@ -376,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];
       }
@@ -457,7 +456,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-5a488a1c"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-ce445821"]]);
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   ...{ name: "TableColumnRenderer" },
   __name: "TableColumnRenderer",
@@ -832,7 +831,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-05f75d0b"]]);
+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.1",
+  "version": "1.0.3",
   "description": "基于 element-plus 的二次封装组件",
   "type": "module",
   "module": "es/index.js",
@@ -39,8 +39,7 @@
     "@qin-ui/core": "workspace:^",
     "@types/lodash-es": "^4.17.12",
     "element-plus": "^2.13.6",
-    "lodash-es": "^4.17.21",
-    "vue": "^3.5.29"
+    "lodash-es": "^4.17.21"
   },
   "publishConfig": {
     "access": "public",