diff --git a/_mobile/date.i18n.cn.js b/_mobile/date.i18n.cn.js deleted file mode 100644 index 79e294934..000000000 --- a/_mobile/date.i18n.cn.js +++ /dev/null @@ -1,67 +0,0 @@ -/** - * Created by astronaut007 on 2018/8/8 - */ -// 牵扯到国际化这些常量在页面加载后再生效 -// full day names -BI.Date = BI.Date || {}; -BI.Date._DN = ["星期日", - "星期一", - "星期二", - "星期三", - "星期四", - "星期五", - "星期六", - "星期日"]; - -// short day names -BI.Date._SDN = ["日", - "一", - "二", - "三", - "四", - "五", - "六", - "日"]; - -// Monday first, etc. -BI.Date._FD = 1; - -// full month namesdat -BI.Date._MN = [ - "一月", - "二月", - "三月", - "四月", - "五月", - "六月", - "七月", - "八月", - "九月", - "十月", - "十一月", - "十二月"]; - -// short month names -BI.Date._SMN = [0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11]; - -BI.Date._QN = ["", "第1季度", - "第2季度", - "第3季度", - "第4季度"]; - -/** Adds the number of days array to the Date object. */ -BI.Date._MD = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; - -// 实际上无论周几作为一周的第一天,周初周末都是在-6-0间做偏移,用一个数组就可以 -BI.Date._OFFSET = [0, -1, -2, -3, -4, -5, -6]; diff --git a/demo/less/face.less b/demo/less/face.less index b9c4fe499..3e22a078b 100644 --- a/demo/less/face.less +++ b/demo/less/face.less @@ -3,7 +3,7 @@ .demo-face { .face-config { .config-label { - font-size: 14px; + font-size: 1.4rem; } .config-item { } diff --git a/demo/less/main.less b/demo/less/main.less index 4e6cb4376..87a094414 100644 --- a/demo/less/main.less +++ b/demo/less/main.less @@ -63,6 +63,7 @@ body { right: 0; top: 0; bottom: 0; + font-size: 1.2rem; } .bi-theme-dark body { @@ -83,9 +84,7 @@ body { -moz-transition: all 0.5s ease; -o-transition: all 0.5s ease; background: #3f8ce8; - -webkit-border-radius: 20px; - -moz-border-radius: 20px; - border-radius: 20px; + border-radius: 2rem; overflow: hidden; overflow-x: hidden; overflow-y: hidden; @@ -99,7 +98,5 @@ body { } .bi-progress-bar-bar { - -webkit-border-radius: 20px; - -moz-border-radius: 20px; - border-radius: 20px; -} \ No newline at end of file + border-radius: 2rem; +} diff --git a/demo/less/north.less b/demo/less/north.less index 0114afd65..12fbdb5b4 100644 --- a/demo/less/north.less +++ b/demo/less/north.less @@ -6,7 +6,7 @@ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; color: @color-bi-text; background-color: #367fa9; - font-size: 20px; + font-size: 2rem; font-weight: 300; } } \ No newline at end of file diff --git a/dist/fix/fix.compact.js b/dist/fix/fix.compact.js index df02143b6..6179d484b 100644 --- a/dist/fix/fix.compact.js +++ b/dist/fix/fix.compact.js @@ -78,7 +78,7 @@ }, options); }; - function findStore (widget) { + BI.Widget.findStore = function findStore (widget) { if (target != null) { return target; } @@ -110,7 +110,7 @@ return true; } if (this._store) { - var store = findStore(this.options.context || this._parent || this.options.element || this._context); + var store = BI.Widget.findStore(this.options.context || this._parent || this.options.element || this._context); if (store) { pushTarget(store); needPop = true; diff --git a/examples/ThemeProvider.html b/examples/ThemeProvider.html new file mode 100644 index 000000000..7848ee406 --- /dev/null +++ b/examples/ThemeProvider.html @@ -0,0 +1,99 @@ + + + + + + + + + + +
+ + + diff --git a/examples/useContext.html b/examples/useContext.html index 56c78b2ce..4f91239bd 100644 --- a/examples/useContext.html +++ b/examples/useContext.html @@ -5,8 +5,15 @@ - + + +
+ diff --git a/webpack/attachments.js b/webpack/attachments.js index 94274e1b3..acb30ad2a 100644 --- a/webpack/attachments.js +++ b/webpack/attachments.js @@ -31,6 +31,7 @@ const basicAttachmentMap = { // 实现好的一些基础实例 case: sync([ "src/case/**/*.js", + "src/less/case/**/*.less", ]), widget: sync([ "src/less/widget/**/*.less", @@ -90,6 +91,7 @@ const basicAttachmentMap = { "src/less/core/**/*.less", "src/less/theme/**/*.less", "src/less/base/**/*.less", + "src/less/case/**/*.less", "src/less/widget/**/*.less", "src/less/component/**/*.less", ]), @@ -139,6 +141,7 @@ const bundleWithoutNormalize = [].concat( basicAttachmentMap.core_without_normalize, sync([ "src/less/base/**/*.less", + "src/less/case/**/*.less", "src/less/widget/**/*.less", "src/less/component/**/*.less", "public/less/**/*.less", @@ -152,6 +155,7 @@ const fineuiWithoutNormalize = [].concat( basicAttachmentMap.core_without_normalize, sync([ "src/less/base/**/*.less", + "src/less/case/**/*.less", "src/less/widget/**/*.less", "src/less/component/**/*.less", 'ui/less/app.less',