diff --git a/packages/area/index.less b/packages/area/index.less index 72b95115..b82bf76d 100644 --- a/packages/area/index.less +++ b/packages/area/index.less @@ -57,11 +57,10 @@ &__item { padding: 0 5px; - color: @gray-dark; + color: @text-color; &--selected { font-weight: 500; - color: @text-color; } &--disabled { diff --git a/packages/area/index.ts b/packages/area/index.ts index c3e0727e..c4f28f73 100644 --- a/packages/area/index.ts +++ b/packages/area/index.ts @@ -33,13 +33,6 @@ VantComponent({ columns: [] }, - computed: { - displayColumns() { - const { columns = [], columnsNum } = this.data; - return columns.slice(0, +columnsNum); - } - }, - watch: { value(value) { this.code = value; @@ -68,7 +61,8 @@ VantComponent({ onChange(event: Weapp.Event) { const { value } = event.detail; - const { pickerValue, displayColumns } = this.data; + const { pickerValue } = this.data; + const displayColumns = this.getDisplayColumns(); const index = pickerValue.findIndex( (item, index) => item !== value[index] ); @@ -159,7 +153,8 @@ VantComponent({ }, getValues() { - const { displayColumns = [], pickerValue = [] } = this.data; + const { pickerValue = [] } = this.data; + const displayColumns = this.getDisplayColumns(); return displayColumns .map((option, index) => option[pickerValue[index]]) .filter(value => !!value); @@ -201,6 +196,11 @@ VantComponent({ reset() { this.code = ''; this.setValues(); + }, + + getDisplayColumns() { + const { columns = [], columnsNum } = this.data; + return columns.slice(0, +columnsNum); } } }); diff --git a/packages/area/index.wxml b/packages/area/index.wxml index cf401704..bec4249b 100644 --- a/packages/area/index.wxml +++ b/packages/area/index.wxml @@ -17,7 +17,8 @@ class="van-picker__columns" >