= {
_restTitle: '休息标题',
_image: '图片',
_text: '文本',
+ _countdown: '倒数',
+ _dateColor: '日期颜色',
+ _timeColor: '时间颜色',
+ _date: '日期',
+ _time: '时间',
}
export default zhCN
diff --git a/src/types/index.ts b/src/types/index.ts
index 3409cfa23a..00d2d95cea 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -20,7 +20,7 @@ export enum ComponentType {
OffWork = 2,
Runtime = 3,
Image = 4,
- Holiday = 5,
+ Countdown = 5,
}
export interface IComponentProps {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 4e07eacdd1..73aee02653 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -391,6 +391,7 @@ export function isMobile() {
return 'ontouchstart' in window
}
+// 今年第几天
export function getDayOfYear() {
const now = new Date()
const startOfYear = new Date(now.getFullYear(), 0, 0)
diff --git a/src/utils/mitt.ts b/src/utils/mitt.ts
index 2e4acfd393..ea3abc7cd7 100644
--- a/src/utils/mitt.ts
+++ b/src/utils/mitt.ts
@@ -1,4 +1,6 @@
// 开源项目，未经作者同意，不得以抄袭/复制代码/修改源代码版权信息。
+// Copyright @ 2018-present xiejiahe. All rights reserved.
+// See https://github.com/xjh22222228/nav
import mitt from 'mitt'
export default mitt()
diff --git a/src/view/system/component/index.component.html b/src/view/system/component/index.component.html
index 0ad3014346..7ebf348deb 100644
--- a/src/view/system/component/index.component.html
+++ b/src/view/system/component/index.component.html
@@ -19,6 +19,7 @@
+
@@ -47,3 +48,4 @@
+
diff --git a/src/view/system/component/index.component.ts b/src/view/system/component/index.component.ts
index e5e0863615..2e90bbe5cb 100644
--- a/src/view/system/component/index.component.ts
+++ b/src/view/system/component/index.component.ts
@@ -14,8 +14,10 @@ import { CalendarDrawerComponent } from 'src/components/calendar/drawer/index.co
import { RuntimeDrawerComponent } from 'src/components/runtime/drawer/index.component'
import { OffWorkDrawerComponent } from 'src/components/off-work/drawer/index.component'
import { ImageDrawerComponent } from 'src/components/image/drawer/index.component'
+import { CountdownDrawerComponent } from 'src/components/countdown/drawer/index.component'
import { componentTitleMap } from './types'
import { isSelfDevelop } from 'src/utils/util'
+import event from 'src/utils/mitt'
@Component({
selector: 'system-component',
@@ -27,6 +29,7 @@ export default class SystemComponentComponent {
@ViewChild('runtime') runtimeChild!: RuntimeDrawerComponent
@ViewChild('offwork') offworkChild!: OffWorkDrawerComponent
@ViewChild('image') imageChild!: ImageDrawerComponent
+ @ViewChild('countdown') countdownChild!: CountdownDrawerComponent
$t = $t
isSelfDevelop = isSelfDevelop
@@ -67,10 +70,11 @@ export default class SystemComponentComponent {
handleEdit(data: any, idx: number) {
const type = data.type
const types: Record = {
- 1: this.calendarChild,
- 2: this.offworkChild,
- 3: this.runtimeChild,
- 4: this.imageChild,
+ [ComponentType.Calendar]: this.calendarChild,
+ [ComponentType.OffWork]: this.offworkChild,
+ [ComponentType.Runtime]: this.runtimeChild,
+ [ComponentType.Image]: this.imageChild,
+ [ComponentType.Countdown]: this.countdownChild,
}
types[type]?.open(data, idx)
}
@@ -92,6 +96,7 @@ export default class SystemComponentComponent {
...this.components[index],
...values,
}
+ event.emit('COMPONENT_OK')
}
handleSubmit() {
diff --git a/src/view/system/component/types.ts b/src/view/system/component/types.ts
index 83ea041c55..a7c8b40058 100644
--- a/src/view/system/component/types.ts
+++ b/src/view/system/component/types.ts
@@ -10,4 +10,5 @@ export const componentTitleMap: Record = {
[ComponentType.OffWork]: $t('_offWork'),
[ComponentType.Runtime]: $t('_runtime'),
[ComponentType.Image]: $t('_image'),
+ [ComponentType.Countdown]: $t('_countdown'),
}
diff --git a/src/view/system/setting/index.component.html b/src/view/system/setting/index.component.html
index 66bcca55b1..4660a28056 100644
--- a/src/view/system/setting/index.component.html
+++ b/src/view/system/setting/index.component.html
@@ -55,6 +55,10 @@
{{ $t('_imageCDN') }}
+
+