Merge branch 'master' of https://code.fineres.com/scm/~guyi/fineui

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-22 11:20:30 */
+/*! time: 2020-10-28 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -32248,7 +32248,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button overflow-hidden",
             extraCls: "pull-down-font"
         });
     }
@@ -32256,6 +32256,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
 BI.TriggerIconButton.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE;
 BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton);
 
+
 /***/ }),
 /* 439 */
 /***/ (function(module, exports) {
@@ -68884,19 +68885,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
                 });
             });

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-22 11:20:30 */
+/*! time: 2020-10-28 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -32248,7 +32248,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button overflow-hidden",
             extraCls: "pull-down-font"
         });
     }
@@ -32256,6 +32256,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
 BI.TriggerIconButton.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE;
 BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton);
 
+
 /***/ }),
 /* 439 */
 /***/ (function(module, exports) {
@@ -68884,19 +68885,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
                 });
             });

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-22 11:20:30 */
+/*! time: 2020-10-28 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -32248,7 +32248,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button overflow-hidden",
             extraCls: "pull-down-font"
         });
     }
@@ -32256,6 +32256,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
 BI.TriggerIconButton.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE;
 BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton);
 
+
 /***/ }),
 /* 439 */
 /***/ (function(module, exports) {
@@ -68884,19 +68885,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
                 });
             });

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-22 11:20:30 */
+/*! time: 2020-10-28 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -28280,7 +28280,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button overflow-hidden",
             extraCls: "pull-down-font"
         });
     }
@@ -28288,6 +28288,7 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
 BI.TriggerIconButton.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE;
 BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton);
 
+
 /***/ }),
 /* 439 */
 /***/ (function(module, exports) {
@@ -64916,19 +64917,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
                 });
             });

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;

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;

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2020-10-22 11:20:30 */
+/*! time: 2020-10-28 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

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

src/case/button/icon/icon.trigger.js

@@ -10,10 +10,10 @@ BI.TriggerIconButton = BI.inherit(BI.IconButton, {
     _defaultConfig: function () {
         var conf = BI.TriggerIconButton.superclass._defaultConfig.apply(this, arguments);
         return BI.extend(conf, {
-            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button",
+            baseCls: (conf.baseCls || "") + " bi-trigger-icon-button overflow-hidden",
             extraCls: "pull-down-font"
         });
     }
 });
 BI.TriggerIconButton.EVENT_CHANGE = BI.IconButton.EVENT_CHANGE;
-BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton);
+BI.shortcut("bi.trigger_icon_button", BI.TriggerIconButton);

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
                 });
             });

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;
 

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;