auto upgrade version to 2.0.20201229102138

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-28 14:20:17 */
+/*! time: 2020-12-29 10:20:41 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -69080,19 +69080,10 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         if (!this.items) {
             o.itemsCreator({}, function (items) {
                 self._initData(items);
-                join();
+                call();
             });
         } else {
-            join();
-        }
-
-        // 重新计算合并selectedValues
-        function join() {
-            self._reqAdjustTreeNode(options, function (joinedValue) {
-                options.selectedValues = joinedValue;
-
             call();
-            });
         }
 
         function call() {
@@ -69650,11 +69641,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         }
 
         function dealWithSelectedValue(parentValues, selectedValues) {
-            var valueMap = {};
+            var valueMap = {}, parents = (parentValues || []).slice(0);
             BI.each(parentValues, function (i, v) {
+                parents.push(v);
+
                 selectedValues = selectedValues[v] || {};
             });
             BI.each(selectedValues, function (value, obj) {
+                var currentParents = BI.concat(parents, value);
+
                 if (BI.isNull(obj)) {
                     valueMap[value] = [0, 0];
                     return;
@@ -69667,6 +69662,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 BI.each(obj, function (t, o) {
                     if (BI.isNull(o) || BI.isEmpty(o)) {
                         nextNames[t] = true;
+                    } else {
+                        isAllSelected(o, BI.concat(currentParents, [t])) && (nextNames[t] = true);
                     }
                 });
                 // valueMap的数组第一个参数为不选: 0, 半选: 1, 全选：2， 第二个参数为改节点下选中的子节点个数(子节点全选或者不存在)
@@ -69675,6 +69672,20 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
             return valueMap;
         }
 
+        function isAllSelected(selected, parents) {
+            if (BI.isEmpty(selected)) {
+                return true;
+            }
+
+            if (self._getChildCount(parents) !== BI.size(selected)) {
+                return false;
+            }
+
+            return BI.every(selected, function (value) {
+               return isAllSelected(selected[value], BI.concat(parents, value));
+            });
+        }
+
         function getCheckState(current, parentValues, valueMap, checkState) {
             // 节点本身的checked和half优先级最高
             var checked = checkState.checked, half = checkState.half;
@@ -69821,7 +69832,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         } else {
             var parent = this.tree.getRoot();
         }
-        return parent.getChildren();
+
+        return parent ? parent.getChildren() : [];
     },
 
     _getAllChildren: function(parentValues) {

dist/core.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-28 14:20:17 */
+/*! time: 2020-12-29 10:20:41 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -69080,19 +69080,10 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         if (!this.items) {
             o.itemsCreator({}, function (items) {
                 self._initData(items);
-                join();
+                call();
             });
         } else {
-            join();
-        }
-
-        // 重新计算合并selectedValues
-        function join() {
-            self._reqAdjustTreeNode(options, function (joinedValue) {
-                options.selectedValues = joinedValue;
-
             call();
-            });
         }
 
         function call() {
@@ -69650,11 +69641,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         }
 
         function dealWithSelectedValue(parentValues, selectedValues) {
-            var valueMap = {};
+            var valueMap = {}, parents = (parentValues || []).slice(0);
             BI.each(parentValues, function (i, v) {
+                parents.push(v);
+
                 selectedValues = selectedValues[v] || {};
             });
             BI.each(selectedValues, function (value, obj) {
+                var currentParents = BI.concat(parents, value);
+
                 if (BI.isNull(obj)) {
                     valueMap[value] = [0, 0];
                     return;
@@ -69667,6 +69662,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 BI.each(obj, function (t, o) {
                     if (BI.isNull(o) || BI.isEmpty(o)) {
                         nextNames[t] = true;
+                    } else {
+                        isAllSelected(o, BI.concat(currentParents, [t])) && (nextNames[t] = true);
                     }
                 });
                 // valueMap的数组第一个参数为不选: 0, 半选: 1, 全选：2， 第二个参数为改节点下选中的子节点个数(子节点全选或者不存在)
@@ -69675,6 +69672,20 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
             return valueMap;
         }
 
+        function isAllSelected(selected, parents) {
+            if (BI.isEmpty(selected)) {
+                return true;
+            }
+
+            if (self._getChildCount(parents) !== BI.size(selected)) {
+                return false;
+            }
+
+            return BI.every(selected, function (value) {
+               return isAllSelected(selected[value], BI.concat(parents, value));
+            });
+        }
+
         function getCheckState(current, parentValues, valueMap, checkState) {
             // 节点本身的checked和half优先级最高
             var checked = checkState.checked, half = checkState.half;
@@ -69821,7 +69832,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         } else {
             var parent = this.tree.getRoot();
         }
-        return parent.getChildren();
+
+        return parent ? parent.getChildren() : [];
     },
 
     _getAllChildren: function(parentValues) {

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-28 14:20:17 */
+/*! time: 2020-12-29 10:20:41 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -69080,19 +69080,10 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         if (!this.items) {
             o.itemsCreator({}, function (items) {
                 self._initData(items);
-                join();
+                call();
             });
         } else {
-            join();
-        }
-
-        // 重新计算合并selectedValues
-        function join() {
-            self._reqAdjustTreeNode(options, function (joinedValue) {
-                options.selectedValues = joinedValue;
-
             call();
-            });
         }
 
         function call() {
@@ -69650,11 +69641,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         }
 
         function dealWithSelectedValue(parentValues, selectedValues) {
-            var valueMap = {};
+            var valueMap = {}, parents = (parentValues || []).slice(0);
             BI.each(parentValues, function (i, v) {
+                parents.push(v);
+
                 selectedValues = selectedValues[v] || {};
             });
             BI.each(selectedValues, function (value, obj) {
+                var currentParents = BI.concat(parents, value);
+
                 if (BI.isNull(obj)) {
                     valueMap[value] = [0, 0];
                     return;
@@ -69667,6 +69662,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 BI.each(obj, function (t, o) {
                     if (BI.isNull(o) || BI.isEmpty(o)) {
                         nextNames[t] = true;
+                    } else {
+                        isAllSelected(o, BI.concat(currentParents, [t])) && (nextNames[t] = true);
                     }
                 });
                 // valueMap的数组第一个参数为不选: 0, 半选: 1, 全选：2， 第二个参数为改节点下选中的子节点个数(子节点全选或者不存在)
@@ -69675,6 +69672,20 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
             return valueMap;
         }
 
+        function isAllSelected(selected, parents) {
+            if (BI.isEmpty(selected)) {
+                return true;
+            }
+
+            if (self._getChildCount(parents) !== BI.size(selected)) {
+                return false;
+            }
+
+            return BI.every(selected, function (value) {
+               return isAllSelected(selected[value], BI.concat(parents, value));
+            });
+        }
+
         function getCheckState(current, parentValues, valueMap, checkState) {
             // 节点本身的checked和half优先级最高
             var checked = checkState.checked, half = checkState.half;
@@ -69821,7 +69832,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         } else {
             var parent = this.tree.getRoot();
         }
-        return parent.getChildren();
+
+        return parent ? parent.getChildren() : [];
     },
 
     _getAllChildren: function(parentValues) {

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-28 14:20:17 */
+/*! time: 2020-12-29 10:20:41 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -69080,19 +69080,10 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         if (!this.items) {
             o.itemsCreator({}, function (items) {
                 self._initData(items);
-                join();
+                call();
             });
         } else {
-            join();
-        }
-
-        // 重新计算合并selectedValues
-        function join() {
-            self._reqAdjustTreeNode(options, function (joinedValue) {
-                options.selectedValues = joinedValue;
-
             call();
-            });
         }
 
         function call() {
@@ -69650,11 +69641,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         }
 
         function dealWithSelectedValue(parentValues, selectedValues) {
-            var valueMap = {};
+            var valueMap = {}, parents = (parentValues || []).slice(0);
             BI.each(parentValues, function (i, v) {
+                parents.push(v);
+
                 selectedValues = selectedValues[v] || {};
             });
             BI.each(selectedValues, function (value, obj) {
+                var currentParents = BI.concat(parents, value);
+
                 if (BI.isNull(obj)) {
                     valueMap[value] = [0, 0];
                     return;
@@ -69667,6 +69662,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 BI.each(obj, function (t, o) {
                     if (BI.isNull(o) || BI.isEmpty(o)) {
                         nextNames[t] = true;
+                    } else {
+                        isAllSelected(o, BI.concat(currentParents, [t])) && (nextNames[t] = true);
                     }
                 });
                 // valueMap的数组第一个参数为不选: 0, 半选: 1, 全选：2， 第二个参数为改节点下选中的子节点个数(子节点全选或者不存在)
@@ -69675,6 +69672,20 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
             return valueMap;
         }
 
+        function isAllSelected(selected, parents) {
+            if (BI.isEmpty(selected)) {
+                return true;
+            }
+
+            if (self._getChildCount(parents) !== BI.size(selected)) {
+                return false;
+            }
+
+            return BI.every(selected, function (value) {
+               return isAllSelected(selected[value], BI.concat(parents, value));
+            });
+        }
+
         function getCheckState(current, parentValues, valueMap, checkState) {
             // 节点本身的checked和half优先级最高
             var checked = checkState.checked, half = checkState.half;
@@ -69821,7 +69832,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         } else {
             var parent = this.tree.getRoot();
         }
-        return parent.getChildren();
+
+        return parent ? parent.getChildren() : [];
     },
 
     _getAllChildren: function(parentValues) {

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-28 14:20:17 */
+/*! time: 2020-12-29 10:20:41 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -65107,19 +65107,10 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         if (!this.items) {
             o.itemsCreator({}, function (items) {
                 self._initData(items);
-                join();
+                call();
             });
         } else {
-            join();
-        }
-
-        // 重新计算合并selectedValues
-        function join() {
-            self._reqAdjustTreeNode(options, function (joinedValue) {
-                options.selectedValues = joinedValue;
-
             call();
-            });
         }
 
         function call() {
@@ -65677,11 +65668,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         }
 
         function dealWithSelectedValue(parentValues, selectedValues) {
-            var valueMap = {};
+            var valueMap = {}, parents = (parentValues || []).slice(0);
             BI.each(parentValues, function (i, v) {
+                parents.push(v);
+
                 selectedValues = selectedValues[v] || {};
             });
             BI.each(selectedValues, function (value, obj) {
+                var currentParents = BI.concat(parents, value);
+
                 if (BI.isNull(obj)) {
                     valueMap[value] = [0, 0];
                     return;
@@ -65694,6 +65689,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                 BI.each(obj, function (t, o) {
                     if (BI.isNull(o) || BI.isEmpty(o)) {
                         nextNames[t] = true;
+                    } else {
+                        isAllSelected(o, BI.concat(currentParents, [t])) && (nextNames[t] = true);
                     }
                 });
                 // valueMap的数组第一个参数为不选: 0, 半选: 1, 全选：2， 第二个参数为改节点下选中的子节点个数(子节点全选或者不存在)
@@ -65702,6 +65699,20 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
             return valueMap;
         }
 
+        function isAllSelected(selected, parents) {
+            if (BI.isEmpty(selected)) {
+                return true;
+            }
+
+            if (self._getChildCount(parents) !== BI.size(selected)) {
+                return false;
+            }
+
+            return BI.every(selected, function (value) {
+               return isAllSelected(selected[value], BI.concat(parents, value));
+            });
+        }
+
         function getCheckState(current, parentValues, valueMap, checkState) {
             // 节点本身的checked和half优先级最高
             var checked = checkState.checked, half = checkState.half;
@@ -65848,7 +65859,8 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
         } else {
             var parent = this.tree.getRoot();
         }
-        return parent.getChildren();
+
+        return parent ? parent.getChildren() : [];
     },
 
     _getAllChildren: function(parentValues) {

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-12-28 14:20:17 */
+/*! time: 2020-12-29 10:20:41 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

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