From 808af1f3b5a15df6d8dd5a84479d67b83efa1492 Mon Sep 17 00:00:00 2001
From: Kagol <kagol@sina.com>
Date: Mon, 18 Nov 2024 19:26:45 +0800
Subject: [PATCH 1/8] fix(base-select): [base-select] fix data init error when
 set options and multiple

---
 .../sites/demos/pc/app/base-select/size-composition-api.vue   | 4 ++--
 examples/sites/demos/pc/app/base-select/size.vue              | 4 ++--
 packages/renderless/src/base-select/index.ts                  | 3 ++-
 packages/renderless/src/grid-select/index.ts                  | 3 ++-
 packages/renderless/src/tree-select/index.ts                  | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/examples/sites/demos/pc/app/base-select/size-composition-api.vue b/examples/sites/demos/pc/app/base-select/size-composition-api.vue
index edc934496a..a49f52738a 100644
--- a/examples/sites/demos/pc/app/base-select/size-composition-api.vue
+++ b/examples/sites/demos/pc/app/base-select/size-composition-api.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <p>默认</p>
-    <tiny-base-select v-model="value1" multiple :options="options"></tiny-base-select>
     <p>medium</p>
     <tiny-base-select v-model="value2" size="medium" multiple :options="options"></tiny-base-select>
+    <p>默认</p>
+    <tiny-base-select v-model="value1" multiple :options="options"></tiny-base-select>
     <p>small</p>
     <tiny-base-select v-model="value3" size="small" multiple :options="options"> </tiny-base-select>
     <p>mini</p>
diff --git a/examples/sites/demos/pc/app/base-select/size.vue b/examples/sites/demos/pc/app/base-select/size.vue
index fdbb04d2cc..97be668c16 100644
--- a/examples/sites/demos/pc/app/base-select/size.vue
+++ b/examples/sites/demos/pc/app/base-select/size.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
-    <p>默认</p>
-    <tiny-base-select v-model="value1" multiple :options="options"></tiny-base-select>
     <p>medium</p>
     <tiny-base-select v-model="value2" size="medium" multiple :options="options"></tiny-base-select>
+    <p>默认</p>
+    <tiny-base-select v-model="value1" multiple :options="options"></tiny-base-select>
     <p>small</p>
     <tiny-base-select v-model="value3" size="small" multiple :options="options"> </tiny-base-select>
     <p>mini</p>
diff --git a/packages/renderless/src/base-select/index.ts b/packages/renderless/src/base-select/index.ts
index 27e377dd0d..b6c3b5e6f5 100644
--- a/packages/renderless/src/base-select/index.ts
+++ b/packages/renderless/src/base-select/index.ts
@@ -361,9 +361,10 @@ export const setSelected =
           : 'halfselect'
         : 'check'
 
-      if (state.selected.length === 0 || !state.selected[0].currentLabel) {
+      if (!state.selected?.[0]?.isTree && !state.selected?.[0]?.isGrid) {
         state.selected = result
       }
+      state.selected.length && (state.selectedLabel = '')
 
       vm.$refs.selectTree && vm.$refs.selectTree.setCheckedNodes && vm.$refs.selectTree.setCheckedNodes(state.selected)
       state.tips = state.selected.map((item) => (item.state ? item.state.currentLabel : item.currentLabel)).join(',')
diff --git a/packages/renderless/src/grid-select/index.ts b/packages/renderless/src/grid-select/index.ts
index d23bca6e6c..fa966fee11 100644
--- a/packages/renderless/src/grid-select/index.ts
+++ b/packages/renderless/src/grid-select/index.ts
@@ -63,7 +63,8 @@ export const selectChange =
           return {
             ...node,
             currentLabel: node[props.textField],
-            value: node[props.valueField]
+            value: node[props.valueField],
+            isGrid: true
           }
         })
       )
