@qin-ui/antdv-next-pro 1.1.8 → 1.1.10

package/es/antdv-next-pro.css

@@ -36,23 +36,23 @@
 .pro-table_column-control_button[data-v-246b0faf] svg {
   transform: scale(1.2, 1.4);
 }
-.pro-table_header[data-v-da8d2778] {
+.pro-table_header[data-v-b87d832c] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table_header[data-v-da8d2778]:empty {
+.pro-table_header[data-v-b87d832c]:empty {
   display: none;
 }
-.pro-table_header + .pro-table_header_content[data-v-da8d2778] {
+.pro-table_header + .pro-table_header_content[data-v-b87d832c] {
   margin-top: 16px;
 }
-.pro-table_header_button-bar[data-v-da8d2778] {
+.pro-table_header_button-bar[data-v-b87d832c] {
   flex: 1;
 }
-.pro-table_header_toolbar[data-v-da8d2778] {
+.pro-table_header_toolbar[data-v-b87d832c] {
   margin-left: 12px;
 }
-.pro-table[data-v-da8d2778] [class*='-pagination'] [class*='-pagination-total-text'] {
+.pro-table[data-v-b87d832c] [class*='-pagination'] [class*='-pagination-total-text'] {
   flex: 1;
 }

package/es/component-provider/index.js

@@ -1,5 +1,5 @@
 import { defineComponent, provide, renderSlot } from "vue";
-import { g as getObject } from "../core/index-BWMfavD1.js";
+import { g as getObject } from "../core/index-C98RSrpN.js";
 const getPopupContainer = (triggerNode) => triggerNode.closest("form[class*='-form']");
 const INJECT_CONFIG = {
   "pro-table": {

package/es/core/{index-BWMfavD1.js → index-C98RSrpN.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/form/{index-CdBauDf0.js → index-CyMXEA_9.js}

@@ -2,7 +2,7 @@ import { defineComponent, provide, computed, inject, useSlots, watchEffect, crea
 import { FormItem, Col, Table, Form, Transfer, TreeSelect, Slider, Switch, RadioGroup, CheckboxGroup, TimeRangePicker, TimePicker, DateRangePicker, DatePicker, Cascader, Select, AutoComplete, InputOTP, InputNumber, InputPassword, InputSearch, TextArea, Input, Row } from "antdv-next";
 import { useDisabledContextProvider, useDisabledContext } from "antdv-next/dist/config-provider/DisabledContext";
 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-BWMfavD1.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-C98RSrpN.js";
 import { i as isPlainObject, t as toPath, o as omit, c as cloneDeep } from "../vendor/utils/lodash-es-p6jau26B.js";
 const tableProps = () => Table.props || {};
 const gridItemProps = () => Col.props || {};

package/es/form/index.js

@@ -1,5 +1,5 @@
-import { c, _, b, a, F, d, T, e, _ as _2, h, f, u, g } from "./index-CdBauDf0.js";
-import { I, a as a2, e as e2 } from "../core/index-BWMfavD1.js";
+import { c, _, b, a, F, d, T, e, _ as _2, h, f, u, g } from "./index-CyMXEA_9.js";
+import { I, a as a2, e as e2 } from "../core/index-C98RSrpN.js";
 export {
   c as BaseField,
   _ as BaseForm,

package/es/index.d.ts

@@ -122,8 +122,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 - 基础公共字段类型
@@ -450,9 +450,9 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
         bodyCell?: (props: {
             text: any;
             value: any;
-            record: T extends Table<infer U extends Data> ? U : never;
+            record: T extends Table<any, infer R extends Data> ? R : never;
             index: number;
-            column: Column<T extends Table<infer U extends Data> ? U : never>;
+            column: Column<T extends Table<any, infer R extends Data> ? R : never>;
         }) => void;
     }> & Readonly<Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>>, "default">> & Omit<Omit<Readonly<{
         default?: (() => any) | undefined;
@@ -489,9 +489,9 @@ declare const _default_2: <T extends Table<any> = Table>(__VLS_props: NonNullabl
         bodyCell?: (props: {
             text: any;
             value: any;
-            record: T extends Table<infer U extends Data> ? U : never;
+            record: T extends Table<any, infer R extends Data> ? R : never;
             index: number;
-            column: Column<T extends Table<infer U extends Data> ? U : never>;
+            column: Column<T extends Table<any, infer R extends Data> ? R : never>;
         }) => void;
     }> & Readonly<Partial<Record<"table" | "search-form" | "button-bar" | "toolbar", Slot>>>, "default">;
     emit: ((evt: "update:size", value: ButtonSize) => void) & ((evt: "update:loading", value: boolean) => void);
@@ -803,7 +803,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;
 
@@ -826,19 +826,19 @@ export declare type Slots = {
 };
 
 /**
- * 重新定义 Table 类型，将 Column 类型绑定为 antdv-next 的 Column<D>
+ * 重新定义 Table 类型，将 Column 类型绑定为 antdv-next 的 Column<T>
  */
-export declare type Table<D extends Data = Data, T extends object = ExtendWithAny<D>> = Table_2<D, T, Column<D>>;
+export declare type Table<D extends Data = Data, T extends Data = ExtendWithAny<D>> = Table_2<D, T, Column<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;
 };
@@ -939,8 +939,8 @@ declare const useFormRef_2: <F = any>() => {
 /**
  * 类型断言 re-export @qin-ui/core 的 useTable，
  */
-export declare const useTable: <D extends Data = Data, T extends object = ExtendWithAny<D>>(params: {
-    columns?: Columns<D>;
+export declare const useTable: <D extends Data = Data, T extends Data = ExtendWithAny<D>>(params: {
+    columns?: Columns<T>;
     dataSource?: T[];
     pageParam?: PageParam;
     searchParam?: ExtendWithAny<DeepPartial<D>>;

package/es/index.js

@@ -1,7 +1,7 @@
 import "./antdv-next-pro.css";
-import { _ as _sfc_main } from "./form/index-CdBauDf0.js";
-import { c, b, a, F, d, T, e, h, f, u, g } from "./form/index-CdBauDf0.js";
-import { I, a as a2, e as e2 } from "./core/index-BWMfavD1.js";
+import { _ as _sfc_main } from "./form/index-CyMXEA_9.js";
+import { c, b, a, F, d, T, e, h, f, u, g } from "./form/index-CyMXEA_9.js";
+import { I, a as a2, e as e2 } from "./core/index-C98RSrpN.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,9 +1,9 @@
 import { createElementBlock, openBlock, createElementVNode, defineComponent, ref, computed, watch, watchEffect, createBlock, unref, mergeProps, withCtx, createVNode, renderSlot, resolveDynamicComponent, createTextVNode, createCommentVNode, Fragment, toDisplayString, normalizeStyle, useModel, h, mergeModels, inject, useAttrs, useSlots, onMounted, normalizeClass, createSlots, renderList, normalizeProps, guardReactiveProps, nextTick } from "vue";
 import { Space, Button, theme, useConfig, Dropdown, Menu, Checkbox, Table } from "antdv-next";
 import "antdv-next/dist/config-provider/DisabledContext";
-import { _ as _sfc_main$9, t as tableProps, a as _sfc_main$a } from "../form/index-CdBauDf0.js";
+import { _ as _sfc_main$9, t as tableProps, a as _sfc_main$a } from "../form/index-CyMXEA_9.js";
 import { INJECT_CONFIG } from "../component-provider/index.js";
-import { g as getObject, c as camelizeProperties, f as useTable$1 } from "../core/index-BWMfavD1.js";
+import { g as getObject, c as camelizeProperties, f as useTable$1 } from "../core/index-C98RSrpN.js";
 import { p as pick } from "../vendor/utils/lodash-es-p6jau26B.js";
 const _export_sfc = (sfc, props) => {
   const target = sfc.__vccOpts || sfc;
@@ -679,7 +679,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-da8d2778"]]);
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b87d832c"]]);
 const useTable = useTable$1;
 export {
   BaseTable as default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antdv-next-pro",
-  "version": "1.1.8",
+  "version": "1.1.10",
   "description": "基于 antdv-next 的二次封装组件",
   "type": "module",
   "module": "es/index.js",
@@ -39,8 +39,7 @@
     "@qin-ui/core": "workspace:^",
     "@types/lodash-es": "^4.17.12",
     "antdv-next": "^1.1.0",
-    "lodash-es": "^4.17.21",
-    "vue": "^3.5.29"
+    "lodash-es": "^4.17.21"
   },
   "publishConfig": {
     "access": "public",