w-web-sso 1.0.13 → 1.0.15

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.
Files changed (76) hide show
  1. package/db/wsso/ips/data.mdb +0 -0
  2. package/db/wsso/ips/lock.mdb +0 -0
  3. package/db/wsso/tokens/data.mdb +0 -0
  4. package/db/wsso/tokens/lock.mdb +0 -0
  5. package/db/wsso/users/data.mdb +0 -0
  6. package/db/wsso/users/lock.mdb +0 -0
  7. package/dist/css/{app.03a2f95c.css → app.e4367a2b.css} +1 -1
  8. package/dist/index.tmp +6 -2
  9. package/dist/js/app-legacy.4ebeee34.js +2 -0
  10. package/dist/js/app-legacy.4ebeee34.js.map +1 -0
  11. package/dist/js/app.d1707f92.js +2 -0
  12. package/dist/js/app.d1707f92.js.map +1 -0
  13. package/dist/js/chunk-vendors-legacy.7380957a.js +15 -0
  14. package/dist/js/chunk-vendors-legacy.7380957a.js.map +1 -0
  15. package/dist/js/chunk-vendors.7380957a.js +15 -0
  16. package/dist/js/chunk-vendors.7380957a.js.map +1 -0
  17. package/dist/w-web-sso.umd.js +2 -2
  18. package/dist/w-web-sso.umd.js.map +1 -1
  19. package/docs/WWebSso.html +4 -112
  20. package/docs/WWebSso.mjs.html +460 -111
  21. package/docs/index.html +1 -1
  22. package/g.getSettings.mjs +0 -1
  23. package/g.initialData.mjs +8 -10
  24. package/g.mjs +0 -0
  25. package/package.json +7 -6
  26. package/public/index.html +13 -0
  27. package/server/WWebSso.mjs +459 -110
  28. package/server/procCore.mjs +871 -277
  29. package/server/procProtect.mjs +746 -0
  30. package/server/procStaInfor.mjs +393 -0
  31. package/server/provideUsers.mjs +0 -1
  32. package/server/srlog.mjs +12 -0
  33. package/server/staLogs/staIp.callWorker.mjs +35 -0
  34. package/server/staLogs/staIp.mjs +118 -0
  35. package/server/staLogs/staIp.shellWorker.mjs +18 -0
  36. package/server/staLogs/staToken.callWorker.mjs +35 -0
  37. package/server/staLogs/staToken.mjs +118 -0
  38. package/server/staLogs/staToken.shellWorker.mjs +18 -0
  39. package/server/staLogs/staUserAccountLogin.callWorker.mjs +35 -0
  40. package/server/staLogs/staUserAccountLogin.mjs +136 -0
  41. package/server/staLogs/staUserAccountLogin.shellWorker.mjs +18 -0
  42. package/server/staLogs/test_staIp.mjs +27 -0
  43. package/server/staLogs/test_staToken.mjs +27 -0
  44. package/server/staLogs/test_staUserAccountLogin.mjs +30 -0
  45. package/settings.json +15 -1
  46. package/src/components/Layout.vue +70 -15
  47. package/src/components/LayoutContent.vue +35 -33
  48. package/src/components/LayoutContentIps.vue +757 -0
  49. package/src/components/LayoutContentStaInfor.vue +917 -0
  50. package/src/components/LayoutContentTokens.vue +961 -0
  51. package/src/components/{LayoutContentInfor.vue → LayoutContentUserInfor.vue} +366 -73
  52. package/src/components/LayoutContentUsers.vue +21 -34
  53. package/src/components/PageLogin.vue +1 -1
  54. package/src/components/VeUser.vue.txt +9 -10
  55. package/src/components/ruleGroup.vue.txt +5 -6
  56. package/src/main.js +7 -13
  57. package/src/plugins/mLang.mjs +853 -520
  58. package/src/plugins/mShare.mjs +141 -3
  59. package/src/plugins/mUI.mjs +30 -21
  60. package/src/schema/index.mjs +2 -0
  61. package/src/schema/tables/ips.mjs +0 -9
  62. package/src/schema/tables/tokens.mjs +5 -1
  63. package/src/schema/tables/users.mjs +2 -14
  64. package/src/store/mutations.mjs +3 -3
  65. package/src/store/types.mjs +1 -1
  66. package/srv.mjs +55 -38
  67. package/_/350/246/217/345/212/203.md +0 -275
  68. package/dist/js/app-legacy.d468ef7f.js +0 -2
  69. package/dist/js/app-legacy.d468ef7f.js.map +0 -1
  70. package/dist/js/app.d468ef7f.js +0 -2
  71. package/dist/js/app.d468ef7f.js.map +0 -1
  72. package/dist/js/chunk-vendors-legacy.f51f58bb.js +0 -13
  73. package/dist/js/chunk-vendors-legacy.f51f58bb.js.map +0 -1
  74. package/dist/js/chunk-vendors.f51f58bb.js +0 -13
  75. package/dist/js/chunk-vendors.f51f58bb.js.map +0 -1
  76. package/src/components/LayoutContentSettings.vue +0 -1248
