Browse Source

Pull request #2085: 无JIRA任务 width属性支持 calc

Merge in VISUAL/fineui from ~DAILER/fineui:master to master

* commit '4319606580627ccef9ceaaf94340837fb454bcca':
  update changelog
  无JIRA bubble_combo增加logic属性
  无JIRA 规范
  无JIRA任务 width属性支持 calc
es6
Dailer 3 years ago
parent
commit
fc8d6fe00b
  1. 1
      changelog.md
  2. 1
      src/case/combo/bubblecombo/combo.bubble.js
  3. 2
      src/core/2.base.js

1
changelog.md

@ -1,5 +1,6 @@
# 更新日志
2.0(2021-07)
- width属性支持calc()
- 修改了颜色选择器交互
- 新增bi.horizontal_fill、bi.vertical_fill布局
- 增加module定义插件版本号

1
src/case/combo/bubblecombo/combo.bubble.js

@ -36,6 +36,7 @@ BI.BubbleCombo = BI.inherit(BI.Widget, {
element: this,
trigger: o.trigger,
toggle: o.toggle,
logic: o.logic,
container: o.container,
direction: o.direction,
isDefaultInit: o.isDefaultInit,

2
src/core/2.base.js

@ -500,7 +500,7 @@ if (!_global.BI) {
if (typeof w === "number") {
return w >= 0;
} else if (typeof w === "string") {
return /^\d{1,3}(\.\d)?%$/.exec(w) || w == "auto" || /^\d+px$/.exec(w);
return /^\d{1,3}(\.\d)?%$/.test(w) || w === "auto" || /^\d+px$/.test(w) || /^calc/.test(w);
}
},

Loading…
Cancel
Save