Merge branch 'dev' into MomoPoppy/feat-dropdown-0914

Author: MomoPoppy

.vscode/settings.json

@@ -80,6 +80,15 @@
       "backgroundColor": "transparent",
       "bold": false,
       "italic": false
+    },
+    {
+      "tag": "--",
+      "color": "#FFFFFF",
+      "strikethrough": false,
+      "underline": false,
+      "backgroundColor": "#5CB300",
+      "bold": false,
+      "italic": false
     }
   ],
   "vue.codeActions.enabled": false

examples/sites/demos/pc/app/action-menu/icon-composition-api.vue

@@ -42,7 +42,7 @@ const options = ref([
   },
   {
     label: '网络设置',
-    children: [{ label: '更改安全组' }, { label: '切换VPC', divided: true }]
+    children: [{ label: '更改安全组' }, { label: '切换VPC' }]
   }
 ])
 

examples/sites/demos/pc/app/action-menu/icon.vue

@@ -43,7 +43,7 @@ export default {
         },
         {
           label: '网络设置',
-          children: [{ label: '更改安全组' }, { label: '切换VPC', divided: true }]
+          children: [{ label: '更改安全组' }, { label: '切换VPC' }]
         }
       ],
       options1: [

examples/sites/demos/pc/app/carousel/show-title-composition-api.vue

@@ -21,7 +21,7 @@ import { Carousel as TinyCarousel, CarouselItem as TinyCarouselItem } from '@ope
 }
 
 .carousel-item-demo:nth-child(2n) {
-  background-color: #fafafa;
+  background-color: #f0f0f0;
 }
 
 .carousel-item-demo:nth-child(2n + 1) {

examples/sites/demos/pc/app/carousel/show-title.vue

@@ -28,7 +28,7 @@ export default {
 }
 
 .carousel-item-demo:nth-child(2n) {
-  background-color: #fafafa;
+  background-color: #f0f0f0;
 }
 
 .carousel-item-demo:nth-child(2n + 1) {

examples/sites/demos/pc/app/cascader/check-strictly-multiple.spec.ts

@@ -6,8 +6,4 @@ test('多选选择任意一级选项', async ({ page }) => {
   await page.getByText('指南 /安装指南 /开发 /引入组件').click()
   await page.getByRole('menuitem', { name: '开发' }).locator('span').nth(1).click()
   await page.getByRole('menuitem', { name: '安装' }).click()
-  const kaifa = page.getByRole('menuitem', { name: '开发' }).locator('span').nth(1)
-  const anzhuang = page.getByRole('menuitem', { name: '安装' }).locator('span').nth(1)
-  await expect(kaifa).toHaveCSS('background-color', 'rgb(94, 124, 224)')
-  await expect(anzhuang).toHaveCSS('background-color', 'rgb(94, 124, 224)')
 })

examples/sites/demos/pc/app/cascader/filter-mode-composition-api.vue

@@ -9,7 +9,7 @@
       tip="提示"
       label="开发文档"
     ></tiny-cascader>
-    <div>
+    <div style="margin-top: 16px">
       <tiny-cascader v-model="value" :options="options" shape="filter" label="开发文档" blank></tiny-cascader>
     </div>
   </div>

examples/sites/demos/pc/app/cascader/filter-mode.vue

@@ -9,7 +9,7 @@
       tip="提示"
       label="开发文档"
     ></tiny-cascader>
-    <div>
+    <div style="margin-top: 16px">
       <tiny-cascader v-model="value" :options="options" shape="filter" label="开发文档" blank></tiny-cascader>
     </div>
   </div>

examples/sites/demos/pc/app/cascader/size.spec.ts

@@ -6,8 +6,7 @@ test('size', async ({ page }) => {
 
   await expect(page.locator('.tiny-cascader.tiny-cascader--mini input')).toHaveCSS('height', '24px')
 
-  await expect(page.locator('.tiny-cascader.tiny-cascader--small input')).toHaveCSS('height', '32px')
+  await expect(page.locator('.tiny-cascader.tiny-cascader--small input')).toHaveCSS('height', '28px')
 
   await expect(page.locator('.tiny-cascader.tiny-cascader--medium input')).toHaveCSS('height', '40px')
-
 })

examples/sites/demos/pc/app/checkbox/basic-usage.spec.ts

@@ -6,8 +6,8 @@ test('基础用法', async ({ page }) => {
   const demo = page.locator('#basic-usage')
   const checkbox = demo.locator('.tiny-checkbox')
   await expect(checkbox).toHaveClass(/is-checked/)
-  await expect(checkbox.locator('.tiny-checkbox__inner')).toHaveCSS('background-color', 'rgb(94, 124, 224)')
-  await expect(checkbox.locator('.tiny-checkbox__inner')).toHaveCSS('border-left-color', 'rgb(94, 124, 224)')
+  await expect(checkbox.locator('.tiny-checkbox__inner')).toHaveCSS('background-color', 'rgb(20, 118, 255)')
+  await expect(checkbox.locator('.tiny-checkbox__inner')).toHaveCSS('border-left-color', 'rgb(20, 118, 255)')
   await checkbox.click()
   await expect(checkbox).not.toHaveClass(/is-checked/)
 })