@qin-ui/antd-vue-pro 2.1.7 → 2.1.9

package/es/antd-vue-pro.css

@@ -36,23 +36,23 @@
 .pro-table_column-control_button[data-v-d503f78a] svg {
   transform: scale(1.2, 1.4);
 }
-.pro-table_header[data-v-0e17ddec] {
+.pro-table_header[data-v-8502b3b9] {
   display: flex;
   align-items: center;
   justify-content: flex-end;
 }
-.pro-table_header[data-v-0e17ddec]:empty {
+.pro-table_header[data-v-8502b3b9]:empty {
   display: none;
 }
-.pro-table_header + .pro-table_header_content[data-v-0e17ddec] {
+.pro-table_header + .pro-table_header_content[data-v-8502b3b9] {
   margin-top: 16px;
 }
-.pro-table_header_button-bar[data-v-0e17ddec] {
+.pro-table_header_button-bar[data-v-8502b3b9] {
   flex: 1;
 }
-.pro-table_header_toolbar[data-v-0e17ddec] {
+.pro-table_header_toolbar[data-v-8502b3b9] {
   margin-left: 12px;
 }
-.pro-table[data-v-0e17ddec] [class*='-pagination'] [class*='-pagination-total-text'] {
+.pro-table[data-v-8502b3b9] [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_COMPONENTS = Symbol("INJECT_COMPONENTS");
 const INJECT_CONFIG = {

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.js

@@ -6,8 +6,8 @@ import { colProps } from "ant-design-vue/es/grid/Col";
 import { formItemProps, useInjectFormItemContext } from "ant-design-vue/es/form";
 import { defineComponent, provide, inject, useSlots, watchEffect, createBlock, openBlock, unref, mergeProps, withCtx, createVNode, renderSlot, computed, toValue, normalizeProps, guardReactiveProps, resolveComponent, createElementBlock, Fragment, renderList, createSlots, ref, useAttrs, createCommentVNode, resolveDynamicComponent, isVNode, createTextVNode, toDisplayString } from "vue";
 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 { e } 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 { e } 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 _sfc_main$6 = /* @__PURE__ */ defineComponent({
   ...{ name: "ProForm", inheritAttrs: false },

package/es/index.d.ts

@@ -118,8 +118,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 - 基础公共字段类型
@@ -812,7 +812,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;
 
@@ -835,19 +835,19 @@ export declare type Slots = {
 };
 
 /**
- * 重新定义 Table 类型，将 Column 类型绑定为 antd-vue-pro 的 Column<D>
+ * 重新定义 Table 类型，将 Column 类型绑定为 antd-vue-pro 的 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;
 };
@@ -947,10 +947,10 @@ declare const useFormRef_2: <F = any>() => {
 
 /**
  * 类型断言 re-export @qin-ui/core 的 useTable，
- * 将默认的 BaseColumn<D> 覆盖为本地的 Column<D>。
+ * 将默认的 BaseColumn<T> 覆盖为本地的 Column<T>。
  */
-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>>;
@@ -979,8 +979,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

@@ -5,7 +5,7 @@ import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
 import _sfc_main$1 from "./component-provider/index.js";
 import { INJECT_COMPONENTS, INJECT_CONFIG, ensureInjectConfig, getInjectConfig } from "./component-provider/index.js";
-import { I, a, e } from "./core/index-BWMfavD1.js";
+import { I, a, e } from "./core/index-C98RSrpN.js";
 const withInstall = (comp) => {
   comp.install = (app) => {
     app.component(comp.name, comp);

package/es/table/index.js

@@ -3,7 +3,7 @@ import { INJECT_CONFIG } from "../component-provider/index.js";
 import _sfc_main$9, { ContainerFragment as _sfc_main$a } from "../form/index.js";
 import { Space, Button, theme, Dropdown, Menu, MenuItem, Checkbox, MenuDivider, Table } from "ant-design-vue";
 import { p as pick } from "../vendor/utils/lodash-es-p6jau26B.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 { useConfigContextInject } from "ant-design-vue/es/config-provider/context";
 import { tableProps } from "ant-design-vue/es/table";
 const _export_sfc = (sfc, props) => {
@@ -690,7 +690,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-0e17ddec"]]);
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-8502b3b9"]]);
 const useTable = useTable$1;
 export {
   BaseTable as default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "2.1.7",
+  "version": "2.1.9",
   "description": "二次封装antd vue组件",
   "type": "module",
   "module": "es/index.js",
@@ -43,8 +43,7 @@
     "@types/lodash-es": "^4.17.12",
     "ant-design-vue": "^4",
     "lodash-es": "^4.17.21",
-    "scroll-into-view-if-needed": "^3.1.0",
-    "vue": "^3.5.18"
+    "scroll-into-view-if-needed": "^3.1.0"
   },
   "sideEffects": false,
   "publishConfig": {