diff --git a/packages/renderless/src/tree-select/index.ts b/packages/renderless/src/tree-select/index.ts
index b37db14c7e..1b757fe722 100644
--- a/packages/renderless/src/tree-select/index.ts
+++ b/packages/renderless/src/tree-select/index.ts
@@ -37,7 +37,8 @@ export const check =
           return {
             ...node,
             currentLabel: node[props.textField],
-            value: node[props.valueField]
+            value: node[props.valueField],
+            isTree: true
           }
         })
       )

From 85e67370ba0068182faa2c8a1754356bd5b08a22 Mon Sep 17 00:00:00 2001
From: Kagol <kagol@sina.com>
Date: Mon, 18 Nov 2024 20:25:26 +0800
Subject: [PATCH 2/8] fix(base-select): fix data display error when set
 disabled and hover-expand

---
 packages/renderless/src/base-select/index.ts |  17 +++
 packages/renderless/src/base-select/vue.ts   |  12 +-
 packages/vue/src/base-select/src/index.ts    |   4 +
 packages/vue/src/base-select/src/pc.vue      | 123 +++++++++++--------
 4 files changed, 106 insertions(+), 50 deletions(-)

diff --git a/packages/renderless/src/base-select/index.ts b/packages/renderless/src/base-select/index.ts
index b6c3b5e6f5..c2ea6f6dca 100644
--- a/packages/renderless/src/base-select/index.ts
+++ b/packages/renderless/src/base-select/index.ts
@@ -1971,6 +1971,23 @@ export const watchShowClose =
   }
 
 // 以下为tiny 新增功能
