Skip to content

Commit 7ca72cd

Browse files
kagolzzcrMomoPoppy
authored
Sync release-3.22.0 to dev (#3376)
* feat(release): add dist directory check for specific packages to optimize the release process (#3265) * 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 * chore: release v3.22.1 (#3275) * chore: added the cdn address of Huicharts component runtime, and updated the version number of docs to 3.22.3 --------- Co-authored-by: ajaxzheng <894103554@qq.com> Co-authored-by: MomoPoppy <125256456+MomoPoppy@users.noreply.github.com>
1 parent 4209075 commit 7ca72cd

File tree

13 files changed

+30
-12
lines changed

13 files changed

+30
-12
lines changed

examples/sites/demos/pc/app/select/collapse-tags-composition-api.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<br />
1717
<br />
1818
<br />
19+
<br />
20+
<br />
21+
<br />
1922
<div>场景 3:click-expand 折叠</div>
2023
<br />
2124
<tiny-select v-model="value3" :max-visible-rows="2" :options="options" multiple click-expand> </tiny-select>

examples/sites/demos/pc/app/select/collapse-tags.vue

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
<br />
1717
<br />
1818
<br />
19+
<br />
20+
<br />
21+
<br />
1922
<div>场景 3:click-expand 折叠</div>
2023
<br />
2124
<tiny-select v-model="value3" :max-visible-rows="2" :options="options" multiple click-expand> </tiny-select>

examples/sites/demos/pc/app/select/multiple-mix-composition-api.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<tiny-form-item label="多选只读">
1111
<tiny-select v-model="formData.select1" multiple :options="options" hover-expand> </tiny-select>
1212
</tiny-form-item>
13+
<br />
14+
<br />
1315
</tiny-form>
1416
</div>
1517
</template>

examples/sites/demos/pc/app/select/multiple-mix.vue

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
<tiny-form-item label="多选只读">
1111
<tiny-select v-model="formData.select1" multiple :options="options" hover-expand> </tiny-select>
1212
</tiny-form-item>
13+
<br />
14+
<br />
1315
</tiny-form>
1416
</div>
1517
</template>

examples/sites/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opentiny/vue-docs",
33
"type": "module",
4-
"version": "3.22.1",
4+
"version": "3.22.3",
55
"license": "MIT",
66
"scripts": {
77
"start": "vite",
@@ -58,7 +58,7 @@
5858
"sortablejs": "1.15.0",
5959
"tailwindcss": "^3.2.4",
6060
"vue": "^3.4.31",
61-
"vue-i18n": "^9.1.10",
61+
"vue-i18n": "~9.14.3",
6262
"vue-router": "4.1.5"
6363
},
6464
"devDependencies": {

examples/sites/playground/App.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ const createImportMap = (version) => {
7878
'@opentiny/vue-locale': `${getRuntime(version)}tiny-vue-locale.mjs`,
7979
'@opentiny/vue-common': `${getRuntime(version)}tiny-vue-common.mjs`,
8080
'@opentiny/vue-directive': `${getRuntime(version)}tiny-vue-directive.mjs`,
81+
'@opentiny/vue-huicharts': `${getRuntime(version)}tiny-vue-huicharts.mjs`,
8182
'@opentiny/vue-theme/': `${cdnHost}/@opentiny/vue-theme${versionDelimiter}${version}/${fileDelimiter}`,
8283
'@opentiny/vue-theme-mobile/': `${cdnHost}/@opentiny/vue-theme-mobile${versionDelimiter}${version}/${fileDelimiter}`,
8384
'@opentiny/vue-renderless/': `${cdnHost}/@opentiny/vue-renderless${versionDelimiter}${version}/${fileDelimiter}`,

internals/cli/src/commands/release/releaseAlpha.ts

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ const releaseSiteAlpha = (updateVersion) => {
7777
fs.writeFileSync(PKG_PATH, JSON.stringify(PKGContent, null, 2))
7878
}
7979

80+
const needDistDirPackages = ['utils', 'vue-hooks', 'vue-runtime']
8081
export const releaseAlpha = ({ updateVersion }) => {
8182
const distLists = [
8283
'dist3/',
@@ -90,7 +91,17 @@ export const releaseAlpha = ({ updateVersion }) => {
9091
'vue-runtime'
9192
]
9293
distLists.forEach((item) => {
93-
findAllpage(pathFromPackages(item), updateVersion)
94+
if (needDistDirPackages.includes(item)) {
95+
// 检查是否存在dist或dist3文件夹
96+
const hasDistDir = fs.existsSync(pathFromPackages(`${item}/dist`))
97+
const hasDist3Dir = fs.existsSync(pathFromPackages(`${item}/dist3`))
98+
99+
if (hasDistDir || hasDist3Dir) {
100+
findAllpage(pathFromPackages(item), updateVersion)
101+
}
102+
} else {
103+
findAllpage(pathFromPackages(item), updateVersion)
104+
}
94105
})
95106
releaseSiteAlpha(updateVersion)
96107
}

packages/theme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opentiny/vue-theme",
33
"type": "module",
4-
"version": "3.22.0",
4+
"version": "3.22.1",
55
"description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
66
"author": "OpenTiny Team",
77
"license": "MIT",

packages/theme/src/option/index.less

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@
5151
path:first-child {
5252
fill: var(--tv-Option-icon-color-checked);
5353
}
54-
55-
path:last-child {
56-
fill: var(--tv-Option-icon-inverse-disabled);
57-
}
5854
}
5955

6056
.check.tiny-svg {

packages/vue-runtime/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opentiny/vue-runtime",
33
"type": "module",
4-
"version": "3.22.0",
4+
"version": "3.22.1",
55
"description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
66
"author": "OpenTiny Team",
77
"license": "MIT",

packages/vue/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opentiny/vue",
33
"private": true,
4-
"version": "3.22.0",
4+
"version": "3.22.1",
55
"description": "An enterprise-class UI component library, support both Vue.js 2 and Vue.js 3, as well as PC and mobile.",
66
"homepage": "https://opentiny.design/tiny-vue",
77
"keywords": [

packages/vue/src/base-select/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@opentiny/vue-base-select",
33
"type": "module",
4-
"version": "3.22.0",
4+
"version": "3.22.1",
55
"description": "",
66
"license": "MIT",
77
"sideEffects": false,

packages/vue/src/base-select/src/pc.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@
456456
<slot name="dropdown"></slot>
457457
<li
458458
v-if="multiple && showCheck && showAlloption && !state.multipleLimit && !state.query && !remote"
459-
class="tiny-option tiny-select-dropdown__item"
459+
class="tiny-option tiny-option_all tiny-select-dropdown__item"
460460
data-tag="tiny-option"
461461
:class="[
462462
{

0 commit comments

Comments
 (0)