@@ -10,21 +10,29 @@
10
10
  v-if="!isLoading && !errMsg"
11
11
  >
12
12
 
13
- <div style="padding:20px;">
13
+ <div style="padding:40px;">
14
+
14
15
 
15
16
  <div style="display:flex; align-items:center;">
16
17
 
17
- <div style="display:inline-block; padding:0px; border:1px solid #ddd; border-radius:50%;">
18
+ <div style="display:inline-block; padding:0px; _border:1px solid #ddd; border-radius:50%;" v-if="false">
18
19
  <svg xmlns="http://www.w3.org/2000/svg" width="120" height="120" viewBox="0 0 24 24"><path fill="currentColor" d="M6.196 17.485q1.275-.918 2.706-1.451Q10.332 15.5 12 15.5t3.098.534t2.706 1.45q.99-1.025 1.593-2.42Q20 13.667 20 12q0-3.325-2.337-5.663T12 4T6.337 6.338T4 12q0 1.667.603 3.064q.603 1.396 1.593 2.42m5.805-4.984q-1.264 0-2.133-.868T9 9.501t.868-2.133T12 6.5t2.132.868T15 9.5t-.868 2.132t-2.131.868M12 21q-1.883 0-3.525-.701t-2.858-1.916t-1.916-2.858T3 12t.701-3.525t1.916-2.858q1.216-1.215 2.858-1.916T12 3t3.525.701t2.858 1.916t1.916 2.858T21 12t-.701 3.525t-1.916 2.858q-1.216 1.215-2.858 1.916T12 21m0-1q1.383 0 2.721-.484q1.338-.483 2.313-1.324q-.974-.783-2.255-1.237T12 16.5t-2.789.445t-2.246 1.247q.975.84 2.314 1.324T12 20m0-8.5q.842 0 1.421-.579T14 9.5t-.579-1.421T12 7.5t-1.421.579T10 9.5t.579 1.421T12 11.5m0 6.75"/></svg>
19
20
  </div>
20
21
 
21
- <div style="padding-left:20px;">
22
+ <div
23
+ style="display:inline-block; padding:0px; _border:1px solid #ddd; border-radius:50%;"
24
+ v-if="userLogo"
25
+ >
26
+ <img style="width:120px; height:120px;" :src="userLogo" />
27
+ </div>
28
+
29
+ <div style="padding-left:15px;">
22
30
 
23
31
  <div style="font-size:3.0rem;">
24
32
  {{$ui.gv(user,'name')}}
25
33
  </div>
26
34
 
27
- <div style="font-size:1.5rem;">
35
+ <div style="margin-top:-5px; padding-left:2px; font-size:1.5rem;">
28
36
  {{$ui.gv(user,'account')}}
29
37
  </div>
30
38
 
@@ -32,9 +40,194 @@
32
40
 
33
41
  </div>
34
42
 
35
- <div style="padding-top:20px;"></div>
36
43
 
