diff --git a/examples/form/demos/validator-status.vue b/examples/form/demos/validator-status.vue index aefa94510..4e2d73a78 100644 --- a/examples/form/demos/validator-status.vue +++ b/examples/form/demos/validator-status.vue @@ -15,30 +15,30 @@ @submit="onSubmit" :statusIcon="true" > - + - + - + - + - + - + - + - + - + - + - + 提交 重置 @@ -85,25 +85,13 @@ export default { return { formData: { ...INITIAL_DATA }, rules: { - fail: [ - { required: true, message: '必填', type: 'error' }, - ], - warning: [ - { required: true, message: '必填', type: 'warning' }, - ], - success: [ - { validator: () => true }, - ], - failB: [ - { required: true, message: '必填', type: 'error' }, - ], - warningB: [ - { required: true, message: '必填', type: 'warning' }, - ], + fail: [{ required: true, message: '必填', type: 'error' }], + warning: [{ required: true, message: '必填', type: 'warning' }], + success: [{ validator: () => true }], + failB: [{ required: true, message: '必填', type: 'error' }], + warningB: [{ required: true, message: '必填', type: 'warning' }], }, - addlist: [ - { id: 0, name: 'add0' }, - ], + addlist: [{ id: 0, name: 'add0' }], lastAddItem: 1, }; }, @@ -132,9 +120,8 @@ export default { this.$message.warning(firstError); } }, - getStatusIcon(h) { - console.log(h); - return ; + getStatusIcon() { + return ; }, }, }; diff --git a/site/src/App.vue b/site/src/App.vue index 41466db08..98240aef8 100644 --- a/site/src/App.vue +++ b/site/src/App.vue @@ -1,24 +1,3 @@ - - diff --git a/site/src/components/codesandbox/index.vue b/site/src/components/codesandbox/index.vue index 2ec079446..491d749f8 100644 --- a/site/src/components/codesandbox/index.vue +++ b/site/src/components/codesandbox/index.vue @@ -23,7 +23,29 @@ import pkg from '@/package.json'; import packageJSON from './package.json'; import mainJsContent from './main.js?raw'; -import styleContent from './index.css?raw'; + +const styleContent = ` +/* 竖排展示 demo 行间距 16px */ +.tdesign-demo-block-column { + display: flex; + flex-direction: column; + row-gap: 16px; +} + +/* 竖排展示 demo 行间距 32px */ +.tdesign-demo-block-column-large { + display: flex; + flex-direction: column; + row-gap: 32px; +} + +/* 横排排展示 demo 列间距 16px */ +.tdesign-demo-block-row { + display: flex; + column-gap: 16px; + align-items: center; +} +`; packageJSON.dependencies['tdesign-vue'] = pkg.version; packageJSON.dependencies['tdesign-icons-vue'] = pkg.dependencies['tdesign-icons-vue']; @@ -36,7 +58,7 @@ function getDemoContent(demoContent) { } export default { - name: "code-sandbox", + name: 'code-sandbox', props: { code: String, demoName: String, @@ -90,3 +112,24 @@ export default { }, }; + + diff --git a/src/input/input.tsx b/src/input/input.tsx index 3d4f5e8a6..94f54cab2 100644 --- a/src/input/input.tsx +++ b/src/input/input.tsx @@ -45,7 +45,7 @@ export default (Vue as VueConstructor).extend({ disabled: this.disabled, readonly: this.readonly, autocomplete: this.autocomplete, - placeholder: this.placeholder || undefined, + placeholder: this.placeholder || '请输入', maxlength: this.maxlength, name: this.name || undefined, type: this.renderType, @@ -76,7 +76,7 @@ export default (Vue as VueConstructor).extend({ keypress: this.handleKeypress, // input的change事件是失去焦点或者keydown的时候执行。这与api定义的change不符,所以不做任何变化。 // eslint-disable-next-line @typescript-eslint/no-empty-function - change: () => { }, + change: () => {}, }); const wrapperAttrs = omit(this.$attrs, Object.keys(this.inputAttrs)); @@ -111,8 +111,8 @@ export default (Vue as VueConstructor).extend({ return (
this.mouseEvent(true) } - onMouseleave={() => this.mouseEvent(false) } + onMouseenter={() => this.mouseEvent(true)} + onMouseleave={() => this.mouseEvent(false)} {...{ attrs: wrapperAttrs, on: wrapperEvents }} > {prefixIcon ? {prefixIcon} : null} @@ -124,11 +124,9 @@ export default (Vue as VueConstructor).extend({ onInput={this.handleInput} onCompositionend={this.onCompositionend} /> - { - suffixIcon - ? {suffixIcon} - : null - } + {suffixIcon ? ( + {suffixIcon} + ) : null}
); }, @@ -136,11 +134,7 @@ export default (Vue as VueConstructor).extend({ mouseEvent(v: boolean) { this.isHover = v; }, - renderIcon( - h: CreateElement, - icon: string | Function | undefined, - iconType: 'prefix-icon' | 'suffix-icon', - ) { + renderIcon(h: CreateElement, icon: string | Function | undefined, iconType: 'prefix-icon' | 'suffix-icon') { if (typeof icon === 'function') { return icon(h); } diff --git a/src/steps/props.ts b/src/steps/props.ts index ecf98d70d..ec8e7537c 100644 --- a/src/steps/props.ts +++ b/src/steps/props.ts @@ -20,7 +20,6 @@ export default { /** 已废弃。步骤条方向,有两种:横向和纵向 */ direction: { type: String as PropType, - default: 'horizontal' as TdStepsProps['direction'], validator(val: TdStepsProps['direction']): boolean { return ['horizontal', 'vertical'].includes(val); }, diff --git a/src/time-picker/time-picker.tsx b/src/time-picker/time-picker.tsx index 1943a5fde..684e2ea4c 100755 --- a/src/time-picker/time-picker.tsx +++ b/src/time-picker/time-picker.tsx @@ -6,7 +6,12 @@ import { TimeIcon as TIconTime } from 'tdesign-icons-vue'; import mixins from '../utils/mixins'; import getConfigReceiverMixins, { TimePickerConfig } from '../config-provider/config-receiver'; import { - TimePickerInstance, TimePickerPanelInstance, TimeInputEvent, InputTime, TimeInputType, EPickerCols, + TimePickerInstance, + TimePickerPanelInstance, + TimeInputEvent, + InputTime, + TimeInputType, + EPickerCols, } from './interface'; import TPopup, { PopupVisibleChangeContext } from '../popup'; import { prefix } from '../config'; @@ -68,13 +73,16 @@ export default mixins(getConfigReceiverMixins step !== 1).length < 1) { + } + if (this.steps.filter((step) => step !== 1).length < 1) { return [dayjs()]; - } return [dayjs().hour(0).minute(0).second(0)]; + } + return [dayjs().hour(0).minute(0).second(0)]; }, textClassName(): string { - const isDefault = (this.inputTime as any) - .some((item: InputTime) => !!item.hour && !!item.minute && !!item.second); + const isDefault = (this.inputTime as any).some( + (item: InputTime) => !!item.hour && !!item.minute && !!item.second, + ); return isDefault ? '' : `${name}__group-text`; }, }, @@ -131,13 +139,19 @@ export default mixins(getConfigReceiverMixins diff --git a/test/ssr/__snapshots__/ssr.test.js.snap b/test/ssr/__snapshots__/ssr.test.js.snap index e8b0cd99d..1a6a82239 100644 --- a/test/ssr/__snapshots__/ssr.test.js.snap +++ b/test/ssr/__snapshots__/ssr.test.js.snap @@ -3190,7 +3190,7 @@ exports[`ssr snapshot test renders ./examples/config-provider/demos/others.vue c
-
+
select time



Fearure Tag Fearure Tag Fearure Tag Fearure Tag

@@ -3272,7 +3272,7 @@ exports[`ssr snapshot test renders ./examples/config-provider/demos/pagination.v
-
jump to
+
jump to
`; @@ -3886,13 +3886,13 @@ exports[`ssr snapshot test renders ./examples/drawer/demos/operation.vue correct
标签 A -
+
标签 B -
+
标签 C -
+
@@ -4065,7 +4065,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/align.vue correctly 1`]
-
+
@@ -4141,7 +4141,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/custom-validator.vue co
-
+
@@ -4149,7 +4149,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/custom-validator.vue co
-
+
同一个校验方法可输出不同的错误信息和类型,依次输入:1234 观察变化
@@ -4158,7 +4158,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/custom-validator.vue co
-
+
在此处体验普通自定义校验方法
@@ -4185,7 +4185,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/layout.vue correctly 1`
-
+
@@ -4193,7 +4193,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/layout.vue correctly 1`
-
+
@@ -4234,7 +4234,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator.vue correctly
-
+
这里请填写用户名
@@ -4243,7 +4243,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator.vue correctly
-
+
这里请填写密码
@@ -4252,7 +4252,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator.vue correctly
-
+
@@ -4291,7 +4291,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator.vue correctly
-
+
@@ -4299,7 +4299,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator.vue correctly
-
+
@@ -4320,7 +4320,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator-status.vue co
-
+
这是校验通过后的提示信息
@@ -4329,7 +4329,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator-status.vue co
-
+
@@ -4337,7 +4337,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator-status.vue co
-
+
@@ -4353,7 +4353,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator-status.vue co
-
+
@@ -4369,7 +4369,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator-status.vue co
-
+
@@ -4378,7 +4378,7 @@ exports[`ssr snapshot test renders ./examples/form/demos/validator-status.vue co
-
+
自定义帮助图标
@@ -4976,7 +4976,7 @@ exports[`ssr snapshot test renders ./examples/input/demos/clearable.vue correctl exports[`ssr snapshot test renders ./examples/input/demos/disabled.vue correctly 1`] = `
-
+
`; @@ -4990,28 +4990,28 @@ exports[`ssr snapshot test renders ./examples/input/demos/group.vue correctly 1`
-
-
+
+
-
-
+
+
-
-
+
+
-
 -  -
-
-
+
 -  +
+
+
@@ -5019,8 +5019,8 @@ exports[`ssr snapshot test renders ./examples/input/demos/group.vue correctly 1` exports[`ssr snapshot test renders ./examples/input/demos/password.vue correctly 1`] = `
-
-
+
+
`; @@ -5034,9 +5034,9 @@ exports[`ssr snapshot test renders ./examples/input/demos/size.vue correctly 1`] exports[`ssr snapshot test renders ./examples/input/demos/status.vue correctly 1`] = `
-
-
-
+
+
+
`; @@ -7262,7 +7262,7 @@ exports[`ssr snapshot test renders ./examples/pagination/demos/customizable.vue
-
跳至
+
跳至
`; @@ -7296,7 +7296,7 @@ exports[`ssr snapshot test renders ./examples/pagination/demos/disabled.vue corr
-
跳至
+
跳至
`; @@ -7356,7 +7356,7 @@ exports[`ssr snapshot test renders ./examples/pagination/demos/jump.vue correctl
-
跳至
+
跳至
`; @@ -12109,7 +12109,7 @@ exports[`ssr snapshot test renders ./examples/table/demos/pagination.vue correct
-
跳至
+
跳至
@@ -13288,14 +13288,14 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/base.vue correct
-
+
::
-
+
::
@@ -13308,7 +13308,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/clearable.vue co
-
+
::
@@ -13316,7 +13316,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/clearable.vue co
-
+
::
@@ -13328,7 +13328,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/disabled.vue cor
-
+
::
@@ -13340,7 +13340,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/format.vue corre
-
+
::
@@ -13353,7 +13353,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/hide-clear-butto
-
+
::
@@ -13361,7 +13361,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/hide-clear-butto
-
+
请选择时间
@@ -13373,7 +13373,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/hm.vue correctly
-
+
请选择时间
@@ -13385,7 +13385,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/hms.vue correctl
-
+
::
@@ -13398,7 +13398,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/keyboard.vue cor
-
+
::
@@ -13406,7 +13406,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/keyboard.vue cor
-
+
::
@@ -13418,7 +13418,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/range.vue correc
-
+
::-::
@@ -13430,7 +13430,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/show-steps.vue c
-
+
请选择时间
@@ -13442,7 +13442,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/step.vue correct
-
+
::
@@ -13454,7 +13454,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/twelve-hour.vue
-
+
::
@@ -13466,7 +13466,7 @@ exports[`ssr snapshot test renders ./examples/time-picker/demos/twelve-hour-meri
-
+
::
@@ -14087,13 +14087,13 @@ exports[`ssr snapshot test renders ./examples/tree/demos/controlled.vue correctl
checked: -
+
expanded: -
+
actived: -
+
@@ -14379,7 +14379,7 @@ exports[`ssr snapshot test renders ./examples/tree/demos/expand-mutex.vue correc exports[`ssr snapshot test renders ./examples/tree/demos/filter.vue correctly 1`] = `
filter: -
+
@@ -14786,7 +14786,7 @@ exports[`ssr snapshot test renders ./examples/tree/demos/operations.vue correctl
filter: -
+
@@ -14805,7 +14805,7 @@ exports[`ssr snapshot test renders ./examples/tree/demos/performance.vue correct
插入节点数量: -
+
@@ -14848,13 +14848,13 @@ exports[`ssr snapshot test renders ./examples/tree/demos/sync.vue correctly 1`]
checked: -
+
expanded: -
+
actived: -
+
@@ -14902,7 +14902,7 @@ exports[`ssr snapshot test renders ./examples/tree-select/demos/collapsed.vue co
guangzhou+1 - +
guangzhou更多... - +
guangzhoushenzhen - +
undefinedundefined - +
@@ -978,6 +979,7 @@ exports[`Drawer Demo operation wroks fine 1`] = ` >
@@ -995,6 +997,7 @@ exports[`Drawer Demo operation wroks fine 1`] = ` >
diff --git a/test/unit/input/__snapshots__/demo.test.js.snap b/test/unit/input/__snapshots__/demo.test.js.snap index ac5e45ea1..6a7d5abcb 100644 --- a/test/unit/input/__snapshots__/demo.test.js.snap +++ b/test/unit/input/__snapshots__/demo.test.js.snap @@ -107,6 +107,7 @@ exports[`Input disabled demo works fine 1`] = `
@@ -128,6 +129,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -137,6 +139,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -152,6 +155,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -161,6 +165,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -176,6 +181,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -185,6 +191,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -201,6 +208,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -217,6 +225,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -227,6 +236,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -237,6 +247,7 @@ exports[`Input group demo works fine 1`] = ` >
@@ -277,6 +288,7 @@ exports[`Input password demo works fine 1`] = `
@@ -414,6 +428,7 @@ exports[`Input status demo works fine 1`] = ` >
@@ -423,6 +438,7 @@ exports[`Input status demo works fine 1`] = ` > diff --git a/test/unit/input/__snapshots__/index.test.js.snap b/test/unit/input/__snapshots__/index.test.js.snap index b0d903890..082843b06 100644 --- a/test/unit/input/__snapshots__/index.test.js.snap +++ b/test/unit/input/__snapshots__/index.test.js.snap @@ -2,14 +2,14 @@ exports[`Input $attrs input attrs should pass to input element 1`] = `
`; -exports[`Input :props :autocomplete 1`] = `
`; +exports[`Input :props :autocomplete 1`] = `
`; -exports[`Input :props :disabled 1`] = `
`; +exports[`Input :props :disabled 1`] = `
`; -exports[`Input :props :prefix-icon 1`] = `
`; +exports[`Input :props :prefix-icon 1`] = `
`; -exports[`Input :props :readonly 1`] = `
`; +exports[`Input :props :readonly 1`] = `
`; -exports[`Input :props :size 1`] = `
`; +exports[`Input :props :size 1`] = `
`; -exports[`Input :props :suffix-icon 1`] = `
`; +exports[`Input :props :suffix-icon 1`] = `
`; diff --git a/test/unit/pagination/__snapshots__/demo.test.js.snap b/test/unit/pagination/__snapshots__/demo.test.js.snap index 62cb27d6d..8560b8e12 100644 --- a/test/unit/pagination/__snapshots__/demo.test.js.snap +++ b/test/unit/pagination/__snapshots__/demo.test.js.snap @@ -429,7 +429,7 @@ exports[`Pagination customizable demo works fine 1`] = `
-
跳至
+
跳至
`; @@ -650,6 +650,7 @@ exports[`Pagination disabled demo works fine 1`] = ` > @@ -1042,6 +1043,7 @@ exports[`Pagination jump demo works fine 1`] = ` > diff --git a/test/unit/time-picker/__snapshots__/demo.test.js.snap b/test/unit/time-picker/__snapshots__/demo.test.js.snap index 98176d6db..427ac1b6c 100644 --- a/test/unit/time-picker/__snapshots__/demo.test.js.snap +++ b/test/unit/time-picker/__snapshots__/demo.test.js.snap @@ -806,6 +806,7 @@ exports[`Time-picker base demo works fine 1`] = ` > @@ -1668,6 +1669,7 @@ exports[`Time-picker base demo works fine 1`] = ` > diff --git a/test/unit/tree-select/__snapshots__/demo.test.js.snap b/test/unit/tree-select/__snapshots__/demo.test.js.snap index 1f4943614..aac738334 100644 --- a/test/unit/tree-select/__snapshots__/demo.test.js.snap +++ b/test/unit/tree-select/__snapshots__/demo.test.js.snap @@ -400,6 +400,7 @@ exports[`TreeSelect collapsed demo works fine 1`] = ` > @@ -652,6 +653,7 @@ exports[`TreeSelect collapsed demo works fine 1`] = ` > @@ -1375,6 +1377,7 @@ exports[`TreeSelect multiple demo works fine 1`] = ` > @@ -2266,6 +2269,7 @@ exports[`TreeSelect valuetype demo works fine 1`] = ` > diff --git a/test/unit/tree-select/__snapshots__/index.test.js.snap b/test/unit/tree-select/__snapshots__/index.test.js.snap index da7566314..bec030fb4 100644 --- a/test/unit/tree-select/__snapshots__/index.test.js.snap +++ b/test/unit/tree-select/__snapshots__/index.test.js.snap @@ -21,7 +21,7 @@ exports[`TreeSelect :props :clearable 1`] = `
- +
shenzhenguangzhou - +
- +
- +
-
+
-
@@ -231,7 +231,7 @@ exports[`TreeSelect :props :loadingText 1`] = `
- +
- +
- +
- +
- +
- +
- +
- +
- +
-
@@ -697,7 +697,7 @@ exports[`TreeSelect 1`] = `
icon
- +
- +
- +
-
@@ -839,7 +839,7 @@ exports[`TreeSelect function :prefixIcon 1`] = `
- +
@@ -1306,6 +1307,7 @@ exports[`Tree:demo controlled demo works fine 1`] = ` >
@@ -1324,6 +1326,7 @@ exports[`Tree:demo controlled demo works fine 1`] = ` >
@@ -3966,6 +3969,7 @@ exports[`Tree:demo filter demo works fine 1`] = ` >
@@ -7142,6 +7146,7 @@ exports[`Tree:demo operations demo works fine 1`] = ` > @@ -7487,6 +7492,7 @@ exports[`Tree:demo sync demo works fine 1`] = ` > @@ -7505,6 +7511,7 @@ exports[`Tree:demo sync demo works fine 1`] = ` > @@ -7523,6 +7530,7 @@ exports[`Tree:demo sync demo works fine 1`] = ` >