Merge branch 'master' of ssh://github.com/bd-js/wcui

master
chenjiajian 2023-03-16 19:21:34 +08:00
commit cff5e495a6
5 changed files with 399 additions and 183 deletions

View File

@ -22,7 +22,7 @@
- [ ] `wc-badge`徽标组件 - [ ] `wc-badge`徽标组件
- [ ] `wc-counter`倒计时组件 - [ ] `wc-counter`倒计时组件
- [ ] `wc-drag`拖拽组件 - [ ] `wc-drag`拖拽组件
- [ ] `wc-button`表单组件-按钮 - [x] `wc-button`表单组件-按钮
- [ ] `wc-checkbox`表单组件-复选框 - [ ] `wc-checkbox`表单组件-复选框
- [ ] `wc-input`表单组件-文本输入框 - [ ] `wc-input`表单组件-文本输入框
- [ ] `wc-number`表单组件-步进数字输入 - [ ] `wc-number`表单组件-步进数字输入

View File

@ -18,7 +18,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<link rel="stylesheet" href="/dist/css/reset-basic.css"> <link rel="stylesheet" href="/dist/css/reset-basic.css">
<script async src="//jscdn.ink/es-module-shims/1.6.3/es-module-shims.wasm.js"></script> <script async src="//jscdn.ink/es-module-shims/1.6.3/es-module-shims.wasm.js"></script>
<script type="importmap">{"imports":{"es.shim":"//jscdn.ink/es.shim/2.1.1/index.js","vue":"//jscdn.ink/vue/3.2.47/vue.runtime.esm-browser.prod.js","vue-router":"//jscdn.ink/@bytedo/vue-router/4.1.6/vue-router.js","fetch":"//jscdn.ink/@bytedo/fetch/2.1.5/next.js","@bd/core":"//jscdn.ink/@bd/core/1.3.0/index.js"}}</script> <script type="importmap">{"imports":{"es.shim":"//jscdn.ink/es.shim/2.1.1/index.js","vue":"//jscdn.ink/vue/3.2.47/vue.runtime.esm-browser.prod.js","vue-router":"//jscdn.ink/@bytedo/vue-router/4.1.6/vue-router.js","fetch":"//jscdn.ink/@bytedo/fetch/2.1.5/next.js","@bd/core":"//jscdn.ink/@bd/core/1.4.1/index.js"}}</script>
<style></style> <style></style>
</head> </head>
<body> <body>

View File

