Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/typos-config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ loosing = "loosing"

[files]
extend-exclude = [
"CHANGELOG*.md",
"changelog.json",
"CHANGELOG*.md",
"changelog.json",
"echarts.js",
"packages/components/locale/*",
"packages/uniapp-components/npm/**/*",
"packages/uniapp-pro-components/chat/npm/**/*",
"packages/tdesign-uniapp/app/common/uni.css",
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ packages/tdesign-miniprogram/test/e2e
packages/tdesign-miniprogram/test/unit
packages/tdesign-miniprogram/test/unit-virtualHost

# about uniapp
# about uniapp
packages/tdesign-uniapp/example/src/_tdesign*
packages/tdesign-uniapp/example/src/pages-more/
packages/tdesign-uniapp/npm_dist/
Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"url": "https://github.com/Tencent/tdesign-miniprogram/issues"
},
"scripts": {
"init": "git submodule init && git submodule update",
"start": "npm run dev",
"dev": "cross-env NODE_ENV=development gulp dev --gulpfile script/gulpfile.js --cwd ./",
"uniapp": "pnpm -C packages/tdesign-uniapp",
Expand All @@ -22,6 +23,7 @@
"update:icons": "node script/update-icons.mjs",
"api:css": "node packages/common/scripts/generate-css-vars.mjs Miniprogram",
"api:css:uni": "node packages/common/scripts/generate-css-vars.mjs Uniapp",
"update:locale": "gulp copyLocale --gulpfile script/gulpfile.locale.js --cwd ./",
"lintfix": "eslint '{packages/components,packages/pro-components,packages/tdesign-miniprogram/example}/**/*.{js,ts}' --fix",
"lint": "eslint '{packages/components,packages/pro-components,packages/tdesign-miniprogram/example}/**/*.{js,ts}'",
"format": "prettier {packages/components,packages/pro-components,packages/tdesign-miniprogram/example,script}/**/*.{js,ts,wxss,less,wxml,html,json,md,wxs} --write",
Expand Down Expand Up @@ -125,4 +127,4 @@
"eslint --fix"
]
}
}
}
2 changes: 1 addition & 1 deletion packages/common
Submodule common updated 62 files
+0 −52 .github/workflows/issue-assignees.temp.yml
+1 −0 .github/workflows/typos-config.toml
+200 −0 docs/web/api/chat-engine.md
+23 −2 docs/web/api/chat-markdown.md
+2 −0 docs/web/api/chat-thinking.md
+106 −14 docs/web/api/chatbot.md
+8 −0 docs/web/api/date-picker.en-US.md
+8 −0 docs/web/api/date-picker.md
+3 −1 docs/web/api/slider.en-US.md
+6 −0 js/calendar/constants.ts
+9 −0 js/calendar/types.ts
+67 −0 js/calendar/utils.ts
+4 −3 js/components.ts
+8 −4 js/date-picker/format.ts
+115 −1 js/date-picker/utils.ts
+44 −0 js/global-config/mobile/locale/ar_KW.ts
+38 −6 js/global-config/mobile/locale/en_US.ts
+31 −0 js/global-config/mobile/locale/it_IT.ts
+31 −0 js/global-config/mobile/locale/ja_JP.ts
+31 −0 js/global-config/mobile/locale/ko_KR.ts
+44 −0 js/global-config/mobile/locale/ru_RU.ts
+32 −0 js/global-config/mobile/locale/zh_CN.ts
+31 −0 js/global-config/mobile/locale/zh_TW.ts
+14 −9 js/input-number/large-number.ts
+1 −1 js/message/animation.ts
+0 −0 js/message/constants.ts
+1 −1 js/message/index.ts
+1 −1 js/upload/types.ts
+3 −0 js/upload/utils.ts
+30 −0 js/utils/helper.ts
+3 −1 js/utils/setStyle.ts
+7 −1 scripts/generate-css-vars.mjs
+110 −29 style/mobile/components/badge/_index.less
+2 −1 style/mobile/components/badge/_var.less
+7 −0 style/mobile/components/image-viewer/_index.less
+2 −2 style/mobile/components/navbar/_index.less
+1 −1 style/mobile/components/popup/_index.less
+1 −0 style/mobile/components/search/_index.less
+1 −0 style/mobile/components/search/_var.less
+1 −0 style/mobile/components/tabs/_index.less
+1 −1 style/mobile/components/tabs/_var.less
+14 −0 style/web/_global.less
+6 −1 style/web/components/card/_index.less
+4 −1 style/web/components/chat/_index.less
+17 −0 style/web/components/date-picker/_index.less
+3 −2 style/web/components/date-picker/_var.less
+2 −0 style/web/components/image-viewer/_index.less
+2 −0 style/web/components/image/_index.less
+4 −4 style/web/components/input-number/_index.less
+11 −2 style/web/components/list/_index.less
+1 −1 style/web/components/list/_var.less
+13 −34 style/web/components/menu/_index.less
+4 −0 style/web/components/range-input/_index.less
+56 −0 style/web/components/swiper/_index.less
+3 −3 style/web/components/swiper/_mixin.less
+5 −2 style/web/components/swiper/_var.less
+103 −0 test/unit/calendar/utils.test.js
+46 −2 test/unit/input-number/compareLargeNumber.test.js
+16 −0 test/unit/input-number/largeNumberSubtract.test.js
+22 −0 test/unit/input-number/largeNumberToFixed.test.js
+350 −1 test/unit/input-number/number.test.js
+135 −0 test/unit/utils/helper.test.js
2 changes: 1 addition & 1 deletion packages/components/action-sheet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ isComponent: true
该组件于 0.9.0 版本上线,请留意版本。
</div>

