@varlet/cli 2.0.0-alpha.1664527888620 → 2.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@varlet/cli",
-  "version": "2.0.0-alpha.1664527888620",
+  "version": "2.0.0",
   "description": "cli of varlet",
   "bin": {
     "varlet-cli": "./lib/index.js"
@@ -32,10 +32,10 @@
     "@babel/helper-plugin-utils": "^7.14.5",
     "@babel/preset-env": "^7.14.8",
     "@babel/preset-typescript": "^7.14.5",
-    "@varlet/icons": "2.0.0-alpha.1664527888620",
-    "@varlet/markdown-vite-plugin": "2.0.0-alpha.1664527888620",
-    "@varlet/shared": "2.0.0-alpha.1664527888620",
-    "@varlet/touch-emulator": "2.0.0-alpha.1664527888620",
+    "@varlet/icons": "2.0.0",
+    "@varlet/markdown-vite-plugin": "2.0.0",
+    "@varlet/shared": "2.0.0",
+    "@varlet/touch-emulator": "2.0.0",
     "@vitejs/plugin-vue": "3.0.1",
     "@vitejs/plugin-vue-jsx": "2.0.0",
     "@vue/babel-plugin-jsx": "1.1.1",
@@ -80,7 +80,7 @@
     "@types/semver": "^7.3.9"
   },
   "peerDependencies": {
-    "@varlet/touch-emulator": "2.0.0-alpha.1664527888620",
+    "@varlet/touch-emulator": "2.0.0",
     "@vue/runtime-core": "3.2.16",
     "@vue/test-utils": "^2.0.2",
     "clipboard": "^2.0.6",

package/site/components/progress/Progress.vue

@@ -1,14 +1,14 @@
 <template>
   <div :class="n()">
     <div :class="n('linear')" v-if="mode === 'linear'">
-      <div :class="n('linear-block')" :style="{ height: toSizeUnit(lineWidth) }" v-bind="$attrs">
+      <div :class="n('linear-block')" :style="{ height: toSizeUnit(lineWidth) }">
         <div :class="n('linear-background')" v-if="track" :style="{ background: trackColor }"></div>
         <div
           :class="classes(n('linear-certain'), [ripple, n('linear-ripple')])"
           :style="{ background: color, width: linearProps.width }"
         ></div>
       </div>
-      <div :class="n('linear-label')" v-bind="$attrs" v-if="label">
+      <div :class="classes(n('linear-label'), [labelClass, labelClass])" v-if="label">
         <slot>
           {{ linearProps.roundValue }}
         </slot>
@@ -44,7 +44,7 @@
         ></circle>
       </svg>
 
-      <div :class="n('circle-label')" v-if="label" v-bind="$attrs">
+      <div :class="classes(n('circle-label'), [labelClass, labelClass])" v-if="label">
         <slot>
           {{ circleProps.roundValue }}
         </slot>
@@ -64,7 +64,6 @@ const { n, classes } = createNamespace('progress')
 
 export default defineComponent({
   name: 'VarProgress',
-  inheritAttrs: false,
   props,
   setup(props) {
     const linearProps = computed(() => {

package/site/components/progress/props.ts

@@ -1,55 +1,52 @@
+import { type PropType } from 'vue'
+
 function modeValidator(mode: string): boolean {
   return ['linear', 'circle'].includes(mode)
 }
 
+type ProgressMode = 'linear' | 'circle'
+
 export const props = {
-  // progress 模式
   mode: {
-    type: String,
+    type: String as PropType<ProgressMode>,
     default: 'linear',
     validator: modeValidator,
   },
-  // progress 线宽
   lineWidth: {
     type: [Number, String],
     default: 4,
   },
-  // progress 颜色
   color: {
     type: String,
   },
-  // progress 轨道颜色
   trackColor: {
     type: String,
   },
-  // 是否添加水波纹效果
   ripple: {
     type: Boolean,
     default: false,
   },
-  // progress 值
   value: {
     type: [Number, String],
     default: 0,
   },
-  // 是否显示label
   label: {
     type: Boolean,
     default: false,
   },
-  // circle 的尺寸
+  labelClass: {
+    type: String,
+  },
   size: {
     type: [Number, String],
     default: 40,
   },
-  // circle的原点
   rotate: {
     type: Number,
     default: 0,
   },
-  // 是否显示 circle 轨道
   track: {
     type: Boolean,
     default: true,
-  },
+  }
 }

package/site/pc/Layout.vue

@@ -50,10 +50,16 @@ const handleSidebarChange = (menu: Menu) => {
 }
 
 const confirmClose = () => {
-  if (!window.confirm('The code will no longer be saved after closing. Are you sure you want to close?')) {
+  const key = 'VARLET_UI_PLAYGROUND_HAS_BEEN_CLOSED'
+
+  if (
+    !localStorage.getItem(key) &&
+    !window.confirm('The code will no longer be saved after closing. Are you sure you want to close?')
+  ) {
     return
   }
 
+  localStorage.setItem(key, 'true')
   context.showPlayground = false
 }
 
@@ -305,7 +311,7 @@ iframe {
       }
 
       h2 {
-        margin: 30px 0 20px;
+        margin: 30px 0;
         font-size: 25px;
       }
 
@@ -327,9 +333,16 @@ iframe {
         line-height: 26px;
         border-radius: 4px;
         background: var(--site-config-color-bar);
-        list-style: none;
         margin: 14px 0 0;
         padding: 0;
+
+        li {
+          margin-bottom: 4px;
+        }
+      }
+
+      ul,ol {
+        padding: 0 0 0 18px;
       }
 
       pre {

package/template/generators/config/default/sfc/src/button/docs/zh-CN.md

@@ -2,7 +2,7 @@
 
 ### 基本使用
 ```html
-<var-button>组件库从我开始</var-button>
+<var-button>按钮起步</var-button>
 ```
 
 ```vue
@@ -11,7 +11,7 @@ import BasicUse from '../example/BasicUse'
 
 ### 主题色按钮
 ```html
-<var-button color="#009688">组件库从我开始</var-button>
+<var-button color="#009688">按钮起步</var-button>
 ```
 
 ```vue

package/template/generators/config/default/tsx/src/button/docs/zh-CN.md

@@ -2,7 +2,7 @@
 
 ### 基本使用
 ```html
-<var-button>组件库从我开始</var-button>
+<var-button>按钮起步</var-button>
 ```
 
 ```vue
@@ -11,7 +11,7 @@ import BasicUse from '../example/BasicUse'
 
 ### 主题色按钮
 ```html
-<var-button color="#009688">组件库从我开始</var-button>
+<var-button color="#009688">按钮起步</var-button>
 ```
 
 ```vue

package/template/generators/config/i18n/sfc/src/button/Button.vue

@@ -1,6 +1,6 @@
 <template>
   <button class="var-button" :style="{ background: color }">
-    {{ pack.button }} -> 
+    {{ pack.button }}
     <slot />
   </button>
 </template>

package/template/generators/config/i18n/sfc/src/button/docs/zh-CN.md

@@ -2,7 +2,7 @@
 
 ### 基本使用
 ```html
-<var-button>组件库从我开始</var-button>
+<var-button>按钮起步</var-button>
 ```
 
 ```vue
@@ -11,7 +11,7 @@ import BasicUse from '../example/BasicUse'
 
 ### 主题色按钮
 ```html
-<var-button color="#009688">组件库从我开始</var-button>
+<var-button color="#009688">按钮起步</var-button>
 ```
 
 ```vue

package/template/generators/config/i18n/tsx/src/button/Button.tsx

@@ -22,7 +22,7 @@ export default defineComponent({
 
       return (
         <button class="var-button" style={{ background: color }} onClick={handleClick}>
-          {pack.value.button} -{'> '}
+          {pack.value.button}
           {slots.default?.()}
         </button>
       )

package/template/generators/config/i18n/tsx/src/button/docs/zh-CN.md

@@ -2,7 +2,7 @@
 
 ### 基本使用
 ```html
-<var-button>组件库从我开始</var-button>
+<var-button>按钮起步</var-button>
 ```
 
 ```vue
@@ -11,7 +11,7 @@ import BasicUse from '../example/BasicUse'
 
 ### 主题色按钮
 ```html
-<var-button color="#009688">组件库从我开始</var-button>
+<var-button color="#009688">按钮起步</var-button>
 ```
 
 ```vue

package/varlet.default.config.js

@@ -152,7 +152,7 @@ module.exports = {
       },
       versions: null,
       github: 'https://github.com/varletjs/varlet',
-      playground: 'https://varlet-ui-playground-git-dev-varletjs.vercel.app',
+      playground: 'https://varlet.gitee.io/varlet-ui-playground',
       darkMode: true,
     },
     clipboard: {