Merge pull request #417 in FUI/fineui from ~WINDY/fui:master to master

* commit '0b1e49f8dd47d0209491de5dd13d5153ff79ee8a':
  update
  update
  BI-20686

demo/version.js

@@ -59,7 +59,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -163,5 +163,7 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-Word_Align_Center": "文字居中",
     "BI-More_Than": "大于",
-    "BI-More_And_Equal": "大于等于"
+    "BI-More_And_Equal": "大于等于",
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

dist/bundle.css

@@ -6390,6 +6390,17 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
 .tree-collapse-icon-type1 .x-icon {
   display: block;
   background: url('https://fanruan.coding.me/fineui/dist/images/2x/icon/tree_collapse_1.png') no-repeat center center;

dist/bundle.js

@@ -112968,7 +112968,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -113073,5 +113073,6 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-More_Than": "大于",
     "BI-More_And_Equal": "大于等于",
-    "BI-Please_Enter_SQL": "请输入SQL"
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

dist/config.js

@@ -59,7 +59,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -163,5 +163,7 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-Word_Align_Center": "文字居中",
     "BI-More_Than": "大于",
-    "BI-More_And_Equal": "大于等于"
+    "BI-More_And_Equal": "大于等于",
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

dist/demo.js

@@ -11017,6 +11017,111 @@ BI.shortcut("demo.tmp", Demo.Func);
     });
 
     BI.shortcut("demo.fix_global_watcher", Demo.Fix);
+}());(function () {
+    var State = BI.inherit(Fix.Model, {
+        state: function () {
+            return {
+                name: "原始属性",
+                info: {
+                    age: 12,
+                    sex: "male",
+                    birth: {
+                        year: 2018,
+                        month: 9,
+                        day: 11
+                    }
+                },
+                career: [{
+                    a: 1,
+                    b: 2,
+                    c: 3
+                }]
+            };
+        },
+        computed: {
+            b: function () {
+                return this.model.name + "-计算属性";
+            },
+            birth: function () {
+                return this.model.info.birth;
+            }
+        }
+    });
+
+    Demo.Fix = BI.inherit(BI.Widget, {
+        _store: function () {
+            return new State();
+        },
+        watch: {
+            b: function () {
+                this.button.setText(this.model.b);
+            },
+            "birth.**": function () {
+                console.log(123);
+            }
+        },
+        render: function () {
+            var self = this;
+            return {
+                type: "bi.vertical",
+                items: [{
+                    el: {
+                        type: "bi.button",
+                        ref: function () {
+                            self.button = this;
+                        },
+                        handler: function () {
+                            self.model.name = "这是改变后的属性";
+                        },
+                        text: this.model.b
+                    }
+                }, {
+                    el: {
+                        type: "bi.button",
+                        ref: function () {
+                            self.button = this;
+                        },
+                        handler: function () {
+                            self.model.birth.year = 2019;
+                        },
+                        text: "birthYearButton"
+                    }
+                }, {
+                    el: {
+                        type: "bi.button",
+                        ref: function () {
+                            self.button = this;
+                        },
+                        handler: function () {
+                            self.model.career.push({
+                                year: 2017,
+                                month: 3,
+                                day: 24
+                            });
+                        },
+                        text: "careerAddButton"
+                    }
+                }, {
+                    el: {
+                        type: "bi.button",
+                        ref: function () {
+                            self.button = this;
+                        },
+                        handler: function () {
+                            self.model.career[0].a = 24;
+                        },
+                        text: "careerChangeButton"
+                    }
+                }]
+            };
+        },
+        mounted: function () {
+
+
+        }
+    });
+
+    BI.shortcut("demo.fix_immutable", Demo.Fix);
 }());/**
  * @Author: Young
  * @CreationDate 2017-11-06 10:32

dist/fineui.css

@@ -6390,6 +6390,17 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
 .tree-collapse-icon-type1 .x-icon {
   display: block;
   background: url('resources?path=/com/fr/web/ui/images/2x/icon/tree_collapse_1.png') no-repeat center center;

dist/fineui.js

@@ -113211,7 +113211,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -113316,5 +113316,6 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-More_Than": "大于",
     "BI-More_And_Equal": "大于等于",
-    "BI-Please_Enter_SQL": "请输入SQL"
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

dist/resource.css

@@ -1175,6 +1175,17 @@ textarea::-webkit-scrollbar-thumb:hover {
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
 .tree-collapse-icon-type1 .x-icon {
   display: block;
   background: url('images/2x/icon/tree_collapse_1.png') no-repeat center center;

public/css/font.css

@@ -854,3 +854,14 @@
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}

public/js/index.js

@@ -59,7 +59,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -164,5 +164,6 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-More_Than": "大于",
     "BI-More_And_Equal": "大于等于",
-    "BI-Please_Enter_SQL": "请输入SQL"
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };

src/css/resource/font.css

@@ -854,3 +854,14 @@
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}

src/less/lib/font.less

@@ -37,4 +37,6 @@
 @font-tip-success: "e756";
 @font-tip-warning: "e755";
 @font-tip-message: "e74b";
+@font-add: "e6dd";
+
 

src/less/resource/font.less

@@ -106,4 +106,6 @@
 .font(toast-error-font, @font-tip-error);
 .font(toast-success-font, @font-tip-success);
 .font(toast-warning-font, @font-tip-warning);
-.font(toast-message-font, @font-tip-message);
+.font(toast-message-font, @font-tip-message);
+
+.font(text-add-tip-font, @font-add, @color-bi-text-success);

ui/css/font.css

@@ -854,3 +854,14 @@
   content: "\e74b";
   color: inherit;
 }
+.text-add-tip-font .b-font {
+  *zoom: expression( this.runtimeStyle['zoom'] = '1',this.innerHTML = '');
+}
+.text-add-tip-font .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}
+.text-add-tip-font.disabled .b-font:before {
+  content: "\e6dd";
+  color: #5cb75d;
+}

ui/js/index.js

@@ -59,7 +59,7 @@ BI.i18n = {
     "BI-Basic_April": "四月",
     "BI-Multi_Date_Quarter_Begin": "季度初",
     "BI-Multi_Date_Week": "周",
-    "BI-Click_Blank_To_Select": "点击\"空格键\"选中匹配项",
+    "BI-Click_Blank_To_Select": "点击\"空格键\"选中完全匹配项",
     "BI-Basic_August": "八月",
     "BI-Word_Align_Left": "文字居左",
     "BI-Basic_November": "十一月",
@@ -164,5 +164,6 @@ BI.i18n = {
     "BI-Basic_Please_Enter_Number_Between": "请输入{R1}-{R2}的值",
     "BI-More_Than": "大于",
     "BI-More_And_Equal": "大于等于",
-    "BI-Please_Enter_SQL": "请输入SQL"
+    "BI-Please_Enter_SQL": "请输入SQL",
+    "BI-Basic_Click_To_Add_Text": "点击新增\"{R1}\""
 };