<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-98%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-87%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-98%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-93%25-blue" /></span>
<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-96%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-89%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-96%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-93%25-blue" /></span>
## 引入

全局引入,在 miniprogram 根目录下的`app.json`中配置,局部引入,在需要引入的页面或组件的`index.json`中配置。
Expand Down
14 changes: 11 additions & 3 deletions packages/components/action-sheet/action-sheet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,16 @@ import config from '../common/config';
import { ActionSheetTheme, show } from './show';
import props from './props';
import useCustomNavbar from '../mixins/using-custom-navbar';
import usingConfig from '../mixins/using-config';

const { prefix } = config;
const name = `${prefix}-action-sheet`;
const componentName = 'action-sheet';

@wxComponent()
export default class ActionSheet extends SuperComponent {
static show = show;

behaviors = [useCustomNavbar];
behaviors = [useCustomNavbar, usingConfig({ componentName })];

externalClasses = [`${prefix}-class`, `${prefix}-class-content`, `${prefix}-class-cancel`];

Expand All @@ -22,7 +23,7 @@ export default class ActionSheet extends SuperComponent {

data = {
prefix,
classPrefix: name,
classPrefix: `${prefix}-${componentName}`,
gridThemeItems: [],
currentSwiperIndex: 0,
defaultPopUpProps: {},
Expand All @@ -40,6 +41,9 @@ export default class ActionSheet extends SuperComponent {
items() {
this.splitGridThemeActions();
},
globalConfig() {
this.updateInitialData();
},
};

lifetimes = {
Expand All @@ -55,6 +59,10 @@ export default class ActionSheet extends SuperComponent {
},

memoInitialData() {
this.updateInitialData();
},

updateInitialData() {
this.initialData = {
...this.properties,
...this.data,
Expand Down
2 changes: 1 addition & 1 deletion packages/components/action-sheet/action-sheet.wxml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
bind:tap="onCancel"
aria-role="button"
>
{{ cancelText || '取消' }}
{{ cancelText || globalConfig.cancel }}
</view>
</view>
</t-popup>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/avatar/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spline: data
isComponent: true
---

<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-62%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-71%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-62%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-84%25-blue" /></span>
<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-93%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-83%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-93%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-94%25-blue" /></span>
## 引入

全局引入,在 miniprogram 根目录下的`app.json`中配置,局部引入,在需要引入的页面或组件的`index.json`中配置。
Expand Down
2 changes: 1 addition & 1 deletion packages/components/back-top/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spline: navigation
isComponent: true
---

<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-63%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-57%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-63%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-67%25-red" /></span>
<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-91%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-67%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-91%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-80%25-blue" /></span>
## 引入

全局引入,在 miniprogram 根目录下的`app.json`中配置,局部引入,在需要引入的页面或组件的`index.json`中配置。
Expand Down
2 changes: 1 addition & 1 deletion packages/components/badge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spline: data
isComponent: true
---

<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-53%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-50%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-53%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-50%25-red" /></span>
<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-84%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-75%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-84%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-67%25-red" /></span>
## 引入

全局引入,在 miniprogram 根目录下的`app.json`中配置,局部引入,在需要引入的页面或组件的`index.json`中配置。
Expand Down
2 changes: 1 addition & 1 deletion packages/components/button/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spline: base
isComponent: true
---

<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-51%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-78%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-51%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-74%25-red" /></span>
<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-95%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-82%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-95%25-blue" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-77%25-red" /></span>
## 引入

全局引入,在 miniprogram 根目录下的`app.json`中配置,局部引入,在需要引入的页面或组件的`index.json`中配置。
Expand Down
2 changes: 1 addition & 1 deletion packages/components/calendar/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ isComponent: true
该组件于 0.22.0 版本上线,请留意版本。
</div>

<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-57%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-48%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-57%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-71%25-red" /></span>
<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-72%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-49%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-72%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-71%25-red" /></span>
## 引入

全局引入,在 miniprogram 根目录下的`app.json`中配置,局部引入,在需要引入的页面或组件的`index.json`中配置。
Expand Down
39 changes: 22 additions & 17 deletions packages/components/calendar/calendar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,23 @@ import props from './props';
import TCalendar from '../common/shared/calendar/index';
import { TdCalendarProps } from './type';
import useCustomNavbar from '../mixins/using-custom-navbar';
import usingConfig from '../mixins/using-config';
import { getPrevMonth, getPrevYear, getNextMonth, getNextYear } from './utils';

const { prefix } = config;
const name = `${prefix}-calendar`;

const defaultLocaleText = {
title: '请选择日期',
weekdays: ['日', '一', '二', '三', '四', '五', '六'],
monthTitle: '{year} 年 {month}',
months: ['1 月', '2 月', '3 月', '4 月', '5 月', '6 月', '7 月', '8 月', '9 月', '10 月', '11 月', '12 月'],
confirm: '确认',
};
const componentName = 'calendar';

export interface CalendarProps extends TdCalendarProps {}

@wxComponent()
export default class Calendar extends SuperComponent {
behaviors = [useCustomNavbar];
behaviors = [
useCustomNavbar,
usingConfig({
componentName,
localeTextPropName: 'localeText',
}),
];

externalClasses = [`${prefix}-class`];

Expand All @@ -33,7 +32,7 @@ export default class Calendar extends SuperComponent {

data = {
prefix,
classPrefix: name,
classPrefix: `${prefix}-${componentName}`,
months: [],
scrollIntoView: '',
innerConfirmBtn: {},
Expand Down Expand Up @@ -64,14 +63,8 @@ export default class Calendar extends SuperComponent {
},

ready() {
const realLocalText = { ...defaultLocaleText, ...this.properties.localeText };
this.initialValue();

this.setData({
days: this.base.getDays(realLocalText.weekdays),
realLocalText,
});

this.calcMonths();
this.updateCurrentMonth();

Expand All @@ -82,6 +75,18 @@ export default class Calendar extends SuperComponent {
};

observers = {
localeText() {
this.updateLocale?.();
},

globalConfig() {
const { globalConfig } = this.data;
this.setData({
days: this.base.getDays(globalConfig.weekdays),
realLocalText: globalConfig,
});
},

type(v) {
this.base.type = v;
},
Expand Down
2 changes: 1 addition & 1 deletion packages/components/cascader/README.en-US.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ check-strictly | Boolean | false | \- | N
close-btn | Boolean | true | \- | N
keys | Object | - | Typescript: `CascaderKeysType` `type CascaderKeysType = TreeKeysType`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/common/common.ts)。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/cascader/type.ts) | N
options | Array | [] | Typescript: `Array<CascaderOption>` | N
placeholder | String | 选择选项 | \- | N
placeholder | String | - | \- | N
sub-titles | Array | [] | Typescript: `Array<string>` | N
theme | String | step | options: step/tab | N
title | String | - | \- | N
Expand Down
4 changes: 2 additions & 2 deletions packages/components/cascader/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ isComponent: true
该组件于 0.23.0 版本上线,请留意版本。
</div>

<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-34%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-5%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-34%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-50%25-red" /></span>
<span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20lines-32%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20functions-5%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20statements-32%25-red" /></span><span class="coverages-badge" style="margin-right: 10px"><img src="https://img.shields.io/badge/coverages%3A%20branches-100%25-blue" /></span>
## 引入

全局引入,在 miniprogram 根目录下的`app.json`中配置,局部引入,在需要引入的页面或组件的`index.json`中配置。
Expand Down Expand Up @@ -69,7 +69,7 @@ check-strictly | Boolean | false | 父子节点选中状态不再关联,可各
close-btn | Boolean | true | 关闭按钮 | N
keys | Object | - | 用来定义 value / label / children / disabled 在 `options` 中对应的字段别名。TS 类型:`CascaderKeysType` `type CascaderKeysType = TreeKeysType`。[通用类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/common/common.ts)。[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/cascader/type.ts) | N
options | Array | [] | 可选项数据源。TS 类型:`Array<CascaderOption>` | N
placeholder | String | 选择选项 | 未选中时的提示文案 | N
placeholder | String | - | 未选中时的提示文案。组件内置默认值为:'选择选项' | N
sub-titles | Array | [] | 每级展示的次标题。TS 类型:`Array<string>` | N
theme | String | step | 展示风格。可选项:step/tab | N
title | String | - | 标题 | N
Expand Down
18 changes: 11 additions & 7 deletions packages/components/cascader/cascader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ import config from '../common/config';
import props from './props';
import { TdCascaderProps } from './type';
import { getRect } from '../common/utils';
import usingConfig from '../mixins/using-config';

const { prefix } = config;
const name = `${prefix}-cascader`;
const componentName = 'cascader';

export interface CascaderProps extends TdCascaderProps {}

Expand Down Expand Up @@ -36,6 +37,8 @@ const defaultState = {

@wxComponent()
export default class Cascader extends SuperComponent {
behaviors = [usingConfig({ componentName })];

externalClasses = [`${prefix}-class`];

options: WechatMiniprogram.Component.ComponentOptions = {
Expand All @@ -58,7 +61,7 @@ export default class Cascader extends SuperComponent {

data = {
prefix,
name,
classPrefix: `${prefix}-${componentName}`,
stepIndex: 0,
selectedIndexes: [],
selectedValue: [],
Expand Down Expand Up @@ -135,13 +138,14 @@ export default class Cascader extends SuperComponent {
},

async initOptionsHeight(steps: number) {
const { classPrefix } = this.data;
const { theme, subTitles } = this.properties;

const { height } = await getRect(this, `.${name}__content`);
const { height } = await getRect(this, `.${classPrefix}__content`);
this.state.contentHeight = height;

if (theme === 'step') {
await Promise.all([getRect(this, `.${name}__steps`), getRect(this, `.${name}__step`)]).then(
await Promise.all([getRect(this, `.${classPrefix}__steps`), getRect(this, `.${classPrefix}__step`)]).then(
([stepsRect, stepRect]) => {
this.state.stepsInitHeight = stepsRect.height - (steps - 1) * stepRect.height;
this.state.stepHeight = stepRect.height;
Expand All @@ -150,7 +154,7 @@ export default class Cascader extends SuperComponent {
}

if (subTitles.length > 0) {
const { height } = await getRect(this, `.${name}__options-title`);
const { height } = await getRect(this, `.${classPrefix}__options-title`);
this.state.subTitlesHeight = height;
}

Expand Down Expand Up @@ -229,7 +233,7 @@ export default class Cascader extends SuperComponent {
});
},
genItems() {
const { options, selectedIndexes, keys, placeholder } = this.data;
const { options, selectedIndexes, keys, placeholder, globalConfig } = this.data;
const selectedValue = [];
const steps = [];
const items = [parseOptions(options, keys)];
Expand All @@ -251,7 +255,7 @@ export default class Cascader extends SuperComponent {
}

if (steps.length < items.length) {
steps.push(placeholder);
steps.push(placeholder || globalConfig.placeholder);
}

return {
Expand Down
Loading
Loading