From 212c56f69f4ce3baa5fdd695d551ae20a1434075 Mon Sep 17 00:00:00 2001 From: ajaxzheng <894103554@qq.com> Date: Tue, 8 Apr 2025 10:49:18 +0800 Subject: [PATCH 1/3] feat(release): add dist directory check for specific packages to optimize the release process (#3265) --- internals/cli/src/commands/release/releaseAlpha.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/internals/cli/src/commands/release/releaseAlpha.ts b/internals/cli/src/commands/release/releaseAlpha.ts index 48bf9ce96b..33c68fb39e 100644 --- a/internals/cli/src/commands/release/releaseAlpha.ts +++ b/internals/cli/src/commands/release/releaseAlpha.ts @@ -77,6 +77,7 @@ const releaseSiteAlpha = (updateVersion) => { fs.writeFileSync(PKG_PATH, JSON.stringify(PKGContent, null, 2)) } +const needDistDirPackages = ['utils', 'vue-hooks', 'vue-runtime'] export const releaseAlpha = ({ updateVersion }) => { const distLists = [ 'dist3/', @@ -90,7 +91,17 @@ export const releaseAlpha = ({ updateVersion }) => { 'vue-runtime' ] distLists.forEach((item) => { - findAllpage(pathFromPackages(item), updateVersion) + if (needDistDirPackages.includes(item)) { + // 检查是否存在dist或dist3文件夹 + const hasDistDir = fs.existsSync(pathFromPackages(`${item}/dist`)) + const hasDist3Dir = fs.existsSync(pathFromPackages(`${item}/dist3`)) + + if (hasDistDir || hasDist3Dir) { + findAllpage(pathFromPackages(item), updateVersion) + } + } else { + findAllpage(pathFromPackages(item), updateVersion) + } }) releaseSiteAlpha(updateVersion) } From 0652fa01189b095bbdc64732f928197314385d5b Mon Sep 17 00:00:00 2001 From: MomoPoppy <125256456+MomoPoppy@users.noreply.github.com> Date: Tue, 8 Apr 2025 05:00:57 -0700 Subject: [PATCH 2/3] fix(base-select): [select,base-select] fix the highlight style of the selected item icon (#3268) * fix(base-select): [select,base-select] fix the highlight style of the selected item icon * feat(base-select): [base-select] modify version number --- .../demos/pc/app/select/collapse-tags-composition-api.vue | 3 +++ examples/sites/demos/pc/app/select/collapse-tags.vue | 3 +++ .../demos/pc/app/select/multiple-mix-composition-api.vue | 2 ++ examples/sites/demos/pc/app/select/multiple-mix.vue | 2 ++ packages/theme/package.json | 2 +- packages/theme/src/option/index.less | 4 ---- packages/vue/src/base-select/package.json | 2 +- packages/vue/src/base-select/src/pc.vue | 2 +- 8 files changed, 13 insertions(+), 7 deletions(-) diff --git a/examples/sites/demos/pc/app/select/collapse-tags-composition-api.vue b/examples/sites/demos/pc/app/select/collapse-tags-composition-api.vue index 246d9a3ce7..2e0a693302 100644 --- a/examples/sites/demos/pc/app/select/collapse-tags-composition-api.vue +++ b/examples/sites/demos/pc/app/select/collapse-tags-composition-api.vue @@ -16,6 +16,9 @@


+
+
+
场景 3:click-expand 折叠

diff --git a/examples/sites/demos/pc/app/select/collapse-tags.vue b/examples/sites/demos/pc/app/select/collapse-tags.vue index 85f5e3cf8a..bc0b29e058 100644 --- a/examples/sites/demos/pc/app/select/collapse-tags.vue +++ b/examples/sites/demos/pc/app/select/collapse-tags.vue @@ -16,6 +16,9 @@


+
+
+
场景 3:click-expand 折叠

diff --git a/examples/sites/demos/pc/app/select/multiple-mix-composition-api.vue b/examples/sites/demos/pc/app/select/multiple-mix-composition-api.vue index fb710d6984..639c71e757 100644 --- a/examples/sites/demos/pc/app/select/multiple-mix-composition-api.vue +++ b/examples/sites/demos/pc/app/select/multiple-mix-composition-api.vue @@ -10,6 +10,8 @@ +
+
diff --git a/examples/sites/demos/pc/app/select/multiple-mix.vue b/examples/sites/demos/pc/app/select/multiple-mix.vue index 3722d1d1d3..fdeece82f1 100644 --- a/examples/sites/demos/pc/app/select/multiple-mix.vue +++ b/examples/sites/demos/pc/app/select/multiple-mix.vue @@ -10,6 +10,8 @@ +
+
diff --git a/packages/theme/package.json b/packages/theme/package.json index 850a78a57c..0d1c528c41 100644 --- a/packages/theme/package.json +++ b/packages/theme/package.json @@ -1,7 +1,7 @@ { "name": "@opentiny/vue-theme", "type": "module", - "version": "3.22.0", + "version": "3.22.1", "description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.", "author": "OpenTiny Team", "license": "MIT", diff --git a/packages/theme/src/option/index.less b/packages/theme/src/option/index.less index 1100687534..547e9db1d2 100644 --- a/packages/theme/src/option/index.less +++ b/packages/theme/src/option/index.less @@ -51,10 +51,6 @@ path:first-child { fill: var(--tv-Option-icon-color-checked); } - - path:last-child { - fill: var(--tv-Option-icon-inverse-disabled); - } } .check.tiny-svg { diff --git a/packages/vue/src/base-select/package.json b/packages/vue/src/base-select/package.json index 0a52f33d15..bc0dfdc85b 100644 --- a/packages/vue/src/base-select/package.json +++ b/packages/vue/src/base-select/package.json @@ -1,7 +1,7 @@ { "name": "@opentiny/vue-base-select", "type": "module", - "version": "3.22.0", + "version": "3.22.1", "description": "", "license": "MIT", "sideEffects": false, diff --git a/packages/vue/src/base-select/src/pc.vue b/packages/vue/src/base-select/src/pc.vue index 90cd7efd36..c4bc63450a 100644 --- a/packages/vue/src/base-select/src/pc.vue +++ b/packages/vue/src/base-select/src/pc.vue @@ -456,7 +456,7 @@