@fbkworks/adapter-vant 0.3.0 → 0.4.0

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/dist/index.mjs CHANGED
@@ -37,7 +37,7 @@ const vantCapabilities = {
37
37
  pagination: { mode: "infinite", pageSizes: false, jumper: false },
38
38
  // 只有契约里真实存在的两个 API;notification / loading 没有对应实现,不声明
39
39
  feedback: { message: true, notification: false, confirm: true, loading: false },
40
- theme: { darkMode: true, cssVariables: true, provider: true },
40
+ theme: { darkMode: true, provider: true },
41
41
  features: { "table.fixedColumns": false, "table.summary": false, "form.inline": false }
42
42
  };
43
43
  const vantAdapter = {
@@ -1 +1 @@
1
- {"version":3,"file":"index.mjs","sources":["../src/index.ts"],"sourcesContent":["import type { Capabilities, UiAdapter } from '@fbkworks/adapter-core'\nimport { Button } from './primitives/Button'\nimport { Input } from './primitives/Input'\nimport { Select } from './primitives/Select'\nimport { Checkbox } from './primitives/Checkbox'\nimport { DatePicker } from './primitives/DatePicker'\nimport { Radio } from './primitives/Radio'\nimport { feedback } from './feedback'\nimport { Form, FormItem } from './primitives/Form'\nimport { DataGrid } from './primitives/DataGrid'\nimport { Pagination } from './primitives/Pagination'\nimport { Dialog } from './primitives/Dialog'\nimport { Drawer } from './primitives/Drawer'\nimport { Tag } from './primitives/Tag'\nimport { Spin } from './primitives/Spin'\nimport { vantTheme } from './theme'\nimport { RootProvider } from './root-provider'\n\nexport const vantCapabilities: Capabilities = {\n dataGrid: {\n presentation: 'cards',\n selection: true,\n /* 卡片列表没有表头,全文也没有一处 emit('update:sort');\n 补齐移动端排序入口(下拉 / 筛选栏 / 顶栏菜单)需要产品方案,故声明为 none。 */\n sort: 'none',\n expandable: false,\n tree: false,\n virtualScroll: false,\n stickyHeader: false,\n },\n form: {\n layout: 'vertical',\n labelWidth: false,\n validateOn: ['change', 'blur', 'submit'],\n asyncValidator: true,\n },\n // van-popup 的 position 就是抽屉:Drawer 原语已实现,能力声明必须跟上\n overlay: { kind: 'popup', supportsDrawer: true, supportsTeleport: true },\n pagination: { mode: 'infinite', pageSizes: false, jumper: false },\n // 只有契约里真实存在的两个 API;notification / loading 没有对应实现,不声明\n feedback: { message: true, notification: false, confirm: true, loading: false },\n theme: { darkMode: true, cssVariables: true, provider: true },\n features: { 'table.fixedColumns': false, 'table.summary': false, 'form.inline': false },\n}\n\nexport const vantAdapter: UiAdapter = {\n meta: {\n apiVersion: 3,\n name: 'vant',\n version: '0.1.0',\n uiLibrary: { name: 'vant', version: '^4.9.0' },\n platform: 'mobile',\n },\n capabilities: vantCapabilities,\n primitives: { Button, Input, Select, Checkbox, DatePicker, Radio, Form, FormItem, DataGrid, Pagination, Dialog, Drawer, Tag, Spin },\n feedback,\n RootProvider,\n theme: vantTheme,\n}\n\nexport { vantTheme, RootProvider }\nexport { Button, Input, Select, Checkbox, DatePicker, Radio, Form, FormItem, DataGrid, Pagination, Dialog, Drawer, Tag, Spin }\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAkBO,MAAM,mBAAiC;AAAA,EAC5C,UAAU;AAAA,IACR,cAAc;AAAA,IACd,WAAW;AAAA;AAAA;AAAA,IAGX,MAAM;AAAA,IACN,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,eAAe;AAAA,IACf,cAAc;AAAA,EAAA;AAAA,EAEhB,MAAM;AAAA,IACJ,QAAQ;AAAA,IACR,YAAY;AAAA,IACZ,YAAY,CAAC,UAAU,QAAQ,QAAQ;AAAA,IACvC,gBAAgB;AAAA,EAAA;AAAA;AAAA,EAGlB,SAAS,EAAE,MAAM,SAAS,gBAAgB,MAAM,kBAAkB,KAAA;AAAA,EAClE,YAAY,EAAE,MAAM,YAAY,WAAW,OAAO,QAAQ,MAAA;AAAA;AAAA,EAE1D,UAAU,EAAE,SAAS,MAAM,cAAc,OAAO,SAAS,MAAM,SAAS,MAAA;AAAA,EACxE,OAAO,EAAE,UAAU,MAAM,cAAc,MAAM,UAAU,KAAA;AAAA,EACvD,UAAU,EAAE,sBAAsB,OAAO,iBAAiB,OAAO,eAAe,MAAA;AAClF;AAEO,MAAM,cAAyB;AAAA,EACpC,MAAM;AAAA,IACJ,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,SAAS;AAAA,IACT,WAAW,EAAE,MAAM,QAAQ,SAAS,SAAA;AAAA,IACpC,UAAU;AAAA,EAAA;AAAA,EAEZ,cAAc;AAAA,EACd,YAAY,EAAE,QAAQ,OAAO,QAAQ,UAAU,YAAY,OAAO,MAAM,UAAU,UAAU,YAAY,QAAQ,QAAQ,KAAK,KAAA;AAAA,EAC7H;AAAA,EACA;AAAA,EACA,OAAO;AACT;"}
1
+ {"version":3,"file":"index.mjs","sources":["../src/index.ts"],"sourcesContent":["import type { Capabilities, UiAdapter } from '@fbkworks/adapter-core'\nimport { Button } from './primitives/Button'\nimport { Input } from './primitives/Input'\nimport { Select } from './primitives/Select'\nimport { Checkbox } from './primitives/Checkbox'\nimport { DatePicker } from './primitives/DatePicker'\nimport { Radio } from './primitives/Radio'\nimport { feedback } from './feedback'\nimport { Form, FormItem } from './primitives/Form'\nimport { DataGrid } from './primitives/DataGrid'\nimport { Pagination } from './primitives/Pagination'\nimport { Dialog } from './primitives/Dialog'\nimport { Drawer } from './primitives/Drawer'\nimport { Tag } from './primitives/Tag'\nimport { Spin } from './primitives/Spin'\nimport { vantTheme } from './theme'\nimport { RootProvider } from './root-provider'\n\nexport const vantCapabilities: Capabilities = {\n dataGrid: {\n presentation: 'cards',\n selection: true,\n /* 卡片列表没有表头,全文也没有一处 emit('update:sort');\n 补齐移动端排序入口(下拉 / 筛选栏 / 顶栏菜单)需要产品方案,故声明为 none。 */\n sort: 'none',\n expandable: false,\n tree: false,\n virtualScroll: false,\n stickyHeader: false,\n },\n form: {\n layout: 'vertical',\n labelWidth: false,\n validateOn: ['change', 'blur', 'submit'],\n asyncValidator: true,\n },\n // van-popup 的 position 就是抽屉:Drawer 原语已实现,能力声明必须跟上\n overlay: { kind: 'popup', supportsDrawer: true, supportsTeleport: true },\n pagination: { mode: 'infinite', pageSizes: false, jumper: false },\n // 只有契约里真实存在的两个 API;notification / loading 没有对应实现,不声明\n feedback: { message: true, notification: false, confirm: true, loading: false },\n theme: { darkMode: true, provider: true },\n features: { 'table.fixedColumns': false, 'table.summary': false, 'form.inline': false },\n}\n\nexport const vantAdapter: UiAdapter = {\n meta: {\n apiVersion: 3,\n name: 'vant',\n version: '0.1.0',\n uiLibrary: { name: 'vant', version: '^4.9.0' },\n platform: 'mobile',\n },\n capabilities: vantCapabilities,\n primitives: { Button, Input, Select, Checkbox, DatePicker, Radio, Form, FormItem, DataGrid, Pagination, Dialog, Drawer, Tag, Spin },\n feedback,\n RootProvider,\n theme: vantTheme,\n}\n\nexport { vantTheme, RootProvider }\nexport { Button, Input, Select, Checkbox, DatePicker, Radio, Form, FormItem, DataGrid, Pagination, Dialog, Drawer, Tag, Spin }\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAkBO,MAAM,mBAAiC;AAAA,EAC5C,UAAU;AAAA,IACR,cAAc;AAAA,IACd,WAAW;AAAA;AAAA;AAAA,IAGX,MAAM;AAAA,IACN,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,eAAe;AAAA,IACf,cAAc;AAAA,EAAA;AAAA,EAEhB,MAAM;AAAA,IACJ,QAAQ;AAAA,IACR,YAAY;AAAA,IACZ,YAAY,CAAC,UAAU,QAAQ,QAAQ;AAAA,IACvC,gBAAgB;AAAA,EAAA;AAAA;AAAA,EAGlB,SAAS,EAAE,MAAM,SAAS,gBAAgB,MAAM,kBAAkB,KAAA;AAAA,EAClE,YAAY,EAAE,MAAM,YAAY,WAAW,OAAO,QAAQ,MAAA;AAAA;AAAA,EAE1D,UAAU,EAAE,SAAS,MAAM,cAAc,OAAO,SAAS,MAAM,SAAS,MAAA;AAAA,EACxE,OAAO,EAAE,UAAU,MAAM,UAAU,KAAA;AAAA,EACnC,UAAU,EAAE,sBAAsB,OAAO,iBAAiB,OAAO,eAAe,MAAA;AAClF;AAEO,MAAM,cAAyB;AAAA,EACpC,MAAM;AAAA,IACJ,YAAY;AAAA,IACZ,MAAM;AAAA,IACN,SAAS;AAAA,IACT,WAAW,EAAE,MAAM,QAAQ,SAAS,SAAA;AAAA,IACpC,UAAU;AAAA,EAAA;AAAA,EAEZ,cAAc;AAAA,EACd,YAAY,EAAE,QAAQ,OAAO,QAAQ,UAAU,YAAY,OAAO,MAAM,UAAU,UAAU,YAAY,QAAQ,QAAQ,KAAK,KAAA;AAAA,EAC7H;AAAA,EACA;AAAA,EACA,OAAO;AACT;"}
@@ -54,7 +54,10 @@ export declare const Form: import('vue').DefineComponent<import('vue').ExtractPr
54
54
  export declare const FormItem: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
55
55
  label: StringConstructor;
56
56
  prop: StringConstructor;
57
- required: BooleanConstructor;
57
+ required: {
58
+ type: PropType<boolean | undefined>;
59
+ default: undefined;
60
+ };
58
61
  rules: {
59
62
  type: PropType<FbkRule[]>;
60
63
  default: undefined;
@@ -68,7 +71,10 @@ export declare const FormItem: import('vue').DefineComponent<import('vue').Extra
68
71
  }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
69
72
  label: StringConstructor;
70
73
  prop: StringConstructor;
71
- required: BooleanConstructor;
74
+ required: {
75
+ type: PropType<boolean | undefined>;
76
+ default: undefined;
77
+ };
72
78
  rules: {
73
79
  type: PropType<FbkRule[]>;
74
80
  default: undefined;
@@ -80,7 +86,7 @@ export declare const FormItem: import('vue').DefineComponent<import('vue').Extra
80
86
  };
81
87
  span: NumberConstructor;
82
88
  }>> & Readonly<{}>, {
83
- required: boolean;
89
+ required: boolean | undefined;
84
90
  rules: FbkRule[];
85
91
  labelWidth: string | number;
86
92
  }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
@@ -1,5 +1,6 @@
1
- import { defineComponent, ref, createVNode } from "vue";
1
+ import { defineComponent, ref, computed, provide, createVNode, inject, cloneVNode } from "vue";
2
2
  import { Form as Form$1, Field } from "vant";
3
+ const VANT_FORM_RULES = Symbol("fbk.vant.form.rules");
3
4
  function toVantLabelWidth(width) {
4
5
  return width === "auto" ? void 0 : width;
5
6
  }
@@ -11,9 +12,9 @@ function toVantRules(rules) {
11
12
  message: rule.message,
12
13
  trigger: rule.trigger === "submit" || rule.trigger === void 0 ? void 0 : rule.trigger === "change" ? "onChange" : "onBlur",
13
14
  validator: rule.validator && ((value) => {
15
+ const normalize = (result2) => result2 === true || result2 === void 0 ? true : typeof result2 === "string" ? result2 : false;
14
16
  const result = rule.validator(value, {});
15
- if (result instanceof Promise) return result.then((message) => message === true || !message);
16
- return result === true || result === void 0;
17
+ return result instanceof Promise ? result.then(normalize) : normalize(result);
17
18
  })
18
19
  }));