37
- <div style="">
44
+ <div class="pt-6 space-y-8">
45
+
46
+ <!-- 帳號狀態區塊:RWD 網格佈局,會根據螢幕寬度自動調整欄數 -->
47
+ <div>
48
+
49
+ <div class="mb-2 text-xs text-gray-500">{{$t('userStatus')}}</div>
50
+
51
+ <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
52
+
53
+ <!-- 帳號封鎖 -->
54
+ <div v-show="false">
55
+ {{$t('isBlocked')}}
56
+ </div>
57
+ <div :class="`status-${isBlocked?'danger':'success'} flex items-center p-3 rounded-lg`">
58
+ <i :class="`mdi ${isBlocked?'mdi-lock':'mdi-lock-open-variant'} mdi-24px mr-3 flex-shrink-0`"></i>
59
+ <div>
60
+ <div class="font-semibold">
61
+ {{isBlocked?$t('isBlockedY'):$t('isBlockedN')}}
62
+ </div>
63
+ <div :class="`text-xs text-${isBlocked?'red':'green'}-800/80`">
64
+ {{
65
+ isBlocked
66
+ ?
67
+ timeBlockedToDay===''
68
+ ?
69
+ $t('unknow')
70
+ :
71
+ $t('to')+' '+timeBlockedToDay
72
+ :
73
+ $t('isBlockedNormalStatus')
74
+ }}
75
+ </div>
76
+ </div>
77
+ </div>
78
+
79
+ <!-- 帳號過期 -->
80
+ <div v-show="false">
81
+ {{$t('isExpired')}}
82
+ {{$t('timeExpired')}}
83
+ </div>
84
+ <div :class="`status-${isExpired?'danger':'success'} flex items-center p-3 rounded-lg`">
85
+ <i :class="`mdi ${isExpired?'mdi-calendar-lock':'mdi-calendar-check'} mdi-24px mr-3 flex-shrink-0`"></i>
86
+ <div>
87
+ <div class="font-semibold">
88
+ {{isExpired?$t('isExpiredY'):$t('isExpiredN')}}
89
+ </div>
90
+ <div :class="`text-xs text-${isExpired?'red':'green'}-800/80`">
91
+ {{
92
+ isExpired
93
+ ?
94
+ $t('isExpiredDeny')
95
+ :
96
+ timeExpiredToDay===''
97
+ ?
98
+ $t('isExpiredNever')
99
+ :
100
+ $t('to')+' '+timeExpiredToDay
101
+ }}
102
+ </div>
103
+ </div>
104
+ </div>
105
+
106
+ <!-- 帳號驗證 -->
107
+ <div v-show="false">
108
+ {{$t('isVerified')}}
109
+ {{$t('timeVerified')}}
110
+ </div>
111
+ <div :class="`status-${isVerified?'success':'danger'} flex items-center p-3 rounded-lg`">
112
+ <i :class="`mdi ${isVerified?'mdi-check-decagram':'mdi-alert-decagram-outline'} mdi-24px mr-3 flex-shrink-0`"></i>
113
+ <div>
114
+ <div class="font-semibold">
115
+ {{isVerified?$t('isVerifiedY'):$t('isVerifiedN')}}
116
+ </div>
117
+ <div :class="`text-xs text-${isVerified?'green':'red'}-800/80`">
118
+ {{
119
+ isVerified
120
+ ?
121
+ timeVerifiedToDay===''
122
+ ?
123
+ $t('unknow')
124
+ :
125
+ $t('at')+' '+timeVerifiedToDay
126
+ :
127
+ $t('isVerifiedWaiting')
128
+ }}
129
+ </div>
130
+ </div>
131
+ </div>
132
+
133
+ <!-- 帳號有效 -->
134
+ <div v-show="false">
135
+ {{$t('isActive')}}
136
+ </div>
137
+ <div :class="`status-${$ui.gv(user,'isActive','')==='y'?'success':'danger'} flex items-center p-3 rounded-lg`">
138
+ <i :class="`mdi ${$ui.gv(user,'isActive','')==='y'?'mdi-toggle-switch':'mdi-toggle-switch-off-outline'} mdi-24px mr-3 flex-shrink-0`"></i>
139
+ <div>
140
+ <div class="font-semibold">
141
+ {{$ui.gv(user,'isActive','')==='y'?$t('isActiveY'):$t('isActiveN')}}
142
+ </div>
143
+ <div :class="`text-xs text-${$ui.gv(user,'isActive','')==='y'?'green':'red'}-800/80`">
144
+ {{$ui.gv(user,'isActive','')==='y'?$t('isActiveMsgY'):$t('isActiveMsgN')}}
145
+ </div>
146
+ </div>
147
+ </div>
148
+
149
+ </div>
150
+ </div>
151
+
152
+ <!-- 詳細資訊區塊:同樣採用 RWD 網格佈局 -->
153
+ <div>
154
+
155
+ <div class="grid grid-cols-1 md:grid-cols-2 gap-x-8 gap-y-6 pt-6 border-t border-gray-200">
156
+
157
+ <!-- 帳號 -->
158
+ <div class="flex items-start gap-3">
159
+ <i class="mdi mdi-account-circle text-gray-400 mdi-20px mt-1 flex-shrink-0"></i>
160
+ <div>
161
+ <div class="text-sm text-gray-500">{{$t('account')}}</div>
162
+ <div class="text-base font-medium text-gray-900">
163
+ {{$ui.gv(user,'account')}}
164
+ </div>
165
+ </div>
166
+ </div>
167
+
168
+ <!-- 描述 -->
169
+ <div class="flex items-start gap-3">
170
+ <i class="mdi mdi-comment-text-outline text-gray-400 mdi-20px mt-1 flex-shrink-0"></i>
171
+ <div>
172
+ <div class="text-sm text-gray-500">{{$t('description')}}</div>
173
+ <div class="text-base font-medium text-gray-900">
174
+ {{$ui.gv(user,'description')}}
175
+ </div>
176
+ </div>
177
+ </div>
178
+
179
+ <!-- 電子郵件 -->
180
+ <div class="flex items-start gap-3">
181
+ <i class="mdi mdi-email-outline text-gray-400 mdi-20px mt-1 flex-shrink-0"></i>
182
+ <div>
183
+ <div class="text-sm text-gray-500">{{$t('email')}}</div>
184
+ <div class="inline-block text-base bg-gray-100 mt-1 px-2 py-1 rounded-md text-gray-700 break-all text-sm">
185
+ {{$ui.gv(user,'email')}}
186
+ </div>
187
+ </div>
188
+ </div>
189
+
190
+ <!-- 來源 -->
191
+ <div class="flex items-start gap-3">
192
+ <i class="mdi mdi-source-branch text-gray-400 mdi-20px mt-1 flex-shrink-0"></i>
193
+ <div>
194
+ <div class="text-sm text-gray-500">{{$t('from')}}</div>
195
+ <div class="inline-block text-base bg-gray-100 mt-1 px-2 py-1 rounded-md text-gray-700 break-all text-sm">
196
+ {{$ui.gv(user,'from')}}
197
+ </div>
198
+ </div>
199
+ </div>
200
+
201
+ <!-- 身份 -->
202
+ <div class="flex items-start gap-3">
203
+ <i class="mdi mdi-id-card text-gray-400 mdi-20px mt-1 flex-shrink-0"></i>
204
+ <div>
205
+ <div class="text-sm text-gray-500">{{$t('userRole')}}</div>
206
+ <div class="inline-block text-base bg-blue-100 mt-1 px-2 py-1 rounded-md text-blue-700 break-all text-sm">
207
+ {{$ui.gv(user,'isAdmin','')==='y'?$t('userRoleAdmin'):$t('userRoleGeneral')}}
208
+ </div>
209
+ </div>
210
+ </div>
211
+
212
+ <!-- 登入後轉址 -->
213
+ <div class="flex items-start gap-3 md:col-span-2">
214
+ <i class="mdi mdi-link-variant text-gray-400 mdi-20px mt-1 flex-shrink-0"></i>
215
+ <div>
216
+ <div class="text-sm text-gray-500">{{$t('redir')}}</div>
217
+ <div class="inline-block text-base bg-gray-100 mt-1 px-2 py-1 rounded-md text-gray-700 break-all text-sm">
218
+ {{$ui.gv(user,'redir')}}
219
+ </div>
220
+ </div>
221
+ </div>
222
+
223
+ </div>
224
+
225
+ </div>
226
+
227
+ </div>
228
+
229
+
230
+ <div v-if="false">
38
231
 
