@zeedhi/common 1.83.0 → 1.83.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2881,22 +2881,24 @@ class Number$1 extends TextInput {
2881
2881
  */
2882
2882
  parser(value) { return this.parserFn(value, this); }
2883
2883
  }
2884
- FormatterParserProvider.registerFormatter('ZdNumber', (value, { mask = Config.masks.numberMask, } = {}) => {
2884
+ FormatterParserProvider.registerFormatter('ZdNumber', (value, { mask = {}, } = {}) => {
2885
2885
  let maskDef = mask;
2886
2886
  if (Accessor.isAccessorDefinition(maskDef)) {
2887
2887
  const [controller, accessor] = Accessor.getAccessor(maskDef);
2888
2888
  maskDef = Loader.getInstance(controller)[accessor];
2889
2889
  }
2890
- const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
2890
+ let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
2891
+ maskValue = Object.assign(Object.assign({}, Config.masks.numberMask), maskValue);
2891
2892
  return value === null ? '' : AutoNumeric.format(value, maskValue);
2892
2893
  });
2893
- FormatterParserProvider.registerParser('ZdNumber', (value, { mask = Config.masks.numberMask, } = {}) => {
2894
+ FormatterParserProvider.registerParser('ZdNumber', (value, { mask = {}, } = {}) => {
2894
2895
  let maskDef = mask;
2895
2896
  if (Accessor.isAccessorDefinition(maskDef)) {
2896
2897
  const [controller, accessor] = Accessor.getAccessor(maskDef);
2897
2898
  maskDef = Loader.getInstance(controller)[accessor];
2898
2899
  }
2899
- const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
2900
+ let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
2901
+ maskValue = Object.assign(Object.assign({}, Config.masks.numberMask), maskValue);
2900
2902
  return value === '' ? null : AutoNumeric.unformat(value, maskValue);
2901
2903
  });
2902
2904
 
@@ -2915,22 +2917,24 @@ class Currency extends Number$1 {
2915
2917
  this.validateMask();
2916
2918
  }
2917
2919
  }
2918
- FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask), } = {}) => {
2920
+ FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = {}, } = {}) => {
2919
2921
  let maskDef = mask;
2920
2922
  if (Accessor.isAccessorDefinition(maskDef)) {
2921
2923
  const [controller, accessor] = Accessor.getAccessor(maskDef);
2922
2924
  maskDef = Loader.getInstance(controller)[accessor];
2923
2925
  }
2924
- const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
2926
+ let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
2927
+ maskValue = Object.assign(Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask), maskValue);
2925
2928
  return value === null ? '' : AutoNumeric.format(value, maskValue);
2926
2929
  });
2927
- FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask), } = {}) => {
2930
+ FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = {}, } = {}) => {
2928
2931
  let maskDef = mask;
2929
2932
  if (Accessor.isAccessorDefinition(maskDef)) {
2930
2933
  const [controller, accessor] = Accessor.getAccessor(maskDef);
2931
2934
  maskDef = Loader.getInstance(controller)[accessor];
2932
2935
  }
2933
- const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
2936
+ let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
2937
+ maskValue = Object.assign(Object.assign(Object.assign({}, Config.masks.numberMask), Config.masks.currencyMask), maskValue);
2934
2938
  return value === '' ? null : AutoNumeric.unformat(value, maskValue);
2935
2939
  });
2936
2940
 
@@ -10294,6 +10298,7 @@ class TreeDataStructure {
10294
10298
  originalData.splice(index + 1, 0, ...data);
10295
10299
  this.originalDatasource.data = originalData;
10296
10300
  this.originalDatasource.currentRow = this.clearRow(row);
10301
+ delete this.originalDatasource.filter[this.parentField];
10297
10302
  return data;
10298
10303
  }
10299
10304
  return undefined;
@@ -2888,22 +2888,24 @@
2888
2888
  */
2889
2889
  parser(value) { return this.parserFn(value, this); }
2890
2890
  }
