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

* commit '464306a902abf36a742e601b97bc6d19181eb46f':
  update
  BI-21015
  BI-19739
  BI-20686 交互
  update

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": "十一月",

dist/bundle.js

@@ -90563,6 +90563,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
 
     setValue: function (v) {
         v = v || {};
+        this.position = v.position || BI.DynamicDateCard.OFFSET.CURRENT;
         var values = [];
         var valuesItems = [];
         if(BI.isNotNull(v.year)) {
@@ -90864,7 +90865,10 @@ BI.extend(BI.DynamicDateCard, {
     },
 
     mounted: function () {
-        this._checkDynamicValue(this.options.value);
+        var o = this.options;
+        if(BI.isNotNull(o.value)) {
+            this._checkDynamicValue(o.value);
+        }
     },
 
     _checkDynamicValue: function (v) {
@@ -90961,7 +90965,7 @@ BI.extend(BI.DynamicDateCombo, {
                     height: 24,
                     text: this._getText()
                 },
-                width: 20
+                width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
             }, {
                 type: "bi.text_value_combo",
                 height: 24,
@@ -91002,9 +91006,12 @@ BI.extend(BI.DynamicDateCombo, {
                 text = BI.i18nText("BI-Basic_Week");
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-            default:
                 text = BI.i18nText("BI-Basic_Day");
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+            default:
+                text = BI.i18nText("BI-Basic_Work_Day");
+                break;
         }
         return text;
     },
@@ -91101,7 +91108,6 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
         var self = this;
         return {
             type: "bi.tab",
-            showIndex: BI.DynamicDateCombo.Static,
             ref: function () {
                 self.dateTab = this;
             },
@@ -91722,7 +91728,10 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
     },
 
     mounted: function () {
-        this._checkDynamicValue(this.options.value);
+        var o = this.options;
+        if(BI.isNotNull(o.value)) {
+            this._checkDynamicValue(o.value);
+        }
     },
 
     _checkDynamicValue: function (v) {
@@ -91850,7 +91859,6 @@ BI.extend(BI.DynamicDateTimeCombo, {
         var self = this;
         return {
             type: "bi.tab",
-            showIndex: BI.DynamicDateCombo.Static,
             ref: function () {
                 self.dateTab = this;
             },
@@ -112640,7 +112648,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": "十一月",

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": "十一月",

dist/demo.js

@@ -11014,6 +11014,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.js

@@ -90806,6 +90806,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
 
     setValue: function (v) {
         v = v || {};
+        this.position = v.position || BI.DynamicDateCard.OFFSET.CURRENT;
         var values = [];
         var valuesItems = [];
         if(BI.isNotNull(v.year)) {
@@ -91107,7 +91108,10 @@ BI.extend(BI.DynamicDateCard, {
     },
 
     mounted: function () {
-        this._checkDynamicValue(this.options.value);
+        var o = this.options;
+        if(BI.isNotNull(o.value)) {
+            this._checkDynamicValue(o.value);
+        }
     },
 
     _checkDynamicValue: function (v) {
@@ -91204,7 +91208,7 @@ BI.extend(BI.DynamicDateCombo, {
                     height: 24,
                     text: this._getText()
                 },
-                width: 20
+                width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
             }, {
                 type: "bi.text_value_combo",
                 height: 24,
@@ -91245,9 +91249,12 @@ BI.extend(BI.DynamicDateCombo, {
                 text = BI.i18nText("BI-Basic_Week");
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-            default:
                 text = BI.i18nText("BI-Basic_Day");
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+            default:
+                text = BI.i18nText("BI-Basic_Work_Day");
+                break;
         }
         return text;
     },
@@ -91344,7 +91351,6 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
         var self = this;
         return {
             type: "bi.tab",
-            showIndex: BI.DynamicDateCombo.Static,
             ref: function () {
                 self.dateTab = this;
             },
@@ -91965,7 +91971,10 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
     },
 
     mounted: function () {
-        this._checkDynamicValue(this.options.value);
+        var o = this.options;
+        if(BI.isNotNull(o.value)) {
+            this._checkDynamicValue(o.value);
+        }
     },
 
     _checkDynamicValue: function (v) {
@@ -92093,7 +92102,6 @@ BI.extend(BI.DynamicDateTimeCombo, {
         var self = this;
         return {
             type: "bi.tab",
-            showIndex: BI.DynamicDateCombo.Static,
             ref: function () {
                 self.dateTab = this;
             },
@@ -112883,7 +112891,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": "十一月",

dist/widget.js

@@ -3009,6 +3009,7 @@ BI.shortcut("bi.down_list_popup", BI.DownListPopup);/**
 
     setValue: function (v) {
         v = v || {};
+        this.position = v.position || BI.DynamicDateCard.OFFSET.CURRENT;
         var values = [];
         var valuesItems = [];
         if(BI.isNotNull(v.year)) {
@@ -3310,7 +3311,10 @@ BI.extend(BI.DynamicDateCard, {
     },
 
     mounted: function () {
-        this._checkDynamicValue(this.options.value);
+        var o = this.options;
+        if(BI.isNotNull(o.value)) {
+            this._checkDynamicValue(o.value);
+        }
     },
 
     _checkDynamicValue: function (v) {
@@ -3407,7 +3411,7 @@ BI.extend(BI.DynamicDateCombo, {
                     height: 24,
                     text: this._getText()
                 },
-                width: 20
+                width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
             }, {
                 type: "bi.text_value_combo",
                 height: 24,
@@ -3448,9 +3452,12 @@ BI.extend(BI.DynamicDateCombo, {
                 text = BI.i18nText("BI-Basic_Week");
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-            default:
                 text = BI.i18nText("BI-Basic_Day");
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+            default:
+                text = BI.i18nText("BI-Basic_Work_Day");
+                break;
         }
         return text;
     },
@@ -3547,7 +3554,6 @@ BI.shortcut("bi.dynamic_date_param_item", BI.DynamicDateParamItem);BI.DynamicDat
         var self = this;
         return {
             type: "bi.tab",
-            showIndex: BI.DynamicDateCombo.Static,
             ref: function () {
                 self.dateTab = this;
             },
@@ -4168,7 +4174,10 @@ BI.shortcut("bi.dynamic_date_trigger", BI.DynamicDateTrigger);BI.DynamicDateTime
     },
 
     mounted: function () {
-        this._checkDynamicValue(this.options.value);
+        var o = this.options;
+        if(BI.isNotNull(o.value)) {
+            this._checkDynamicValue(o.value);
+        }
     },
 
     _checkDynamicValue: function (v) {
@@ -4296,7 +4305,6 @@ BI.extend(BI.DynamicDateTimeCombo, {
         var self = this;
         return {
             type: "bi.tab",
-            showIndex: BI.DynamicDateCombo.Static,
             ref: function () {
                 self.dateTab = this;
             },

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": "十一月",

src/widget/dynamicdate/dynamicdate.card.js

@@ -241,6 +241,7 @@ BI.DynamicDateCard = BI.inherit(BI.Widget, {
 
     setValue: function (v) {
         v = v || {};
+        this.position = v.position || BI.DynamicDateCard.OFFSET.CURRENT;
         var values = [];
         var valuesItems = [];
         if(BI.isNotNull(v.year)) {

src/widget/dynamicdate/dynamicdate.combo.js

@@ -211,7 +211,10 @@ BI.DynamicDateCombo = BI.inherit(BI.Single, {
     },
 
     mounted: function () {
-        this._checkDynamicValue(this.options.value);
+        var o = this.options;
+        if(BI.isNotNull(o.value)) {
+            this._checkDynamicValue(o.value);
+        }
     },
 
     _checkDynamicValue: function (v) {

src/widget/dynamicdate/dynamicdate.param.item.js

@@ -45,7 +45,7 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
                     height: 24,
                     text: this._getText()
                 },
-                width: 20
+                width: o.dateType === BI.DynamicDateCard.TYPE.WORK_DAY ? 60 : 20
             }, {
                 type: "bi.text_value_combo",
                 height: 24,
@@ -86,9 +86,12 @@ BI.DynamicDateParamItem = BI.inherit(BI.Widget, {
                 text = BI.i18nText("BI-Basic_Week");
                 break;
             case BI.DynamicDateCard.TYPE.DAY:
-            default:
                 text = BI.i18nText("BI-Basic_Day");
                 break;
+            case BI.DynamicDateCard.TYPE.WORK_DAY:
+            default:
+                text = BI.i18nText("BI-Basic_Work_Day");
+                break;
         }
         return text;
     },

src/widget/dynamicdate/dynamicdate.popup.js

@@ -72,7 +72,6 @@ BI.DynamicDatePopup = BI.inherit(BI.Widget, {
         var self = this;
         return {
             type: "bi.tab",
-            showIndex: BI.DynamicDateCombo.Static,
             ref: function () {
                 self.dateTab = this;
             },

src/widget/dynamicdatetime/dynamicdatetime.combo.js

@@ -214,7 +214,10 @@ BI.DynamicDateTimeCombo = BI.inherit(BI.Single, {
     },
 
     mounted: function () {
-        this._checkDynamicValue(this.options.value);
+        var o = this.options;
+        if(BI.isNotNull(o.value)) {
+            this._checkDynamicValue(o.value);
+        }
     },
 
     _checkDynamicValue: function (v) {

src/widget/dynamicdatetime/dynamicdatetime.popup.js

@@ -72,7 +72,6 @@ BI.DynamicDateTimePopup = BI.inherit(BI.Widget, {
         var self = this;
         return {
             type: "bi.tab",
-            showIndex: BI.DynamicDateCombo.Static,
             ref: function () {
                 self.dateTab = this;
             },

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": "十一月",