@qin-ui/antd-vue-pro 2.3.4 → 2.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +7 -5
- package/api.json +1 -25
- package/es/__tests__/BaseField.spec.d.ts +2 -0
- package/es/__tests__/BaseField.spec.d.ts.map +1 -0
- package/es/__tests__/BaseFormItem.spec.d.ts +2 -0
- package/es/__tests__/BaseFormItem.spec.d.ts.map +1 -0
- package/es/__tests__/ProForm.spec.d.ts +2 -0
- package/es/__tests__/ProForm.spec.d.ts.map +1 -0
- package/es/__tests__/ProTable.spec.d.ts +2 -0
- package/es/__tests__/ProTable.spec.d.ts.map +1 -0
- package/es/__tests__/SearchForm.spec.d.ts +2 -0
- package/es/__tests__/SearchForm.spec.d.ts.map +1 -0
- package/es/__tests__/controls.spec.d.ts +2 -0
- package/es/__tests__/controls.spec.d.ts.map +1 -0
- package/es/__tests__/cross-package.spec.d.ts +2 -0
- package/es/__tests__/cross-package.spec.d.ts.map +1 -0
- package/es/__tests__/helpers/fixtures.d.ts +15 -0
- package/es/__tests__/helpers/fixtures.d.ts.map +1 -0
- package/es/__tests__/helpers/mount.d.ts +38 -0
- package/es/__tests__/helpers/mount.d.ts.map +1 -0
- package/es/__tests__/hooks-locale.spec.d.ts +2 -0
- package/es/__tests__/hooks-locale.spec.d.ts.map +1 -0
- package/es/__tests__/index.spec.d.ts +2 -0
- package/es/__tests__/index.spec.d.ts.map +1 -0
- package/es/__tests__/integration.spec.d.ts +2 -0
- package/es/__tests__/integration.spec.d.ts.map +1 -0
- package/es/__tests__/setup.d.ts +14 -0
- package/es/__tests__/setup.d.ts.map +1 -0
- package/es/antd-vue-pro.css +13 -13
- package/es/index.js +369 -362
- package/es/index.js.map +1 -1
- package/es/{components → src/components}/component-provider/components/index.vue.d.ts +5 -1
- package/es/src/components/component-provider/components/index.vue.d.ts.map +1 -0
- package/es/{components → src/components}/component-provider/constants/index.d.ts +2 -2
- package/es/src/components/component-provider/constants/index.d.ts.map +1 -0
- package/es/src/components/component-provider/index.d.ts.map +1 -0
- package/es/src/components/component-provider/types/index.d.ts.map +1 -0
- package/es/{components → src/components}/form/components/BaseField/index.vue.d.ts +4 -1
- package/es/src/components/form/components/BaseField/index.vue.d.ts.map +1 -0
- package/es/src/components/form/components/BaseField/utils/index.d.ts +6 -0
- package/es/src/components/form/components/BaseField/utils/index.d.ts.map +1 -0
- package/es/{components → src/components}/form/components/BaseFormItem/index.vue.d.ts +5 -1
- package/es/src/components/form/components/BaseFormItem/index.vue.d.ts.map +1 -0
- package/es/{components → src/components}/form/components/ContainerFragment/index.vue.d.ts +3 -1
- package/es/src/components/form/components/ContainerFragment/index.vue.d.ts.map +1 -0
- package/es/src/components/form/components/ProForm/index.vue.d.ts.map +1 -0
- package/es/src/components/form/components/SlotComponent/index.vue.d.ts +11 -0
- package/es/src/components/form/components/SlotComponent/index.vue.d.ts.map +1 -0
- package/es/src/components/form/components/index.d.ts.map +1 -0
- package/es/src/components/form/constants/index.d.ts.map +1 -0
- package/es/src/components/form/hooks/index.d.ts.map +1 -0
- package/es/src/components/form/hooks/useFields.d.ts.map +1 -0
- package/es/src/components/form/hooks/useForm.d.ts.map +1 -0
- package/es/src/components/form/hooks/useFormRef.d.ts.map +1 -0
- package/es/{components → src/components}/form/hooks/useGroupFieldAttrs.d.ts +4 -0
- package/es/src/components/form/hooks/useGroupFieldAttrs.d.ts.map +1 -0
- package/es/src/components/form/index.d.ts.map +1 -0
- package/es/{components → src/components}/form/types/index.d.ts +26 -2
- package/es/src/components/form/types/index.d.ts.map +1 -0
- package/es/{components → src/components}/table/components/ColumnControl.vue.d.ts +4 -1
- package/es/src/components/table/components/ColumnControl.vue.d.ts.map +1 -0
- package/es/src/components/table/components/DefaultSearchFormContainer.vue.d.ts.map +1 -0
- package/es/src/components/table/components/DefaultTableContainer.vue.d.ts.map +1 -0
- package/es/{components → src/components}/table/components/ProTable.vue.d.ts +4 -3
- package/es/src/components/table/components/ProTable.vue.d.ts.map +1 -0
- package/es/{components → src/components}/table/components/SearchForm.vue.d.ts +14 -4
- package/es/src/components/table/components/SearchForm.vue.d.ts.map +1 -0
- package/es/src/components/table/components/SizeControl.vue.d.ts.map +1 -0
- package/es/src/components/table/components/icons/ColumnHeightOutlined.vue.d.ts.map +1 -0
- package/es/src/components/table/components/icons/DownOutlined.vue.d.ts.map +1 -0
- package/es/src/components/table/components/icons/FilterOutlined.vue.d.ts.map +1 -0
- package/es/src/components/table/components/index.d.ts.map +1 -0
- package/es/src/components/table/hooks/index.d.ts.map +1 -0
- package/es/src/components/table/hooks/useTable.d.ts.map +1 -0
- package/es/src/components/table/index.d.ts.map +1 -0
- package/es/{components → src/components}/table/types/index.d.ts +1 -1
- package/es/src/components/table/types/index.d.ts.map +1 -0
- package/es/{index.d.ts → src/index.d.ts} +1 -1
- package/es/src/index.d.ts.map +1 -0
- package/es/{locale → src/locale}/index.d.ts +1 -1
- package/es/src/locale/index.d.ts.map +1 -0
- package/es/src/shared/core/index.d.ts +6 -0
- package/es/src/shared/core/index.d.ts.map +1 -0
- package/es/src/shared/ui/index.d.ts.map +1 -0
- package/package.json +8 -3
- package/src/components/component-provider/components/index.vue +41 -11
- package/src/components/component-provider/constants/index.ts +6 -4
- package/src/components/form/components/BaseField/index.vue +61 -37
- package/src/components/form/components/BaseField/utils/index.ts +17 -11
- package/src/components/form/components/BaseFormItem/index.vue +47 -33
- package/src/components/form/components/ContainerFragment/index.vue +4 -2
- package/src/components/form/components/ProForm/index.vue +72 -20
- package/src/components/form/components/SlotComponent/index.vue +6 -4
- package/src/components/form/hooks/useGroupFieldAttrs.ts +16 -4
- package/src/components/form/types/index.ts +26 -2
- package/src/components/table/components/ColumnControl.vue +17 -22
- package/src/components/table/components/ProTable.vue +129 -83
- package/src/components/table/components/SearchForm.vue +45 -198
- package/src/components/table/components/SizeControl.vue +4 -2
- package/src/components/table/types/index.ts +1 -1
- package/src/index.ts +1 -1
- package/src/locale/index.ts +1 -1
- package/src/shared/core/index.ts +15 -1
- package/es/components/component-provider/components/index.vue.d.ts.map +0 -1
- package/es/components/component-provider/constants/index.d.ts.map +0 -1
- package/es/components/component-provider/index.d.ts.map +0 -1
- package/es/components/component-provider/types/index.d.ts.map +0 -1
- package/es/components/form/components/BaseField/index.vue.d.ts.map +0 -1
- package/es/components/form/components/BaseField/utils/index.d.ts +0 -5
- package/es/components/form/components/BaseField/utils/index.d.ts.map +0 -1
- package/es/components/form/components/BaseFormItem/index.vue.d.ts.map +0 -1
- package/es/components/form/components/ContainerFragment/index.vue.d.ts.map +0 -1
- package/es/components/form/components/ProForm/index.vue.d.ts.map +0 -1
- package/es/components/form/components/SlotComponent/index.vue.d.ts +0 -7
- package/es/components/form/components/SlotComponent/index.vue.d.ts.map +0 -1
- package/es/components/form/components/index.d.ts.map +0 -1
- package/es/components/form/constants/index.d.ts.map +0 -1
- package/es/components/form/hooks/index.d.ts.map +0 -1
- package/es/components/form/hooks/useFields.d.ts.map +0 -1
- package/es/components/form/hooks/useForm.d.ts.map +0 -1
- package/es/components/form/hooks/useFormRef.d.ts.map +0 -1
- package/es/components/form/hooks/useGroupFieldAttrs.d.ts.map +0 -1
- package/es/components/form/index.d.ts.map +0 -1
- package/es/components/form/types/index.d.ts.map +0 -1
- package/es/components/table/components/ColumnControl.vue.d.ts.map +0 -1
- package/es/components/table/components/DefaultSearchFormContainer.vue.d.ts.map +0 -1
- package/es/components/table/components/DefaultTableContainer.vue.d.ts.map +0 -1
- package/es/components/table/components/ProTable.vue.d.ts.map +0 -1
- package/es/components/table/components/SearchForm.vue.d.ts.map +0 -1
- package/es/components/table/components/SizeControl.vue.d.ts.map +0 -1
- package/es/components/table/components/icons/ColumnHeightOutlined.vue.d.ts.map +0 -1
- package/es/components/table/components/icons/DownOutlined.vue.d.ts.map +0 -1
- package/es/components/table/components/icons/FilterOutlined.vue.d.ts.map +0 -1
- package/es/components/table/components/index.d.ts.map +0 -1
- package/es/components/table/hooks/index.d.ts.map +0 -1
- package/es/components/table/hooks/useTable.d.ts.map +0 -1
- package/es/components/table/index.d.ts.map +0 -1
- package/es/components/table/types/index.d.ts.map +0 -1
- package/es/index.d.ts.map +0 -1
- package/es/locale/index.d.ts.map +0 -1
- package/es/shared/core/index.d.ts +0 -6
- package/es/shared/core/index.d.ts.map +0 -1
- package/es/shared/ui/index.d.ts.map +0 -1
- /package/es/{components → src/components}/component-provider/index.d.ts +0 -0
- /package/es/{components → src/components}/component-provider/types/index.d.ts +0 -0
- /package/es/{components → src/components}/form/components/ProForm/index.vue.d.ts +0 -0
- /package/es/{components → src/components}/form/components/index.d.ts +0 -0
- /package/es/{components → src/components}/form/constants/index.d.ts +0 -0
- /package/es/{components → src/components}/form/hooks/index.d.ts +0 -0
- /package/es/{components → src/components}/form/hooks/useFields.d.ts +0 -0
- /package/es/{components → src/components}/form/hooks/useForm.d.ts +0 -0
- /package/es/{components → src/components}/form/hooks/useFormRef.d.ts +0 -0
- /package/es/{components → src/components}/form/index.d.ts +0 -0
- /package/es/{components → src/components}/table/components/DefaultSearchFormContainer.vue.d.ts +0 -0
- /package/es/{components → src/components}/table/components/DefaultTableContainer.vue.d.ts +0 -0
- /package/es/{components → src/components}/table/components/SizeControl.vue.d.ts +0 -0
- /package/es/{components → src/components}/table/components/icons/ColumnHeightOutlined.vue.d.ts +0 -0
- /package/es/{components → src/components}/table/components/icons/DownOutlined.vue.d.ts +0 -0
- /package/es/{components → src/components}/table/components/icons/FilterOutlined.vue.d.ts +0 -0
- /package/es/{components → src/components}/table/components/index.d.ts +0 -0
- /package/es/{components → src/components}/table/hooks/index.d.ts +0 -0
- /package/es/{components → src/components}/table/hooks/useTable.d.ts +0 -0
- /package/es/{components → src/components}/table/index.d.ts +0 -0
- /package/es/{shared → src/shared}/ui/index.d.ts +0 -0
|
@@ -33,9 +33,10 @@ import {
|
|
|
33
33
|
inject,
|
|
34
34
|
mergeProps,
|
|
35
35
|
ref,
|
|
36
|
+
toValue,
|
|
36
37
|
useAttrs,
|
|
37
38
|
} from 'vue';
|
|
38
|
-
import { cloneDeep
|
|
39
|
+
import { cloneDeep } from '../../../../shared/core';
|
|
39
40
|
import {
|
|
40
41
|
useInjectDisabled,
|
|
41
42
|
useInjectFormItemContext,
|
|
@@ -43,9 +44,12 @@ import {
|
|
|
43
44
|
import type { Field } from '../../types';
|
|
44
45
|
import { ContainerFragment, SlotComponent } from '..';
|
|
45
46
|
import { componentMap, InjectionFormSlotsKey } from '../../constants';
|
|
46
|
-
import {
|
|
47
|
+
import {
|
|
48
|
+
INJECT_COMPONENTS,
|
|
49
|
+
getInjectConfig,
|
|
50
|
+
} from '../../../component-provider/constants';
|
|
47
51
|
import { useForm } from '../../hooks/useForm';
|
|
48
|
-
import { getInitProps } from './utils';
|
|
52
|
+
import { getInitProps, warnUnknownComponent } from './utils';
|
|
49
53
|
import { useLocale } from '../../../../locale';
|
|
50
54
|
|
|
51
55
|
defineOptions({ name: 'BaseField', inheritAttrs: false });
|
|
@@ -54,12 +58,14 @@ type Props = {
|
|
|
54
58
|
component?: string | Component;
|
|
55
59
|
path?: string;
|
|
56
60
|
};
|
|
57
|
-
const
|
|
61
|
+
const props = withDefaults(defineProps<Props>(), {
|
|
62
|
+
component: undefined,
|
|
63
|
+
path: '',
|
|
64
|
+
});
|
|
58
65
|
|
|
59
66
|
const { t } = useLocale();
|
|
60
67
|
|
|
61
68
|
const form = useForm(false);
|
|
62
|
-
const { getFormData, setFormData } = form;
|
|
63
69
|
|
|
64
70
|
const componentRef = ref<any>();
|
|
65
71
|
|
|
@@ -70,14 +76,23 @@ const triggerFormItemChange = () => {
|
|
|
70
76
|
|
|
71
77
|
const attrs: any = useAttrs();
|
|
72
78
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
79
|
+
// 全局默认配置注入:key = 组件名 + picker 修饰段;inject 须在 setup 同步期调用
|
|
80
|
+
const pickerVal = attrs.picker;
|
|
81
|
+
const injectConfigKey =
|
|
82
|
+
typeof props.component === 'string'
|
|
83
|
+
? [props.component, pickerVal].filter(Boolean).join('.')
|
|
84
|
+
: '';
|
|
85
|
+
const componentInjectConfig = injectConfigKey
|
|
86
|
+
? getInjectConfig(injectConfigKey)
|
|
87
|
+
: undefined;
|
|
88
|
+
const rawInjectComponentProps = componentInjectConfig
|
|
89
|
+
? inject(componentInjectConfig.injectionKey, componentInjectConfig.default)
|
|
90
|
+
: undefined;
|
|
76
91
|
|
|
77
92
|
// setter: 向 formData 写入值,支持 valueFormatter / valueFormatter.set 转换
|
|
78
93
|
const value = computed({
|
|
79
94
|
get() {
|
|
80
|
-
let val = getFormData?.(path);
|
|
95
|
+
let val = form.getFormData?.(props.path);
|
|
81
96
|
const { valueFormatter } = groupedAttrs.value;
|
|
82
97
|
if (
|
|
83
98
|
typeof valueFormatter === 'object' &&
|
|
@@ -90,14 +105,23 @@ const value = computed({
|
|
|
90
105
|
set(val) {
|
|
91
106
|
let newVal = val;
|
|
92
107
|
const { valueFormatter } = groupedAttrs.value;
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
108
|
+
const setFormatter =
|
|
109
|
+
typeof valueFormatter === 'function'
|
|
110
|
+
? valueFormatter
|
|
111
|
+
: typeof valueFormatter === 'object' &&
|
|
112
|
+
typeof valueFormatter?.set === 'function'
|
|
113
|
+
? valueFormatter.set
|
|
114
|
+
: undefined;
|
|
115
|
+
|
|
116
|
+
if (setFormatter) {
|
|
117
|
+
// 仅当 set 转换函数需要旧值参数时,才获取旧值上下文
|
|
118
|
+
const oldVal =
|
|
119
|
+
setFormatter.length > 1
|
|
120
|
+
? cloneDeep(form.getFormData?.(props.path))
|
|
121
|
+
: undefined;
|
|
122
|
+
newVal = setFormatter(val, oldVal);
|
|
99
123
|
}
|
|
100
|
-
setFormData?.(path, newVal);
|
|
124
|
+
form.setFormData?.(props.path, newVal);
|
|
101
125
|
triggerFormItemChange();
|
|
102
126
|
},
|
|
103
127
|
});
|
|
@@ -109,28 +133,24 @@ const parentDisabled = useInjectDisabled();
|
|
|
109
133
|
* 属性分为三类:绑定属性(v-model)、组件属性(传递给组件)、插槽(动态渲染)
|
|
110
134
|
*/
|
|
111
135
|
const groupedAttrs = computed(() => {
|
|
136
|
+
const currentInjectProps = toValue(rawInjectComponentProps) || {};
|
|
112
137
|
const initProps = getInitProps(
|
|
113
|
-
{
|
|
114
|
-
|
|
115
|
-
picker: attrs.picker,
|
|
116
|
-
} as Field,
|
|
138
|
+
{ component: props.component, picker: attrs.picker } as Field,
|
|
139
|
+
currentInjectProps,
|
|
117
140
|
t
|
|
118
141
|
);
|
|
142
|
+
const effectiveModelProp = attrs.modelProp ?? initProps.modelProp ?? 'value';
|
|
119
143
|
const mergedProps = mergeProps(
|
|
120
144
|
initProps,
|
|
121
145
|
attrs,
|
|
122
146
|
{ class: attrs.componentClass, style: attrs.componentStyle },
|
|
123
|
-
{ class: initProps.componentClass, style: initProps.componentStyle },
|
|
124
147
|
{ disabled: attrs.disabled ?? parentDisabled.value ?? initProps.disabled },
|
|
125
|
-
{ modelProp:
|
|
148
|
+
{ modelProp: effectiveModelProp }
|
|
126
149
|
) as Required<Field>;
|
|
127
150
|
|
|
128
151
|
// prettier-ignore
|
|
129
152
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
130
|
-
const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, ...
|
|
131
|
-
|
|
132
|
-
// 从剩余属性中移除 v-model 绑定属性,避免重复绑定
|
|
133
|
-
const bindAttrs = omit(rest, [modelProp, `onUpdate:${modelProp}`]);
|
|
153
|
+
const { valueFormatter, modelProp, slots, componentClass, componentStyle, componentContainer, [effectiveModelProp]: _modelVal, [`onUpdate:${effectiveModelProp}`]: _onUpdateModelVal, ...bindAttrs } = mergedProps as any;
|
|
134
154
|
|
|
135
155
|
return {
|
|
136
156
|
attrs: bindAttrs,
|
|
@@ -154,16 +174,17 @@ const customComponents = inject(INJECT_COMPONENTS, {});
|
|
|
154
174
|
* ProForm 插槽 → 自定义组件映射 → 内置组件映射 → 原始 component 值
|
|
155
175
|
*/
|
|
156
176
|
const is = computed(() => {
|
|
157
|
-
const teleportSlot = path && formSlots?.[path];
|
|
177
|
+
const teleportSlot = props.path && formSlots?.[props.path];
|
|
158
178
|
if (teleportSlot) return teleportSlot;
|
|
159
|
-
if (typeof component === 'string') {
|
|
160
|
-
|
|
161
|
-
(customComponents as any)[component] ||
|
|
162
|
-
(componentMap as any)[component]
|
|
163
|
-
|
|
164
|
-
);
|
|
179
|
+
if (typeof props.component === 'string') {
|
|
180
|
+
const resolved =
|
|
181
|
+
toValue(customComponents as any)?.[props.component] ||
|
|
182
|
+
(componentMap as any)[props.component];
|
|
183
|
+
if (resolved) return resolved;
|
|
184
|
+
warnUnknownComponent(props.component);
|
|
185
|
+
return props.component;
|
|
165
186
|
}
|
|
166
|
-
return component;
|
|
187
|
+
return props.component;
|
|
167
188
|
});
|
|
168
189
|
|
|
169
190
|
defineExpose({
|
|
@@ -173,21 +194,24 @@ defineExpose({
|
|
|
173
194
|
</script>
|
|
174
195
|
|
|
175
196
|
<template>
|
|
176
|
-
<ContainerFragment
|
|
197
|
+
<ContainerFragment
|
|
198
|
+
:component="groupedAttrs.componentContainer"
|
|
199
|
+
:path="props.path"
|
|
200
|
+
>
|
|
177
201
|
<component
|
|
178
202
|
:is="is"
|
|
179
203
|
v-if="is"
|
|
180
204
|
v-bind="groupedAttrs.attrs"
|
|
181
205
|
ref="componentRef"
|
|
182
206
|
v-model:[`${groupedAttrs.modelProp}`]="value"
|
|
183
|
-
:path="path"
|
|
207
|
+
:path="props.path"
|
|
184
208
|
>
|
|
185
209
|
<template
|
|
186
210
|
v-for="(slot, name) in groupedAttrs.slots"
|
|
187
211
|
:key="name"
|
|
188
212
|
#[name]="scoped"
|
|
189
213
|
>
|
|
190
|
-
<SlotComponent :path="path" v-bind="scoped" :component="slot" />
|
|
214
|
+
<SlotComponent :path="props.path" v-bind="scoped" :component="slot" />
|
|
191
215
|
</template>
|
|
192
216
|
</component>
|
|
193
217
|
</ContainerFragment>
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
import { Field } from '../../../types';
|
|
2
|
-
import { getInjectConfig } from '../../../../component-provider/constants';
|
|
3
|
-
import { inject } from 'vue';
|
|
4
2
|
|
|
5
3
|
type LocaleT = (
|
|
6
4
|
key: string,
|
|
@@ -17,11 +15,7 @@ const PLACEHOLDER_KEYS: Record<string, string> = {
|
|
|
17
15
|
cascader: 'select.placeholder',
|
|
18
16
|
};
|
|
19
17
|
|
|
20
|
-
/**
|
|
21
|
-
* 根据组件 key 兜底生成 locale 占位符
|
|
22
|
-
*
|
|
23
|
-
* @description 用户通过 componentVars 或字段属性显式设置了占位符时不再兜底。
|
|
24
|
-
*/
|
|
18
|
+
/** 根据组件 key 兜底生成 locale 占位符;已显式设置占位符(componentVars 或字段属性)时不兜底 */
|
|
25
19
|
const getPlaceholderProps = (
|
|
26
20
|
key: string,
|
|
27
21
|
injectProps: Record<string, any>,
|
|
@@ -32,15 +26,27 @@ const getPlaceholderProps = (
|
|
|
32
26
|
return { placeholder: t(placeholderKey) };
|
|
33
27
|
};
|
|
34
28
|
|
|
35
|
-
export const getInitProps = (
|
|
29
|
+
export const getInitProps = (
|
|
30
|
+
field: Field,
|
|
31
|
+
injectProps: Record<string, any> = {},
|
|
32
|
+
t: LocaleT
|
|
33
|
+
): Record<string, any> => {
|
|
36
34
|
const { component } = field as any;
|
|
37
35
|
const picker = component === 'date-picker' ? '' : (field as any).picker;
|
|
38
36
|
if (typeof component === 'string') {
|
|
39
37
|
const k = [component, picker].filter(Boolean).join('.');
|
|
40
|
-
const config = getInjectConfig(k);
|
|
41
|
-
if (!config) return getPlaceholderProps(k, {}, t);
|
|
42
|
-
const injectProps = inject(config.injectionKey, config.default);
|
|
43
38
|
return { ...injectProps, ...getPlaceholderProps(k, injectProps, t) };
|
|
44
39
|
}
|
|
45
40
|
return {};
|
|
46
41
|
};
|
|
42
|
+
|
|
43
|
+
/** 已告警过的未知组件名(模块级去重,避免 computed 重算导致刷屏) */
|
|
44
|
+
const warnedUnknownComponents = new Set<string>();
|
|
45
|
+
|
|
46
|
+
export function warnUnknownComponent(name: string) {
|
|
47
|
+
if (warnedUnknownComponents.has(name)) return;
|
|
48
|
+
warnedUnknownComponents.add(name);
|
|
49
|
+
console.warn(
|
|
50
|
+
`[pro-components] 未识别的组件类型 "${name}",已降级为原生元素渲染。如为自定义组件请在 componentMap 或 ProComponentProvider 中注册。`
|
|
51
|
+
);
|
|
52
|
+
}
|
|
@@ -31,7 +31,7 @@ import {
|
|
|
31
31
|
GridProps,
|
|
32
32
|
useProviderDisabled,
|
|
33
33
|
} from '../../../../shared/ui';
|
|
34
|
-
import { computed, inject, toValue } from 'vue';
|
|
34
|
+
import { computed, inject, toRaw, toValue } from 'vue';
|
|
35
35
|
import type { Fields, Grid } from '../../types';
|
|
36
36
|
import { BaseField, SlotComponent, ContainerFragment } from '..';
|
|
37
37
|
import { useGroupFieldAttrs } from '../../hooks/useGroupFieldAttrs';
|
|
@@ -44,49 +44,65 @@ type Props = {
|
|
|
44
44
|
fields?: Fields;
|
|
45
45
|
disabled?: boolean;
|
|
46
46
|
};
|
|
47
|
-
const {
|
|
48
|
-
grid
|
|
49
|
-
fields
|
|
50
|
-
disabled
|
|
51
|
-
}
|
|
47
|
+
const props = withDefaults(defineProps<Props>(), {
|
|
48
|
+
grid: undefined,
|
|
49
|
+
fields: () => [],
|
|
50
|
+
disabled: undefined,
|
|
51
|
+
});
|
|
52
52
|
|
|
53
|
-
const validFields = computed(() =>
|
|
53
|
+
const validFields = computed(() =>
|
|
54
|
+
// hidden 支持 Ref/ComputedRef/getter 等响应式形态(统一使用 toValue 取值)
|
|
55
|
+
(props.fields ?? []).filter(field => !toValue(field.hidden))
|
|
56
|
+
);
|
|
54
57
|
|
|
55
|
-
useProviderDisabled(computed(() => disabled));
|
|
58
|
+
useProviderDisabled(computed(() => props.disabled));
|
|
56
59
|
|
|
57
60
|
const config = INJECT_CONFIG['pro-form'];
|
|
58
|
-
|
|
59
|
-
const
|
|
61
|
+
const injectFormConfig = inject(config.injectionKey, config.default);
|
|
62
|
+
const injectGrid = computed(() => toValue(injectFormConfig)?.grid);
|
|
60
63
|
|
|
61
64
|
const enableGrid = computed(() => {
|
|
62
|
-
if (grid !== undefined) return !!grid;
|
|
63
|
-
return !!injectGrid;
|
|
65
|
+
if (props.grid !== undefined) return !!props.grid;
|
|
66
|
+
return !!injectGrid.value;
|
|
64
67
|
});
|
|
65
68
|
|
|
66
69
|
const computedGridProps = computed<GridProps>(() => {
|
|
67
70
|
return enableGrid.value
|
|
68
|
-
? { ...getObject(injectGrid), ...getObject(grid) }
|
|
71
|
+
? { ...getObject(injectGrid.value), ...getObject(props.grid) }
|
|
69
72
|
: {};
|
|
70
73
|
});
|
|
71
74
|
|
|
72
|
-
|
|
73
|
-
|
|
75
|
+
/**
|
|
76
|
+
* 以字段原始对象为 key 登记 FormItem / 控件实例,供 getFormItemRef / getComponentRef 读取;
|
|
77
|
+
* WeakMap 不参与响应式追踪,条目随字段对象回收自动释放。
|
|
78
|
+
*/
|
|
79
|
+
const formItemInstanceMap = new WeakMap<object, any>();
|
|
80
|
+
const componentInstanceMap = new WeakMap<object, any>();
|
|
74
81
|
|
|
75
|
-
const
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
82
|
+
const setFormItemRef = (field: any, el: any, formItemProps?: any) => {
|
|
83
|
+
if (!field || typeof field !== 'object') return;
|
|
84
|
+
const raw = toRaw(field);
|
|
85
|
+
if (el) {
|
|
86
|
+
formItemInstanceMap.set(raw, el);
|
|
87
|
+
raw.getFormItemRef = () => formItemInstanceMap.get(raw);
|
|
88
|
+
raw.getFormItemComputedProps = () => formItemProps;
|
|
89
|
+
} else {
|
|
90
|
+
formItemInstanceMap.delete(raw);
|
|
91
|
+
}
|
|
81
92
|
};
|
|
82
93
|
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
94
|
+
const setComponentRef = (field: any, el: any) => {
|
|
95
|
+
if (!field || typeof field !== 'object') return;
|
|
96
|
+
const raw = toRaw(field);
|
|
97
|
+
if (el) {
|
|
98
|
+
componentInstanceMap.set(raw, el);
|
|
99
|
+
raw.getComponentRef = () =>
|
|
100
|
+
componentInstanceMap.get(raw)?.getComponentRef();
|
|
101
|
+
raw.getComponentComputedProps = () =>
|
|
102
|
+
componentInstanceMap.get(raw)?.getComponentComputedProps();
|
|
103
|
+
} else {
|
|
104
|
+
componentInstanceMap.delete(raw);
|
|
105
|
+
}
|
|
90
106
|
};
|
|
91
107
|
|
|
92
108
|
const groupedFields = useGroupFieldAttrs(validFields);
|
|
@@ -108,10 +124,9 @@ const groupedFields = useGroupFieldAttrs(validFields);
|
|
|
108
124
|
>
|
|
109
125
|
<FormItem
|
|
110
126
|
v-bind="item.formItemProps"
|
|
111
|
-
:ref="el => (
|
|
127
|
+
:ref="el => setFormItemRef(item.rawField, el, item.formItemProps)"
|
|
112
128
|
:name="toPath(item.path)"
|
|
113
129
|
:path="item.path"
|
|
114
|
-
@vue:mounted="onFormItemMounted(index, item.formItemProps)"
|
|
115
130
|
>
|
|
116
131
|
<template
|
|
117
132
|
v-for="(slot, name) in item.formItemSlots"
|
|
@@ -126,17 +141,16 @@ const groupedFields = useGroupFieldAttrs(validFields);
|
|
|
126
141
|
</template>
|
|
127
142
|
<template v-if="item.rawField.fields">
|
|
128
143
|
<BaseFormItem
|
|
129
|
-
:grid="(item.rawField as any).grid ?? grid"
|
|
144
|
+
:grid="(item.rawField as any).grid ?? props.grid"
|
|
130
145
|
:fields="item.rawField.fields"
|
|
131
146
|
:disabled="toValue(item.rawField.disabled)"
|
|
132
147
|
/>
|
|
133
148
|
</template>
|
|
134
149
|
<template v-else>
|
|
135
150
|
<BaseField
|
|
136
|
-
:ref="el => (
|
|
151
|
+
:ref="el => setComponentRef(item.rawField, el)"
|
|
137
152
|
v-bind="item.componentProps"
|
|
138
153
|
:path="item.path"
|
|
139
|
-
@vue:mounted="onComponentMounted(index)"
|
|
140
154
|
/>
|
|
141
155
|
</template>
|
|
142
156
|
</FormItem>
|
|
@@ -11,13 +11,15 @@ type Props = {
|
|
|
11
11
|
component?: ContainerComponent;
|
|
12
12
|
};
|
|
13
13
|
|
|
14
|
-
defineProps<Props>()
|
|
14
|
+
const props = withDefaults(defineProps<Props>(), {
|
|
15
|
+
component: undefined,
|
|
16
|
+
});
|
|
15
17
|
|
|
16
18
|
defineOptions({ name: 'ContainerFragment', inheritAttrs: false });
|
|
17
19
|
</script>
|
|
18
20
|
|
|
19
21
|
<template>
|
|
20
|
-
<component :is="component" v-if="component" v-bind="$attrs">
|
|
22
|
+
<component :is="props.component" v-if="props.component" v-bind="$attrs">
|
|
21
23
|
<slot />
|
|
22
24
|
</component>
|
|
23
25
|
<slot v-else />
|
|
@@ -43,38 +43,89 @@
|
|
|
43
43
|
* ```
|
|
44
44
|
*/
|
|
45
45
|
import { Form as AForm, FormProps as AFormProps } from '../../../../shared/ui';
|
|
46
|
-
import {
|
|
46
|
+
import {
|
|
47
|
+
computed,
|
|
48
|
+
inject,
|
|
49
|
+
mergeProps,
|
|
50
|
+
provide,
|
|
51
|
+
toValue,
|
|
52
|
+
useAttrs,
|
|
53
|
+
type Slot,
|
|
54
|
+
} from 'vue';
|
|
47
55
|
import { INJECT_CONFIG } from '../../../component-provider/constants';
|
|
48
56
|
import { BaseFormItem } from '..';
|
|
49
57
|
import { InjectionFormKey, InjectionFormSlotsKey } from '../../constants';
|
|
50
58
|
import type { Grid, VModelProps, PathProps } from '../../types';
|
|
51
|
-
import {
|
|
52
|
-
|
|
59
|
+
import {
|
|
60
|
+
Path,
|
|
61
|
+
camelizeProperties,
|
|
62
|
+
createFormProxy,
|
|
63
|
+
} from '../../../../shared/core';
|
|
64
|
+
import { useForm, type Form } from '../../hooks/useForm';
|
|
53
65
|
|
|
54
66
|
defineOptions({ name: 'ProForm', inheritAttrs: false });
|
|
55
67
|
|
|
56
|
-
type
|
|
68
|
+
type MyFormProps = Partial<Omit<AFormProps, 'model'>>;
|
|
57
69
|
|
|
58
|
-
type Props = { grid?: Grid; form?: F } & /* @vue-ignore */
|
|
59
|
-
const
|
|
70
|
+
type Props = { grid?: Grid; form?: F } & /* @vue-ignore */ MyFormProps;
|
|
71
|
+
const props = withDefaults(defineProps<Props>(), {
|
|
72
|
+
grid: false,
|
|
73
|
+
form: undefined,
|
|
74
|
+
});
|
|
60
75
|
|
|
61
76
|
/**
|
|
62
77
|
* 依赖注入中心:
|
|
63
|
-
*
|
|
64
|
-
*
|
|
78
|
+
* 若外部未传 form 实例,则自动初始化内部表单实例;
|
|
79
|
+
* 将 Form 实例注入到 Vue Context 中,供深层子组件(如 BaseFormItem, BaseField, 自定义插槽)跨层级直接访问数据和方法。
|
|
65
80
|
*/
|
|
66
|
-
|
|
81
|
+
const fallbackForm = props.form ? undefined : useForm();
|
|
82
|
+
const currentForm = computed(
|
|
83
|
+
() => props.form ?? (fallbackForm as unknown as F)
|
|
84
|
+
);
|
|
85
|
+
|
|
86
|
+
/**
|
|
87
|
+
* 表单实例代理:操作全部转发至 currentForm 当前实例;
|
|
88
|
+
* 下游持有本代理即可,:form 运行期替换无需重绑;方法具有引用记忆化。
|
|
89
|
+
*/
|
|
90
|
+
const formProxy = createFormProxy(() => currentForm.value);
|
|
91
|
+
|
|
92
|
+
provide(InjectionFormKey, formProxy);
|
|
93
|
+
|
|
94
|
+
const fields = computed(() => {
|
|
95
|
+
const f = currentForm.value?.fields;
|
|
96
|
+
return (Array.isArray(f) ? f : f?.value) ?? [];
|
|
97
|
+
});
|
|
98
|
+
const formData = computed(() => currentForm.value?.formData);
|
|
99
|
+
const setFormRef = (el: any) => currentForm.value?.setFormRef?.(el);
|
|
67
100
|
|
|
68
|
-
|
|
101
|
+
let formInstanceCounter = 0;
|
|
102
|
+
const formInstanceKeyMap = new WeakMap<object, number>();
|
|
103
|
+
const getFormKey = (f: object) => {
|
|
104
|
+
if (!formInstanceKeyMap.has(f)) {
|
|
105
|
+
formInstanceKeyMap.set(f, ++formInstanceCounter);
|
|
106
|
+
}
|
|
107
|
+
return formInstanceKeyMap.get(f)!;
|
|
108
|
+
};
|
|
109
|
+
const formKey = computed(() => getFormKey(currentForm.value as any));
|
|
69
110
|
|
|
70
111
|
const config = INJECT_CONFIG['pro-form'];
|
|
112
|
+
const injectFormConfig = inject(config.injectionKey, config.default);
|
|
71
113
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
)
|
|
114
|
+
const attrs = useAttrs();
|
|
115
|
+
|
|
116
|
+
/**
|
|
117
|
+
* 从 ProComponentProvider 获取全局配置,响应式派生以支持动态配置变更
|
|
118
|
+
*/
|
|
119
|
+
const injectAttrs = computed(() => {
|
|
120
|
+
const raw = toValue(injectFormConfig);
|
|
121
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
122
|
+
const { grid: _injectGrid, ...rest } = raw || {};
|
|
123
|
+
return rest;
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
const formAttrs = computed(() => {
|
|
127
|
+
return mergeProps(injectAttrs.value, camelizeProperties(attrs));
|
|
128
|
+
});
|
|
78
129
|
|
|
79
130
|
type ExtractPath<T> = T extends Form<infer D> ? Path<D> : string;
|
|
80
131
|
type FieldSlotProps = VModelProps &
|
|
@@ -87,17 +138,18 @@ const slots = defineSlots<Partial<FieldSlots & { default: Slot }>>();
|
|
|
87
138
|
* 动态插槽映射中心 (Slot Teleporting):
|
|
88
139
|
* 在 setup 同步期直接提供响应式 slots 上下文容器,供深层 BaseField 按需动态获取插槽
|
|
89
140
|
*/
|
|
90
|
-
provide(InjectionFormSlotsKey,
|
|
141
|
+
provide(InjectionFormSlotsKey, slots);
|
|
91
142
|
</script>
|
|
92
143
|
|
|
93
144
|
<template>
|
|
94
145
|
<AForm
|
|
95
|
-
:
|
|
146
|
+
:key="formKey"
|
|
147
|
+
:ref="setFormRef"
|
|
96
148
|
:model="formData"
|
|
97
|
-
v-bind="
|
|
149
|
+
v-bind="formAttrs"
|
|
98
150
|
class="pro-form"
|
|
99
151
|
>
|
|
100
|
-
<BaseFormItem :fields="fields" :grid="grid" />
|
|
152
|
+
<BaseFormItem :fields="fields" :grid="props.grid" />
|
|
101
153
|
<slot />
|
|
102
154
|
</AForm>
|
|
103
155
|
</template>
|
|
@@ -13,14 +13,16 @@ defineOptions({ name: 'SlotComponent', inheritAttrs: false });
|
|
|
13
13
|
type Props = {
|
|
14
14
|
component?: SlotComponentType;
|
|
15
15
|
};
|
|
16
|
-
defineProps<Props>()
|
|
16
|
+
const props = withDefaults(defineProps<Props>(), {
|
|
17
|
+
component: undefined,
|
|
18
|
+
});
|
|
17
19
|
</script>
|
|
18
20
|
|
|
19
21
|
<template>
|
|
20
22
|
<component
|
|
21
|
-
:is="component"
|
|
22
|
-
v-if="isVNode(component) || typeof component === 'function'"
|
|
23
|
+
:is="props.component"
|
|
24
|
+
v-if="isVNode(props.component) || typeof props.component === 'function'"
|
|
23
25
|
v-bind="$attrs"
|
|
24
26
|
/>
|
|
25
|
-
<template v-else>{{ component }}</template>
|
|
27
|
+
<template v-else>{{ props.component }}</template>
|
|
26
28
|
</template>
|
|
@@ -14,6 +14,9 @@ const formItemPropKeys = Object.keys(formItemProps()).concat([
|
|
|
14
14
|
'formItemContainer',
|
|
15
15
|
]);
|
|
16
16
|
const gridItemPropKeys = Object.keys(gridItemProps());
|
|
17
|
+
// 模块级 Set:字段循环内 O(1) 命中,替代数组 includes 线性扫描
|
|
18
|
+
const gridItemPropKeySet = new Set<string>(gridItemPropKeys);
|
|
19
|
+
const formItemPropKeySet = new Set<string>(formItemPropKeys);
|
|
17
20
|
|
|
18
21
|
export interface GroupedField {
|
|
19
22
|
path: string;
|
|
@@ -27,12 +30,17 @@ export interface GroupedField {
|
|
|
27
30
|
|
|
28
31
|
/**
|
|
29
32
|
* 将 fields 配置数组逐个拆分为 grid / formItem / component / slots 分组。
|
|
33
|
+
*
|
|
34
|
+
* @description
|
|
35
|
+
* 1. 响应式集成 ProComponentProvider 的 `pro-form-item` 全局变量配置;
|
|
36
|
+
* 2. 剥离 `extraProps`(用户自定义字段标识袋):保留在字段原始对象上供业务层存取,渲染层经解构剥离,避免落入 componentProps 透传为无效 DOM 属性。
|
|
30
37
|
*/
|
|
31
38
|
export function useGroupFieldAttrs(validFields: ComputedRef<Field[]>) {
|
|
32
39
|
const config = INJECT_CONFIG['pro-form-item'];
|
|
33
40
|
const injectFormItemProps = inject(config.injectionKey, config.default);
|
|
34
41
|
|
|
35
42
|
return computed<GroupedField[]>(() => {
|
|
43
|
+
const rawInject = toValue(injectFormItemProps) || {};
|
|
36
44
|
return validFields.value.map(field => {
|
|
37
45
|
let gridItemProps: Record<string, any> = {};
|
|
38
46
|
let formItemProps: Record<string, any> = {};
|
|
@@ -55,15 +63,19 @@ export function useGroupFieldAttrs(validFields: ComputedRef<Field[]>) {
|
|
|
55
63
|
lg,
|
|
56
64
|
xl,
|
|
57
65
|
xxl,
|
|
66
|
+
formItemContainer: injectFormItemContainer,
|
|
58
67
|
...injectRest
|
|
59
|
-
} =
|
|
68
|
+
} = rawInject;
|
|
60
69
|
|
|
70
|
+
// 字段显式 span 优先,否则回退注入配置的响应式断点
|
|
61
71
|
const initGridItemProps =
|
|
62
72
|
span || span === 0
|
|
63
73
|
? { span }
|
|
64
74
|
: { xs, sm, md, lg, xl, xxl, span: injectSpan };
|
|
65
75
|
|
|
66
76
|
gridItemProps = fields ? { span: span ?? 24 } : initGridItemProps;
|
|
77
|
+
// 字段级容器优先,回退注入级配置
|
|
78
|
+
const container = formItemContainer ?? injectFormItemContainer;
|
|
67
79
|
formItemProps = mergeProps(
|
|
68
80
|
injectRest,
|
|
69
81
|
{ class: injectClassName, style: injectStyle },
|
|
@@ -72,9 +84,9 @@ export function useGroupFieldAttrs(validFields: ComputedRef<Field[]>) {
|
|
|
72
84
|
);
|
|
73
85
|
|
|
74
86
|
Object.keys(rest).forEach(k => {
|
|
75
|
-
if (
|
|
87
|
+
if (gridItemPropKeySet.has(k)) {
|
|
76
88
|
gridItemProps[k] = rest[k];
|
|
77
|
-
} else if (
|
|
89
|
+
} else if (formItemPropKeySet.has(k)) {
|
|
78
90
|
formItemProps[k] = rest[k];
|
|
79
91
|
} else {
|
|
80
92
|
componentProps[k] = rest[k];
|
|
@@ -100,7 +112,7 @@ export function useGroupFieldAttrs(validFields: ComputedRef<Field[]>) {
|
|
|
100
112
|
formItemProps: formItemProps as any,
|
|
101
113
|
formItemSlots,
|
|
102
114
|
componentProps,
|
|
103
|
-
formItemContainer,
|
|
115
|
+
formItemContainer: container,
|
|
104
116
|
rawField: field,
|
|
105
117
|
};
|
|
106
118
|
}
|
|
@@ -30,9 +30,33 @@ export type VModelProps<T = any> = {
|
|
|
30
30
|
'onUpdate:value'?: (val: T) => void;
|
|
31
31
|
};
|
|
32
32
|
|
|
33
|
+
/**
|
|
34
|
+
* 字段值格式化/转换处理器
|
|
35
|
+
*
|
|
36
|
+
* @description 支持函数形态或包含 get/set 方法的对象形态。
|
|
37
|
+
*
|
|
38
|
+
* ### 行为与契约说明
|
|
39
|
+
* 1. **旧值参数按需注入**:底层基于函数的形参声明个数(`fn.length > 1`)决定是否读取旧值。若转换逻辑需要使用旧值,请显式声明两个形参 `(val, oldVal) => ...`(请勿使用默认参数或 `...args` 剩余参数,否则 `fn.length` 无法正确识别);
|
|
40
|
+
* 2. **只读快照副本**:传入的 `oldVal` 为只读快照副本,不得依赖原地修改写回;仅当 formatter 声明双形参时才克隆旧值,单参转换零开销。
|
|
41
|
+
*
|
|
42
|
+
* @example
|
|
43
|
+
* ```ts
|
|
44
|
+
* // 1. 单参数转换(常见):无需旧值,零多余开销
|
|
45
|
+
* valueFormatter: (val) => val?.trim()
|
|
46
|
+
*
|
|
47
|
+
* // 2. 双参数转换:需要基于旧值做对比或回退
|
|
48
|
+
* valueFormatter: (val, oldVal) => (isValid(val) ? val : oldVal)
|
|
49
|
+
*
|
|
50
|
+
* // 3. 对象形态:分别定义读(展示)与写(存储)转换
|
|
51
|
+
* valueFormatter: {
|
|
52
|
+
* get: (val) => (val ? dayjs(val).format('YYYY-MM-DD') : ''),
|
|
53
|
+
* set: (val, oldVal) => (val ? dayjs(val).valueOf() : undefined),
|
|
54
|
+
* }
|
|
55
|
+
* ```
|
|
56
|
+
*/
|
|
33
57
|
export type ValueFormatter =
|
|
34
|
-
| { (val: any, oldVal
|
|
35
|
-
| { get?: (val: any) => any; set?: (val: any, oldVal
|
|
58
|
+
| { (val: any, oldVal?: any): any }
|
|
59
|
+
| { get?: (val: any) => any; set?: (val: any, oldVal?: any) => any };
|
|
36
60
|
|
|
37
61
|
/**
|
|
38
62
|
* @description 自定义组件
|