@ -4,24 +4,38 @@
* @date 2023/03/06 15:17:25 * @date 2023/03/06 15:17:25
*/ */
import { css, html, Component } from '@bd/core' import { css, html, Component, $, nextTick } from '@bd/core'
import '../icon/index.js' import '../icon/index.js'
class Button extends Component { class Button extends Component {
static props = { static props = {
type: 'primary',
icon: '', icon: '',
autofocus: '', size: 'l',
loading: false, autofocus: false,
loading: {
type: Boolean,
default: false,
observer(val) {
if (val) {
this.cacheIcon = this.icon
this.icon = 'loading'
} else {
this.icon = this.cacheIcon || ''
}
}
},
disabled: false, disabled: false,
lazy: 0 // 并发拦截时间, 单位毫秒 lazy: 0 // 并发拦截时间, 单位毫秒
} }
static styles = css` static styles = [
// 基础样式
css`
:host { :host {
overflow: hidden; overflow: hidden;
display: inline-flex; display: inline-flex;
min-width: 128px; border: 0;
height: 36px;
border-radius: 3px; border-radius: 3px;
user-select: none; user-select: none;
-moz-user-select: none; -moz-user-select: none;
@ -32,13 +46,14 @@ class Button extends Component {
button { button {
display: flex; display: flex;
justify-content: space-evenly; justify-content: center;
align-items: center; align-items: center;
width: 100%; width: 100%;
min-width: 1px;
height: inherit; height: inherit;
padding: var(--padding, 0 14px); padding: var(--button-padding, 0 4px);
line-height: 1; line-height: 1;
border: 1px solid var(--color-grey-2); border: 1px solid transparent;
border-radius: inherit; border-radius: inherit;
white-space: nowrap; white-space: nowrap;
background: #fff; background: #fff;
@ -56,75 +71,82 @@ class Button extends Component {
.icon { .icon {
--size: var(--icon-size, 18px); --size: var(--icon-size, 18px);
margin-right: 4px;
} }
} }
:host(:focus-within) {
box-shadow: 0 0 0 2px var(--color-plain-a);
}
`,
// 尺寸
css`
@use 'sass:map';
$sizes: (
s: (
w: 52px,
h: 20px,
f: 12px
),
m: (
w: 72px,
h: 24px,
f: 12px
),
l: (
w: 108px,
h: 32px,
f: 14px
),
xl: (
w: 132px,
h: 36px,
f: 14px
),
xxl: (
w: 160px,
h: 44px,
f: 14px
),
xxxl: (
w: 192px,
h: 52px,
f: 16px
),
xxxxl: (
w: 212px,
h: 64px,
f: 18px
)
);
:host([size='large']) { @loop $s, $v in $sizes {
min-width: 212px; :host([size='#{$s}']) {
height: 52px; min-width: map.get($v, 'w');
font-size: 18px; height: map.get($v, 'h');
font-size: map.get($v, 'f');
button {
padding: 0 24px;
}
.icon { .icon {
--size: 26px; --size: #{map.get($v, 'f')};
} }
} }
:host([size='large'][circle]) { :host([size='#{$s}'][circle]) {
min-width: 52px; width: map.get($v, 'h');
width: 52px; height: map.get($v, 'h');
height: 52px;
button { button {
padding: 0;
} }
} }
:host([size='medium']) {
min-width: 160px;
height: 44px;
button {
padding: 0 18px;
}
}
:host([size='medium'][circle]) {
min-width: 44px;
width: 44px;
}
:host([size='small']) {
min-width: 96px;
height: 32px;
}
:host([size='small'][circle]) {
min-width: 32px;
width: 32px;
}
:host([size='mini']) {
min-width: 72px;
height: 26px;
font-size: 12px;
button {
padding: 0 6px;
} }
.icon { :host([dashed]) button {
--size: 14px; border-style: dashed;
}
}
:host([size='mini'][circle]) {
min-width: 26px;
width: 26px;
} }
:host([round]) { :host([round]) {
border-radius: 26px; border-radius: 32px;
} }
:host([circle]) { :host([circle]) {
min-width: 36px; min-width: 0;
width: 36px;
border-radius: 50%; border-radius: 50%;
button { button {
padding: 0; padding: 0;
@ -137,11 +159,9 @@ class Button extends Component {
display: none; display: none;
} }
} }
`,
:host(:focus-within) { // 配色
box-shadow: 0 0 0 2px var(--color-plain-a); css`
}
$colors: ( $colors: (
primary: 'teal', primary: 'teal',
info: 'blue', info: 'blue',
@ -156,7 +176,7 @@ class Button extends Component {
:host([type='#{$t}']) { :host([type='#{$t}']) {
button { button {
color: var(--color-#{$c}-2); color: var(--color-#{$c}-2);
border: 1px solid var(--color-#{$c}-2); border-color: var(--color-#{$c}-2);
&:hover { &:hover {
color: var(--color-#{$c}-1); color: var(--color-#{$c}-1);
@ -192,19 +212,59 @@ class Button extends Component {
} }
} }
} }
`,
// 状态
css`
:host([loading]), :host([loading]),
:host([disabled]) { :host([disabled]) {
cursor: not-allowed; cursor: not-allowed;
opacity: 0.6; opacity: 0.6;
} }
` `
]
created() {
this.stamp = 0
this._clickFn = this.$on(
'click',
ev => {
let { loading, disabled, lazy } = this
let now = Date.now()
if (loading || disabled) {
return ev.stopPropagation()
}
// 并发拦截
if (lazy > 0 && now - this.stamp < lazy) {
return ev.stopPropagation()
}
this.stamp = now
},
true
)
}
mounted() {
if (this.autofocus) {
let $btn = $('button', this.root)
$btn.setAttribute('autofocus', '')
// 需要focus()才能聚焦成功
nextTick(_ => $btn.focus())
}
}
unmounted() {
this.$off('click', this._clickFn)
}
render() { render() {
return html`<button> return html`
<wc-icon class="icon" is="${this.icon}"></wc-icon> <button disabled=${this.disabled}>
<wc-icon class="icon" is=${this.icon}></wc-icon>
<slot /> <slot />
</button>` </button>
`
} }
} }

156
src/form/link.js Normal file
View File

@ -0,0 +1,156 @@
/**
* {}
* @author yutent<yutent.io@gmail.com>
* @date 2023/03/16 17:40:50
*/
import { css, html, Component, bind, unbind, $, nextTick } from '@bd/core'
class Link extends Component {
static props = {
type: 'primary',
to: '',
autofocus: false,
disabled: false,
lazy: 0 // 并发拦截时间, 单位毫秒
}
static styles = [
// 基础样式
css`
:host {
position: relative;
display: inline-flex;
border-radius: 2px;
user-select: none;
-moz-user-select: none;
font-size: inherit;
cursor: pointer;
transition: box-shadow 0.15s linear;
.link {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
padding: var(--padding, 0 2px);
line-height: 1;
font-size: inherit;
font-family: inherit;
outline: none;
color: inherit;
cursor: inherit;
text-decoration: none;
transition: color 0.15s linear;
&::-moz-focus-inner {
border: none;
}
}
&::after {
position: absolute;
bottom: -2px;
left: 0;
width: 100%;
height: 1px;
border-bottom: 1px dashed transparent;
content: '';
opacity: 0;
transition: opacity 0.15s linear;
}
}
`,
// 配色
css`
$colors: (
primary: 'teal',
info: 'blue',
success: 'green',
warning: 'orange',
danger: 'red',
secondary: 'dark',
help: 'grey'
);
@loop $t, $c in $colors {
:host([type='#{$t}']) {
color: var(--color-#{$c}-2);
&::after {
border-color: var(--color-#{$c}-1);
}
}
:host([type='#{$t}']:not([disabled]):hover) {
color: var(--color-#{$c}-1);
}
:host([type='#{$t}']:not([disabled]):active) {
color: var(--color-#{$c}-3);
}
:host([type='#{$t}']:not([disabled]):focus-within) {
box-shadow: 0 0 0 2px var(--color-#{$c}-a);
}
}
`,
// 状态
css`
:host(:not([disabled]):hover),
:host([underline]) {
&::after {
opacity: 1;
}
}
:host([disabled]) {
cursor: not-allowed;
opacity: 0.6;
}
`
]
mounted() {
let $a = $('.link', this.root)
this.stamp = 0
if (this.autofocus) {
$a.setAttribute('autofocus', '')
// 需要focus()才能聚焦成功
nextTick(_ => $a.focus())
}
this._clickFn = bind(
$a,
'click',
ev => {
let { disabled, lazy } = this
let now = Date.now()
// 除了事件冒泡之外, a标签的默认事件也要阻止
if (disabled) {
ev.preventDefault()
ev.stopPropagation()
return
}
// 并发拦截
if (lazy > 0 && now - this.stamp < lazy) {
ev.preventDefault()
ev.stopPropagation()
return
}
this.stamp = now
},
true
)
}
unmounted() {
unbind($('.link', this.root), 'click', this._clickFn)
}
render() {
return html`
<a tabindex="0" class="link" href=${this.to || 'javascript:;'}>
<slot />
</a>
`
}
}
customElements.define('wc-link', Link)

View File

@ -4,7 +4,7 @@
> 主题功能, 暂时由根样式定义来实现, 所以, 组件内的样式, 尽可能避免过多的私有配色。 > 主题功能, 暂时由根样式定义来实现, 所以, 组件内的样式, 尽可能避免过多的私有配色。
2. 组件几种配色样式, 暂时同大多数组件一致 2. 组件几种配色样式, 暂时同大多数组件一致
- `type=primary` 青色 - `type=primary` 青色 (默认值)
- `type=secondary` 暗色 - `type=secondary` 暗色
- `type=info` 蓝色 - `type=info` 蓝色
- `type=success` 绿色 - `type=success` 绿色