@qin-ui/antd-vue-pro 1.0.35 → 1.0.37

package/es/index.d.ts

@@ -491,7 +491,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
     table?: ({
         dataSource: Ref<D[]>;
         columns: Ref<Columns<D>>;
-        checkedColumns: Ref<(keyof D & string)[]>;
+        showColumnKeys: Ref<(keyof D & string)[]>;
         searchParam: Ref<Partial<D & Record<string, any>>>;
         searchFields: Ref<Fields<Partial<D>>>;
         pagination: Ref<Partial<ExtractPropTypes<{
@@ -587,7 +587,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
     } & {
         setSearchParam: SetFormData;
         setSearchField: SetField;
-        setCheckedColumns: (val: string[]) => void;
+        setShowColumnKeys: (val: string[]) => void;
         setPagination: (val: Partial<ExtractPropTypes<{
             total: NumberConstructor;
             defaultCurrent: NumberConstructor;
@@ -717,8 +717,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
     searchContainer?: ContainerComponent | any;
     controlContainer?: ContainerComponent | any;
     tableContainer?: ContainerComponent | any;
-    paramCache?: ParamCache | undefined;
-    disabledParamCache?: boolean | undefined;
+    paramCache?: ParamCache | null | undefined;
     immediateSearch?: boolean | undefined;
     onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
     rowSelection?: TableRowSelection<any> | undefined;
@@ -935,7 +934,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         table?: ({
             dataSource: Ref<D[]>;
             columns: Ref<Columns<D>>;
-            checkedColumns: Ref<(keyof D & string)[]>;
+            showColumnKeys: Ref<(keyof D & string)[]>;
             searchParam: Ref<Partial<D & Record<string, any>>>;
             searchFields: Ref<Fields<Partial<D>>>;
             pagination: Ref<Partial<ExtractPropTypes<{
@@ -1031,7 +1030,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         } & {
             setSearchParam: SetFormData;
             setSearchField: SetField;
-            setCheckedColumns: (val: string[]) => void;
+            setShowColumnKeys: (val: string[]) => void;
             setPagination: (val: Partial<ExtractPropTypes<{
                 total: NumberConstructor;
                 defaultCurrent: NumberConstructor;
@@ -1161,8 +1160,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
         searchContainer?: ContainerComponent | any;
         controlContainer?: ContainerComponent | any;
         tableContainer?: ContainerComponent | any;
-        paramCache?: ParamCache | undefined;
-        disabledParamCache?: boolean | undefined;
+        paramCache?: ParamCache | null | undefined;
         immediateSearch?: boolean | undefined;
         onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
         rowSelection?: TableRowSelection<any> | undefined;
@@ -1383,7 +1381,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             table?: ({
                 dataSource: Ref<D[]>;
                 columns: Ref<Columns<D>>;
-                checkedColumns: Ref<(keyof D & string)[]>;
+                showColumnKeys: Ref<(keyof D & string)[]>;
                 searchParam: Ref<Partial<D & Record<string, any>>>;
                 searchFields: Ref<Fields<Partial<D>>>;
                 pagination: Ref<Partial<ExtractPropTypes<{
@@ -1479,7 +1477,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             } & {
                 setSearchParam: SetFormData;
                 setSearchField: SetField;
-                setCheckedColumns: (val: string[]) => void;
+                setShowColumnKeys: (val: string[]) => void;
                 setPagination: (val: Partial<ExtractPropTypes<{
                     total: NumberConstructor;
                     defaultCurrent: NumberConstructor;
@@ -1609,8 +1607,7 @@ declare const _default_3: <D extends Record<string, any>>(__VLS_props: {
             searchContainer?: ContainerComponent | any;
             controlContainer?: ContainerComponent | any;
             tableContainer?: ContainerComponent | any;
-            paramCache?: ParamCache | undefined;
-            disabledParamCache?: boolean | undefined;
+            paramCache?: ParamCache | null | undefined;
             immediateSearch?: boolean | undefined;
             onResizeColumn?: ((w: number, col: ColumnType_2<any>) => void) | undefined;
             rowSelection?: TableRowSelection<any> | undefined;
@@ -3102,7 +3099,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
     table?: ({
         dataSource: Ref<D[]>;
         columns: Ref<Columns<D>>;
-        checkedColumns: Ref<(keyof D & string)[]>;
+        showColumnKeys: Ref<(keyof D & string)[]>;
         searchParam: Ref<Partial<D & Record<string, any>>>;
         searchFields: Ref<Fields<Partial<D>>>;
         pagination: Ref<Partial<ExtractPropTypes<{
@@ -3198,7 +3195,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
     } & {
         setSearchParam: SetFormData;
         setSearchField: SetField;
-        setCheckedColumns: (val: string[]) => void;
+        setShowColumnKeys: (val: string[]) => void;
         setPagination: (val: Partial<ExtractPropTypes<{
             total: NumberConstructor;
             defaultCurrent: NumberConstructor;
@@ -3328,8 +3325,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
     searchContainer?: any;
     controlContainer?: any;
     tableContainer?: any;
-    paramCache?: ParamCache | undefined;
-    disabledParamCache?: boolean | undefined;
+    paramCache?: ParamCache | null | undefined;
     immediateSearch?: boolean | undefined;
     onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
     rowSelection?: TableRowSelection<any> | undefined;
@@ -3546,7 +3542,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         table?: ({
             dataSource: Ref<D[]>;
             columns: Ref<Columns<D>>;
-            checkedColumns: Ref<(keyof D & string)[]>;
+            showColumnKeys: Ref<(keyof D & string)[]>;
             searchParam: Ref<Partial<D & Record<string, any>>>;
             searchFields: Ref<Fields<Partial<D>>>;
             pagination: Ref<Partial<ExtractPropTypes<{
@@ -3642,7 +3638,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         } & {
             setSearchParam: SetFormData;
             setSearchField: SetField;
-            setCheckedColumns: (val: string[]) => void;
+            setShowColumnKeys: (val: string[]) => void;
             setPagination: (val: Partial<ExtractPropTypes<{
                 total: NumberConstructor;
                 defaultCurrent: NumberConstructor;
@@ -3772,8 +3768,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
         searchContainer?: any;
         controlContainer?: any;
         tableContainer?: any;
-        paramCache?: ParamCache | undefined;
-        disabledParamCache?: boolean | undefined;
+        paramCache?: ParamCache | null | undefined;
         immediateSearch?: boolean | undefined;
         onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
         rowSelection?: TableRowSelection<any> | undefined;
@@ -3994,7 +3989,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             table?: ({
                 dataSource: Ref<D[]>;
                 columns: Ref<Columns<D>>;
-                checkedColumns: Ref<(keyof D & string)[]>;
+                showColumnKeys: Ref<(keyof D & string)[]>;
                 searchParam: Ref<Partial<D & Record<string, any>>>;
                 searchFields: Ref<Fields<Partial<D>>>;
                 pagination: Ref<Partial<ExtractPropTypes<{
@@ -4090,7 +4085,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             } & {
                 setSearchParam: SetFormData;
                 setSearchField: SetField;
-                setCheckedColumns: (val: string[]) => void;
+                setShowColumnKeys: (val: string[]) => void;
                 setPagination: (val: Partial<ExtractPropTypes<{
                     total: NumberConstructor;
                     defaultCurrent: NumberConstructor;
@@ -4220,8 +4215,7 @@ export declare const ProTable: SFCWithInstall<(<D extends Record<string, any>>(_
             searchContainer?: any;
             controlContainer?: any;
             tableContainer?: any;
-            paramCache?: ParamCache | undefined;
-            disabledParamCache?: boolean | undefined;
+            paramCache?: ParamCache | null | undefined;
             immediateSearch?: boolean | undefined;
             onResizeColumn?: ((w: number, col: TableColumnType<any>) => void) | undefined;
             rowSelection?: TableRowSelection<any> | undefined;
@@ -4399,7 +4393,7 @@ declare type SwitchSlots = FieldSlot<'checkedChildren' | 'unCheckedChildren'>;
 export declare type Table<D extends Data = Data> = {
     dataSource: Array<D>;
     columns: Columns<D>;
-    checkedColumns: Array<keyof D & string>;
+    showColumnKeys: Array<keyof D & string>;
     searchParam: Partial<D & Record<string, any>>;
     searchFields: Fields<Partial<D>>;
     pagination: PaginationProps;
@@ -4487,7 +4481,7 @@ export declare type UseTable<T extends Data = Data> = <D extends T = T>(init: Pa
 } & {
     setSearchParam: SetFormData;
     setSearchField: SetField;
-    setCheckedColumns: (val: Array<string>) => void;
+    setShowColumnKeys: (val: Array<string>) => void;
     setPagination: (val: PaginationProps) => void;
     resetQueryParams: () => void;
 };

package/es/style.css

@@ -19,10 +19,10 @@
 .search .expand-transition[data-v-41c82259] {
   transition: all 0.25s;
 }
-.control-icon[data-v-104a603d] {
+.control-icon[data-v-2776fca6] {
   cursor: pointer;
 }
-.control-icon[data-v-104a603d] :hover {
+.control-icon[data-v-2776fca6] :hover {
   color: #1677ff;
 }
 .search-container[data-v-c00ace37] {
@@ -41,11 +41,11 @@
   padding: 24px 24px 16px;
   background-color: #fff;
 }
-.pro-table[data-v-1a65329a] {
+.pro-table[data-v-864e5a75] {
   display: flex;
   flex-direction: column;
   min-width: 800px;
 }
-.pro-table[data-v-1a65329a] .ant-pagination .ant-pagination-total-text {
+.pro-table[data-v-864e5a75] .ant-pagination .ant-pagination-total-text {
   flex: 1;
 }

package/es/table/index.js

@@ -221,11 +221,11 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     const checkedColumns = computed({
       get() {
         var _a;
-        return ((_a = props.table) == null ? void 0 : _a.checkedColumns.value) || [];
+        return ((_a = props.table) == null ? void 0 : _a.showColumnKeys.value) || [];
       },
       set(val) {
         var _a;
-        (_a = props.table) == null ? void 0 : _a.setCheckedColumns(val || []);
+        (_a = props.table) == null ? void 0 : _a.setShowColumnKeys(val || []);
       }
     });
     const onCheckAllChange = (e) => {
@@ -341,8 +341,8 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Control_vue_vue_type_style_index_0_scoped_104a603d_lang = "";
-const Control = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-104a603d"]]);
+const Control_vue_vue_type_style_index_0_scoped_2776fca6_lang = "";
+const Control = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-2776fca6"]]);
 const DefaultSearchContainer_vue_vue_type_style_index_0_scoped_c00ace37_lang = "";
 const _sfc_main$3 = {};
 const _hoisted_1$3 = { class: "search-container" };
@@ -400,7 +400,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     controlContainer: { default: DefaultControlContainer },
     tableContainer: { default: DefaultTableContainer },
     paramCache: { default: void 0 },
-    disabledParamCache: { type: Boolean, default: false },
     immediateSearch: { type: Boolean, default: false }
   },
   emits: ["search"],
@@ -410,7 +409,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const injectProps = inject(
       PRO_TABLE_INJECT_COMPONENT_PROPS_KEYS.table
     );
-    const cache = props.disabledParamCache ? void 0 : props.paramCache ?? (injectProps == null ? void 0 : injectProps.paramCache);
+    const cache = props.paramCache === void 0 ? injectProps == null ? void 0 : injectProps.paramCache : props.paramCache;
     const size = ref(unref(props.size));
     const attrs = useAttrs();
     const { table = {} } = props;
@@ -419,7 +418,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       dataSource,
       pagination,
       setPagination,
-      checkedColumns,
+      showColumnKeys,
       searchParam,
       setSearchParam
     } = table;
@@ -513,7 +512,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         list = (mergeTableProps == null ? void 0 : mergeTableProps.value.columns) || [];
       } else {
         list = ((_a2 = mergeTableProps.value.columns) == null ? void 0 : _a2.filter(
-          (item) => item.key && checkedColumns.value.includes(item.key)
+          (item) => item.key && showColumnKeys.value.includes(item.key)
         )) || [];
       }
       if (props.addIndexColumn) {
@@ -587,13 +586,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Table_vue_vue_type_style_index_0_scoped_1a65329a_lang = "";
-const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-1a65329a"]]);
+const Table_vue_vue_type_style_index_0_scoped_864e5a75_lang = "";
+const BaseTable = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-864e5a75"]]);
 const getDefaultPagination = () => ({ current: 1, pageSize: 10, total: 0 });
 const useTable = ({
   columns: initColumns = [],
   dataSource: initDataSource = [],
-  checkedColumns: initCheckedColumns = void 0,
+  showColumnKeys: initShowColumnKeys = void 0,
   pagination: initPagination = getDefaultPagination(),
   searchParam: initSearchParam = {},
   searchFields: initSearchFields = []
@@ -601,16 +600,24 @@ const useTable = ({
   const _initSearchParam = cloneDeep(unref(initSearchParam));
   const columns = ref(initColumns);
   const dataSource = ref(initDataSource);
-  const checkedColumns = ref(
-    initCheckedColumns ?? columns.value.map(
+  const showColumnKeys = ref(
+    initShowColumnKeys ?? columns.value.map(
       (item, index) => {
         var _a;
         return item.key ?? ((_a = item.dataIndex) == null ? void 0 : _a.toString()) ?? index;
       }
     )
   );
-  const setCheckedColumns = (val) => {
-    checkedColumns.value = val;
+  watch(columns, (val) => {
+    showColumnKeys.value = val.map(
+      (item, index) => {
+        var _a;
+        return item.key ?? ((_a = item.dataIndex) == null ? void 0 : _a.toString()) ?? index;
+      }
+    );
+  });
+  const setShowColumnKeys = (val) => {
+    showColumnKeys.value = val;
   };
   const pagination = ref(initPagination);
   const setPagination = (val) => {
@@ -632,12 +639,12 @@ const useTable = ({
     columns,
     dataSource,
     pagination,
-    checkedColumns,
+    showColumnKeys,
     searchParam,
     setSearchParam,
     searchFields,
     setSearchField,
-    setCheckedColumns,
+    setShowColumnKeys,
     setPagination,
     resetQueryParams
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "1.0.35",
+  "version": "1.0.37",
   "description": "二次封装antd vue组件",
   "type": "module",
   "main": "",