chore: 回退一些特性
This commit is contained in:
		
							parent
							
								
									497e117567
								
							
						
					
					
						commit
						6af091260b
					
				@ -61,33 +61,6 @@ export default {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
:::
 | 
					:::
 | 
				
			||||||
 | 
					
 | 
				
			||||||
::: title 不同边框
 | 
					 | 
				
			||||||
:::
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
::: demo 使用 `border-style` 属性设置边框样式
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<template>
 | 
					 | 
				
			||||||
  <lay-button border-style="dashed">原始按钮</lay-button>
 | 
					 | 
				
			||||||
  <lay-button border="green" border-style="dashed">默认按钮</lay-button>
 | 
					 | 
				
			||||||
  <lay-button border="blue" border-style="dashed">百搭按钮</lay-button>
 | 
					 | 
				
			||||||
  <lay-button border="orange" border-style="dashed">暖色按钮</lay-button>
 | 
					 | 
				
			||||||
  <lay-button border="red" border-style="dashed">警告按钮</lay-button>
 | 
					 | 
				
			||||||
</template>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
<script>
 | 
					 | 
				
			||||||
import { ref } from 'vue'
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
export default {
 | 
					 | 
				
			||||||
  setup() {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    return {
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
</script>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
:::
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
::: title 按钮尺寸
 | 
					::: title 按钮尺寸
 | 
				
			||||||
:::
 | 
					:::
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -332,7 +305,6 @@ export default {
 | 
				
			|||||||
| native-type | 原生类型 | string  | `button`  | `button` `submit` `reset`          |
 | 
					| native-type | 原生类型 | string  | `button`  | `button` `submit` `reset`          |
 | 
				
			||||||
| prefix-icon | 前置图标 | string  | --   | 内置 icon 集                     |
 | 
					| prefix-icon | 前置图标 | string  | --   | 内置 icon 集                     |
 | 
				
			||||||
| suffix-icon | 后置图标 | string  | --   | 内置 icon 集          |
 | 
					| suffix-icon | 后置图标 | string  | --   | 内置 icon 集          |
 | 
				
			||||||
| border-style | 边框样式 | string  | `soild`   | border-style css  |
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
:::
 | 
					:::
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -5,6 +5,7 @@
 | 
				
			|||||||
  <lay-timeline-item title="尾版本号:日常问题更新。" simple></lay-timeline-item>
 | 
					  <lay-timeline-item title="尾版本号:日常问题更新。" simple></lay-timeline-item>
 | 
				
			||||||
  <lay-timeline-item title="次版本号:带有新特性的向下兼容的版本。" simple></lay-timeline-item>
 | 
					  <lay-timeline-item title="次版本号:带有新特性的向下兼容的版本。" simple></lay-timeline-item>
 | 
				
			||||||
  <lay-timeline-item title="主版本号:含有破坏性更新和新特性,不在发布周期内。" simple></lay-timeline-item>
 | 
					  <lay-timeline-item title="主版本号:含有破坏性更新和新特性,不在发布周期内。" simple></lay-timeline-item>
 | 
				
			||||||
 | 
					  <lay-timeline-item title="版本说明:1.0.0 正式 1.0.0-beta.* 公测 1.0.0-alpha.* 内测。" simple></lay-timeline-item>
 | 
				
			||||||
</lay-timeline>
 | 
					</lay-timeline>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
::: demo
 | 
					::: demo
 | 
				
			||||||
@ -14,7 +15,7 @@
 | 
				
			|||||||
    <ul> 
 | 
					    <ul> 
 | 
				
			||||||
      <a name="1-0-0"> </a> 
 | 
					      <a name="1-0-0"> </a> 
 | 
				
			||||||
      <li> 
 | 
					      <li> 
 | 
				
			||||||
        <h3>1.0.0 <span class="layui-badge-rim">2022-04-01</span></h3> 
 | 
					        <h3>1.0.0 <span class="layui-badge-rim">2022-04-02</span></h3> 
 | 
				
			||||||
        <ul>
 | 
					        <ul>
 | 
				
			||||||
          <li>[重要] 修订 version 为 1.0.0。</li>
 | 
					          <li>[重要] 修订 version 为 1.0.0。</li>
 | 
				
			||||||
          <li>[新增] empty 组件 extra 插槽, 支持扩展内容。</li>
 | 
					          <li>[新增] empty 组件 extra 插槽, 支持扩展内容。</li>
 | 
				
			||||||
@ -25,7 +26,6 @@
 | 
				
			|||||||
          <li>[新增] date-picker 组件 time 属性, 支持 时 分 秒 选择。</li>
 | 
					          <li>[新增] date-picker 组件 time 属性, 支持 时 分 秒 选择。</li>
 | 
				
			||||||
          <li>[新增] date-picker 组件 yearmonth 属性, 支持 年 月 选择。</li>
 | 
					          <li>[新增] date-picker 组件 yearmonth 属性, 支持 年 月 选择。</li>
 | 
				
			||||||
          <li>[新增] tab 组件 position 属性, 用于支持不同方向的选项卡标题。</li>
 | 
					          <li>[新增] tab 组件 position 属性, 用于支持不同方向的选项卡标题。</li>
 | 
				
			||||||
          <li>[新增] button 组件 border-style 属性, 可选值 dashed dotted 等。</li>
 | 
					 | 
				
			||||||
          <li>[修复] date-picker 组件 type 属性为 time 时, v-model 默认不生效。</li>
 | 
					          <li>[修复] date-picker 组件 type 属性为 time 时, v-model 默认不生效。</li>
 | 
				
			||||||
          <li>[修复] date-picker 组件 12 小时制为 24 小时制。</li>
 | 
					          <li>[修复] date-picker 组件 12 小时制为 24 小时制。</li>
 | 
				
			||||||
          <li>[修复] transfer 组件 showSearch 属性类型警告。</li>              
 | 
					          <li>[修复] transfer 组件 showSearch 属性类型警告。</li>              
 | 
				
			||||||
 | 
				
			|||||||
@ -41,7 +41,7 @@
 | 
				
			|||||||
          rel="nofollow"
 | 
					          rel="nofollow"
 | 
				
			||||||
          class="site-star"
 | 
					          class="site-star"
 | 
				
			||||||
        >
 | 
					        >
 | 
				
			||||||
          <i class="layui-icon"></i> Star <cite id="getStars">741</cite>
 | 
					          <i class="layui-icon"></i> Star <cite id="getStars">746</cite>
 | 
				
			||||||
        </a>
 | 
					        </a>
 | 
				
			||||||
        <a
 | 
					        <a
 | 
				
			||||||
          href="https://gitee.com/layui-vue"
 | 
					          href="https://gitee.com/layui-vue"
 | 
				
			||||||
 | 
				
			|||||||
@ -13,7 +13,7 @@ import {
 | 
				
			|||||||
  ButtonSize,
 | 
					  ButtonSize,
 | 
				
			||||||
  ButtonType,
 | 
					  ButtonType,
 | 
				
			||||||
} from "./interface";
 | 
					} from "./interface";
 | 
				
			||||||
import { BooleanOrString, String } from "../../types";
 | 
					import { Boolean, BooleanOrString, String } from "../../types";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export interface LayButtonProps {
 | 
					export interface LayButtonProps {
 | 
				
			||||||
  type?: ButtonType;
 | 
					  type?: ButtonType;
 | 
				
			||||||
@ -26,7 +26,6 @@ export interface LayButtonProps {
 | 
				
			|||||||
  loading?: BooleanOrString;
 | 
					  loading?: BooleanOrString;
 | 
				
			||||||
  disabled?: BooleanOrString;
 | 
					  disabled?: BooleanOrString;
 | 
				
			||||||
  nativeType?: ButtonNativeType;
 | 
					  nativeType?: ButtonNativeType;
 | 
				
			||||||
  borderStyle?: String;
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const props = withDefaults(defineProps<LayButtonProps>(), {
 | 
					const props = withDefaults(defineProps<LayButtonProps>(), {
 | 
				
			||||||
@ -34,8 +33,7 @@ const props = withDefaults(defineProps<LayButtonProps>(), {
 | 
				
			|||||||
  radius: false,
 | 
					  radius: false,
 | 
				
			||||||
  loading: false,
 | 
					  loading: false,
 | 
				
			||||||
  disabled: false,
 | 
					  disabled: false,
 | 
				
			||||||
  nativeType: "button",
 | 
					  nativeType: "button"
 | 
				
			||||||
  borderStyle: "solid",
 | 
					 | 
				
			||||||
});
 | 
					});
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const emit = defineEmits(["click"]);
 | 
					const emit = defineEmits(["click"]);
 | 
				
			||||||
@ -46,12 +44,6 @@ const onClick = (event: any) => {
 | 
				
			|||||||
  }
 | 
					  }
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
const styles = computed(() => {
 | 
					 | 
				
			||||||
  return {
 | 
					 | 
				
			||||||
    "border-style": props.borderStyle,
 | 
					 | 
				
			||||||
  };
 | 
					 | 
				
			||||||
});
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
const classes = computed(() => {
 | 
					const classes = computed(() => {
 | 
				
			||||||
  return [
 | 
					  return [
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
@ -71,7 +63,6 @@ const classes = computed(() => {
 | 
				
			|||||||
    class="layui-btn"
 | 
					    class="layui-btn"
 | 
				
			||||||
    :class="classes"
 | 
					    :class="classes"
 | 
				
			||||||
    :type="nativeType"
 | 
					    :type="nativeType"
 | 
				
			||||||
    :style="styles"
 | 
					 | 
				
			||||||
    @click="onClick"
 | 
					    @click="onClick"
 | 
				
			||||||
  >
 | 
					  >
 | 
				
			||||||
    <i v-if="prefixIcon" :class="`layui-icon ${prefixIcon}`"></i>
 | 
					    <i v-if="prefixIcon" :class="`layui-icon ${prefixIcon}`"></i>
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user