2891
- core.FormatterParserProvider.registerFormatter('ZdNumber', (value, { mask = core.Config.masks.numberMask, } = {}) => {
2891
+ core.FormatterParserProvider.registerFormatter('ZdNumber', (value, { mask = {}, } = {}) => {
2892
2892
  let maskDef = mask;
2893
2893
  if (core.Accessor.isAccessorDefinition(maskDef)) {
2894
2894
  const [controller, accessor] = core.Accessor.getAccessor(maskDef);
2895
2895
  maskDef = core.Loader.getInstance(controller)[accessor];
2896
2896
  }
2897
- const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
2897
+ let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
2898
+ maskValue = Object.assign(Object.assign({}, core.Config.masks.numberMask), maskValue);
2898
2899
  return value === null ? '' : AutoNumeric.format(value, maskValue);
2899
2900
  });
2900
- core.FormatterParserProvider.registerParser('ZdNumber', (value, { mask = core.Config.masks.numberMask, } = {}) => {
2901
+ core.FormatterParserProvider.registerParser('ZdNumber', (value, { mask = {}, } = {}) => {
2901
2902
  let maskDef = mask;
2902
2903
  if (core.Accessor.isAccessorDefinition(maskDef)) {
2903
2904
  const [controller, accessor] = core.Accessor.getAccessor(maskDef);
2904
2905
  maskDef = core.Loader.getInstance(controller)[accessor];
2905
2906
  }
2906
- const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
2907
+ let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
2908
+ maskValue = Object.assign(Object.assign({}, core.Config.masks.numberMask), maskValue);
2907
2909
  return value === '' ? null : AutoNumeric.unformat(value, maskValue);
2908
2910
  });
2909
2911
 
@@ -2922,22 +2924,24 @@
2922
2924
  this.validateMask();
2923
2925
  }
2924
2926
  }
2925
- core.FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask), } = {}) => {
2927
+ core.FormatterParserProvider.registerFormatter('ZdCurrency', (value, { mask = {}, } = {}) => {
2926
2928
  let maskDef = mask;
2927
2929
  if (core.Accessor.isAccessorDefinition(maskDef)) {
2928
2930
  const [controller, accessor] = core.Accessor.getAccessor(maskDef);
2929
2931
  maskDef = core.Loader.getInstance(controller)[accessor];
2930
2932
  }
2931
- const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
2933
+ let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.unformat(value)) : maskDef;
2934
+ maskValue = Object.assign(Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask), maskValue);
2932
2935
  return value === null ? '' : AutoNumeric.format(value, maskValue);
2933
2936
  });
2934
- core.FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask), } = {}) => {
2937
+ core.FormatterParserProvider.registerParser('ZdCurrency', (value, { mask = {}, } = {}) => {
2935
2938
  let maskDef = mask;
2936
2939
  if (core.Accessor.isAccessorDefinition(maskDef)) {
2937
2940
  const [controller, accessor] = core.Accessor.getAccessor(maskDef);
2938
2941
  maskDef = core.Loader.getInstance(controller)[accessor];
2939
2942
  }
2940
- const maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
2943
+ let maskValue = typeof (maskDef) === 'function' ? maskDef(AutoNumeric.format(value)) : maskDef;
2944
+ maskValue = Object.assign(Object.assign(Object.assign({}, core.Config.masks.numberMask), core.Config.masks.currencyMask), maskValue);
2941
2945
  return value === '' ? null : AutoNumeric.unformat(value, maskValue);
2942
2946
  });
2943
2947
 
@@ -10301,6 +10305,7 @@
10301
10305
  originalData.splice(index + 1, 0, ...data);
10302
10306
  this.originalDatasource.data = originalData;
10303
10307
  this.originalDatasource.currentRow = this.clearRow(row);
10308
+ delete this.originalDatasource.filter[this.parentField];
10304
10309
  return data;
10305
10310
  }
10306
10311
  return undefined;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zeedhi/common",
3
- "version": "1.83.0",
3
+ "version": "1.83.1",
4
4
  "description": "Zeedhi Common",
5
5
  "author": "Zeedhi <zeedhi@teknisa.com>",
6
6
  "license": "ISC",
@@ -43,5 +43,5 @@
43
43
  "lodash.times": "4.3.*",
44
44
  "mockdate": "3.0.*"
45
45
  },
46
- "gitHead": "40cb1a2c5fe9d6ebb8d5ceb0add7e08f26cf5659"
46
+ "gitHead": "543eabdb14abf45c8c6f645c760cbf299b446cee"
47
47
  }