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

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2021-3-15 10:10:22 */
+/*! time: 2021-3-15 16:15:53 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,7 +82,7 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1416);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1417);
 /******/ })
 /************************************************************************/
 /******/ ([
@@ -29152,7 +29152,7 @@ BI.SingleSelectRadioItem = BI.inherit(BI.BasicButton, {
                 dynamic: false
             },
             height: 24,
-            iconWrapperWidth: 26,
+            iconWrapperWidth: 16,
             hgap: 10,
             textHgap: 0,
             textLgap: 0,
@@ -69343,6 +69343,12 @@ Object.defineProperty(exports, "Router", {
     return _router.Router;
   }
 });
+Object.defineProperty(exports, "DateTimeCombo", {
+  enumerable: true,
+  get: function get() {
+    return _datetime.DateTimeCombo;
+  }
+});
 exports["default"] = void 0;
 
 var _combo = __webpack_require__(718);
@@ -69637,6 +69643,8 @@ var _button6 = __webpack_require__(840);
 
 var _router = __webpack_require__(841);
 
+var _datetime = __webpack_require__(842);
+
 function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function _getRequireWildcardCache() { return cache; }; return cache; }
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -70963,7 +70971,15 @@ var _button = __webpack_require__(8);
 
 
 /***/ }),
-/* 842 */,
+/* 842 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+var _single = __webpack_require__(2);
+
+/***/ }),
 /* 843 */,
 /* 844 */,
 /* 845 */,
@@ -71013,7 +71029,8 @@ var _button = __webpack_require__(8);
 /* 889 */,
 /* 890 */,
 /* 891 */,
