@qin-ui/element-plus-pro 1.4.3 → 1.4.4

package/es/shared/core/index.d.ts

@@ -1,5 +1,5 @@
 /**
  * 统一 re-export @qin-ui/pro-components-core，包内所有文件通过此文件引入 core 内容。
  */
-export { type AdditionalMethods, localePacks, normalizeColumn, normalizeColumns, useForm, createFormProxy, useTable, useSearchFormExpand, useFields, resolveFieldIdentity, DEFAULT_FIELD_IDENTITY_KEYS, useFormData, useFormRef, useReactiveAttrs, InjectionFormKey, InjectionFormSlotsKey, getObject, omitBy, get, set, normalizePathKey, toPath, camelizeProperties, cloneDeep, pick, omit, isPlainObject, isObjectItem, isPromise, zhCN, zhTW, enUS, format, resolveLocaleName, type ProLocale, type ProLocaleName, type ProLocaleKey, type Data, type Path, type Paths, type KeyExpandString, type ExtendWithAny, type DeepPartial, type PageParam, type Fields, type Form, type Table, type UseFieldsReturn, type UseFormDataReturn, type UseFormRefReturn, } from '@qin-ui/pro-components-core';
+export { type AdditionalMethods, localePacks, normalizeColumn, normalizeColumns, useForm, createFormProxy, useTable, useSearchFormExpand, useFields, resolveFieldIdentity, DEFAULT_FIELD_IDENTITY_KEYS, useFormData, useFormRef, useReactiveAttrs, InjectionFormKey, InjectionFormSlotsKey, getObject, mergeComponentVars, omitBy, get, set, normalizePathKey, toPath, camelizeProperties, cloneDeep, pick, omit, isPlainObject, isObjectItem, isPromise, callListeners, zhCN, zhTW, enUS, format, resolveLocaleName, type ProLocale, type ProLocaleName, type ProLocaleKey, type Data, type Path, type Paths, type KeyExpandString, type ExtendWithAny, type DeepPartial, type PageParam, type Fields, type Form, type Table, type UseFieldsReturn, type UseFormDataReturn, type UseFormRefReturn, } from '@qin-ui/pro-components-core';
 //# sourceMappingURL=index.d.ts.map