39
232
  <WPanelLabelItem
40
233
  style="padding:5px 0px;"
@@ -208,7 +401,7 @@
208
401
 
209
402
  <WPanelLabelItem
210
403
  style="padding:5px 0px;"
211
- :label="$t('timeBlocked')"
404
+ :label="$t('userTimeBlocked')"
212
405
  >
213
406
  <template v-slot:item>
214
407
 
@@ -259,6 +452,7 @@
259
452
 
260
453
  </div>
261
454
 
455
+
262
456
  </div>
263
457
 
264
458
  </div>
@@ -281,36 +475,16 @@
281
475
  </template>
282
476
 
283
477
  <script>
284
- import { mdiAccountCircleOutline, mdiAccountPlusOutline, mdiCheckboxMarkedCircle, mdiChessRook } from '@mdi/js/mdi.js'
478
+ import { mdiAccountCircleOutline } from '@mdi/js/mdi.js'
285
479
  import ot from 'dayjs'
286
480
  import get from 'lodash-es/get.js'
287
- import each from 'lodash-es/each.js'
288
- import keys from 'lodash-es/keys.js'
289
- import sortBy from 'lodash-es/sortBy.js'
290
- import find from 'lodash-es/find.js'
291
- import size from 'lodash-es/size.js'
292
- import groupBy from 'lodash-es/groupBy.js'
293
- import genID from 'wsemi/src/genID.mjs'
294
- import isestr from 'wsemi/src/isestr.mjs'
295
- import iseobj from 'wsemi/src/iseobj.mjs'
296
- import istimeTZ from 'wsemi/src/istimeTZ.mjs'
297
- import waitFun from 'wsemi/src/waitFun.mjs'
298
- import WIcon from 'w-component-vue/src/components/WIcon.vue'
299
- import WButtonChip from 'w-component-vue/src/components/WButtonChip.vue'
300
- import WSwitch from 'w-component-vue/src/components/WSwitch.vue'
301
- import WText from 'w-component-vue/src/components/WText.vue'
481
+ import istimemsTZ from 'wsemi/src/istimemsTZ.mjs'
302
482
  import WPanelLabelItem from 'w-component-vue/src/components/WPanelLabelItem.vue'
