cloud-web-corejs 1.0.54-dev.560 → 1.0.54-dev.562
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/package.json +2 -1
- package/src/components/xform/form-render/container-item/table2-item.vue +4 -12
- package/src/layout/index.vue +5 -3
- package/src/router/modules/customer.js +8 -142
- package/src/views/user/wf/wf_work_calendar/date.js +64 -65
- package/src/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.es6.min.js +0 -11028
- package/src/components/table/plugins/extend-cell-area/vxe-table-extend-cell-area.min.css +0 -200
- package/src/mixins/table/index.js +0 -151
- package/src/views/user/home/bears/index.vue +0 -1032
- package/src/views/user/home/taili/index.vue +0 -1034
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "cloud-web-corejs",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "1.0.54-dev.
|
|
4
|
+
"version": "1.0.54-dev.562",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"dev": "vue-cli-service serve",
|
|
7
7
|
"lint": "eslint --ext .js,.vue src",
|
|
@@ -25,6 +25,7 @@
|
|
|
25
25
|
"copy-webpack-plugin": "5.1.2",
|
|
26
26
|
"core-js": "^3.8.3",
|
|
27
27
|
"dayjs": "^1.11.13",
|
|
28
|
+
"dompurify": "^3.3.1",
|
|
28
29
|
"dhtmlx-gantt": "^9.1.1",
|
|
29
30
|
"element-ui": "^2.15.14",
|
|
30
31
|
"esdk-obs-browserjs": "^3.25.6",
|
|
@@ -92,7 +92,6 @@ export default {
|
|
|
92
92
|
1: "textarea",
|
|
93
93
|
2: "date",
|
|
94
94
|
3: "number",
|
|
95
|
-
4: "text"
|
|
96
95
|
},
|
|
97
96
|
};
|
|
98
97
|
},
|
|
@@ -185,11 +184,11 @@ export default {
|
|
|
185
184
|
this.widget.rows.length = 0;
|
|
186
185
|
this.widget.rows.push(...widgetRows);
|
|
187
186
|
},
|
|
188
|
-
loadDataDefaultHandle(
|
|
189
|
-
|
|
190
|
-
|
|
187
|
+
loadDataDefaultHandle() {
|
|
188
|
+
/*this.init();
|
|
189
|
+
return*/
|
|
191
190
|
let dataId = this.formDataId;
|
|
192
|
-
if (
|
|
191
|
+
if (!dataId) return;
|
|
193
192
|
let reportTemplate = this.getFormRef().reportTemplate;
|
|
194
193
|
let formCode = reportTemplate.formCode;
|
|
195
194
|
let formScriptEnabled = this.widget.options.formScriptEnabled || false;
|
|
@@ -264,13 +263,6 @@ export default {
|
|
|
264
263
|
f_is_required: true,
|
|
265
264
|
f_field_value: "6",
|
|
266
265
|
},
|
|
267
|
-
{
|
|
268
|
-
f_field_name: "姓名",//显示名称
|
|
269
|
-
f_key: "name",//字段名
|
|
270
|
-
f_field_type: 4,//类型,0: "文本输入框",1: "多行输入框",2: "日期输入框",3: "数字输入框",4:"纯文本"
|
|
271
|
-
f_is_required: false,//是否必填
|
|
272
|
-
f_field_value: "张三",//字段值
|
|
273
|
-
}
|
|
274
266
|
];
|
|
275
267
|
let a = 1;
|
|
276
268
|
this.setValue(items);
|
package/src/layout/index.vue
CHANGED
|
@@ -6,10 +6,12 @@
|
|
|
6
6
|
import defaultLayout from "@base/layout/defaultLayout.vue";
|
|
7
7
|
|
|
8
8
|
export default {
|
|
9
|
-
name:
|
|
9
|
+
name: 'Layout',
|
|
10
10
|
components: {
|
|
11
|
-
defaultLayout
|
|
11
|
+
defaultLayout
|
|
12
12
|
},
|
|
13
13
|
};
|
|
14
14
|
</script>
|
|
15
|
-
<style lang="scss" scoped
|
|
15
|
+
<style lang="scss" scoped>
|
|
16
|
+
</style>
|
|
17
|
+
|
|
@@ -1,142 +1,8 @@
|
|
|
1
|
-
export const constantRoutes = [
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
},
|
|
10
|
-
{
|
|
11
|
-
path: '/pcp_outLink_view',
|
|
12
|
-
component: () => import('@/views/pcp/outLink/view'),
|
|
13
|
-
hidden: true
|
|
14
|
-
},
|
|
15
|
-
{
|
|
16
|
-
path: '/pcp_outLink_m_view',
|
|
17
|
-
component: () => import('@/views/pcp/outLink/m_view'),
|
|
18
|
-
meta: {
|
|
19
|
-
checkToken: false,
|
|
20
|
-
},
|
|
21
|
-
hidden: true
|
|
22
|
-
},
|
|
23
|
-
{
|
|
24
|
-
path: '/test_univer',
|
|
25
|
-
component: () => import('@/views/test/test_univer.vue'),
|
|
26
|
-
meta: {
|
|
27
|
-
checkToken: false,
|
|
28
|
-
},
|
|
29
|
-
hidden: true
|
|
30
|
-
},
|
|
31
|
-
{
|
|
32
|
-
path: '/test_luckysheet',
|
|
33
|
-
component: () => import('@/views/test/HelloWorld.vue'),
|
|
34
|
-
meta: {
|
|
35
|
-
checkToken: false,
|
|
36
|
-
},
|
|
37
|
-
hidden: true
|
|
38
|
-
},
|
|
39
|
-
{
|
|
40
|
-
path: '/test_luckysheet2',
|
|
41
|
-
component: () => import('@/views/test/HelloWorld2.vue'),
|
|
42
|
-
meta: {
|
|
43
|
-
checkToken: false,
|
|
44
|
-
},
|
|
45
|
-
hidden: true
|
|
46
|
-
}, */
|
|
47
|
-
|
|
48
|
-
{
|
|
49
|
-
path: "",
|
|
50
|
-
component: () => import("@/layout/index"),
|
|
51
|
-
children: [
|
|
52
|
-
/* {
|
|
53
|
-
path: "/pmd/product/common/product_display/detail/:id",
|
|
54
|
-
component: () =>
|
|
55
|
-
import("@/views/pmd/product/common/product_display/detail"),
|
|
56
|
-
name: "productDisplayEdit",
|
|
57
|
-
meta: {
|
|
58
|
-
title: "产品详情",
|
|
59
|
-
paramField: "id",
|
|
60
|
-
menuUrl: "/pmd/product/common/product_display/detail",
|
|
61
|
-
},
|
|
62
|
-
}, */
|
|
63
|
-
/* {
|
|
64
|
-
path: "/test",
|
|
65
|
-
component: () =>
|
|
66
|
-
import("@/views/test/index"),
|
|
67
|
-
name: "test",
|
|
68
|
-
meta: {
|
|
69
|
-
title: "表格复制粘贴",
|
|
70
|
-
},
|
|
71
|
-
},
|
|
72
|
-
{
|
|
73
|
-
path: "/test1",
|
|
74
|
-
component: () =>
|
|
75
|
-
import("@/views/test/index1"),
|
|
76
|
-
name: "test1",
|
|
77
|
-
meta: {
|
|
78
|
-
title: "甘特图",
|
|
79
|
-
},
|
|
80
|
-
},
|
|
81
|
-
{
|
|
82
|
-
path: "/testQrcode",
|
|
83
|
-
component: () =>
|
|
84
|
-
import("@/views/test/testQrcode"),
|
|
85
|
-
name: "test1",
|
|
86
|
-
meta: {
|
|
87
|
-
title: "测试二维码",
|
|
88
|
-
},
|
|
89
|
-
},
|
|
90
|
-
{
|
|
91
|
-
path: "/test_gantt",
|
|
92
|
-
component: () =>
|
|
93
|
-
import("@/views/test/test_gatt"),
|
|
94
|
-
name: "board_project:index",
|
|
95
|
-
meta: {
|
|
96
|
-
title: "测试甘特图",
|
|
97
|
-
},
|
|
98
|
-
},
|
|
99
|
-
|
|
100
|
-
{
|
|
101
|
-
path: "/test_univer2",
|
|
102
|
-
component: () =>
|
|
103
|
-
import("@/views/test/test_univer2.vue"),
|
|
104
|
-
name: "test_univer2",
|
|
105
|
-
meta: {
|
|
106
|
-
title: "测试excel",
|
|
107
|
-
},
|
|
108
|
-
}, */
|
|
109
|
-
|
|
110
|
-
// {
|
|
111
|
-
// path: "/test_table",
|
|
112
|
-
// component: () =>
|
|
113
|
-
// import("@/views/test/handsontable/index1.vue"),
|
|
114
|
-
// name: "test_table",
|
|
115
|
-
// meta: {
|
|
116
|
-
// title: "测试表格",
|
|
117
|
-
// },
|
|
118
|
-
// },
|
|
119
|
-
],
|
|
120
|
-
},
|
|
121
|
-
|
|
122
|
-
/*{
|
|
123
|
-
path: "",
|
|
124
|
-
component: () => import("@/layout/index"),
|
|
125
|
-
children: []
|
|
126
|
-
}*/
|
|
127
|
-
/*{
|
|
128
|
-
path: "/test",
|
|
129
|
-
component: () => import("@/views/test/excelImport.vue"),
|
|
130
|
-
hidden: true
|
|
131
|
-
},
|
|
132
|
-
{
|
|
133
|
-
path: "/test2",
|
|
134
|
-
component: () => import("@/views/test/test2.vue"),
|
|
135
|
-
hidden: true
|
|
136
|
-
},*/
|
|
137
|
-
/*{
|
|
138
|
-
path: "/barcode",
|
|
139
|
-
component: () => import("@/views/test/barcode/test.vue"),
|
|
140
|
-
hidden: true
|
|
141
|
-
},*/
|
|
142
|
-
];
|
|
1
|
+
export const constantRoutes = [
|
|
2
|
+
/*{
|
|
3
|
+
path: "",
|
|
4
|
+
component: () => import("@/layout/index"),
|
|
5
|
+
children: []
|
|
6
|
+
}*/
|
|
7
|
+
];
|
|
8
|
+
|
|
@@ -223,10 +223,10 @@ export default {
|
|
|
223
223
|
* 返回农历y年一整年的总天数
|
|
224
224
|
* @param lunar Year
|
|
225
225
|
* @return Number
|
|
226
|
-
* @eg:
|
|
226
|
+
* @eg:var count = calendar.lYearDays(1987) ;//count=387
|
|
227
227
|
*/
|
|
228
228
|
lYearDays: function (y) {
|
|
229
|
-
|
|
229
|
+
var i,
|
|
230
230
|
sum = 348
|
|
231
231
|
for (i = 0x8000; i > 0x8; i >>= 1) {
|
|
232
232
|
sum += this.lunarInfo[y - 1900] & i ? 1 : 0
|
|
@@ -238,7 +238,7 @@ export default {
|
|
|
238
238
|
* 返回农历y年闰月是哪个月;若y年没有闰月 则返回0
|
|
239
239
|
* @param lunar Year
|
|
240
240
|
* @return Number (0-12)
|
|
241
|
-
* @eg:
|
|
241
|
+
* @eg:var leapMonth = calendar.leapMonth(1987) ;//leapMonth=6
|
|
242
242
|
*/
|
|
243
243
|
leapMonth: function (y) {
|
|
244
244
|
//闰字编码 \u95f0
|
|
@@ -249,7 +249,7 @@ export default {
|
|
|
249
249
|
* 返回农历y年闰月的天数 若该年没有闰月则返回0
|
|
250
250
|
* @param lunar Year
|
|
251
251
|
* @return Number (0、29、30)
|
|
252
|
-
* @eg:
|
|
252
|
+
* @eg:var leapMonthDay = calendar.leapDays(1987) ;//leapMonthDay=29
|
|
253
253
|
*/
|
|
254
254
|
leapDays: function (y) {
|
|
255
255
|
if (this.leapMonth(y)) {
|
|
@@ -262,7 +262,7 @@ export default {
|
|
|
262
262
|
* 返回农历y年m月(非闰月)的总天数,计算m为闰月时的天数请使用leapDays方法
|
|
263
263
|
* @param lunar Year
|
|
264
264
|
* @return Number (-1、29、30)
|
|
265
|
-
* @eg:
|
|
265
|
+
* @eg:var MonthDay = calendar.monthDays(1987,9) ;//MonthDay=29
|
|
266
266
|
*/
|
|
267
267
|
monthDays: function (y, m) {
|
|
268
268
|
if (m > 12 || m < 1) {
|
|
@@ -275,13 +275,13 @@ export default {
|
|
|
275
275
|
* 返回公历(!)y年m月的天数
|
|
276
276
|
* @param solar Year
|
|
277
277
|
* @return Number (-1、28、29、30、31)
|
|
278
|
-
* @eg:
|
|
278
|
+
* @eg:var solarMonthDay = calendar.leapDays(1987) ;//solarMonthDay=30
|
|
279
279
|
*/
|
|
280
280
|
solarDays: function (y, m) {
|
|
281
281
|
if (m > 12 || m < 1) {
|
|
282
282
|
return -1
|
|
283
283
|
} //若参数错误 返回-1
|
|
284
|
-
|
|
284
|
+
var ms = m - 1
|
|
285
285
|
if (ms == 1) {
|
|
286
286
|
//2月份的闰平规律测算后确认返回28或29
|
|
287
287
|
return (y % 4 == 0 && y % 100 != 0) || y % 400 == 0 ? 29 : 28
|
|
@@ -296,8 +296,8 @@ export default {
|
|
|
296
296
|
* @return Cn string
|
|
297
297
|
*/
|
|
298
298
|
toGanZhiYear: function (lYear) {
|
|
299
|
-
|
|
300
|
-
|
|
299
|
+
var ganKey = (lYear - 3) % 10
|
|
300
|
+
var zhiKey = (lYear - 3) % 12
|
|
301
301
|
if (ganKey == 0) ganKey = 10 //如果余数为0则为最后一个天干
|
|
302
302
|
if (zhiKey == 0) zhiKey = 12 //如果余数为0则为最后一个地支
|
|
303
303
|
return this.Gan[ganKey - 1] + this.Zhi[zhiKey - 1]
|
|
@@ -310,9 +310,9 @@ export default {
|
|
|
310
310
|
* @return Cn string
|
|
311
311
|
*/
|
|
312
312
|
toAstro: function (cMonth, cDay) {
|
|
313
|
-
|
|
313
|
+
var s =
|
|
314
314
|
'\u9b54\u7faf\u6c34\u74f6\u53cc\u9c7c\u767d\u7f8a\u91d1\u725b\u53cc\u5b50\u5de8\u87f9\u72ee\u5b50\u5904\u5973\u5929\u79e4\u5929\u874e\u5c04\u624b\u9b54\u7faf'
|
|
315
|
-
|
|
315
|
+
var arr = [20, 19, 21, 21, 21, 22, 23, 23, 23, 23, 22, 22]
|
|
316
316
|
return s.substr(cMonth * 2 - (cDay < arr[cMonth - 1] ? 2 : 0), 2) + '\u5ea7' //座
|
|
317
317
|
},
|
|
318
318
|
|
|
@@ -329,7 +329,7 @@ export default {
|
|
|
329
329
|
* 传入公历(!)y年获得该年第n个节气的公历日期
|
|
330
330
|
* @param y公历年(1900-2100);n二十四节气中的第几个节气(1~24);从n=1(小寒)算起
|
|
331
331
|
* @return day Number
|
|
332
|
-
* @eg:
|
|
332
|
+
* @eg:var _24 = calendar.getTerm(1987,3) ;//_24=4;意即1987年2月4日立春
|
|
333
333
|
*/
|
|
334
334
|
getTerm: function (y, n) {
|
|
335
335
|
if (y < 1900 || y > 2100) {
|
|
@@ -338,8 +338,8 @@ export default {
|
|
|
338
338
|
if (n < 1 || n > 24) {
|
|
339
339
|
return -1
|
|
340
340
|
}
|
|
341
|
-
|
|
342
|
-
|
|
341
|
+
var _table = this.sTermInfo[y - 1900]
|
|
342
|
+
var _info = [
|
|
343
343
|
parseInt('0x' + _table.substr(0, 5)).toString(),
|
|
344
344
|
parseInt('0x' + _table.substr(5, 5)).toString(),
|
|
345
345
|
parseInt('0x' + _table.substr(10, 5)).toString(),
|
|
@@ -347,7 +347,7 @@ export default {
|
|
|
347
347
|
parseInt('0x' + _table.substr(20, 5)).toString(),
|
|
348
348
|
parseInt('0x' + _table.substr(25, 5)).toString(),
|
|
349
349
|
]
|
|
350
|
-
|
|
350
|
+
var _calday = [
|
|
351
351
|
_info[0].substr(0, 1),
|
|
352
352
|
_info[0].substr(1, 2),
|
|
353
353
|
_info[0].substr(3, 1),
|
|
@@ -385,14 +385,14 @@ export default {
|
|
|
385
385
|
* 传入农历数字月份返回汉语通俗表示法
|
|
386
386
|
* @param lunar month
|
|
387
387
|
* @return Cn string
|
|
388
|
-
* @eg:
|
|
388
|
+
* @eg:var cnMonth = calendar.toChinaMonth(12) ;//cnMonth='腊月'
|
|
389
389
|
*/
|
|
390
390
|
toChinaMonth: function (m) {
|
|
391
391
|
// 月 => \u6708
|
|
392
392
|
if (m > 12 || m < 1) {
|
|
393
393
|
return -1
|
|
394
394
|
} //若参数错误 返回-1
|
|
395
|
-
|
|
395
|
+
var s = this.nStr3[m - 1]
|
|
396
396
|
s += '\u6708' //加上月字
|
|
397
397
|
return s
|
|
398
398
|
},
|
|
@@ -401,11 +401,11 @@ export default {
|
|
|
401
401
|
* 传入农历日期数字返回汉字表示法
|
|
402
402
|
* @param lunar day
|
|
403
403
|
* @return Cn string
|
|
404
|
-
* @eg:
|
|
404
|
+
* @eg:var cnDay = calendar.toChinaDay(21) ;//cnMonth='廿一'
|
|
405
405
|
*/
|
|
406
406
|
toChinaDay: function (d) {
|
|
407
407
|
//日 => \u65e5
|
|
408
|
-
|
|
408
|
+
var s
|
|
409
409
|
switch (d) {
|
|
410
410
|
case 10:
|
|
411
411
|
s = '\u521d\u5341'
|
|
@@ -429,7 +429,7 @@ export default {
|
|
|
429
429
|
* 年份转生肖[!仅能大致转换] => 精确划分生肖分界线是“立春”
|
|
430
430
|
* @param y year
|
|
431
431
|
* @return Cn string
|
|
432
|
-
* @eg:
|
|
432
|
+
* @eg:var animal = calendar.getAnimal(1987) ;//animal='兔'
|
|
433
433
|
*/
|
|
434
434
|
getAnimal: function (y) {
|
|
435
435
|
return this.Animals[(y - 4) % 12]
|
|
@@ -462,20 +462,19 @@ export default {
|
|
|
462
462
|
return -1
|
|
463
463
|
}
|
|
464
464
|
//未传参 获得当天
|
|
465
|
-
let objDate = null;
|
|
466
465
|
if (!y) {
|
|
467
|
-
objDate = new Date()
|
|
466
|
+
var objDate = new Date()
|
|
468
467
|
} else {
|
|
469
|
-
objDate = new Date(y, parseInt(m) - 1, d)
|
|
468
|
+
var objDate = new Date(y, parseInt(m) - 1, d)
|
|
470
469
|
}
|
|
471
|
-
|
|
472
|
-
|
|
470
|
+
var i,
|
|
471
|
+
leap = 0,
|
|
473
472
|
temp = 0
|
|
474
473
|
//修正ymd参数
|
|
475
|
-
|
|
474
|
+
var y = objDate.getFullYear(),
|
|
476
475
|
m = objDate.getMonth() + 1,
|
|
477
476
|
d = objDate.getDate()
|
|
478
|
-
|
|
477
|
+
var offset =
|
|
479
478
|
(Date.UTC(objDate.getFullYear(), objDate.getMonth(), objDate.getDate()) -
|
|
480
479
|
Date.UTC(1900, 0, 31)) /
|
|
481
480
|
86400000
|
|
@@ -489,7 +488,7 @@ export default {
|
|
|
489
488
|
}
|
|
490
489
|
|
|
491
490
|
//是否今天
|
|
492
|
-
|
|
491
|
+
var isTodayObj = new Date(),
|
|
493
492
|
isToday = false
|
|
494
493
|
if (
|
|
495
494
|
isTodayObj.getFullYear() == y &&
|
|
@@ -499,16 +498,16 @@ export default {
|
|
|
499
498
|
isToday = true
|
|
500
499
|
}
|
|
501
500
|
//星期几
|
|
502
|
-
|
|
501
|
+
var nWeek = objDate.getDay(),
|
|
503
502
|
cWeek = this.nStr1[nWeek]
|
|
504
503
|
//数字表示周几顺应天朝周一开始的惯例
|
|
505
504
|
if (nWeek == 0) {
|
|
506
505
|
nWeek = 7
|
|
507
506
|
}
|
|
508
507
|
//农历年
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
508
|
+
var year = i
|
|
509
|
+
var leap = this.leapMonth(i) //闰哪个月
|
|
510
|
+
var isLeap = false
|
|
512
511
|
|
|
513
512
|
//效验闰月
|
|
514
513
|
for (i = 1; i < 13 && offset > 0; i++) {
|
|
@@ -540,27 +539,27 @@ export default {
|
|
|
540
539
|
--i
|
|
541
540
|
}
|
|
542
541
|
//农历月
|
|
543
|
-
|
|
542
|
+
var month = i
|
|
544
543
|
//农历日
|
|
545
|
-
|
|
544
|
+
var day = offset + 1
|
|
546
545
|
//天干地支处理
|
|
547
|
-
|
|
548
|
-
|
|
546
|
+
var sm = m - 1
|
|
547
|
+
var gzY = this.toGanZhiYear(year)
|
|
549
548
|
|
|
550
549
|
// 当月的两个节气
|
|
551
550
|
// bugfix-2017-7-24 11:03:38 use lunar Year Param `y` Not `year`
|
|
552
|
-
|
|
553
|
-
|
|
551
|
+
var firstNode = this.getTerm(y, m * 2 - 1) //返回当月「节」为几日开始
|
|
552
|
+
var secondNode = this.getTerm(y, m * 2) //返回当月「节」为几日开始
|
|
554
553
|
|
|
555
554
|
// 依据12节气修正干支月
|
|
556
|
-
|
|
555
|
+
var gzM = this.toGanZhi((y - 1900) * 12 + m + 11)
|
|
557
556
|
if (d >= firstNode) {
|
|
558
557
|
gzM = this.toGanZhi((y - 1900) * 12 + m + 12)
|
|
559
558
|
}
|
|
560
559
|
|
|
561
560
|
//传入的日期的节气与否
|
|
562
|
-
|
|
563
|
-
|
|
561
|
+
var isTerm = false
|
|
562
|
+
var Term = null
|
|
564
563
|
if (firstNode == d) {
|
|
565
564
|
isTerm = true
|
|
566
565
|
Term = this.solarTerm[m * 2 - 2]
|
|
@@ -570,19 +569,19 @@ export default {
|
|
|
570
569
|
Term = this.solarTerm[m * 2 - 1]
|
|
571
570
|
}
|
|
572
571
|
//日柱 当月一日与 1900/1/1 相差天数
|
|
573
|
-
|
|
574
|
-
|
|
572
|
+
var dayCyclical = Date.UTC(y, sm, 1, 0, 0, 0, 0) / 86400000 + 25567 + 10
|
|
573
|
+
var gzD = this.toGanZhi(dayCyclical + d - 1)
|
|
575
574
|
//该日期所属的星座
|
|
576
|
-
|
|
575
|
+
var astro = this.toAstro(m, d)
|
|
577
576
|
|
|
578
|
-
|
|
579
|
-
|
|
577
|
+
var solarDate = y + '-' + (m + '').padStart(2, 0) + '-' + (d + '').padStart(2, 0)
|
|
578
|
+
var lunarDate = year + '-' + month + '-' + day
|
|
580
579
|
|
|
581
|
-
|
|
582
|
-
|
|
580
|
+
var festival = this.festival
|
|
581
|
+
var lfestival = this.getLunarFestival(year, month, day)
|
|
583
582
|
|
|
584
|
-
|
|
585
|
-
|
|
583
|
+
var festivalDate = m + '-' + d
|
|
584
|
+
var lunarFestivalDate = month + '-' + day
|
|
586
585
|
|
|
587
586
|
return {
|
|
588
587
|
isWork: workday.includes(solarDate),
|
|
@@ -628,18 +627,18 @@ export default {
|
|
|
628
627
|
y = parseInt(y)
|
|
629
628
|
m = parseInt(m)
|
|
630
629
|
d = parseInt(d)
|
|
631
|
-
isLeapMonth = !!isLeapMonth
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
630
|
+
var isLeapMonth = !!isLeapMonth
|
|
631
|
+
var leapOffset = 0
|
|
632
|
+
var leapMonth = this.leapMonth(y)
|
|
633
|
+
var leapDay = this.leapDays(y)
|
|
635
634
|
if (isLeapMonth && leapMonth != m) {
|
|
636
635
|
return -1
|
|
637
636
|
} //传参要求计算该闰月公历 但该年得出的闰月与传参的月份并不同
|
|
638
637
|
if ((y == 2100 && m == 12 && d > 1) || (y == 1900 && m == 1 && d < 31)) {
|
|
639
638
|
return -1
|
|
640
639
|
} //超出了最大极限值
|
|
641
|
-
|
|
642
|
-
|
|
640
|
+
var day = this.monthDays(y, m)
|
|
641
|
+
var _day = day
|
|
643
642
|
//bugFix 2016-9-25
|
|
644
643
|
//if month is leap, _day use leapDays method
|
|
645
644
|
if (isLeapMonth) {
|
|
@@ -650,13 +649,13 @@ export default {
|
|
|
650
649
|
} //参数合法性效验
|
|
651
650
|
|
|
652
651
|
//计算农历的时间差
|
|
653
|
-
|
|
654
|
-
for (
|
|
652
|
+
var offset = 0
|
|
653
|
+
for (var i = 1900; i < y; i++) {
|
|
655
654
|
offset += this.lYearDays(i)
|
|
656
655
|
}
|
|
657
|
-
|
|
656
|
+
var leap = 0,
|
|
658
657
|
isAdd = false
|
|
659
|
-
for (
|
|
658
|
+
for (var i = 1; i < m; i++) {
|
|
660
659
|
leap = this.leapMonth(y)
|
|
661
660
|
if (!isAdd) {
|
|
662
661
|
//处理闰月
|
|
@@ -672,11 +671,11 @@ export default {
|
|
|
672
671
|
offset += day
|
|
673
672
|
}
|
|
674
673
|
//1900年农历正月一日的公历时间为1900年1月30日0时0分0秒(该时间也是本农历的最开始起始点)
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
|
|
674
|
+
var stmap = Date.UTC(1900, 1, 30, 0, 0, 0)
|
|
675
|
+
var calObj = new Date((offset + d - 31) * 86400000 + stmap)
|
|
676
|
+
var cY = calObj.getUTCFullYear()
|
|
677
|
+
var cM = calObj.getUTCMonth() + 1
|
|
678
|
+
var cD = calObj.getUTCDate()
|
|
680
679
|
return `${cY}${cM}${cD}`
|
|
681
680
|
// return this.solar2lunar(cY, cM, cD)
|
|
682
681
|
},
|