diff --git a/package.json b/package.json index b83ed52ad..55f257472 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@vant/eslint-config": "workspace:*", "@vant/stylelint-config": "workspace:*", "eslint": "^8.2.0", - "husky": "^7.0.4", + "husky": "^8.0.1", "lint-staged": "^12.1.2", "prettier": "^2.5.0", "rimraf": "^3.0.2", diff --git a/packages/vant-cli/changelog.md b/packages/vant-cli/changelog.md index 3e9b2498a..4d45f8601 100644 --- a/packages/vant-cli/changelog.md +++ b/packages/vant-cli/changelog.md @@ -1,5 +1,11 @@ # 更新日志 +## v4.0.2 + +`2022-05-14` + +- 修复编译 script setup 错误的问题 + ## v4.0.1 `2022-03-03` diff --git a/packages/vant-cli/package.json b/packages/vant-cli/package.json index b87d6229a..c92702d33 100644 --- a/packages/vant-cli/package.json +++ b/packages/vant-cli/package.json @@ -1,6 +1,6 @@ { "name": "@vant/cli", - "version": "4.0.1", + "version": "4.0.2", "type": "module", "main": "lib/index.js", "typings": "lib/index.d.ts", @@ -70,7 +70,7 @@ "gh-pages": "^3.2.3", "hash-sum": "^2.0.0", "highlight.js": "^11.3.1", - "husky": "^7.0.4", + "husky": "^8.0.1", "jest": "^27.3.1", "jest-canvas-mock": "^2.3.1", "jest-serializer-html": "^7.1.0", diff --git a/packages/vant-cli/src/compiler/compile-script.ts b/packages/vant-cli/src/compiler/compile-script.ts index d77a56acd..ca1dd95b0 100644 --- a/packages/vant-cli/src/compiler/compile-script.ts +++ b/packages/vant-cli/src/compiler/compile-script.ts @@ -2,7 +2,7 @@ import fse from 'fs-extra'; import babel from '@babel/core'; import esbuild, { type Format } from 'esbuild'; import { sep } from 'path'; -import { isJsx, replaceExt } from '../common/index.js'; +import { isJsx, replaceExt, getVantConfig } from '../common/index.js'; import { replaceCSSImportExt } from '../common/css.js'; import { replaceScriptImportExt } from './get-deps.js'; @@ -50,7 +50,9 @@ export async function compileScript( ({ code } = esbuildResult); - const jsFilePath = replaceExt(filePath, '.js'); + const extensionMap = getVantConfig().build?.extensions; + const extension = extensionMap?.[format] || '.js'; + const jsFilePath = replaceExt(filePath, extension); removeSync(filePath); outputFileSync(jsFilePath, code); } diff --git a/packages/vant-cli/src/compiler/compile-sfc.ts b/packages/vant-cli/src/compiler/compile-sfc.ts index a46b0cf7c..5508072ee 100644 --- a/packages/vant-cli/src/compiler/compile-sfc.ts +++ b/packages/vant-cli/src/compiler/compile-sfc.ts @@ -1,7 +1,12 @@ import fse from 'fs-extra'; import path from 'path'; import hash from 'hash-sum'; -import { parse, SFCBlock, compileTemplate } from 'vue/compiler-sfc'; +import { + parse, + SFCBlock, + compileTemplate, + compileScript, +} from 'vue/compiler-sfc'; import { replaceExt } from '../common/index.js'; const { remove, readFileSync, outputFile } = fse; @@ -73,8 +78,9 @@ export async function compileSfc(filePath: string): Promise { const scopeId = hasScoped ? `data-v-${hash(source)}` : ''; // compile js part - if (descriptor.script) { - const lang = descriptor.script.lang || 'js'; + if (descriptor.script || descriptor.scriptSetup) { + const lang = + descriptor.script?.lang || descriptor.scriptSetup?.lang || 'js'; const scriptFilePath = replaceExt(filePath, `.${lang}`); tasks.push( @@ -86,7 +92,14 @@ export async function compileSfc(filePath: string): Promise { script += '// @ts-nocheck\n'; } - script += descriptor.script!.content; + if (descriptor.scriptSetup) { + script += compileScript(descriptor, { + id: scopeId, + }).content; + } else { + script += descriptor.script!.content; + } + script = injectStyle(script, styles, filePath); script = script.replace(EXPORT, `const ${VUEIDS} =`); diff --git a/packages/vant-cli/src/config/vite.package.ts b/packages/vant-cli/src/config/vite.package.ts index 7c780e3b4..4d6f35469 100644 --- a/packages/vant-cli/src/config/vite.package.ts +++ b/packages/vant-cli/src/config/vite.package.ts @@ -14,7 +14,9 @@ export function getViteConfigForPackage({ }): InlineConfig { setBuildTarget('package'); - const { name } = getVantConfig(); + const { name, build } = getVantConfig(); + const entryExtension = build?.extensions?.esm || '.js'; + const entry = join(ES_DIR, `index${entryExtension}`); return { root: CWD, @@ -24,7 +26,7 @@ export function getViteConfigForPackage({ build: { lib: { name, - entry: join(ES_DIR, 'index.js'), + entry, formats, fileName: (format: string) => { const suffix = format === 'umd' ? '' : `.${format}`; diff --git a/packages/vant-eslint-config/index.js b/packages/vant-eslint-config/index.js index e73b77e42..bef7970b8 100644 --- a/packages/vant-eslint-config/index.js +++ b/packages/vant-eslint-config/index.js @@ -51,6 +51,7 @@ module.exports = { 'vue/require-v-for-key': 'off', 'vue/require-default-prop': 'off', 'vue/no-unused-components': 'off', + 'vue/multi-word-component-names': 'off', 'vue/return-in-computed-property': 'off', // typescript-eslint '@typescript-eslint/camelcase': 'off', diff --git a/packages/vant/src/badge/test/__snapshots__/index.spec.ts.snap b/packages/vant/src/badge/test/__snapshots__/index.spec.ts.snap index 8b978ac3b..134456dbd 100644 --- a/packages/vant/src/badge/test/__snapshots__/index.spec.ts.snap +++ b/packages/vant/src/badge/test/__snapshots__/index.spec.ts.snap @@ -6,9 +6,9 @@ exports[`should render content slot correctly 1`] = ` `; -exports[`should render nothing when content is empty string 1`] = ``; +exports[`should render nothing when content is empty string 1`] = `""`; -exports[`should render nothing when content is undefined 1`] = ``; +exports[`should render nothing when content is undefined 1`] = `""`; exports[`should render nothing when content is zero 1`] = `
diff --git a/packages/vant/src/field/Field.tsx b/packages/vant/src/field/Field.tsx index 6fb894fb3..9c85f7607 100644 --- a/packages/vant/src/field/Field.tsx +++ b/packages/vant/src/field/Field.tsx @@ -59,6 +59,7 @@ import type { FieldFormatTrigger, FieldValidateError, FieldAutosizeConfig, + FieldValidationStatus, FieldValidateTrigger, FieldFormSharedProps, } from './types'; @@ -135,8 +136,8 @@ export default defineComponent({ setup(props, { emit, slots }) { const id = useId(); const state = reactive({ + status: 'unvalidated' as FieldValidationStatus, focused: false, - validateFailed: false, validateMessage: '', }); @@ -181,7 +182,7 @@ export default defineComponent({ rules.reduce( (promise, rule) => promise.then(() => { - if (state.validateFailed) { + if (state.status === 'failed') { return; } @@ -192,7 +193,7 @@ export default defineComponent({ } if (!runSyncRule(value, rule)) { - state.validateFailed = true; + state.status = 'failed'; state.validateMessage = getRuleMessage(value, rule); return; } @@ -200,10 +201,10 @@ export default defineComponent({ if (rule.validator) { return runRuleValidator(value, rule).then((result) => { if (result && typeof result === 'string') { - state.validateFailed = true; + state.status = 'failed'; state.validateMessage = result; } else if (result === false) { - state.validateFailed = true; + state.status = 'failed'; state.validateMessage = getRuleMessage(value, rule); } }); @@ -213,10 +214,8 @@ export default defineComponent({ ); const resetValidation = () => { - if (state.validateFailed) { - state.validateFailed = false; - state.validateMessage = ''; - } + state.status = 'unvalidated'; + state.validateMessage = ''; }; const validate = (rules = props.rules) => @@ -224,12 +223,13 @@ export default defineComponent({ resetValidation(); if (rules) { runRules(rules).then(() => { - if (state.validateFailed) { + if (state.status === 'failed') { resolve({ name: props.name, message: state.validateMessage, }); } else { + state.status = 'passed'; resolve(); } }); @@ -351,7 +351,7 @@ export default defineComponent({ if (typeof props.error === 'boolean') { return props.error; } - if (form && form.props.showError && state.validateFailed) { + if (form && form.props.showError && state.status === 'failed') { return true; } }); @@ -383,6 +383,8 @@ export default defineComponent({ const getInputId = () => props.id || `${id}-input`; + const getValidationStatus = () => state.status; + const renderInput = () => { const controlClass = bem('control', [ getProp('inputAlign'), @@ -407,7 +409,6 @@ export default defineComponent({ name: props.name, rows: props.rows !== undefined ? +props.rows : undefined, class: controlClass, - value: props.modelValue, disabled: getProp('disabled'), readonly: getProp('readonly'), autofocus: props.autofocus, @@ -531,6 +532,7 @@ export default defineComponent({ validate, formValue, resetValidation, + getValidationStatus, }); provide(CUSTOM_FIELD_INJECTION_KEY, { diff --git a/packages/vant/src/field/README.md b/packages/vant/src/field/README.md index 2df7fd86d..d1f10fb4c 100644 --- a/packages/vant/src/field/README.md +++ b/packages/vant/src/field/README.md @@ -327,6 +327,7 @@ import type { FieldValidateError, FieldAutosizeConfig, FieldValidateTrigger, + FieldValidationStatus, } from 'vant'; ``` diff --git a/packages/vant/src/field/README.zh-CN.md b/packages/vant/src/field/README.zh-CN.md index f9f60fdce..6828d3082 100644 --- a/packages/vant/src/field/README.zh-CN.md +++ b/packages/vant/src/field/README.zh-CN.md @@ -346,6 +346,7 @@ import type { FieldValidateError, FieldAutosizeConfig, FieldValidateTrigger, + FieldValidationStatus, } from 'vant'; ``` diff --git a/packages/vant/src/field/index.ts b/packages/vant/src/field/index.ts index d671c706b..90bb5ef51 100644 --- a/packages/vant/src/field/index.ts +++ b/packages/vant/src/field/index.ts @@ -17,6 +17,7 @@ export type { FieldValidateError, FieldAutosizeConfig, FieldValidateTrigger, + FieldValidationStatus, } from './types'; declare module 'vue' { diff --git a/packages/vant/src/field/types.ts b/packages/vant/src/field/types.ts index c60169f7c..51200e8c8 100644 --- a/packages/vant/src/field/types.ts +++ b/packages/vant/src/field/types.ts @@ -66,6 +66,8 @@ export type FieldRule = { formatter?: FiledRuleFormatter; }; +export type FieldValidationStatus = 'passed' | 'failed' | 'unvalidated'; + // Shared props of Field and Form export type FieldFormSharedProps = | 'colon' @@ -83,6 +85,7 @@ export type FieldExpose = { rules?: FieldRule[] | undefined ) => Promise; resetValidation: () => void; + getValidationStatus: () => FieldValidationStatus; /** @private */ formValue: ComputedRef; }; diff --git a/packages/vant/src/form/Form.tsx b/packages/vant/src/form/Form.tsx index a7857b0b6..47db6eb2e 100644 --- a/packages/vant/src/form/Form.tsx +++ b/packages/vant/src/form/Form.tsx @@ -18,6 +18,7 @@ import type { FieldTextAlign, FieldValidateError, FieldValidateTrigger, + FieldValidationStatus, } from '../field/types'; import type { FormExpose } from './types'; @@ -141,6 +142,12 @@ export default defineComponent({ }); }; + const getValidationStatus = () => + children.reduce>((form, field) => { + form[field.name] = field.getValidationStatus(); + return form; + }, {}); + const scrollToField = ( name: string, options?: boolean | ScrollIntoViewOptions @@ -186,6 +193,7 @@ export default defineComponent({ getValues, scrollToField, resetValidation, + getValidationStatus, }); return () => ( diff --git a/packages/vant/src/form/README.md b/packages/vant/src/form/README.md index 941b23b9f..c08540b85 100644 --- a/packages/vant/src/form/README.md +++ b/packages/vant/src/form/README.md @@ -538,9 +538,10 @@ Use [ref](https://v3.vuejs.org/guide/component-template-refs.html) to get Form i | Name | Description | Attribute | Return value | | --- | --- | --- | --- | | submit | Submit form | - | - | -| validate | Validate form | _name?: string \| string[]_ | _Promise_ | | getValues `v3.4.8` | Get current form values | - | _Record_ | +| validate | Validate form | _name?: string \| string[]_ | _Promise\_ | | resetValidation | Reset validation | _name?: string \| string[]_ | - | +| getValidationStatus `v3.5.0` | Get validation status of all fields，status can be `passed`、`failed`、`unvalidated` | - | _Record\_ | | scrollToField | Scroll to field | _name: string, alignToTop: boolean_ | - | ### Types diff --git a/packages/vant/src/form/README.zh-CN.md b/packages/vant/src/form/README.zh-CN.md index 47532e444..f6aaf9fd9 100644 --- a/packages/vant/src/form/README.zh-CN.md +++ b/packages/vant/src/form/README.zh-CN.md @@ -576,9 +576,10 @@ export default { | 方法名 | 说明 | 参数 | 返回值 | | --- | --- | --- | --- | | submit | 提交表单，与点击提交按钮的效果等价 | - | - | -| validate | 验证表单，支持传入 `name` 来验证单个或部分表单项 | _name?: string \| string[]_ | _Promise_ | | getValues `v3.4.8` | 获取所有表单项当前的值 | - | _Record_ | -| resetValidation | 重置表单项的验证提示，支持传入 `name` 来重置单个或部分表单项 | _name?: string \| string[]_ | - | +| validate | 验证表单，支持传入一个或多个 `name` 来验证单个或部分表单项，不传入 `name` 时，会验证所有表单项 | _name?: string \| string[]_ | _Promise\_ | +| resetValidation | 重置表单项的验证提示，支持传入一个或多个 `name` 来重置单个或部分表单项，不传入 `name` 时，会重置所有表单项 | _name?: string \| string[]_ | - | +| getValidationStatus `v3.5.0` | 获取所有表单项的校验状态，状态包括 `passed`、`failed`、`unvalidated` | - | _Record\_ | | scrollToField | 滚动到对应表单项的位置，默认滚动到顶部，第二个参数传 false 可滚动至底部 | _name: string, alignToTop: boolean_ | - | ### 类型定义 diff --git a/packages/vant/src/form/test/__snapshots__/demo.spec.ts.snap b/packages/vant/src/form/test/__snapshots__/demo.spec.ts.snap index d9c042ecd..5d788962c 100644 --- a/packages/vant/src/form/test/__snapshots__/demo.spec.ts.snap +++ b/packages/vant/src/form/test/__snapshots__/demo.spec.ts.snap @@ -459,7 +459,7 @@ exports[`should render demo and match snapshot 1`] = `
diff --git a/packages/vant/src/form/test/methods.spec.tsx b/packages/vant/src/form/test/methods.spec.tsx index 8d3322cf0..7c3b54430 100644 --- a/packages/vant/src/form/test/methods.spec.tsx +++ b/packages/vant/src/form/test/methods.spec.tsx @@ -153,3 +153,37 @@ test('getValues method should return all current values', () => { expect(formRef.value?.getValues()).toEqual({ A: '123', B: '456' }); }); + +test('getValidationStatus method should the status of all fields', async () => { + const formRef = ref(); + const rules = getSimpleRules(); + mount({ + render() { + return ( +
+ + + + ); + }, + }); + + expect(formRef.value?.getValidationStatus()).toEqual({ + A: 'unvalidated', + B: 'unvalidated', + }); + + await formRef.value?.validate(); + + expect(formRef.value?.getValidationStatus()).toEqual({ + A: 'passed', + B: 'passed', + }); + + formRef.value?.resetValidation(); + + expect(formRef.value?.getValidationStatus()).toEqual({ + A: 'unvalidated', + B: 'unvalidated', + }); +}); diff --git a/packages/vant/src/form/types.ts b/packages/vant/src/form/types.ts index f5e372f27..bfdc5be2c 100644 --- a/packages/vant/src/form/types.ts +++ b/packages/vant/src/form/types.ts @@ -1,5 +1,6 @@ import type { ComponentPublicInstance } from 'vue'; import type { FormProps } from './Form'; +import type { FieldValidationStatus } from '../field'; export type FormExpose = { submit: () => void; @@ -10,6 +11,7 @@ export type FormExpose = { options?: boolean | ScrollIntoViewOptions | undefined ) => void; resetValidation: (name?: string | string[] | undefined) => void; + getValidationStatus: () => Record; }; export type FormProvide = { diff --git a/packages/vant/src/locale/README.md b/packages/vant/src/locale/README.md index 111e1ebe7..6cd452836 100644 --- a/packages/vant/src/locale/README.md +++ b/packages/vant/src/locale/README.md @@ -41,13 +41,16 @@ Current supported languages: | Language | Filename | Version | | ------------------------ | ------------ | -------- | +| Bulgarian | bg-BG | `v3.5.0` | | Bangla (Bangladesh) | bn-BD | `v3.4.5` | | Danish | da-DK | `v3.4.8` | | German | de-DE | - | | German (formal) | de-DE-formal | - | +| Greek | el-GR | `v3.5.0` | | English | en-US | - | | Spanish (Spain) | es-ES | - | | French | fr-FR | - | +| Hebrew | he-IL | `v3.5.0` | | Hindi | hi-IN | `v3.4.3` | | Indonesian | id-ID | `v3.4.5` | | Icelandic | is-IS | `v3.4.7` | diff --git a/packages/vant/src/locale/README.zh-CN.md b/packages/vant/src/locale/README.zh-CN.md index dc19e7a6c..579a232e0 100644 --- a/packages/vant/src/locale/README.zh-CN.md +++ b/packages/vant/src/locale/README.zh-CN.md @@ -42,13 +42,16 @@ Locale.add(messages); | 语言 | 文件名 | 版本 | | -------------------- | ------------ | -------- | +| 保加利亚语 | bg-BG | `v3.5.0` | | 孟加拉语（孟加拉国） | bn-BD | `v3.4.5` | | 丹麦语 | da-DK | `v3.4.8` | | 德语 | de-DE | - | | 德语（正式） | de-DE-formal | - | +| 希腊语 | el-GR | `v3.5.0` | | 英语 | en-US | - | | 西班牙语 | es-ES | - | | 法语 | fr-FR | - | +| 希伯来语 | he-IL | `v3.5.0` | | 印地语 | hi-IN | `v3.4.3` | | 印度尼西亚语 | id-ID | `v3.4.5` | | 冰岛语 | is-IS | `v3.4.7` | diff --git a/packages/vant/src/locale/lang/bg-BG.ts b/packages/vant/src/locale/lang/bg-BG.ts new file mode 100644 index 000000000..0d6d57bb1 --- /dev/null +++ b/packages/vant/src/locale/lang/bg-BG.ts @@ -0,0 +1,71 @@ +export default { + name: 'Име', + tel: 'Телефон', + save: 'Запазване', + confirm: 'Потвърди', + cancel: 'Отказ', + delete: 'Изтриване', + loading: 'Зареждане...', + noCoupon: 'Без купони', + nameEmpty: 'Моля, попълнете името', + addContact: 'Добавяне на контакт', + telInvalid: 'Неправилно формиран телефонен номер', + vanCalendar: { + end: 'Край', + start: 'Старт', + title: 'Календар', + weekdays: [ + 'неделя', + 'понеделник', + 'вторник', + 'сряда', + 'четвъртък', + 'петък', + 'събота', + ], + monthTitle: (year: number, month: number) => `${year}/${month}`, + rangePrompt: (maxRange: number) => `Изберете не повече от ${maxRange} дни`, + }, + vanCascader: { + select: 'Избор', + }, + vanPagination: { + prev: 'Предишна', + next: 'Напред', + }, + vanPullRefresh: { + pulling: 'Издърпайте за опресняване...', + loosing: 'Разхлабен за опресняване...', + }, + vanSubmitBar: { + label: 'Общо:', + }, + vanCoupon: { + unlimited: 'Неограничен', + discount: (discount: number) => `${discount * 10}% отстъпка`, + condition: (condition: number) => `Поне ${condition}`, + }, + vanCouponCell: { + title: 'Купон', + count: (count: number) => `Имате ${count} купони`, + }, + vanCouponList: { + exchange: 'Размяна', + close: 'Затвори', + enable: 'Налично', + disabled: 'Недостъпно', + placeholder: 'Код на купон', + }, + vanAddressEdit: { + area: 'Площ', + postal: 'Пощенски', + areaEmpty: 'Моля, изберете зона за получаване', + addressEmpty: 'Адресът не може да бъде празен', + postalEmpty: 'Грешен пощенски код', + addressDetail: 'Адрес', + defaultAddress: 'Задаване като адрес по подразбиране', + }, + vanAddressList: { + add: 'Добавяне на нов адрес', + }, +}; diff --git a/packages/vant/src/locale/lang/el-GR.ts b/packages/vant/src/locale/lang/el-GR.ts new file mode 100644 index 000000000..c3acb8b32 --- /dev/null +++ b/packages/vant/src/locale/lang/el-GR.ts @@ -0,0 +1,72 @@ +export default { + name: 'Όνομα', + tel: 'Τηλέφωνο', + save: 'Αποθήκευση', + confirm: 'Επιβεβαίωση', + cancel: 'Ακύρωση', + delete: 'Διαγραφή', + loading: 'Φόρτωση...', + noCoupon: 'Χωρίς κουπόνια', + nameEmpty: 'Παρακαλώ συμπληρώστε το όνομα', + addContact: 'Προσθήκη επαφής', + telInvalid: 'Αριθμός τηλεφώνου με εσφαλμένη μορφή', + vanCalendar: { + end: 'Τέλος', + start: 'Έναρξη', + title: 'Ημερολόγιο', + weekdays: [ + 'Κυριακή', + 'Δευτέρα', + 'Τρίτη', + 'Τετάρτη', + 'Πέμπτη', + 'Παρασκευή', + 'Σάββατο', + ], + monthTitle: (year: number, month: number) => `${year}/${month}`, + rangePrompt: (maxRange: number) => + `Επιλέξτε όχι περισσότερες από ${maxRange} ημέρες`, + }, + vanCascader: { + select: 'Επιλογή', + }, + vanPagination: { + prev: 'Προηγούμενο', + next: 'Επόμενο', + }, + vanPullRefresh: { + pulling: 'Τραβήξτε για ανανέωση...', + loosing: 'Χαλαρά για ανανέωση...', + }, + vanSubmitBar: { + label: 'Σύνολο:', + }, + vanCoupon: { + unlimited: 'Απεριόριστο', + discount: (discount: number) => `${discount * 10}% έκπτωση`, + condition: (condition: number) => `Τουλάχιστον ${condition}`, + }, + vanCouponCell: { + title: 'Κουπόνι', + count: (count: number) => `Έχετε ${count} κουπόνια`, + }, + vanCouponList: { + exchange: 'Ανταλλαγή', + close: 'Κλείσιμο', + enable: 'Διαθέσιμο', + disabled: 'Μη διαθέσιμο', + placeholder: 'Κωδικός κουπονιού', + }, + vanAddressEdit: { + area: 'Περιοχή', + postal: 'Ταχυδρομείο', + areaEmpty: 'Παρακαλώ επιλέξτε μια περιοχή λήψης', + addressEmpty: 'Η διεύθυνση δεν μπορεί να είναι κενή', + postalEmpty: 'Λάθος ταχυδρομικός κώδικας', + addressDetail: 'Διεύθυνση', + defaultAddress: 'Ορισμός ως προεπιλεγμένη διεύθυνση', + }, + vanAddressList: { + add: 'Προσθήκη νέας διεύθυνσης', + }, +}; diff --git a/packages/vant/src/locale/lang/he-IL.ts b/packages/vant/src/locale/lang/he-IL.ts new file mode 100644 index 000000000..14c5cef8b --- /dev/null +++ b/packages/vant/src/locale/lang/he-IL.ts @@ -0,0 +1,63 @@ +export default { + name: 'שם', + tel: 'טלפון', + save: 'שמור', + confirm: 'אישור', + cancel: 'ביטול', + delete: 'מחיקה', + loading: 'טוען...', + noCoupon: 'אין קופונים', + nameEmpty: 'אנא מלא את השדה', + addContact: 'הוסף איש-קשר', + telInvalid: 'מספר טלפון שגוי', + vanCalendar: { + end: 'סוף', + start: 'התחלה', + title: 'לוח שנה', + weekdays: ['ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'], + monthTitle: (year: number, month: number) => `${year}/${month}`, + rangePrompt: (maxRange: number) => ` בחר לא יותר מ ${maxRange} ימים `, + }, + vanCascader: { + select: 'בחר', + }, + vanPagination: { + prev: 'הקודם', + next: 'הבא', + }, + vanPullRefresh: { + pulling: 'גרור כדי לרענן', + loosing: 'שחרר כדי לרענן', + }, + vanSubmitBar: { + label: 'סך הכל:', + }, + vanCoupon: { + unlimited: 'ללא הגבלה', + discount: (discount: number) => `${discount * 10}% הנחה`, + condition: (condition: number) => ` לפחות ${condition}`, + }, + vanCouponCell: { + title: 'קופון', + count: (count: number) => ` יש לך ${count} קופונים `, + }, + vanCouponList: { + exchange: 'החלפה', + close: 'סגירה', + enable: 'זמינים', + disabled: 'לא זמינים', + placeholder: 'קוד קופון', + }, + vanAddressEdit: { + area: 'איזור', + postal: 'מיקוד', + areaEmpty: 'אנא בחר איזור קבלה', + addressEmpty: 'יש למלא כתובת', + postalEmpty: 'טעות במיקוד', + addressDetail: 'כתובת', + defaultAddress: 'הגדר ככתובת ברירת מחדש', + }, + vanAddressList: { + add: 'הוספת כתובת חדשה', + }, +}; diff --git a/packages/vant/src/picker/test/index.spec.tsx b/packages/vant/src/picker/test/index.spec.tsx index 8c61d98d0..9eb5a67d2 100644 --- a/packages/vant/src/picker/test/index.spec.tsx +++ b/packages/vant/src/picker/test/index.spec.tsx @@ -238,3 +238,28 @@ test('should not render mask and frame when options is empty', async () => { expect(wrapper.find('.van-picker__mask').exists()).toBeTruthy(); expect(wrapper.find('.van-picker__frame').exists()).toBeTruthy(); }); + +test('columns-field-names responsiveness', async () => { + const columnsOne = [ + { type: 1, name: 'Ios' }, + { type: 2, name: 'Android' }, + ]; + const columnsTwo = [ + { type: 1, serverName: 'server1' }, + { type: 2, serverName: 'server2' }, + ]; + const wrapper = mount(Picker, { + props: { + columns: columnsOne, + columnsFieldNames: { + text: 'name', + }, + }, + }); + expect(wrapper.findAll('.van-ellipsis')[0].text()).toEqual('Ios'); + await wrapper.setProps({ + columns: columnsTwo, + columnsFieldNames: { text: 'serverName' }, + }); + expect(wrapper.findAll('.van-ellipsis')[0].text()).toEqual('server1'); +}); diff --git a/packages/vant/src/stepper/README.md b/packages/vant/src/stepper/README.md index b8629e91d..40f3f78f5 100644 --- a/packages/vant/src/stepper/README.md +++ b/packages/vant/src/stepper/README.md @@ -143,8 +143,8 @@ export default { | show-plus | Whether to show plus button | _boolean_ | `true` | | show-minus | Whether to show minus button | _boolean_ | `true` | | show-input | Whether to show input | _boolean_ | `true` | -| long-press | Whether to allow long press | _boolean_ | `true` | -| allow-empty | Whether to allow the input to be empty | _boolean_ | `false` | +| long-press | Whether to enable the long press gesture, when enabled you can long press the increase and decrease buttons | _boolean_ | `true` | +| allow-empty | Whether to allow the input value to be empty, set to `true` to allow an empty string to be passed in | _boolean_ | `false` | ### Events diff --git a/packages/vant/src/stepper/README.zh-CN.md b/packages/vant/src/stepper/README.zh-CN.md index eb387ae62..b27da7c6d 100644 --- a/packages/vant/src/stepper/README.zh-CN.md +++ b/packages/vant/src/stepper/README.zh-CN.md @@ -163,8 +163,8 @@ export default { | show-plus | 是否显示增加按钮 | _boolean_ | `true` | | show-minus | 是否显示减少按钮 | _boolean_ | `true` | | show-input | 是否显示输入框 | _boolean_ | `true` | -| long-press | 是否开启长按手势 | _boolean_ | `true` | -| allow-empty | 是否允许输入的值为空 | _boolean_ | `false` | +| long-press | 是否开启长按手势，开启后可以长按增加和减少按钮 | _boolean_ | `true` | +| allow-empty | 是否允许输入的值为空，设置为 `true` 后允许传入空字符串 | _boolean_ | `false` | ### Events diff --git a/packages/vant/src/switch/README.md b/packages/vant/src/switch/README.md index abf7394ae..4a216d776 100644 --- a/packages/vant/src/switch/README.md +++ b/packages/vant/src/switch/README.md @@ -59,6 +59,37 @@ export default { ``` +### Custom Node + +Using `node` slot to custom the content of the node. + +```html + +
+ +
+ + + +``` + ### Async Control ```html @@ -121,6 +152,12 @@ export default { | change | Emitted when check status changed | _value: any_ | | click | Emitted when component is clicked | _event: MouseEvent_ | +### Slots + +| Name | Description | SlotProps | +| ------------- | -------------------------- | --------- | +| node `v3.5.0` | Custom the content of node | - | + ### Types The component exports the following type definitions: diff --git a/packages/vant/src/switch/README.zh-CN.md b/packages/vant/src/switch/README.zh-CN.md index 4990baa1a..5e7381097 100644 --- a/packages/vant/src/switch/README.zh-CN.md +++ b/packages/vant/src/switch/README.zh-CN.md @@ -69,6 +69,37 @@ export default { ``` +### 自定义按钮 + +通过 `node` 插槽自定义按钮的内容。 + +```html + +
+ +
+ + + +``` + ### 异步控制 需要异步控制开关时，可以使用 `modelValue` 属性和 `update:model-value` 事件代替 `v-model`，并在事件回调函数中手动处理开关状态。 @@ -133,6 +164,12 @@ export default { | change | 开关状态切换时触发 | _value: any_ | | click | 点击时触发 | _event: MouseEvent_ | +### Slots + +| 名称 | 说明 | 参数 | +| ------------- | ---------------- | ---- | +| node `v3.5.0` | 自定义按钮的内容 | - | + ### 类型定义 组件导出以下类型定义： diff --git a/packages/vant/src/switch/Switch.tsx b/packages/vant/src/switch/Switch.tsx index bfc337f80..73f18c997 100644 --- a/packages/vant/src/switch/Switch.tsx +++ b/packages/vant/src/switch/Switch.tsx @@ -31,7 +31,7 @@ export default defineComponent({ emits: ['change', 'update:modelValue'], - setup(props, { emit }) { + setup(props, { emit, slots }) { const isChecked = () => props.modelValue === props.activeValue; const onClick = () => { @@ -47,6 +47,9 @@ export default defineComponent({ const color = isChecked() ? props.activeColor : props.inactiveColor; return ; } + if (slots.node) { + return slots.node(); + } }; useCustomFieldValue(() => props.modelValue); diff --git a/packages/vant/src/switch/demo/index.vue b/packages/vant/src/switch/demo/index.vue index 687c44b64..a5215f48e 100644 --- a/packages/vant/src/switch/demo/index.vue +++ b/packages/vant/src/switch/demo/index.vue @@ -1,6 +1,7 @@