package/es/shared/core/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/core/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAEL,KAAK,iBAAiB,EACtB,WAAW,EACX,eAAe,EACf,gBAAgB,EAEhB,OAAO,EACP,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,oBAAoB,EACpB,2BAA2B,EAC3B,WAAW,EACX,UAAU,EACV,gBAAgB,EAEhB,gBAAgB,EAChB,qBAAqB,EAErB,SAAS,EACT,MAAM,EACN,GAAG,EACH,GAAG,EACH,gBAAgB,EAChB,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,SAAS,EAET,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,iBAAiB,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,YAAY,EAEjB,KAAK,IAAI,EACT,KAAK,IAAI,EACT,KAAK,KAAK,EACV,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,IAAI,EACT,KAAK,KAAK,EACV,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,GACtB,MAAM,6BAA6B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shared/core/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAEL,KAAK,iBAAiB,EACtB,WAAW,EACX,eAAe,EACf,gBAAgB,EAEhB,OAAO,EACP,eAAe,EACf,QAAQ,EACR,mBAAmB,EACnB,SAAS,EACT,oBAAoB,EACpB,2BAA2B,EAC3B,WAAW,EACX,UAAU,EACV,gBAAgB,EAEhB,gBAAgB,EAChB,qBAAqB,EAErB,SAAS,EACT,kBAAkB,EAClB,MAAM,EACN,GAAG,EACH,GAAG,EACH,gBAAgB,EAChB,MAAM,EACN,kBAAkB,EAClB,SAAS,EACT,IAAI,EACJ,IAAI,EACJ,aAAa,EACb,YAAY,EACZ,SAAS,EACT,aAAa,EAEb,IAAI,EACJ,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,iBAAiB,EACjB,KAAK,SAAS,EACd,KAAK,aAAa,EAClB,KAAK,YAAY,EAEjB,KAAK,IAAI,EACT,KAAK,IAAI,EACT,KAAK,KAAK,EACV,KAAK,eAAe,EACpB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,IAAI,EACT,KAAK,KAAK,EACV,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,GACtB,MAAM,6BAA6B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/element-plus-pro",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "基于 element-plus 的二次封装组件",
   "bin": {
     "element-plus-pro": "./bin/init-ai.mjs"
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "vue-component-type-helpers": "^3.2.5",
-    "@qin-ui/pro-components-core": "^2.1.1"
+    "@qin-ui/pro-components-core": "^2.2.0"
   },
   "devDependencies": {
     "@types/node": "^24",

package/src/components/component-provider/components/index.vue

@@ -36,8 +36,8 @@ import {
   ensureInjectConfig,
 } from '../constants';
 import type { ComponentVars } from '../types';
-import { computed, provide } from 'vue';
-import { getObject, omit } from '../../../shared/core';
+import { computed, inject, provide, toValue } from 'vue';
+import { getObject, mergeComponentVars, omit } from '../../../shared/core';
 import type { ComponentName } from '../../form/constants';
 import { LOCALE_INJECT_KEY, type ProLocale } from '../../../locale';
 
@@ -74,20 +74,22 @@ const props = withDefaults(defineProps<Props>(), {
 });
 
 /*
- * 遍历 componentVars 的每个 key，获取或创建对应的 inject 配置
- * 将用户提供的值合并到默认值上，剔除该注入项的不可注入键后通过 provide 响应式注入到子组件树
+ * 遍历 componentVars 的每个 key，读取祖先注入值与本层配置合并后向下 provide
+ * 合并顺序为内置默认值 → 祖先注入值 → 本层 componentVars，剔除该注入项的不可注入键
  * 子组件通过 inject(config.injectionKey) 获取合并后的计算属性配置
  */
 (Object.keys(INJECT_CONFIG) as Array<keyof typeof INJECT_CONFIG>).forEach(
   key => {
     const config = INJECT_CONFIG[key];
     const ignored = config.ignoreProps;
+    const parentConfig = inject(config.injectionKey as any, undefined);
     provide(
       config.injectionKey as any,
       computed(() =>
         omit(
           {
             ...config.default,
+            ...(toValue(parentConfig) || {}),
             ...getObject(props.componentVars?.[key as keyof ComponentVars]),
           },
           ignored ?? []
@@ -102,10 +104,11 @@ if (props.componentVars) {
   Object.keys(props.componentVars).forEach(key => {
     if (!(key in INJECT_CONFIG)) {
       const config = ensureInjectConfig(key);
+      const parentConfig = inject(config.injectionKey as any, undefined);
       provide(
         config.injectionKey as any,
         computed(() => ({
-          ...config.default,
+          ...(toValue(parentConfig) || {}),
           ...getObject((props.componentVars as any)?.[key]),
         }))
       );
@@ -113,22 +116,36 @@ if (props.componentVars) {
   });
 }
 
+const parentComponentVars = inject(INJECT_COMPONENT_VARS, undefined);
 // 全量 componentVars：自定义组件键在运行期新增后同样可被子组件读取
 provide(
   INJECT_COMPONENT_VARS,
-  computed(() => (props.componentVars as Record<string, any>) ?? {})
+  computed(() =>
+    mergeComponentVars(
+      toValue(parentComponentVars),
+      props.componentVars as Record<string, any>
+    )
+  )
 );
 
+const parentComponents = inject(INJECT_COMPONENTS, undefined);
 // 注入自定义组件映射，BaseField 在解析组件时会优先使用此映射
 provide(
   INJECT_COMPONENTS,
-  computed(() => props.componentMap)
+  computed(() => ({
+    ...(toValue(parentComponents) || {}),
+    ...(props.componentMap ?? {}),
+  }))
 );
 
+const parentLocale = inject(LOCALE_INJECT_KEY, undefined);
 // 注入内置文案覆盖，useLocale 在解析文案时会优先使用
 provide(
   LOCALE_INJECT_KEY,
-  computed(() => props.locale)
+  computed(() => ({
+    ...(toValue(parentLocale) || {}),
+    ...(props.locale ?? {}),
+  }))
 );
 </script>
 

package/src/components/form/components/BaseField/index.vue

@@ -40,6 +40,7 @@ import {
 import {
   cloneDeep,
   getObject,
+  omitBy,
   useReactiveAttrs,
 } from '../../../../shared/core';
 import { useDisabledContext } from '../../../../shared/ui';
@@ -81,20 +82,23 @@ const componentRef = ref<any>();
 const attrs: any = useReactiveAttrs();
 
 /**
- * 全局默认配置注入：key = 组件名 + type 修饰段，inject 须在 setup 同步期调用。
+ * 全局默认配置注入：按组件名与 type 修饰段分别解析注入通道，inject 须在 setup 同步期调用。
  * 组件名与 `type` 仅取 setup 期初始值——运行期变更不会切换 Provider 的默认值预设
  * （`date-picker.month` 等子类型预设需在初始渲染前确定）。
+ * `date-picker` 的 type 缺省时按 `date` 段解析子类型预设。
  */
 const typeVal = attrs.type;
-const injectConfigKey =
-  typeof props.component === 'string'
-    ? [props.component, typeVal].filter(Boolean).join('.')
-    : '';
-const componentInjectConfig = injectConfigKey
-  ? getInjectConfig(injectConfigKey)
+const baseConfigKey =
+  typeof props.component === 'string' ? props.component : '';
+const typeConfigKey =
+  typeVal || (baseConfigKey === 'date-picker' ? 'date' : '');
+const subtypeConfigKey =
+  baseConfigKey && typeConfigKey ? `${baseConfigKey}.${typeConfigKey}` : '';
+const baseInjectConfig = baseConfigKey
+  ? getInjectConfig(baseConfigKey)
   : undefined;
-const rawInjectComponentProps = componentInjectConfig
-  ? inject(componentInjectConfig.injectionKey, componentInjectConfig.default)
+const subtypeInjectConfig = subtypeConfigKey
+  ? getInjectConfig(subtypeConfigKey)
   : undefined;
 // 全量 componentVars：运行期新增的自定义组件键由此兜底读取
 const componentVars = inject(INJECT_COMPONENT_VARS, undefined);
@@ -149,9 +153,12 @@ const parentDisabled = useDisabledContext();
  * 属性分为三类：绑定属性（v-model）、组件属性（传递给组件）、插槽（动态渲染）
  */
 const groupedAttrs = computed(() => {
+  // 库内置默认（基础键 → 子类型键）之后再铺项目配置，项目配置始终覆盖库默认
   const currentInjectProps = {
-    ...(toValue(rawInjectComponentProps) || {}),
-    ...getObject(toValue(componentVars)?.[injectConfigKey]),
+    ...getObject(baseInjectConfig?.default),
+    ...getObject(subtypeInjectConfig?.default),
+    ...getObject(toValue(componentVars)?.[baseConfigKey]),
+    ...getObject(toValue(componentVars)?.[subtypeConfigKey]),
   };
   const initProps = getInitProps(
     {
@@ -169,7 +176,8 @@ const groupedAttrs = computed(() => {
   );
   const mergedProps = mergeProps(
     initProps,
-    attrs,
+    // 未赋值（undefined）的键不作为显式值下发，保留注入默认值与占位符兜底
+    omitBy(attrs, value => value === undefined),
     { class: attrs.componentClass, style: attrs.componentStyle },
     { disabled: effectiveDisabled },
     { modelProp: modelPropName }

package/src/components/form/components/BaseField/utils/index.ts

@@ -65,7 +65,8 @@ const getPlaceholderProps = (
 /**
  * 组件初始属性：以内置默认值为底，按下发组件名补默认占位符文案
  *
- * @description 组件名由 `component` 与 `type` 拼接（如 `input.password`）；`component` 非字符串时返回空记录。
+ * @description 占位符按 `component` 与 `type` 拼接的键查表（如 `input.password`），
+ * 该键无占位符映射时回落到基础组件名；`component` 非字符串时返回空记录。
  * @param {Field} field - 字段配置
  * @param {Record<string, any>} injectProps - Provider 下发的组件默认属性
  * @param {LocaleT} t - 取文案的翻译函数
@@ -78,8 +79,12 @@ export const getInitProps = (
 ): Record<string, any> => {
   const { component, type } = field as any;
   if (typeof component === 'string') {
-    const k = [component, type].filter(Boolean).join('.');
-    return { ...injectProps, ...getPlaceholderProps(k, injectProps, t) };
+    const subtypeKey = [component, type].filter(Boolean).join('.');
+    const key =
+      PLACEHOLDER_KEYS[subtypeKey] || RANGE_PLACEHOLDER_KEYS[subtypeKey]
+        ? subtypeKey
+        : component;
+    return { ...injectProps, ...getPlaceholderProps(key, injectProps, t) };
   }
   return {};
 };

package/src/components/form/components/ProForm/index.vue

@@ -105,7 +105,14 @@ const fields = computed(() => {
   return (Array.isArray(f) ? f : f?.value) ?? [];
 });
 const formData = computed(() => currentForm.value?.formData);
-const setFormRef = (el: any) => currentForm.value?.setFormRef?.(el);
+/*
+ * ref 回调按渲染期实例路由：卸载回调（null）写回该子树所属表单，
+ * 运行期替换 :form 后旧实例的 formRef 同步清空
+ */
+const formRefSetter = computed(() => {
+  const form = currentForm.value;
+  return (el: any) => form?.setFormRef?.(el);
+});
 
 /*
  * formKey 子树重挂载契约：以 WeakMap 为每个 form 实例生成自增 key，绑定到原生 Form 的 :key
@@ -172,7 +179,7 @@ provide(InjectionFormSlotsKey, formSlotsRef);
   <!-- el-form 渲染原生 form 元素，拦截回车触发的默认提交 -->
   <ElForm
     :key="formKey"
-    :ref="setFormRef"
+    :ref="formRefSetter"
     :model="formData"
     v-bind="formAttrs"
     class="pro-form"

package/src/components/table/components/ProTable.vue

@@ -87,6 +87,7 @@ import { useLocale } from '../../../locale';
 import type { Path } from '../../../shared/core';
 import {
   camelizeProperties,
+  callListeners,
   getObject,
   isObjectItem,
   isPlainObject,
@@ -243,16 +244,21 @@ const _search = async () => {
   if (props.search && attrs.onSearch) {
     warnSearchConfig('duplicate');
   }
-  if (!search) return;
-  const searchPromise = search();
-  if (!isPromise(searchPromise)) {
+  const results = callListeners(search);
+  if (!results.length) return;
+  const promises = results.filter(isPromise);
+  if (!promises.length) {
     warnSearchConfig('not-promise');
     return;
   }
   const seq = ++searchSequence;
   loading.value = true;
   try {
-    await searchPromise;
+    const settled = await Promise.allSettled(promises);
+    const rejected = settled.find(item => item.status === 'rejected') as
+      | PromiseRejectedResult
+      | undefined;
+    if (rejected) throw rejected.reason;
   } finally {
     if (seq === searchSequence) {
       loading.value = false;
@@ -472,7 +478,7 @@ const onSizeChange = (pageSize: number) => {
 
 const onPaginationChange = (currentPage: number, pageSize: number) => {
   // 透传 el-pagination change 回调
-  attrs.onChange?.(currentPage, pageSize);
+  callListeners(attrs.onChange, currentPage, pageSize);
 };
 
 const searchFormVisible = computed(() => {

package/src/components/table/types/index.ts

@@ -59,6 +59,7 @@ export type Column<D extends Data = Data> = Partial<
    * 列是否隐藏；支持布尔、Ref 与 ComputedRef 形式，渲染期按 `toValue` 取值
    *
    * 分组列的子列同样参与过滤（递归生效）。
+   * 只读 ref（如 `computed`）经 `setColumn` 写入时会被普通值替换，可写 ref 保持绑定。
    */
   hidden?: MaybeRefOrComputedRef<boolean>;
   /** 自定义渲染函数 */

package/src/shared/core/index.ts

@@ -23,6 +23,7 @@ export {
   InjectionFormSlotsKey,
   // utils
   getObject,
+  mergeComponentVars,
   omitBy,
   get,
   set,
@@ -35,6 +36,7 @@ export {
   isPlainObject,
   isObjectItem,
   isPromise,
+  callListeners,
   // locale
   zhCN,
   zhTW,