-/* 892 */
+/* 892 */,
+/* 893 */
 /***/ (function(module, exports) {
 
 ;(function () {
@@ -71176,17 +71193,17 @@ var _button = __webpack_require__(8);
 
 
 /***/ }),
-/* 893 */,
 /* 894 */,
 /* 895 */,
-/* 896 */
+/* 896 */,
+/* 897 */
 /***/ (function(module, exports, __webpack_require__) {
 
-/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(897);
+/* WEBPACK VAR INJECTION */(function(global) {module.exports = global["Fix"] = __webpack_require__(898);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(17)))
 
 /***/ }),
-/* 897 */
+/* 898 */
 /***/ (function(module, exports, __webpack_require__) {
 
 /* WEBPACK VAR INJECTION */(function(setImmediate) {function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -72719,8 +72736,8 @@ var _button = __webpack_require__(8);
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(63).setImmediate))
 
 /***/ }),
-/* 898 */,
-/* 899 */
+/* 899 */,
+/* 900 */
 /***/ (function(module, exports) {
 
 ;(function () {
@@ -73067,7 +73084,6 @@ var _button = __webpack_require__(8);
 
 
 /***/ }),
-/* 900 */,
 /* 901 */,
 /* 902 */,
 /* 903 */,
@@ -73284,13 +73300,13 @@ var _button = __webpack_require__(8);
 /* 1114 */,
 /* 1115 */,
 /* 1116 */,
-/* 1117 */
+/* 1117 */,
+/* 1118 */
 /***/ (function(module, exports) {
 
 
 
 /***/ }),
-/* 1118 */,
 /* 1119 */,
 /* 1120 */,
 /* 1121 */,
@@ -73588,7 +73604,8 @@ var _button = __webpack_require__(8);
 /* 1413 */,
 /* 1414 */,
 /* 1415 */,
-/* 1416 */
+/* 1416 */,
+/* 1417 */
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(123);
@@ -73692,7 +73709,7 @@ __webpack_require__(396);
 __webpack_require__(153);
 __webpack_require__(154);
 __webpack_require__(155);
-__webpack_require__(896);
+__webpack_require__(897);
 __webpack_require__(397);
 __webpack_require__(398);
 __webpack_require__(399);
@@ -74072,9 +74089,9 @@ __webpack_require__(712);
 __webpack_require__(713);
 __webpack_require__(714);
 __webpack_require__(715);
-__webpack_require__(899);
-__webpack_require__(892);
-__webpack_require__(1117);
+__webpack_require__(900);
+__webpack_require__(893);
+__webpack_require__(1118);
 module.exports = __webpack_require__(716);
 
 

dist/lib/base/combination/loader.d.ts

@@ -2,7 +2,13 @@ import { Widget } from "../../core/widget";
 export declare class Loader extends Widget {
     static xtype: string;
     static EVENT_CHANGE: string;
-    populate<T>(items: T[]): void;
+    _prevLoad(): void;
+    _nextLoad(): void;
+    hasPrev(): boolean;
+    hasNext(): boolean;
+    prependItems<T>(items: T[]): void;
+    addItems<T>(items: T[]): void;
+    populate(...args: any[]): void;
     setNotSelectedValue(...args: any[]): void;
     getNotSelectedValue<T>(): T;
     getAllButtons<T>(): T[];

dist/lib/index.d.ts

@@ -153,6 +153,7 @@ import { TextNode } from "./base/single/button/node/textnode";
 import { TextValueCheckComboPopup } from "./case/combo/textvaluecheckcombo/popup.textvaluecheck";
 import { ImageButton } from './base/single/button/buttons/button.image';
 import { History, Router } from "./router/router";
+import { DateTimeCombo } from './widget/datetime/datetime.combo';
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     OB: typeof OB;
     Plugin: _Plugin;
@@ -310,9 +311,10 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     ImageButton: typeof ImageButton;
     Router: typeof Router;
     history: History;
+    DateTimeCombo: typeof DateTimeCombo;
 }
 declare const _default: {
     Decorators: typeof decorator;
 };
 export default _default;
-export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, };
+export { OB, Widget, Single, BasicButton, Checkbox, Icon, LeftVerticalAdaptLayout, LeftRightVerticalAdaptLayout, SearchTextValueCombo, Input, IconTextItem, AllValueMultiTextValueCombo, IconTextIconItem, Layout, HorizontalAutoLayout, InlineVerticalAdaptLayout, RightVerticalAdaptLayout, TableAdaptLayout, AbsoluteCenterLayout, HorizontalAdaptLayout, FloatLeftLayout, FloatRightLayout, VerticalLayout, AbsoluteLayout, DefaultLayout, HTapeLayout, CenterAdaptLayout, VTapeLayout, VerticalAdaptLayout, IconButton, Trigger, TriggerIconButton, Action, ActionFactory, ShowAction, Controller, LayerController, Behavior, BehaviorFactory, RedMarkBehavior, HighlightBehavior, LoadingPane, Searcher, AbstractLabel, Label, TextButton, DownListCombo, IconChangeButton, Button, TextEditor, A, Html, Switcher, BubbleCombo, Loader, ListPane, MultiSelectBar, SelectList, TextValueCombo, Editor, IconLabel, Popover, BarPopover, Tab, AbstractTreeValueChooser, AbstractListTreeValueChooser, ListTreeValueChooserInsertCombo, TreeValueChooserCombo, TreeValueChooserInsertCombo, MultiLayerSelectTreePopup, MultiLayerSingleTreePopup, TreeView, ListTreeView, ListAsyncTree, AsyncTree, MultiLayerSingleTreeCombo, MultiLayerSelectTreeCombo, MultiTreeListCombo, MultiTreeInsertCombo, Combo, IconCombo, DynamicDateCombo, Radio, MultiSelectItem, CustomTree, ButtonGroup, ButtonTree, NodeButton, IconArrowNode, MidTreeLeafItem, FirstTreeLeafItem, LastTreeLeafItem, SmallTextEditor, MultifileEditor, SignEditor, MultiSelectInsertCombo, MultiSelectCombo, SearchEditor, Text, Pane, MultiLayerSingleLevelTree, SimpleColorChooser, AbstractAllValueChooser, AllValueChooserCombo, TextAreaEditor, SingleSelectItem, DynamicDateTimeCombo, MultiTreeCombo, CenterLayout, VirtualGroup, GridLayout, MultiTreePopup, SingleSelectRadioItem, SingleSelectInsertCombo, SingleSelectCombo, CardLayout, DynamicYearMonthCombo, TimeCombo, Iframe, TextValueDownListCombo, Switch, HorizontalLayout, ShelterEditor, SelectTextTrigger, DateInterval, DynamicDatePane, AllCountPager, PopupView, BubblePopupView, BubblePopupBarView, TextBubblePopupBarView, ArrowTreeGroupNodeCheckbox, NumberInterval, DynamicYearQuarterCombo, DynamicYearCombo, IntervalSlider, MultiSelectInsertList, YearMonthInterval, TextValueCheckCombo, NumberEditor, LinearSegment, Img, EditorIconCheckCombo, IconTextValueCombo, ListView, FloatCenterLayout, DynamicYearMonthPopup, DateCalendarPopup, Tree, Node, TextNode, TextValueCheckComboPopup, ImageButton, Router, History, DateTimeCombo, };

dist/lib/widget/datetime/datetime.combo.d.ts

@@ -0,0 +1,9 @@
+import { Single } from '../../base/single/single';
+export declare class DateTimeCombo extends Single {
+    static xtype: string;
+    static EVENT_CANCEL: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+    hidePopupView: () => void;
+}

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-3-15 10:10:22 */
+/*! time: 2021-3-15 16:15:53 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -82,12 +82,12 @@
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 1239);
+/******/ 	return __webpack_require__(__webpack_require__.s = 1240);
 /******/ })
 /************************************************************************/
 /******/ ({
 
-/***/ 1100:
+/***/ 1101:
 /***/ (function(module, exports) {
 
 BI.i18n = {
@@ -320,7 +320,14 @@ if(_global.BI.prepares == null) {
 
 /***/ }),
 
-/***/ 1239:
+/***/ 124:
+/***/ (function(module, exports, __webpack_require__) {
+
+__webpack_require__(125)(__webpack_require__(126))
+
+/***/ }),
+
+/***/ 1240:
 /***/ (function(module, exports, __webpack_require__) {
 
 __webpack_require__(123);
@@ -350,8 +357,8 @@ __webpack_require__(140);
 __webpack_require__(141);
 __webpack_require__(142);
 __webpack_require__(143);
-__webpack_require__(1100);
-__webpack_require__(1240);
+__webpack_require__(1101);
+__webpack_require__(1241);
 __webpack_require__(153);
 __webpack_require__(154);
 module.exports = __webpack_require__(155);
@@ -359,14 +366,7 @@ module.exports = __webpack_require__(155);
 
 /***/ }),
 
-/***/ 124:
-/***/ (function(module, exports, __webpack_require__) {
-
-__webpack_require__(125)(__webpack_require__(126))
-
-/***/ }),
-
-/***/ 1240:
+/***/ 1241:
 /***/ (function(module, exports) {
 
 /**

package.json

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

src/base/tree/ztree/parttree.js

@@ -93,7 +93,9 @@ BI.PartTree = BI.inherit(BI.AsyncTree, {
                 //                if(checkState.checked === true && checkState.half === false && nodes[i].flag === true){
                 //                    continue;
                 //                }
-                if (BI.isNotEmptyArray(node.children)) {
+                // 未展开当前节点和展开当前节点后点击全选应该表现一致
+                // 这两种情况的check_Child_State分别为-1和2
+                if (BI.isNotEmptyArray(node.children) && node.check_Child_State !== 2) {
                     track(node.children);
                     return true;
                 }

typescript/base/combination/loader.ts

@@ -5,7 +5,19 @@ export declare class Loader extends Widget {
 
     static EVENT_CHANGE: string;
 
-    populate<T>(items: T[]): void;
+    _prevLoad(): void;
+
+    _nextLoad(): void;
+
+    hasPrev(): boolean;
+
+    hasNext(): boolean;
+
+    prependItems<T>(items: T[]): void;
+
+    addItems<T>(items: T[]): void;
+
+    populate(...args: any[]): void;
 
     setNotSelectedValue(...args: any[]): void;
 

typescript/index.ts

@@ -153,6 +153,7 @@ import { TextNode } from "./base/single/button/node/textnode";
 import { TextValueCheckComboPopup } from "./case/combo/textvaluecheckcombo/popup.textvaluecheck";
 import { ImageButton } from './base/single/button/buttons/button.image';
 import { History, Router } from "./router/router";
+import { DateTimeCombo } from './widget/datetime/datetime.combo';
 
 
 export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
@@ -312,6 +313,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     ImageButton: typeof ImageButton;
     Router: typeof Router;
     history: History,
+    DateTimeCombo: typeof DateTimeCombo;
 }
 
 export default {
@@ -473,4 +475,5 @@ export {
     ImageButton,
     Router,
     History,
+    DateTimeCombo,
 };

typescript/widget/datetime/datetime.combo.ts

@@ -0,0 +1,12 @@
+import { Single } from '../../base/single/single';
+
+export declare class DateTimeCombo extends Single {
+    static xtype: string;
+
+    static EVENT_CANCEL: string;
+    static EVENT_CONFIRM: string;
+    static EVENT_CHANGE: string;
+    static EVENT_BEFORE_POPUPVIEW: string;
+
+    hidePopupView: () => void;
+}