Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~dailer/fineui

# Conflicts:
#	changelog.md

changelog.md

@@ -1,6 +1,7 @@
 # 更新日志
 2.0(2020-11)
 - bi.textarea_editor添加setWatermark方法
+- 生命周期可以通过属性传递来操作
 - 修复了颜色选择器hex框不能输入为空的问题
 - 增加纯文本组件bi.pure_text
 - store支持webworker,引入多线程机制

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-23 11:50:31 */
+/*! time: 2020-11-25 23:40:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -14215,6 +14215,7 @@ module.exports = function (exec) {
 })();
 
 
+
 /***/ }),
 /* 302 */
 /***/ (function(module, exports) {
@@ -23646,7 +23647,7 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         width: datum.width,
                         height: datum.height
                     }, o.items[datum.index], {
-                        cls: (o.items[datum.index].cls || "") + " container-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
+                        cls: (o.items[datum.index].cls || "") + " collection-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
                         _left: datum.x,
                         _top: datum.y
                     }));
@@ -89822,7 +89823,7 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
         this.R.setValue(BI.isNull(json.r) ? "" : json.r);
         this.G.setValue(BI.isNull(json.g) ? "" : json.g);
         this.B.setValue(BI.isNull(json.b) ? "" : json.b);
-        this.hexEditor.setValue(color.slice(this.constants.HEX_PREFIX_POSITION));
+        this.hexEditor.setValue(BI.isEmptyObject(json) ? "" : color.slice(this.constants.HEX_PREFIX_POSITION));
     },
 
     getValue: function () {

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-23 11:50:31 */
+/*! time: 2020-11-25 23:40:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -14215,6 +14215,7 @@ module.exports = function (exec) {
 })();
 
 
+
 /***/ }),
 /* 302 */
 /***/ (function(module, exports) {
@@ -23646,7 +23647,7 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         width: datum.width,
                         height: datum.height
                     }, o.items[datum.index], {
-                        cls: (o.items[datum.index].cls || "") + " container-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
+                        cls: (o.items[datum.index].cls || "") + " collection-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
                         _left: datum.x,
                         _top: datum.y
                     }));
@@ -89822,7 +89823,7 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
         this.R.setValue(BI.isNull(json.r) ? "" : json.r);
         this.G.setValue(BI.isNull(json.g) ? "" : json.g);
         this.B.setValue(BI.isNull(json.b) ? "" : json.b);
-        this.hexEditor.setValue(color.slice(this.constants.HEX_PREFIX_POSITION));
+        this.hexEditor.setValue(BI.isEmptyObject(json) ? "" : color.slice(this.constants.HEX_PREFIX_POSITION));
     },
 
     getValue: function () {

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-23 11:50:31 */
+/*! time: 2020-11-25 23:40:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -14215,6 +14215,7 @@ module.exports = function (exec) {
 })();
 
 
+
 /***/ }),
 /* 302 */
 /***/ (function(module, exports) {
@@ -23646,7 +23647,7 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         width: datum.width,
                         height: datum.height
                     }, o.items[datum.index], {
-                        cls: (o.items[datum.index].cls || "") + " container-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
+                        cls: (o.items[datum.index].cls || "") + " collection-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
                         _left: datum.x,
                         _top: datum.y
                     }));
@@ -89822,7 +89823,7 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
         this.R.setValue(BI.isNull(json.r) ? "" : json.r);
         this.G.setValue(BI.isNull(json.g) ? "" : json.g);
         this.B.setValue(BI.isNull(json.b) ? "" : json.b);