19
20
  }
@@ -46,6 +47,7 @@ const Form = /* @__PURE__ */ defineComponent({
46
47
  }) {
47
48
  const formRef = ref();
48
49
  let pending = null;
50
+ const vantRules = computed(() => props.rules);
49
51
  const validate = () => new Promise((resolve, reject) => {
50
52
  pending = {
51
53
  resolve,
@@ -53,6 +55,7 @@ const Form = /* @__PURE__ */ defineComponent({
53
55
  };
54
56
  formRef.value?.submit();
55
57
  });
58
+ provide(VANT_FORM_RULES, vantRules);
56
59
  expose({
57
60
  validate,
58
61
  validateField: async () => true,
@@ -82,7 +85,13 @@ const FormItem = /* @__PURE__ */ defineComponent({
82
85
  props: {
83
86
  label: String,
84
87
  prop: String,
85
- required: Boolean,
88
+ /* 必须显式给 default: undefined:写成裸 `Boolean` 时 Vue 会把「没传」强转成 false,
89
+ 进而覆盖/关闭 UI 库对规则里 required 的处理。element-plus 上已实测:
90
+ 表单级 { required: true } 被改成 false,空值校验静默通过。 */
91
+ required: {
92
+ type: Boolean,
93
+ default: void 0
94
+ },
86
95
  rules: {
87
96
  type: Array,
88
97
  default: void 0
@@ -97,17 +106,37 @@ const FormItem = /* @__PURE__ */ defineComponent({
97
106
  setup(props, {
98
107
  slots
99
108
  }) {
109
+ const fieldRef = ref();
110
+ const formRules = inject(VANT_FORM_RULES, null);
111
+ const mergedRules = computed(() => {
112
+ const fromForm = props.prop ? formRules?.value?.[props.prop] : void 0;
113
+ if (fromForm?.length && props.rules?.length) return [...fromForm, ...props.rules];
114
+ return props.rules?.length ? props.rules : fromForm;
115
+ });
100
116
  return () => createVNode(Field, {
117
+ "ref": fieldRef,
101
118
  "name": props.prop,
102
119
  "label": props.label,
103
120
  "required": props.required,
104
- "rules": toVantRules(props.rules),
121
+ "rules": toVantRules(mergedRules.value),
105
122
  "labelWidth": toVantLabelWidth(props.labelWidth)
106
123
  }, {
107
124
  default: () => [props.help ? createVNode("div", {
108
125
  "class": "fbk-form-item__help"
109
126
  }, [props.help]) : null],
110
- input: slots.default,
127
+ /* 我们把 van-field 的输入槽整个换成了自定义 Input,
128
+ 于是 van-field 内部的 blur 校验处理器不再运行 ——
129
+ 表单级/条目级规则都不会在 blur 时触发(实测连错误元素都不出现)。
130
+ 这里把自定义输入的 blur 接回 van-field 暴露的 validate()。 */
131
+ input: () => (slots.default?.() ?? []).map((node) => {
132
+ const inherited = node.props?.onBlur ?? null;
133
+ return cloneVNode(node, {
134
+ onBlur: () => {
135
+ inherited?.();
136
+ void fieldRef.value?.validate?.();
137
+ }
138
+ });
139
+ }),
111
140
  default: slots.default
112
141
  });
113
142
  }
@@ -1 +1 @@
1
- {"version":3,"file":"Form.mjs","sources":["../../src/primitives/Form.tsx"],"sourcesContent":["import { defineComponent, ref, type PropType } from 'vue'\nimport { Form as VanForm, Field } from 'vant'\nimport type { FieldRule } from 'vant'\nimport type { FbkRule, FormProps } from '@fbkworks/adapter-core'\n\n/**\n * vant 没有「按最宽标签统一」的能力。\n *\n * `labelWidth=\"auto\"` 会被 vant 的 addUnit 原样写成 `width: auto`,\n * 而 .van-field__label 是 flex:none,`auto` 会让它重新按内容收缩 ——\n * 恰好是我们要避免的效果。所以这里把 `auto` 翻译成「不传」:\n * vant 的默认值 --van-field-label-width 是 6.2em,本来就对所有行一致。\n *\n * 换句话说:契约里的 `auto` 语义是「各行标签等宽」,\n * element-plus / naive-ui 用「量最宽的那个」实现,\n * vant 用「固定 em」实现。三者对调用方是同一个承诺。\n */\nfunction toVantLabelWidth(width: string | number | undefined) {\n return width === 'auto' ? undefined : width\n}\n\nfunction toVantRules(rules: FbkRule[] | undefined) {\n if (!rules?.length) return undefined\n return rules.map((rule) => ({\n required: rule.required,\n pattern: rule.pattern,\n message: rule.message,\n trigger:\n rule.trigger === 'submit' || rule.trigger === undefined\n ? undefined\n : rule.trigger === 'change'\n ? 'onChange'\n : 'onBlur',\n validator:\n rule.validator &&\n ((value: unknown) => {\n const result = rule.validator!(value, {})\n if (result instanceof Promise) return result.then((message) => message === true || !message)\n return result === true || result === undefined\n }),\n }))\n}\n\n/**\n * van-form 没有命令式 validate() Promise。\n * 用 @submit / @failed 事件桥接,契约只承诺 validate(): Promise<true>。\n */\nexport const Form = defineComponent({\n name: 'FbkVantForm',\n props: {\n model: { type: Object as PropType<Record<string, any>>, required: true },\n rules: { type: Object as PropType<FormProps['rules']>, default: undefined },\n labelWidth: { type: [String, Number] as PropType<string | number>, default: undefined },\n labelPosition: { type: String as PropType<FormProps['labelPosition']>, default: 'right' },\n disabled: Boolean,\n size: String,\n scrollToError: Boolean,\n },\n setup(props, { expose, slots }) {\n // van-form 没有官方 TS 类型暴露 submit/resetValidation,但它们确实存在\n const formRef = ref<any>()\n let pending: { resolve: (value: true) => void; reject: (reason: unknown) => void } | null = null\n\n const validate = () =>\n new Promise<true>((resolve, reject) => {\n pending = { resolve, reject }\n formRef.value?.submit()\n })\n\n expose({\n validate,\n validateField: async () => true as const,\n resetFields: () => formRef.value?.resetValidation(),\n clearValidate: () => formRef.value?.resetValidation(),\n })\n\n return () => (\n <VanForm\n ref={formRef}\n labelWidth={toVantLabelWidth(props.labelWidth)}\n labelAlign={props.labelPosition === 'top' ? 'top' : props.labelPosition === 'left' ? 'left' : 'right'}\n disabled={props.disabled}\n onSubmit={() => {\n pending?.resolve(true)\n pending = null\n }}\n onFailed={(errors: unknown) => {\n pending?.reject(errors)\n pending = null\n }}\n >\n {slots.default?.()}\n </VanForm>\n )\n },\n})\n\nexport const FormItem = defineComponent({\n name: 'FbkVantFormItem',\n props: {\n label: String,\n prop: String,\n required: Boolean,\n rules: { type: Array as PropType<FbkRule[]>, default: undefined },\n help: String,\n labelWidth: { type: [String, Number] as PropType<string | number>, default: undefined },\n span: Number,\n },\n setup(props, { slots }) {\n return () => (\n <Field\n name={props.prop}\n label={props.label}\n required={props.required}\n rules={toVantRules(props.rules) as FieldRule[] | undefined}\n labelWidth={toVantLabelWidth(props.labelWidth)}\n v-slots={{ input: slots.default, default: slots.default }}\n >\n {props.help ? <div class=\"fbk-form-item__help\">{props.help}</div> : null}\n </Field>\n )\n },\n})\n"],"names":["toVantLabelWidth","width","undefined","toVantRules","rules","length","map","rule","required","pattern","message","trigger","validator","value","result","Promise","then","Form","defineComponent","name","props","model","type","Object","default","labelWidth","String","Number","labelPosition","disabled","Boolean","size","scrollToError","setup","expose","slots","formRef","ref","pending","validate","resolve","reject","submit","validateField","resetFields","resetValidation","clearValidate","_createVNode","VanForm","onSubmit","errors","FormItem","label","prop","Array","help","span","Field","input"],"mappings":"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"}
1
+ {"version":3,"file":"Form.mjs","sources":["../../src/primitives/Form.tsx"],"sourcesContent":["import {\n cloneVNode,\n computed,\n defineComponent,\n inject,\n provide,\n ref,\n type ComputedRef,\n type InjectionKey,\n type PropType,\n} from 'vue'\nimport { Form as VanForm, Field } from 'vant'\nimport type { FieldRule } from 'vant'\nimport type { FbkRule, FormProps } from '@fbkworks/adapter-core'\n\n/**\n * vant 没有「按最宽标签统一」的能力。\n *\n * `labelWidth=\"auto\"` 会被 vant 的 addUnit 原样写成 `width: auto`,\n * 而 .van-field__label 是 flex:none,`auto` 会让它重新按内容收缩 ——\n * 恰好是我们要避免的效果。所以这里把 `auto` 翻译成「不传」:\n * vant 的默认值 --van-field-label-width 是 6.2em,本来就对所有行一致。\n *\n * 换句话说:契约里的 `auto` 语义是「各行标签等宽」,\n * element-plus / naive-ui 用「量最宽的那个」实现,\n * vant 用「固定 em」实现。三者对调用方是同一个承诺。\n */\n/* van-form **没有** rules prop(实测其 props 里没有这一项),\n 表单级规则只能由 Form 通过 provide 传给各个 Field。 */\nconst VANT_FORM_RULES: InjectionKey<ComputedRef<FormProps['rules'] | undefined>> =\n Symbol('fbk.vant.form.rules')\n\nfunction toVantLabelWidth(width: string | number | undefined) {\n return width === 'auto' ? undefined : width\n}\n\nfunction toVantRules(rules: FbkRule[] | undefined) {\n if (!rules?.length) return undefined\n return rules.map((rule) => ({\n required: rule.required,\n pattern: rule.pattern,\n message: rule.message,\n trigger:\n rule.trigger === 'submit' || rule.trigger === undefined\n ? undefined\n : rule.trigger === 'change'\n ? 'onChange'\n : 'onBlur',\n validator:\n rule.validator &&\n ((value: unknown) => {\n /* FbkRule 约定「validator 返回字符串 = 错误信息」。\n vant 的 runRules 对**字符串**会直接拿来当 validateMessage,\n 所以不能像原先那样压成布尔 —— 那会把文案丢掉(只剩 rule.message)。 */\n const normalize = (result: unknown): true | false | string =>\n result === true || result === undefined\n ? true\n : typeof result === 'string'\n ? result\n : false\n const result = rule.validator!(value, {})\n return result instanceof Promise ? result.then(normalize) : normalize(result)\n }),\n }))\n}\n\n/**\n * van-form 没有命令式 validate() Promise。\n * 用 @submit / @failed 事件桥接,契约只承诺 validate(): Promise<true>。\n */\nexport const Form = defineComponent({\n name: 'FbkVantForm',\n props: {\n model: { type: Object as PropType<Record<string, any>>, required: true },\n rules: { type: Object as PropType<FormProps['rules']>, default: undefined },\n labelWidth: { type: [String, Number] as PropType<string | number>, default: undefined },\n labelPosition: { type: String as PropType<FormProps['labelPosition']>, default: 'right' },\n disabled: Boolean,\n size: String,\n scrollToError: Boolean,\n },\n setup(props, { expose, slots }) {\n // van-form 没有官方 TS 类型暴露 submit/resetValidation,但它们确实存在\n const formRef = ref<any>()\n let pending: { resolve: (value: true) => void; reject: (reason: unknown) => void } | null = null\n\n /* 传**原始**规则,映射由 Field 统一做(映射一次就够,避免类型来回转)。 */\n const vantRules = computed(() => props.rules)\n\n const validate = () =>\n new Promise<true>((resolve, reject) => {\n pending = { resolve, reject }\n formRef.value?.submit()\n })\n\n provide(VANT_FORM_RULES, vantRules)\n\n expose({\n validate,\n validateField: async () => true as const,\n resetFields: () => formRef.value?.resetValidation(),\n clearValidate: () => formRef.value?.resetValidation(),\n })\n\n return () => (\n <VanForm\n ref={formRef}\n labelWidth={toVantLabelWidth(props.labelWidth)}\n labelAlign={props.labelPosition === 'top' ? 'top' : props.labelPosition === 'left' ? 'left' : 'right'}\n disabled={props.disabled}\n onSubmit={() => {\n pending?.resolve(true)\n pending = null\n }}\n onFailed={(errors: unknown) => {\n pending?.reject(errors)\n pending = null\n }}\n >\n {slots.default?.()}\n </VanForm>\n )\n },\n})\n\nexport const FormItem = defineComponent({\n name: 'FbkVantFormItem',\n props: {\n label: String,\n prop: String,\n /* 必须显式给 default: undefined:写成裸 `Boolean` 时 Vue 会把「没传」强转成 false,\n 进而覆盖/关闭 UI 库对规则里 required 的处理。element-plus 上已实测:\n 表单级 { required: true } 被改成 false,空值校验静默通过。 */\n required: { type: Boolean as PropType<boolean | undefined>, default: undefined },\n rules: { type: Array as PropType<FbkRule[]>, default: undefined },\n help: String,\n labelWidth: { type: [String, Number] as PropType<string | number>, default: undefined },\n span: Number,\n },\n setup(props, { slots }) {\n /* 表单级规则在 Form 里,通过 inject 取;条目级规则优先合并进来。\n van-form 不支持 rules prop,这是唯一可行的传递路径。 */\n const fieldRef = ref<any>()\n const formRules = inject(VANT_FORM_RULES, null)\n const mergedRules = computed<FbkRule[] | undefined>(() => {\n const fromForm = props.prop ? formRules?.value?.[props.prop] : undefined\n if (fromForm?.length && props.rules?.length) return [...fromForm, ...props.rules]\n return props.rules?.length ? props.rules : fromForm\n })\n\n return () => (\n <Field\n ref={fieldRef}\n name={props.prop}\n label={props.label}\n required={props.required}\n rules={toVantRules(mergedRules.value) as FieldRule[] | undefined}\n labelWidth={toVantLabelWidth(props.labelWidth)}\n v-slots={{\n /* 我们把 van-field 的输入槽整个换成了自定义 Input,\n 于是 van-field 内部的 blur 校验处理器不再运行 ——\n 表单级/条目级规则都不会在 blur 时触发(实测连错误元素都不出现)。\n 这里把自定义输入的 blur 接回 van-field 暴露的 validate()。 */\n input: () =>\n (slots.default?.() ?? []).map((node) => {\n const inherited = (node.props?.onBlur ?? null) as (() => void) | null\n return cloneVNode(node, {\n onBlur: () => {\n inherited?.()\n void fieldRef.value?.validate?.()\n },\n })\n }),\n default: slots.default,\n }}\n >\n {props.help ? <div class=\"fbk-form-item__help\">{props.help}</div> : null}\n </Field>\n )\n },\n})\n"],"names":["VANT_FORM_RULES","Symbol","toVantLabelWidth","width","undefined","toVantRules","rules","length","map","rule","required","pattern","message","trigger","validator","value","normalize","result","Promise","then","Form","defineComponent","name","props","model","type","Object","default","labelWidth","String","Number","labelPosition","disabled","Boolean","size","scrollToError","setup","expose","slots","formRef","ref","pending","vantRules","computed","validate","resolve","reject","submit","provide","validateField","resetFields","resetValidation","clearValidate","_createVNode","VanForm","onSubmit","errors","FormItem","label","prop","Array","help","span","fieldRef","formRules","inject","mergedRules","fromForm","Field","input","node","inherited","onBlur","cloneVNode"],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fbkworks/adapter-vant",
3
- "version": "0.3.0",
3
+ "version": "0.4.0",
4
4
  "type": "module",
5
5
  "sideEffects": [
6
6
  "**/*.css"
@@ -21,7 +21,7 @@
21
21
  "./package.json": "./package.json"
22
22
  },
23
23
  "dependencies": {
24
- "@fbkworks/adapter-core": "^0.3.0",
24
+ "@fbkworks/adapter-core": "^0.4.0",
25
25
  "@fbkworks/shared": "^0.3.0",
26
26
  "@fbkworks/tokens": "^0.3.0"
27
27
  },