atr-components 3.1.12 → 3.1.13
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.
- package/fesm2022/atr-components.mjs +36 -9
- package/fesm2022/atr-components.mjs.map +1 -1
- package/index.d.ts +2 -1
- package/package.json +1 -1
|
@@ -138,6 +138,7 @@ const atr_static_datas = {
|
|
|
138
138
|
* oss地址前缀
|
|
139
139
|
*/
|
|
140
140
|
OSS_URL: '',
|
|
141
|
+
isIso: false, //iso
|
|
141
142
|
/** 图片加载失败时使用的静态资源地址；宿主可覆盖。 */
|
|
142
143
|
errImg: 'assets/atr-components/assets/no-image-placeholder.png',
|
|
143
144
|
/**
|
|
@@ -3724,8 +3725,14 @@ class AtrTableComponent {
|
|
|
3724
3725
|
}
|
|
3725
3726
|
}
|
|
3726
3727
|
if (formate == 'yyyy-MM-dd HH:mm:ss') {
|
|
3727
|
-
|
|
3728
|
-
|
|
3728
|
+
if (atr_static_datas.isIso) {
|
|
3729
|
+
params[begin] = new Date(this.atrForm.value[key][0]).toISOString();
|
|
3730
|
+
params[end] = new Date(this.atrForm.value[key][1]).toISOString();
|
|
3731
|
+
}
|
|
3732
|
+
else {
|
|
3733
|
+
params[begin] = formatDate(this.atrForm.value[key][0], formate, this.locale);
|
|
3734
|
+
params[end] = formatDate(this.atrForm.value[key][1], formate, this.locale);
|
|
3735
|
+
}
|
|
3729
3736
|
}
|
|
3730
3737
|
else {
|
|
3731
3738
|
params[begin] = formatDate(this.atrForm.value[key][0], formate, this.locale);
|
|
@@ -3735,11 +3742,22 @@ class AtrTableComponent {
|
|
|
3735
3742
|
else if (this.getHederType(key) == "dayRange") {
|
|
3736
3743
|
let begin = key + "Begin";
|
|
3737
3744
|
let end = key + "End";
|
|
3738
|
-
|
|
3739
|
-
|
|
3745
|
+
if (atr_static_datas.isIso) {
|
|
3746
|
+
params[begin] = new Date(formatDate(this.atrForm.value[key][0], 'yyyy-MM-dd 00:00:00', this.locale)).toISOString();
|
|
3747
|
+
params[end] = new Date(formatDate(this.atrForm.value[key][1], 'yyyy-MM-dd 23:59:59', this.locale)).toISOString();
|
|
3748
|
+
}
|
|
3749
|
+
else {
|
|
3750
|
+
params[begin] = formatDate(this.atrForm.value[key][0], 'yyyy-MM-dd 00:00:00', this.locale);
|
|
3751
|
+
params[end] = formatDate(this.atrForm.value[key][1], 'yyyy-MM-dd 23:59:59', this.locale);
|
|
3752
|
+
}
|
|
3740
3753
|
}
|
|
3741
3754
|
else if (this.getHederType(key) == "sdate") {
|
|
3742
|
-
|
|
3755
|
+
if (atr_static_datas.isIso) {
|
|
3756
|
+
params[key] = new Date(formatDate(this.atrForm.value[key], 'yyyy-MM-dd 00:00:00', this.locale)).toISOString();
|
|
3757
|
+
}
|
|
3758
|
+
else {
|
|
3759
|
+
params[key] = formatDate(this.atrForm.value[key], 'yyyy-MM-dd 00:00:00', this.locale);
|
|
3760
|
+
}
|
|
3743
3761
|
}
|
|
3744
3762
|
else if (this.getHederType(key) == "treeSelect") {
|
|
3745
3763
|
let value = this.atrForm.value[key];
|
|
@@ -4864,7 +4882,7 @@ class AtrFormComponent {
|
|
|
4864
4882
|
this.viewTitle = '';
|
|
4865
4883
|
this.viewSize = 'small';
|
|
4866
4884
|
this.defNumFormat = (value) => {
|
|
4867
|
-
return value
|
|
4885
|
+
return value == null ? '' : String(value);
|
|
4868
4886
|
};
|
|
4869
4887
|
this.atrForm = this.fb.group({});
|
|
4870
4888
|
}
|
|
@@ -5372,11 +5390,20 @@ class AtrFormComponent {
|
|
|
5372
5390
|
obj.value[key] = formatDate(new Date(Number(value[key])), item.dateFormat, this.locale);
|
|
5373
5391
|
}
|
|
5374
5392
|
else if (item.type == 'date') {
|
|
5375
|
-
|
|
5393
|
+
if (atr_static_datas.isIso) {
|
|
5394
|
+
obj.value[key] = new Date(Number(value[key])).toISOString().replace(/T.*/, 'T00:00:00.000Z');
|
|
5395
|
+
}
|
|
5396
|
+
else {
|
|
5397
|
+
obj.value[key] = formatDate(new Date(Number(value[key])), 'yyyy-MM-dd 00:00:00', this.locale);
|
|
5398
|
+
}
|
|
5376
5399
|
}
|
|
5377
5400
|
else if (item.type == 'dateTime') {
|
|
5378
|
-
|
|
5379
|
-
|
|
5401
|
+
if (atr_static_datas.isIso) {
|
|
5402
|
+
obj.value[key] = new Date(Number(value[key])).toISOString();
|
|
5403
|
+
}
|
|
5404
|
+
else {
|
|
5405
|
+
obj.value[key] = formatDate(new Date(Number(value[key])), 'yyyy-MM-dd HH:mm:ss', this.locale);
|
|
5406
|
+
}
|
|
5380
5407
|
}
|
|
5381
5408
|
}
|
|
5382
5409
|
}
|