release 3.1.0

2024-11-30 02:57:50 +08:00 · 2022-04-06 09:24:25 +08:00 · 2022-04-06 09:24:25 +08:00 · 6222e43d7a
commit 6222e43d7a
parent 272430ba06
10 changed files with 85 additions and 26 deletions
--- a/CHANGELOG.en-US.md
+++ b/CHANGELOG.en-US.md
@ -10,6 +10,14 @@

 ---

+## 3.1.0
+
+`2022-04-06`
+
+### 🔥🔥🔥 3.1.0 official version released 🔥🔥🔥
+
+- 🐞 Fix `Select.Option` child element is empty, the error is reported [272430](https://github.com/vueComponent/ant-design-vue/commit/272430ba06e44e06eb07694d6aef4d474fb741cb)
+
 ## 3.1.0-rc.6

 `2022-04-01`
--- a/CHANGELOG.zh-CN.md
+++ b/CHANGELOG.zh-CN.md
@ -10,6 +10,14 @@

 ---

+## 3.1.0
+
+`2022-04-06`
+
+### 🔥🔥🔥 3.1.0 正式版发布 🔥🔥🔥
+
+- 🐞 修复 `Select.Option` 子元素为空的时候，报错问题 [272430](https://github.com/vueComponent/ant-design-vue/commit/272430ba06e44e06eb07694d6aef4d474fb741cb)
+
 ## 3.1.0-rc.6

 `2022-04-01`
--- a/site/404.html
+++ b/site/404.html
@ -50,6 +50,13 @@
      }
    </style>
    <script>
+      if (
+        location.host === 'ant-design-vue.gitee.io' ||
+        location.host === 'vue.ant.design' ||
+        location.host === 'next.antdv.com'
+      ) {
+        location.replace(location.href.replace(location.host, 'www.antdv.com'));
+      }
      var _hmt = _hmt || [];
      var srcMap = {
        'ant-design-vue.gitee.io': 'https://hm.baidu.com/hm.js?1e30265f06f76fabfcdb7ed272017441',
--- a/site/index.html
+++ b/site/index.html
@ -23,7 +23,11 @@
      }
    </style>
    <script>
-      if (location.host === 'ant-design-vue.gitee.io' || location.host === 'vue.ant.design') {
+      if (
+        location.host === 'ant-design-vue.gitee.io' ||
+        location.host === 'vue.ant.design' ||
+        location.host === 'next.antdv.com'
+      ) {
        location.replace(location.href.replace(location.host, 'www.antdv.com'));
      }
      var _hmt = _hmt || [];
--- a/site/src/layouts/header/Menu.vue
+++ b/site/src/layouts/header/Menu.vue
@ -8,11 +8,14 @@
      key="version"
      class="version"
      size="small"
+      :dropdown-match-select-width="false"
      :default-value="antdVersion"
-      :get-popup-container="trigger => trigger.parentNode"
    >
      <a-select-option :value="antdVersion">{{ antdVersion }}</a-select-option>
-      <a-select-option value="1.x" @click="changeVersion">1.x</a-select-option>
+      <a-select-option value="2.x" @click="changeVersion('2x')">
+        2.x (Not Recommended)
+      </a-select-option>
+      <a-select-option value="1.x" @click="changeVersion('1x')">1.x (For Vue 2)</a-select-option>
    </a-select>
    <a-button
      key="lang-button"
@ -66,8 +69,8 @@ export default defineComponent({
        );
    };

-    const changeVersion = () => {
-      location.href = `https://1x.antdv.com${route.fullPath}`;
+    const changeVersion = v => {
+      location.href = `https://${v}.antdv.com${route.fullPath}`;
    };
    return {
      onLangChange,
--- a/site/src/layouts/header/index.vue
+++ b/site/src/layouts/header/index.vue
@ -16,6 +16,18 @@

      <CloseOutlined class="close-icon" @click="visibleAdblockBanner = false" />
    </div>
+    <div v-if="visibleAlertBanner" class="alert-banner">
+      <template v-if="isZhCN">
+        Ant Design Vue 3 已正式发布，并成为默认文档。
+        <a href="https://www.antdv.com/docs/vue/migration-v3-cn">升级文档</a>
+      </template>
+      <template v-else>
+        Ant Design Vue 3 is now the new default version!
+        <a href="https://www.antdv.com/docs/vue/migration-v3">Update Doc</a>
+      </template>
+
+      <CloseOutlined class="close-icon" @click="visibleAlertBanner = false" />
+    </div>
    <a-popover
      v-model:visible="menuVisible"
      overlay-class-name="popover-menu"
@ -54,6 +66,7 @@ import Logo from './Logo.vue';
 import Menu from './Menu.vue';
 import { UnorderedListOutlined, CloseOutlined } from '@ant-design/icons-vue';
 import SearchBox from './SearchBox.vue';
+import { version } from 'ant-design-vue';
 export default defineComponent({
  components: {
    Logo,
@ -121,6 +134,12 @@ export default defineComponent({
    watch(globalConfig?.blocked, val => {
      visibleAdblockBanner.value = val;
    });
+    const visibleAlertBanner = ref(!localStorage.getItem('v3'));
+    watch(visibleAlertBanner, () => {
+      if (!visibleAlertBanner.value) {
+        localStorage.setItem('v3', version);
+      }
+    });
    return {
      isZhCN: globalConfig.isZhCN,
      isMobile: globalConfig.isMobile,
@ -134,13 +153,15 @@ export default defineComponent({
      colProps,
      menuVisible,
      onTriggerSearching,
+      visibleAlertBanner,
    };
  },
 });
 </script>
 <style lang="less" src="./index.less"></style>
 <style scope>
-.adblock-banner {
+.adblock-banner,
+.alert-banner {
  position: relative;
  z-index: 100;
  min-width: 1000px;
@ -150,6 +171,18 @@ export default defineComponent({
  text-align: center;
  background-color: #ebebeb;
 }
+.alert-banner {
+  background-color: var(--ant-primary-color);
+  color: #fff;
+  padding: 5px;
+}
+.alert-banner a {
+  color: #fff;
+  text-decoration: underline;
+}
+.alert-banner .close-icon {
+  top: 12px;
+}
 .close-icon {
  position: absolute;
  top: 15px;
--- a/site/src/vueDocs/getting-started.en-US.md
+++ b/site/src/vueDocs/getting-started.en-US.md
@ -37,7 +37,7 @@ And, setup your vue project configuration.
 #### Install

 ```bash
-$ npm i --save ant-design-vue@next
+$ npm i --save ant-design-vue
 ```

 #### Component Registration
--- a/site/src/vueDocs/getting-started.zh-CN.md
+++ b/site/src/vueDocs/getting-started.zh-CN.md
@ -39,7 +39,7 @@ $ vue create antd-demo
 #### 安装

 ```bash
-$ npm i --save ant-design-vue@next
+$ npm i --save ant-design-vue
 ```

 #### 注册
--- a/site/src/vueDocs/introduce.en-US.md
+++ b/site/src/vueDocs/introduce.en-US.md
@ -38,7 +38,7 @@ Following the Ant Design specification, we developed a Vue UI library `antd` tha

 ## Version

- Stable: [![npm package](https://img.shields.io/npm/v/ant-design-vue/next.svg?style=flat-square)](https://www.npmjs.org/package/ant-design-vue)
+- Stable: [![npm package](https://img.shields.io/npm/v/ant-design-vue.svg?style=flat-square)](https://www.npmjs.org/package/ant-design-vue)

 You can subscribe to this feed for new version notifications: https://github.com/vueComponent/ant-design-vue/releases.atom

@ -49,11 +49,11 @@ You can subscribe to this feed for new version notifications: https://github.com
 **We recommend using npm or yarn to install**，it not only makes development easier，but also allow you to take advantage of the rich ecosystem of Javascript packages and tooling.

 ```bash
-$ npm install ant-design-vue@next --save
+$ npm install ant-design-vue --save
 ```

 ```bash
-$ yarn add ant-design-vue@next
+$ yarn add ant-design-vue
 ```

 If you are in a bad network environment，you can try other registries and tools like [cnpm](https://github.com/cnpm/cnpm).
@ -115,16 +115,14 @@ import 'ant-design-vue/dist/antd.css'; // or 'ant-design-vue/dist/antd.less'

  ```js
  // vite.config.js
-  import Components from 'unplugin-vue-components/vite'
-  import { AntDesignVueResolver } from 'unplugin-vue-components/resolvers'
-  
+  import Components from 'unplugin-vue-components/vite';
+  import { AntDesignVueResolver } from 'unplugin-vue-components/resolvers';
+
  export default {
    plugins: [
      /* ... */
      Components({
-        resolvers: [
-          AntDesignVueResolver(),
-        ],
+        resolvers: [AntDesignVueResolver()],
      }),
    ],
  };
--- a/site/src/vueDocs/introduce.zh-CN.md
+++ b/site/src/vueDocs/introduce.zh-CN.md
@ -38,7 +38,7 @@

 ## 版本

- 稳定版：[![npm package](https://img.shields.io/npm/v/ant-design-vue/next.svg?style=flat-square)](https://www.npmjs.org/package/ant-design-vue)
+- 稳定版：[![npm package](https://img.shields.io/npm/v/ant-design-vue.svg?style=flat-square)](https://www.npmjs.org/package/ant-design-vue)

 你可以订阅：https://github.com/vueComponent/ant-design-vue/releases.atom 来获得稳定版发布的通知。

@ -49,11 +49,11 @@
 **我们推荐使用 npm 或 yarn 的方式进行开发**，不仅可在开发环境轻松调试，也可放心地在生产环境打包部署使用，享受整个生态圈和工具链带来的诸多好处。

 ```bash
-$ npm install ant-design-vue@next --save
+$ npm install ant-design-vue --save
 ```

 ```bash
-$ yarn add ant-design-vue@next
+$ yarn add ant-design-vue
 ```

 如果你的网络环境不佳，推荐使用 [cnpm](https://github.com/cnpm/cnpm)。
@ -117,16 +117,14 @@ import 'ant-design-vue/dist/antd.css'; // or 'ant-design-vue/dist/antd.less'

  ```js
  // vite.config.js
-  import Components from 'unplugin-vue-components/vite'
-  import { AntDesignVueResolver } from 'unplugin-vue-components/resolvers'
-  
+  import Components from 'unplugin-vue-components/vite';
+  import { AntDesignVueResolver } from 'unplugin-vue-components/resolvers';
+
  export default {
    plugins: [
      /* ... */
      Components({
-        resolvers: [
-          AntDesignVueResolver(),
-        ],
+        resolvers: [AntDesignVueResolver()],
      }),
    ],
  };