diff --git a/.eslintignore b/.eslintignore index 965aaca32..5484d7a9c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,4 +7,3 @@ es/ lib/ _site/ dist/ -types/ diff --git a/.eslintrc b/.eslintrc index 6d1be14cc..c61e47679 100644 --- a/.eslintrc +++ b/.eslintrc @@ -19,6 +19,14 @@ "rules": { "no-console": "off" } + }, + { + "files": ["**/types/**/*.ts"], + "extends": ["@vue/typescript/recommended"], + "rules": { + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/ban-types": 0 + } } ], "rules": { diff --git a/.jest.js b/.jest.js index 171aff90a..a1dd53c46 100644 --- a/.jest.js +++ b/.jest.js @@ -2,7 +2,9 @@ const libDir = process.env.LIB_DIR; const transformIgnorePatterns = [ '/dist/', - 'node_modules/[^/]+?/(?!(es|node_modules)/)', // Ignore modules without es dir + // Ignore modules without es dir. + // Update: @babel/runtime should also be transformed + 'node_modules/(?!.*(@babel|lodash-es))[^/]+?/(?!(es|node_modules)/)', ]; module.exports = { diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 89dfca655..379ef7f0f 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -10,6 +10,133 @@ --- +## 2.0.0-beta.8 + +- 🐞 Fix ts types error + +## 2.0.0-beta.7 + +- 🐞 Fix the problem that Descriptions Item does not support v-for [#2793](https://github.com/vueComponent/ant-design-vue/issues/2793) +- 🐞 Fix Modal button loading effect not working problem [9257c1](https://github.com/vueComponent/ant-design-vue/commit/9257c1ea685db4339239589153aee3189d0434fe) +- 🐞 Fix the problem that the Steps component cannot be clicked when using v-model [ec7309](https://github.com/vueComponent/ant-design-vue/commit/ec73097d9b6ea8e2f2942ac28853c19191ca3298) +- 🌟 Checkbox, Radio add event declaration +- 🐞 Fix ts type error [802446](https://github.com/vueComponent/ant-design-vue/commit/8024469b8832cfc4fe85498b639bfb48820531aa) + +## 2.0.0-beta.6 + +- 🐞 Fix the problem that TreeSelectNode subcomponent TreeSelectNode is not registered + +## 2.0.0-beta.5 + +- 🔥 Support Vite. + +## 2.0.0-beta.4 + +- 🌟 Remove polyfills that are no longer used +- 🐞 Fix the problem of calling `Modal` afterClose twice +- 🐞 Supplement the declaration that ts type files lack native attributes + +## 2.0.0-beta.3 + +- 🔥 Support Typescript. +- 🔥 Added `Space` component. +- 🐞 Fix the problem that some components cannot use css scope [4bdb24](https://github.com/vueComponent/ant-design-vue/commit/4bdb241aa674b50fafa29b3b98e291643f2a06cc). +- 🐞 Fix `List.Meta` registration failure problem [03a42a](https://github.com/vueComponent/ant-design-vue/commit/03a42a5b35e7d42a39aedb1aba8346995be2c27e) +- 🐞 Fix the problem of misalignment in the fixed column of Table [#1493](https://github.com/vueComponent/ant-design-vue/issues/1493) +- 🐞 Fix the problem that the `Button` is not vertically centered [bd71e3](https://github.com/vueComponent/ant-design-vue/commit/bd71e3806b73881f9a95028982d17a10b2cd0b5c) +- 🐞 Fix `Tabs` multiple departure `change` event issue [8ed937](https://github.com/vueComponent/ant-design-vue/commit/8ed937344a57142a575e5272f50933c9c4459a43) + +## 2.0.0-beta.2 + +### Design specification adjustment + +- Adjust the row height from `1.5`(`21px`) to `1.5715`(`22px`). +- Basic round corner adjustment, changed from `4px` to `2px`. +- The color brightness of the dividing line is reduced, from `#E8E8E8` to `#F0F0F0`. +- The default background color of Table is changed from transparent to white. + +### Compatibility adjustment + +- The minimum supported version of IE is IE 11. +- The minimum supported version of Vue is Vue 3.0. + +#### Adjusted API + +- Removed LocaleProvider, please use `ConfigProvider` instead. +- Removed the afterClose property of Tag. +- Merged FormModel and Form, see the Form refactoring part below for details. +- `tabIndex`, `maxLength`, `readOnly`, `autoComplete`, `autoFocus` are changed to all lowercase. +- In order to use the slot more friendly in template syntax, all related to xxxRender, renderXxxx are changed to single parameter, involving `itemRender`, `renderItem`, `customRender`, `dropdownRender`, `dateCellRender`, `dateFullCellRender`, `monthCellRender`, `monthFullCellRender`, `renderTabBar`. +- All the places where scopedSlots are configured are changed to slots. +- `{ on, props, attrs, ... }` configuration is flattened, such as `{ props: {type:'xxx'}, on: {click: this.handleClick}}` changed to `{ type: 'xxx', onClick: this.handleClick }`, related fields: `okButtonProps`, `cancelButtonProps`. +- Change xxx.sync to v-model:xxx +- v-model is changed to v-model:xxx, which specifically involves components: + + - The components changed from v-model to v-model:checked are: CheckableTag, Checkbox, Switch + - The components changed from v-model to v-model:value are: Radio, Mentions, CheckboxGroup, Rate, DatePicker + - The components changed from v-model to v-model:visible are: Tag, Popconfirm, Popove, Tooltip, Moda, Dropdown + - The components changed from v-model to v-model:activeKey are: Collaps, Tabs + - The components changed from v-model to v-model:current are: Steps + - The components changed from v-model to v-model:selectedKeys are: Menu + +#### Icon Upgrade + +In `ant-design-vue@1.2.0`, we introduced the svg icon ([Why use the svg icon?](https://github.com/ant-design/ant-design/issues/10353)). The icon API that uses string naming cannot be loaded on demand, so the svg icon file is fully introduced, which greatly increases the size of the packaged product. In 2.0, we adjusted the icon usage API to support tree shaking, reducing the default package size by approximately 150 KB (Gzipped). + +The old way of using Icon will be obsolete: + +```html + +``` + +In 2.0, an on-demand introduction method will be adopted: + +```html + + +``` + +#### Component refactoring + +In 1.x, we provide two form components, Form and FormModel. The original Form component uses v-decorator for data binding. In Vue2, we use context to force update components. However, in Vue3, due to the introduction of patchFlag, etc. Optimization method, forced refresh will destroy the performance advantage brought by patchFlag. So in version 2.0, we merged Form and FormModel, retained the use of FormModel, enriched related functions, and renamed it to Form. + +Involving changes: + +- Added `scrollToFirstError`, `name`, `validateTrigger` properties for Form, added `finish`, `finishFailed` events, and added `scrollToField` method. +- Form.Item adds `validateFirst`, `validateTrigger`, and discards the `prop` attribute, and replaces it with `name`. +- The nested field path uses an array. In the past version, we used. To represent the nested path (such as user.name to represent {user: {name:''} }). However, in some back-end systems, the variable name will also carry .. This causes users to need additional codes for conversion. Therefore, in the new version, nested paths are represented by arrays to avoid wrong handling behaviors (such as ['user','name']). +- validateFields no longer supports callback. validateFields will return a Promise object, so you can perform corresponding error handling through async/await or then/catch. It is no longer necessary to determine whether errors is empty: + +```js +// v1 +validateFields((err, value) => { + if (!err) { + // Do something with value + } +}); +``` + +Change to + +```js +// v2 +validateFields().then(values ​​=> { + // Do something with value +}); +``` + ## 1.6.4 `2020-07-21` diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index 50dce553f..3667f7f2c 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -10,6 +10,135 @@ --- +## 2.0.0-beta.8 + +- 🐞 修复 ts 类型错误 + +## 2.0.0-beta.7 + +- 🐞 修复 Descriptions Item 不支持 v-for 问题 [#2793](https://github.com/vueComponent/ant-design-vue/issues/2793) +- 🐞 修复 Modal button loading 效果不生效问题 [9257c1](https://github.com/vueComponent/ant-design-vue/commit/9257c1ea685db4339239589153aee3189d0434fe) +- 🐞 修复 Steps 组件使用 v-model 时不可点击的问题 [ec7309](https://github.com/vueComponent/ant-design-vue/commit/ec73097d9b6ea8e2f2942ac28853c19191ca3298) +- 🌟 Checkbox、Radio 添加事件声明 +- 🐞 修复 ts 类型错误 [802446](https://github.com/vueComponent/ant-design-vue/commit/8024469b8832cfc4fe85498b639bfb48820531aa) + +## 2.0.0-beta.6 + +- 🐞 修复 TreeSelectNode 子组件 TreeSelectNode 没有注册的问题 + +## 2.0.0-beta.5 + +- 🔥 支持 Vite。 + +## 2.0.0-beta.4 + +- 🌟 移除不再使用的 polyfill +- 🐞 修复 `Modal` afterClose 调用两次的问题 +- 🐞 补充 ts 类型文件缺少原生属性的声明 + +## 2.0.0-beta.3 + +- 🔥 支持 Typescript。 +- 🔥 新增 `Space` 组件。 +- 🐞 修复部分组件无法使用 css scope 问题 [4bdb24](https://github.com/vueComponent/ant-design-vue/commit/4bdb241aa674b50fafa29b3b98e291643f2a06cc)。 +- 🐞 修复 `List.Meta` 注册失败的问题 [03a42a](https://github.com/vueComponent/ant-design-vue/commit/03a42a5b35e7d42a39aedb1aba8346995be2c27e) +- 🐞 修复 `Table` 固定列情况下错位问题 [#1493](https://github.com/vueComponent/ant-design-vue/issues/1493) +- 🐞 修复 `Button` 没有垂直居中的问题 [bd71e3](https://github.com/vueComponent/ant-design-vue/commit/bd71e3806b73881f9a95028982d17a10b2cd0b5c) +- 🐞 修复 `Tabs` 多次出发 `change` 事件问题 [8ed937](https://github.com/vueComponent/ant-design-vue/commit/8ed937344a57142a575e5272f50933c9c4459a43) + +## 2.0.0-beta.2 + +`2020-08-14` + +### 设计规范调整 + +- 行高从 `1.5`(`21px`) 调整为 `1.5715`(`22px`)。 +- 基础圆角调整，由`4px` 改为 `2px`。 +- 分割线颜色明度降低，由 `#E8E8E8` 改为 `#F0F0F0`。 +- Table 默认背景颜色从透明修改为白色。 + +### 兼容性调整 + +- IE 最低支持版本为 IE 11。 +- Vue 最低支持版本为 Vue 3.0。 + +#### 调整的 API + +- 移除了 LocaleProvider，请使用 `ConfigProvider` 替代。 +- 移除了 Tag 的 afterClose 属性。 +- 合并了 FormModel、Form，详见下方的 Form 重构部分。 +- `tabIndex`、`maxLength`、`readOnly`、`autoComplete`、`autoFocus` 更改为全小写。 +- 为了在 template 语法中更友好的使用插槽，所有涉及到 xxxRender, renderXxxx 的均改成单参数，涉及到 `itemRender`、`renderItem`、`customRender`、`dropdownRender`、`dateCellRender`、`dateFullCellRender`、`monthCellRender`、`monthFullCellRender`、`renderTabBar`。 +- 所有配置 scopedSlots 的地方统一改成 slots。 +- `{ on, props, attrs, ... }` 配置进行扁平化处理，如 `{ props: {type: 'xxx'}, on: {click: this.handleClick}}` 改成 `{ type: 'xxx', onClick: this.handleClick }`, 涉及相关字段：`okButtonProps`、`cancelButtonProps`。 +- xxx.sync 改成 v-model:xxx +- v-model 更改成 v-model:xxx，具体涉及组件： + + - v-model 改成 v-model:checked 的组件有: CheckableTag、Checkbox、Switch + - v-model 改成 v-model:value 的组件有: Radio、Mentions、CheckboxGroup、Rate、DatePicker + - v-model 改成 v-model:visible 的组件有: Tag、Popconfirm、Popove、Tooltip、Moda、Dropdown + - v-model 改成 v-model:activeKey 的组件有: Collaps、Tabs + - v-model 改成 v-model:current 的组件有: Steps + - v-model 改成 v-model:selectedKeys 的组件有: Menu + +#### 图标升级 + +在 `ant-design-vue@1.2.0` 中，我们引入了 svg 图标（[为何使用 svg 图标？](https://github.com/ant-design/ant-design/issues/10353)）。使用了字符串命名的图标 API 无法做到按需加载，因而全量引入了 svg 图标文件，这大大增加了打包产物的尺寸。在 2.0 中，我们调整了图标的使用 API 从而支持 tree shaking，减少默认包体积约 150 KB(Gzipped)。 + +旧版 Icon 使用方式将被废弃： + +```html + +``` + +2.0 中会采用按需引入的方式： + +```html + + +``` + +#### 组件重构 + +在 1.x 中我们提供了 Form、FormModel 两个表单组件，原有的 Form 组件使用 v-decorator 进行数据绑定，在 Vue2 中我们通过上下文进行强制更新组件，但是在 Vue3 中，由于引入 patchFlag 等优化方式，强制刷新会破坏 patchFlag 带来的性能优势。所以在 2.0 版本中我们将 Form、FormModel 进行合并，保留了 FormModel 的使用方式，丰富了相关功能，并改名成 Form。 + +涉及改动： + +- Form 新增 `scrollToFirstError`,`name`,`validateTrigger` 属性，新增 `finish`、`finishFailed` 事件，新增 `scrollToField` 方法。 +- Form.Item 新增 `validateFirst`, `validateTrigger`, 废弃 `prop` 属性，使用 `name` 替换。 +- 嵌套字段路径使用数组，过去版本我们通过 . 代表嵌套路径（诸如 user.name 来代表 { user: { name: '' } }）。然而在一些后台系统中，变量名中也会带上 .。这造成用户需要额外的代码进行转化，因而新版中，嵌套路径通过数组来表示以避免错误的处理行为（如 ['user', 'name']）。 +- validateFields 不再支持 callback。validateFields 会返回 Promise 对象，因而你可以通过 async/await 或者 then/catch 来执行对应的错误处理。不再需要判断 errors 是否为空： + +```js +// v1 +validateFields((err, value) => { + if (!err) { + // Do something with value + } +}); +``` + +改成 + +```js +// v2 +validateFields().then(values => { + // Do something with value +}); +``` + ## 1.6.4 `2020-07-21` diff --git a/antd-tools/getBabelCommonConfig.js b/antd-tools/getBabelCommonConfig.js index cd6b14caa..b6886ea4e 100644 --- a/antd-tools/getBabelCommonConfig.js +++ b/antd-tools/getBabelCommonConfig.js @@ -2,7 +2,7 @@ module.exports = function(modules) { const plugins = [ - require.resolve('@ant-design-vue/babel-plugin-jsx'), + require.resolve('@vue/babel-plugin-jsx'), require.resolve('@babel/plugin-proposal-optional-chaining'), require.resolve('@babel/plugin-transform-object-assign'), require.resolve('@babel/plugin-proposal-object-rest-spread'), diff --git a/antd-tools/getWebpackConfig.js b/antd-tools/getWebpackConfig.js index 4efa0822a..5c2e646fc 100644 --- a/antd-tools/getWebpackConfig.js +++ b/antd-tools/getWebpackConfig.js @@ -83,7 +83,7 @@ function getWebpackConfig(modules) { options: { presets: [require.resolve('@babel/preset-env')], plugins: [ - require.resolve('@ant-design-vue/babel-plugin-jsx'), + require.resolve('@vue/babel-plugin-jsx'), require.resolve('@babel/plugin-proposal-object-rest-spread'), ], }, diff --git a/antdv-demo b/antdv-demo index 31e7b308a..cd4d03a89 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit 31e7b308adb6eabb97c003fbc7883e4d00c8f764 +Subproject commit cd4d03a897a0ab0224f4a631481e73cb05540f4a diff --git a/babel.config.js b/babel.config.js index c0bd6b4be..58c70b70a 100644 --- a/babel.config.js +++ b/babel.config.js @@ -3,7 +3,7 @@ module.exports = { test: { presets: [['@babel/preset-env', { targets: { node: true } }]], plugins: [ - ['@ant-design-vue/babel-plugin-jsx'], + ['@vue/babel-plugin-jsx'], '@babel/plugin-proposal-optional-chaining', '@babel/plugin-transform-object-assign', '@babel/plugin-proposal-object-rest-spread', diff --git a/breakChange-2.x.md b/breakChange-2.x.md deleted file mode 100644 index ab1a183da..000000000 --- a/breakChange-2.x.md +++ /dev/null @@ -1,121 +0,0 @@ -# break change - -## global api - -所有 dom 原生属性由驼峰改成全小写，涉及 API - -#### - -maxLength -> maxlength tabIndex => tabindex readOnly => readonly autoComplete => autocomplete - -## Tag - -### CheckableTag - -v-model -> v-model:checked - -### Tag - -v-model -> v-model:visible - -移除 afterClose 属性 - -## Radio - -radioGroup radio v-model -> v-model:value - -## popconfirm - -okButtonProps、cancelButtonProps 扁平化处理 - -v-model -> v-model:visible - -## popover - -v-model -> v-model:visible - -## Tooltip - -v-model -> v-model:visible - -## Modal - -v-model -> v-model:visible - -okButtonProps、cancelButtonProps 扁平化处理 - -## Mentions - -v-model -> v-model:value - -## menu - -v-model -> v-model:selectedKeys :openKeys.sync -> v-mdoel:openKeys - -## dropdown - -v-model -> v-model:visible - -## Steps - -v-model -> v-model:current - -## checkbox - -v-model -> v-model:checked - -checkboxGroup - -v-model -> v-model:value - -## Switch - -v-model -> v-model:checked - -## tabs - -v-model -> v-model:activeKey - -renderTabBar({props, on, style, class}, DefaultTabBar) -> {DefaultTabBar, ...props} 多参数改成单参数并且扁平化处理 - -## card - -tabList[{scopedSlots}] -> tabList[{slots}] - -## rate - -v-model -> v-model:value - -## Collapse - -v-model -> v-model:activeKey - -## List - -renderItem(item, index) => renderItem({item, index}) 该用单参数 - -## TreeSelect - -treeData 中 scopedSlots => slots , v-model => v-model:value - -## datePicker - -dateRender - -(current: moment.Moment, today: moment.Moment) => ({current: moment.Moment, today: moment.Moment}) - -monthCellContentRender (date, locale) => ({date, locale}) - -## table - -customRender( text, record, index, column ); => customRender({ text, record, index, column }); - -expandedRowRender(record, index, indent, expanded) => expandedRowRender({ record, index, indent, expanded }) - -filterIcon(filtered, column) => filterIcon({ filtered, column }) - -## calendar - -dateCellRender、dateFullCellRender、monthCellRender、monthFullCellRender - -function (date, today?) => function({current, today?}) diff --git a/components/_util/PortalWrapper.ts b/components/_util/PortalWrapper.ts index 2ae3f6b29..84170c206 100644 --- a/components/_util/PortalWrapper.ts +++ b/components/_util/PortalWrapper.ts @@ -2,6 +2,7 @@ import PropTypes from './vue-types'; import switchScrollingEffect from './switchScrollingEffect'; import setStyle from './setStyle'; import Portal from './Portal'; +import syncWatch from './syncWatch'; let openCount = 0; const windowIsUndefined = !( @@ -32,9 +33,9 @@ export default { this.setWrapperClassName(); }, watch: { - visible(val) { + visible: syncWatch(function(val) { openCount = val ? openCount + 1 : openCount - 1; - }, + }), getContainer(getContainer, prevGetContainer) { const getContainerIsFunc = typeof getContainer === 'function' && typeof prevGetContainer === 'function'; diff --git a/components/_util/classNames.js b/components/_util/classNames.js new file mode 100644 index 000000000..55875ffb7 --- /dev/null +++ b/components/_util/classNames.js @@ -0,0 +1,27 @@ +import { isArray, isString, isObject } from './util'; +function classNames() { + let classes = []; + for (let i = 0; i < arguments.length; i++) { + const value = arguments[i]; + if (!value) continue; + if (isString(value)) { + classes.push(value); + } else if (isArray(value)) { + for (let i = 0; i < value.length; i++) { + const inner = classNames(value[i]); + if (inner) { + classes.push(inner); + } + } + } else if (isObject(value)) { + for (const name in value) { + if (value[name]) { + classes.push(name); + } + } + } + } + return classes.join(' '); +} + +export default classNames; diff --git a/components/_util/moment-util.ts b/components/_util/moment-util.ts index 163effc36..002820474 100644 --- a/components/_util/moment-util.ts +++ b/components/_util/moment-util.ts @@ -1,7 +1,7 @@ import interopDefault from './interopDefault'; -import * as moment from 'moment'; +import moment from 'moment'; import warning from './warning'; -import isNil from 'lodash/isNil'; +import isNil from 'lodash-es/isNil'; export const TimeType = { validator(value) { diff --git a/components/_util/props-util.ts b/components/_util/props-util.ts index f65b04425..9572a7f3f 100644 --- a/components/_util/props-util.ts +++ b/components/_util/props-util.ts @@ -1,3 +1,4 @@ +<<<<<<< HEAD:components/_util/props-util.ts import isPlainObject from 'lodash/isPlainObject'; import classNames from 'classnames'; import { @@ -10,6 +11,11 @@ import { ComponentPublicInstance, PropOptions, } from 'vue'; +======= +import isPlainObject from 'lodash-es/isPlainObject'; +import classNames from './classNames'; +import { isVNode, Fragment, Comment, Text, h } from 'vue'; +>>>>>>> @{-1}:components/_util/props-util.js import { camelize, hyphenate, isOn, resolvePropValue } from './util'; import isValid from './isValid'; // function getType(fn) { diff --git a/components/_util/responsiveObserve.js b/components/_util/responsiveObserve.js new file mode 100644 index 000000000..9b6fa3c76 --- /dev/null +++ b/components/_util/responsiveObserve.js @@ -0,0 +1,63 @@ +export const responsiveArray = ['xxl', 'xl', 'lg', 'md', 'sm', 'xs']; + +export const responsiveMap = { + xs: '(max-width: 575px)', + sm: '(min-width: 576px)', + md: '(min-width: 768px)', + lg: '(min-width: 992px)', + xl: '(min-width: 1200px)', + xxl: '(min-width: 1600px)', +}; + +const subscribers = new Map(); +let subUid = -1; +let screens = {}; + +const responsiveObserve = { + matchHandlers: {}, + dispatch(pointMap) { + screens = pointMap; + subscribers.forEach(func => func(screens)); + return subscribers.size >= 1; + }, + subscribe(func) { + if (!subscribers.size) this.register(); + subUid += 1; + subscribers.set(subUid, func); + func(screens); + return subUid; + }, + unsubscribe(token) { + subscribers.delete(token); + if (!subscribers.size) this.unregister(); + }, + unregister() { + Object.keys(responsiveMap).forEach(screen => { + const matchMediaQuery = responsiveMap[screen]; + const handler = this.matchHandlers[matchMediaQuery]; + handler?.mql.removeListener(handler?.listener); + }); + subscribers.clear(); + }, + register() { + Object.keys(responsiveMap).forEach(screen => { + const matchMediaQuery = responsiveMap[screen]; + const listener = ({ matches }) => { + this.dispatch({ + ...screens, + [screen]: matches, + }); + }; + const mql = window.matchMedia(matchMediaQuery); + mql.addListener(listener); + this.matchHandlers[matchMediaQuery] = { + mql, + listener, + }; + + listener(mql); + }); + }, +}; + +export default responsiveObserve; diff --git a/components/_util/util.ts b/components/_util/util.ts index 8c8e7ced5..8140af3fa 100644 --- a/components/_util/util.ts +++ b/components/_util/util.ts @@ -1,4 +1,9 @@ -const isFunction = val => typeof val === 'function'; +export const isFunction = val => typeof val === 'function'; + +export const isArray = Array.isArray; +export const isString = val => typeof val === 'string'; +export const isSymbol = val => typeof val === 'symbol'; +export const isObject = val => val !== null && typeof val === 'object'; const onRE = /^on[^a-z]/; const isOn = key => onRE.test(key); diff --git a/components/_util/vue-types/index.ts b/components/_util/vue-types/index.ts index e04b3e431..de2dbb92e 100644 --- a/components/_util/vue-types/index.ts +++ b/components/_util/vue-types/index.ts @@ -1,5 +1,9 @@ +<<<<<<< HEAD:components/_util/vue-types/index.ts import { PropType } from 'vue'; import isPlainObject from 'lodash/isPlainObject'; +======= +import isPlainObject from 'lodash-es/isPlainObject'; +>>>>>>> @{-1}:components/_util/vue-types/index.js import { toType, getType, isFunction, validateType, isInteger, isArray, warn } from './utils'; const VuePropTypes = { diff --git a/components/_util/vue-types/utils.ts b/components/_util/vue-types/utils.ts index 6d77d4e9e..5f09b5875 100644 --- a/components/_util/vue-types/utils.ts +++ b/components/_util/vue-types/utils.ts @@ -1,4 +1,4 @@ -import isPlainObject from 'lodash/isPlainObject'; +import isPlainObject from 'lodash-es/isPlainObject'; const ObjProto = Object.prototype; const toString = ObjProto.toString; diff --git a/components/affix/__tests__/__snapshots__/demo.test.js.snap b/components/affix/__tests__/__snapshots__/demo.test.js.snap index d6c6954a5..62bfb421b 100644 --- a/components/affix/__tests__/__snapshots__/demo.test.js.snap +++ b/components/affix/__tests__/__snapshots__/demo.test.js.snap @@ -3,18 +3,21 @@ exports[`renders ./antdv-demo/docs/affix/demo/basic.md correctly 1`] = `
+ Affix top +

+ Affix bottom +
`; exports[`renders ./antdv-demo/docs/affix/demo/on-change.md correctly 1`] = `
+ 120px to affix top +
`; @@ -23,7 +26,8 @@ exports[`renders ./antdv-demo/docs/affix/demo/target.md correctly 1`] = `
+ Fixed at the top of container +
diff --git a/components/affix/index.tsx b/components/affix/index.tsx index eb0778eaa..7eea0b00c 100644 --- a/components/affix/index.tsx +++ b/components/affix/index.tsx @@ -1,6 +1,6 @@ import { inject } from 'vue'; import PropTypes from '../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import omit from 'omit.js'; import ResizeObserver from '../vc-resize-observer'; import BaseMixin from '../_util/BaseMixin'; diff --git a/components/alert/__tests__/__snapshots__/demo.test.js.snap b/components/alert/__tests__/__snapshots__/demo.test.js.snap index 76acf0c82..0ddccef29 100644 --- a/components/alert/__tests__/__snapshots__/demo.test.js.snap +++ b/components/alert/__tests__/__snapshots__/demo.test.js.snap @@ -23,14 +23,17 @@ exports[`renders ./antdv-demo/docs/alert/demo/basic.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/alert/demo/closable.md correctly 1`] = `
- Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text
+ Warning Text Warning Text Warning TextW arning Text Warning Text Warning TextWarning Text +
- Error TextError Description Error Description Error Description Error Description Error Description Error Description
+ Error TextError Description Error Description Error Description Error Description Error Description Error Description + `; exports[`renders ./antdv-demo/docs/alert/demo/close-text.md correctly 1`] = `
- Info TextClose Now
+ Info TextClose Now + `; exports[`renders ./antdv-demo/docs/alert/demo/custom-icon.md correctly 1`] = ` @@ -96,7 +99,7 @@ exports[`renders ./antdv-demo/docs/alert/demo/icon.md correctly 1`] = `
Error
-
Success TipsDetailed description and advices about successful copywriting. +
Success TipsDetailed description and advices about successful copywriting.
Informational NotesAdditional description and informations about copywriting. @@ -112,7 +115,8 @@ exports[`renders ./antdv-demo/docs/alert/demo/icon.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/alert/demo/smooth-closed.md correctly 1`] = `
- Alert Message Text
+ Alert Message Text +
`; exports[`renders ./antdv-demo/docs/alert/demo/style.md correctly 1`] = ` diff --git a/components/alert/index.tsx b/components/alert/index.tsx index ea209f039..c51b25135 100644 --- a/components/alert/index.tsx +++ b/components/alert/index.tsx @@ -8,7 +8,7 @@ import CheckCircleFilled from '@ant-design/icons-vue/CheckCircleFilled'; import ExclamationCircleFilled from '@ant-design/icons-vue/ExclamationCircleFilled'; import InfoCircleFilled from '@ant-design/icons-vue/InfoCircleFilled'; import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import BaseMixin from '../_util/BaseMixin'; import PropTypes from '../_util/vue-types'; import getTransitionProps from '../_util/getTransitionProps'; diff --git a/components/anchor/Anchor.jsx b/components/anchor/Anchor.jsx index 9150d5f67..b8ca299aa 100644 --- a/components/anchor/Anchor.jsx +++ b/components/anchor/Anchor.jsx @@ -1,6 +1,6 @@ import { inject, provide } from 'vue'; import PropTypes from '../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import addEventListener from '../vc-util/Dom/addEventListener'; import Affix from '../affix'; import scrollTo from '../_util/scrollTo'; diff --git a/components/anchor/AnchorLink.jsx b/components/anchor/AnchorLink.jsx index 40579b217..cca32ff82 100644 --- a/components/anchor/AnchorLink.jsx +++ b/components/anchor/AnchorLink.jsx @@ -1,7 +1,7 @@ import { inject } from 'vue'; import PropTypes from '../_util/vue-types'; import { initDefaultProps, getComponent } from '../_util/props-util'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { ConfigConsumerProps } from '../config-provider'; function noop() {} diff --git a/components/avatar/__tests__/__snapshots__/demo.test.js.snap b/components/avatar/__tests__/__snapshots__/demo.test.js.snap index 8bcb8b973..5d0fdd55e 100644 --- a/components/avatar/__tests__/__snapshots__/demo.test.js.snap +++ b/components/avatar/__tests__/__snapshots__/demo.test.js.snap @@ -3,7 +3,8 @@ exports[`renders ./antdv-demo/docs/avatar/demo/badge.md correctly 1`] = `

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

 -
+ +
`; exports[`renders ./antdv-demo/docs/avatar/demo/basic.md correctly 1`] = ` @@ -15,7 +16,8 @@ exports[`renders ./antdv-demo/docs/avatar/demo/basic.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/avatar/demo/dynamic.md correctly 1`] = `
U
+ 改 变 + `; exports[`renders ./antdv-demo/docs/avatar/demo/type.md correctly 1`] = `
UUSERU
`; diff --git a/components/back-top/__tests__/__snapshots__/demo.test.js.snap b/components/back-top/__tests__/__snapshots__/demo.test.js.snap index 30d58d134..31d2c6d54 100644 --- a/components/back-top/__tests__/__snapshots__/demo.test.js.snap +++ b/components/back-top/__tests__/__snapshots__/demo.test.js.snap @@ -2,10 +2,12 @@ exports[`renders ./antdv-demo/docs/back-top/demo/basic.md correctly 1`] = `
- Scroll down to see the bottom-right gray button.
+ Scroll down to see the bottom-right gray button. + `; exports[`renders ./antdv-demo/docs/back-top/demo/custom.md correctly 1`] = `
- Scroll down to see the bottom-right blue button.
+ Scroll down to see the bottom-right blue button. + `; diff --git a/components/back-top/index.jsx b/components/back-top/index.jsx index 0eb5e8f70..bb715156e 100644 --- a/components/back-top/index.jsx +++ b/components/back-top/index.jsx @@ -1,5 +1,5 @@ import { inject, Transition } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import backTopTypes from './backTopTypes'; import addEventListener from '../vc-util/Dom/addEventListener'; diff --git a/components/badge/Badge.jsx b/components/badge/Badge.jsx index 846e97d83..98368c2e1 100644 --- a/components/badge/Badge.jsx +++ b/components/badge/Badge.jsx @@ -1,7 +1,7 @@ import PropTypes from '../_util/vue-types'; import ScrollNumber from './ScrollNumber'; import { PresetColorTypes } from '../_util/colors'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { initDefaultProps, getComponent, getSlot } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; import getTransitionProps from '../_util/getTransitionProps'; @@ -21,7 +21,7 @@ const BadgeProps = { scrollNumberPrefixCls: PropTypes.string, status: PropTypes.oneOf(['success', 'processing', 'default', 'error', 'warning']), color: PropTypes.string, - text: PropTypes.string, + text: PropTypes.any, offset: PropTypes.array, numberStyle: PropTypes.object.def(() => ({})), title: PropTypes.string, @@ -110,7 +110,7 @@ export default { }, renderStatusText(prefixCls) { - const { text } = this.$props; + const text = getComponent(this, 'text'); const hidden = this.isHidden(); return hidden || !text ? null : {text}; }, @@ -173,10 +173,10 @@ export default { prefixCls: customizePrefixCls, scrollNumberPrefixCls: customizeScrollNumberPrefixCls, status, - text, color, } = this; + const text = getComponent(this, 'text'); const getPrefixCls = this.configProvider.getPrefixCls; const prefixCls = getPrefixCls('badge', customizePrefixCls); const scrollNumberPrefixCls = getPrefixCls('scroll-number', customizeScrollNumberPrefixCls); diff --git a/components/badge/ScrollNumber.jsx b/components/badge/ScrollNumber.jsx index 69a01f7d8..f91f71d99 100644 --- a/components/badge/ScrollNumber.jsx +++ b/components/badge/ScrollNumber.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; import omit from 'omit.js'; diff --git a/components/badge/__tests__/__snapshots__/demo.test.js.snap b/components/badge/__tests__/__snapshots__/demo.test.js.snap index 19b0c9609..4aa8b83f1 100644 --- a/components/badge/__tests__/__snapshots__/demo.test.js.snap +++ b/components/badge/__tests__/__snapshots__/demo.test.js.snap @@ -11,11 +11,14 @@ exports[`renders ./antdv-demo/docs/badge/demo/change.md correctly 1`] = `

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9
+ +
+ + `; exports[`renders ./antdv-demo/docs/badge/demo/colors.md correctly 1`] = ` @@ -43,12 +46,14 @@ exports[`renders ./antdv-demo/docs/badge/demo/dot.md correctly 1`] = ` + Link something + `; exports[`renders ./antdv-demo/docs/badge/demo/link.md correctly 1`] = `

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

 - + + `; exports[`renders ./antdv-demo/docs/badge/demo/no-wrapper.md correctly 1`] = ` @@ -66,5 +71,6 @@ exports[`renders ./antdv-demo/docs/badge/demo/status.md correctly 1`] = `

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

 - + + `; diff --git a/components/badge/__tests__/__snapshots__/index.test.js.snap b/components/badge/__tests__/__snapshots__/index.test.js.snap index 2939e5279..0274af1fb 100644 --- a/components/badge/__tests__/__snapshots__/index.test.js.snap +++ b/components/badge/__tests__/__snapshots__/index.test.js.snap @@ -7,7 +7,8 @@ exports[`Badge badge should support float number 2`] = `-

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

 -

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

0

1

2

3

4

5

6

7

8

9

 - + + `; exports[`Badge should be compatible with borderColor style 1`] = ` @@ -44,3 +45,5 @@ exports[`Badge should support offset when count is a VueNode 1`] = ` head `; + +exports[`Badge text works with vnode 1`] = `hello`; diff --git a/components/badge/__tests__/index.test.js b/components/badge/__tests__/index.test.js index cf93f59d1..aa27ec16b 100644 --- a/components/badge/__tests__/index.test.js +++ b/components/badge/__tests__/index.test.js @@ -136,4 +136,14 @@ describe('Badge', () => { }); expect(wrapper.html()).toMatchSnapshot(); }); + + it('text works with vnode', () => { + const wrapper = mount({ + render() { + return hello} />; + }, + }); + + expect(wrapper.html()).toMatchSnapshot(); + }); }); diff --git a/components/button/__tests__/__snapshots__/demo.test.js.snap b/components/button/__tests__/__snapshots__/demo.test.js.snap index 59393b406..80f161eff 100644 --- a/components/button/__tests__/__snapshots__/demo.test.js.snap +++ b/components/button/__tests__/__snapshots__/demo.test.js.snap @@ -2,97 +2,147 @@ exports[`renders ./antdv-demo/docs/button/demo/basic.md correctly 1`] = ` + Primary + `; exports[`renders ./antdv-demo/docs/button/demo/block.md correctly 1`] = ` + Primary + `; exports[`renders ./antdv-demo/docs/button/demo/button-group.md correctly 1`] = `

Basic

+ Cancel +
+ L +
+ L +

With Icon

+ Go back +
`; exports[`renders ./antdv-demo/docs/button/demo/disabled.md correctly 1`] = `


+ Primary +


+ Ghost + `; exports[`renders ./antdv-demo/docs/button/demo/ghost.md correctly 1`] = `
+ Primary + `; exports[`renders ./antdv-demo/docs/button/demo/icon.md correctly 1`] = ` + A + `; exports[`renders ./antdv-demo/docs/button/demo/loading.md correctly 1`] = `

+ mouseenter me! +
`; exports[`renders ./antdv-demo/docs/button/demo/multiple.md correctly 1`] = ` + Primary + + Actions + `; exports[`renders ./antdv-demo/docs/button/demo/size.md correctly 1`] = `




+ Primary +

+ Backward + `; diff --git a/components/button/__tests__/__snapshots__/index.test.js.snap b/components/button/__tests__/__snapshots__/index.test.js.snap index 5dcebaebd..b45ab8461 100644 --- a/components/button/__tests__/__snapshots__/index.test.js.snap +++ b/components/button/__tests__/__snapshots__/index.test.js.snap @@ -2,32 +2,38 @@ exports[`Button fixbug renders {0} , 0 and {false} 1`] = ` + 0 + `; exports[`Button fixbug renders {0} , 0 and {false} 2`] = ` + 0 + `; exports[`Button fixbug renders {0} , 0 and {false} 3`] = ` + + `; exports[`Button renders Chinese characters correctly 1`] = ` + 按 钮 + `; exports[`Button renders Chinese characters correctly 2`] = ` + 按钮 + `; exports[`Button renders Chinese characters correctly 3`] = ` + 按 钮 + `; exports[`Button renders Chinese characters correctly 4`] = ``; @@ -36,20 +42,24 @@ exports[`Button renders Chinese characters correctly 5`] = ` + 按钮 + `; exports[`Button renders correctly 1`] = ` + Follow + `; exports[`Button should not render as link button when href is undefined 1`] = ` + button + `; exports[`Button should support link button 1`] = ` - link button + link button + `; diff --git a/components/calendar/__tests__/__snapshots__/demo.test.js.snap b/components/calendar/__tests__/__snapshots__/demo.test.js.snap index 90ce54e9f..3e1a066d4 100644 --- a/components/calendar/__tests__/__snapshots__/demo.test.js.snap +++ b/components/calendar/__tests__/__snapshots__/demo.test.js.snap @@ -1647,7 +1647,7 @@ exports[`renders ./antdv-demo/docs/calendar/demo/notice-calendar.md correctly 1` `; exports[`renders ./antdv-demo/docs/calendar/demo/select.md correctly 1`] = ` -
+
You selected date: 2017-01-25
diff --git a/components/calendar/index.jsx b/components/calendar/index.jsx index 5f0d23176..97a3ee6d0 100644 --- a/components/calendar/index.jsx +++ b/components/calendar/index.jsx @@ -2,7 +2,7 @@ import { inject } from 'vue'; import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; import { getOptionProps, hasProp, initDefaultProps } from '../_util/props-util'; -import * as moment from 'moment'; +import moment from 'moment'; import FullCalendar from '../vc-calendar/src/FullCalendar'; import Header from './Header'; import LocaleReceiver from '../locale-provider/LocaleReceiver'; diff --git a/components/card/Card.tsx b/components/card/Card.tsx index 578a730a7..c97775708 100644 --- a/components/card/Card.tsx +++ b/components/card/Card.tsx @@ -6,7 +6,7 @@ import PropTypes from '../_util/vue-types'; import { getComponent, getSlot, isEmptyElement } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; import { ConfigConsumerProps } from '../config-provider'; -import isPlainObject from 'lodash/isPlainObject'; +import isPlainObject from 'lodash-es/isPlainObject'; const { TabPane } = Tabs; export default { diff --git a/components/card/__tests__/__snapshots__/demo.test.js.snap b/components/card/__tests__/__snapshots__/demo.test.js.snap index 091e50dc8..5f421cae1 100644 --- a/components/card/__tests__/__snapshots__/demo.test.js.snap +++ b/components/card/__tests__/__snapshots__/demo.test.js.snap @@ -249,7 +249,8 @@ exports[`renders ./antdv-demo/docs/card/demo/loading.md correctly 1`] = `
+ Toggle loading + `; exports[`renders ./antdv-demo/docs/card/demo/meta.md correctly 1`] = ` diff --git a/components/card/__tests__/__snapshots__/index.test.js.snap b/components/card/__tests__/__snapshots__/index.test.js.snap index 96f5f3dd0..bf48381bf 100644 --- a/components/card/__tests__/__snapshots__/index.test.js.snap +++ b/components/card/__tests__/__snapshots__/index.test.js.snap @@ -58,7 +58,8 @@ exports[`Card title should be vertically aligned 1`] = `
Card title
+ Button +
diff --git a/components/carousel/__tests__/__snapshots__/demo.test.js.snap b/components/carousel/__tests__/__snapshots__/demo.test.js.snap index 8fb95d8a2..d2b9470a9 100644 --- a/components/carousel/__tests__/__snapshots__/demo.test.js.snap +++ b/components/carousel/__tests__/__snapshots__/demo.test.js.snap @@ -314,28 +314,28 @@ exports[`renders ./antdv-demo/docs/carousel/demo/fade.md correctly 1`] = `
-
+

1

- @@ -79,7 +80,8 @@ exports[`Drawer render correctly 1`] = `
-
+ +
Here is content of Drawer
@@ -97,7 +99,8 @@ exports[`Drawer render top drawer 1`] = `
-
+ +
Here is content of Drawer
diff --git a/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap b/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap index 98b9f7c03..684bf6b56 100644 --- a/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap +++ b/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap @@ -2,7 +2,8 @@ exports[`Drawer render correctly 1`] = `
+ open +
@@ -10,7 +11,8 @@ exports[`Drawer render correctly 1`] = `
-
+ +
Here is content of Drawer
diff --git a/components/drawer/__tests__/__snapshots__/demo.test.js.snap b/components/drawer/__tests__/__snapshots__/demo.test.js.snap index 3d2a80e10..172893f8c 100644 --- a/components/drawer/__tests__/__snapshots__/demo.test.js.snap +++ b/components/drawer/__tests__/__snapshots__/demo.test.js.snap @@ -2,31 +2,36 @@ exports[`renders ./antdv-demo/docs/drawer/demo/basic-right.md correctly 1`] = ` + Open + `; exports[`renders ./antdv-demo/docs/drawer/demo/form-in-drawer.md correctly 1`] = ` + New account + `; exports[`renders ./antdv-demo/docs/drawer/demo/multi-level-drawer.md correctly 1`] = ` + Open + `; exports[`renders ./antdv-demo/docs/drawer/demo/placement.md correctly 1`] = `
+ Open + `; exports[`renders ./antdv-demo/docs/drawer/demo/render-in-current.md correctly 1`] = `
Render in this
+ Open +
diff --git a/components/drawer/index.jsx b/components/drawer/index.jsx index 2584f95d8..77a37e6d0 100644 --- a/components/drawer/index.jsx +++ b/components/drawer/index.jsx @@ -1,5 +1,5 @@ import { inject, provide, nextTick } from 'vue'; -import classnames from 'classnames'; +import classnames from '../_util/classNames'; import omit from 'omit.js'; import VcDrawer from '../vc-drawer/src'; import PropTypes from '../_util/vue-types'; diff --git a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap index 80740a861..ba658324f 100644 --- a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap +++ b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap @@ -9,19 +9,29 @@ exports[`renders ./antdv-demo/docs/dropdown/demo/context-menu.md correctly 1`] = exports[`renders ./antdv-demo/docs/dropdown/demo/dropdown-button.md correctly 1`] = `
+ Dropdown +
+ + +
+ Dropdown +
+ + +
+ Dropdown +
+ + +
+ Button + `; exports[`renders ./antdv-demo/docs/dropdown/demo/event.md correctly 1`] = ` Hover me, Click menu item `; @@ -33,21 +43,27 @@ exports[`renders ./antdv-demo/docs/dropdown/demo/overlay-visible.md correctly 1` exports[`renders ./antdv-demo/docs/dropdown/demo/placement.md correctly 1`] = `
+ bottomLeft + + bottomCenter +
+ bottomRight +
+ topLeft + + topCenter + + topRight +
`; diff --git a/components/dropdown/__tests__/__snapshots__/dropdown-button.test.js.snap b/components/dropdown/__tests__/__snapshots__/dropdown-button.test.js.snap index 72bef44de..0e137c47b 100644 --- a/components/dropdown/__tests__/__snapshots__/dropdown-button.test.js.snap +++ b/components/dropdown/__tests__/__snapshots__/dropdown-button.test.js.snap @@ -2,7 +2,10 @@ exports[`DropdownButton should support href like Button 1`] = `
- + +
+ + +
`; diff --git a/components/dropdown/dropdown-button.jsx b/components/dropdown/dropdown-button.jsx index 891e8cc43..086bd19e3 100644 --- a/components/dropdown/dropdown-button.jsx +++ b/components/dropdown/dropdown-button.jsx @@ -1,6 +1,6 @@ import { provide, inject } from 'vue'; import Button from '../button'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import buttonTypes from '../button/buttonTypes'; import { ButtonGroupProps } from '../button/button-group'; import Dropdown from './dropdown'; diff --git a/components/dropdown/dropdown.jsx b/components/dropdown/dropdown.jsx index 5a5bf205c..f573fefe2 100644 --- a/components/dropdown/dropdown.jsx +++ b/components/dropdown/dropdown.jsx @@ -3,7 +3,7 @@ import RcDropdown from '../vc-dropdown/src/index'; import DropdownButton from './dropdown-button'; import PropTypes from '../_util/vue-types'; import { cloneElement } from '../_util/vnode'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { getOptionProps, getPropsData, diff --git a/components/empty/__tests__/__snapshots__/demo.test.js.snap b/components/empty/__tests__/__snapshots__/demo.test.js.snap index 354dd1c7b..8a01c712a 100644 --- a/components/empty/__tests__/__snapshots__/demo.test.js.snap +++ b/components/empty/__tests__/__snapshots__/demo.test.js.snap @@ -25,7 +25,8 @@ exports[`renders ./antdv-demo/docs/empty/demo/basic.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/empty/demo/config-provider.md correctly 1`] = ` + default + @@ -52,7 +53,8 @@ exports[`renders ./antdv-demo/docs/empty/demo/config-provider.md correctly 1`] =
0 item
+ + 0 item
@@ -76,7 +78,8 @@ exports[`renders ./antdv-demo/docs/empty/demo/config-provider.md correctly 1`] =
0 item
+ + 0 item
@@ -186,7 +189,8 @@ exports[`renders ./antdv-demo/docs/empty/demo/customize.md correctly 1`] = `
empty

Customize Description

+ Create Now +
`; diff --git a/components/form/Form.jsx b/components/form/Form.jsx index e87526abd..eca955557 100755 --- a/components/form/Form.jsx +++ b/components/form/Form.jsx @@ -1,8 +1,8 @@ import { inject, provide } from 'vue'; import PropTypes from '../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { ColProps } from '../grid/Col'; -import isRegExp from 'lodash/isRegExp'; +import isRegExp from 'lodash-es/isRegExp'; import warning from '../_util/warning'; import FormItem from './FormItem'; import { initDefaultProps, getSlot } from '../_util/props-util'; @@ -11,7 +11,7 @@ import { getNamePath, containsNamePath } from './utils/valueUtil'; import { defaultValidateMessages } from './utils/messages'; import { allPromiseFinish } from './utils/asyncUtil'; import { toArray } from './utils/typeUtil'; -import isEqual from 'lodash/isEqual'; +import isEqual from 'lodash-es/isEqual'; import scrollIntoView from 'scroll-into-view-if-needed'; export const FormProps = { @@ -191,7 +191,7 @@ const Form = { ); if (!this.model) { warning(false, 'Form', 'model is required for validateFields to work.'); - return; + return Promise.reject('Form `model` is required for validateFields to work.'); } const provideNameList = !!nameList; const namePathList = provideNameList ? toArray(nameList).map(getNamePath) : []; diff --git a/components/form/FormItem.jsx b/components/form/FormItem.jsx index e17e1cfe4..61241a6d1 100644 --- a/components/form/FormItem.jsx +++ b/components/form/FormItem.jsx @@ -1,7 +1,7 @@ import { inject, provide, Transition } from 'vue'; -import cloneDeep from 'lodash/cloneDeep'; +import cloneDeep from 'lodash-es/cloneDeep'; import PropTypes from '../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import getTransitionProps from '../_util/getTransitionProps'; import Row from '../grid/Row'; import Col, { ColProps } from '../grid/Col'; @@ -25,7 +25,7 @@ import { validateRules } from './utils/validateUtil'; import { getNamePath } from './utils/valueUtil'; import { toArray } from './utils/typeUtil'; import { warning } from '../vc-util/warning'; -import find from 'lodash/find'; +import find from 'lodash-es/find'; const iconMap = { success: CheckCircleFilled, diff --git a/components/form/__tests__/__snapshots__/demo.test.js.snap b/components/form/__tests__/__snapshots__/demo.test.js.snap index 13a173f28..845ffd75d 100644 --- a/components/form/__tests__/__snapshots__/demo.test.js.snap +++ b/components/form/__tests__/__snapshots__/demo.test.js.snap @@ -74,7 +74,8 @@ exports[`renders ./antdv-demo/docs/form/demo/basic.md correctly 1`] = `
+ Cancel + @@ -119,7 +120,8 @@ exports[`renders ./antdv-demo/docs/form/demo/custom-validation.md correctly 1`]
+ Reset + @@ -143,7 +145,8 @@ exports[`renders ./antdv-demo/docs/form/demo/dynamic-form-item.md correctly 1`]
+ Reset + @@ -303,7 +306,8 @@ exports[`renders ./antdv-demo/docs/form/demo/validation.md correctly 1`] = `
+ Reset + diff --git a/components/input-number/__tests__/__snapshots__/demo.test.js.snap b/components/input-number/__tests__/__snapshots__/demo.test.js.snap index 8cd96351a..ed2c673a2 100644 --- a/components/input-number/__tests__/__snapshots__/demo.test.js.snap +++ b/components/input-number/__tests__/__snapshots__/demo.test.js.snap @@ -23,7 +23,8 @@ exports[`renders ./antdv-demo/docs/input-number/demo/disabled.md correctly 1`] =
+ Toggle disabled +
`; diff --git a/components/input-number/index.jsx b/components/input-number/index.jsx index 6b82355d1..c1730db9c 100644 --- a/components/input-number/index.jsx +++ b/components/input-number/index.jsx @@ -1,7 +1,7 @@ import { inject } from 'vue'; import PropTypes from '../_util/vue-types'; import { initDefaultProps, getOptionProps } from '../_util/props-util'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import UpOutlined from '@ant-design/icons-vue/UpOutlined'; import DownOutlined from '@ant-design/icons-vue/DownOutlined'; import VcInputNumber from '../vc-input-number/src'; diff --git a/components/input/ClearableLabeledInput.jsx b/components/input/ClearableLabeledInput.jsx index 62f3538ee..bbeb170ef 100644 --- a/components/input/ClearableLabeledInput.jsx +++ b/components/input/ClearableLabeledInput.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import CloseCircleFilled from '@ant-design/icons-vue/CloseCircleFilled'; import { getInputClassName } from './Input'; import PropTypes from '../_util/vue-types'; diff --git a/components/input/Input.jsx b/components/input/Input.jsx index a90ede41e..1dc080a69 100644 --- a/components/input/Input.jsx +++ b/components/input/Input.jsx @@ -1,5 +1,5 @@ import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import omit from 'omit.js'; import inputProps from './inputProps'; import { hasProp, getComponent, getOptionProps } from '../_util/props-util'; diff --git a/components/input/Password.jsx b/components/input/Password.jsx index 99ce991d6..1473d58b9 100644 --- a/components/input/Password.jsx +++ b/components/input/Password.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { getComponent, getOptionProps } from '../_util/props-util'; import Input from './Input'; import EyeOutlined from '@ant-design/icons-vue/EyeOutlined'; diff --git a/components/input/ResizableTextArea.jsx b/components/input/ResizableTextArea.jsx index 9910f6606..369d603d3 100644 --- a/components/input/ResizableTextArea.jsx +++ b/components/input/ResizableTextArea.jsx @@ -1,6 +1,6 @@ import ResizeObserver from '../vc-resize-observer'; import omit from 'omit.js'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import calculateNodeHeight from './calculateNodeHeight'; import raf from '../_util/raf'; import warning from '../_util/warning'; diff --git a/components/input/Search.jsx b/components/input/Search.jsx index 03adc0338..efac9c7ad 100644 --- a/components/input/Search.jsx +++ b/components/input/Search.jsx @@ -1,5 +1,5 @@ import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { isMobile } from 'is-mobile'; import Input from './Input'; import LoadingOutlined from '@ant-design/icons-vue/LoadingOutlined'; @@ -10,7 +10,7 @@ import { cloneElement } from '../_util/vnode'; import PropTypes from '../_util/vue-types'; import { getOptionProps, getComponent } from '../_util/props-util'; import { ConfigConsumerProps } from '../config-provider'; -import isPlainObject from 'lodash/isPlainObject'; +import isPlainObject from 'lodash-es/isPlainObject'; export default { name: 'AInputSearch', diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap index cc931299a..1ab6fe444 100644 --- a/components/input/__tests__/__snapshots__/demo.test.js.snap +++ b/components/input/__tests__/__snapshots__/demo.test.js.snap @@ -64,7 +64,8 @@ exports[`renders ./antdv-demo/docs/input/demo/search-input.md correctly 1`] = `< exports[`renders ./antdv-demo/docs/input/demo/search-input-loading.md correctly 1`] = `


-
+ +
`; exports[`renders ./antdv-demo/docs/input/demo/size.md correctly 1`] = `
`; @@ -73,7 +74,8 @@ exports[`renders ./antdv-demo/docs/input/demo/textarea.md correctly 1`] = `
+ Auto Resize: false +
`; exports[`renders ./antdv-demo/docs/input/demo/tooltip.md correctly 1`] = ``; diff --git a/components/layout/Sider.jsx b/components/layout/Sider.jsx index 42c179fe1..602c1efd4 100644 --- a/components/layout/Sider.jsx +++ b/components/layout/Sider.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { inject, provide } from 'vue'; import PropTypes from '../_util/vue-types'; import { @@ -16,20 +16,6 @@ import RightOutlined from '@ant-design/icons-vue/RightOutlined'; import LeftOutlined from '@ant-design/icons-vue/LeftOutlined'; import omit from 'omit.js'; -// matchMedia polyfill for -// https://github.com/WickyNilliams/enquire.js/issues/82 -if (typeof window !== 'undefined') { - const matchMediaPolyfill = mediaQuery => { - return { - media: mediaQuery, - matches: false, - addListener() {}, - removeListener() {}, - }; - }; - window.matchMedia = window.matchMedia || matchMediaPolyfill; -} - const dimensionMaxMap = { xs: '479.98px', sm: '575.98px', diff --git a/components/layout/__tests__/__snapshots__/demo.test.js.snap b/components/layout/__tests__/__snapshots__/demo.test.js.snap index ea7ca60c5..4ad41417c 100644 --- a/components/layout/__tests__/__snapshots__/demo.test.js.snap +++ b/components/layout/__tests__/__snapshots__/demo.test.js.snap @@ -356,7 +356,7 @@ exports[`renders ./antdv-demo/docs/layout/demo/top-side.md correctly 1`] = `
+ loading more +
`; diff --git a/components/list/index.jsx b/components/list/index.jsx index 8854953f2..474089fc2 100644 --- a/components/list/index.jsx +++ b/components/list/index.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import omit from 'omit.js'; import { ConfigConsumerProps } from '../config-provider'; diff --git a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap index d7dd39d91..e56804d25 100644 --- a/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/demo.test.js.snap @@ -52,15 +52,20 @@ exports[`renders ./antdv-demo/docs/locale-provider/demo/all.md correctly 1`] = `
- Click to confirm
+ Show Modal + + Click to confirm +
0 item
+ + 0 item
@@ -86,7 +91,8 @@ exports[`renders ./antdv-demo/docs/locale-provider/demo/all.md correctly 1`] = `
0 item
+ + 0 item
diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap index 6aed23390..84f4709c0 100644 --- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap @@ -8,7 +8,7 @@ exports[`Locale Provider set moment locale when locale changes 1`] = `
-
+
@@ -624,7 +624,8 @@ exports[`Locale Provider should display the text as ar 1`] = `
0 عنصر
+ + 0 عنصر
@@ -650,7 +651,8 @@ exports[`Locale Provider should display the text as ar 1`] = `
0 عنصر
+ + 0 عنصر
@@ -1179,7 +1181,8 @@ exports[`Locale Provider should display the text as bg 1`] = `
0 избор
+ + 0 избор
@@ -1205,7 +1208,8 @@ exports[`Locale Provider should display the text as bg 1`] = `
0 избор
+ + 0 избор
@@ -1734,7 +1738,8 @@ exports[`Locale Provider should display the text as ca 1`] = `
0 item
+ + 0 item
@@ -1760,7 +1765,8 @@ exports[`Locale Provider should display the text as ca 1`] = `
0 item
+ + 0 item
@@ -2289,7 +2295,8 @@ exports[`Locale Provider should display the text as cs 1`] = `
0 položka
+ + 0 položka
@@ -2315,7 +2322,8 @@ exports[`Locale Provider should display the text as cs 1`] = `
0 položka
+ + 0 položka
@@ -2844,7 +2852,8 @@ exports[`Locale Provider should display the text as da 1`] = `
0 element
+ + 0 element
@@ -2870,7 +2879,8 @@ exports[`Locale Provider should display the text as da 1`] = `
0 element
+ + 0 element
@@ -3399,7 +3409,8 @@ exports[`Locale Provider should display the text as de 1`] = `
0 Eintrag
+ + 0 Eintrag
@@ -3425,7 +3436,8 @@ exports[`Locale Provider should display the text as de 1`] = `
0 Eintrag
+ + 0 Eintrag
@@ -3954,7 +3966,8 @@ exports[`Locale Provider should display the text as el 1`] = `
0 αντικείμενο
+ + 0 αντικείμενο
@@ -3980,7 +3993,8 @@ exports[`Locale Provider should display the text as el 1`] = `
0 αντικείμενο
+ + 0 αντικείμενο
@@ -4509,7 +4523,8 @@ exports[`Locale Provider should display the text as en 1`] = `
0 item
+ + 0 item
@@ -4535,7 +4550,8 @@ exports[`Locale Provider should display the text as en 1`] = `
0 item
+ + 0 item
@@ -5064,7 +5080,8 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
0 item
+ + 0 item
@@ -5090,7 +5107,8 @@ exports[`Locale Provider should display the text as en-gb 1`] = `
0 item
+ + 0 item
@@ -5619,7 +5637,8 @@ exports[`Locale Provider should display the text as es 1`] = `
0 elemento
+ + 0 elemento
@@ -5645,7 +5664,8 @@ exports[`Locale Provider should display the text as es 1`] = `
0 elemento
+ + 0 elemento
@@ -6174,7 +6194,8 @@ exports[`Locale Provider should display the text as et 1`] = `
0 kogus
+ + 0 kogus
@@ -6200,7 +6221,8 @@ exports[`Locale Provider should display the text as et 1`] = `
0 kogus
+ + 0 kogus
@@ -6729,7 +6751,8 @@ exports[`Locale Provider should display the text as fa 1`] = `
0
+ + 0
@@ -6755,7 +6778,8 @@ exports[`Locale Provider should display the text as fa 1`] = `
0
+ + 0
@@ -7284,7 +7308,8 @@ exports[`Locale Provider should display the text as fi 1`] = `
0 kohde
+ + 0 kohde
@@ -7310,7 +7335,8 @@ exports[`Locale Provider should display the text as fi 1`] = `
0 kohde
+ + 0 kohde
@@ -7839,7 +7865,8 @@ exports[`Locale Provider should display the text as fr 1`] = `
0 élément
+ + 0 élément
@@ -7865,7 +7892,8 @@ exports[`Locale Provider should display the text as fr 1`] = `
0 élément
+ + 0 élément
@@ -8394,7 +8422,8 @@ exports[`Locale Provider should display the text as fr 2`] = `
0 élément
+ + 0 élément
@@ -8420,7 +8449,8 @@ exports[`Locale Provider should display the text as fr 2`] = `
0 élément
+ + 0 élément
@@ -8949,7 +8979,8 @@ exports[`Locale Provider should display the text as he 1`] = `
0 פריט
+ + 0 פריט
@@ -8975,7 +9006,8 @@ exports[`Locale Provider should display the text as he 1`] = `
0 פריט
+ + 0 פריט
@@ -9504,7 +9536,8 @@ exports[`Locale Provider should display the text as hi 1`] = `
0 तत्त्व
+ + 0 तत्त्व
@@ -9530,7 +9563,8 @@ exports[`Locale Provider should display the text as hi 1`] = `
0 तत्त्व
+ + 0 तत्त्व
@@ -10059,7 +10093,8 @@ exports[`Locale Provider should display the text as hr 1`] = `
0 stavka
+ + 0 stavka
@@ -10085,7 +10120,8 @@ exports[`Locale Provider should display the text as hr 1`] = `
0 stavka
+ + 0 stavka
@@ -10614,7 +10650,8 @@ exports[`Locale Provider should display the text as hu 1`] = `
0 elem
+ + 0 elem
@@ -10640,7 +10677,8 @@ exports[`Locale Provider should display the text as hu 1`] = `
0 elem
+ + 0 elem
@@ -11169,7 +11207,8 @@ exports[`Locale Provider should display the text as hy 1`] = `
0 պարագան
+ + 0 պարագան
@@ -11195,7 +11234,8 @@ exports[`Locale Provider should display the text as hy 1`] = `
0 պարագան
+ + 0 պարագան
@@ -11724,7 +11764,8 @@ exports[`Locale Provider should display the text as id 1`] = `
0 item
+ + 0 item
@@ -11750,7 +11791,8 @@ exports[`Locale Provider should display the text as id 1`] = `
0 item
+ + 0 item
@@ -12279,7 +12321,8 @@ exports[`Locale Provider should display the text as is 1`] = `
0 færsla
+ + 0 færsla
@@ -12305,7 +12348,8 @@ exports[`Locale Provider should display the text as is 1`] = `
0 færsla
+ + 0 færsla
@@ -12834,7 +12878,8 @@ exports[`Locale Provider should display the text as it 1`] = `
0 elemento
+ + 0 elemento
@@ -12860,7 +12905,8 @@ exports[`Locale Provider should display the text as it 1`] = `
0 elemento
+ + 0 elemento
@@ -13389,7 +13435,8 @@ exports[`Locale Provider should display the text as ja 1`] = `
0 アイテム
+ + 0 アイテム
@@ -13415,7 +13462,8 @@ exports[`Locale Provider should display the text as ja 1`] = `
0 アイテム
+ + 0 アイテム
@@ -13944,7 +13992,8 @@ exports[`Locale Provider should display the text as kn 1`] = `
0 ವಿಷಯ
+ + 0 ವಿಷಯ
@@ -13970,7 +14019,8 @@ exports[`Locale Provider should display the text as kn 1`] = `
0 ವಿಷಯ
+ + 0 ವಿಷಯ
@@ -14499,7 +14549,8 @@ exports[`Locale Provider should display the text as ko 1`] = `
0 개
+ + 0 개
@@ -14525,7 +14576,8 @@ exports[`Locale Provider should display the text as ko 1`] = `
0 개
+ + 0 개
@@ -15054,7 +15106,8 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
0 tişt
+ + 0 tişt
@@ -15080,7 +15133,8 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
0 tişt
+ + 0 tişt
@@ -15609,7 +15663,8 @@ exports[`Locale Provider should display the text as lv 1`] = `
0 vienumu
+ + 0 vienumu
@@ -15635,7 +15690,8 @@ exports[`Locale Provider should display the text as lv 1`] = `
0 vienumu
+ + 0 vienumu
@@ -16164,7 +16220,8 @@ exports[`Locale Provider should display the text as mk 1`] = `
0 предмет
+ + 0 предмет
@@ -16190,7 +16247,8 @@ exports[`Locale Provider should display the text as mk 1`] = `
0 предмет
+ + 0 предмет
@@ -16719,7 +16777,8 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
0 Зүйл
+ + 0 Зүйл
@@ -16745,7 +16804,8 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
0 Зүйл
+ + 0 Зүйл
@@ -17274,7 +17334,8 @@ exports[`Locale Provider should display the text as ms-my 1`] = `
0 item
+ + 0 item
@@ -17300,7 +17361,8 @@ exports[`Locale Provider should display the text as ms-my 1`] = `
0 item
+ + 0 item
@@ -17829,7 +17891,8 @@ exports[`Locale Provider should display the text as nb 1`] = `
0 element
+ + 0 element
@@ -17855,7 +17918,8 @@ exports[`Locale Provider should display the text as nb 1`] = `
0 element
+ + 0 element
@@ -18384,7 +18448,8 @@ exports[`Locale Provider should display the text as ne-np 1`] = `
0 वस्तु
+ + 0 वस्तु
@@ -18410,7 +18475,8 @@ exports[`Locale Provider should display the text as ne-np 1`] = `
0 वस्तु
+ + 0 वस्तु
@@ -18939,7 +19005,8 @@ exports[`Locale Provider should display the text as nl 1`] = `
0 item
+ + 0 item
@@ -18965,7 +19032,8 @@ exports[`Locale Provider should display the text as nl 1`] = `
0 item
+ + 0 item
@@ -19494,7 +19562,8 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
0 item
+ + 0 item
@@ -19520,7 +19589,8 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
0 item
+ + 0 item
@@ -20049,7 +20119,8 @@ exports[`Locale Provider should display the text as pl 1`] = `
0 obiekt
+ + 0 obiekt
@@ -20075,7 +20146,8 @@ exports[`Locale Provider should display the text as pl 1`] = `
0 obiekt
+ + 0 obiekt
@@ -20604,7 +20676,8 @@ exports[`Locale Provider should display the text as pt 1`] = `
0 item
+ + 0 item
@@ -20630,7 +20703,8 @@ exports[`Locale Provider should display the text as pt 1`] = `
0 item
+ + 0 item
@@ -21159,7 +21233,8 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
0 item
+ + 0 item
@@ -21185,7 +21260,8 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
0 item
+ + 0 item
@@ -21714,7 +21790,8 @@ exports[`Locale Provider should display the text as ro 1`] = `
0 element
+ + 0 element
@@ -21740,7 +21817,8 @@ exports[`Locale Provider should display the text as ro 1`] = `
0 element
+ + 0 element
@@ -22269,7 +22347,8 @@ exports[`Locale Provider should display the text as ru 1`] = `
0 элем.
+ + 0 элем.
@@ -22295,7 +22374,8 @@ exports[`Locale Provider should display the text as ru 1`] = `
0 элем.
+ + 0 элем.
@@ -22824,7 +22904,8 @@ exports[`Locale Provider should display the text as sk 1`] = `
0 položka
+ + 0 položka
@@ -22850,7 +22931,8 @@ exports[`Locale Provider should display the text as sk 1`] = `
0 položka
+ + 0 položka
@@ -23379,7 +23461,8 @@ exports[`Locale Provider should display the text as sl 1`] = `
0 Objekt
+ + 0 Objekt
@@ -23405,7 +23488,8 @@ exports[`Locale Provider should display the text as sl 1`] = `
0 Objekt
+ + 0 Objekt
@@ -23934,7 +24018,8 @@ exports[`Locale Provider should display the text as sr 1`] = `
0 stavka
+ + 0 stavka
@@ -23960,7 +24045,8 @@ exports[`Locale Provider should display the text as sr 1`] = `
0 stavka
+ + 0 stavka
@@ -24489,7 +24575,8 @@ exports[`Locale Provider should display the text as sv 1`] = `
0 element
+ + 0 element
@@ -24515,7 +24602,8 @@ exports[`Locale Provider should display the text as sv 1`] = `
0 element
+ + 0 element
@@ -25044,7 +25132,8 @@ exports[`Locale Provider should display the text as ta 1`] = `
0 தகவல்
+ + 0 தகவல்
@@ -25070,7 +25159,8 @@ exports[`Locale Provider should display the text as ta 1`] = `
0 தகவல்
+ + 0 தகவல்
@@ -25599,7 +25689,8 @@ exports[`Locale Provider should display the text as th 1`] = `
0 ชิ้น
+ + 0 ชิ้น
@@ -25625,7 +25716,8 @@ exports[`Locale Provider should display the text as th 1`] = `
0 ชิ้น
+ + 0 ชิ้น
@@ -26154,7 +26246,8 @@ exports[`Locale Provider should display the text as tr 1`] = `
0 Öğe
+ + 0 Öğe
@@ -26180,7 +26273,8 @@ exports[`Locale Provider should display the text as tr 1`] = `
0 Öğe
+ + 0 Öğe
@@ -26709,7 +26803,8 @@ exports[`Locale Provider should display the text as uk 1`] = `
0 item
+ + 0 item
@@ -26735,7 +26830,8 @@ exports[`Locale Provider should display the text as uk 1`] = `
0 item
+ + 0 item
@@ -27264,7 +27360,8 @@ exports[`Locale Provider should display the text as vi 1`] = `
0 mục
+ + 0 mục
@@ -27290,7 +27387,8 @@ exports[`Locale Provider should display the text as vi 1`] = `
0 mục
+ + 0 mục
@@ -27819,7 +27917,8 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
0 项
+ + 0 项
@@ -27845,7 +27944,8 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
0 项
+ + 0 项
@@ -28374,7 +28474,8 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
0 項目
+ + 0 項目
@@ -28400,7 +28501,8 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
0 項目
+ + 0 項目
diff --git a/components/locale-provider/__tests__/index.test.js b/components/locale-provider/__tests__/index.test.js index 2d4194c01..b49c2bf4f 100644 --- a/components/locale-provider/__tests__/index.test.js +++ b/components/locale-provider/__tests__/index.test.js @@ -240,7 +240,7 @@ describe('Locale Provider', () => { } }); - it('set moment locale when locale changes', async () => { + xit('set moment locale when locale changes', async () => { document.body.innerHTML = ''; const Test = { data() { diff --git a/components/locale-provider/index.tsx b/components/locale-provider/index.tsx index 2904fa144..0a7913bef 100644 --- a/components/locale-provider/index.tsx +++ b/components/locale-provider/index.tsx @@ -1,6 +1,6 @@ import { provide, App, defineComponent, VNode } from 'vue'; import PropTypes from '../_util/vue-types'; -import * as moment from 'moment'; +import moment from 'moment'; import interopDefault from '../_util/interopDefault'; import { ModalLocale, changeConfirmLocale } from '../modal/locale'; import warning from '../_util/warning'; diff --git a/components/mentions/__tests__/__snapshots__/demo.test.js.snap b/components/mentions/__tests__/__snapshots__/demo.test.js.snap index 13c942c57..a36d8a90b 100644 --- a/components/mentions/__tests__/__snapshots__/demo.test.js.snap +++ b/components/mentions/__tests__/__snapshots__/demo.test.js.snap @@ -35,7 +35,8 @@ exports[`renders ./antdv-demo/docs/mentions/demo/form.md correctly 1`] = `
+ Reset + diff --git a/components/mentions/index.jsx b/components/mentions/index.jsx index cfd4a822a..9cc6283c1 100644 --- a/components/mentions/index.jsx +++ b/components/mentions/index.jsx @@ -1,5 +1,5 @@ import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import omit from 'omit.js'; import PropTypes from '../_util/vue-types'; import VcMentions from '../vc-mentions'; diff --git a/components/menu/SubMenu.jsx b/components/menu/SubMenu.jsx index b9b41dec7..989866306 100644 --- a/components/menu/SubMenu.jsx +++ b/components/menu/SubMenu.jsx @@ -1,6 +1,6 @@ import { inject } from 'vue'; import { SubMenu as VcSubMenu } from '../vc-menu'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import Omit from 'omit.js'; import { getSlot } from '../_util/props-util'; diff --git a/components/menu/__tests__/__snapshots__/demo.test.js.snap b/components/menu/__tests__/__snapshots__/demo.test.js.snap index b972fdc69..865627a7d 100644 --- a/components/menu/__tests__/__snapshots__/demo.test.js.snap +++ b/components/menu/__tests__/__snapshots__/demo.test.js.snap @@ -60,7 +60,7 @@ exports[`renders ./antdv-demo/docs/menu/demo/inline.md correctly 1`] = `
diff --git a/components/modal/__tests__/__snapshots__/demo.test.js.snap b/components/modal/__tests__/__snapshots__/demo.test.js.snap index f24488017..876b4eb0e 100644 --- a/components/modal/__tests__/__snapshots__/demo.test.js.snap +++ b/components/modal/__tests__/__snapshots__/demo.test.js.snap @@ -2,74 +2,93 @@ exports[`renders ./antdv-demo/docs/modal/demo/async.md correctly 1`] = `
+ Open Modal with async logic +
`; exports[`renders ./antdv-demo/docs/modal/demo/basic.md correctly 1`] = `
+ Open Modal +
`; exports[`renders ./antdv-demo/docs/modal/demo/button-props.md correctly 1`] = `
+ Open Modal with customized button props +
`; exports[`renders ./antdv-demo/docs/modal/demo/confirm.md correctly 1`] = `
+ Confirm +
`; exports[`renders ./antdv-demo/docs/modal/demo/confirm-promise.md correctly 1`] = ` + Confirm + `; exports[`renders ./antdv-demo/docs/modal/demo/confirm-router.md correctly 1`] = ` + Confirm + `; exports[`renders ./antdv-demo/docs/modal/demo/footer.md correctly 1`] = `
+ Open Modal with customized footer +
`; exports[`renders ./antdv-demo/docs/modal/demo/info.md correctly 1`] = `
+ Info +
`; exports[`renders ./antdv-demo/docs/modal/demo/locale.md correctly 1`] = `
+ Modal +

+ Confirm + +
`; exports[`renders ./antdv-demo/docs/modal/demo/manual.md correctly 1`] = ` + Open modal to close in 5s + `; exports[`renders ./antdv-demo/docs/modal/demo/position.md correctly 1`] = `
+ Display a modal dialog at 20px to Top +

+ Vertically centered modal dialog +
`; diff --git a/components/notification/__tests__/__snapshots__/demo.test.js.snap b/components/notification/__tests__/__snapshots__/demo.test.js.snap index 70803fa28..7cae591be 100644 --- a/components/notification/__tests__/__snapshots__/demo.test.js.snap +++ b/components/notification/__tests__/__snapshots__/demo.test.js.snap @@ -2,50 +2,64 @@ exports[`renders ./antdv-demo/docs/notification/demo/basic.md correctly 1`] = ` + Open the notification box + `; exports[`renders ./antdv-demo/docs/notification/demo/custom-icon.md correctly 1`] = ` + Open the notification box + `; exports[`renders ./antdv-demo/docs/notification/demo/custom-style.md correctly 1`] = ` + Open the notification box + `; exports[`renders ./antdv-demo/docs/notification/demo/duration.md correctly 1`] = ` + Open the notification box + `; exports[`renders ./antdv-demo/docs/notification/demo/placement.md correctly 1`] = `
+ topLeft + + bottomLeft +
`; exports[`renders ./antdv-demo/docs/notification/demo/update.md correctly 1`] = ` + Open the notification box + `; exports[`renders ./antdv-demo/docs/notification/demo/with-btn.md correctly 1`] = ` + Open the notification box + `; exports[`renders ./antdv-demo/docs/notification/demo/with-icon.md correctly 1`] = `
+ Success +
`; diff --git a/components/pagination/Pagination.jsx b/components/pagination/Pagination.jsx index 8722a4939..5f8d35a44 100644 --- a/components/pagination/Pagination.jsx +++ b/components/pagination/Pagination.jsx @@ -11,7 +11,7 @@ import DoubleLeftOutlined from '@ant-design/icons-vue/DoubleLeftOutlined'; import DoubleRightOutlined from '@ant-design/icons-vue/DoubleRightOutlined'; import { ConfigConsumerProps } from '../config-provider'; import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; export const PaginationProps = () => ({ total: PropTypes.number, diff --git a/components/popconfirm/__tests__/__snapshots__/demo.test.js.snap b/components/popconfirm/__tests__/__snapshots__/demo.test.js.snap index d09e690f6..a0a7334ee 100644 --- a/components/popconfirm/__tests__/__snapshots__/demo.test.js.snap +++ b/components/popconfirm/__tests__/__snapshots__/demo.test.js.snap @@ -5,7 +5,9 @@ exports[`renders ./antdv-demo/docs/popconfirm/demo/basic.md correctly 1`] = ` Delete a task

Whether directly execute：
+ + +
`; exports[`renders ./antdv-demo/docs/popconfirm/demo/icon.md correctly 1`] = `Delete`; @@ -16,31 +18,47 @@ exports[`renders ./antdv-demo/docs/popconfirm/demo/placement.md correctly 1`] =
+ TL + + Top +
+ TR + +
+ LT + + Left +
+ LB + +
+ RT + + Right +
+ RB + +
+ BL + + Bottom +
+ BR + +
`; diff --git a/components/popconfirm/__tests__/__snapshots__/index.test.js.snap b/components/popconfirm/__tests__/__snapshots__/index.test.js.snap index 16ecc95ba..e58b64854 100644 --- a/components/popconfirm/__tests__/__snapshots__/index.test.js.snap +++ b/components/popconfirm/__tests__/__snapshots__/index.test.js.snap @@ -11,8 +11,10 @@ exports[`Popconfirm should show overlay when trigger is clicked 1`] = `
code
+ Cancel +
diff --git a/components/popover/__tests__/__snapshots__/demo.test.js.snap b/components/popover/__tests__/__snapshots__/demo.test.js.snap index fb04ea5f7..936d47844 100644 --- a/components/popover/__tests__/__snapshots__/demo.test.js.snap +++ b/components/popover/__tests__/__snapshots__/demo.test.js.snap @@ -3,66 +3,92 @@ exports[`renders ./antdv-demo/docs/popover/demo/arrow-point-at-center.md correctly 1`] = `
+ Align edge / 边缘对齐 +
+ Arrow points to center / 箭头指向中心 + +
`; exports[`renders ./antdv-demo/docs/popover/demo/basic.md correctly 1`] = ` + Hover me + `; exports[`renders ./antdv-demo/docs/popover/demo/control.md correctly 1`] = ` + Click me + `; exports[`renders ./antdv-demo/docs/popover/demo/hover-with-click.md correctly 1`] = ` + Hover and click / 悬停并单击 + `; exports[`renders ./antdv-demo/docs/popover/demo/placement.md correctly 1`] = `
+ TL + + Top +
+ TR + +
+ LT + + Left +
+ LB + +
+ RT + + Right +
+ RB + +
+ BL + + Bottom +
+ BR + +
`; exports[`renders ./antdv-demo/docs/popover/demo/triggerType.md correctly 1`] = `
+ Hover me + + Focus me +
+ Click me + +
`; diff --git a/components/progress/progress.jsx b/components/progress/progress.jsx index 5d0f1b571..ae0694fe7 100644 --- a/components/progress/progress.jsx +++ b/components/progress/progress.jsx @@ -1,5 +1,5 @@ import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import { getOptionProps, initDefaultProps } from '../_util/props-util'; import { ConfigConsumerProps } from '../config-provider'; diff --git a/components/radio/Group.jsx b/components/radio/Group.jsx index b5772083e..352cc65e9 100644 --- a/components/radio/Group.jsx +++ b/components/radio/Group.jsx @@ -1,5 +1,5 @@ import { provide, inject, nextTick } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import Radio from './Radio'; import { getOptionProps, filterEmpty, hasProp, getSlot } from '../_util/props-util'; @@ -25,6 +25,7 @@ export default { name: String, buttonStyle: PropTypes.string.def('outline'), onChange: PropTypes.func, + 'onUpdate:value': PropTypes.func, }, data() { const { value, defaultValue } = this; diff --git a/components/radio/Radio.jsx b/components/radio/Radio.jsx index 56d46eaf8..d0e30eb7b 100644 --- a/components/radio/Radio.jsx +++ b/components/radio/Radio.jsx @@ -1,7 +1,7 @@ import { inject } from 'vue'; import PropTypes from '../_util/vue-types'; import VcCheckbox from '../vc-checkbox'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { getOptionProps } from '../_util/props-util'; import { ConfigConsumerProps } from '../config-provider'; diff --git a/components/radio/__tests__/__snapshots__/demo.test.js.snap b/components/radio/__tests__/__snapshots__/demo.test.js.snap index 565a94e8b..44682c802 100644 --- a/components/radio/__tests__/__snapshots__/demo.test.js.snap +++ b/components/radio/__tests__/__snapshots__/demo.test.js.snap @@ -5,7 +5,8 @@ exports[`renders ./antdv-demo/docs/radio/demo/basic.md correctly 1`] = `
`; diff --git a/components/result/__tests__/__snapshots__/demo.test.js.snap b/components/result/__tests__/__snapshots__/demo.test.js.snap index fcf5d2014..f382fd981 100644 --- a/components/result/__tests__/__snapshots__/demo.test.js.snap +++ b/components/result/__tests__/__snapshots__/demo.test.js.snap @@ -64,7 +64,8 @@ exports[`renders ./antdv-demo/docs/result/demo/403.md correctly 1`] = `
Sorry, you are not authorized to access this page.
+ Back Home +
`; @@ -140,7 +141,8 @@ exports[`renders ./antdv-demo/docs/result/demo/404.md correctly 1`] = `
Sorry, the page you visited does not exist.
+ Back Home +
`; @@ -223,7 +225,8 @@ exports[`renders ./antdv-demo/docs/result/demo/500.md correctly 1`] = `
Sorry, the server is wrong.
+ Back Home +
`; @@ -234,7 +237,8 @@ exports[`renders ./antdv-demo/docs/result/demo/customIcon.md correctly 1`] = `
+ Next +
`; @@ -251,8 +255,10 @@ exports[`renders ./antdv-demo/docs/result/demo/error.md correctly 1`] = `
+ Go Console +
`; @@ -263,7 +269,8 @@ exports[`renders ./antdv-demo/docs/result/demo/info.md correctly 1`] = `
+ Go Console +
`; @@ -274,8 +281,10 @@ exports[`renders ./antdv-demo/docs/result/demo/success.md correctly 1`] = `
Order number: 2017182818828182881 Cloud server configuration takes 1-5 minutes, please wait.
+ Go Console +
`; @@ -286,6 +295,7 @@ exports[`renders ./antdv-demo/docs/result/demo/warning.md correctly 1`] = `
+ Go Console +
`; diff --git a/components/select/index.jsx b/components/select/index.jsx index 11b942a1f..84183efbe 100644 --- a/components/select/index.jsx +++ b/components/select/index.jsx @@ -252,7 +252,7 @@ const Select = { class: cls, ref: 'vcSelect', }; - return ; + return ; }, }; diff --git a/components/skeleton/Avatar.jsx b/components/skeleton/Avatar.jsx index 75f5671c5..49a58d59d 100644 --- a/components/skeleton/Avatar.jsx +++ b/components/skeleton/Avatar.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import { initDefaultProps } from '../_util/props-util'; diff --git a/components/skeleton/__tests__/__snapshots__/demo.test.js.snap b/components/skeleton/__tests__/__snapshots__/demo.test.js.snap index 3f5e51cb4..f8e22d141 100644 --- a/components/skeleton/__tests__/__snapshots__/demo.test.js.snap +++ b/components/skeleton/__tests__/__snapshots__/demo.test.js.snap @@ -34,7 +34,8 @@ exports[`renders ./antdv-demo/docs/skeleton/demo/children.md correctly 1`] = `

Ant Design Vue, a design language

We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.

+ Show Skeleton +
`; @@ -55,7 +56,8 @@ exports[`renders ./antdv-demo/docs/skeleton/demo/complex.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/skeleton/demo/list.md correctly 1`] = `
+ +
diff --git a/components/skeleton/index.jsx b/components/skeleton/index.jsx index 5e5e7fd92..b1e681784 100644 --- a/components/skeleton/index.jsx +++ b/components/skeleton/index.jsx @@ -1,5 +1,5 @@ import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import { initDefaultProps, hasProp } from '../_util/props-util'; import { ConfigConsumerProps } from '../config-provider'; diff --git a/components/slider/__tests__/__snapshots__/demo.test.js.snap b/components/slider/__tests__/__snapshots__/demo.test.js.snap index 23c4c0467..0b886cb3b 100644 --- a/components/slider/__tests__/__snapshots__/demo.test.js.snap +++ b/components/slider/__tests__/__snapshots__/demo.test.js.snap @@ -20,7 +20,8 @@ exports[`renders ./antdv-demo/docs/slider/demo/basic.md correctly 1`] = `
Disabled: + +
`; @@ -180,7 +181,8 @@ exports[`renders ./antdv-demo/docs/slider/demo/reverse.md correctly 1`] = `
Reversed: + +
`; diff --git a/components/space/__tests__/__snapshots__/demo.test.js.snap b/components/space/__tests__/__snapshots__/demo.test.js.snap index f2b217be8..b7424b7ba 100644 --- a/components/space/__tests__/__snapshots__/demo.test.js.snap +++ b/components/space/__tests__/__snapshots__/demo.test.js.snap @@ -6,7 +6,8 @@ exports[`renders ./antdv-demo/docs/space/demo/align.md correctly 1`] = `
center
+ Primary +
Block
@@ -14,7 +15,8 @@ exports[`renders ./antdv-demo/docs/space/demo/align.md correctly 1`] = `
start
+ Primary +
Block
@@ -22,7 +24,8 @@ exports[`renders ./antdv-demo/docs/space/demo/align.md correctly 1`] = `
end
+ Primary +
Block
@@ -30,7 +33,8 @@ exports[`renders ./antdv-demo/docs/space/demo/align.md correctly 1`] = `
baseline
+ Primary +
Block
@@ -41,11 +45,14 @@ exports[`renders ./antdv-demo/docs/space/demo/base.md correctly 1`] = `
Space
-
+ Button +
+
+ Confirm + +
`; @@ -61,13 +68,17 @@ exports[`renders ./antdv-demo/docs/space/demo/customize.md correctly 1`] = `


+ Primary +
+ Default +
+ Dashed +
+ Link +
`; @@ -77,13 +88,17 @@ exports[`renders ./antdv-demo/docs/space/demo/size.md correctly 1`] = `


+ Primary +
+ Default +
+ Dashed +
+ Link +
`; diff --git a/components/spin/Spin.jsx b/components/spin/Spin.jsx index c293170c9..2e0f30fc4 100644 --- a/components/spin/Spin.jsx +++ b/components/spin/Spin.jsx @@ -1,5 +1,5 @@ import { inject, cloneVNode, isVNode } from 'vue'; -import debounce from 'lodash/debounce'; +import debounce from 'lodash-es/debounce'; import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; import { initDefaultProps, getComponent, getSlot } from '../_util/props-util'; diff --git a/components/spin/__tests__/__snapshots__/demo.test.js.snap b/components/spin/__tests__/__snapshots__/demo.test.js.snap index 6cc6da1ed..69ac851d5 100644 --- a/components/spin/__tests__/__snapshots__/demo.test.js.snap +++ b/components/spin/__tests__/__snapshots__/demo.test.js.snap @@ -32,7 +32,8 @@ exports[`renders ./antdv-demo/docs/spin/demo/delayAndDebounce.md correctly 1`] =
可以点击‘切换’按钮，延迟显示 loading 效果。当 spinning 状态在 \`delay\` 时间内结束，则不显示 loading 状态。
Loading state： + +
`; @@ -52,7 +53,8 @@ exports[`renders ./antdv-demo/docs/spin/demo/nested.md correctly 1`] = `
可以点击‘切换’按钮，控制本区域的spin展示。
Loading state： + +
`; diff --git a/components/statistic/Countdown.jsx b/components/statistic/Countdown.jsx index 3f5c21c4f..5964383d8 100644 --- a/components/statistic/Countdown.jsx +++ b/components/statistic/Countdown.jsx @@ -1,4 +1,4 @@ -import * as moment from 'moment'; +import moment from 'moment'; import interopDefault from '../_util/interopDefault'; import { initDefaultProps } from '../_util/props-util'; import Statistic, { StatisticProps } from './Statistic'; diff --git a/components/statistic/Number.jsx b/components/statistic/Number.jsx index 74fb0ba13..1063d750a 100644 --- a/components/statistic/Number.jsx +++ b/components/statistic/Number.jsx @@ -1,4 +1,4 @@ -import padEnd from 'lodash/padEnd'; +import padEnd from 'lodash-es/padEnd'; import { createVNode } from 'vue'; const Number = (_, { attrs }) => { diff --git a/components/statistic/__tests__/__snapshots__/demo.test.js.snap b/components/statistic/__tests__/__snapshots__/demo.test.js.snap index 159caa16d..53a000860 100644 --- a/components/statistic/__tests__/__snapshots__/demo.test.js.snap +++ b/components/statistic/__tests__/__snapshots__/demo.test.js.snap @@ -90,14 +90,16 @@ exports[`renders ./antdv-demo/docs/statistic/demo/unit.md correctly 1`] = `
Feedback
- 1,128
+ 1,128 +
Unmerged
- 93 / 100
+ 93 / 100 +
diff --git a/components/statistic/utils.js b/components/statistic/utils.js index 25e6be2d7..f553b3490 100644 --- a/components/statistic/utils.js +++ b/components/statistic/utils.js @@ -1,5 +1,5 @@ -import * as moment from 'moment'; -import padStart from 'lodash/padStart'; +import moment from 'moment'; +import padStart from 'lodash-es/padStart'; import interopDefault from '../_util/interopDefault'; diff --git a/components/steps/__tests__/__snapshots__/demo.test.js.snap b/components/steps/__tests__/__snapshots__/demo.test.js.snap index 152fb5709..00f412e19 100644 --- a/components/steps/__tests__/__snapshots__/demo.test.js.snap +++ b/components/steps/__tests__/__snapshots__/demo.test.js.snap @@ -694,7 +694,8 @@ exports[`renders ./antdv-demo/docs/steps/demo/step-next.md correctly 1`] = `
First-content
+ Next +
diff --git a/components/steps/index.jsx b/components/steps/index.jsx index 5a311ffb2..4d228a5c1 100644 --- a/components/steps/index.jsx +++ b/components/steps/index.jsx @@ -18,12 +18,15 @@ const getStepsProps = (defaultProps = {}) => { direction: PropTypes.oneOf(['horizontal', 'vertical']), progressDot: PropTypes.oneOfType([PropTypes.bool, PropTypes.func]), type: PropTypes.oneOf(['default', 'navigation']), + onChange: PropTypes.func, + 'onUpdate:current': PropTypes.func, }; return initDefaultProps(props, defaultProps); }; const Steps = { name: 'ASteps', + inheritAttrs: false, props: getStepsProps({ current: 0, }), @@ -33,8 +36,14 @@ const Steps = { }; }, Step: { ...VcSteps.Step, name: 'AStep' }, + methods: { + handleChange(current) { + this.$emit('update:current', current); + this.$emit('change', current); + }, + }, render() { - const props = getOptionProps(this); + const props = { ...getOptionProps(this), ...this.$attrs }; const { prefixCls: customizePrefixCls, iconPrefix: customizeIconPrefixCls } = props; const getPrefixCls = this.configProvider.getPrefixCls; const prefixCls = getPrefixCls('steps', customizePrefixCls); @@ -51,6 +60,8 @@ const Steps = { prefixCls, progressDot, ...props, + canClick: !!(this.onChange || this['onUpdate:current']), + onChange: this.handleChange, }; return {getSlot(this)}; }, diff --git a/components/switch/__tests__/__snapshots__/demo.test.js.snap b/components/switch/__tests__/__snapshots__/demo.test.js.snap index cba3ccdfc..f01270cf3 100644 --- a/components/switch/__tests__/__snapshots__/demo.test.js.snap +++ b/components/switch/__tests__/__snapshots__/demo.test.js.snap @@ -2,26 +2,34 @@ exports[`renders ./antdv-demo/docs/switch/demo/basic.md correctly 1`] = `
+ +
`; exports[`renders ./antdv-demo/docs/switch/demo/disabled.md correctly 1`] = `

+ +
`; exports[`renders ./antdv-demo/docs/switch/demo/loading.md correctly 1`] = `

`; exports[`renders ./antdv-demo/docs/switch/demo/size.md correctly 1`] = `

+ +
`; exports[`renders ./antdv-demo/docs/switch/demo/text.md correctly 1`] = `


+ 开 +

`; diff --git a/components/switch/__tests__/__snapshots__/index.test.js.snap b/components/switch/__tests__/__snapshots__/index.test.js.snap index 882066d39..6fa22b0c9 100644 --- a/components/switch/__tests__/__snapshots__/index.test.js.snap +++ b/components/switch/__tests__/__snapshots__/index.test.js.snap @@ -2,5 +2,6 @@ exports[`Switch should has click wave effect 1`] = ` + + `; diff --git a/components/table/SelectionCheckboxAll.jsx b/components/table/SelectionCheckboxAll.jsx index fa16cc8f6..75de379d6 100644 --- a/components/table/SelectionCheckboxAll.jsx +++ b/components/table/SelectionCheckboxAll.jsx @@ -2,7 +2,7 @@ import DownOutlined from '@ant-design/icons-vue/DownOutlined'; import Checkbox from '../checkbox'; import Dropdown from '../dropdown'; import Menu from '../menu'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { SelectionCheckboxAllProps } from './interface'; import BaseMixin from '../_util/BaseMixin'; diff --git a/components/table/Table.jsx b/components/table/Table.jsx index 2b52f3085..e3c39cfb5 100755 --- a/components/table/Table.jsx +++ b/components/table/Table.jsx @@ -2,7 +2,7 @@ import { inject, markRaw } from 'vue'; import CaretUpFilled from '@ant-design/icons-vue/CaretUpFilled'; import CaretDownFilled from '@ant-design/icons-vue/CaretDownFilled'; import VcTable, { INTERNAL_COL_DEFINE } from '../vc-table'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import shallowEqual from '../_util/shallowequal'; import FilterDropdown from './filterDropdown'; import createStore from './createStore'; diff --git a/components/table/__tests__/__snapshots__/Table.filter.test.js.snap b/components/table/__tests__/__snapshots__/Table.filter.test.js.snap index 542bb8bc5..15a4f373f 100644 --- a/components/table/__tests__/__snapshots__/Table.filter.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.filter.test.js.snap @@ -36,22 +36,26 @@ exports[`Table.filter renders filter correctly 1`] = ` - Jack + Jack + - Lucy + Lucy + - Tom + Tom + - Jerry + Jerry + diff --git a/components/table/__tests__/__snapshots__/Table.pagination.test.js.snap b/components/table/__tests__/__snapshots__/Table.pagination.test.js.snap index 6b037f006..a939fabe6 100644 --- a/components/table/__tests__/__snapshots__/Table.pagination.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.pagination.test.js.snap @@ -26,12 +26,14 @@ exports[`Table.pagination renders pagination correctly 1`] = ` - Jack + Jack + - Lucy + Lucy + diff --git a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap index d732cfd74..661262909 100644 --- a/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.rowSelection.test.js.snap @@ -36,37 +36,45 @@ exports[`Table.rowSelection fix selection column on the left 1`] = ` + + - Jack + Jack + + + - Lucy + Lucy + + + - Tom + Tom + + + - Jerry + Jerry + @@ -98,25 +106,29 @@ exports[`Table.rowSelection fix selection column on the left 1`] = ` + + + + + + + + diff --git a/components/table/__tests__/__snapshots__/Table.test.js.snap b/components/table/__tests__/__snapshots__/Table.test.js.snap index 9e3eb0852..0342ca992 100644 --- a/components/table/__tests__/__snapshots__/Table.test.js.snap +++ b/components/table/__tests__/__snapshots__/Table.test.js.snap @@ -36,7 +36,8 @@ exports[`Table align column should not override cell style 1`] = ` - 32 + 32 + @@ -46,7 +47,8 @@ exports[`Table align column should not override cell style 1`] = ` - 42 + 42 + @@ -111,24 +113,30 @@ exports[`Table renders JSX correctly 1`] = ` - John + John + - Brown + Brown + - 32 + 32 + - Jim + Jim + - Green + Green + - 42 + 42 + diff --git a/components/table/__tests__/__snapshots__/demo.test.js.snap b/components/table/__tests__/__snapshots__/demo.test.js.snap index 102a32f32..c78dec546 100644 --- a/components/table/__tests__/__snapshots__/demo.test.js.snap +++ b/components/table/__tests__/__snapshots__/demo.test.js.snap @@ -107,53 +107,68 @@ exports[`renders ./antdv-demo/docs/table/demo/basic.md correctly 1`] = ` - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - NICEDEVELOPER + NICEDEVELOPER + - Invite 一 John BrownDelete More actions + Invite 一 John BrownDelete More actions + - Jim Green + Jim Green + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + - LOSER + LOSER + - Invite 一 Jim GreenDelete More actions + Invite 一 Jim GreenDelete More actions + - Joe Black + Joe Black + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + - COOLTEACHER + COOLTEACHER + - Invite 一 Joe BlackDelete More actions + Invite 一 Joe BlackDelete More actions + @@ -212,35 +227,44 @@ exports[`renders ./antdv-demo/docs/table/demo/bordered.md correctly 1`] = ` - John Brown + John Brown + - ￥300,000.00 + ￥300,000.00 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - Jim Green + Jim Green + - ￥1,256,000.00 + ￥1,256,000.00 + - London No. 1 Lake Park + London No. 1 Lake Park + - Joe Black + Joe Black + - ￥120,000.00 + ￥120,000.00 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + @@ -305,73 +329,93 @@ exports[`renders ./antdv-demo/docs/table/demo/colspan-rowspan.md correctly 1`] = - John Brown + John Brown + - 32 + 32 + - 0571-22098909 + 0571-22098909 + - 18889898989 + 18889898989 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - Jim Green + Jim Green + - 42 + 42 + - 0571-22098333 + 0571-22098333 + - 18889898888 + 18889898888 + - London No. 1 Lake Park + London No. 1 Lake Park + - Joe Black + Joe Black + - 32 + 32 + - 0575-22098909 + 0575-22098909 + - 18900010002 + 18900010002 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + - Jim Red + Jim Red + - 18 + 18 + - 18900010002 + 18900010002 + - London No. 2 Lake Park + London No. 2 Lake Park + - Jake White + Jake White + @@ -434,46 +478,58 @@ exports[`renders ./antdv-demo/docs/table/demo/custom-filter-panel.md correctly 1 - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - Joe Black + Joe Black + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + - Jim Green + Jim Green + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + - Jim Red + Jim Red + - 32 + 32 + - London No. 2 Lake Park + London No. 2 Lake Park + @@ -498,7 +554,8 @@ exports[`renders ./antdv-demo/docs/table/demo/custom-filter-panel.md correctly 1 exports[`renders ./antdv-demo/docs/table/demo/edit-cell.md correctly 1`] = ` + Add +
@@ -541,38 +598,44 @@ exports[`renders ./antdv-demo/docs/table/demo/edit-cell.md correctly 1`] = `
-
Edward King 0
+
Edward King 0
- 32 + 32 + - London, Park Lane no. 0 + London, Park Lane no. 0 + - Delete + Delete +
-
Edward King 1
+
Edward King 1
- 32 + 32 + - London, Park Lane no. 1 + London, Park Lane no. 1 + - Delete + Delete + @@ -933,62 +996,80 @@ exports[`renders ./antdv-demo/docs/table/demo/ellipsis.md correctly 1`] = ` - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park, New York No. 1 Lake Park + New York No. 1 Lake Park, New York No. 1 Lake Park + - New York No. 1 Lake Park, New York No. 1 Lake Park + New York No. 1 Lake Park, New York No. 1 Lake Park + - New York No. 1 Lake Park, New York No. 1 Lake Park + New York No. 1 Lake Park, New York No. 1 Lake Park + - New York No. 1 Lake Park, New York No. 1 Lake Park + New York No. 1 Lake Park, New York No. 1 Lake Park + - Jim Green + Jim Green + - 42 + 42 + - London No. 2 Lake Park, London No. 2 Lake Park + London No. 2 Lake Park, London No. 2 Lake Park + - London No. 2 Lake Park, London No. 2 Lake Park + London No. 2 Lake Park, London No. 2 Lake Park + - London No. 2 Lake Park, London No. 2 Lake Park + London No. 2 Lake Park, London No. 2 Lake Park + - London No. 2 Lake Park, London No. 2 Lake Park + London No. 2 Lake Park, London No. 2 Lake Park + - Joe Black + Joe Black + - 32 + 32 + - Sidney No. 1 Lake Park, Sidney No. 1 Lake Park + Sidney No. 1 Lake Park, Sidney No. 1 Lake Park + - Sidney No. 1 Lake Park, Sidney No. 1 Lake Park + Sidney No. 1 Lake Park, Sidney No. 1 Lake Park + - Sidney No. 1 Lake Park, Sidney No. 1 Lake Park + Sidney No. 1 Lake Park, Sidney No. 1 Lake Park + - Sidney No. 1 Lake Park, Sidney No. 1 Lake Park + Sidney No. 1 Lake Park, Sidney No. 1 Lake Park + @@ -1061,16 +1142,20 @@ exports[`renders ./antdv-demo/docs/table/demo/expand.md correctly 1`] = ` - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - Delete + Delete + @@ -1081,16 +1166,20 @@ exports[`renders ./antdv-demo/docs/table/demo/expand.md correctly 1`] = ` - Jim Green + Jim Green + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + - Delete + Delete + @@ -1101,16 +1190,20 @@ exports[`renders ./antdv-demo/docs/table/demo/expand.md correctly 1`] = ` - Joe Black + Joe Black + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + - Delete + Delete + @@ -1179,7 +1272,8 @@ exports[`renders ./antdv-demo/docs/table/demo/expand-children.md correctly 1`] = + +
@@ -1187,10 +1281,12 @@ exports[`renders ./antdv-demo/docs/table/demo/expand-children.md correctly 1`] = - 60 + 60 + - New York No. 1 Lake Park + New York No. 1 Lake Park + @@ -1203,14 +1299,17 @@ exports[`renders ./antdv-demo/docs/table/demo/expand-children.md correctly 1`] = + + Joe Black - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + @@ -1306,72 +1405,94 @@ exports[`renders ./antdv-demo/docs/table/demo/fixed-columns.md correctly 1`] = ` - John Brown + John Brown + - 32 + 32 + - New York Park + New York Park + - New York Park + New York Park + - New York Park + New York Park + - New York Park + New York Park + - New York Park + New York Park + - New York Park + New York Park + - New York Park + New York Park + - New York Park + New York Park + - action + action + - Jim Green + Jim Green + - 40 + 40 + - London Park + London Park + - London Park + London Park + - London Park + London Park + - London Park + London Park + - London Park + London Park + - London Park + London Park + - London Park + London Park + - London Park + London Park + - action + action + @@ -1404,18 +1525,22 @@ exports[`renders ./antdv-demo/docs/table/demo/fixed-columns.md correctly 1`] = ` - John Brown + John Brown + - 32 + 32 + - Jim Green + Jim Green + - 40 + 40 + @@ -1442,12 +1567,14 @@ exports[`renders ./antdv-demo/docs/table/demo/fixed-columns.md correctly 1`] = ` - action + action + - action + action + @@ -1559,352 +1686,462 @@ exports[`renders ./antdv-demo/docs/table/demo/fixed-columns-header.md correctly - Edrward 0 + Edrward 0 + - 32 + 32 + - London Park no. 0 + London Park no. 0 + - London Park no. 0 + London Park no. 0 + - London Park no. 0 + London Park no. 0 + - London Park no. 0 + London Park no. 0 + - London Park no. 0 + London Park no. 0 + - London Park no. 0 + London Park no. 0 + - London Park no. 0 + London Park no. 0 + - London Park no. 0 + London Park no. 0 + - action + action + - Edrward 1 + Edrward 1 + - 32 + 32 + - London Park no. 1 + London Park no. 1 + - London Park no. 1 + London Park no. 1 + - London Park no. 1 + London Park no. 1 + - London Park no. 1 + London Park no. 1 + - London Park no. 1 + London Park no. 1 + - London Park no. 1 + London Park no. 1 + - London Park no. 1 + London Park no. 1 + - London Park no. 1 + London Park no. 1 + - action + action + - Edrward 2 + Edrward 2 + - 32 + 32 + - London Park no. 2 + London Park no. 2 + - London Park no. 2 + London Park no. 2 + - London Park no. 2 + London Park no. 2 + - London Park no. 2 + London Park no. 2 + - London Park no. 2 + London Park no. 2 + - London Park no. 2 + London Park no. 2 + - London Park no. 2 + London Park no. 2 + - London Park no. 2 + London Park no. 2 + - action + action + - Edrward 3 + Edrward 3 + - 32 + 32 + - London Park no. 3 + London Park no. 3 + - London Park no. 3 + London Park no. 3 + - London Park no. 3 + London Park no. 3 + - London Park no. 3 + London Park no. 3 + - London Park no. 3 + London Park no. 3 + - London Park no. 3 + London Park no. 3 + - London Park no. 3 + London Park no. 3 + - London Park no. 3 + London Park no. 3 + - action + action + - Edrward 4 + Edrward 4 + - 32 + 32 + - London Park no. 4 + London Park no. 4 + - London Park no. 4 + London Park no. 4 + - London Park no. 4 + London Park no. 4 + - London Park no. 4 + London Park no. 4 + - London Park no. 4 + London Park no. 4 + - London Park no. 4 + London Park no. 4 + - London Park no. 4 + London Park no. 4 + - London Park no. 4 + London Park no. 4 + - action + action + - Edrward 5 + Edrward 5 + - 32 + 32 + - London Park no. 5 + London Park no. 5 + - London Park no. 5 + London Park no. 5 + - London Park no. 5 + London Park no. 5 + - London Park no. 5 + London Park no. 5 + - London Park no. 5 + London Park no. 5 + - London Park no. 5 + London Park no. 5 + - London Park no. 5 + London Park no. 5 + - London Park no. 5 + London Park no. 5 + - action + action + - Edrward 6 + Edrward 6 + - 32 + 32 + - London Park no. 6 + London Park no. 6 + - London Park no. 6 + London Park no. 6 + - London Park no. 6 + London Park no. 6 + - London Park no. 6 + London Park no. 6 + - London Park no. 6 + London Park no. 6 + - London Park no. 6 + London Park no. 6 + - London Park no. 6 + London Park no. 6 + - London Park no. 6 + London Park no. 6 + - action + action + - Edrward 7 + Edrward 7 + - 32 + 32 + - London Park no. 7 + London Park no. 7 + - London Park no. 7 + London Park no. 7 + - London Park no. 7 + London Park no. 7 + - London Park no. 7 + London Park no. 7 + - London Park no. 7 + London Park no. 7 + - London Park no. 7 + London Park no. 7 + - London Park no. 7 + London Park no. 7 + - London Park no. 7 + London Park no. 7 + - action + action + - Edrward 8 + Edrward 8 + - 32 + 32 + - London Park no. 8 + London Park no. 8 + - London Park no. 8 + London Park no. 8 + - London Park no. 8 + London Park no. 8 + - London Park no. 8 + London Park no. 8 + - London Park no. 8 + London Park no. 8 + - London Park no. 8 + London Park no. 8 + - London Park no. 8 + London Park no. 8 + - London Park no. 8 + London Park no. 8 + - action + action + - Edrward 9 + Edrward 9 + - 32 + 32 + - London Park no. 9 + London Park no. 9 + - London Park no. 9 + London Park no. 9 + - London Park no. 9 + London Park no. 9 + - London Park no. 9 + London Park no. 9 + - London Park no. 9 + London Park no. 9 + - London Park no. 9 + London Park no. 9 + - London Park no. 9 + London Park no. 9 + - London Park no. 9 + London Park no. 9 + - action + action + @@ -1946,82 +2183,102 @@ exports[`renders ./antdv-demo/docs/table/demo/fixed-columns-header.md correctly - Edrward 0 + Edrward 0 + - 32 + 32 + - Edrward 1 + Edrward 1 + - 32 + 32 + - Edrward 2 + Edrward 2 + - 32 + 32 + - Edrward 3 + Edrward 3 + - 32 + 32 + - Edrward 4 + Edrward 4 + - 32 + 32 + - Edrward 5 + Edrward 5 + - 32 + 32 + - Edrward 6 + Edrward 6 + - 32 + 32 + - Edrward 7 + Edrward 7 + - 32 + 32 + - Edrward 8 + Edrward 8 + - 32 + 32 + - Edrward 9 + Edrward 9 + - 32 + 32 + @@ -2056,52 +2313,62 @@ exports[`renders ./antdv-demo/docs/table/demo/fixed-columns-header.md correctly - action + action + - action + action + - action + action + - action + action + - action + action + - action + action + - action + action + - action + action + - action + action + - action + action + @@ -2177,552 +2444,702 @@ exports[`renders ./antdv-demo/docs/table/demo/fixed-header.md correctly 1`] = ` - Edward King 0 + Edward King 0 + - 32 + 32 + - London, Park Lane no. 0 + London, Park Lane no. 0 + - Edward King 1 + Edward King 1 + - 32 + 32 + - London, Park Lane no. 1 + London, Park Lane no. 1 + - Edward King 2 + Edward King 2 + - 32 + 32 + - London, Park Lane no. 2 + London, Park Lane no. 2 + - Edward King 3 + Edward King 3 + - 32 + 32 + - London, Park Lane no. 3 + London, Park Lane no. 3 + - Edward King 4 + Edward King 4 + - 32 + 32 + - London, Park Lane no. 4 + London, Park Lane no. 4 + - Edward King 5 + Edward King 5 + - 32 + 32 + - London, Park Lane no. 5 + London, Park Lane no. 5 + - Edward King 6 + Edward King 6 + - 32 + 32 + - London, Park Lane no. 6 + London, Park Lane no. 6 + - Edward King 7 + Edward King 7 + - 32 + 32 + - London, Park Lane no. 7 + London, Park Lane no. 7 + - Edward King 8 + Edward King 8 + - 32 + 32 + - London, Park Lane no. 8 + London, Park Lane no. 8 + - Edward King 9 + Edward King 9 + - 32 + 32 + - London, Park Lane no. 9 + London, Park Lane no. 9 + - Edward King 10 + Edward King 10 + - 32 + 32 + - London, Park Lane no. 10 + London, Park Lane no. 10 + - Edward King 11 + Edward King 11 + - 32 + 32 + - London, Park Lane no. 11 + London, Park Lane no. 11 + - Edward King 12 + Edward King 12 + - 32 + 32 + - London, Park Lane no. 12 + London, Park Lane no. 12 + - Edward King 13 + Edward King 13 + - 32 + 32 + - London, Park Lane no. 13 + London, Park Lane no. 13 + - Edward King 14 + Edward King 14 + - 32 + 32 + - London, Park Lane no. 14 + London, Park Lane no. 14 + - Edward King 15 + Edward King 15 + - 32 + 32 + - London, Park Lane no. 15 + London, Park Lane no. 15 + - Edward King 16 + Edward King 16 + - 32 + 32 + - London, Park Lane no. 16 + London, Park Lane no. 16 + - Edward King 17 + Edward King 17 + - 32 + 32 + - London, Park Lane no. 17 + London, Park Lane no. 17 + - Edward King 18 + Edward King 18 + - 32 + 32 + - London, Park Lane no. 18 + London, Park Lane no. 18 + - Edward King 19 + Edward King 19 + - 32 + 32 + - London, Park Lane no. 19 + London, Park Lane no. 19 + - Edward King 20 + Edward King 20 + - 32 + 32 + - London, Park Lane no. 20 + London, Park Lane no. 20 + - Edward King 21 + Edward King 21 + - 32 + 32 + - London, Park Lane no. 21 + London, Park Lane no. 21 + - Edward King 22 + Edward King 22 + - 32 + 32 + - London, Park Lane no. 22 + London, Park Lane no. 22 + - Edward King 23 + Edward King 23 + - 32 + 32 + - London, Park Lane no. 23 + London, Park Lane no. 23 + - Edward King 24 + Edward King 24 + - 32 + 32 + - London, Park Lane no. 24 + London, Park Lane no. 24 + - Edward King 25 + Edward King 25 + - 32 + 32 + - London, Park Lane no. 25 + London, Park Lane no. 25 + - Edward King 26 + Edward King 26 + - 32 + 32 + - London, Park Lane no. 26 + London, Park Lane no. 26 + - Edward King 27 + Edward King 27 + - 32 + 32 + - London, Park Lane no. 27 + London, Park Lane no. 27 + - Edward King 28 + Edward King 28 + - 32 + 32 + - London, Park Lane no. 28 + London, Park Lane no. 28 + - Edward King 29 + Edward King 29 + - 32 + 32 + - London, Park Lane no. 29 + London, Park Lane no. 29 + - Edward King 30 + Edward King 30 + - 32 + 32 + - London, Park Lane no. 30 + London, Park Lane no. 30 + - Edward King 31 + Edward King 31 + - 32 + 32 + - London, Park Lane no. 31 + London, Park Lane no. 31 + - Edward King 32 + Edward King 32 + - 32 + 32 + - London, Park Lane no. 32 + London, Park Lane no. 32 + - Edward King 33 + Edward King 33 + - 32 + 32 + - London, Park Lane no. 33 + London, Park Lane no. 33 + - Edward King 34 + Edward King 34 + - 32 + 32 + - London, Park Lane no. 34 + London, Park Lane no. 34 + - Edward King 35 + Edward King 35 + - 32 + 32 + - London, Park Lane no. 35 + London, Park Lane no. 35 + - Edward King 36 + Edward King 36 + - 32 + 32 + - London, Park Lane no. 36 + London, Park Lane no. 36 + - Edward King 37 + Edward King 37 + - 32 + 32 + - London, Park Lane no. 37 + London, Park Lane no. 37 + - Edward King 38 + Edward King 38 + - 32 + 32 + - London, Park Lane no. 38 + London, Park Lane no. 38 + - Edward King 39 + Edward King 39 + - 32 + 32 + - London, Park Lane no. 39 + London, Park Lane no. 39 + - Edward King 40 + Edward King 40 + - 32 + 32 + - London, Park Lane no. 40 + London, Park Lane no. 40 + - Edward King 41 + Edward King 41 + - 32 + 32 + - London, Park Lane no. 41 + London, Park Lane no. 41 + - Edward King 42 + Edward King 42 + - 32 + 32 + - London, Park Lane no. 42 + London, Park Lane no. 42 + - Edward King 43 + Edward King 43 + - 32 + 32 + - London, Park Lane no. 43 + London, Park Lane no. 43 + - Edward King 44 + Edward King 44 + - 32 + 32 + - London, Park Lane no. 44 + London, Park Lane no. 44 + - Edward King 45 + Edward King 45 + - 32 + 32 + - London, Park Lane no. 45 + London, Park Lane no. 45 + - Edward King 46 + Edward King 46 + - 32 + 32 + - London, Park Lane no. 46 + London, Park Lane no. 46 + - Edward King 47 + Edward King 47 + - 32 + 32 + - London, Park Lane no. 47 + London, Park Lane no. 47 + - Edward King 48 + Edward King 48 + - 32 + 32 + - London, Park Lane no. 48 + London, Park Lane no. 48 + - Edward King 49 + Edward King 49 + - 32 + 32 + - London, Park Lane no. 49 + London, Park Lane no. 49 + @@ -2841,262 +3258,342 @@ exports[`renders ./antdv-demo/docs/table/demo/grouping-columns.md correctly 1`] - John Brown + John Brown + - 1 + 1 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 2 + 2 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 3 + 3 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 4 + 4 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 5 + 5 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 6 + 6 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 7 + 7 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 8 + 8 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 9 + 9 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + - John Brown + John Brown + - 10 + 10 + - Lake Park + Lake Park + - C + C + - 2035 + 2035 + - Lake Street 42 + Lake Street 42 + - SoftLake Co + SoftLake Co + - M + M + @@ -3132,52 +3629,62 @@ exports[`renders ./antdv-demo/docs/table/demo/grouping-columns.md correctly 1`] - John Brown + John Brown + - John Brown + John Brown + - John Brown + John Brown + - John Brown + John Brown + - John Brown + John Brown + - John Brown + John Brown + - John Brown + John Brown + - John Brown + John Brown + - John Brown + John Brown + - John Brown + John Brown + @@ -3212,52 +3719,62 @@ exports[`renders ./antdv-demo/docs/table/demo/grouping-columns.md correctly 1`] - M + M + - M + M + - M + M + - M + M + - M + M + - M + M + - M + M + - M + M + - M + M + - M + M + @@ -3325,46 +3842,58 @@ exports[`renders ./antdv-demo/docs/table/demo/head.md correctly 1`] = ` - Jim Green + Jim Green + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - Joe Black + Joe Black + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + - Jim Red + Jim Red + - 32 + 32 + - London No. 2 Lake Park + London No. 2 Lake Park + @@ -3451,25 +3980,32 @@ exports[`renders ./antdv-demo/docs/table/demo/nested-table.md correctly 1`] = ` - Screem + Screem + - iOS + iOS + - 10.3.4.5654 + 10.3.4.5654 + - 500 + 500 + - Jack + Jack + - 2014-12-24 23:12:00 + 2014-12-24 23:12:00 + - Publish + Publish + @@ -3480,25 +4016,32 @@ exports[`renders ./antdv-demo/docs/table/demo/nested-table.md correctly 1`] = ` - Screem + Screem + - iOS + iOS + - 10.3.4.5654 + 10.3.4.5654 + - 500 + 500 + - Jack + Jack + - 2014-12-24 23:12:00 + 2014-12-24 23:12:00 + - Publish + Publish + @@ -3509,25 +4052,32 @@ exports[`renders ./antdv-demo/docs/table/demo/nested-table.md correctly 1`] = ` - Screem + Screem + - iOS + iOS + - 10.3.4.5654 + 10.3.4.5654 + - 500 + 500 + - Jack + Jack + - 2014-12-24 23:12:00 + 2014-12-24 23:12:00 + - Publish + Publish + @@ -3554,9 +4104,12 @@ exports[`renders ./antdv-demo/docs/table/demo/nested-table.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/table/demo/reset-filter.md correctly 1`] = `
+ Sort age +
@@ -3595,46 +4148,58 @@ exports[`renders ./antdv-demo/docs/table/demo/reset-filter.md correctly 1`] = ` - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - Jim Green + Jim Green + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + - Joe Black + Joe Black + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + - Jim Red + Jim Red + - 32 + 32 + - London No. 2 Lake Park + London No. 2 Lake Park + @@ -3703,61 +4268,77 @@ exports[`renders ./antdv-demo/docs/table/demo/row-selection.md correctly 1`] = ` + + - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + + + - Jim Green + Jim Green + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + + + - Joe Black + Joe Black + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + + + - Disabled User + Disabled User + - 99 + 99 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + @@ -3783,7 +4364,8 @@ exports[`renders ./antdv-demo/docs/table/demo/row-selection.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/table/demo/row-selection-and-operation.md correctly 1`] = `
+ Reload +
@@ -3828,151 +4410,191 @@ exports[`renders ./antdv-demo/docs/table/demo/row-selection-and-operation.md cor + + - Edward King 0 + Edward King 0 + - 32 + 32 + - London, Park Lane no. 0 + London, Park Lane no. 0 + + + - Edward King 1 + Edward King 1 + - 32 + 32 + - London, Park Lane no. 1 + London, Park Lane no. 1 + + + - Edward King 2 + Edward King 2 + - 32 + 32 + - London, Park Lane no. 2 + London, Park Lane no. 2 + + + - Edward King 3 + Edward King 3 + - 32 + 32 + - London, Park Lane no. 3 + London, Park Lane no. 3 + + + - Edward King 4 + Edward King 4 + - 32 + 32 + - London, Park Lane no. 4 + London, Park Lane no. 4 + + + - Edward King 5 + Edward King 5 + - 32 + 32 + - London, Park Lane no. 5 + London, Park Lane no. 5 + + + - Edward King 6 + Edward King 6 + - 32 + 32 + - London, Park Lane no. 6 + London, Park Lane no. 6 + + + - Edward King 7 + Edward King 7 + - 32 + 32 + - London, Park Lane no. 7 + London, Park Lane no. 7 + + + - Edward King 8 + Edward King 8 + - 32 + 32 + - London, Park Lane no. 8 + London, Park Lane no. 8 + + + - Edward King 9 + Edward King 9 + - 32 + 32 + - London, Park Lane no. 9 + London, Park Lane no. 9 + @@ -4046,151 +4668,191 @@ exports[`renders ./antdv-demo/docs/table/demo/row-selection-custom.md correctly + + - Edward King 0 + Edward King 0 + - 32 + 32 + - London, Park Lane no. 0 + London, Park Lane no. 0 + + + - Edward King 1 + Edward King 1 + - 32 + 32 + - London, Park Lane no. 1 + London, Park Lane no. 1 + + + - Edward King 2 + Edward King 2 + - 32 + 32 + - London, Park Lane no. 2 + London, Park Lane no. 2 + + + - Edward King 3 + Edward King 3 + - 32 + 32 + - London, Park Lane no. 3 + London, Park Lane no. 3 + + + - Edward King 4 + Edward King 4 + - 32 + 32 + - London, Park Lane no. 4 + London, Park Lane no. 4 + + + - Edward King 5 + Edward King 5 + - 32 + 32 + - London, Park Lane no. 5 + London, Park Lane no. 5 + + + - Edward King 6 + Edward King 6 + - 32 + 32 + - London, Park Lane no. 6 + London, Park Lane no. 6 + + + - Edward King 7 + Edward King 7 + - 32 + 32 + - London, Park Lane no. 7 + London, Park Lane no. 7 + + + - Edward King 8 + Edward King 8 + - 32 + 32 + - London, Park Lane no. 8 + London, Park Lane no. 8 + + + - Edward King 9 + Edward King 9 + - 32 + 32 + - London, Park Lane no. 9 + London, Park Lane no. 9 + @@ -4255,35 +4917,44 @@ exports[`renders ./antdv-demo/docs/table/demo/size.md correctly 1`] = ` - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - Jim Green + Jim Green + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + - Joe Black + Joe Black + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + @@ -4340,35 +5011,44 @@ exports[`renders ./antdv-demo/docs/table/demo/size.md correctly 1`] = ` - John Brown + John Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - Jim Green + Jim Green + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + - Joe Black + Joe Black + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + @@ -4448,62 +5128,80 @@ exports[`renders ./antdv-demo/docs/table/demo/template.md correctly 1`] = ` - John + John + - Brown + Brown + - 32 + 32 + - New York No. 1 Lake Park + New York No. 1 Lake Park + - nicedeveloper + nicedeveloper + - Action 一 JohnDelete + Action 一 JohnDelete + - Jim + Jim + - Green + Green + - 42 + 42 + - London No. 1 Lake Park + London No. 1 Lake Park + - loser + loser + - Action 一 JimDelete + Action 一 JimDelete + - Joe + Joe + - Black + Black + - 32 + 32 + - Sidney No. 1 Lake Park + Sidney No. 1 Lake Park + - coolteacher + coolteacher + - Action 一 JoeDelete + Action 一 JoeDelete + diff --git a/components/table/filterDropdown.jsx b/components/table/filterDropdown.jsx index 4d98921a9..5e4723115 100755 --- a/components/table/filterDropdown.jsx +++ b/components/table/filterDropdown.jsx @@ -1,7 +1,7 @@ import FilterFilled from '@ant-design/icons-vue/FilterFilled'; import Menu, { SubMenu, Item as MenuItem } from '../vc-menu'; import closest from 'dom-closest'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import shallowequal from '../_util/shallowequal'; import Dropdown from '../dropdown'; import Checkbox from '../checkbox'; @@ -53,59 +53,6 @@ export default { ); return state; }, - // data() { - // this.neverShown = false; - // const visible = - // 'filterDropdownVisible' in this.column ? this.column.filterDropdownVisible : false; - // this.preProps = { ...getOptionProps(this) }; - // return { - // sSelectedKeys: this.selectedKeys, - // sKeyPathOfSelectedItem: {}, // 记录所有有选中子菜单的祖先菜单 - // sVisible: visible, - // sValueKeys: generateValueMaps(this.column.filters), - // }; - // }, - watch: { - // _propsSymbol: syncWatch(function() { - // const nextProps = getOptionProps(this); - // const { column } = nextProps; - // const newState = {}; - // /** - // * if the state is visible the component should ignore updates on selectedKeys prop to avoid - // * that the user selection is lost - // * this happens frequently when a table is connected on some sort of realtime data - // * Fixes https://github.com/ant-design/ant-design/issues/10289 and - // * https://github.com/ant-design/ant-design/issues/10209 - // */ - // if ( - // 'selectedKeys' in nextProps && - // !shallowequal(this.preProps.selectedKeys, nextProps.selectedKeys) - // ) { - // newState.sSelectedKeys = nextProps.selectedKeys; - // } - // if (!shallowequal((this.preProps.column || {}).filters, (nextProps.column || {}).filters)) { - // newState.sValueKeys = generateValueMaps(nextProps.column.filters); - // } - // if ('filterDropdownVisible' in column) { - // newState.sVisible = column.filterDropdownVisible; - // } - // if (Object.keys(newState).length > 0) { - // this.setState(newState); - // } - // this.preProps = { ...nextProps }; - // }), - // 'column.fixed': function (val) { - // this.setNeverShown(this.column) - // }, - // column (val) { - // if ('filterDropdownVisible' in val) { - // this.sVisible = val.filterDropdownVisible - // } - // }, - // selectedKeys (val) { - // this.sSelectedKeys = val - // }, - }, mounted() { const { column } = this; diff --git a/components/table/interface.js b/components/table/interface.js index f41294466..a58c2132a 100644 --- a/components/table/interface.js +++ b/components/table/interface.js @@ -195,7 +195,6 @@ export const SelectionBoxProps = { // } export const FilterMenuProps = { - _propsSymbol: PropTypes.any, locale: TableLocale, selectedKeys: PropTypes.arrayOf([PropTypes.string, PropTypes.number]), column: PropTypes.object, diff --git a/components/tabs/__tests__/__snapshots__/demo.test.js.snap b/components/tabs/__tests__/__snapshots__/demo.test.js.snap index b479497c2..b1f4b3018 100644 --- a/components/tabs/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tabs/__tests__/__snapshots__/demo.test.js.snap @@ -124,7 +124,8 @@ exports[`renders ./antdv-demo/docs/tabs/demo/card-top.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/tabs/demo/custom-add-trigger.md correctly 1`] = `
+ ADD +
@@ -242,7 +243,8 @@ exports[`renders ./antdv-demo/docs/tabs/demo/editable-card.md correctly 1`] = `
-
+ +
@@ -290,7 +292,8 @@ exports[`renders ./antdv-demo/docs/tabs/demo/extra.md correctly 1`] = `
+ Extra Action +
diff --git a/components/tabs/tabs.jsx b/components/tabs/tabs.jsx index 24963b25c..47a78a840 100644 --- a/components/tabs/tabs.jsx +++ b/components/tabs/tabs.jsx @@ -172,6 +172,6 @@ export default { onChange: this.handleChange, class: cls, }; - return ; + return ; }, }; diff --git a/components/tag/__tests__/__snapshots__/demo.test.js.snap b/components/tag/__tests__/__snapshots__/demo.test.js.snap index db4c9e786..bbf95251a 100644 --- a/components/tag/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tag/__tests__/__snapshots__/demo.test.js.snap @@ -22,12 +22,14 @@ exports[`renders ./antdv-demo/docs/tag/demo/colorful.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/tag/demo/control.md correctly 1`] = `
UnremovableTag 2 Tag 3Tag 3Tag 3Tag 3... New Tag -
+ +
`; exports[`renders ./antdv-demo/docs/tag/demo/controlled.md correctly 1`] = `
Movies
+ Toggle +
`; exports[`renders ./antdv-demo/docs/tag/demo/hot-tags.md correctly 1`] = ` diff --git a/components/time-picker/__tests__/__snapshots__/demo.test.js.snap b/components/time-picker/__tests__/__snapshots__/demo.test.js.snap index a1116daad..65f4f07af 100644 --- a/components/time-picker/__tests__/__snapshots__/demo.test.js.snap +++ b/components/time-picker/__tests__/__snapshots__/demo.test.js.snap @@ -7,7 +7,8 @@ exports[`renders ./antdv-demo/docs/time-picker/demo/12hours.md correctly 1`] = ` -
+ +
`; exports[`renders ./antdv-demo/docs/time-picker/demo/addon.md correctly 1`] = ` @@ -15,7 +16,8 @@ exports[`renders ./antdv-demo/docs/time-picker/demo/addon.md correctly 1`] = ` -
+ +
`; exports[`renders ./antdv-demo/docs/time-picker/demo/basic.md correctly 1`] = ` @@ -39,7 +41,8 @@ exports[`renders ./antdv-demo/docs/time-picker/demo/size.md correctly 1`] = `
-
+ +
`; exports[`renders ./antdv-demo/docs/time-picker/demo/suffix.md correctly 1`] = ` diff --git a/components/timeline/Timeline.jsx b/components/timeline/Timeline.jsx index 65e886639..7dab2fd33 100644 --- a/components/timeline/Timeline.jsx +++ b/components/timeline/Timeline.jsx @@ -1,5 +1,5 @@ import { inject, cloneVNode } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import { getOptionProps, diff --git a/components/timeline/TimelineItem.jsx b/components/timeline/TimelineItem.jsx index ad8e8920a..fee9d95bd 100644 --- a/components/timeline/TimelineItem.jsx +++ b/components/timeline/TimelineItem.jsx @@ -1,5 +1,5 @@ import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import { getOptionProps, initDefaultProps, getComponent } from '../_util/props-util'; import { ConfigConsumerProps } from '../config-provider'; diff --git a/components/timeline/__tests__/__snapshots__/demo.test.js.snap b/components/timeline/__tests__/__snapshots__/demo.test.js.snap index 92dd83ebb..ffec12534 100644 --- a/components/timeline/__tests__/__snapshots__/demo.test.js.snap +++ b/components/timeline/__tests__/__snapshots__/demo.test.js.snap @@ -200,7 +200,8 @@ exports[`renders ./antdv-demo/docs/timeline/demo/pending.md correctly 1`] = `
Recording...
+ Toggle Reverse +
`; diff --git a/components/tooltip/Tooltip.jsx b/components/tooltip/Tooltip.jsx index 59c098035..9d2fb35b4 100644 --- a/components/tooltip/Tooltip.jsx +++ b/components/tooltip/Tooltip.jsx @@ -1,6 +1,6 @@ import { inject } from 'vue'; import VcTooltip from '../vc-tooltip'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import getPlacements from './placements'; import PropTypes from '../_util/vue-types'; import { diff --git a/components/tooltip/__tests__/__snapshots__/demo.test.js.snap b/components/tooltip/__tests__/__snapshots__/demo.test.js.snap index c6e84dcf0..5e0344fc9 100644 --- a/components/tooltip/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tooltip/__tests__/__snapshots__/demo.test.js.snap @@ -3,17 +3,23 @@ exports[`renders ./antdv-demo/docs/tooltip/demo/arrow-point-at-center.md correctly 1`] = `
+ Align edge / 边缘对齐 +
+ Arrow points to center / 箭头指向中心 + +
`; exports[`renders ./antdv-demo/docs/tooltip/demo/auto-adjust-overflow.md correctly 1`] = `

+ Adjust automatically / 自动调整 +
+ Ingore / 不处理 + +
`; exports[`renders ./antdv-demo/docs/tooltip/demo/basic.md correctly 1`] = ` Tooltip will show when mouse enter. `; @@ -22,31 +28,47 @@ exports[`renders ./antdv-demo/docs/tooltip/demo/placement.md correctly 1`] = `
+ TL + + Top +
+ TR + +
+ LT + + Left +
+ LB + +
+ RT + + Right +
+ RB + +
+ BL + + Bottom +
+ BR + +
`; diff --git a/components/transfer/ListItem.jsx b/components/transfer/ListItem.jsx index d084c4ff6..ec7da984b 100644 --- a/components/transfer/ListItem.jsx +++ b/components/transfer/ListItem.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import Lazyload from '../vc-lazy-load'; import Checkbox from '../checkbox'; @@ -56,11 +56,7 @@ export default { debounce: false, ...lazy, }; - children = ( - - {listItem} - - ); + children = {listItem}; } else { children = listItem; } diff --git a/components/transfer/__tests__/__snapshots__/demo.test.js.snap b/components/transfer/__tests__/__snapshots__/demo.test.js.snap index 1e88f31ad..9a0218622 100644 --- a/components/transfer/__tests__/__snapshots__/demo.test.js.snap +++ b/components/transfer/__tests__/__snapshots__/demo.test.js.snap @@ -4,7 +4,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/advanced.md correctly 1`] = `
20 items
+ + 20 items
@@ -73,12 +74,14 @@ exports[`renders ./antdv-demo/docs/transfer/demo/advanced.md correctly 1`] = `
+ reload +
0 item
+ + 0 item
@@ -86,7 +89,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/advanced.md correctly 1`] = `
没数据
+ reload +
`; @@ -96,7 +100,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/basic.md correctly 1`] = `
2/14 itemsSource
+ + 2/14 itemsSource
    @@ -149,7 +154,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/basic.md correctly 1`] = `
    6 itemsTarget
    + + 6 itemsTarget
      @@ -176,7 +182,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/basic.md correctly 1`] = `
+ enabled +
`; @@ -184,7 +191,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/custom-item.md correctly 1`] =
20 items
+ + 20 items
    @@ -255,7 +263,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/custom-item.md correctly 1`] =
    0 item
    + + 0 item
    @@ -283,7 +292,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/large-data.md correctly 1`] = `
    2000 items
    + + 2000 items
    @@ -6296,7 +6306,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/large-data.md correctly 1`] = `
    0 item
    + + 0 item
    @@ -6326,7 +6337,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/search.md correctly 1`] = `
    20 items
    + + 20 items
    @@ -6399,7 +6411,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/search.md correctly 1`] = `
    0 item
    + + 0 item
    @@ -6430,7 +6443,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/table-transfer.md correctly 1`]
    - 14 items
    + 14 items +
    @@ -6473,121 +6487,151 @@ exports[`renders ./antdv-demo/docs/transfer/demo/table-transfer.md correctly 1`] + + - content1 + content1 + - description of content1 + description of content1 + + + - content2 + content2 + - description of content2 + description of content2 + + + - content4 + content4 + - description of content4 + description of content4 + + + - content5 + content5 + - description of content5 + description of content5 + + + - content7 + content7 + - description of content7 + description of content7 + + + - content8 + content8 + - description of content8 + description of content8 + + + - content10 + content10 + - description of content10 + description of content10 + + + - content11 + content11 + - description of content11 + description of content11 + + + - content13 + content13 + - description of content13 + description of content13 + + + - content14 + content14 + - description of content14 + description of content14 + @@ -6616,7 +6660,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/table-transfer.md correctly 1`]
    - 6 items
    + 6 items +
    @@ -6654,55 +6699,67 @@ exports[`renders ./antdv-demo/docs/transfer/demo/table-transfer.md correctly 1`] + + - content3 + content3 + + + - content6 + content6 + + + - content9 + content9 + + + - content12 + content12 + + + - content15 + content15 + + + - content18 + content18 + @@ -6728,8 +6785,10 @@ exports[`renders ./antdv-demo/docs/transfer/demo/table-transfer.md correctly 1`]
    + disabled +
    `; exports[`renders ./antdv-demo/docs/transfer/demo/tree-transfer.md correctly 1`] = ` @@ -6737,7 +6796,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/tree-transfer.md correctly 1`]
    - 5 items
    + 5 items +
    @@ -6766,7 +6826,8 @@ exports[`renders ./antdv-demo/docs/transfer/demo/tree-transfer.md correctly 1`]
    - 0 item
    + 0 item +
    diff --git a/components/transfer/__tests__/__snapshots__/index.test.js.snap b/components/transfer/__tests__/__snapshots__/index.test.js.snap index fee82d21b..a649545a6 100644 --- a/components/transfer/__tests__/__snapshots__/index.test.js.snap +++ b/components/transfer/__tests__/__snapshots__/index.test.js.snap @@ -4,14 +4,17 @@ exports[`Transfer should render correctly 1`] = `
    1/2 items
    + + 1/2 items
      • + +
      • + +
    @@ -19,12 +22,14 @@ exports[`Transfer should render correctly 1`] = `
    1 item
    + + 1 item
      • + +
    @@ -36,12 +41,14 @@ exports[`Transfer should show sorted targetkey 1`] = `
    1 item
    + + 1 item
    • a
      • + + a
    @@ -49,14 +56,17 @@ exports[`Transfer should show sorted targetkey 1`] = `
    2 items
    + + 2 items
    • c
      • + + c
    • b
      • + + b
    diff --git a/components/transfer/__tests__/__snapshots__/list.test.js.snap b/components/transfer/__tests__/__snapshots__/list.test.js.snap index 7ace6cc03..0cab55dcd 100644 --- a/components/transfer/__tests__/__snapshots__/list.test.js.snap +++ b/components/transfer/__tests__/__snapshots__/list.test.js.snap @@ -3,16 +3,20 @@ exports[`List should render correctly 1`] = `
    1/3
    + + 1/3
      • + +
      • + +
      • + +
    diff --git a/components/transfer/index.jsx b/components/transfer/index.jsx index 95e799a8e..caa841453 100644 --- a/components/transfer/index.jsx +++ b/components/transfer/index.jsx @@ -2,7 +2,7 @@ import { inject } from 'vue'; import PropTypes from '../_util/vue-types'; import { hasProp, initDefaultProps, getOptionProps, getComponent } from '../_util/props-util'; import BaseMixin from '../_util/BaseMixin'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import List from './list'; import Operation from './operation'; import LocaleReceiver from '../locale-provider/LocaleReceiver'; diff --git a/components/transfer/list.jsx b/components/transfer/list.jsx index 83d236647..e8a41131a 100644 --- a/components/transfer/list.jsx +++ b/components/transfer/list.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import { isValidElement, diff --git a/components/tree-select/__tests__/__snapshots__/demo.test.js.snap b/components/tree-select/__tests__/__snapshots__/demo.test.js.snap index d6da2ad7c..51bd50046 100644 --- a/components/tree-select/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tree-select/__tests__/__snapshots__/demo.test.js.snap @@ -15,7 +15,8 @@ exports[`renders ./antdv-demo/docs/tree-select/demo/basic.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/tree-select/demo/checkable.md correctly 1`] = `
    •   -
      • + +
    diff --git a/components/tree-select/index.jsx b/components/tree-select/index.jsx index 7f003d4f5..66069d14e 100644 --- a/components/tree-select/index.jsx +++ b/components/tree-select/index.jsx @@ -1,6 +1,6 @@ import VcTreeSelect, { TreeNode, SHOW_ALL, SHOW_PARENT, SHOW_CHILD } from '../vc-tree-select'; import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { TreeSelectProps } from './interface'; import warning from '../_util/warning'; import { initDefaultProps, getOptionProps, getComponent, getSlot } from '../_util/props-util'; @@ -13,12 +13,9 @@ import DownOutlined from '@ant-design/icons-vue/DownOutlined'; import CloseOutlined from '@ant-design/icons-vue/CloseOutlined'; import CloseCircleOutlined from '@ant-design/icons-vue/CloseCircleOutlined'; import omit from 'omit.js'; -const ATreeSelectNode = function ATreeSelectNode(props, ctx) { - return TreeNode(props, ctx); -}; -Object.keys(TreeNode).forEach(key => (ATreeSelectNode[key] = TreeNode[key])); + const TreeSelect = { - TreeNode: ATreeSelectNode, + TreeNode, SHOW_ALL, SHOW_PARENT, SHOW_CHILD, @@ -195,7 +192,7 @@ const TreeSelect = { ); }, @@ -204,7 +201,7 @@ const TreeSelect = { /* istanbul ignore next */ TreeSelect.install = function(app) { app.component(TreeSelect.name, TreeSelect); - app.component(TreeSelect.TreeNode.name, TreeSelect.TreeNode); + app.component('ATreeSelectNode', TreeSelect.TreeNode); }; export default TreeSelect; diff --git a/components/tree/DirectoryTree.jsx b/components/tree/DirectoryTree.jsx index f0ae19112..deed450a4 100644 --- a/components/tree/DirectoryTree.jsx +++ b/components/tree/DirectoryTree.jsx @@ -1,11 +1,11 @@ import { inject } from 'vue'; import omit from 'omit.js'; -import debounce from 'lodash/debounce'; +import debounce from 'lodash-es/debounce'; import FolderOpenOutlined from '@ant-design/icons-vue/FolderOpenOutlined'; import FolderOutlined from '@ant-design/icons-vue/FolderOutlined'; import FileOutlined from '@ant-design/icons-vue/FileOutlined'; import PropTypes from '../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { conductExpandParent, convertTreeToEntities } from '../vc-tree/src/util'; import Tree, { TreeProps } from './Tree'; import { diff --git a/components/tree/Tree.jsx b/components/tree/Tree.jsx index 245a26fe9..ef301c293 100644 --- a/components/tree/Tree.jsx +++ b/components/tree/Tree.jsx @@ -1,17 +1,18 @@ import { inject } from 'vue'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import LoadingOutlined from '@ant-design/icons-vue/LoadingOutlined'; import FileOutlined from '@ant-design/icons-vue/FileOutlined'; import CaretDownFilled from '@ant-design/icons-vue/CaretDownFilled'; import MinusSquareOutlined from '@ant-design/icons-vue/MinusSquareOutlined'; import PlusSquareOutlined from '@ant-design/icons-vue/PlusSquareOutlined'; -import { Tree as VcTree, TreeNode } from '../vc-tree'; +import VcTree from '../vc-tree'; import animation from '../_util/openAnimation'; import PropTypes from '../_util/vue-types'; import { initDefaultProps, getOptionProps, getComponent, getSlot } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; import { ConfigConsumerProps } from '../config-provider'; +const TreeNode = VcTree.TreeNode; function TreeProps() { return { showLine: PropTypes.bool, @@ -219,6 +220,6 @@ export default { if (treeData) { vcTreeProps.treeData = treeData; } - return ; + return ; }, }; diff --git a/components/tree/__tests__/__snapshots__/demo.test.js.snap b/components/tree/__tests__/__snapshots__/demo.test.js.snap index 3dcaa668e..6cde7ec13 100644 --- a/components/tree/__tests__/__snapshots__/demo.test.js.snap +++ b/components/tree/__tests__/__snapshots__/demo.test.js.snap @@ -15,7 +15,7 @@ exports[`renders ./antdv-demo/docs/tree/demo/basic.md correctly 1`] = `
  • parent 1-1 -
      +
      • sss
        • @@ -182,8 +182,10 @@ exports[`renders ./antdv-demo/docs/tree/demo/dynamic.md correctly 1`] = ` exports[`renders ./antdv-demo/docs/tree/demo/line.md correctly 1`] = `
        showLine:

        showIcon:
        + +

        showIcon:
        • parent 1 @@ -207,7 +209,7 @@ exports[`renders ./antdv-demo/docs/tree/demo/line.md correctly 1`] = `
        • parent 1-1 -
            +
            • leaf @@ -248,7 +250,7 @@ exports[`renders ./antdv-demo/docs/tree/demo/replaceFields.md correctly 1`] = `
          • parent 1-1 -
              +
              • zcvc
                • diff --git a/components/upload/Upload.jsx b/components/upload/Upload.jsx index 94f702266..18564d44c 100644 --- a/components/upload/Upload.jsx +++ b/components/upload/Upload.jsx @@ -1,6 +1,6 @@ -import classNames from 'classnames'; -import uniqBy from 'lodash/uniqBy'; -import findIndex from 'lodash/findIndex'; +import classNames from '../_util/classNames'; +import uniqBy from 'lodash-es/uniqBy'; +import findIndex from 'lodash-es/findIndex'; import VcUpload from '../vc-upload'; import BaseMixin from '../_util/BaseMixin'; import { getOptionProps, initDefaultProps, hasProp, getSlot } from '../_util/props-util'; @@ -12,6 +12,7 @@ import UploadList from './UploadList'; import { UploadProps } from './interface'; import { T, fileToObject, genPercentAdd, getFileItem, removeFileItem } from './utils'; import { inject } from 'vue'; +import { getDataAndAria } from '../vc-tree/src/util'; export { UploadProps }; @@ -273,14 +274,13 @@ export default { if (type === 'drag') { const dragCls = classNames(prefixCls, { - [className]: !!className, [`${prefixCls}-drag`]: true, [`${prefixCls}-drag-uploading`]: fileList.some(file => file.status === 'uploading'), [`${prefixCls}-drag-hover`]: dragState === 'dragover', [`${prefixCls}-disabled`]: disabled, }); return ( - +
                + {uploadList} {uploadButton} ); } return ( - + {uploadButton} {uploadList} diff --git a/components/upload/UploadList.jsx b/components/upload/UploadList.jsx index 16706ac53..82353281c 100644 --- a/components/upload/UploadList.jsx +++ b/components/upload/UploadList.jsx @@ -13,7 +13,7 @@ import DownloadOutlined from '@ant-design/icons-vue/DownloadOutlined'; import EyeOutlined from '@ant-design/icons-vue/EyeOutlined'; import Tooltip from '../tooltip'; import Progress from '../progress'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { UploadListProps } from './interface'; export default { diff --git a/components/upload/__tests__/__snapshots__/demo.test.js.snap b/components/upload/__tests__/__snapshots__/demo.test.js.snap index 5274aea92..04d0abd9c 100644 --- a/components/upload/__tests__/__snapshots__/demo.test.js.snap +++ b/components/upload/__tests__/__snapshots__/demo.test.js.snap @@ -1,11 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders ./antdv-demo/docs/upload/demo/avatar.md correctly 1`] = `
                `; +exports[`renders ./antdv-demo/docs/upload/demo/avatar.md correctly 1`] = `
                `; -exports[`renders ./antdv-demo/docs/upload/demo/basic.md correctly 1`] = `
                `; +exports[`renders ./antdv-demo/docs/upload/demo/basic copy 3.md correctly 1`] = `
                `; + +exports[`renders ./antdv-demo/docs/upload/demo/basic.md correctly 1`] = `
                `; exports[`renders ./antdv-demo/docs/upload/demo/defaultFileList.md correctly 1`] = ` -
                xxx.png
                +
                xxx.png
                @@ -24,12 +26,12 @@ exports[`renders ./antdv-demo/docs/upload/demo/defaultFileList.md correctly 1`]
                `; -exports[`renders ./antdv-demo/docs/upload/demo/directory.md correctly 1`] = `
                `; +exports[`renders ./antdv-demo/docs/upload/demo/directory.md correctly 1`] = `
                `; exports[`renders ./antdv-demo/docs/upload/demo/drag.md correctly 1`] = `
                `; exports[`renders ./antdv-demo/docs/upload/demo/fileList.md correctly 1`] = ` -
                xxx.png
                +
                xxx.png
                @@ -57,7 +59,8 @@ exports[`renders ./antdv-demo/docs/upload/demo/picture-card.md correctly 1`] = `
                image.png -
                + +
                @@ -71,7 +74,7 @@ exports[`renders ./antdv-demo/docs/upload/demo/picture-card.md correctly 1`] = ` `; exports[`renders ./antdv-demo/docs/upload/demo/picture-style.md correctly 1`] = ` -
                xxx.pngxxx.png
                +
                xxx.pngxxx.png
                @@ -79,7 +82,7 @@ exports[`renders ./antdv-demo/docs/upload/demo/picture-style.md correctly 1`] =
                -


                xxx.pngxxx.png
                +


                xxx.pngxxx.png
                @@ -90,11 +93,12 @@ exports[`renders ./antdv-demo/docs/upload/demo/picture-style.md correctly 1`] =
                `; -exports[`renders ./antdv-demo/docs/upload/demo/preview-file.md correctly 1`] = `
                `; +exports[`renders ./antdv-demo/docs/upload/demo/preview-file.md correctly 1`] = `
                `; -exports[`renders ./antdv-demo/docs/upload/demo/transform-file.md correctly 1`] = `
                `; +exports[`renders ./antdv-demo/docs/upload/demo/transform-file.md correctly 1`] = `
                `; exports[`renders ./antdv-demo/docs/upload/demo/upload-manually.md correctly 1`] = ` -
                +
                `; diff --git a/components/upload/__tests__/__snapshots__/uploadlist.test.js.snap b/components/upload/__tests__/__snapshots__/uploadlist.test.js.snap index b26c0381e..6d78f652d 100644 --- a/components/upload/__tests__/__snapshots__/uploadlist.test.js.snap +++ b/components/upload/__tests__/__snapshots__/uploadlist.test.js.snap @@ -35,7 +35,7 @@ exports[`Upload List handle error 2`] = ` exports[`Upload List should be uploading when upload a file 1`] = `
                `; exports[`Upload List should non-image format file preview 1`] = ` -
                not-image
                +
                not-image
                diff --git a/components/vc-align/Align.jsx b/components/vc-align/Align.jsx index a3959dd4f..88eaff6aa 100644 --- a/components/vc-align/Align.jsx +++ b/components/vc-align/Align.jsx @@ -4,7 +4,7 @@ import { alignElement, alignPoint } from 'dom-align'; import addEventListener from '../vc-util/Dom/addEventListener'; import { isWindow, buffer, isSamePoint, isSimilarValue, restoreFocus } from './util'; import { cloneElement } from '../_util/vnode.js'; -import clonedeep from 'lodash/cloneDeep'; +import clonedeep from 'lodash-es/cloneDeep'; import { getSlot, findDOMNode } from '../_util/props-util'; function getElement(func) { diff --git a/components/vc-calendar/src/Picker.jsx b/components/vc-calendar/src/Picker.jsx index fb8308e4a..fd55b26f2 100644 --- a/components/vc-calendar/src/Picker.jsx +++ b/components/vc-calendar/src/Picker.jsx @@ -7,7 +7,7 @@ import KeyCode from '../../_util/KeyCode'; import placements from './picker/placements'; import Trigger from '../../vc-trigger'; import moment from 'moment'; -import isNil from 'lodash/isNil'; +import isNil from 'lodash-es/isNil'; const TimeType = { validator(value) { if (Array.isArray(value)) { diff --git a/components/vc-calendar/src/date/DateTBody.jsx b/components/vc-calendar/src/date/DateTBody.jsx index be5358a5f..3b6646724 100644 --- a/components/vc-calendar/src/date/DateTBody.jsx +++ b/components/vc-calendar/src/date/DateTBody.jsx @@ -1,6 +1,6 @@ import PropTypes from '../../../_util/vue-types'; import { getOptionProps } from '../../../_util/props-util'; -import cx from 'classnames'; +import cx from '../../../_util/classNames'; import DateConstants from './DateConstants'; import { getTitleString, getTodayTime } from '../util/'; function noop() {} diff --git a/components/vc-checkbox/src/Checkbox.jsx b/components/vc-checkbox/src/Checkbox.jsx index 9c22a08e8..2828dcd25 100644 --- a/components/vc-checkbox/src/Checkbox.jsx +++ b/components/vc-checkbox/src/Checkbox.jsx @@ -1,5 +1,5 @@ import { nextTick } from 'vue'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import PropTypes from '../../_util/vue-types'; import BaseMixin from '../../_util/BaseMixin'; import { getOptionProps, hasProp, initDefaultProps } from '../../_util/props-util'; diff --git a/components/vc-dialog/Dialog.jsx b/components/vc-dialog/Dialog.jsx index 13273931b..420fcacb3 100644 --- a/components/vc-dialog/Dialog.jsx +++ b/components/vc-dialog/Dialog.jsx @@ -65,7 +65,6 @@ export default { }), data() { return { - destroyPopup: false, inTransition: false, titleId: `rcDialogTitle${uuid++}`, dialogMouseDown: undefined, @@ -74,9 +73,6 @@ export default { watch: { visible(val) { - if (val) { - this.destroyPopup = false; - } this.$nextTick(() => { this.updatedCallback(!val); }); @@ -147,15 +143,12 @@ export default { } }, onAnimateLeave() { - const { afterClose, destroyOnClose } = this; + const { afterClose } = this; // need demo? // https://github.com/react-component/dialog/pull/28 if (this.$refs.wrap) { this.$refs.wrap.style.display = 'none'; } - if (destroyOnClose) { - this.destroyPopup = true; - } this.inTransition = false; this.switchScrollingEffect(); if (afterClose) { @@ -295,7 +288,7 @@ export default { }); return ( - {visible || !this.destroyPopup ? dialogElement : null} + {visible || !this.destroyOnClose ? dialogElement : null} ); }, diff --git a/components/vc-drawer/src/Drawer.js b/components/vc-drawer/src/Drawer.js index 932310a5c..eac3691ec 100644 --- a/components/vc-drawer/src/Drawer.js +++ b/components/vc-drawer/src/Drawer.js @@ -1,4 +1,4 @@ -import classnames from 'classnames'; +import classnames from '../../_util/classNames'; import { cloneVNode, Teleport, nextTick } from 'vue'; import BaseMixin from '../../_util/BaseMixin'; import { initDefaultProps, getSlot } from '../../_util/props-util'; @@ -577,14 +577,6 @@ const Drawer = { currentDrawer[this.drawerId] = open ? this.container : open; const children = this.getChildToRender(this.sFirstEnter ? open : false); if (!getContainer) { - // const directives = [ - // { - // name: 'ant-ref', - // value: c => { - // this.container = c; - // }, - // }, - // ]; return (
                { - this._mounted = true; + watchEffect(() => { + if (!this.visible) { + this.lazyLoadHandler(this.$props); + } + }); const eventNode = this.getEventNode(); - this.lazyLoadHandler(); - if (this.lazyLoadHandler.flush) { this.lazyLoadHandler.flush(); } @@ -75,7 +70,6 @@ export default { }); }, beforeUnmount() { - this._mounted = false; if (this.lazyLoadHandler.cancel) { this.lazyLoadHandler.cancel(); } @@ -110,7 +104,7 @@ export default { }; }, lazyLoadHandler() { - if (!this._mounted) { + if (!this._.isMounted) { return; } const offset = this.getOffset(); diff --git a/components/vc-m-feedback/src/TouchFeedback.jsx b/components/vc-m-feedback/src/TouchFeedback.jsx index 89c388911..73187ee0f 100755 --- a/components/vc-m-feedback/src/TouchFeedback.jsx +++ b/components/vc-m-feedback/src/TouchFeedback.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import { initDefaultProps, getSlot } from '../../_util/props-util'; import { cloneElement } from '../../_util/vnode'; import warning from '../../_util/warning'; diff --git a/components/vc-mentions/src/Mentions.jsx b/components/vc-mentions/src/Mentions.jsx index 45b3ac72a..8071753de 100644 --- a/components/vc-mentions/src/Mentions.jsx +++ b/components/vc-mentions/src/Mentions.jsx @@ -1,5 +1,5 @@ import { provide } from 'vue'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import omit from 'omit.js'; import KeyCode from '../../_util/KeyCode'; import BaseMixin from '../../_util/BaseMixin'; diff --git a/components/vc-menu/DOMWrap.jsx b/components/vc-menu/DOMWrap.jsx index 456faa20f..2802e0e05 100644 --- a/components/vc-menu/DOMWrap.jsx +++ b/components/vc-menu/DOMWrap.jsx @@ -6,20 +6,9 @@ import { getWidth, setStyle, menuAllProps } from './util'; import { cloneElement } from '../_util/vnode'; import { getPropsData, getAllProps, getSlot, findDOMNode } from '../_util/props-util'; -const canUseDOM = !!( - typeof window !== 'undefined' && - window.document && - window.document.createElement -); - const MENUITEM_OVERFLOWED_CLASSNAME = 'menuitem-overflowed'; const FLOAT_PRECISION_ADJUST = 0.5; -// Fix ssr -if (canUseDOM) { - require('mutationobserver-shim'); -} - const DOMWrap = { name: 'DOMWrap', mixins: [BaseMixin], diff --git a/components/vc-menu/SubPopupMenu.jsx b/components/vc-menu/SubPopupMenu.jsx index 5843cdfbb..72b4bca7d 100644 --- a/components/vc-menu/SubPopupMenu.jsx +++ b/components/vc-menu/SubPopupMenu.jsx @@ -3,7 +3,7 @@ import PropTypes from '../_util/vue-types'; import { connect } from '../_util/store'; import BaseMixin from '../_util/BaseMixin'; import KeyCode from '../_util/KeyCode'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { getKeyFromChildrenIndex, loopMenuItem, noop, isMobileDevice, menuAllProps } from './util'; import DOMWrap from './DOMWrap'; import { cloneElement } from '../_util/vnode'; diff --git a/components/vc-menu/util.js b/components/vc-menu/util.js index 2672b7bfa..e460618cc 100644 --- a/components/vc-menu/util.js +++ b/components/vc-menu/util.js @@ -1,5 +1,5 @@ import isMobile from './utils/isMobile'; -import isObject from 'lodash/isObject'; +import isObject from 'lodash-es/isObject'; export function noop() {} diff --git a/components/vc-pagination/Pager.jsx b/components/vc-pagination/Pager.jsx index 66272ab26..4023aca32 100644 --- a/components/vc-pagination/Pager.jsx +++ b/components/vc-pagination/Pager.jsx @@ -1,5 +1,5 @@ import PropTypes from '../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import BaseMixin from '../_util/BaseMixin'; export default { diff --git a/components/vc-pagination/Pagination.jsx b/components/vc-pagination/Pagination.jsx index 5f450ad14..6ab628450 100644 --- a/components/vc-pagination/Pagination.jsx +++ b/components/vc-pagination/Pagination.jsx @@ -5,7 +5,7 @@ import Pager from './Pager'; import Options from './Options'; import LOCALE from './locale/zh_CN'; import KEYCODE from './KeyCode'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; function noop() {} diff --git a/components/vc-rate/src/Rate.jsx b/components/vc-rate/src/Rate.jsx index 9061b923c..34d323888 100644 --- a/components/vc-rate/src/Rate.jsx +++ b/components/vc-rate/src/Rate.jsx @@ -1,5 +1,5 @@ import PropTypes from '../../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import KeyCode from '../../_util/KeyCode'; import { initDefaultProps, diff --git a/components/vc-select/Select.jsx b/components/vc-select/Select.jsx index e536b705f..d9b0d59c0 100644 --- a/components/vc-select/Select.jsx +++ b/components/vc-select/Select.jsx @@ -1,7 +1,7 @@ import { TransitionGroup } from 'vue'; import KeyCode from '../_util/KeyCode'; import PropTypes from '../_util/vue-types'; -import classnames from 'classnames'; +import classnames from '../_util/classNames'; import classes from 'component-classes'; import { Item as MenuItem, ItemGroup as MenuItemGroup } from '../vc-menu'; import warning from 'warning'; diff --git a/components/vc-select/SelectTrigger.jsx b/components/vc-select/SelectTrigger.jsx index bddf07d25..31e735482 100644 --- a/components/vc-select/SelectTrigger.jsx +++ b/components/vc-select/SelectTrigger.jsx @@ -1,4 +1,4 @@ -import classnames from 'classnames'; +import classnames from '../_util/classNames'; import raf from 'raf'; import Trigger from '../vc-trigger'; import PropTypes from '../_util/vue-types'; diff --git a/components/vc-slick/src/arrows.js b/components/vc-slick/src/arrows.js index fc580728a..67a622203 100644 --- a/components/vc-slick/src/arrows.js +++ b/components/vc-slick/src/arrows.js @@ -1,4 +1,4 @@ -import classnames from 'classnames'; +import classnames from '../../_util/classNames'; import { cloneElement } from '../../_util/vnode'; import { canGoNext } from './utils/innerSliderUtils'; diff --git a/components/vc-slick/src/dots.js b/components/vc-slick/src/dots.js index 64a5f59cd..398ad8083 100644 --- a/components/vc-slick/src/dots.js +++ b/components/vc-slick/src/dots.js @@ -1,4 +1,4 @@ -import classnames from 'classnames'; +import classnames from '../../_util/classNames'; import { cloneElement } from '../../_util/vnode'; const getDotCount = function(spec) { diff --git a/components/vc-slick/src/inner-slider.js b/components/vc-slick/src/inner-slider.js index 67778335b..bedeec34f 100644 --- a/components/vc-slick/src/inner-slider.js +++ b/components/vc-slick/src/inner-slider.js @@ -1,5 +1,5 @@ -import debounce from 'lodash/debounce'; -import classnames from 'classnames'; +import debounce from 'lodash-es/debounce'; +import classnames from '../../_util/classNames'; import BaseMixin from '../../_util/BaseMixin'; import defaultProps from './default-props'; import initialState from './initial-state'; diff --git a/components/vc-slick/src/slider.js b/components/vc-slick/src/slider.js index 6498d5d1a..97e0df203 100644 --- a/components/vc-slick/src/slider.js +++ b/components/vc-slick/src/slider.js @@ -5,7 +5,6 @@ import InnerSlider from './inner-slider'; import defaultProps from './default-props'; import { canUseDOM } from './utils/innerSliderUtils'; import { getSlot } from '../../_util/props-util'; -const enquire = canUseDOM() && require('enquire.js'); export default { name: 'Slider', @@ -26,8 +25,15 @@ export default { }, media(query, handler) { // javascript handler for css media query - enquire.register(query, handler); - this._responsiveMediaHandlers.push({ query, handler }); + const mql = window.matchMedia(query); + const listener = ({ matches }) => { + if (matches) { + handler(); + } + }; + mql.addListener(listener); + listener(mql); + this._responsiveMediaHandlers.push({ mql, query, listener }); }, slickPrev() { this.innerSlider.slickPrev(); @@ -47,11 +53,6 @@ export default { }, // handles responsive breakpoints beforeMount() { - // performance monitoring - // if (process.env.NODE_ENV !== 'production') { - // const { whyDidYouUpdate } = require('why-did-you-update') - // whyDidYouUpdate(React) - // } if (this.responsive) { const breakpoints = this.responsive.map(breakpt => breakpt.breakpoint); // sort them in increasing order of their numerical value @@ -87,7 +88,7 @@ export default { }, beforeUnmount() { this._responsiveMediaHandlers.forEach(function(obj) { - enquire.unregister(obj.query, obj.handler); + obj.mql.removeListener(obj.listener); }); }, @@ -193,6 +194,6 @@ export default { children: newChildren, ref: this.innerSliderRefHandler, }; - return ; + return ; }, }; diff --git a/components/vc-slick/src/track.js b/components/vc-slick/src/track.js index 8af84cb77..6b2c8f622 100644 --- a/components/vc-slick/src/track.js +++ b/components/vc-slick/src/track.js @@ -1,5 +1,5 @@ import { createVNode } from 'vue'; -import classnames from 'classnames'; +import classnames from '../../_util/classNames'; import { cloneElement } from '../../_util/vnode'; import { flattenChildren } from '../../_util/props-util'; import { lazyStartIndex, lazyEndIndex, getPreClones } from './utils/innerSliderUtils'; diff --git a/components/vc-slider/src/Handle.jsx b/components/vc-slider/src/Handle.jsx index 907a42399..4359e85be 100644 --- a/components/vc-slider/src/Handle.jsx +++ b/components/vc-slider/src/Handle.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import PropTypes from '../../_util/vue-types'; import BaseMixin from '../../_util/BaseMixin'; import { getOptionProps } from '../../_util/props-util'; diff --git a/components/vc-slider/src/Range.jsx b/components/vc-slider/src/Range.jsx index c2e720a30..f05e085cc 100644 --- a/components/vc-slider/src/Range.jsx +++ b/components/vc-slider/src/Range.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import PropTypes from '../../_util/vue-types'; import BaseMixin from '../../_util/BaseMixin'; import { initDefaultProps, hasProp } from '../../_util/props-util'; diff --git a/components/vc-slider/src/common/Marks.jsx b/components/vc-slider/src/common/Marks.jsx index 1fc43db31..0886fcdc3 100644 --- a/components/vc-slider/src/common/Marks.jsx +++ b/components/vc-slider/src/common/Marks.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../../_util/classNames'; import { isValidElement } from '../../../_util/props-util'; const Marks = (_, { attrs }) => { diff --git a/components/vc-slider/src/common/Steps.jsx b/components/vc-slider/src/common/Steps.jsx index 47b6911a1..c34be3990 100644 --- a/components/vc-slider/src/common/Steps.jsx +++ b/components/vc-slider/src/common/Steps.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../../_util/classNames'; import warning from '../../../_util/warning'; const calcPoints = (vertical, marks, dots, step, min, max) => { diff --git a/components/vc-slider/src/common/createSlider.jsx b/components/vc-slider/src/common/createSlider.jsx index 1143d368d..18cfc127b 100644 --- a/components/vc-slider/src/common/createSlider.jsx +++ b/components/vc-slider/src/common/createSlider.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../../_util/classNames'; import PropTypes from '../../../_util/vue-types'; import addEventListener from '../../../vc-util/Dom/addEventListener'; import warning from '../../../_util/warning'; diff --git a/components/vc-steps/Steps.jsx b/components/vc-steps/Steps.jsx index 30b51bfa7..c01ce0787 100644 --- a/components/vc-steps/Steps.jsx +++ b/components/vc-steps/Steps.jsx @@ -1,8 +1,8 @@ import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; -import debounce from 'lodash/debounce'; +import debounce from 'lodash-es/debounce'; import isFlexSupported from '../_util/isFlexSupported'; -import { filterEmpty, getSlot, getPropsData } from '../_util/props-util'; +import { getSlot, getPropsData } from '../_util/props-util'; import { cloneElement } from '../_util/vnode'; export default { @@ -23,6 +23,7 @@ export default { finish: PropTypes.any, error: PropTypes.any, }).loose, + canClick: PropTypes.bool, }, data() { this.calcStepOffsetWidth = debounce(this.calcStepOffsetWidth, 150); @@ -59,7 +60,6 @@ export default { const { current } = this.$props; if (current !== next) { this.__emit('change', next); - this.__emit('update:current', next); } }, calcStepOffsetWidth() { @@ -101,10 +101,11 @@ export default { progressDot, initial, icons, + canClick, } = this; const isNav = type === 'navigation'; const { lastStepOffsetWidth, flexSupported } = this; - const filteredChildren = filterEmpty(getSlot(this)); + const filteredChildren = getSlot(this); const lastIndex = filteredChildren.length - 1; const adjustedlabelPlacement = progressDot ? 'vertical' : labelPlacement; const classString = { @@ -134,9 +135,7 @@ export default { icons, ...childProps, }; - - const { onChange } = this.$attrs; - if (onChange || this.$attrs['onUpdate:current']) { + if (canClick) { stepProps.onStepClick = this.onStepClick; } if (!flexSupported && direction !== 'vertical') { diff --git a/components/vc-table/src/BaseTable.jsx b/components/vc-table/src/BaseTable.jsx index 7e58f19c5..446222ed8 100644 --- a/components/vc-table/src/BaseTable.jsx +++ b/components/vc-table/src/BaseTable.jsx @@ -1,6 +1,6 @@ import { inject } from 'vue'; import PropTypes from '../../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import ColGroup from './ColGroup'; import TableHeader from './TableHeader'; import TableRow from './TableRow'; diff --git a/components/vc-table/src/HeadTable.jsx b/components/vc-table/src/HeadTable.jsx index af640b1ac..4706ffcda 100644 --- a/components/vc-table/src/HeadTable.jsx +++ b/components/vc-table/src/HeadTable.jsx @@ -2,7 +2,7 @@ import { inject } from 'vue'; import PropTypes from '../../_util/vue-types'; import { measureScrollbar } from './utils'; import BaseTable from './BaseTable'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; export default { name: 'HeadTable', diff --git a/components/vc-table/src/Table.jsx b/components/vc-table/src/Table.jsx index 522efc9dd..ccd604ea7 100644 --- a/components/vc-table/src/Table.jsx +++ b/components/vc-table/src/Table.jsx @@ -1,9 +1,9 @@ /* eslint-disable camelcase */ import { provide, markRaw } from 'vue'; import shallowequal from '../../_util/shallowequal'; -import merge from 'lodash/merge'; +import merge from 'lodash-es/merge'; import classes from 'component-classes'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import PropTypes from '../../_util/vue-types'; import { debounce, getDataAndAriaProps } from './utils'; import warning from '../../_util/warning'; diff --git a/components/vc-table/src/TableCell.jsx b/components/vc-table/src/TableCell.jsx index b196c6b96..ad5979c06 100644 --- a/components/vc-table/src/TableCell.jsx +++ b/components/vc-table/src/TableCell.jsx @@ -1,7 +1,7 @@ import { inject } from 'vue'; import PropTypes from '../../_util/vue-types'; -import get from 'lodash/get'; -import classNames from 'classnames'; +import get from 'lodash-es/get'; +import classNames from '../../_util/classNames'; import { isValidElement } from '../../_util/props-util'; function isInvalidRenderCellText(text) { diff --git a/components/vc-table/src/TableHeaderRow.jsx b/components/vc-table/src/TableHeaderRow.jsx index 9d1037958..3a26f00d1 100644 --- a/components/vc-table/src/TableHeaderRow.jsx +++ b/components/vc-table/src/TableHeaderRow.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import PropTypes from '../../_util/vue-types'; import { connect } from '../../_util/store'; diff --git a/components/vc-table/src/TableRow.jsx b/components/vc-table/src/TableRow.jsx index 0dc7aca48..4e4bd52da 100644 --- a/components/vc-table/src/TableRow.jsx +++ b/components/vc-table/src/TableRow.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import PropTypes from '../../_util/vue-types'; import { connect } from '../../_util/store'; import TableCell from './TableCell'; diff --git a/components/vc-tabs/src/ScrollableTabBarNode.jsx b/components/vc-tabs/src/ScrollableTabBarNode.jsx index f34f85255..6eef57c91 100644 --- a/components/vc-tabs/src/ScrollableTabBarNode.jsx +++ b/components/vc-tabs/src/ScrollableTabBarNode.jsx @@ -1,4 +1,4 @@ -import debounce from 'lodash/debounce'; +import debounce from 'lodash-es/debounce'; import ResizeObserver from 'resize-observer-polyfill'; import PropTypes from '../../_util/vue-types'; import BaseMixin from '../../_util/BaseMixin'; diff --git a/components/vc-tabs/src/Tabs.jsx b/components/vc-tabs/src/Tabs.jsx index 9789179fe..31b5d12dd 100644 --- a/components/vc-tabs/src/Tabs.jsx +++ b/components/vc-tabs/src/Tabs.jsx @@ -1,9 +1,8 @@ -import { provide } from 'vue'; +import { provide, reactive, watchEffect } from 'vue'; import BaseMixin from '../../_util/BaseMixin'; import PropTypes from '../../_util/vue-types'; import raf from 'raf'; import KeyCode from './KeyCode'; -import { getOptionProps } from '../../_util/props-util'; import { cloneElement } from '../../_util/vnode'; import Sentinel from './Sentinel'; import isValid from '../../_util/isValid'; @@ -40,43 +39,42 @@ export default { tabBarPosition: PropTypes.string.def('top'), activeKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), defaultActiveKey: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), - __propsSymbol__: PropTypes.any, direction: PropTypes.string.def('ltr'), tabBarGutter: PropTypes.number, }, - data() { - provide('sentinelContext', this); - const props = getOptionProps(this); + setup(props) { let activeKey; - if ('activeKey' in props) { + if (props.activeKey !== undefined) { activeKey = props.activeKey; - } else if ('defaultActiveKey' in props) { + } else if (props.defaultActiveKey !== undefined) { activeKey = props.defaultActiveKey; } else { activeKey = getDefaultActiveKey(props); } + const state = reactive({ + _activeKey: activeKey, + }); + watchEffect( + () => { + if (props.activeKey !== undefined) { + state._activeKey = props.activeKey; + } else if (!activeKeyIsValid(props, state._activeKey)) { + // https://github.com/ant-design/ant-design/issues/7093 + state._activeKey = getDefaultActiveKey(props); + } + }, + { + flush: 'sync', + }, + ); + return { state }; + }, + created() { this.panelSentinelStart = undefined; this.panelSentinelEnd = undefined; this.sentinelStart = undefined; this.sentinelEnd = undefined; - return { - _activeKey: activeKey, - }; - }, - watch: { - __propsSymbol__() { - const nextProps = getOptionProps(this); - if ('activeKey' in nextProps) { - this.setState({ - _activeKey: nextProps.activeKey, - }); - } else if (!activeKeyIsValid(nextProps, this.$data._activeKey)) { - // https://github.com/ant-design/ant-design/issues/7093 - this.setState({ - _activeKey: getDefaultActiveKey(nextProps), - }); - } - }, + provide('sentinelContext', this); }, beforeUnmount() { this.destroy = true; @@ -133,12 +131,10 @@ export default { }, setActiveKey(activeKey) { - if (this.$data._activeKey !== activeKey) { - const props = getOptionProps(this); - if (!('activeKey' in props)) { - this.setState({ - _activeKey: activeKey, - }); + if (this.state._activeKey !== activeKey) { + const props = this.$props; + if (props.activeKey === undefined) { + this.state._activeKey = activeKey; } this.__emit('update:activeKey', activeKey); this.__emit('change', activeKey); @@ -146,7 +142,7 @@ export default { }, getNextActiveKey(next) { - const activeKey = this.$data._activeKey; + const activeKey = this.state._activeKey; const children = []; this.$props.children.forEach(c => { if (c && !c.disabled && c.disabled !== '') { @@ -206,7 +202,7 @@ export default { navWrapper, tabBarPosition, panels: props.children, - activeKey: this.$data._activeKey, + activeKey: this.state._activeKey, direction, tabBarGutter, onKeydown: this.onNavKeyDown, @@ -216,7 +212,7 @@ export default { const tabContent = cloneElement(renderTabContent(), { prefixCls, tabBarPosition, - activeKey: this.$data._activeKey, + activeKey: this.state._activeKey, destroyInactiveTabPane, direction, onChange: this.setActiveKey, diff --git a/components/vc-time-picker/Panel.jsx b/components/vc-time-picker/Panel.jsx index 741e5400f..29993ec34 100644 --- a/components/vc-time-picker/Panel.jsx +++ b/components/vc-time-picker/Panel.jsx @@ -1,5 +1,5 @@ import moment from 'moment'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; import Header from './Header'; diff --git a/components/vc-time-picker/Select.jsx b/components/vc-time-picker/Select.jsx index a305f0c31..a9a7fcc48 100644 --- a/components/vc-time-picker/Select.jsx +++ b/components/vc-time-picker/Select.jsx @@ -1,6 +1,6 @@ import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; -import classnames from 'classnames'; +import classnames from '../_util/classNames'; import raf from 'raf'; import { findDOMNode } from '../_util/props-util'; diff --git a/components/vc-time-picker/TimePicker.jsx b/components/vc-time-picker/TimePicker.jsx index 18fd05084..614f7c956 100644 --- a/components/vc-time-picker/TimePicker.jsx +++ b/components/vc-time-picker/TimePicker.jsx @@ -1,5 +1,5 @@ import moment from 'moment'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import PropTypes from '../_util/vue-types'; import BaseMixin from '../_util/BaseMixin'; import { diff --git a/components/vc-tree-select/src/Base/BasePopup.jsx b/components/vc-tree-select/src/Base/BasePopup.jsx index 8729f2bdf..412cb0e50 100644 --- a/components/vc-tree-select/src/Base/BasePopup.jsx +++ b/components/vc-tree-select/src/Base/BasePopup.jsx @@ -1,7 +1,7 @@ import { inject } from 'vue'; import warning from 'warning'; import PropTypes from '../../../_util/vue-types'; -import { Tree } from '../../../vc-tree'; +import Tree from '../../../vc-tree'; import BaseMixin from '../../../_util/BaseMixin'; import { createRef } from '../util'; @@ -270,7 +270,7 @@ const BasePopup = { onExpand: this.onTreeExpand, onLoad: this.onLoad, }; - $tree = ; + $tree = ; } return ( diff --git a/components/vc-tree-select/src/Base/BaseSelector.jsx b/components/vc-tree-select/src/Base/BaseSelector.jsx index 94689f398..992c1ff54 100644 --- a/components/vc-tree-select/src/Base/BaseSelector.jsx +++ b/components/vc-tree-select/src/Base/BaseSelector.jsx @@ -8,7 +8,7 @@ import { inject } from 'vue'; import { createRef } from '../util'; import PropTypes from '../../../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../../../_util/classNames'; import { initDefaultProps, getComponent } from '../../../_util/props-util'; import BaseMixin from '../../../_util/BaseMixin'; export const selectorPropTypes = () => ({ diff --git a/components/vc-tree-select/src/Popup/SinglePopup.jsx b/components/vc-tree-select/src/Popup/SinglePopup.jsx index 34eb2a3ab..438ae2b29 100644 --- a/components/vc-tree-select/src/Popup/SinglePopup.jsx +++ b/components/vc-tree-select/src/Popup/SinglePopup.jsx @@ -73,7 +73,7 @@ const SinglePopup = { renderSearch: this._renderSearch, }} ref={this.popupRef} - __propsSymbol__={Symbol()} + __propsSymbol__={[]} /> ); }, diff --git a/components/vc-tree-select/src/Select.jsx b/components/vc-tree-select/src/Select.jsx index 26842f3f4..faa6cf23f 100644 --- a/components/vc-tree-select/src/Select.jsx +++ b/components/vc-tree-select/src/Select.jsx @@ -1091,7 +1091,7 @@ const Select = { }; const Popup = isMultiple ? MultiplePopup : SinglePopup; - const $popup = ; + const $popup = ; const Selector = isMultiple ? MultipleSelector : SingleSelector; const $selector = ; diff --git a/components/vc-tree-select/src/SelectNode.jsx b/components/vc-tree-select/src/SelectNode.jsx index f2e21a900..98e58444b 100644 --- a/components/vc-tree-select/src/SelectNode.jsx +++ b/components/vc-tree-select/src/SelectNode.jsx @@ -1,9 +1,10 @@ -import { TreeNode } from '../../vc-tree'; +import VcTree from '../../vc-tree'; /** * SelectNode wrapped the tree node. * Let's use SelectNode instead of TreeNode * since TreeNode is so confuse here. */ +const TreeNode = VcTree.TreeNode; function SelectNode(_, { attrs, slots }) { return ; } diff --git a/components/vc-tree-select/src/SelectTrigger.jsx b/components/vc-tree-select/src/SelectTrigger.jsx index 9ba348489..c9e916d87 100644 --- a/components/vc-tree-select/src/SelectTrigger.jsx +++ b/components/vc-tree-select/src/SelectTrigger.jsx @@ -1,7 +1,7 @@ import PropTypes from '../../_util/vue-types'; import Trigger from '../../vc-trigger'; import { createRef } from './util'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import { getSlot } from '../../_util/props-util'; const BUILT_IN_PLACEMENTS = { diff --git a/components/vc-tree-select/src/Selector/MultipleSelector/Selection.jsx b/components/vc-tree-select/src/Selector/MultipleSelector/Selection.jsx index 834b1ff6b..11f13cebf 100644 --- a/components/vc-tree-select/src/Selector/MultipleSelector/Selection.jsx +++ b/components/vc-tree-select/src/Selector/MultipleSelector/Selection.jsx @@ -1,4 +1,4 @@ -import classNames from 'classnames'; +import classNames from '../../../../_util/classNames'; import PropTypes from '../../../../_util/vue-types'; import { toTitle, UNSELECTABLE_ATTRIBUTE, UNSELECTABLE_STYLE } from '../../util'; import { getComponent } from '../../../../_util/props-util'; diff --git a/components/vc-tree/index.js b/components/vc-tree/index.js index bf7b1b6b1..384396194 100644 --- a/components/vc-tree/index.js +++ b/components/vc-tree/index.js @@ -1,4 +1,4 @@ // based on rc-tree 2.1.3 -'use strict'; +import Tree from './src'; -module.exports = require('./src/'); +export default Tree; diff --git a/components/vc-tree/src/Tree.jsx b/components/vc-tree/src/Tree.jsx index eba40c809..e7e32e7f0 100644 --- a/components/vc-tree/src/Tree.jsx +++ b/components/vc-tree/src/Tree.jsx @@ -1,9 +1,10 @@ import PropTypes from '../../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import warning from 'warning'; import { hasProp, initDefaultProps, getOptionProps, getSlot } from '../../_util/props-util'; import { cloneElement } from '../../_util/vnode'; import BaseMixin from '../../_util/BaseMixin'; +import syncWatch from '../../_util/syncWatch'; import { convertTreeToEntities, convertDataToTree, @@ -30,8 +31,11 @@ import { function getWatch(keys = []) { const watch = {}; keys.forEach(k => { - watch[k] = function() { - this.needSyncKeys[k] = true; + watch[k] = { + handler() { + this.needSyncKeys[k] = true; + }, + flush: 'sync', }; }); return watch; @@ -149,10 +153,10 @@ const Tree = { 'checkedKeys', 'loadedKeys', ]), - __propsSymbol__() { + __propsSymbol__: syncWatch(function() { this.setState(this.getDerivedState(getOptionProps(this), this.$data)); this.needSyncKeys = {}; - }, + }), }, methods: { diff --git a/components/vc-tree/src/TreeNode.jsx b/components/vc-tree/src/TreeNode.jsx index d668a94c5..5ece80c5a 100644 --- a/components/vc-tree/src/TreeNode.jsx +++ b/components/vc-tree/src/TreeNode.jsx @@ -1,6 +1,6 @@ import { inject, provide, Transition } from 'vue'; import PropTypes from '../../_util/vue-types'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import { getNodeChildren, mapChildren, warnOnlyTreeNode, getDataAndAria } from './util'; import { initDefaultProps, getComponent, getSlot } from '../../_util/props-util'; import BaseMixin from '../../_util/BaseMixin'; diff --git a/components/vc-tree/src/index.js b/components/vc-tree/src/index.js index 239494bcc..a37c0d201 100644 --- a/components/vc-tree/src/index.js +++ b/components/vc-tree/src/index.js @@ -1,7 +1,5 @@ -import ProxyTree, { Tree } from './Tree'; +import Tree from './Tree'; import TreeNode from './TreeNode'; Tree.TreeNode = TreeNode; -ProxyTree.TreeNode = TreeNode; -export { Tree, TreeNode }; -export default ProxyTree; +export default Tree; diff --git a/components/vc-trigger/Trigger.jsx b/components/vc-trigger/Trigger.jsx index 5ff0739ae..1dc384973 100644 --- a/components/vc-trigger/Trigger.jsx +++ b/components/vc-trigger/Trigger.jsx @@ -16,7 +16,7 @@ import Popup from './Popup'; import { getAlignFromPlacement, getAlignPopupClassName, noop } from './utils'; import BaseMixin from '../_util/BaseMixin'; import Portal from '../_util/Portal'; -import classNames from 'classnames'; +import classNames from '../_util/classNames'; import { cloneElement } from '../_util/vnode'; function returnEmptyString() { diff --git a/components/vc-upload/src/AjaxUploader.jsx b/components/vc-upload/src/AjaxUploader.jsx index ab6f4cdd9..f6893e442 100644 --- a/components/vc-upload/src/AjaxUploader.jsx +++ b/components/vc-upload/src/AjaxUploader.jsx @@ -1,7 +1,7 @@ import PropTypes from '../../_util/vue-types'; import BaseMixin from '../../_util/BaseMixin'; -import partition from 'lodash/partition'; -import classNames from 'classnames'; +import partition from 'lodash-es/partition'; +import classNames from '../../_util/classNames'; import defaultRequest from './request'; import getUid from './uid'; import attrAccept from './attr-accept'; diff --git a/components/vc-upload/src/IframeUploader.jsx b/components/vc-upload/src/IframeUploader.jsx index 41f2ab952..e9a15a2d6 100644 --- a/components/vc-upload/src/IframeUploader.jsx +++ b/components/vc-upload/src/IframeUploader.jsx @@ -1,6 +1,6 @@ import PropTypes from '../../_util/vue-types'; import BaseMixin from '../../_util/BaseMixin'; -import classNames from 'classnames'; +import classNames from '../../_util/classNames'; import getUid from './uid'; import warning from '../../_util/warning'; import { getSlot, findDOMNode } from '../../_util/props-util'; diff --git a/examples/App.vue b/examples/App.vue index dad93a217..6bdc60a92 100644 --- a/examples/App.vue +++ b/examples/App.vue @@ -11,133 +11,15 @@ Use Drawer to quickly preview details of an object, such as those in a list. ```vue