-        this.hexEditor.setValue(color.slice(this.constants.HEX_PREFIX_POSITION));
+        this.hexEditor.setValue(BI.isEmptyObject(json) ? "" : color.slice(this.constants.HEX_PREFIX_POSITION));
     },
 
     getValue: function () {

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-23 11:50:31 */
+/*! time: 2020-11-25 23:40:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -10242,6 +10242,7 @@ BI.Req = {
 })();
 
 
+
 /***/ }),
 /* 302 */
 /***/ (function(module, exports) {
@@ -19673,7 +19674,7 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         width: datum.width,
                         height: datum.height
                     }, o.items[datum.index], {
-                        cls: (o.items[datum.index].cls || "") + " container-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
+                        cls: (o.items[datum.index].cls || "") + " collection-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
                         _left: datum.x,
                         _top: datum.y
                     }));

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-11-23 11:50:31 */
+/*! time: 2020-11-25 23:40:26 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fineui",
-  "version": "2.0.20201123115206",
+  "version": "2.0.20201125234158",
   "description": "fineui",
   "main": "dist/fineui.min.js",
   "types": "dist/lib/index.d.ts",

src/base/collection/collection.js

@@ -181,7 +181,7 @@ BI.CollectionView = BI.inherit(BI.Widget, {
                         width: datum.width,
                         height: datum.height
                     }, o.items[datum.index], {
-                        cls: (o.items[datum.index].cls || "") + " container-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
+                        cls: (o.items[datum.index].cls || "") + " collection-cell" + (datum.y === 0 ? " first-row" : "") + (datum.x === 0 ? " first-col" : ""),
                         _left: datum.x,
                         _top: datum.y
                     }));

src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js

@@ -181,7 +181,7 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
         this.R.setValue(BI.isNull(json.r) ? "" : json.r);
         this.G.setValue(BI.isNull(json.g) ? "" : json.g);
         this.B.setValue(BI.isNull(json.b) ? "" : json.b);
-        this.hexEditor.setValue(color.slice(this.constants.HEX_PREFIX_POSITION));
+        this.hexEditor.setValue(BI.isEmptyObject(json) ? "" : color.slice(this.constants.HEX_PREFIX_POSITION));
     },
 
     getValue: function () {

src/core/__test__/base.test.js

@@ -437,7 +437,8 @@ describe("baseFunctionTest", function () {
      * test_author_teller
      * 只传一个时分秒format的时间进去后,在某些情况下,返回的是当前时间,然而想要的是返回正确的时分秒
     */
-    it("parseDateTime", function () {
-        expect(BI.parseDateTime("14:13:16", "%H:%M:%S").getTime()).to.eql(1602655996000);
+    it("parseDateTime2", function () {
+        var date = BI.getDate();
+        expect(BI.parseDateTime("14:13:16", "%H:%M:%S").getTime()).to.eql(BI.getDate(date.getFullYear(), date.getMonth(), 14, 14, 13, 16).getTime());
     });
 });

src/core/__test__/context.test.js

@@ -1,5 +1,5 @@
 /**
- * Created by windy on 2018/01/23.
+ * Created by guy on 2018/01/23.
  */
 describe("contextTest", function () {
 

src/core/__test__/widget.test.js

@@ -0,0 +1,38 @@
+/**
+ * Created by guy on 2018/01/23.
+ */
+describe("widgetTest", function () {
+
+    before(function () {
+    });
+
+    /**
+     * test_author_guy
+     */
+    it("widget生命周期测试", function () {
+
+        var Demo = BI.inherit(BI.Widget, {
+            render: function () {
+                return {
+                    type: "bi.label",
+                    text: "old"
+                };
+            }
+        });
+        BI.shortcut("demo.demo", Demo);
+
+        var demo = BI.Test.createWidget({
+            type: "demo.demo",
+            render: function () {
+                return {
+                    type: "bi.label",
+                    text: "new"
+                };
+            }
+        });
+
+        expect(demo.element.text()).to.equal("new");
+        demo.destroy();
+    });
+
+});

src/core/widget.js

@@ -658,3 +658,4 @@
         return widget._mount(true, false, false, predicate);
     };
 })();
+

src/less/base/segment/segment.less

@@ -30,7 +30,7 @@
       border-bottom: 1px solid @color-bi-border-line-theme-dark;
     }
     & > .first-element{
-      border-left: 1px solid @color-bi-background-default-theme-dark;
+      border-left: 1px solid @color-bi-border-line-theme-dark;
     }
   }
-}
+}

src/less/core/utils/common.less

