@qin-ui/antd-vue-pro 2.0.8 → 2.0.10

package/README.md

@@ -2,6 +2,8 @@
 
 > 二次封装 ant-design-vue 组件，提供 ProForm 和 ProTable 高级组件。
 
+## [使用示例和文档详细内容](https://dufan3715.github.io/pro-components/)
+
 ---
 
 ## ✨ 特性
@@ -109,5 +111,3 @@ antd-vue-pro 导出了一个名为 `useTable` 的自定义 Hook，用于处理
 | button-bar  | 自定义按钮组   |
 | toolbar     | 自定义工具栏   |
 | table       | 自定义表格     |
-
-## [更多使用示例和文档详细内容](https://dufan3715.github.io/pro-components/)

package/es/antd-vue-pro.css

@@ -28,12 +28,12 @@
 .control-icon[data-v-d8e78b5b] :hover {
   color: #1677ff;
 }
-.control-icon[data-v-88c80679] {
+.control-icon[data-v-f75da747] {
   display: flex;
   align-items: center;
   cursor: pointer;
 }
-.control-icon[data-v-88c80679] :hover {
+.control-icon[data-v-f75da747] :hover {
   color: #1677ff;
 }
 .pro-table .pro-table-header[data-v-eb2f3860] {

package/es/form/index.js

@@ -15,7 +15,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    provide(FORM, props.form);
+    provide(InjectionFormKey, props.form);
     const { formData, fields, setFormRef } = props.form;
     const config = INJECT_CONFIG["pro-form"];
     const { grid: _injectGrid, ...injectAttrs } = inject(
@@ -69,8 +69,8 @@ const COMPONENT_MAP = /* @__PURE__ */ new Map([
   ["transfer", Transfer]
 ]);
 const TeleportComponentNamePrefix = "TeleportComponent_";
-const FORM = Symbol("form");
-const PATH = Symbol("path");
+const InjectionFormKey = Symbol("form");
+const InjectionPathKey = Symbol("path");
 const _sfc_main$5 = /* @__PURE__ */ defineComponent({
   __name: "index",
   props: {
@@ -81,7 +81,7 @@ const _sfc_main$5 = /* @__PURE__ */ defineComponent({
     const namePath = computed(() => {
       return Array.isArray(props.path) ? props.path.join(".") : props.path;
     });
-    provide(PATH, namePath);
+    provide(InjectionPathKey, namePath);
     return (_ctx, _cache) => {
       return renderSlot(_ctx.$slots, "default", { path: namePath.value });
     };
@@ -424,8 +424,13 @@ const useFields = (initFields) => {
     getParentField
   };
 };
-const useFormData = (initFormData = {}) => {
-  const formData = reactive(initFormData);
+const InjectionFormDataKey = Symbol("form-data");
+const useFormData = (initFormData) => {
+  if (!initFormData) {
+    const injectFormDataStore = inject(InjectionFormDataKey, void 0);
+    if (injectFormDataStore) return injectFormDataStore;
+  }
+  const formData = reactive(initFormData ?? {});
   function getFormData(path) {
     if (!path) return void 0;
     return get(formData, path);
@@ -457,7 +462,9 @@ const useFormData = (initFormData = {}) => {
       Object.assign(formData, value);
     }
   }
-  return { formData, getFormData, setFormData };
+  const formDataStore = { formData, getFormData, setFormData };
+  provide(InjectionFormDataKey, formDataStore);
+  return formDataStore;
 };
 const useFormRef = () => {
   const formRef = ref();
@@ -476,7 +483,7 @@ function useForm(...args) {
     root = args[2] ?? root;
   }
   if (!root) {
-    const injectForm = inject(FORM);
+    const injectForm = inject(InjectionFormKey);
     if (injectForm) return injectForm;
   }
   return {
@@ -637,9 +644,9 @@ export {
   _sfc_main$3 as BaseFormItem,
   COMPONENT_MAP,
   _sfc_main$1 as ContainerFragment,
-  FORM,
   FORM_ITEM_SLOT_KEYS,
-  PATH,
+  InjectionFormKey,
+  InjectionPathKey,
   _sfc_main as SlotComponent,
   TeleportComponentNamePrefix,
   _sfc_main$6 as default,

package/es/index.d.ts

@@ -253,95 +253,6 @@ export declare type ComponentVars = Partial<RequiredComponentVars>;
  */
 declare type CompSlot<T extends string> = Partial<Record<KeyExpandString<T>, SlotComponentType>>;
 
-/**
- * @type {CompType} 字段类型集合
- */
-export declare type CompType = {
-    /** 文本框 */
-    'input': {
-        component: 'input';
-        slots?: InputSlots;
-    } & InputProps;
-    /** 文本域 */
-    'textarea': {
-        component: 'textarea';
-        slots?: InputSlots;
-    } & TextAreaProps;
-    /** 文本框-密码 */
-    'input-password': {
-        component: 'input-password';
-        slots?: InputSlots;
-    } & InputProps;
-    /** 文本框-搜索 */
-    'input-search': {
-        component: 'input-search';
-        slots?: InputSlots;
-    } & InputProps;
-    /** 数字文本框 */
-    'input-number': {
-        component: 'input-number';
-        slots?: InputNumberSlots;
-    } & InputNumberProps;
-    /** 下拉选择器 */
-    'select': {
-        component: 'select';
-        slots?: SelectSlots;
-    } & SelectProps;
-    /** 级联选择器 */
-    'cascader': {
-        component: 'cascader';
-        slots?: CascaderSlots;
-    } & CascaderProps;
-    /** 日期选择器 */
-    'date-picker': {
-        component: 'date-picker';
-        slots?: DatePickerSlots;
-    } & DatePickerProps;
-    /** 日期选择器-范围 */
-    'range-picker': {
-        component: 'range-picker';
-        slots?: RangePickerSlots;
-    } & RangePickerProps;
-    /** 时间选择器 */
-    'time-picker': {
-        component: 'time-picker';
-        slots?: TimePickerSlots;
-    } & TimePickerProps;
-    /** 复选框组 */
-    'checkbox-group': {
-        component: 'checkbox-group';
-    } & CheckboxGroupProps;
-    /** 单选框组 */
-    'radio-group': {
-        component: 'radio-group';
-    } & RadioGroupProps;
-    /** 开关 */
-    'switch': {
-        component: 'switch';
-        slots?: SwitchSlots;
-    } & SwitchProps;
-    /** 滑块 */
-    'slider': {
-        component: 'slider';
-        slots?: SliderSlots;
-    } & SliderProps;
-    /** 树形选择器 */
-    'tree-select': {
-        component: 'tree-select';
-        slots?: TreeSelectSlots;
-    } & TreeSelectProps;
-    /** 穿梭框 */
-    'transfer': {
-        component: 'transfer';
-        slots?: TransferSlots;
-    } & TransferProps;
-    /** 自定义组件 */
-    'custom': {
-        component?: RenderComponentType | Raw<RenderComponentType>;
-        slots?: Slots;
-    } & Record<string, any>;
-};
-
 /**
  * @description 容器组件类型
  */
@@ -443,7 +354,11 @@ declare type ExtendWithAny<D> = {
  * @description 字段配置类型，包含所有字段属性和响应式支持
  * @template D - 数据对象类型
  */
-export declare type Field<D extends Data = Data> = WithRef<CompType[keyof CompType] & Omit<FormItemProps, 'label'> & ColProps & Base<D>>;
+export declare type Field<D extends Data = Data> = {
+    [K in keyof FieldTypeMap]: {
+        component: K extends 'custom' ? FieldTypeMap<D>[K]['component'] : K;
+    } & FieldTypeMap<D>[K];
+}[keyof FieldTypeMap];
 
 /**
  * @description 字段数组类型
@@ -451,12 +366,82 @@ export declare type Field<D extends Data = Data> = WithRef<CompType[keyof CompTy
  */
 export declare type Fields<D extends Data = Data> = Array<Field<D>>;
 
+/**
+ * @type {FieldTypeMap} 字段类型集合
+ */
+export declare type FieldTypeMap<D extends Data = Data> = {
+    /** 文本框 */
+    'input': WithCommon<{
+        slots?: InputSlots;
+    } & InputProps, D>;
+    /** 文本域 */
+    'textarea': WithCommon<{
+        slots?: InputSlots;
+    } & TextAreaProps, D>;
+    /** 文本框-密码 */
+    'input-password': WithCommon<{
+        slots?: InputSlots;
+    } & InputProps, D>;
+    /** 文本框-搜索 */
+    'input-search': WithCommon<{
+        slots?: InputSlots;
+    } & InputProps, D>;
+    /** 数字文本框 */
+    'input-number': WithCommon<{
+        slots?: InputNumberSlots;
+    } & InputNumberProps, D>;
+    /** 下拉选择器 */
+    'select': WithCommon<{
+        slots?: SelectSlots;
+    } & SelectProps, D>;
+    /** 级联选择器 */
+    'cascader': WithCommon<{
+        slots?: CascaderSlots;
+    } & CascaderProps, D>;
+    /** 日期选择器 */
+    'date-picker': WithCommon<{
+        slots?: DatePickerSlots;
+    } & DatePickerProps, D>;
+    /** 日期选择器-范围 */
+    'range-picker': WithCommon<{
+        slots?: RangePickerSlots;
+    } & RangePickerProps, D>;
+    /** 时间选择器 */
+    'time-picker': WithCommon<{
+        slots?: TimePickerSlots;
+    } & TimePickerProps, D>;
+    /** 复选框组 */
+    'checkbox-group': WithCommon<CheckboxGroupProps, D>;
+    /** 单选框组 */
+    'radio-group': WithCommon<RadioGroupProps, D>;
+    /** 开关 */
+    'switch': WithCommon<{
+        slots?: SwitchSlots;
+    } & SwitchProps, D>;
+    /** 滑块 */
+    'slider': WithCommon<{
+        slots?: SliderSlots;
+    } & SliderProps, D>;
+    /** 树形选择器 */
+    'tree-select': WithCommon<{
+        slots?: TreeSelectSlots;
+    } & TreeSelectProps, D>;
+    /** 穿梭框 */
+    'transfer': WithCommon<{
+        slots?: TransferSlots;
+    } & TransferProps, D>;
+    /** 自定义组件 */
+    'custom': {
+        component?: RenderComponentType | Raw<RenderComponentType>;
+    } & WithCommon<{
+        slots?: Slots;
+    } & Record<string, any>, D>;
+};
+
 declare type FindBy<D extends Data> = (field: Readonly<Field<D>>) => boolean;
 
 declare type FindBy_2<D extends Data> = (column: Readonly<Column<D>>) => boolean;
 
-export declare const FORM: InjectionKey<Form>;
-
 export declare type Form<D extends Data = Data> = ReturnType<typeof useFormData<D>> & ReturnType<typeof useFields<D>> & ReturnType<typeof useFormRef>;
 
 export declare const FORM_ITEM_SLOT_KEYS: readonly ["label", "extra", "help", "tooltip"];
@@ -480,6 +465,10 @@ export declare const INJECT_CONFIG: {
     };
 };
 
+export declare const InjectionFormKey: InjectionKey<Form>;
+
+export declare const InjectionPathKey: InjectionKey<ComputedRef<string | undefined>>;
+
 declare type InputNumberSlots = CompSlot<'addonAfter' | 'addonBefore' | 'prefix' | 'upIcon' | 'downIcon'>;
 
 declare type InputSlots = CompSlot<'addonAfter' | 'addonBefore' | 'clearIcon' | 'prefix' | 'suffix'>;
@@ -500,7 +489,7 @@ declare type MaybeRefOrComputedRef<T = any> = MaybeRef<T> | ComputedRef<T>;
 /**
  * @description 不支持响应式的属性名
  */
-declare type NotSupportedRefOrGetterProps = 'container' | 'componentContainer' | 'valueFormatter' | 'fields' | 'slots' | 'modelName';
+declare type NotSupportedRefOrGetterProps = 'component' | 'container' | 'componentContainer' | 'valueFormatter' | 'fields' | 'slots' | 'modelName';
 
 declare type Option_2 = {
     label: string;
@@ -515,8 +504,6 @@ declare type PageParam = Required<Pick<PaginationProps, (typeof pageParamPropert
 
 declare const pageParamProperty: readonly ["current", "pageSize", "total"];
 
-export declare const PATH: InjectionKey<ComputedRef<string | undefined>>;
-
 declare type Path<D extends Data = Data> = KeyPathString<D>;
 
 export declare type PathProps = {
@@ -969,6 +956,8 @@ export declare type WithAdditionalMethodsGetter<T> = T & {
     }>;
 };
 
+declare type WithCommon<T, D extends Data = Data> = WithRef<T & Omit<FormItemProps, 'label'> & ColProps & Base<D>>;
+
 /**
  * @description 为对象属性添加响应式支持的类型
  * @template T - 原始类型

package/es/index.js

@@ -1,6 +1,6 @@
 import "./antd-vue-pro.css";
 import _sfc_main from "./form/index.js";
-import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM, FORM_ITEM_SLOT_KEYS, PATH, SlotComponent, TeleportComponentNamePrefix, useFields, useForm, useFormData } from "./form/index.js";
+import { BaseField, BaseFormItem, COMPONENT_MAP, ContainerFragment, FORM_ITEM_SLOT_KEYS, InjectionFormKey, InjectionPathKey, SlotComponent, TeleportComponentNamePrefix, useFields, useForm, useFormData } from "./form/index.js";
 import BaseTable from "./table/index.js";
 import { useTable } from "./table/index.js";
 import { _ as _sfc_main$1 } from "./component-provider/index-DXPHmG1H.js";
@@ -28,10 +28,10 @@ export {
   BaseFormItem,
   COMPONENT_MAP,
   ContainerFragment,
-  FORM,
   FORM_ITEM_SLOT_KEYS,
   I as INJECT_CONFIG,
-  PATH,
+  InjectionFormKey,
+  InjectionPathKey,
   ProComponentProvider,
   ProForm,
   ProTable,

package/es/table/index.js

@@ -299,6 +299,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
+    const open = ref(false);
     const checkAll = ref(false);
     const indeterminate = ref(false);
     const checkedColumnsOptions = computed(
@@ -349,6 +350,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     );
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(Dropdown), {
+        open: open.value,
+        "onUpdate:open": _cache[1] || (_cache[1] = ($event) => open.value = $event),
         arrow: "",
         placement: "bottomRight"
       }, {
@@ -367,11 +370,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                         indeterminate: indeterminate.value,
                         onChange: onCheckAllChange
                       }, {
-                        default: withCtx(() => _cache[1] || (_cache[1] = [
+                        default: withCtx(() => _cache[2] || (_cache[2] = [
                           createTextVNode(" 全选 ", -1)
                         ])),
                         _: 1,
-                        __: [1]
+                        __: [2]
                       }, 8, ["checked", "indeterminate"])
                     ])
                   ]),
@@ -410,11 +413,11 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           ])
         ]),
         _: 1
-      });
+      }, 8, ["open"]);
     };
   }
 });
-const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-88c80679"]]);
+const ColumnControl = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-f75da747"]]);
 const _hoisted_1 = { class: "pro-table-header" };
 const _hoisted_2 = {
   key: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/antd-vue-pro",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "二次封装antd vue组件",
   "type": "module",
   "module": "es/index.js",