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

4 years ago · 68d3b6ff7d
39 changed files with 122 additions and 114 deletions
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
--- a/dist/2.0/fineui.ie.min.js
+++ b/dist/2.0/fineui.ie.min.js
--- a/dist/2.0/fineui.ie.min.js.map
+++ b/dist/2.0/fineui.ie.min.js.map
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2020-10-20 16:20:29 */
+/*! time: 2020-10-26 17:50:30 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -32644,7 +32644,8 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });

        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
@ -32692,6 +32693,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {

 BI.shortcut("bi.arrow_group_node", BI.ArrowNode);

+
 /***/ }),
 /* 446 */
 /***/ (function(module, exports) {
@ -32835,7 +32837,8 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
            if (type === BI.Events.CLICK) {
@ -32885,6 +32888,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {

 BI.shortcut("bi.icon_arrow_node", BI.IconArrowNode);

+
 /***/ }),
 /* 448 */
 /***/ (function(module, exports) {
@ -33094,7 +33098,8 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        this.node.on(BI.Controller.EVENT_CHANGE, function (type) {
            self.setSelected(self.isSelected());
@ -33666,6 +33671,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, {
            text: o.text,
            value: o.value,
            py: o.py,
+            keyword: o.keyword,
            iconWidth: o.iconWidth,
            iconHeight: o.iconHeight
        });
@ -33771,7 +33777,8 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {
            rgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        BI.createWidget({
            type: "bi.htape",
@ -33809,6 +33816,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {

 BI.shortcut("bi.tree_text_leaf_item", BI.TreeTextLeafItem);

+
 /***/ }),
 /* 459 */
 /***/ (function(module, exports) {
@ -68876,19 +68884,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                    parentCheckState.half = find.halfCheck;
                }
                var state = getCheckState(node.value, node.parentValues, valueMap, parentCheckState);
-
-                var isParent = node.getChildrenLength() > 0;
                result.push({
                    id: node.id,
                    pId: node.pId,
                    value: node.value,
                    text: node.text,
                    times: 1,
-                    isParent: isParent,
-                    // 同步树的情况下，父亲节点的状态由子控制，不再设置checked和halfCheck属性
-                    // 叶子节点本身不存在halfCheck属性且checked属性由计算得到
-                    checked: isParent ? undefined : state[0],
-                    // halfCheck: state[1],
+                    isParent: node.getChildrenLength() > 0,
+                    checked: state[0],
+                    halfCheck: state[1],
                    open: self.options.open
                });
            });
--- a/dist/2.0/fineui.js.map
+++ b/dist/2.0/fineui.js.map
--- a/dist/2.0/fineui.min.css
+++ b/dist/2.0/fineui.min.css
--- a/dist/2.0/fineui.min.js
+++ b/dist/2.0/fineui.min.js
--- a/dist/2.0/fineui.min.js.map
+++ b/dist/2.0/fineui.min.js.map
--- a/dist/2.0/fineui_without_normalize.css
+++ b/dist/2.0/fineui_without_normalize.css
--- a/dist/2.0/fineui_without_normalize.min.css
+++ b/dist/2.0/fineui_without_normalize.min.css
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/bundle.min.js.map
+++ b/dist/bundle.min.js.map
--- a/dist/demo.css
+++ b/dist/demo.css
--- a/dist/demo.js
+++ b/dist/demo.js
@ -1,4 +1,4 @@
-/*! time: 2020-10-20 16:20:29 */
+/*! time: 2020-10-26 17:50:30 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -32644,7 +32644,8 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });

        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
@ -32692,6 +32693,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {

 BI.shortcut("bi.arrow_group_node", BI.ArrowNode);

+
 /***/ }),
 /* 446 */
 /***/ (function(module, exports) {
@ -32835,7 +32837,8 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
            if (type === BI.Events.CLICK) {
@ -32885,6 +32888,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {

 BI.shortcut("bi.icon_arrow_node", BI.IconArrowNode);

+
 /***/ }),
 /* 448 */
 /***/ (function(module, exports) {
@ -33094,7 +33098,8 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        this.node.on(BI.Controller.EVENT_CHANGE, function (type) {
            self.setSelected(self.isSelected());
@ -33666,6 +33671,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, {
            text: o.text,
            value: o.value,
            py: o.py,
+            keyword: o.keyword,
            iconWidth: o.iconWidth,
            iconHeight: o.iconHeight
        });
@ -33771,7 +33777,8 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {
            rgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        BI.createWidget({
            type: "bi.htape",
@ -33809,6 +33816,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {

 BI.shortcut("bi.tree_text_leaf_item", BI.TreeTextLeafItem);

+
 /***/ }),
 /* 459 */
 /***/ (function(module, exports) {
@ -68876,19 +68884,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                    parentCheckState.half = find.halfCheck;
                }
                var state = getCheckState(node.value, node.parentValues, valueMap, parentCheckState);
-
-                var isParent = node.getChildrenLength() > 0;
                result.push({
                    id: node.id,
                    pId: node.pId,
                    value: node.value,
                    text: node.text,
                    times: 1,
-                    isParent: isParent,
-                    // 同步树的情况下，父亲节点的状态由子控制，不再设置checked和halfCheck属性
-                    // 叶子节点本身不存在halfCheck属性且checked属性由计算得到
-                    checked: isParent ? undefined : state[0],
-                    // halfCheck: state[1],
+                    isParent: node.getChildrenLength() > 0,
+                    checked: state[0],
+                    halfCheck: state[1],
                    open: self.options.open
                });
            });
--- a/dist/demo.js.map
+++ b/dist/demo.js.map
--- a/dist/fineui.css
+++ b/dist/fineui.css
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.ie.min.js.map
+++ b/dist/fineui.ie.min.js.map
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -1,4 +1,4 @@
-/*! time: 2020-10-20 16:20:29 */
+/*! time: 2020-10-26 17:50:30 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -32644,7 +32644,8 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });

        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
@ -32692,6 +32693,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {

 BI.shortcut("bi.arrow_group_node", BI.ArrowNode);

+
 /***/ }),
 /* 446 */
 /***/ (function(module, exports) {
@ -32835,7 +32837,8 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
            if (type === BI.Events.CLICK) {
@ -32885,6 +32888,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {

 BI.shortcut("bi.icon_arrow_node", BI.IconArrowNode);

+
 /***/ }),
 /* 448 */
 /***/ (function(module, exports) {
@ -33094,7 +33098,8 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        this.node.on(BI.Controller.EVENT_CHANGE, function (type) {
            self.setSelected(self.isSelected());
@ -33666,6 +33671,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, {
            text: o.text,
            value: o.value,
            py: o.py,
+            keyword: o.keyword,
            iconWidth: o.iconWidth,
            iconHeight: o.iconHeight
        });
@ -33771,7 +33777,8 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {
            rgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        BI.createWidget({
            type: "bi.htape",
@ -33809,6 +33816,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {

 BI.shortcut("bi.tree_text_leaf_item", BI.TreeTextLeafItem);

+
 /***/ }),
 /* 459 */
 /***/ (function(module, exports) {
@ -68876,19 +68884,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                    parentCheckState.half = find.halfCheck;
                }
                var state = getCheckState(node.value, node.parentValues, valueMap, parentCheckState);
-
-                var isParent = node.getChildrenLength() > 0;
                result.push({
                    id: node.id,
                    pId: node.pId,
                    value: node.value,
                    text: node.text,
                    times: 1,
-                    isParent: isParent,
-                    // 同步树的情况下，父亲节点的状态由子控制，不再设置checked和halfCheck属性
-                    // 叶子节点本身不存在halfCheck属性且checked属性由计算得到
-                    checked: isParent ? undefined : state[0],
-                    // halfCheck: state[1],
+                    isParent: node.getChildrenLength() > 0,
+                    checked: state[0],
+                    halfCheck: state[1],
                    open: self.options.open
                });
            });
--- a/dist/fineui.js.map
+++ b/dist/fineui.js.map
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui.min.js.map
+++ b/dist/fineui.min.js.map
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -1,4 +1,4 @@
-/*! time: 2020-10-20 16:20:29 */
+/*! time: 2020-10-26 17:50:30 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@ -28676,7 +28676,8 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });

        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
@ -28724,6 +28725,7 @@ BI.ArrowNode = BI.inherit(BI.NodeButton, {

 BI.shortcut("bi.arrow_group_node", BI.ArrowNode);

+
 /***/ }),
 /* 446 */
 /***/ (function(module, exports) {
@ -28867,7 +28869,8 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        this.checkbox.on(BI.Controller.EVENT_CHANGE, function (type) {
            if (type === BI.Events.CLICK) {
@ -28917,6 +28920,7 @@ BI.IconArrowNode = BI.inherit(BI.NodeButton, {

 BI.shortcut("bi.icon_arrow_node", BI.IconArrowNode);

+
 /***/ }),
 /* 448 */
 /***/ (function(module, exports) {
@ -29126,7 +29130,8 @@ BI.MultiLayerIconArrowNode = BI.inherit(BI.NodeButton, {
            hgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        this.node.on(BI.Controller.EVENT_CHANGE, function (type) {
            self.setSelected(self.isSelected());
@ -29698,6 +29703,7 @@ BI.MultiLayerIconTreeLeafItem = BI.inherit(BI.BasicButton, {
            text: o.text,
            value: o.value,
            py: o.py,
+            keyword: o.keyword,
            iconWidth: o.iconWidth,
            iconHeight: o.iconHeight
        });
@ -29803,7 +29809,8 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {
            rgap: o.hgap,
            text: o.text,
            value: o.value,
-            py: o.py
+            py: o.py,
+            keyword: o.keyword
        });
        BI.createWidget({
            type: "bi.htape",
@ -29841,6 +29848,7 @@ BI.TreeTextLeafItem = BI.inherit(BI.BasicButton, {

 BI.shortcut("bi.tree_text_leaf_item", BI.TreeTextLeafItem);

+
 /***/ }),
 /* 459 */
 /***/ (function(module, exports) {
@ -64908,19 +64916,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                    parentCheckState.half = find.halfCheck;
                }
                var state = getCheckState(node.value, node.parentValues, valueMap, parentCheckState);
-
-                var isParent = node.getChildrenLength() > 0;
                result.push({
                    id: node.id,
                    pId: node.pId,
                    value: node.value,
                    text: node.text,
                    times: 1,
-                    isParent: isParent,
-                    // 同步树的情况下，父亲节点的状态由子控制，不再设置checked和halfCheck属性
-                    // 叶子节点本身不存在halfCheck属性且checked属性由计算得到
-                    checked: isParent ? undefined : state[0],
-                    // halfCheck: state[1],
+                    isParent: node.getChildrenLength() > 0,
+                    checked: state[0],
+                    halfCheck: state[1],
                    open: self.options.open
                });
            });
--- a/dist/fineui_without_jquery_polyfill.js.map
+++ b/dist/fineui_without_jquery_polyfill.js.map
--- a/dist/font.css
+++ b/dist/font.css
--- a/dist/lib/core/base.d.ts
+++ b/dist/lib/core/base.d.ts
@ -135,7 +135,7 @@ export interface _base {
    isNotEmptyObject: (obj: any) => obj is object;
    isWindow: (obj: any) => obj is Window;
    isDeepMatch: (object: any, attrs: any) => boolean;
-    contains: (obj: any[], target: any, fromIndex?: number) => number;
+    contains: (obj: any[], target: any, fromIndex?: number) => boolean;
    deepContains: (obj: any[], copy: any) => number;
    deepIndexOf: (obj: any[], target: any) => number;
    deepRemove: (obj: any[], target: any) => boolean;
--- a/dist/lib/core/plugin.d.ts
+++ b/dist/lib/core/plugin.d.ts
@ -1,9 +1,9 @@
 import { _Widget } from "./widget";
-declare type configWidgetFn = (options: object) => object;
-declare type configObjectFn = (widget: _Widget) => void;
+declare type configWidgetFn = (type: string, options: Obj) => void;
+declare type configObjectFn = (type: string, widget: _Widget) => void;
 export declare type _config = (widgetFunction: configWidgetFn | configWidgetFn[], objectFunction: configObjectFn | configObjectFn[]) => void;
-export declare type _configWidget = (shorcut: string, widgetFunction: configWidgetFn) => void;
-export declare type _registerObject = (shorcut: string, objectFunction: configObjectFn) => void;
+export declare type _configWidget = (shortcut: string, widgetFunction: configWidgetFn) => void;
+export declare type _registerObject = (shortcut: string, objectFunction: configObjectFn) => void;
 export declare type _Plugin = {
    config: _config;
    configWidget: _configWidget;
--- a/dist/utils.js
+++ b/dist/utils.js
@ -1,4 +1,4 @@
-/*! time: 2020-10-20 16:20:29 */
+/*! time: 2020-10-26 17:50:30 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "fineui",
-  "version": "2.0.20201020162204",
+  "version": "2.0.20201026175205",
  "description": "fineui",
  "main": "dist/fineui.min.js",
  "types": "dist/lib/index.d.ts",
--- a/src/component/treevaluechooser/abstract.treevaluechooser.js
+++ b/src/component/treevaluechooser/abstract.treevaluechooser.js
@ -565,19 +565,15 @@ BI.AbstractTreeValueChooser = BI.inherit(BI.Widget, {
                    parentCheckState.half = find.halfCheck;
                }
                var state = getCheckState(node.value, node.parentValues, valueMap, parentCheckState);
-
-                var isParent = node.getChildrenLength() > 0;
                result.push({
                    id: node.id,
                    pId: node.pId,
                    value: node.value,
                    text: node.text,
                    times: 1,
-                    isParent: isParent,
-                    // 同步树的情况下，父亲节点的状态由子控制，不再设置checked和halfCheck属性
-                    // 叶子节点本身不存在halfCheck属性且checked属性由计算得到
-                    checked: isParent ? undefined : state[0],
-                    // halfCheck: state[1],
+                    isParent: node.getChildrenLength() > 0,
+                    checked: state[0],
+                    halfCheck: state[1],
                    open: self.options.open
                });
            });
--- a/src/less/core/wrapper/flex.horizontal.less
+++ b/src/less/core/wrapper/flex.horizontal.less
@ -1,5 +1,4 @@
 .bi-flex-horizontal-layout {
-  display: box; /* OLD - Android 4.4- */
  display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
  display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
  display: -ms-flexbox; /* TWEENER - IE 10 */
--- a/src/less/core/wrapper/flex.vertical.less
+++ b/src/less/core/wrapper/flex.vertical.less
@ -1,5 +1,4 @@
 .bi-flex-vertical-layout {
-  display: box; /* OLD - Android 4.4- */
  display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
  display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
  display: -ms-flexbox; /* TWEENER - IE 10 */
--- a/src/less/core/wrapper/flex.wrapper.horizontal.less
+++ b/src/less/core/wrapper/flex.wrapper.horizontal.less
@ -1,6 +1,5 @@
 .bi-flex-scrollable-horizontal-layout {
  & .flex-scrollable-horizontal-layout-wrapper {
-    display: box; /* OLD - Android 4.4- */
    display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
    display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
    display: -ms-flexbox; /* TWEENER - IE 10 */
--- a/src/less/core/wrapper/flex.wrapper.vertical.less
+++ b/src/less/core/wrapper/flex.wrapper.vertical.less
@ -1,6 +1,5 @@
 .bi-flex-scrollable-vertical-layout {
  & .flex-scrollable-vertical-layout-wrapper {
-    display: box; /* OLD - Android 4.4- */
    display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6 */
    display: -moz-box; /* OLD - Firefox 19- (buggy but mostly works) */
    display: -ms-flexbox; /* TWEENER - IE 10 */
--- a/typescript/core/base.ts
+++ b/typescript/core/base.ts
@ -263,7 +263,7 @@ export interface _base {

    isDeepMatch: (object: any, attrs: any) => boolean;

-    contains: (obj: any[], target: any, fromIndex?: number) => number;
+    contains: (obj: any[], target: any, fromIndex?: number) => boolean;

    deepContains: (obj: any[], copy: any) => number;

--- a/typescript/core/plugin.ts
+++ b/typescript/core/plugin.ts
@ -1,13 +1,13 @@
-import {_Widget} from "./widget";
+import { _Widget } from "./widget";

-type configWidgetFn = (options: object) =>  object
-type configObjectFn = (widget: _Widget) => void
+type configWidgetFn = (type: string, options: Obj) => void
+type configObjectFn = (type: string, widget: _Widget) => void

-export  type _config = (widgetFunction: configWidgetFn | configWidgetFn[], objectFunction: configObjectFn | configObjectFn[]) => void
+export type _config = (widgetFunction: configWidgetFn | configWidgetFn[], objectFunction: configObjectFn | configObjectFn[]) => void

-export  type _configWidget = (shorcut: string, widgetFunction: configWidgetFn) => void
+export type _configWidget = (shortcut: string, widgetFunction: configWidgetFn) => void

-export  type _registerObject = (shorcut: string, objectFunction: configObjectFn) => void
+export type _registerObject = (shortcut: string, objectFunction: configObjectFn) => void

 export type _Plugin = {
    config: _config;