@@ -927,35 +927,83 @@ textarea {
     }
   }
   &.disabled {
-    color: @color-bi-text-disabled !important;
-    & .bi-input {
-      color: @color-bi-text-disabled !important;
-    }
-    & .bi-textarea {
-      color: @color-bi-text-disabled !important;
-    }
-    background-color: transparent !important;
-    & .bi-high-light {
+    &, &:hover, &:active {
       color: @color-bi-text-disabled !important;
-    }
-    &.bi-high-light-border {
-      border-color: @color-bi-border-disabled;
-    }
-    &.hover, &.active {
-      color: @color-bi-text !important;
       & .bi-input {
-        color: @color-bi-text !important;
+        color: @color-bi-text-disabled !important;
       }
       & .bi-textarea {
-        color: @color-bi-text !important;
+        color: @color-bi-text-disabled !important;
       }
-      background-color: @color-bi-background-dark-gray !important;
+      background-color: transparent !important;
       & .bi-high-light {
         color: @color-bi-text-disabled !important;
       }
       &.bi-high-light-border {
         border-color: @color-bi-border-disabled;
       }
+      &.hover, &.active {
+        color: @color-bi-text !important;
+        & .bi-input {
+          color: @color-bi-text !important;
+        }
+        & .bi-textarea {
+          color: @color-bi-text !important;
+        }
+        background-color: @color-bi-background-dark-gray !important;
+        & .bi-high-light {
+          color: @color-bi-text-disabled !important;
+        }
+        &.bi-high-light-border {
+          border-color: @color-bi-border-disabled;
+        }
+      }
+    }
+  }
+}
+
+.bi-theme-dark {
+  .bi-list-item-select {
+    &:hover, &.hover {
+      color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
+      & .bi-textarea {
+        color: @color-bi-text;
+      }
+      .background-color(@color-bi-background-default, 5%);
+    }
+    &:active, &.active {
+      color: @color-bi-text;
+      & .bi-input {
+        color: @color-bi-text;
+      }
+      & .bi-textarea {
+        color: @color-bi-text;
+      }
+      background-color: @color-bi-background-highlight;
+      & .bi-high-light {
+        color: @color-bi-text;
+      }
+    }
+    &.disabled {
+      &, &:hover, &:active {
+        background-color: transparent !important;
+        color: @color-bi-text-disabled-theme-dark !important;
+        & .bi-input {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+        & .bi-textarea {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+        & .bi-high-light {
+          color: @color-bi-text-disabled-theme-dark !important;
+        }
+      }
+      &.hover, &.active {
+        background-color: @background-color-black-theme-dark !important;
+      }
     }
   }
 }
@@ -1031,7 +1079,7 @@ textarea {
     &.active {
       background-color: @color-bi-background-default-theme-dark;
     }
-    
+
     &.disabled {
       &, &:hover, &:active {
         background-color: transparent !important;
@@ -1046,6 +1094,9 @@ textarea {
           color: @color-bi-text-disabled-theme-dark !important;
         }
       }
+      &.active {
+        background-color: @background-color-black-theme-dark !important;
+      }
     }
   }
 }
@@ -1095,49 +1146,6 @@ textarea {
   }
 }
 
-.bi-theme-dark {
-  .bi-list-item-select {
-    &:hover, &.hover {
-      color: @color-bi-text;
-      & .bi-input {
-        color: @color-bi-text;
-      }
-      & .bi-textarea {
-        color: @color-bi-text;
-      }
-      .background-color(@color-bi-background-default, 5%);
-    }
-    &:active, &.active {
-      color: @color-bi-text;
-      & .bi-input {
-        color: @color-bi-text;
-      }
-      & .bi-textarea {
-        color: @color-bi-text;
-      }
-      background-color: @color-bi-background-highlight;
-      & .bi-high-light {
-        color: @color-bi-text;
-      }
-    }
-    &.disabled {
-      &, &:hover, &:active {
-        background-color: transparent !important;
-        color: @color-bi-text-disabled-theme-dark !important;
-        & .bi-input {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-        & .bi-textarea {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-        & .bi-high-light {
-          color: @color-bi-text-disabled-theme-dark !important;
-        }
-      }
-    }
-  }
-}
-
 //去掉list-item效果
 .bi-list-item-none {
   &:hover, &.hover {