Merge remote-tracking branch 'origin/master'

# Conflicts: # dist/bundle.min.js # dist/fineui.min.js # dist/utils.min.js
6 years ago · c37e6beaba
27 changed files with 163 additions and 159 deletions
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -339,8 +339,7 @@ module.exports = function (grunt) {
            },
            server: {
                options: {
-                    port: 9001,
-                    base: "./dist"
+                    port: 9001
                }
            }
        },
--- a/README.md
+++ b/README.md
@ -12,15 +12,9 @@ Documentation

 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

-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
--- a/dist/base.js
+++ b/dist/base.js
@ -3154,7 +3154,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        //     return;
        // }
        // 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)
            || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
@ -5982,7 +5982,7 @@ BI.PopupView = BI.inherit(BI.Widget, {

        return BI.createWidget({
            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,
            items: BI.createItems(o.buttons, {
                once: false,
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -470,7 +470,7 @@ textarea {
 .bi-split-left {
  border-left: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border {
+.bi-theme-dark .bi-split {
  border: 1px solid #2F3149;
 }
 .bi-theme-dark .bi-split-top {
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
 }
 if (_global.BI == null) {
    _global.BI = {prepares: []};
+} else {
+    _global.BI.prepares = [];
 }/*!
 * jQuery JavaScript Library v1.9.1
 * http://jquery.com/
@ -38382,7 +38384,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        //     return;
        // }
        // 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)
            || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
@ -41210,7 +41212,7 @@ BI.PopupView = BI.inherit(BI.Widget, {

        return BI.createWidget({
            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,
            items: BI.createItems(o.buttons, {
                once: false,
@ -55431,7 +55433,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {

        this.buttongroup = BI.createWidget({
            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,
            items: BI.createItems(text, {
                type: "bi.text_button",
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -6842,7 +6842,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {

        this.buttongroup = BI.createWidget({
            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,
            items: BI.createItems(text, {
                type: "bi.text_button",
--- a/dist/core.css
+++ b/dist/core.css
@ -470,7 +470,7 @@ textarea {
 .bi-split-left {
  border-left: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border {
+.bi-theme-dark .bi-split {
  border: 1px solid #2F3149;
 }
 .bi-theme-dark .bi-split-top {
--- a/dist/core.js
+++ b/dist/core.js
@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
 }
 if (_global.BI == null) {
    _global.BI = {prepares: []};
+} else {
+    _global.BI.prepares = [];
 }/*!
 * jQuery JavaScript Library v1.9.1
 * http://jquery.com/
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -189,7 +189,7 @@ textarea {
 .bi-split-left {
  border-left: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border {
+.bi-theme-dark .bi-split {
  border: 1px solid #2F3149;
 }
 .bi-theme-dark .bi-split-top {
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -470,7 +470,7 @@ textarea {
 .bi-split-left {
  border-left: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border {
+.bi-theme-dark .bi-split {
  border: 1px solid #2F3149;
 }
 .bi-theme-dark .bi-split-top {
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
 }
 if (_global.BI == null) {
    _global.BI = {prepares: []};
+} else {
+    _global.BI.prepares = [];
 }// Production steps of ECMA-262, Edition 5, 15.4.4.14
 // Reference: http://es5.github.io/#x15.4.4.14
 if (!Array.prototype.indexOf) {
@ -255,6 +257,8 @@ if (typeof window !== "undefined") {
 }
 if (_global.BI == null) {
    _global.BI = {prepares: []};
+} else {
+    _global.BI.prepares = [];
 }/*!
 * jQuery JavaScript Library v1.9.1
 * http://jquery.com/
@ -38621,7 +38625,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        //     return;
        // }
        // 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)
            || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
@ -41449,7 +41453,7 @@ BI.PopupView = BI.inherit(BI.Widget, {

        return BI.createWidget({
            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,
            items: BI.createItems(o.buttons, {
                once: false,
@ -55670,7 +55674,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {

        this.buttongroup = BI.createWidget({
            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,
            items: BI.createItems(text, {
                type: "bi.text_button",
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
 }
 if (_global.BI == null) {
    _global.BI = {prepares: []};
+} else {
+    _global.BI.prepares = [];
 }/**
 * @license
 * Lodash (Custom Build) <https://lodash.com/>
@ -27008,7 +27010,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        //     return;
        // }
        // 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)
            || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
@ -29836,7 +29838,7 @@ BI.PopupView = BI.inherit(BI.Widget, {

        return BI.createWidget({
            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,
            items: BI.createItems(o.buttons, {
                once: false,
@ -39324,7 +39326,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {

        this.buttongroup = BI.createWidget({
            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,
            items: BI.createItems(text, {
                type: "bi.text_button",
--- a/dist/index.html
+++ b/dist/index.html
@ -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>
--- a/dist/polyfill.js
+++ b/dist/polyfill.js
@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
 }
 if (_global.BI == null) {
    _global.BI = {prepares: []};
+} else {
+    _global.BI.prepares = [];
 }// Production steps of ECMA-262, Edition 5, 15.4.4.14
 // Reference: http://es5.github.io/#x15.4.4.14
 if (!Array.prototype.indexOf) {
--- a/dist/utils.js
+++ b/dist/utils.js
@ -16,6 +16,8 @@ if (typeof window !== "undefined") {
 }
 if (_global.BI == null) {
    _global.BI = {prepares: []};
+} else {
+    _global.BI.prepares = [];
 }/**
 * @license
 * Lodash (Custom Build) <https://lodash.com/>
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/index.html
+++ b/index.html
@ -1,5 +1,49 @@
-<html>
-<script>
-    location.href = "docs/_book/index.html"
-</script>
+<!DOCTYPE html>
+<html lang="en">
+
+<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>
--- a/src/base/combination/combo.js
+++ b/src/base/combination/combo.js
@ -261,7 +261,7 @@ BI.Combo = BI.inherit(BI.Widget, {
        //     return;
        // }
        // 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)
            || e.target.className === "CodeMirror-cursor" || BI.Widget._renderEngine.createElement(e.target).closest(".CodeMirror-hints").length > 0) {// BI-9887 CodeMirror的公式弹框需要特殊处理下
            return;
--- a/src/base/layer/layer.popup.js
+++ b/src/base/layer/layer.popup.js
@ -129,7 +129,7 @@ BI.PopupView = BI.inherit(BI.Widget, {

        return BI.createWidget({
            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,
            items: BI.createItems(o.buttons, {
                once: false,
--- a/src/case/layer/layer.multipopup.js
+++ b/src/case/layer/layer.multipopup.js
@ -34,7 +34,7 @@ BI.MultiPopupView = BI.inherit(BI.PopupView, {

        this.buttongroup = BI.createWidget({
            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,
            items: BI.createItems(text, {
                type: "bi.text_button",
--- a/src/core/foundation.js
+++ b/src/core/foundation.js
@ -16,4 +16,6 @@ if (typeof window !== "undefined") {
 }
 if (_global.BI == null) {
    _global.BI = {prepares: []};
+} else {
+    _global.BI.prepares = [];
 }
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -189,7 +189,7 @@ textarea {
 .bi-split-left {
  border-left: 1px solid #f2f4f7;
 }
-.bi-theme-dark .bi-border {
+.bi-theme-dark .bi-split {
  border: 1px solid #2F3149;
 }
 .bi-theme-dark .bi-split-top {
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@ -242,7 +242,7 @@ textarea {
 }

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