Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/bundle.min.js
#	dist/fineui.min.js
#	dist/utils.min.js
es6
guy 6 years ago
parent
commit
c37e6beaba
  1. 3
      Gruntfile.js
  2. 8
      README.md
  3. 4
      dist/base.js
  4. 2
      dist/bundle.css
  5. 8
      dist/bundle.js
  6. 2
      dist/bundle.min.css
  7. 68
      dist/bundle.min.js
  8. 2
      dist/case.js
  9. 2
      dist/core.css
  10. 2
      dist/core.js
  11. 2
      dist/core_without_normalize.css
  12. 2
      dist/fineui.css
  13. 10
      dist/fineui.js
  14. 2
      dist/fineui.min.css
  15. 76
      dist/fineui.min.js
  16. 8
      dist/fineui_without_jquery_polyfill.js
  17. 49
      dist/index.html
  18. 2
      dist/polyfill.js
  19. 2
      dist/utils.js
  20. 4
      dist/utils.min.js
  21. 52
      index.html
  22. 2
      src/base/combination/combo.js
  23. 2
      src/base/layer/layer.popup.js
  24. 2
      src/case/layer/layer.multipopup.js
  25. 2
      src/core/foundation.js
  26. 2
      src/css/core/utils/common.css
  27. 2
      src/less/core/utils/common.less

3
Gruntfile.js

@ -339,8 +339,7 @@ module.exports = function (grunt) {
}, },
server: { server: {
options: { options: {
port: 9001, port: 9001
base: "./dist"
} }
} }
}, },

8
README.md

