Merge remote-tracking branch 'origin/master'

dist/2.0/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -43878,6 +43878,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         this.allPages = BI.createWidget({
             type: "bi.label",
             title: o.pages,
+            height: o.height,
             text: "/" + o.pages,
             lgap: 5,
             invisible: o.pages <= 1
@@ -66289,7 +66290,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                     var keyword = ob.keyword = opts.keywordGetter();
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = self._filterValues(self.storeValue);
                         firstItems = self._createItems(json);
                     }
@@ -67342,13 +67343,13 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
             }, opts.el),
             itemsCreator: function (op, callback) {
                 var startValue = self._startValue;
-                BI.isNotNull(self.storeValue) && (op = BI.extend(op || {}, {
+                !BI.isUndefined(self.storeValue) && (op = BI.extend(op || {}, {
                     selectedValues: [self.storeValue]
                 }));
                 opts.itemsCreator(op, function (ob) {
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = BI.map([self.storeValue], function (i, v) {
                             var txt = opts.valueFormatter(v) || v;
                             return {

dist/2.0/fineui.modern.min.js

@@ -1,2 +1,2 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 !function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t(t.s=1450)}({1192:function(e,n,t){},1450:function(e,n,t){t(1192),t(1451),t(1452),t(1453),t(1454),e.exports=t(1455)},1451:function(e,n,t){},1452:function(e,n,t){},1453:function(e,n,t){},1454:function(e,n,t){},1455:function(e,n,t){}});

dist/core.js

@@ -1,4 +1,4 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -43878,6 +43878,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         this.allPages = BI.createWidget({
             type: "bi.label",
             title: o.pages,
+            height: o.height,
             text: "/" + o.pages,
             lgap: 5,
             invisible: o.pages <= 1
@@ -66289,7 +66290,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                     var keyword = ob.keyword = opts.keywordGetter();
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = self._filterValues(self.storeValue);
                         firstItems = self._createItems(json);
                     }
@@ -67342,13 +67343,13 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
             }, opts.el),
             itemsCreator: function (op, callback) {
                 var startValue = self._startValue;
-                BI.isNotNull(self.storeValue) && (op = BI.extend(op || {}, {
+                !BI.isUndefined(self.storeValue) && (op = BI.extend(op || {}, {
                     selectedValues: [self.storeValue]
                 }));
                 opts.itemsCreator(op, function (ob) {
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = BI.map([self.storeValue], function (i, v) {
                             var txt = opts.valueFormatter(v) || v;
                             return {

dist/demo.js

@@ -1,4 +1,4 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -43878,6 +43878,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         this.allPages = BI.createWidget({
             type: "bi.label",
             title: o.pages,
+            height: o.height,
             text: "/" + o.pages,
             lgap: 5,
             invisible: o.pages <= 1
@@ -66289,7 +66290,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                     var keyword = ob.keyword = opts.keywordGetter();
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = self._filterValues(self.storeValue);
                         firstItems = self._createItems(json);
                     }
@@ -67342,13 +67343,13 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
             }, opts.el),
             itemsCreator: function (op, callback) {
                 var startValue = self._startValue;
-                BI.isNotNull(self.storeValue) && (op = BI.extend(op || {}, {
+                !BI.isUndefined(self.storeValue) && (op = BI.extend(op || {}, {
                     selectedValues: [self.storeValue]
                 }));
                 opts.itemsCreator(op, function (ob) {
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = BI.map([self.storeValue], function (i, v) {
                             var txt = opts.valueFormatter(v) || v;
                             return {

dist/fineui.js

@@ -1,4 +1,4 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -43878,6 +43878,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         this.allPages = BI.createWidget({
             type: "bi.label",
             title: o.pages,
+            height: o.height,
             text: "/" + o.pages,
             lgap: 5,
             invisible: o.pages <= 1
@@ -66289,7 +66290,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                     var keyword = ob.keyword = opts.keywordGetter();
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = self._filterValues(self.storeValue);
                         firstItems = self._createItems(json);
                     }
@@ -67342,13 +67343,13 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
             }, opts.el),
             itemsCreator: function (op, callback) {
                 var startValue = self._startValue;
-                BI.isNotNull(self.storeValue) && (op = BI.extend(op || {}, {
+                !BI.isUndefined(self.storeValue) && (op = BI.extend(op || {}, {
                     selectedValues: [self.storeValue]
                 }));
                 opts.itemsCreator(op, function (ob) {
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = BI.map([self.storeValue], function (i, v) {
                             var txt = opts.valueFormatter(v) || v;
                             return {

dist/fineui.modern.min.js

@@ -1,2 +1,2 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 !function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e["default"]}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="",t(t.s=1441)}({1192:function(e,n,t){},1441:function(e,n,t){t(1192),t(1442),t(1443),t(1444),t(1445),e.exports=t(1446)},1442:function(e,n,t){},1443:function(e,n,t){},1444:function(e,n,t){},1445:function(e,n,t){},1446:function(e,n,t){}});

dist/fineui.proxy.js

@@ -1,4 +1,4 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -41339,6 +41339,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         this.allPages = BI.createWidget({
             type: "bi.label",
             title: o.pages,
+            height: o.height,
             text: "/" + o.pages,
             lgap: 5,
             invisible: o.pages <= 1
@@ -63750,7 +63751,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                     var keyword = ob.keyword = opts.keywordGetter();
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = self._filterValues(self.storeValue);
                         firstItems = self._createItems(json);
                     }
@@ -64803,13 +64804,13 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
             }, opts.el),
             itemsCreator: function (op, callback) {
                 var startValue = self._startValue;
-                BI.isNotNull(self.storeValue) && (op = BI.extend(op || {}, {
+                !BI.isUndefined(self.storeValue) && (op = BI.extend(op || {}, {
                     selectedValues: [self.storeValue]
                 }));
                 opts.itemsCreator(op, function (ob) {
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = BI.map([self.storeValue], function (i, v) {
                             var txt = opts.valueFormatter(v) || v;
                             return {

dist/fineui_without_jquery_polyfill.js

@@ -1,4 +1,4 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};
@@ -40964,6 +40964,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         this.allPages = BI.createWidget({
             type: "bi.label",
             title: o.pages,
+            height: o.height,
             text: "/" + o.pages,
             lgap: 5,
             invisible: o.pages <= 1
@@ -63375,7 +63376,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                     var keyword = ob.keyword = opts.keywordGetter();
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = self._filterValues(self.storeValue);
                         firstItems = self._createItems(json);
                     }
@@ -64428,13 +64429,13 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
             }, opts.el),
             itemsCreator: function (op, callback) {
                 var startValue = self._startValue;
-                BI.isNotNull(self.storeValue) && (op = BI.extend(op || {}, {
+                !BI.isUndefined(self.storeValue) && (op = BI.extend(op || {}, {
                     selectedValues: [self.storeValue]
                 }));
                 opts.itemsCreator(op, function (ob) {
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = BI.map([self.storeValue], function (i, v) {
                             var txt = opts.valueFormatter(v) || v;
                             return {

dist/lib/case/pager/pager.direction.d.ts

@@ -0,0 +1,17 @@
+import { Widget } from "../../core/widget";
+export declare class DirectionPager extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+    getVPage(): number;
+    getHPage(): number;
+    setVPage(v: number): void;
+    setHPage(v: number): void;
+    hasVPrev(): boolean;
+    hasVNext(): boolean;
+    hasHPrev(): boolean;
+    hasHNext(): boolean;
+    setHPagerVisible(v: boolean): void;
+    setVPagerVisible(v: boolean): void;
+    clear(): void;
+    populate(): void;
+}

dist/lib/index.d.ts

@@ -131,6 +131,7 @@ import { SelectTextTrigger } from "./case/trigger/trigger.text.select";
 import { DateInterval } from "./widget/timeinterval/dateinterval";
 import { DynamicDatePane } from "./widget/datepane/datepane";
 import { AllCountPager } from "./case/pager/pager.all.count";
+import { DirectionPager } from "./case/pager/pager.direction";
 import { PopupView } from "./base/layer/layer.popup";
 import { BubblePopupView, BubblePopupBarView, TextBubblePopupBarView } from "./case/combo/bubblecombo/popup.bubble";
 import { ArrowTreeGroupNodeCheckbox } from "./case/checkbox/check.arrownode";
@@ -317,6 +318,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     DateInterval: typeof DateInterval;
     DynamicDatePane: typeof DynamicDatePane;
     AllCountPager: typeof AllCountPager;
+    DirectionPager: typeof DirectionPager;
     Pager: typeof Pager;
     PopupView: typeof PopupView;
     BubblePopupView: typeof BubblePopupView;

dist/utils.js

@@ -1,4 +1,4 @@
-/*! time: 2021-9-22 19:32:02 */
+/*! time: 2021-9-23 14:50:27 */
 /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
 /******/ 	var installedModules = {};

package.json

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

src/case/pager/pager.all.count.js

@@ -90,6 +90,7 @@ BI.AllCountPager = BI.inherit(BI.Widget, {
         this.allPages = BI.createWidget({
             type: "bi.label",
             title: o.pages,
+            height: o.height,
             text: "/" + o.pages,
             lgap: 5,
             invisible: o.pages <= 1

src/widget/singleselect/search/singleselect.search.loader.js

@@ -60,7 +60,7 @@ BI.SingleSelectSearchLoader = BI.inherit(BI.Widget, {
                     var keyword = ob.keyword = opts.keywordGetter();
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = self._filterValues(self.storeValue);
                         firstItems = self._createItems(json);
                     }

src/widget/singleselect/singleselect.loader.js

@@ -60,13 +60,13 @@ BI.SingleSelectLoader = BI.inherit(BI.Widget, {
             }, opts.el),
             itemsCreator: function (op, callback) {
                 var startValue = self._startValue;
-                BI.isNotNull(self.storeValue) && (op = BI.extend(op || {}, {
+                !BI.isUndefined(self.storeValue) && (op = BI.extend(op || {}, {
                     selectedValues: [self.storeValue]
                 }));
                 opts.itemsCreator(op, function (ob) {
                     hasNext = ob.hasNext;
                     var firstItems = [];
-                    if (op.times === 1 && BI.isNotNull(self.storeValue)) {
+                    if (op.times === 1 && !BI.isUndefined(self.storeValue)) {
                         var json = BI.map([self.storeValue], function (i, v) {
                             var txt = opts.valueFormatter(v) || v;
                             return {

typescript/case/pager/pager.direction.ts

@@ -0,0 +1,28 @@
+import { Widget } from "../../core/widget";
+
+export declare class DirectionPager extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+
+    getVPage(): number;
+    getHPage(): number;
+
+    setVPage(v: number):void;
+    setHPage(v: number):void;
+
+    hasVPrev(): boolean;
+
+    hasVNext(): boolean;
+
+    hasHPrev(): boolean;
+
+    hasHNext(): boolean;
+
+    setHPagerVisible(v: boolean): void;
+    setVPagerVisible(v: boolean): void;
+
+    clear(): void;
+
+    populate(): void;
+}

typescript/index.ts

@@ -131,6 +131,7 @@ import { SelectTextTrigger } from "./case/trigger/trigger.text.select";
 import { DateInterval } from "./widget/timeinterval/dateinterval";
 import { DynamicDatePane } from "./widget/datepane/datepane";
 import { AllCountPager } from "./case/pager/pager.all.count";
+import { DirectionPager } from "./case/pager/pager.direction";
 import { PopupView } from "./base/layer/layer.popup";
 import { BubblePopupView, BubblePopupBarView, TextBubblePopupBarView } from "./case/combo/bubblecombo/popup.bubble";
 import { ArrowTreeGroupNodeCheckbox } from "./case/checkbox/check.arrownode";
@@ -319,6 +320,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     DateInterval: typeof DateInterval;
     DynamicDatePane: typeof DynamicDatePane;
     AllCountPager: typeof AllCountPager;
+    DirectionPager: typeof DirectionPager;
     Pager: typeof Pager;
     PopupView: typeof PopupView;
     BubblePopupView: typeof BubblePopupView;