303
- import WPanelScrolly from 'w-component-vue/src/components/WPanelScrolly.vue'
304
483
 
305
484
 
306
485
  export default {
307
486
  components: {
308
- WIcon,
309
- WButtonChip,
310
- WSwitch,
311
- WText,
312
487
  WPanelLabelItem,
313
- WPanelScrolly,
314
488
  },
315
489
  props: {
316
490
  },
@@ -350,6 +524,18 @@ export default {
350
524
  vo.$fapi.getUserByToken(token)
351
525
  .then((res) => {
352
526
  // console.log(res)
527
+ // if (Math.random() < 0.5) {
528
+ // res.timeBlocked = '2026-01-01T00:00:00.000+08:00'
529
+ // }
530
+ // if (Math.random() < 0.5) {
531
+ // res.timeExpired = '2020-01-01T00:00:00.000+08:00'
532
+ // }
533
+ // if (Math.random() < 0.5) {
534
+ // res.timeVerified = ''
535
+ // }
536
+ // if (Math.random() < 0.5) {
537
+ // res.isActive = 'n'
538
+ // }
353
539
  vo.user = res
354
540
  })
355
541
  .catch((err) => {
@@ -368,38 +554,112 @@ export default {
368
554
  return get(vo, `$store.state.userToken`)
369
555
  },
370
556
 
557
+ userLogo: function() {
558
+ let vo = this
559
+ return get(vo, `$store.state.webInfor.userLogo`, '')
560
+ },
561
+
371
562
  isVerified: function() {
372
563
  let vo = this
373
564
 
565
+ //user
566
+ let user = get(vo, 'user')
567
+
568
+ //getIsVerified
569
+ let b = vo.$s.getIsVerified(user)
570
+
571
+ return b
572
+
573
+ // //timeVerified
574
+ // let timeVerified = get(vo, 'user.timeVerified', '')
575
+ // // console.log('timeVerified', timeVerified)
576
+
577
+ // // //check
578
+ // // if (istimemsTZ(timeVerified)) {
579
+ // // return true //有驗證時間, 代表已驗證
580
+ // // }
581
+
582
+ // // //tt
583
+ // // let tt = ot(timeVerified, 'YYYY-MM-DDTHH:mm:ss.SSSZ')
584
+ // // // console.log('tt', tt)
585
+
586
+ // // //tn
587
+ // // let tn = ot()
588
+
589
+ // // //tds
590
+ // // let tds = tt.diff(tn, 'second')
591
+ // // // console.log('tds', tds)
592
+
593
+ // // //check
594
+ // // if (tds > 0) {
595
+ // // return false
596
+ // // }
597
+
598
+ // return istimemsTZ(timeVerified) //有驗證時間, 代表已驗證
599
+ },
600
+
601
+ timeVerifiedToDay: function() {
602
+ let vo = this
603
+
374
604
  //timeVerified
375
605
  let timeVerified = get(vo, 'user.timeVerified', '')
376
606
  // console.log('timeVerified', timeVerified)
377
607
 
378
608
  //check
379
- if (!istimeTZ(timeVerified)) {
380
- return true
609
+ if (!istimemsTZ(timeVerified)) {
610
+ return '' //無驗證時間, 代表未驗證
381
611
  }
382
612
 
383
613
  //tt
384
- let tt = ot(timeVerified, 'YYYY-MM-DDTHH:mm:ssZ')
614
+ let tt = ot(timeVerified, 'YYYY-MM-DDTHH:mm:ss.SSSZ')
385
615
  // console.log('tt', tt)
386
616
 
387
- //tn
388
- let tn = ot()
617
+ //t
618
+ let t = tt.format('YYYY-MM-DD')
389
619
 
390
- //tds
391
- let tds = tt.diff(tn, 'second')
392
- // console.log('tds', tds)
620
+ return t
621
+ },
393
622
 
394
- //check
395
- if (tds > 0) {
396
- return false
397
- }
623
+ isExpired: function() {
624
+ let vo = this
625
+
626
+ //user
627
+ let user = get(vo, 'user')
628
+
629
+ //getIsExpired
630
+ let b = vo.$s.getIsExpired(user)
631
+
632
+ return b
633
+
634
+ // //timeExpired
635
+ // let timeExpired = get(vo, 'user.timeExpired', '')
636
+ // // console.log('timeExpired', timeExpired)
637
+
638
+ // //check
639
+ // if (!istimemsTZ(timeExpired)) {
640
+ // return false //無過期時間, 代表未過期
641
+ // }
642
+
643
+ // // //tt
644
+ // // let tt = ot(timeExpired, 'YYYY-MM-DDTHH:mm:ss.SSSZ')
645
+ // // // console.log('tt', tt)
646
+
647
+ // //tn
648
+ // let tn = ot().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
649
+
650
+ // // //tds
651
+ // // let tds = tt.diff(tn, 'second')
652
+ // // // console.log('tds', tds)
653
+
654
+ // // //check
655
+ // // if (tn > timeExpired) {
656
+ // // return true
657
+ // // }
398
658
 
399
- return true
659
+ // return tn >= timeExpired //現在時間>=過期時間, 代表已過期
400
660
  },
401
661
 
402
- isExpired: function() {
662
+ timeExpiredToDay: function() {
403
663
  let vo = this
404
664
 
405
665
  //timeExpired
@@ -407,30 +667,60 @@ export default {
407
667
  // console.log('timeExpired', timeExpired)
408
668
 
409
669
  //check
410
- if (!istimeTZ(timeExpired)) {
411
- return true
670
+ if (!istimemsTZ(timeExpired)) {
671
+ return '' //無過期時間, 代表未過期
412
672
  }
413
673
 
414
674
  //tt
415
- let tt = ot(timeExpired, 'YYYY-MM-DDTHH:mm:ssZ')
675
+ let tt = ot(timeExpired, 'YYYY-MM-DDTHH:mm:ss.SSSZ')
416
676
  // console.log('tt', tt)
417
677
 
418
- //tn
419
- let tn = ot()
678
+ //t
679
+ let t = tt.format('YYYY-MM-DD')
420
680
 
421
- //tds
422
- let tds = tt.diff(tn, 'second')
423
- // console.log('tds', tds)
681
+ return t
682
+ },
424
683
 
425
- //check
426
- if (tds > 0) {
427
- return false
428
- }
684
+ isBlocked: function() {
685
+ let vo = this
686
+
687
+ //user
688
+ let user = get(vo, 'user')
689
+
690
+ //getIsBlocked
691
+ let b = vo.$s.getIsBlocked(user)
692
+
693
+ return b
694
+
695
+ // //timeBlocked
696
+ // let timeBlocked = get(vo, 'user.timeBlocked', '')
697
+ // // console.log('timeBlocked', timeBlocked)
698
+
699
+ // //check
700
+ // if (!istimemsTZ(timeBlocked)) {
701
+ // return false //無封鎖時間, 代表未封鎖
702
+ // }
703
+
704
+ // // //tt
705
+ // // let tt = ot(timeBlocked, 'YYYY-MM-DDTHH:mm:ss.SSSZ')
706
+ // // // console.log('tt', tt)
429
707
 
430
- return true
708
+ // //tn
709
+ // let tn = ot().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
710
+
711
+ // // //tds
712
+ // // let tds = tt.diff(tn, 'second')
713
+ // // // console.log('tds', tds)
714
+
715
+ // // //check
716
+ // // if (tn > timeBlocked) {
717
+ // // return false
718
+ // // }
719
+
720
+ // return tn <= timeBlocked //現在時間<=封鎖時間, 代表封鎖中
431
721
  },
432
722
 
433
- isBlocked: function() {
723
+ timeBlockedToDay: function() {
434
724
  let vo = this
435
725
 
436
726
  //timeBlocked
@@ -438,27 +728,18 @@ export default {
438
728
  // console.log('timeBlocked', timeBlocked)
439
729
 
440
730
  //check
441
- if (!istimeTZ(timeBlocked)) {
442
- return true
731
+ if (!istimemsTZ(timeBlocked)) {
732
+ return '' //無封鎖時間, 代表未封鎖
443
733
  }
444
734
 
445
735
  //tt
446
- let tt = ot(timeBlocked, 'YYYY-MM-DDTHH:mm:ssZ')
736
+ let tt = ot(timeBlocked, 'YYYY-MM-DDTHH:mm:ss.SSSZ')
447
737
  // console.log('tt', tt)
448
738
 
449
- //tn
450
- let tn = ot()
451
-
452
- //tds
453
- let tds = tt.diff(tn, 'second')
454
- // console.log('tds', tds)
455
-
456
- //check
457
- if (tds > 0) {
458
- return false
459
- }
739
+ //t
740
+ let t = tt.format('YYYY-MM-DD')
460
741
 
461
- return true
742
+ return t
462
743
  },
463
744
 
464
745
  // users: function() {
@@ -586,7 +867,7 @@ export default {
586
867
  // }
587
868
 
588
869
  // //save
589
- // await vo.$fapi.users.insert(u) //bbb 待改為後端fun
870
+ // await vo.$fapi.users.insert(u)
590
871
  // .catch((err) => {
591
872
  // errTemp = err
592
873
  // })
@@ -721,4 +1002,16 @@ export default {
721
1002
  </script>
722
1003
 
723
1004
  <style scoped>
1005
+ .status-danger {
1006
+ background-color: #fef2f2; color: #b91c1c; border: 1px solid #fecaca;
1007
+ }
1008
+ .status-warning {
1009
+ background-color: #fffbeb; color: #b45309; border: 1px solid #fde68a;
1010
+ }
1011
+ .status-success {
1012
+ background-color: #f0fdf4; color: #15803d; border: 1px solid #bbf7d0;
1013
+ }
1014
+ .status-info {
1015
+ background-color: #f8fafc; color: #475569; border: 1px solid #e2e8f0;
1016
+ }
724
1017
  </style>