@qin-ui/element-plus-pro 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qin-ui/element-plus-pro",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "description": "基于 element-plus 的二次封装组件",
   "bin": {
     "element-plus-pro": "./bin/init-ai.mjs"
@@ -14,7 +14,6 @@
       "types": "./es/index.d.ts",
       "import": "./es/index.js"
     },
-    "./element-plus-pro.css": "./es/element-plus-pro.css",
     "./package.json": "./package.json"
   },
   "files": [
@@ -41,7 +40,7 @@
   },
   "dependencies": {
     "vue-component-type-helpers": "^3.2.5",
-    "@qin-ui/pro-components-core": "^2.1.0"
+    "@qin-ui/pro-components-core": "^2.1.1"
   },
   "devDependencies": {
     "@types/node": "^24",

package/src/components/component-provider/constants/index.ts

@@ -43,7 +43,7 @@ export const INJECT_CONFIG: {
   },
   'pro-form': {
     injectionKey: Symbol(''),
-    // 表单实例由 `:form` 显式传入
+    // 表单实例由 `:form` 显式传入；grid 仅作为启用时的参数默认值，不开启网格
     ignoreProps: ['form'],
     default: { grid: { gutter: 24 } },
   },

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

@@ -54,6 +54,7 @@ import {
 } from '../../../component-provider/constants';
 import { useForm } from '../../hooks/useForm';
 import { getInitProps, warnUnknownComponent } from './utils';
+import { resolveEffectiveDisabled } from '../../utils/disabled';
 import { useLocale } from '../../../../locale';
 
 const cloneDeepIfObject = (val: unknown) =>
@@ -161,14 +162,11 @@ const groupedAttrs = computed(() => {
     t
   );
   const modelPropName = attrs.modelProp ?? initProps.modelProp ?? 'modelValue';
-  // 字段级优先；null / undefined 回退父级与 Provider，'' / 'disabled' 按宿主 Boolean 形态为 true
-  const normalizeDisabled = (value: unknown) =>
-    value === '' || value === 'disabled' ? true : Boolean(value);
-  const effectiveDisabled =
-    attrs.disabled !== undefined && attrs.disabled !== null
-      ? normalizeDisabled(attrs.disabled)
-      : normalizeDisabled(parentDisabled.value) ||
-        normalizeDisabled(initProps.disabled);
+  const effectiveDisabled = resolveEffectiveDisabled(
+    attrs.disabled,
+    parentDisabled.value,
+    initProps.disabled
+  );
   const mergedProps = mergeProps(
     initProps,
     attrs,

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

@@ -21,6 +21,8 @@ const PLACEHOLDER_KEYS: Record<string, string> = {
   'date-picker.week': 'date-picker.placeholder',
   'date-picker.month': 'date-picker.placeholder',
   'date-picker.months': 'date-picker.placeholder',
+  'date-picker.quarter': 'date-picker.placeholder',
+  'date-picker.quarters': 'date-picker.placeholder',
   'date-picker.year': 'date-picker.placeholder',
   'date-picker.years': 'date-picker.placeholder',
   'date-picker.datetime': 'date-picker.placeholder',
@@ -33,6 +35,7 @@ const RANGE_PLACEHOLDER_KEYS: Record<string, [string, string]> = {
   'date-picker.daterange': ['date-picker.start', 'date-picker.end'],
   'date-picker.monthrange': ['date-picker.startMonth', 'date-picker.endMonth'],
   'date-picker.yearrange': ['date-picker.startYear', 'date-picker.endYear'],
+  'date-picker.quarterrange': ['date-picker.start', 'date-picker.end'],
   'date-picker.datetimerange': ['date-picker.startTime', 'date-picker.endTime'],
 };
 

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

@@ -71,10 +71,7 @@ const config = INJECT_CONFIG['pro-form'];
 const injectFormConfig = inject(config.injectionKey, config.default);
 const injectGrid = computed(() => toValue(injectFormConfig)?.grid);
 
-const enableGrid = computed(() => {
-  if (props.grid !== undefined) return !!props.grid;
-  return !!injectGrid.value;
-});
+const enableGrid = computed(() => !!props.grid);
 
 const computedGridProps = computed<GridProps>(() => {
   return enableGrid.value
@@ -184,7 +181,7 @@ const groupedFields = useGroupFieldAttrs(validFields);
               <BaseFormItem
                 :grid="(item.rawField as any).grid ?? props.grid"
                 :fields="item.rawField.fields"
-                :disabled="toValue(item.rawField.disabled)"
+                :disabled="toValue(item.rawField.disabled) ?? props.disabled"
               />
             </template>
             <template v-else>
@@ -192,6 +189,7 @@ const groupedFields = useGroupFieldAttrs(validFields);
                 :ref="el => setComponentRef(item.rawField, el)"
                 v-bind="item.componentProps"
                 :path="item.path"
+                :disabled="toValue(item.rawField.disabled) ?? props.disabled"
               />
             </template>
           </FormItem>

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

@@ -26,7 +26,7 @@
  * @template F - 表单实例类型
  *
  * @param {F} [form] - useForm 返回的表单实例
- * @param {boolean | GridProps} [grid] - 是否启用网格布局；未提供时回退 Provider 注入的 `grid` 配置
+ * @param {boolean | GridProps} [grid] - 是否启用网格布局，默认关闭；Provider 的 `grid` 仅作为启用时的参数配置
  * @param {...FormProps} ...attrs - Element Plus Form 组件的其他属性
  *
  * @slot default - 默认插槽，可用于添加额外内容
@@ -44,7 +44,7 @@
  * ```
  */
 import type { FormProps as ElFormProps } from '../../../../shared/ui';
-import { Form as ElForm } from '../../../../shared/ui';
+import { Form as ElForm, useDisabledContext } from '../../../../shared/ui';
 import {
   computed,
   inject,
@@ -68,6 +68,7 @@ import {
   useReactiveAttrs,
 } from '../../../../shared/core';
 import { useForm, type Form } from '../../hooks/useForm';
+import { resolveDisabled } from '../../utils/disabled';
 
 defineOptions({ name: 'ProForm', inheritAttrs: false });
 
@@ -78,7 +79,7 @@ type Props = {
   form?: F;
 } & /* @vue-ignore */ FormProps;
 const props = withDefaults(defineProps<Props>(), {
-  grid: undefined,
+  grid: false,
   form: undefined,
 });
 
@@ -141,6 +142,14 @@ const formAttrs = computed(() => {
   );
 });
 
+// 表单级禁用声明：显式值（含 false）优先，未声明时仅继承外层 true
+const outerDisabled = useDisabledContext();
+const formDisabled = computed<boolean | undefined>(() => {
+  const explicit = resolveDisabled(toValue(formAttrs.value.disabled));
+  if (explicit !== undefined) return explicit;
+  return outerDisabled.value ? true : undefined;
+});
+
 type ExtractPath<T> = T extends Form<infer D> ? Path<D> : string;
 type FieldSlotProps = VModelProps &
   PathProps & { disabled?: boolean; [x: string]: any };
@@ -169,7 +178,11 @@ provide(InjectionFormSlotsKey, formSlotsRef);
     class="pro-form"
     @submit.prevent
   >
-    <BaseFormItem :fields="fields" :grid="props.grid" />
+    <BaseFormItem
+      :fields="fields"
+      :grid="props.grid"
+      :disabled="formDisabled"
+    />
     <slot />
   </ElForm>
 </template>

package/src/components/form/utils/disabled.ts

@@ -0,0 +1,37 @@
+/**
+ * 归一化禁用值
+ *
+ * @description 字符串形态与宿主 Boolean prop 一致：`''` 与 `disabled` 为 true，其余取真值
+ * @param value - 原始禁用值
+ * @returns 归一化后的布尔值
+ */
+export const normalizeDisabled = (value: unknown) =>
+  value === '' || value === 'disabled' ? true : Boolean(value);
+
+/**
+ * 解析显式声明的禁用值
+ *
+ * @description `undefined` / `null` 为未声明，返回 `undefined`；其余返回归一化结果
+ * @param value - 原始禁用值
+ * @returns 显式禁用值；未声明时为 `undefined`
+ */
+export const resolveDisabled = (value: unknown): boolean | undefined =>
+  value === undefined || value === null ? undefined : normalizeDisabled(value);
+
+/**
+ * 解析控件最终生效的禁用状态
+ *
+ * @description 字段显式声明（含 `false`）优先；未声明时继承外层禁用，外层为真即禁用；
+ * 外层未禁用时回退 Provider 注入的组件级默认值
+ * @param explicit - 字段显式声明的禁用值
+ * @param inherited - 外层禁用上下文取值
+ * @param fallback - Provider 注入的组件级默认禁用值
+ * @returns 最终生效的禁用状态
+ */
+export const resolveEffectiveDisabled = (
+  explicit: unknown,
+  inherited: unknown,
+  fallback: unknown
+): boolean =>
+  resolveDisabled(explicit) ??
+  (normalizeDisabled(inherited) || normalizeDisabled(fallback));

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

@@ -32,6 +32,11 @@
  * 2. 分页变化：分页参数同步后发起查询
  * 3. 重置：查询参数恢复初始值后重新查询
  *
+ * ## 列来源
+ *
+ * 显式 `:columns` 优先于 `:table` 实例的 `columns`；显式列按原样透传给宿主，不补齐 `key`，
+ * 需由调用方提供 `key` / `dataIndex` / `prop`。显式模式下 `setColumn` 与列控入口均不生效。
+ *
  * @template T - 表格实例类型（useTable 返回值）
  *
  * @param {T} [table] - 列表表格对象，来自 useTable
@@ -141,7 +146,7 @@ type Props = {
   searchFormConfig?: SearchFormConfig;
   /** 表格区域包裹容器 */
   tableContainer?: ContainerComponent | false;
-  /** 直接传入列配置（覆盖 :table 实例的 columns） */
+  /** 直接传入列配置（覆盖 :table 实例的 columns）；列需自备 key / dataIndex / prop，显式模式不参与 setColumn 与列控 */
   columns?: Columns<RecordType>;
   /** 直接传入数据源（覆盖 :table 实例的 data） */
   data?: RecordType[];
@@ -379,6 +384,7 @@ const getIndex = (i: number) => {
 /** 调用方是否显式传入 columns（值为 undefined 时视为未指定） */
 const hasExplicitColumns = computed(() => props.columns !== undefined);
 
+/** 显式列原样透传（key 由调用方提供）；table 列经 core 规范化 */
 const normalizedRawColumns = computed(() => {
   const source = (
     (props.columns ?? toValue(props.table?.columns) ?? []) as any[]
@@ -445,15 +451,23 @@ const computedPagination = computed<false | Partial<PaginationProps>>(() => {
 
 const showPagination = computed(() => computedPagination.value !== false);
 
+// pageSize 变更窗口：窗口内忽略宿主级联的 current-change
+let sizeChangeWindow = false;
+
 const onCurrentChange = (current: number) => {
+  if (sizeChangeWindow) return;
   props.table?.setPageParam?.({ current });
   _search();
 };
 
 // 改变 pageSize 时重置回第 1 页并重新查询
 const onSizeChange = (pageSize: number) => {
+  sizeChangeWindow = true;
   props.table?.setPageParam?.({ pageSize, current: 1 });
   _search();
+  nextTick(() => {
+    sizeChangeWindow = false;
+  });
 };
 
 const onPaginationChange = (currentPage: number, pageSize: number) => {