@ -12,15 +12,9 @@ Documentation
http://fanruan.coding.me/fineui-doc/ http://fanruan.coding.me/fineui-doc/
### API
GithubPages: [https://fanruan.github.io/fineui](https://fanruan.github.io/fineui)
CodingPages: [http://fanruan.coding.me/fineui](http://fanruan.coding.me/fineui)
### Demo ### Demo
CodingPages: [http://fanruan.coding.me/fineui/dist/index.html](http://fanruan.coding.me/fineui/dist/index.html) CodingPages: [http://fanruan.coding.me/fineui](http://fanruan.coding.me/fineui)
License License

4
dist/base.js vendored

@ -3154,7 +3154,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
@ -5982,7 +5982,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,

2
dist/bundle.css vendored

@ -470,7 +470,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

8
dist/bundle.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/*! }/*!
* jQuery JavaScript Library v1.9.1 * jQuery JavaScript Library v1.9.1
* http://jquery.com/ * http://jquery.com/
@ -38382,7 +38384,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
@ -41210,7 +41212,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,
@ -55431,7 +55433,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

68
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/case.js vendored

@ -6842,7 +6842,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",

2
dist/core.css vendored

@ -470,7 +470,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

2
dist/core.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/*! }/*!
* jQuery JavaScript Library v1.9.1 * jQuery JavaScript Library v1.9.1
* http://jquery.com/ * http://jquery.com/

2
dist/core_without_normalize.css vendored

@ -189,7 +189,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

2
dist/fineui.css vendored

@ -470,7 +470,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

10
dist/fineui.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}// Production steps of ECMA-262, Edition 5, 15.4.4.14 }// Production steps of ECMA-262, Edition 5, 15.4.4.14
// Reference: http://es5.github.io/#x15.4.4.14 // Reference: http://es5.github.io/#x15.4.4.14
if (!Array.prototype.indexOf) { if (!Array.prototype.indexOf) {
@ -255,6 +257,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/*! }/*!
* jQuery JavaScript Library v1.9.1 * jQuery JavaScript Library v1.9.1
* http://jquery.com/ * http://jquery.com/
@ -38621,7 +38625,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
@ -41449,7 +41453,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,
@ -55670,7 +55674,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

76
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/fineui_without_jquery_polyfill.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/** }/**
* @license * @license
* Lodash (Custom Build) <https://lodash.com/> * Lodash (Custom Build) <https://lodash.com/>
@ -27008,7 +27010,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;
@ -29836,7 +29838,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,
@ -39324,7 +39326,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",

49
dist/index.html vendored

@ -1,49 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title></title>
<!--核心css文件-->
<link rel="stylesheet" type="text/css" href="core.css"/>
<!--基础css文件, 包含一些最基本控件的样式-->
<link rel="stylesheet" type="text/css" href="base.css"/>
<!--BI控件样式-->
<link rel="stylesheet" type="text/css" href="widget.css"/>
<!--资源样式, 包括font、icon、background、app-->
<link rel="stylesheet" type="text/css" href="resource.css"/>
<!--当前demo定义的样式-->
<link rel="stylesheet" type="text/css" href="demo.css"/>
<!--IE9及以下兼容-->
<script src="polyfill.js"></script>
<!--核心js-->
<script src="core.js"></script>
<!--BI路由js-->
<script src="router.js"></script>
<!--fix1.0版本框架, 只用ui的话不用引入, fix1.0依赖于router,引入的顺序需在core.js、router.js之后, 可以和2.0版本同时使用或使用任一个均可-->
<script src="fix/fix-1.0.js"></script>
<!--fix2.0版本框架, 只用ui的话不用引入, 引入的顺序需在core.js之后-->
<script src="fix/fix.js"></script>
<!--基础js, 包括最基本的控件-->
<script src="base.js"></script>
<!--基础js, 存放一些通用组件,如选色组件、富文本组件等-->
<script src="case.js"></script>
<!--BI控件js-->
<script src="widget.js"></script>
<!--fix2.0版本框架与fineui结合的代码, 只用ui的话不用引入, 引入的顺序需在fix和控件库(core/base/case/widget)之后之后-->
<script src="fix/fix.compact.js"></script>
<!--工程配置文件,主要是BI.servletURL(根目录)、BI.resourceURL(资源路径)、BI.i18n(国际化)-->
<script src="config.js"></script>
<script src="demo.js"></script>
</head>
<body>
<div id="wrapper"></div>
</body>
</html>

2
dist/polyfill.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}// Production steps of ECMA-262, Edition 5, 15.4.4.14 }// Production steps of ECMA-262, Edition 5, 15.4.4.14
// Reference: http://es5.github.io/#x15.4.4.14 // Reference: http://es5.github.io/#x15.4.4.14
if (!Array.prototype.indexOf) { if (!Array.prototype.indexOf) {

2
dist/utils.js vendored

@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
}/** }/**
* @license * @license
* Lodash (Custom Build) <https://lodash.com/> * Lodash (Custom Build) <https://lodash.com/>

4
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

52
index.html

@ -1,5 +1,49 @@
<html> <!DOCTYPE html>
<script> <html lang="en">
location.href = "docs/_book/index.html"
</script> <head>
<meta charset="utf-8">
<title></title>
<!--核心css文件-->
<link rel="stylesheet" type="text/css" href="dist/core.css"/>
<!--基础css文件, 包含一些最基本控件的样式-->
<link rel="stylesheet" type="text/css" href="dist/base.css"/>
<!--BI控件样式-->
<link rel="stylesheet" type="text/css" href="dist/widget.css"/>
<!--资源样式, 包括font、icon、background、app-->
<link rel="stylesheet" type="text/css" href="dist/resource.css"/>
<!--当前demo定义的样式-->
<link rel="stylesheet" type="text/css" href="dist/demo.css"/>
<!--IE9及以下兼容-->
<script src="dist/polyfill.js"></script>
<!--核心js-->
<script src="dist/core.js"></script>
<!--BI路由js-->
<script src="dist/router.js"></script>
<!--fix1.0版本框架, 只用ui的话不用引入, fix1.0依赖于router,引入的顺序需在core.js、router.js之后, 可以和2.0版本同时使用或使用任一个均可-->
<script src="dist/fix/fix-1.0.js"></script>
<!--fix2.0版本框架, 只用ui的话不用引入, 引入的顺序需在core.js之后-->
<script src="dist/fix/fix.js"></script>
<!--基础js, 包括最基本的控件-->
<script src="dist/base.js"></script>
<!--基础js, 存放一些通用组件,如选色组件、富文本组件等-->
<script src="dist/case.js"></script>
<!--BI控件js-->
<script src="dist/widget.js"></script>
<!--fix2.0版本框架与fineui结合的代码, 只用ui的话不用引入, 引入的顺序需在fix和控件库(core/base/case/widget)之后之后-->
<script src="dist/fix/fix.compact.js"></script>
<!--工程配置文件,主要是BI.servletURL(根目录)、BI.resourceURL(资源路径)、BI.i18n(国际化)-->
<script src="dist/config.js"></script>
<script src="dist/demo.js"></script>
</head>
<body>
<div id="wrapper"></div>
</body>
</html> </html>

2
src/base/combination/combo.js

@ -261,7 +261,7 @@ BI.Combo = BI.inherit(BI.Widget, {
// return; // return;
// } // }
// BI-10290 公式combo双击公式内容会收起 // BI-10290 公式combo双击公式内容会收起
if ((this.element.find(e.target).length > 0 && e.type !== "mousewheel") if ((this.element.find(e.target).length > 0)
|| (this.popupView && this.popupView.element.find(e.target).length > 0) || (this.popupView && this.popupView.element.find(e.target).length > 0)
|| e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下 || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
return; return;

2
src/base/layer/layer.popup.js

@ -129,7 +129,7 @@ BI.PopupView = BI.inherit(BI.Widget, {
return BI.createWidget({ return BI.createWidget({
type: "bi.center", type: "bi.center",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(o.buttons, { items: BI.createItems(o.buttons, {
once: false, once: false,

2
src/case/layer/layer.multipopup.js

@ -34,7 +34,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {
this.buttongroup = BI.createWidget({ this.buttongroup = BI.createWidget({
type: "bi.button_group", type: "bi.button_group",
cls: "list-view-toolbar bi-high-light bi-border-top", cls: "list-view-toolbar bi-high-light bi-split-top",
height: 24, height: 24,
items: BI.createItems(text, { items: BI.createItems(text, {
type: "bi.text_button", type: "bi.text_button",

2
src/core/foundation.js vendored

@ -16,4 +16,6 @@ if (typeof window !== "undefined") {
} }
if (_global.BI == null) { if (_global.BI == null) {
_global.BI = {prepares: []}; _global.BI = {prepares: []};
} else {
_global.BI.prepares = [];
} }

2
src/css/core/utils/common.css

@ -189,7 +189,7 @@ textarea {
.bi-split-left { .bi-split-left {
border-left: 1px solid #f2f4f7; border-left: 1px solid #f2f4f7;
} }
.bi-theme-dark .bi-border { .bi-theme-dark .bi-split {
border: 1px solid #2F3149; border: 1px solid #2F3149;
} }
.bi-theme-dark .bi-split-top { .bi-theme-dark .bi-split-top {

2
src/less/core/utils/common.less

@ -242,7 +242,7 @@ textarea {
} }
.bi-theme-dark { .bi-theme-dark {
.bi-border { .bi-split {
border: 1px solid @border-color-light-line-theme-dark; border: 1px solid @border-color-light-line-theme-dark;
} }

Loading…
Cancel
Save