+/**
+ * 兼容不同主题多选禁用的展示类型
+ * default 和 smb 主题，displayOnly 时显示为 tagText,否则为 tag
+ * aurora 主题 displayOnly||disabled 时显示为tagText,否则为 tag
+ */
+export const computedShowTagText =
+  ({ state }) =>
+  () =>
+    state.isDisplayOnly
+
+/**
+ * 兼容不同主题多选，tag 在disabled 和 required 时是否显示关闭按钮的区别
+ * default 主题 ，禁用显示关闭按钮，required目前和aurora保持一致不显示，待设计图补充时更新
+ * aurora 主题，禁用时无禁用效果，required 时不显示关闭按钮
+ */
+export const isTagClosable = () => (item) => !item.required
+
 export const computedGetIcon =
   ({ designConfig, props }) =>
   () => {
diff --git a/packages/renderless/src/base-select/vue.ts b/packages/renderless/src/base-select/vue.ts
index d01ba74f9f..fe1241b1e4 100644
--- a/packages/renderless/src/base-select/vue.ts
+++ b/packages/renderless/src/base-select/vue.ts
@@ -97,7 +97,9 @@ import {
   onClickCollapseTag,
   computedIsExpand,
   updateSelectedData,
-  hidePanel
+  hidePanel,
+  computedShowTagText,
+  isTagClosable
 } from './index'
 import debounce from '../common/deps/debounce'
 import { isNumber } from '../common/type'
@@ -154,7 +156,9 @@ export const api = [
   'clearSearchText',
   'onClickCollapseTag',
   'updateSelectedData',
-  'hidePanel'
+  'hidePanel',
+  'computedShowTagText',
+  'isTagClosable'
 ]
 
 const initState = ({ reactive, computed, props, api, emitter, parent, constants, useBreakpoint, vm, designConfig }) => {
@@ -271,6 +275,8 @@ const initStateAdd = ({ computed, props, api, parent }) => {
     formItemSize: computed(() => (parent.formItem || { state: {} }).state.formItemSize),
     selectDisabled: computed(() => api.computedSelectDisabled()),
     isDisplayOnly: computed(() => props.displayOnly || (parent.form || {}).displayOnly),
+    isDisabled: computed(() => props.disabled || (parent.form || {}).disabled),
+    isShowTagText: computed(() => api.computedShowTagText()),
     gridCheckedData: computed(() => api.getcheckedData()),
     searchSingleCopy: computed(() => props.allowCopy && !props.multiple && props.filterable),
     childrenName: computed(() => 'children'),
@@ -364,6 +370,8 @@ const initApi = ({
     computedGetTagType: computedGetTagType({ designConfig, props }),
     clearSearchText: clearSearchText({ state, api }),
     clearNoMatchValue: clearNoMatchValue({ props, emit }),
+    computedShowTagText: computedShowTagText({ state }),
+    isTagClosable: isTagClosable(),
     updateSelectedData: updateSelectedData({ state }),
     hidePanel: hidePanel({ state })
   })
diff --git a/packages/vue/src/base-select/src/index.ts b/packages/vue/src/base-select/src/index.ts
index 7257d68804..40e27e7e1f 100644
--- a/packages/vue/src/base-select/src/index.ts
+++ b/packages/vue/src/base-select/src/index.ts
@@ -344,6 +344,10 @@ export default defineComponent({
     allText: {
       type: String,
       default: ''
+    },
+    showAllTextTag: {
+      type: Boolean,
+      default: false
     }
   },
   setup(props, context) {
diff --git a/packages/vue/src/base-select/src/pc.vue b/packages/vue/src/base-select/src/pc.vue
index 25a5931317..87841b9cfb 100644
--- a/packages/vue/src/base-select/src/pc.vue
+++ b/packages/vue/src/base-select/src/pc.vue
@@ -70,11 +70,15 @@
         </tiny-filter-box>
         <div
           ref="tags"
-          :class="['tiny-base-select__tags', { 'is-showicon': slots.prefix, 'not-selected': !state.selected.length }]"
+          :class="[
+            'tiny-base-select__tags',
+            { 'is-showicon': slots.prefix, 'not-selected': !state.selected.length },
+            { 'is-show-tag': !state.isShowTagText }
+          ]"
           v-if="multiple && !state.isDisplayOnly && !shape"
           :style="state.tagsStyle"
         >
-          <span v-if="!state.selectDisabled">
+          <span v-if="!state.isShowTagText">
             <span v-if="collapseTags && state.selected.length">
               <tiny-tag
                 :closable="!state.selectDisabled"
@@ -119,66 +123,88 @@
                 <span class="tiny-base-select__tags-text">+ {{ state.selected.length - 1 }}</span>
               </tiny-tag>
             </span>
+            <!-- 显示所有标签的循环 -->
             <span ref="tags-content" v-if="!collapseTags">
+              <!-- 当 showAllTextTag 时， 用all-text属性做为tag。 xdesign规范 -->
               <tiny-tag
-                v-if="hoverExpand || clickExpand"
-                :class="['tiny-base-select__tags-collapse', { 'is-hidden': state.isHidden }]"
+                v-if="showAllTextTag && state.selectCls === 'checked-sur'"
                 :type="state.getTagType"
-                key="tags-collapse"
-                data-tag="tags-collapse"
-                :closable="false"
+                key="tags-all-text-tag"
+                data-tag="tags-all-text-tag"
+                :disabled="state.isDisabled"
+                :closable="true"
                 :size="state.collapseTagSize"
-                @click="onClickCollapseTag($event)"
+                @close="toggleCheckAll(false)"
               >
-                <template v-if="hoverExpand"> + {{ state.collapseTagsLength }} </template>
-                <icon-ellipsis v-else></icon-ellipsis>
+                {{ allText || t('ui.base.all') }}
               </tiny-tag>
-              <tiny-tag
-                v-for="(item, index) in state.selected"
-                :key="getValueKey(item)"
-                :class="{ 'not-visible': state.toHideIndex <= index && !state.isExpand }"
-                :closable="!item.disabled && !item.required"
-                :size="state.collapseTagSize"
-                :hit="item.state ? item.state.hitState : item.hitState"
-                :type="state.getTagType"
-                @close="deleteTag($event, item)"
-                disable-transitions
-              >
-                <tiny-tooltip
-                  effect="light"
-                  placement="top"
-                  @mouseenter.native="handleEnterTag($event, getValueKey(item))"
+              <!-- 当非 showAllTextTag 时，原来的模式渲染 -->
+              <template v-else>
+                <tiny-tag
+                  v-if="hoverExpand || clickExpand"
+                  :class="['tiny-base-select__tags-collapse', { 'is-hidden': state.isHidden || state.isDisabled }]"
+                  :type="state.getTagType"
+                  key="tags-collapse"
+                  data-tag="tags-collapse"
+                  only-icon
+                  :closable="false"
+                  :size="state.collapseTagSize"
+                  @click="onClickCollapseTag($event)"
                 >
-                  <span v-if="!state.visible && state.overflow === index" class="tiny-base-select__tags-text">
-                    {{ item.state ? item.state.currentLabel + '... ' : item.currentLabel + '... ' }}
-                  </span>
-                  <span v-else class="tiny-base-select__tags-text">
-                    <slot name="label" :item="getLabelSlotValue(item)">
-                      {{ item.state ? item.state.currentLabel : item.currentLabel }}
-                    </slot>
-                  </span>
-                  <template v-if="state.tooltipContent[getValueKey(item)]" #content>
-                    <span v-if="!state.visible && state.overflow === index">
+                  <template v-if="hoverExpand"> + {{ state.collapseTagsLength }} </template>
+                  <icon-ellipsis v-else></icon-ellipsis>
+                </tiny-tag>
+                <tiny-tag
+                  v-for="(item, index) in state.selected"
+                  :key="getValueKey(item)"
+                  :class="{
+                    'not-visible': state.toHideIndex <= index && !state.isExpand,
+                    'is-required': item.required
+                  }"
+                  :closable="isTagClosable(item)"
+                  :disabled="state.isDisabled || item.disabled"
+                  :size="state.collapseTagSize"
+                  :hit="item.state ? item.state.hitState : item.hitState"
+                  :type="state.getTagType"
+                  @close="deleteTag($event, item)"
+                  disable-transitions
+                >
+                  <tiny-tooltip
+                    effect="light"
+                    placement="top"
+                    @mouseenter.native="handleEnterTag($event, getValueKey(item))"
+                  >
+                    <span v-if="!state.visible && state.overflow === index" class="tiny-base-select__tags-text">
                       {{ item.state ? item.state.currentLabel + '... ' : item.currentLabel + '... ' }}
                     </span>
-                    <span v-else>
+                    <span v-else class="tiny-base-select__tags-text">
                       <slot name="label" :item="getLabelSlotValue(item)">
                         {{ item.state ? item.state.currentLabel : item.currentLabel }}
                       </slot>
                     </span>
-                  </template>
-                </tiny-tooltip>
-              </tiny-tag>
+                    <template v-if="state.tooltipContent[getValueKey(item)]" #content>
+                      <span v-if="!state.visible && state.overflow === index">
+                        {{ item.state ? item.state.currentLabel + '... ' : item.currentLabel + '... ' }}
+                      </span>
+                      <span v-else>
+                        <slot name="label" :item="getLabelSlotValue(item)">
+                          {{ item.state ? item.state.currentLabel : item.currentLabel }}
+                        </slot>
+                      </span>
+                    </template>
+                  </tiny-tooltip>
+                </tiny-tag>
 
-              <!-- 收起按钮 -->
-              <span
-                v-if="clickExpand && state.showCollapseTag"
-                class="tiny-base-select__collapse-text"
-                @click="onClickCollapseTag($event)"
-              >
-                {{ t('ui.select.collapse') }}
-                <icon-chevron-up></icon-chevron-up>
-              </span>
+                <!-- 收起按钮 -->
+                <span
+                  v-if="clickExpand && state.showCollapseTag"
+                  class="tiny-base-select__collapse-text"
+                  @click="onClickCollapseTag($event)"
+                >
+                  {{ t('ui.select.collapse') }}
+                  <icon-chevron-up></icon-chevron-up>
+                </span>
+              </template>
             </span>
           </span>
 
@@ -694,6 +720,7 @@ export default defineComponent({
     'showProportion',
     'clickExpand',
     'maxVisibleRows',
+    'showAllTextTag',
     'allText'
   ],
   setup(props, context) {

From 5d56fa1c27ed0c2eb2f45a59aa1b405229a8d779 Mon Sep 17 00:00:00 2001
From: Kagol <kagol@sina.com>
Date: Mon, 18 Nov 2024 21:04:30 +0800
Subject: [PATCH 3/8] fix(base-select): fix e2e test failed

---
 .../demos/pc/app/base-select/disabled.spec.ts      |  2 --
 .../sites/demos/pc/app/base-select/size.spec.ts    | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/examples/sites/demos/pc/app/base-select/disabled.spec.ts b/examples/sites/demos/pc/app/base-select/disabled.spec.ts
index e4eece8691..6d69b5fb24 100644
--- a/examples/sites/demos/pc/app/base-select/disabled.spec.ts
+++ b/examples/sites/demos/pc/app/base-select/disabled.spec.ts
@@ -64,8 +64,6 @@ test('多选，禁用项默认选中', async ({ page }) => {
 
   // 默认值显示tag数
   await expect(tag).toHaveCount(2)
-  // 禁用项默认选中不显示关闭图标
-  await expect(tag.filter({ hasText: '上海' }).locator('svg')).toHaveCount(0)
   // 非禁用项显示关闭图标
   await expect(tag.filter({ hasText: '天津' }).locator('svg')).toHaveCount(1)
 
diff --git a/examples/sites/demos/pc/app/base-select/size.spec.ts b/examples/sites/demos/pc/app/base-select/size.spec.ts
index 5b0bc87f7c..1b1aaefa5b 100644
--- a/examples/sites/demos/pc/app/base-select/size.spec.ts
+++ b/examples/sites/demos/pc/app/base-select/size.spec.ts
@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test'
 
-test('默认尺寸', async ({ page }) => {
+test('medium 尺寸', async ({ page }) => {
   page.on('pageerror', (exception) => expect(exception).toBeNull())
   await page.goto('base-select#size')
 
@@ -9,11 +9,12 @@ test('默认尺寸', async ({ page }) => {
   const input = select.locator('.tiny-input')
   const tag = select.locator('.tiny-tag')
 
-  await expect(input.locator('.tiny-input__inner')).toHaveCSS('height', '32px')
-  await expect(tag.nth(0)).toHaveClass(/tiny-tag--light/)
+  await expect(input).toHaveClass(/tiny-input-medium/)
+  await expect(input.locator('.tiny-input__inner')).toHaveCSS('height', '40px')
+  await expect(tag.nth(0)).toHaveClass(/tiny-tag--medium tiny-tag--light/)
 })
 
-test('medium 尺寸', async ({ page }) => {
+test('默认尺寸', async ({ page }) => {
   page.on('pageerror', (exception) => expect(exception).toBeNull())
   await page.goto('base-select#size')
 
@@ -22,9 +23,8 @@ test('medium 尺寸', async ({ page }) => {
   const input = select.locator('.tiny-input')
   const tag = select.locator('.tiny-tag')
 
-  await expect(input).toHaveClass(/tiny-input-medium/)
-  await expect(input.locator('.tiny-input__inner')).toHaveCSS('height', '40px')
-  await expect(tag.nth(0)).toHaveClass(/tiny-tag--medium tiny-tag--light/)
+  await expect(input.locator('.tiny-input__inner')).toHaveCSS('height', '32px')
+  await expect(tag.nth(0)).toHaveClass(/tiny-tag--light/)
 })
 
 test('small 尺寸', async ({ page }) => {

From ab5516e0f06246099243be37863a204ad81f6cff Mon Sep 17 00:00:00 2001
From: Kagol <kagol@sina.com>
Date: Tue, 19 Nov 2024 10:02:50 +0800
Subject: [PATCH 4/8] fix(base-select): fix search component style when set
 searchable

---
 packages/vue/src/base-select/src/pc.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/vue/src/base-select/src/pc.vue b/packages/vue/src/base-select/src/pc.vue
index 87841b9cfb..1e52a50902 100644
--- a/packages/vue/src/base-select/src/pc.vue
+++ b/packages/vue/src/base-select/src/pc.vue
@@ -387,6 +387,7 @@
           <!-- tiny 新增 可搜索的输入框 -->
           <tiny-input
             v-if="searchable"
+            input-box-type="underline"
             v-model="state.query"
             :placeholder="t('ui.search.placeholder')"
             class="tiny-select-dropdown__search"
@@ -516,7 +517,7 @@
             v-if="!slots.panel && state.emptyText && (!allowCreate || loading || (allowCreate && state.emptyFlag))"
           >
             <!-- tiny 新增 showEmptyImage功能 -->
-            <div v-if="loadingText || slots.empty">
+            <div v-if="loadingText || slots.empty" class="tiny-select-dropdown__empty-wrap">
               <slot name="empty" v-if="slots.empty"></slot>
               <span v-else-if="showEmptyImage" class="tiny-select-dropdown__empty-images"></span>
               <p class="tiny-select-dropdown__empty" v-else>

From 71dd9d2ab9c3d4de9dd5795afa09ce95e1b81c05 Mon Sep 17 00:00:00 2001
From: Kagol <kagol@sina.com>
Date: Tue, 19 Nov 2024 10:56:27 +0800
Subject: [PATCH 5/8] fix(base-select): fix top-create style

---
 packages/vue/src/base-select/src/pc.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/vue/src/base-select/src/pc.vue b/packages/vue/src/base-select/src/pc.vue
index 1e52a50902..b9e69d92f6 100644
--- a/packages/vue/src/base-select/src/pc.vue
+++ b/packages/vue/src/base-select/src/pc.vue
@@ -371,9 +371,9 @@
               autofocus
             ></tiny-input>
           </div>
-          <div v-if="topCreate" class="tiny-base-select__top-create">
+          <div v-if="topCreate" class="tiny-select__top-create">
             <div @click="$emit('top-create-click', $event)">
-              <icon-plus></icon-plus>
+              <component :is="state.designConfig?.icons?.addIcon || 'icon-add-circle'"></component>
               <span>{{ topCreateText }}</span>
             </div>
           </div>
@@ -561,11 +561,12 @@ import {
   IconCheck,
   IconCheckedSur,
   IconCopy,
-  IconPlus,
   IconDeltaDown,
   IconSearch,
   IconEllipsis,
-  IconChevronUp
+  IconChevronUp,
+  iconAddCircle,
+  iconLoadingShadow
 } from '@opentiny/vue-icon'
 import TinyTooltip from '@opentiny/vue-tooltip'
 import FilterBox from '@opentiny/vue-filter-box'
@@ -623,7 +624,8 @@ export default defineComponent({
     IconClose: IconClose(),
     TinyScrollbar,
     IconCopy: IconCopy(),
-    IconPlus: IconPlus(),
+    IconAddCircle: iconAddCircle(),
+    IconLoadingShadow: iconLoadingShadow(),
     TinySelectDropdown,
     IconHalfselect: IconHalfselect(),
     IconCheck: IconCheck(),

From 9e524ef689a9b34a06917a1908a57879fe6feb1f Mon Sep 17 00:00:00 2001
From: Kagol <kagol@sina.com>
Date: Tue, 19 Nov 2024 11:10:06 +0800
Subject: [PATCH 6/8] fix(base-select): fix slot-prefix demo style

---
 .../pc/app/base-select/slot-default-composition-api.vue   | 8 +++-----
 examples/sites/demos/pc/app/base-select/slot-default.vue  | 8 +++-----
 .../pc/app/base-select/slot-prefix-composition-api.vue    | 6 +++---
 examples/sites/demos/pc/app/base-select/slot-prefix.vue   | 6 +++---
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/examples/sites/demos/pc/app/base-select/slot-default-composition-api.vue b/examples/sites/demos/pc/app/base-select/slot-default-composition-api.vue
index d521744cb1..47d375e9af 100644
--- a/examples/sites/demos/pc/app/base-select/slot-default-composition-api.vue
+++ b/examples/sites/demos/pc/app/base-select/slot-default-composition-api.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <p>场景1：带标签和提示信息</p>
+    <br />
     <tiny-base-select v-model="value1" popper-class="slot-default">
       <template v-for="item in options1">
         <tiny-tooltip v-if="item.tip" :content="item.tip" placement="right" effect="light" :key="item.value">
@@ -15,8 +16,10 @@
         </tiny-option>
       </template>
     </tiny-base-select>
+    <br /><br />
 
     <p>场景2：选项双行</p>
+    <br />
     <tiny-base-select v-model="value2" popper-class="double-row">
       <tiny-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
         <div>
@@ -69,11 +72,6 @@ const value2 = ref('选项1')
     margin: 6px;
   }
 }
-p {
-  font-size: 14px;
-  line-height: 1.5;
-  padding: 16px 0;
-}
 </style>
 
 <style lang="less">
diff --git a/examples/sites/demos/pc/app/base-select/slot-default.vue b/examples/sites/demos/pc/app/base-select/slot-default.vue
index e9da3c5fb4..0610a49359 100644
--- a/examples/sites/demos/pc/app/base-select/slot-default.vue
+++ b/examples/sites/demos/pc/app/base-select/slot-default.vue
@@ -1,6 +1,7 @@
 <template>
   <div>
     <p>场景1：带标签和提示信息</p>
+    <br />
     <tiny-base-select v-model="value1" popper-class="slot-default">
       <template v-for="item in options1">
         <tiny-tooltip v-if="item.tip" :content="item.tip" placement="right" effect="light" :key="item.value">
@@ -15,8 +16,10 @@
         </tiny-option>
       </template>
     </tiny-base-select>
+    <br /><br />
 
     <p>场景2：选项双行</p>
+    <br />
     <tiny-base-select v-model="value2" popper-class="double-row">
       <tiny-option v-for="item in options2" :key="item.value" :label="item.label" :value="item.value">
         <div>
@@ -78,11 +81,6 @@ export default {
     margin: 6px;
   }
 }
-p {
-  font-size: 14px;
-  line-height: 1.5;
-  padding: 16px 0;
-}
 </style>
 
 <style lang="less">
diff --git a/examples/sites/demos/pc/app/base-select/slot-prefix-composition-api.vue b/examples/sites/demos/pc/app/base-select/slot-prefix-composition-api.vue
index e9e76adbeb..3a3c2d2b90 100644
--- a/examples/sites/demos/pc/app/base-select/slot-prefix-composition-api.vue
+++ b/examples/sites/demos/pc/app/base-select/slot-prefix-composition-api.vue
@@ -1,7 +1,7 @@
 <template>
   <tiny-base-select v-model="value" multiple collapse-tags>
     <template #prefix>
-      <tiny-icon-share></tiny-icon-share>
+      <tiny-icon-location></tiny-icon-location>
     </template>
     <tiny-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </tiny-option>
   </tiny-base-select>
@@ -10,7 +10,7 @@
 <script setup>
 import { ref } from 'vue'
 import { TinyBaseSelect, TinyOption } from '@opentiny/vue'
-import { iconShare } from '@opentiny/vue-icon'
+import { iconLocation } from '@opentiny/vue-icon'
 
 const options = ref([
   { value: '选项1', label: '北京' },
@@ -21,7 +21,7 @@ const options = ref([
 ])
 const value = ref('')
 
-const TinyIconShare = iconShare()
+const TinyIconLocation = iconLocation()
 </script>
 
 <style lang="less" scoped>
diff --git a/examples/sites/demos/pc/app/base-select/slot-prefix.vue b/examples/sites/demos/pc/app/base-select/slot-prefix.vue
index c03d91ee14..31972b7a6e 100644
--- a/examples/sites/demos/pc/app/base-select/slot-prefix.vue
+++ b/examples/sites/demos/pc/app/base-select/slot-prefix.vue
@@ -1,7 +1,7 @@
 <template>
   <tiny-base-select v-model="value" multiple collapse-tags>
     <template #prefix>
-      <icon-share></icon-share>
+      <tiny-icon-location></tiny-icon-location>
     </template>
     <tiny-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"> </tiny-option>
   </tiny-base-select>
@@ -9,13 +9,13 @@
 
 <script>
 import { TinyBaseSelect, TinyOption } from '@opentiny/vue'
-import { iconShare } from '@opentiny/vue-icon'
+import { iconLocation } from '@opentiny/vue-icon'
 
 export default {
   components: {
     TinyBaseSelect,
     TinyOption,
-    IconShare: iconShare()
+    TinyIconLocation: iconLocation()
   },
   data() {
     return {

From dad14ae70eb5f0e2ace3da80a104afa7b4b0a16c Mon Sep 17 00:00:00 2001
From: Kagol <kagol@sina.com>
Date: Tue, 19 Nov 2024 11:18:34 +0800
Subject: [PATCH 7/8] fix(base-select): fix option can not selected when set
 clear-no-match-value to true

---
 packages/renderless/src/base-select/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/renderless/src/base-select/index.ts b/packages/renderless/src/base-select/index.ts
index 06a7f662d0..a510b172f6 100644
--- a/packages/renderless/src/base-select/index.ts
+++ b/packages/renderless/src/base-select/index.ts
@@ -272,7 +272,7 @@ const getOptionOfSetSelected = ({ api, props }) => {
   }
 
   // tiny 新增
-  if (!option.currentLabel) {
+  if (!option.state.currentLabel) {
     api.clearNoMatchValue('')
   }
 

From 7fe48295b318f3d6318e05cad68baaf807ede826 Mon Sep 17 00:00:00 2001
From: Kagol <kagol@sina.com>
Date: Tue, 19 Nov 2024 11:33:14 +0800
Subject: [PATCH 8/8] chore(base-select): remove beta tag

---
 .../sites/demos/pc/app/base-select/webdoc/base-select.cn.md  | 2 +-
 .../sites/demos/pc/app/base-select/webdoc/base-select.js     | 3 ---
 examples/sites/demos/pc/menus.js                             | 5 +----
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/examples/sites/demos/pc/app/base-select/webdoc/base-select.cn.md b/examples/sites/demos/pc/app/base-select/webdoc/base-select.cn.md
index 8eeddebe42..7e9241f665 100644
--- a/examples/sites/demos/pc/app/base-select/webdoc/base-select.cn.md
+++ b/examples/sites/demos/pc/app/base-select/webdoc/base-select.cn.md
@@ -4,4 +4,4 @@ title: BaseSelect 基础选择器
 
 # BaseSelect 基础选择器
 
-BaseSelect 基础选择器是 Select 组件的基础版本，用法和 Select 一样，但是不包含下拉树和下拉表格功能。
+BaseSelect 基础选择器是 Select 组件的基础版本，用法和 Select 一样，但是不包含下拉树和下拉表格功能。BaseSelect 组件的包体积更小，如果你不需要下拉树和下拉表格功能，推荐使用 BaseSelect 组件，而不是 Select 组件。
diff --git a/examples/sites/demos/pc/app/base-select/webdoc/base-select.js b/examples/sites/demos/pc/app/base-select/webdoc/base-select.js
index 7e4bd4d810..24be0a5647 100644
--- a/examples/sites/demos/pc/app/base-select/webdoc/base-select.js
+++ b/examples/sites/demos/pc/app/base-select/webdoc/base-select.js
@@ -1,9 +1,6 @@
 export default {
   column: '2',
   owner: '',
-  meta: {
-    experimental: '3.16.0'
-  },
   demos: [
     {
       demoId: 'basic-usage',
diff --git a/examples/sites/demos/pc/menus.js b/examples/sites/demos/pc/menus.js
index 2fef4cf4b2..5c9b859a08 100644
--- a/examples/sites/demos/pc/menus.js
+++ b/examples/sites/demos/pc/menus.js
@@ -121,10 +121,7 @@ export const cmpMenus = [
       {
         'nameCn': '基础选择器',
         'name': 'BaseSelect',
-        'key': 'base-select',
-        'meta': {
-          'experimental': '3.17.0'
-        }
+        'key': 'base-select'
       },
       { 'nameCn': '级联选择器', 'name': 'Cascader', 'key': 'cascader' },
       { 'nameCn': '级联面板', 'name': 'CascaderPanel', 'key': 'cascader-panel' },