@utogether/utils 3.0.0-beta.21 → 3.0.0-beta.22
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/dist/utils.es.js +258 -259
- package/dist/utils.umd.js +1 -1
- package/package.json +29 -29
package/dist/utils.es.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
var T = Object.defineProperty;
|
|
2
2
|
var j = (a, l, h) => l in a ? T(a, l, { enumerable: !0, configurable: !0, writable: !0, value: h }) : a[l] = h;
|
|
3
|
-
var
|
|
3
|
+
var k = (a, l, h) => j(a, typeof l != "symbol" ? l + "" : l, h);
|
|
4
4
|
import { createVNode, resolveComponent, mergeProps, isVNode, ref, shallowRef, unref, getCurrentInstance, onBeforeUnmount, reactive, watchEffect, isRef } from "vue";
|
|
5
5
|
import dayjs from "dayjs";
|
|
6
6
|
import XEUtils, { isArray, findTree, isEmpty, isObject, isPlainObject, isUndefined, isFunction, isString, clone, has } from "xe-utils";
|
|
@@ -12,9 +12,9 @@ import NProgress from "nprogress";
|
|
|
12
12
|
import { default as W } from "nprogress";
|
|
13
13
|
class sessionStorageProxy {
|
|
14
14
|
constructor(l) {
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
15
|
+
k(this, "storage");
|
|
16
|
+
k(this, "prefix");
|
|
17
|
+
k(this, "addPrefix", (l) => {
|
|
18
18
|
this.prefix = l;
|
|
19
19
|
});
|
|
20
20
|
this.storage = l;
|
|
@@ -46,7 +46,7 @@ class localStorageProxy extends sessionStorageProxy {
|
|
|
46
46
|
}
|
|
47
47
|
class localforageProxy {
|
|
48
48
|
constructor() {
|
|
49
|
-
|
|
49
|
+
k(this, "storage");
|
|
50
50
|
localforage.config({
|
|
51
51
|
name: "uapp",
|
|
52
52
|
storeName: "udb"
|
|
@@ -155,8 +155,8 @@ function init(a, l) {
|
|
|
155
155
|
init({ read: DEFAULT_CODEC.decodeValue, write: DEFAULT_CODEC.encodeValue }, DEFAULT_ATTRIBUTES);
|
|
156
156
|
class Cookies {
|
|
157
157
|
constructor() {
|
|
158
|
-
|
|
159
|
-
|
|
158
|
+
k(this, "prefix", null);
|
|
159
|
+
k(this, "addPrefix", (l) => {
|
|
160
160
|
this.prefix = l;
|
|
161
161
|
});
|
|
162
162
|
}
|
|
@@ -217,51 +217,50 @@ const VxetableRender = (VXETable, {
|
|
|
217
217
|
events: e
|
|
218
218
|
} = a, {
|
|
219
219
|
label: t = "label",
|
|
220
|
-
value: d = "value"
|
|
221
|
-
extLabel: f
|
|
220
|
+
value: d = "value"
|
|
222
221
|
} = Z, {
|
|
223
|
-
loading:
|
|
224
|
-
multiple:
|
|
222
|
+
loading: f = !1,
|
|
223
|
+
multiple: m,
|
|
225
224
|
mapField: u
|
|
226
|
-
} = i,
|
|
227
|
-
|
|
228
|
-
function
|
|
229
|
-
|
|
225
|
+
} = i, V = useComponent(), p = m ? `_${r.field}` : r.field;
|
|
226
|
+
V.setDefaultValue(i, o, r.field);
|
|
227
|
+
function n(H) {
|
|
228
|
+
V.remote(H, r.field, a);
|
|
230
229
|
}
|
|
231
|
-
function
|
|
232
|
-
|
|
230
|
+
function L(H) {
|
|
231
|
+
V.selectChange(H, data, r.field, a, {
|
|
233
232
|
column: r,
|
|
234
233
|
datasource: "row"
|
|
235
234
|
});
|
|
236
235
|
}
|
|
237
|
-
function
|
|
238
|
-
e != null && e.input && e.input(l,
|
|
236
|
+
function C(H) {
|
|
237
|
+
e != null && e.input && e.input(l, H);
|
|
239
238
|
}
|
|
240
|
-
function
|
|
241
|
-
|
|
239
|
+
function A() {
|
|
240
|
+
V.clear(o, r.field, u, e, "row");
|
|
242
241
|
}
|
|
243
|
-
function
|
|
244
|
-
!c.length &&
|
|
242
|
+
function w() {
|
|
243
|
+
!c.length && n(""), e != null && e.focus && e.focus(l, r.field);
|
|
245
244
|
}
|
|
246
245
|
return [createVNode(resolveComponent("el-select"), mergeProps({
|
|
247
|
-
modelValue: o[
|
|
248
|
-
"onUpdate:modelValue": (
|
|
246
|
+
modelValue: o[p],
|
|
247
|
+
"onUpdate:modelValue": (H) => o[p] = H,
|
|
249
248
|
filterable: !0,
|
|
250
249
|
remote: !0,
|
|
251
250
|
clearable: !0,
|
|
252
251
|
placeholder: "请录入关键字搜索",
|
|
253
252
|
style: "width: 100%",
|
|
254
|
-
"remote-method":
|
|
255
|
-
loading:
|
|
253
|
+
"remote-method": n,
|
|
254
|
+
loading: f
|
|
256
255
|
}, i, {
|
|
257
|
-
onFocus: () =>
|
|
258
|
-
onChange: (
|
|
259
|
-
onClear: () =>
|
|
260
|
-
onInput: (
|
|
261
|
-
}), _isSlot(h = c.map((
|
|
262
|
-
key:
|
|
263
|
-
label:
|
|
264
|
-
value:
|
|
256
|
+
onFocus: () => w(),
|
|
257
|
+
onChange: (H) => L(H),
|
|
258
|
+
onClear: () => A(),
|
|
259
|
+
onInput: (H) => C(H)
|
|
260
|
+
}), _isSlot(h = c.map((H) => createVNode(resolveComponent("el-option"), {
|
|
261
|
+
key: H[d],
|
|
262
|
+
label: H[t],
|
|
263
|
+
value: H[d]
|
|
265
264
|
}, null))) ? h : {
|
|
266
265
|
default: () => [h]
|
|
267
266
|
})];
|
|
@@ -296,45 +295,45 @@ const VxetableRender = (VXETable, {
|
|
|
296
295
|
} = Z, {
|
|
297
296
|
mapField: f,
|
|
298
297
|
multiple: m,
|
|
299
|
-
loading:
|
|
300
|
-
} = i,
|
|
301
|
-
|
|
302
|
-
async function n(
|
|
303
|
-
|
|
298
|
+
loading: u = !1
|
|
299
|
+
} = i, V = useComponent(), p = m ? `_${r}` : r;
|
|
300
|
+
V.setDefaultValue(i, o, r);
|
|
301
|
+
async function n(H) {
|
|
302
|
+
V.remote(H, r, a);
|
|
304
303
|
}
|
|
305
|
-
function
|
|
306
|
-
|
|
304
|
+
function L(H) {
|
|
305
|
+
V.selectChange(H, o, r, a, {
|
|
307
306
|
datasource: "data"
|
|
308
307
|
});
|
|
309
308
|
}
|
|
310
|
-
function C(
|
|
311
|
-
e != null && e.input && e.input(l,
|
|
309
|
+
function C(H) {
|
|
310
|
+
e != null && e.input && e.input(l, H);
|
|
312
311
|
}
|
|
313
|
-
function
|
|
314
|
-
|
|
312
|
+
function A() {
|
|
313
|
+
V.clear(o, r, f, e, "data");
|
|
315
314
|
}
|
|
316
|
-
function
|
|
315
|
+
function w() {
|
|
317
316
|
!c.length && n(""), e != null && e.focus && e.focus(l);
|
|
318
317
|
}
|
|
319
318
|
return [createVNode(resolveComponent("el-select"), mergeProps({
|
|
320
|
-
modelValue: o[
|
|
321
|
-
"onUpdate:modelValue": (
|
|
319
|
+
modelValue: o[p],
|
|
320
|
+
"onUpdate:modelValue": (H) => o[p] = H,
|
|
322
321
|
filterable: !0,
|
|
323
322
|
remote: !0,
|
|
324
323
|
clearable: !0,
|
|
325
324
|
style: "width: 100%",
|
|
326
325
|
placeholder: "请录入关键字搜索",
|
|
327
|
-
loading:
|
|
326
|
+
loading: u,
|
|
328
327
|
"remote-method": n
|
|
329
328
|
}, i, {
|
|
330
|
-
onFocus: () =>
|
|
331
|
-
onChange: (
|
|
332
|
-
onClear: () =>
|
|
329
|
+
onFocus: () => w(),
|
|
330
|
+
onChange: (H) => L(H),
|
|
331
|
+
onClear: () => A(),
|
|
333
332
|
onInput: () => C()
|
|
334
|
-
}), _isSlot(h = c.map((
|
|
335
|
-
key:
|
|
336
|
-
label:
|
|
337
|
-
value:
|
|
333
|
+
}), _isSlot(h = c.map((H) => createVNode(resolveComponent("el-option"), {
|
|
334
|
+
key: H[d],
|
|
335
|
+
label: H[t],
|
|
336
|
+
value: H[d]
|
|
338
337
|
}, null))) ? h : {
|
|
339
338
|
default: () => [h]
|
|
340
339
|
})];
|
|
@@ -398,21 +397,21 @@ const VxetableRender = (VXETable, {
|
|
|
398
397
|
extLabel: f
|
|
399
398
|
} = Z, {
|
|
400
399
|
mapField: m
|
|
401
|
-
} = i,
|
|
400
|
+
} = i, u = useComponent();
|
|
402
401
|
i.multiple && o[r.field] && !isArray(o[r.field]) && o[r.field].split(",").forEach((n) => {
|
|
403
402
|
!c.some((C) => C[t] === n) && c.push({
|
|
404
403
|
[d]: n,
|
|
405
404
|
[t]: n
|
|
406
405
|
});
|
|
407
406
|
});
|
|
408
|
-
function
|
|
409
|
-
|
|
407
|
+
function V(n) {
|
|
408
|
+
u.selectChange(n, o, r.field, a, {
|
|
410
409
|
column: r,
|
|
411
410
|
datasource: "row"
|
|
412
411
|
});
|
|
413
412
|
}
|
|
414
|
-
function
|
|
415
|
-
|
|
413
|
+
function p() {
|
|
414
|
+
u.clear(o, r.field, m, e, "row");
|
|
416
415
|
}
|
|
417
416
|
return [createVNode(resolveComponent("el-select"), mergeProps({
|
|
418
417
|
modelValue: o[r.field],
|
|
@@ -421,8 +420,8 @@ const VxetableRender = (VXETable, {
|
|
|
421
420
|
clearable: !0
|
|
422
421
|
}, i, {
|
|
423
422
|
style: "width: 100%",
|
|
424
|
-
onChange: (n) =>
|
|
425
|
-
onClear: () =>
|
|
423
|
+
onChange: (n) => V(n),
|
|
424
|
+
onClear: () => p()
|
|
426
425
|
}), _isSlot(h = c.map((n) => createVNode(resolveComponent("el-option"), {
|
|
427
426
|
key: n[d],
|
|
428
427
|
label: f && n[f] ? n[d] : n[t],
|
|
@@ -447,21 +446,21 @@ const VxetableRender = (VXETable, {
|
|
|
447
446
|
extLabel: f
|
|
448
447
|
} = Z, {
|
|
449
448
|
mapField: m
|
|
450
|
-
} = i,
|
|
449
|
+
} = i, u = useComponent();
|
|
451
450
|
i.multiple && o[r.field] && !isArray(o[r.field]) && o[r.field].split(",").forEach((n) => {
|
|
452
451
|
!c.some((C) => C[t] === n) && c.push({
|
|
453
452
|
[d]: n,
|
|
454
453
|
[t]: n
|
|
455
454
|
});
|
|
456
455
|
});
|
|
457
|
-
function
|
|
458
|
-
|
|
456
|
+
function V(n) {
|
|
457
|
+
u.selectChange(n, o, r.field, a, {
|
|
459
458
|
column: r,
|
|
460
459
|
datasource: "row"
|
|
461
460
|
});
|
|
462
461
|
}
|
|
463
|
-
function
|
|
464
|
-
|
|
462
|
+
function p() {
|
|
463
|
+
u.clear(o, r.field, m, e, "row");
|
|
465
464
|
}
|
|
466
465
|
return [createVNode(resolveComponent("el-select"), mergeProps({
|
|
467
466
|
modelValue: o[r.field],
|
|
@@ -470,8 +469,8 @@ const VxetableRender = (VXETable, {
|
|
|
470
469
|
clearable: !0
|
|
471
470
|
}, i, {
|
|
472
471
|
style: "width: 100%",
|
|
473
|
-
onChange: (n) =>
|
|
474
|
-
onClear: () =>
|
|
472
|
+
onChange: (n) => V(n),
|
|
473
|
+
onClear: () => p()
|
|
475
474
|
}), _isSlot(h = c.map((n) => createVNode(resolveComponent("el-option"), {
|
|
476
475
|
key: n[d],
|
|
477
476
|
label: f && n[f] ? n[d] : n[t],
|
|
@@ -515,16 +514,16 @@ const VxetableRender = (VXETable, {
|
|
|
515
514
|
value: d = "value"
|
|
516
515
|
} = Z, f = useComponent(), {
|
|
517
516
|
defaultValues: m,
|
|
518
|
-
mapField:
|
|
517
|
+
mapField: u
|
|
519
518
|
} = i;
|
|
520
519
|
m && (o[r] = m);
|
|
521
|
-
function
|
|
520
|
+
function V(n) {
|
|
522
521
|
f.selectChange(n, o, r, a, {
|
|
523
522
|
datasource: "data"
|
|
524
523
|
});
|
|
525
524
|
}
|
|
526
|
-
function
|
|
527
|
-
f.clear(o, r,
|
|
525
|
+
function p() {
|
|
526
|
+
f.clear(o, r, u, e, "data");
|
|
528
527
|
}
|
|
529
528
|
return [createVNode(resolveComponent("el-select"), mergeProps({
|
|
530
529
|
modelValue: o[r],
|
|
@@ -533,8 +532,8 @@ const VxetableRender = (VXETable, {
|
|
|
533
532
|
clearable: !0,
|
|
534
533
|
style: "width: 100%"
|
|
535
534
|
}, i, {
|
|
536
|
-
onChange: (n) =>
|
|
537
|
-
onClear: () =>
|
|
535
|
+
onChange: (n) => V(n),
|
|
536
|
+
onClear: () => p()
|
|
538
537
|
}), _isSlot(h = c.map((n) => createVNode(resolveComponent("el-option"), {
|
|
539
538
|
key: n[d],
|
|
540
539
|
label: n[t],
|
|
@@ -558,35 +557,35 @@ const VxetableRender = (VXETable, {
|
|
|
558
557
|
Z && (h[o] = Z);
|
|
559
558
|
function t(f, m) {
|
|
560
559
|
const {
|
|
561
|
-
mapField:
|
|
562
|
-
field:
|
|
563
|
-
displayName:
|
|
560
|
+
mapField: u,
|
|
561
|
+
field: V,
|
|
562
|
+
displayName: p,
|
|
564
563
|
multiple: n
|
|
565
564
|
} = r;
|
|
566
565
|
if (n) {
|
|
567
566
|
if (n) {
|
|
568
567
|
const C = {};
|
|
569
|
-
h[
|
|
570
|
-
for (const
|
|
571
|
-
C[
|
|
572
|
-
return
|
|
568
|
+
h[p || V] = f.reduce((A, w) => {
|
|
569
|
+
for (const H in u)
|
|
570
|
+
C[H] = A ? C[H] + "," + w[u[H]] : w[u[H]];
|
|
571
|
+
return A = A ? A + "," + w[p || V] : w[p || V], A;
|
|
573
572
|
}, ""), Object.assign(h, C);
|
|
574
573
|
}
|
|
575
574
|
} else {
|
|
576
575
|
const C = {
|
|
577
|
-
[
|
|
576
|
+
[p || V]: f[m || p || V]
|
|
578
577
|
};
|
|
579
|
-
for (const
|
|
580
|
-
C[
|
|
578
|
+
for (const A in u)
|
|
579
|
+
C[A] = f[u[A]];
|
|
581
580
|
Object.assign(h, C);
|
|
582
581
|
}
|
|
583
|
-
const
|
|
582
|
+
const L = {
|
|
584
583
|
row: h,
|
|
585
|
-
property:
|
|
584
|
+
property: V,
|
|
586
585
|
item: f,
|
|
587
|
-
field:
|
|
586
|
+
field: V
|
|
588
587
|
};
|
|
589
|
-
c != null && c.change && c.change(
|
|
588
|
+
c != null && c.change && c.change(L);
|
|
590
589
|
}
|
|
591
590
|
function d() {
|
|
592
591
|
i.clear(h, o, e, c, "data");
|
|
@@ -612,16 +611,16 @@ const VxetableRender = (VXETable, {
|
|
|
612
611
|
const {
|
|
613
612
|
mapField: f,
|
|
614
613
|
field: m,
|
|
615
|
-
displayName:
|
|
616
|
-
multiple:
|
|
614
|
+
displayName: u,
|
|
615
|
+
multiple: V
|
|
617
616
|
} = r;
|
|
618
|
-
if (!
|
|
619
|
-
const
|
|
620
|
-
[
|
|
617
|
+
if (!V) {
|
|
618
|
+
const p = {
|
|
619
|
+
[u || m]: t[d || u || m]
|
|
621
620
|
};
|
|
622
621
|
for (const n in f)
|
|
623
|
-
|
|
624
|
-
Object.assign(h,
|
|
622
|
+
p[n] = t[f[n]];
|
|
623
|
+
Object.assign(h, p);
|
|
625
624
|
}
|
|
626
625
|
c != null && c.change && c.change(l, t, h[o.field]);
|
|
627
626
|
}
|
|
@@ -649,16 +648,16 @@ const VxetableRender = (VXETable, {
|
|
|
649
648
|
const {
|
|
650
649
|
mapField: f,
|
|
651
650
|
field: m,
|
|
652
|
-
displayName:
|
|
653
|
-
multiple:
|
|
651
|
+
displayName: u,
|
|
652
|
+
multiple: V
|
|
654
653
|
} = r;
|
|
655
|
-
if (!
|
|
656
|
-
const
|
|
657
|
-
[
|
|
654
|
+
if (!V) {
|
|
655
|
+
const p = {
|
|
656
|
+
[u || m]: t[d || u || m]
|
|
658
657
|
};
|
|
659
658
|
for (const n in f)
|
|
660
|
-
|
|
661
|
-
Object.assign(h,
|
|
659
|
+
p[n] = t[f[n]];
|
|
660
|
+
Object.assign(h, p);
|
|
662
661
|
}
|
|
663
662
|
c != null && c.change && c.change(l, t, h[o.field]);
|
|
664
663
|
}
|
|
@@ -867,11 +866,11 @@ const VxetableRender = (VXETable, {
|
|
|
867
866
|
fetchField: d,
|
|
868
867
|
url: f,
|
|
869
868
|
defaultParams: m = {},
|
|
870
|
-
method:
|
|
871
|
-
} = e,
|
|
869
|
+
method: u = "get"
|
|
870
|
+
} = e, V = getCookieParam(), p = Object.assign({
|
|
872
871
|
pageSize: 20,
|
|
873
872
|
pageNum: 1,
|
|
874
|
-
...
|
|
873
|
+
...V,
|
|
875
874
|
...m
|
|
876
875
|
}, {
|
|
877
876
|
[d || c]: r
|
|
@@ -879,7 +878,7 @@ const VxetableRender = (VXETable, {
|
|
|
879
878
|
if (e.loading) return;
|
|
880
879
|
let n;
|
|
881
880
|
try {
|
|
882
|
-
Z.length = 0, e.loading = !0, n = await serviceApi[
|
|
881
|
+
Z.length = 0, e.loading = !0, n = await serviceApi[u](f, p), t != null && t.filterMethod ? Z.push(...t.filterMethod(n.list || n)) : n && (n.list ? Z.push(...n.list) : Z.push(...n));
|
|
883
882
|
} finally {
|
|
884
883
|
e.loading = !1;
|
|
885
884
|
}
|
|
@@ -891,27 +890,27 @@ const VxetableRender = (VXETable, {
|
|
|
891
890
|
} = e, {
|
|
892
891
|
options: f,
|
|
893
892
|
props: m,
|
|
894
|
-
optionProps:
|
|
895
|
-
events:
|
|
896
|
-
} = Z,
|
|
893
|
+
optionProps: u = {},
|
|
894
|
+
events: V
|
|
895
|
+
} = Z, p = {
|
|
897
896
|
[d]: c,
|
|
898
897
|
field: i
|
|
899
898
|
};
|
|
900
899
|
c[i] = null, !isEmpty(r) && (m != null && m.multiple) ? (c[i] = r.join(","), t = [], r.forEach((n) => {
|
|
901
|
-
const
|
|
902
|
-
|
|
903
|
-
const
|
|
904
|
-
c[C] =
|
|
905
|
-
}),
|
|
906
|
-
}), Object.assign(
|
|
900
|
+
const L = f.find((C) => n === C[u == null ? void 0 : u.value]);
|
|
901
|
+
L && !isEmpty(m.mapField) && isObject(m.mapField) && Object.keys(m.mapField).forEach((C) => {
|
|
902
|
+
const A = L[m.mapField[C]], w = c[C] ? c[C].toString() : "";
|
|
903
|
+
c[C] = w && !w.includes(A) ? `${w},${A}` : A;
|
|
904
|
+
}), L && t.push(L);
|
|
905
|
+
}), Object.assign(p, {
|
|
907
906
|
options: t
|
|
908
|
-
})) : (c[i] = m != null && m.multiple ? null : r, t = f.find((n) => r === n[
|
|
907
|
+
})) : (c[i] = m != null && m.multiple ? null : r, t = f.find((n) => r === n[u == null ? void 0 : u.value]), !isEmpty(m.mapField) && isObject(m.mapField) && Object.keys(m.mapField).forEach((n) => {
|
|
909
908
|
c[n] = t ? t[m.mapField[n]] : null;
|
|
910
|
-
}), Object.assign(
|
|
909
|
+
}), Object.assign(p, {
|
|
911
910
|
option: t
|
|
912
|
-
})), d === "row" && Object.assign(
|
|
911
|
+
})), d === "row" && Object.assign(p, {
|
|
913
912
|
column: e.column
|
|
914
|
-
}),
|
|
913
|
+
}), V != null && V.change && V.change(p);
|
|
915
914
|
},
|
|
916
915
|
setDefaultValue: (r, c, i) => {
|
|
917
916
|
var d;
|
|
@@ -997,10 +996,10 @@ function useWatermark(a = ref(document.body)) {
|
|
|
997
996
|
d && (t && d.removeChild(t), removeResizeListener(d, l));
|
|
998
997
|
};
|
|
999
998
|
function c(t, d) {
|
|
1000
|
-
const f = document.createElement("canvas"), m = 260,
|
|
1001
|
-
Object.assign(f, { width: m, height:
|
|
1002
|
-
const
|
|
1003
|
-
return
|
|
999
|
+
const f = document.createElement("canvas"), m = 260, u = 180;
|
|
1000
|
+
Object.assign(f, { width: m, height: u });
|
|
1001
|
+
const V = f.getContext("2d");
|
|
1002
|
+
return V && (V.rotate(-20 * Math.PI / 120), V.font = (d == null ? void 0 : d.font) ?? "15px Reggae One", V.fillStyle = (d == null ? void 0 : d.fillStyle) ?? "rgba(180, 180, 180, 0.75)", V.textAlign = "left", V.textBaseline = "middle", V.fillText(t, m / 20, u)), f.toDataURL("image/png");
|
|
1004
1003
|
}
|
|
1005
1004
|
function i(t = {}) {
|
|
1006
1005
|
const d = unref(o);
|
|
@@ -1016,8 +1015,8 @@ function useWatermark(a = ref(document.body)) {
|
|
|
1016
1015
|
o.value = f, f.id = h, f.style.pointerEvents = "none", f.style.top = "0px", f.style.left = "0px", f.style.position = "absolute", f.style.zIndex = "100000";
|
|
1017
1016
|
const m = unref(a);
|
|
1018
1017
|
if (!m) return h;
|
|
1019
|
-
const { clientHeight:
|
|
1020
|
-
return i({ str: t, width:
|
|
1018
|
+
const { clientHeight: u, clientWidth: V } = m;
|
|
1019
|
+
return i({ str: t, width: V, height: u, attr: d }), m.appendChild(f), h;
|
|
1021
1020
|
};
|
|
1022
1021
|
function e(t, d) {
|
|
1023
1022
|
Z(t, d), addResizeListener(document.documentElement, l), getCurrentInstance() && onBeforeUnmount(() => {
|
|
@@ -1040,36 +1039,36 @@ function useAttrs(a = {}) {
|
|
|
1040
1039
|
}), r;
|
|
1041
1040
|
}
|
|
1042
1041
|
const useRender = () => {
|
|
1043
|
-
const a = { value: "dictCode", label: "dictName" }, l = (v,
|
|
1042
|
+
const a = { value: "dictCode", label: "dictName" }, l = (v, M) => {
|
|
1044
1043
|
var E;
|
|
1045
|
-
const
|
|
1044
|
+
const b = H(M);
|
|
1046
1045
|
let s = {
|
|
1047
1046
|
clearable: !0,
|
|
1048
1047
|
disabled: !1,
|
|
1049
1048
|
showValue: !1,
|
|
1050
1049
|
placeholder: null
|
|
1051
|
-
},
|
|
1052
|
-
isObject(v) ? (s = Object.assign(s, v),
|
|
1053
|
-
const
|
|
1050
|
+
}, y, S;
|
|
1051
|
+
isObject(v) ? (s = Object.assign(s, v), y = v.defaultValue, S = v == null ? void 0 : v.code) : S = v;
|
|
1052
|
+
const x = (E = storageLocal.getItem("kLov")[S]) == null ? void 0 : E.children, D = x ? x.filter((N) => N.enabled === "1") : [];
|
|
1054
1053
|
return {
|
|
1055
1054
|
name: "#select",
|
|
1056
1055
|
optionProps: a,
|
|
1057
1056
|
options: D,
|
|
1058
1057
|
props: s,
|
|
1059
|
-
defaultValue:
|
|
1060
|
-
events:
|
|
1058
|
+
defaultValue: y,
|
|
1059
|
+
events: b
|
|
1061
1060
|
};
|
|
1062
|
-
}, h = (v,
|
|
1063
|
-
const
|
|
1061
|
+
}, h = (v, M) => {
|
|
1062
|
+
const b = H(M);
|
|
1064
1063
|
return {
|
|
1065
1064
|
name: "#SuSelect",
|
|
1066
1065
|
optionProps: (v == null ? void 0 : v.optionProps) || { label: "label", value: "value" },
|
|
1067
1066
|
props: v == null ? void 0 : v.props,
|
|
1068
1067
|
options: (v == null ? void 0 : v.options) || [],
|
|
1069
|
-
events:
|
|
1068
|
+
events: b
|
|
1070
1069
|
};
|
|
1071
|
-
}, o = (v,
|
|
1072
|
-
const
|
|
1070
|
+
}, o = (v, M) => {
|
|
1071
|
+
const b = {
|
|
1073
1072
|
optionProps: { extLabel: "userName", value: "employeeName" },
|
|
1074
1073
|
props: {
|
|
1075
1074
|
attrs: { disabled: v == null ? void 0 : v.disabled },
|
|
@@ -1081,9 +1080,9 @@ const useRender = () => {
|
|
|
1081
1080
|
fetchField: "employeeName"
|
|
1082
1081
|
}
|
|
1083
1082
|
};
|
|
1084
|
-
return h(
|
|
1083
|
+
return h(b, M);
|
|
1085
1084
|
}, r = (v) => {
|
|
1086
|
-
const
|
|
1085
|
+
const M = {
|
|
1087
1086
|
optionProps: { extLabel: "userName", value: "name" },
|
|
1088
1087
|
props: {
|
|
1089
1088
|
code: "sys/listUsers",
|
|
@@ -1092,9 +1091,9 @@ const useRender = () => {
|
|
|
1092
1091
|
mapField: v == null ? void 0 : v.mapField
|
|
1093
1092
|
}
|
|
1094
1093
|
};
|
|
1095
|
-
return h(
|
|
1096
|
-
}, c = (v,
|
|
1097
|
-
const
|
|
1094
|
+
return h(M);
|
|
1095
|
+
}, c = (v, M) => {
|
|
1096
|
+
const b = {
|
|
1098
1097
|
label: "organizationName",
|
|
1099
1098
|
value: (v == null ? void 0 : v.field) || "organizationName"
|
|
1100
1099
|
}, s = {
|
|
@@ -1102,13 +1101,13 @@ const useRender = () => {
|
|
|
1102
1101
|
defaultParams: v == null ? void 0 : v.defaultParams,
|
|
1103
1102
|
url: "/uums/cusOrganization",
|
|
1104
1103
|
fetchField: "organizationName"
|
|
1105
|
-
},
|
|
1104
|
+
}, y = {
|
|
1106
1105
|
organizationId: "id",
|
|
1107
1106
|
organizationCode: "organizationCode"
|
|
1108
1107
|
};
|
|
1109
|
-
return Object.assign(s.mapField,
|
|
1110
|
-
}, i = (v,
|
|
1111
|
-
const
|
|
1108
|
+
return Object.assign(s.mapField, y, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: s, optionProps: b, options: [], methods: M };
|
|
1109
|
+
}, i = (v, M) => {
|
|
1110
|
+
const b = {
|
|
1112
1111
|
label: "orgName",
|
|
1113
1112
|
value: (v == null ? void 0 : v.field) || "orgName"
|
|
1114
1113
|
}, s = {
|
|
@@ -1116,40 +1115,40 @@ const useRender = () => {
|
|
|
1116
1115
|
defaultParams: v == null ? void 0 : v.defaultParams,
|
|
1117
1116
|
url: "/uums/org",
|
|
1118
1117
|
fetchField: "orgName"
|
|
1119
|
-
},
|
|
1120
|
-
return Object.assign(s.mapField,
|
|
1121
|
-
}, Z = (v,
|
|
1122
|
-
const
|
|
1118
|
+
}, y = { orgId: "id", orgCode: "orgCode" };
|
|
1119
|
+
return Object.assign(s.mapField, y, (v == null ? void 0 : v.mapField) || {}), { name: "#SuSelect", props: s, optionProps: b, options: [], methods: M };
|
|
1120
|
+
}, Z = (v, M) => {
|
|
1121
|
+
const b = Object.assign({ disabled: !1 }, v), s = b == null ? void 0 : b.defaultValue;
|
|
1123
1122
|
return {
|
|
1124
1123
|
name: "VxeInput",
|
|
1125
|
-
props:
|
|
1124
|
+
props: b,
|
|
1126
1125
|
defaultValue: s,
|
|
1127
|
-
events:
|
|
1126
|
+
events: H(M)
|
|
1128
1127
|
};
|
|
1129
|
-
}, e = (v,
|
|
1130
|
-
const
|
|
1128
|
+
}, e = (v, M) => {
|
|
1129
|
+
const b = Object.assign({ disabled: !1, rows: 3 }, v), s = b == null ? void 0 : b.defaultValue;
|
|
1131
1130
|
return {
|
|
1132
1131
|
name: "VxeTextarea",
|
|
1133
|
-
props:
|
|
1132
|
+
props: b,
|
|
1134
1133
|
defaultValue: s,
|
|
1135
|
-
events:
|
|
1134
|
+
events: H(M)
|
|
1136
1135
|
};
|
|
1137
|
-
}, t = (v,
|
|
1138
|
-
const
|
|
1139
|
-
return { name:
|
|
1140
|
-
}, d = (v,
|
|
1141
|
-
const
|
|
1142
|
-
return { name:
|
|
1136
|
+
}, t = (v, M) => {
|
|
1137
|
+
const b = "VxeCheckbox", { defaultValue: s, options: y, props: S } = f(v);
|
|
1138
|
+
return { name: b, defaultValue: s, options: y, props: S, events: H(M) };
|
|
1139
|
+
}, d = (v, M) => {
|
|
1140
|
+
const b = "VxeRadio", { defaultValue: s, options: y, props: S } = f(v);
|
|
1141
|
+
return { name: b, defaultValue: s, options: y, props: S, events: H(M) };
|
|
1143
1142
|
}, f = (v) => {
|
|
1144
|
-
var
|
|
1145
|
-
let
|
|
1143
|
+
var x;
|
|
1144
|
+
let M = { disabled: !1 }, b;
|
|
1146
1145
|
const s = storageLocal.getItem("kLov");
|
|
1147
|
-
let
|
|
1148
|
-
isObject(v) ? (
|
|
1149
|
-
const
|
|
1150
|
-
return { props:
|
|
1151
|
-
}, m = (v,
|
|
1152
|
-
const
|
|
1146
|
+
let y = "";
|
|
1147
|
+
isObject(v) ? (b = v.defaultValue, y = v.code, M = Object.assign(M, v || {})) : isString(v) && (y = v);
|
|
1148
|
+
const S = y ? (x = s[y]) == null ? void 0 : x.children.map((D) => ({ label: D.dictName, value: D.dictCode })) : [];
|
|
1149
|
+
return { props: M, defaultValue: b, options: S };
|
|
1150
|
+
}, m = (v, M) => {
|
|
1151
|
+
const b = H(M);
|
|
1153
1152
|
return {
|
|
1154
1153
|
name: "VxeInput",
|
|
1155
1154
|
props: Object.assign(
|
|
@@ -1157,19 +1156,19 @@ const useRender = () => {
|
|
|
1157
1156
|
v || {}
|
|
1158
1157
|
),
|
|
1159
1158
|
defaultValue: v == null ? void 0 : v.defaultValue,
|
|
1160
|
-
events:
|
|
1159
|
+
events: b
|
|
1161
1160
|
};
|
|
1162
|
-
},
|
|
1163
|
-
const
|
|
1164
|
-
return { name: "VxeInput", props: Object.assign({ type: "date", valueFormat: s, clearable: !0 }, v || {}), defaultValue:
|
|
1165
|
-
},
|
|
1166
|
-
const
|
|
1167
|
-
return { name: "#lov", props: Object.assign({}, v || {}), events:
|
|
1168
|
-
},
|
|
1169
|
-
const
|
|
1161
|
+
}, u = (v, M) => {
|
|
1162
|
+
const b = H(M), s = "yyyy-MM-dd HH:mm:ss", y = v == null ? void 0 : v.defaultValue;
|
|
1163
|
+
return { name: "VxeInput", props: Object.assign({ type: "date", valueFormat: s, clearable: !0 }, v || {}), defaultValue: y, events: b };
|
|
1164
|
+
}, V = (v, M) => {
|
|
1165
|
+
const b = H(M);
|
|
1166
|
+
return { name: "#lov", props: Object.assign({}, v || {}), events: b };
|
|
1167
|
+
}, p = (v, M) => {
|
|
1168
|
+
const b = H(M), s = (v == null ? void 0 : v.optionProps) || {
|
|
1170
1169
|
label: "label",
|
|
1171
1170
|
value: "value"
|
|
1172
|
-
},
|
|
1171
|
+
}, y = Object.assign(
|
|
1173
1172
|
{ clearable: !0, disabled: !1, showValue: !1 },
|
|
1174
1173
|
v || {}
|
|
1175
1174
|
);
|
|
@@ -1177,42 +1176,42 @@ const useRender = () => {
|
|
|
1177
1176
|
name: "#select",
|
|
1178
1177
|
optionProps: s,
|
|
1179
1178
|
options: (v == null ? void 0 : v.options) || [],
|
|
1180
|
-
props:
|
|
1181
|
-
events:
|
|
1179
|
+
props: y,
|
|
1180
|
+
events: b
|
|
1182
1181
|
};
|
|
1183
|
-
}, n = (v,
|
|
1184
|
-
let
|
|
1182
|
+
}, n = (v, M) => {
|
|
1183
|
+
let b = {
|
|
1185
1184
|
openLabel: "是",
|
|
1186
1185
|
closeLabel: "否",
|
|
1187
1186
|
openValue: "Y",
|
|
1188
1187
|
closeValue: "N"
|
|
1189
1188
|
}, s = "Y";
|
|
1190
|
-
isObject(v) && !isFunction(v) ? (
|
|
1191
|
-
const
|
|
1192
|
-
return { name: "VxeSwitch", props:
|
|
1193
|
-
},
|
|
1194
|
-
const
|
|
1189
|
+
isObject(v) && !isFunction(v) ? (b = Object.assign(b, v || {}), s = v.defaultValue || s) : !isEmpty(v) && isString(v) && (s = v, b = Object.assign(b, { defaultValue: s }));
|
|
1190
|
+
const y = isFunction(v) ? H(v) : H(M);
|
|
1191
|
+
return { name: "VxeSwitch", props: b, defaultValue: s, events: y };
|
|
1192
|
+
}, L = (v, M) => ({ name: "#tag", props: { code: v, tagMap: M } }), C = (v, M) => {
|
|
1193
|
+
const b = {
|
|
1195
1194
|
openLabel: "启用",
|
|
1196
1195
|
closeLabel: "禁用",
|
|
1197
1196
|
openValue: "1",
|
|
1198
1197
|
closeValue: "0",
|
|
1199
1198
|
defaultValue: "1"
|
|
1200
1199
|
};
|
|
1201
|
-
!isFunction(v) && isObject(v) && Object.assign(
|
|
1202
|
-
const s = isFunction(v) ? v :
|
|
1203
|
-
return n(
|
|
1204
|
-
},
|
|
1205
|
-
let
|
|
1206
|
-
return isObject(v) && !isFunction(v) ?
|
|
1207
|
-
change: (v == null ? void 0 : v.change) ||
|
|
1208
|
-
blur: (v == null ? void 0 : v.blur) ||
|
|
1209
|
-
focus: (v == null ? void 0 : v.focus) ||
|
|
1210
|
-
input: (v == null ? void 0 : v.input) ||
|
|
1211
|
-
clear: (v == null ? void 0 : v.clear) ||
|
|
1200
|
+
!isFunction(v) && isObject(v) && Object.assign(b, v);
|
|
1201
|
+
const s = isFunction(v) ? v : M;
|
|
1202
|
+
return n(b, s);
|
|
1203
|
+
}, A = () => ({ name: "#iconSelect" }), w = (v = [], M = {}, b) => ({ name: "#treeSelect", sourceData: v, props: M, events: b }), H = (v) => {
|
|
1204
|
+
let M = {};
|
|
1205
|
+
return isObject(v) && !isFunction(v) ? M = {
|
|
1206
|
+
change: (v == null ? void 0 : v.change) || I,
|
|
1207
|
+
blur: (v == null ? void 0 : v.blur) || I,
|
|
1208
|
+
focus: (v == null ? void 0 : v.focus) || I,
|
|
1209
|
+
input: (v == null ? void 0 : v.input) || I,
|
|
1210
|
+
clear: (v == null ? void 0 : v.clear) || I,
|
|
1212
1211
|
filterMethod: v == null ? void 0 : v.filterMethod
|
|
1213
|
-
} : v && (
|
|
1212
|
+
} : v && (M = { change: v }), M;
|
|
1214
1213
|
};
|
|
1215
|
-
function
|
|
1214
|
+
function I() {
|
|
1216
1215
|
}
|
|
1217
1216
|
return {
|
|
1218
1217
|
renderDict: l,
|
|
@@ -1226,14 +1225,14 @@ const useRender = () => {
|
|
|
1226
1225
|
renderInvOrg: c,
|
|
1227
1226
|
renderBU: i,
|
|
1228
1227
|
renderNumber: m,
|
|
1229
|
-
renderLov:
|
|
1230
|
-
renderSelectLocal:
|
|
1231
|
-
renderDate:
|
|
1228
|
+
renderLov: V,
|
|
1229
|
+
renderSelectLocal: p,
|
|
1230
|
+
renderDate: u,
|
|
1232
1231
|
renderSwitch: n,
|
|
1233
|
-
renderCellTag:
|
|
1232
|
+
renderCellTag: L,
|
|
1234
1233
|
renderEnabled: C,
|
|
1235
|
-
renderIconSelect:
|
|
1236
|
-
renderTreeSelect:
|
|
1234
|
+
renderIconSelect: A,
|
|
1235
|
+
renderTreeSelect: w
|
|
1237
1236
|
};
|
|
1238
1237
|
}, useGlobal = () => {
|
|
1239
1238
|
const a = getCurrentInstance();
|
|
@@ -1301,7 +1300,7 @@ const deviceDetection = () => {
|
|
|
1301
1300
|
var i, Z;
|
|
1302
1301
|
o.title = o.title || `message.${o.field}`, o.span = o.span || h;
|
|
1303
1302
|
let r = !1;
|
|
1304
|
-
l === "detail" ? r = !0 : r = o.disabled || ((Z = (i = o.itemRender) == null ? void 0 : i.props) == null ? void 0 : Z.disabled);
|
|
1303
|
+
l === "detail" ? (r = !0, o.placeholder = null) : r = o.disabled === !1 ? o.disabled : o.disabled || ((Z = (i = o.itemRender) == null ? void 0 : i.props) == null ? void 0 : Z.disabled);
|
|
1305
1304
|
let c = {
|
|
1306
1305
|
name: "VxeInput",
|
|
1307
1306
|
props: { disabled: r, placeholder: r ? "" : o.placeholder }
|
|
@@ -1339,10 +1338,10 @@ const deviceDetection = () => {
|
|
|
1339
1338
|
collapseTagsTooltip: !0,
|
|
1340
1339
|
multiple: !0
|
|
1341
1340
|
}, Z = h.map((t, d) => {
|
|
1342
|
-
var f, m,
|
|
1341
|
+
var f, m, u;
|
|
1343
1342
|
return t.folding = r ? c && d > 1 : c && d > 2, t.span = getDateRange(t) ? 12 : t.span || 6, t.code && !t.itemRender && (t.itemRender = renderHook.renderDict(t.code)), t.itemRender = t.itemRender || { name: "VxeInput" }, t.resetValue = t.itemRender.defaultValue, t.title = t.title || `message.${t.field}`, (t.multiple || (m = (f = t.itemRender) == null ? void 0 : f.props) != null && m.multiple) && (t.itemRender.props = Object.assign(
|
|
1344
1343
|
i,
|
|
1345
|
-
((
|
|
1344
|
+
((u = t.itemRender) == null ? void 0 : u.props) || {}
|
|
1346
1345
|
)), t;
|
|
1347
1346
|
}), e = clone(formSearchButtons, !0);
|
|
1348
1347
|
if (e.collapseNode = c, l && e.itemRender.options.length < 3 && (e.itemRender.options.push(l), e.itemRender.events = l.events), c) {
|
|
@@ -1443,11 +1442,11 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
|
|
|
1443
1442
|
"Content-Type": "application/json",
|
|
1444
1443
|
"X-Requested-With": "XMLHttpRequest"
|
|
1445
1444
|
}
|
|
1446
|
-
},
|
|
1445
|
+
}, g = class g {
|
|
1447
1446
|
constructor() {
|
|
1448
|
-
|
|
1449
|
-
|
|
1450
|
-
|
|
1447
|
+
k(this, "router");
|
|
1448
|
+
k(this, "baseUrl", null);
|
|
1449
|
+
k(this, "getNetworkError", (l) => l ? {
|
|
1451
1450
|
400: "错误的请求",
|
|
1452
1451
|
401: "服务未授权,请重新登录",
|
|
1453
1452
|
403: "拒绝访问",
|
|
@@ -1470,25 +1469,25 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
|
|
|
1470
1469
|
/** 重连原始请求 */
|
|
1471
1470
|
static retryOriginalRequest(l) {
|
|
1472
1471
|
return new Promise((h) => {
|
|
1473
|
-
|
|
1472
|
+
g.requests.push((o) => {
|
|
1474
1473
|
l.headers.Authorization = "Bearer " + o, h(l);
|
|
1475
1474
|
});
|
|
1476
1475
|
});
|
|
1477
1476
|
}
|
|
1478
1477
|
// 请求拦截
|
|
1479
1478
|
httpInterceptorsRequest() {
|
|
1480
|
-
|
|
1481
|
-
(l) => (has(l, "loading") && isRef(l.loading) && (l.loading.value = !0), NProgress.start(), typeof l.beforeRequestCallback == "function" ? (l.beforeRequestCallback(l), l) :
|
|
1479
|
+
g.axiosInstance.interceptors.request.use(
|
|
1480
|
+
(l) => (has(l, "loading") && isRef(l.loading) && (l.loading.value = !0), NProgress.start(), typeof l.beforeRequestCallback == "function" ? (l.beforeRequestCallback(l), l) : g.initConfig.beforeRequestCallback ? (g.initConfig.beforeRequestCallback(l), l) : ["/refreshToken", "/login"].some((o) => l.url.indexOf(o) > -1) ? l : new Promise((o) => {
|
|
1482
1481
|
const r = cookies.get(kTOKENKEY);
|
|
1483
1482
|
if (r) {
|
|
1484
1483
|
const c = JSON.parse(r), i = (/* @__PURE__ */ new Date()).getTime();
|
|
1485
|
-
c.expires - i <= 0 ? (
|
|
1484
|
+
c.expires - i <= 0 ? (g.isRefreshing || (g.isRefreshing = !0, this.get(this.baseUrl + "/uath/refreshToken", {
|
|
1486
1485
|
refreshToken: c.refreshToken
|
|
1487
1486
|
}).then((e) => {
|
|
1488
|
-
this.setToken(e), l.headers.Authorization = "Bearer " + e.access_token,
|
|
1487
|
+
this.setToken(e), l.headers.Authorization = "Bearer " + e.access_token, g.requests.forEach((t) => t(e.access_token)), g.requests = [];
|
|
1489
1488
|
}).finally(() => {
|
|
1490
|
-
|
|
1491
|
-
})), o(
|
|
1489
|
+
g.isRefreshing = !1;
|
|
1490
|
+
})), o(g.retryOriginalRequest(l))) : (l.headers.Authorization = "Bearer " + c.accessToken, o(l));
|
|
1492
1491
|
} else {
|
|
1493
1492
|
const c = cookies.get("kCookies_token");
|
|
1494
1493
|
c && (l.headers["X-Token"] = c), o(l);
|
|
@@ -1507,10 +1506,10 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
|
|
|
1507
1506
|
}
|
|
1508
1507
|
// 响应拦截
|
|
1509
1508
|
httpInterceptorsResponse() {
|
|
1510
|
-
|
|
1509
|
+
g.axiosInstance.interceptors.response.use(
|
|
1511
1510
|
(h) => {
|
|
1512
1511
|
const o = h.config;
|
|
1513
|
-
return has(o, "loading") && isRef(o.loading) && (o.loading.value = !1), NProgress.done(), typeof o.beforeResponseCallback == "function" ? (o.beforeResponseCallback(h), h.data) : (
|
|
1512
|
+
return has(o, "loading") && isRef(o.loading) && (o.loading.value = !1), NProgress.done(), typeof o.beforeResponseCallback == "function" ? (o.beforeResponseCallback(h), h.data) : (g.initConfig.beforeResponseCallback && g.initConfig.beforeResponseCallback(h), h.data);
|
|
1514
1513
|
},
|
|
1515
1514
|
(h) => {
|
|
1516
1515
|
var r;
|
|
@@ -1534,7 +1533,7 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
|
|
|
1534
1533
|
...r
|
|
1535
1534
|
});
|
|
1536
1535
|
return new Promise((i, Z) => {
|
|
1537
|
-
|
|
1536
|
+
g.axiosInstance.request(c).then((e) => {
|
|
1538
1537
|
if (e && (e == null ? void 0 : e.code) === "0")
|
|
1539
1538
|
i(e.data);
|
|
1540
1539
|
else if (e.code === "500")
|
|
@@ -1582,11 +1581,11 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
|
|
|
1582
1581
|
}
|
|
1583
1582
|
};
|
|
1584
1583
|
/** token过期后,暂存待执行的请求 */
|
|
1585
|
-
|
|
1586
|
-
|
|
1587
|
-
|
|
1588
|
-
|
|
1589
|
-
let SuHttp =
|
|
1584
|
+
k(g, "requests", []), /** 防止重复刷新token */
|
|
1585
|
+
k(g, "isRefreshing", !1), // 初始化配置对象
|
|
1586
|
+
k(g, "initConfig", {}), // 保存当前Axios实例对象
|
|
1587
|
+
k(g, "axiosInstance", Axios.create(defaultConfig));
|
|
1588
|
+
let SuHttp = g;
|
|
1590
1589
|
const http = new SuHttp(), lunarCalendar = {
|
|
1591
1590
|
/**
|
|
1592
1591
|
* 农历1900-2100的润大小信息表
|
|
@@ -2397,46 +2396,46 @@ const http = new SuHttp(), lunarCalendar = {
|
|
|
2397
2396
|
const f = /* @__PURE__ */ new Date();
|
|
2398
2397
|
let m = !1;
|
|
2399
2398
|
f.getFullYear() === o && f.getMonth() + 1 === r && f.getDate() === c && (m = !0);
|
|
2400
|
-
let
|
|
2401
|
-
const
|
|
2402
|
-
|
|
2403
|
-
const
|
|
2399
|
+
let u = i.getDay();
|
|
2400
|
+
const V = this.nStr1[u];
|
|
2401
|
+
u === 0 && (u = 7);
|
|
2402
|
+
const p = Z;
|
|
2404
2403
|
e = this.leapMonth(Z);
|
|
2405
2404
|
let n = !1;
|
|
2406
2405
|
for (Z = 1; Z < 13 && d > 0; Z++)
|
|
2407
|
-
e > 0 && Z === e + 1 && n === !1 ? (--Z, n = !0, t = this.leapDays(
|
|
2406
|
+
e > 0 && Z === e + 1 && n === !1 ? (--Z, n = !0, t = this.leapDays(p)) : t = this.monthDays(p, Z), n === !0 && Z === e + 1 && (n = !1), d -= t;
|
|
2408
2407
|
d === 0 && e > 0 && Z === e + 1 && (n ? n = !1 : (n = !0, --Z)), d < 0 && (d += t, --Z);
|
|
2409
|
-
const
|
|
2408
|
+
const L = Z, C = d + 1, A = r - 1, w = this.toGanZhiYear(p), H = this.getTerm(o, r * 2 - 1), I = this.getTerm(o, r * 2);
|
|
2410
2409
|
let v = this.toGanZhi((o - 1900) * 12 + r + 11);
|
|
2411
|
-
c >=
|
|
2412
|
-
let
|
|
2413
|
-
|
|
2414
|
-
const s = Date.UTC(o,
|
|
2415
|
-
let F =
|
|
2416
|
-
return
|
|
2417
|
-
date:
|
|
2410
|
+
c >= H && (v = this.toGanZhi((o - 1900) * 12 + r + 12));
|
|
2411
|
+
let M = !1, b;
|
|
2412
|
+
H === c && (M = !0, b = this.solarTerm[r * 2 - 2]), I === c && (M = !0, b = this.solarTerm[r * 2 - 1]);
|
|
2413
|
+
const s = Date.UTC(o, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, y = this.toGanZhi(s + c - 1), S = this.toAstro(r, c), x = o + "-" + r + "-" + c, D = p + "-" + L + "-" + C, E = this.festival, N = this.lFestival, R = r + "-" + c;
|
|
2414
|
+
let F = L + "-" + C;
|
|
2415
|
+
return L === 12 && C === 29 && this.monthDays(p, L) === 29 && (F = "12-30"), {
|
|
2416
|
+
date: x,
|
|
2418
2417
|
lunarDate: D,
|
|
2419
2418
|
festival: E[R] ? E[R].title : null,
|
|
2420
2419
|
lunarFestival: N[F] ? N[F].title : null,
|
|
2421
|
-
lYear:
|
|
2422
|
-
lMonth:
|
|
2420
|
+
lYear: p,
|
|
2421
|
+
lMonth: L,
|
|
2423
2422
|
lDay: C,
|
|
2424
|
-
Animal: this.getAnimal(
|
|
2425
|
-
IMonthCn: (n ? "闰" : "") + this.toChinaMonth(
|
|
2423
|
+
Animal: this.getAnimal(p),
|
|
2424
|
+
IMonthCn: (n ? "闰" : "") + this.toChinaMonth(L),
|
|
2426
2425
|
IDayCn: this.toChinaDay(C),
|
|
2427
2426
|
cYear: o,
|
|
2428
2427
|
cMonth: r,
|
|
2429
2428
|
cDay: c,
|
|
2430
|
-
gzYear:
|
|
2429
|
+
gzYear: w,
|
|
2431
2430
|
gzMonth: v,
|
|
2432
|
-
gzDay:
|
|
2431
|
+
gzDay: y,
|
|
2433
2432
|
isToday: m,
|
|
2434
2433
|
isLeap: n,
|
|
2435
|
-
nWeek:
|
|
2436
|
-
ncWeek: "星期" +
|
|
2437
|
-
isTerm:
|
|
2438
|
-
Term:
|
|
2439
|
-
astro:
|
|
2434
|
+
nWeek: u,
|
|
2435
|
+
ncWeek: "星期" + V,
|
|
2436
|
+
isTerm: M,
|
|
2437
|
+
Term: b,
|
|
2438
|
+
astro: S
|
|
2440
2439
|
};
|
|
2441
2440
|
},
|
|
2442
2441
|
/**
|
|
@@ -2465,8 +2464,8 @@ const http = new SuHttp(), lunarCalendar = {
|
|
|
2465
2464
|
for (e = 1; e < l; e++)
|
|
2466
2465
|
t = this.leapMonth(a), d || t <= e && t > 0 && (Z += this.leapDays(a), d = !0), Z += this.monthDays(a, e);
|
|
2467
2466
|
o && (Z += c);
|
|
2468
|
-
const f = Date.UTC(1900, 1, 30, 0, 0, 0), m = new Date((Z + h - 31) * 864e5 + f),
|
|
2469
|
-
return this.solar2lunar(
|
|
2467
|
+
const f = Date.UTC(1900, 1, 30, 0, 0, 0), m = new Date((Z + h - 31) * 864e5 + f), u = m.getUTCFullYear(), V = m.getUTCMonth() + 1, p = m.getUTCDate();
|
|
2468
|
+
return this.solar2lunar(u, V, p);
|
|
2470
2469
|
}
|
|
2471
2470
|
}, dict = storageLocal.getItem("kLov"), formats = {
|
|
2472
2471
|
formatDate: {
|