@zeedhi/common 1.81.0 → 1.81.1

package/dist/zd-common.esm.js

@@ -2805,8 +2805,9 @@ class Number$1 extends TextInput {
         this.formatterFn = FormatterParserProvider.getFormatter('ZdNumber');
         this.parserFn = FormatterParserProvider.getParser('ZdNumber');
         this.maskValid = false;
+        const newMask = Object.assign(Object.assign({}, this.defaultMask), props.mask);
         this.align = this.getInitValue('align', props.align, this.align);
-        this.mask = this.getInitValue('mask', props.mask, this.defaultMask);
+        this.mask = this.getInitValue('mask', newMask, this.defaultMask);
         this.createAccessors();
         this.validateMask();
     }
@@ -2897,7 +2898,8 @@ class Currency extends Number$1 {
         this.defaultMask = Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask);
         this.formatterFn = FormatterParserProvider.getFormatter('ZdCurrency');
         this.parserFn = FormatterParserProvider.getParser('ZdCurrency');
-        this.mask = this.getInitValue('mask', props.mask, this.defaultMask);
+        const newMask = Object.assign(Object.assign({}, this.defaultMask), props.mask);
+        this.mask = this.getInitValue('mask', newMask, this.defaultMask);
         this.createAccessors();
         this.validateMask();
     }
@@ -5204,6 +5206,8 @@ class Column extends Component {
         this.label = '';
         this.mask = '';
         this.actionFixed = false;
+        /* column is fixed */
+        this.fixed = false;
         this.sortable = true;
         this.loading = false;
         this.componentProps = {};
@@ -5253,6 +5257,7 @@ class Column extends Component {
         this.overflow = this.getInitValue('overflow', props.overflow, this.overflow);
         this.type = this.getInitValue('type', props.type, this.type);
         this.actionFixed = this.getInitValue('actionFixed', props.actionFixed, this.actionFixed);
+        this.fixed = this.getInitValue('fixed', props.fixed, this.fixed);
         this.sortable = this.getInitValue('sortable', props.sortable, this.sortable);
         this.loading = this.getInitValue('loading', props.loading, this.loading);
         this.style = this.getInitValue('style', props.style, this.style);
@@ -7724,6 +7729,7 @@ class Select extends TextInput {
     }
     showLoadMore() {
         return !!this.datasource.data.length
+            && !this.datasource.loading
             && !this.datasource.loadAll
             && this.datasource.data.length - (this.pushedValue ? 1 : 0) < this.datasource.total;
     }
@@ -9893,6 +9899,7 @@ class SelectMultiple extends Select {
     }
     showLoadMore() {
         return !!this.datasource.data.length
+            && !this.datasource.loading
             && !this.datasource.loadAll
             && (this.datasource.data.length - this.insertedValues.length - this.insertsRemoved.length) < this.datasource.total;
     }

package/dist/zd-common.umd.js

@@ -2812,8 +2812,9 @@
           this.formatterFn = core.FormatterParserProvider.getFormatter('ZdNumber');
           this.parserFn = core.FormatterParserProvider.getParser('ZdNumber');
           this.maskValid = false;
+          const newMask = Object.assign(Object.assign({}, this.defaultMask), props.mask);
           this.align = this.getInitValue('align', props.align, this.align);
-          this.mask = this.getInitValue('mask', props.mask, this.defaultMask);
+          this.mask = this.getInitValue('mask', newMask, this.defaultMask);
           this.createAccessors();
           this.validateMask();
       }
@@ -2904,7 +2905,8 @@
           this.defaultMask = Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask);
           this.formatterFn = core.FormatterParserProvider.getFormatter('ZdCurrency');
           this.parserFn = core.FormatterParserProvider.getParser('ZdCurrency');
-          this.mask = this.getInitValue('mask', props.mask, this.defaultMask);
+          const newMask = Object.assign(Object.assign({}, this.defaultMask), props.mask);
+          this.mask = this.getInitValue('mask', newMask, this.defaultMask);
           this.createAccessors();
           this.validateMask();
       }
@@ -5211,6 +5213,8 @@
           this.label = '';
           this.mask = '';
           this.actionFixed = false;
+          /* column is fixed */
+          this.fixed = false;
           this.sortable = true;
           this.loading = false;
           this.componentProps = {};
@@ -5260,6 +5264,7 @@
           this.overflow = this.getInitValue('overflow', props.overflow, this.overflow);
           this.type = this.getInitValue('type', props.type, this.type);
           this.actionFixed = this.getInitValue('actionFixed', props.actionFixed, this.actionFixed);
+          this.fixed = this.getInitValue('fixed', props.fixed, this.fixed);
           this.sortable = this.getInitValue('sortable', props.sortable, this.sortable);
           this.loading = this.getInitValue('loading', props.loading, this.loading);
           this.style = this.getInitValue('style', props.style, this.style);
@@ -7731,6 +7736,7 @@
       }
       showLoadMore() {
           return !!this.datasource.data.length
+              && !this.datasource.loading
               && !this.datasource.loadAll
               && this.datasource.data.length - (this.pushedValue ? 1 : 0) < this.datasource.total;
       }
@@ -9900,6 +9906,7 @@
       }
       showLoadMore() {
           return !!this.datasource.data.length
+              && !this.datasource.loading
               && !this.datasource.loadAll
               && (this.datasource.data.length - this.insertedValues.length - this.insertsRemoved.length) < this.datasource.total;
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "1.81.0",
+  "version": "1.81.1",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -41,5 +41,5 @@
     "lodash.times": "4.3.*",
     "mockdate": "3.0.*"
   },
-  "gitHead": "895b0c66924cfd9a800ce45074822e4994f7cda8"
+  "gitHead": "75afef60bd7124669d1048e38557e25260d9b619"
 }

package/types/components/zd-grid/grid.d.ts

@@ -124,6 +124,7 @@ export declare class Grid extends Iterable implements IGrid {
      * @public
      */
     rowStyleConditions?: (row: IDictionary) => IDictionary;
+    viewUpdateFixedColumns?: () => void;
     /**
      * Disable selection of specific rows using controller
      * @public

package/types/components/zd-iterable/column.d.ts

@@ -13,6 +13,7 @@ export declare class Column extends Component implements IColumn {
     mask: string;
     type?: ColumnType;
     actionFixed: boolean;
+    fixed: boolean;
     sortable: boolean;
     loading: boolean;
     componentProps: any;

package/types/components/zd-iterable/interfaces.d.ts

@@ -18,6 +18,7 @@ export interface IColumn extends IComponent {
     mask?: string;
     type?: ColumnType;
     actionFixed?: boolean;
+    fixed?: boolean;
     sortable?: boolean;
     loading?: boolean;
     componentProps?: IComponent;