= {
_time: '时间',
_workHours: '工作时间',
_breakTime: '休息时间',
+ _holiday: '节假日',
}
export default zhCN
diff --git a/src/types/index.ts b/src/types/index.ts
index 5dbd7528977..1d822650cec 100644
--- a/src/types/index.ts
+++ b/src/types/index.ts
@@ -22,6 +22,7 @@ export enum ComponentType {
Image = 4,
Countdown = 5,
HTML = 6,
+ Holiday = 7,
}
export interface IComponentProps {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 73aee02653c..ffc144ff3ad 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -402,7 +402,7 @@ export function getDayOfYear() {
}
export function getDateTime() {
- const days = $t('_weeks')
+ const weeks = $t('_weeks')
const now = new Date()
const year = now.getFullYear()
const hours = addZero(now.getHours())
@@ -411,6 +411,7 @@ export function getDateTime() {
const month = now.getMonth() + 1
const date = now.getDate()
const day = now.getDay()
+ const zeroDate = addZero(date)
return {
year,
hours,
@@ -418,7 +419,8 @@ export function getDateTime() {
seconds,
month,
date,
- dayText: days[day],
+ zeroDate,
+ dayText: weeks[day],
} as const
}
diff --git a/src/view/light/index.component.scss b/src/view/light/index.component.scss
index d7513e9ba22..1a31a6d83e9 100644
--- a/src/view/light/index.component.scss
+++ b/src/view/light/index.component.scss
@@ -44,7 +44,7 @@
overflow: hidden;
}
.component-box {
- width: 250px;
+ width: 320px;
overflow: hidden;
overflow-y: auto;
}
diff --git a/src/view/side/index.component.scss b/src/view/side/index.component.scss
index 71aaf249e5c..5e3e05b8910 100644
--- a/src/view/side/index.component.scss
+++ b/src/view/side/index.component.scss
@@ -1,6 +1,7 @@
@media (max-width: 768px) {
.content {
padding-right: 12px !important;
+ padding-left: 10px !important;
}
.sider {
--menuTitleWidth: 85px;
diff --git a/src/view/sim/index.component.scss b/src/view/sim/index.component.scss
index 033f9323800..434d8b6b1ed 100644
--- a/src/view/sim/index.component.scss
+++ b/src/view/sim/index.component.scss
@@ -142,7 +142,8 @@
}
.sim-component {
- width: var(--width);
+ min-width: var(--width);
+ max-width: 100%;
margin: 0 auto;
}
diff --git a/src/view/super/index.component.scss b/src/view/super/index.component.scss
index fe7c7e33f8e..857041c8afe 100644
--- a/src/view/super/index.component.scss
+++ b/src/view/super/index.component.scss
@@ -109,7 +109,8 @@
}
.component-box {
- width: var(--width);
+ min-width: var(--width);
+ max-width: 100%;
margin: 10px auto -10px;
}
diff --git a/src/view/system/component/index.component.html b/src/view/system/component/index.component.html
index c8c89017b2e..658696afa49 100644
--- a/src/view/system/component/index.component.html
+++ b/src/view/system/component/index.component.html
@@ -21,6 +21,7 @@
+
@@ -51,3 +52,4 @@
+
diff --git a/src/view/system/component/index.component.ts b/src/view/system/component/index.component.ts
index 44a9c3ca5d7..e0cac5bf7be 100644
--- a/src/view/system/component/index.component.ts
+++ b/src/view/system/component/index.component.ts
@@ -16,6 +16,7 @@ import { OffWorkDrawerComponent } from 'src/components/off-work/drawer/index.com
import { ImageDrawerComponent } from 'src/components/image/drawer/index.component'
import { CountdownDrawerComponent } from 'src/components/countdown/drawer/index.component'
import { HTMLDrawerComponent } from 'src/components/html/drawer/index.component'
+import { HolidayDrawerComponent } from 'src/components/holiday/drawer/index.component'
import { componentTitleMap } from './types'
import { isSelfDevelop } from 'src/utils/util'
import event from 'src/utils/mitt'
@@ -32,6 +33,7 @@ export default class SystemComponentComponent {
@ViewChild('image') imageChild!: ImageDrawerComponent
@ViewChild('countdown') countdownChild!: CountdownDrawerComponent
@ViewChild('html') htmlChild!: HTMLDrawerComponent
+ @ViewChild('holiday') holidayChild!: HolidayDrawerComponent
$t = $t
isSelfDevelop = isSelfDevelop
@@ -78,6 +80,7 @@ export default class SystemComponentComponent {
[ComponentType.Image]: this.imageChild,
[ComponentType.Countdown]: this.countdownChild,
[ComponentType.HTML]: this.htmlChild,
+ [ComponentType.Holiday]: this.holidayChild,
}
types[type]?.open(data, idx)
}
diff --git a/src/view/system/component/types.ts b/src/view/system/component/types.ts
index 96d0ca28d59..04b1aed2b82 100644
--- a/src/view/system/component/types.ts
+++ b/src/view/system/component/types.ts
@@ -12,4 +12,5 @@ export const componentTitleMap: Record = {
[ComponentType.Image]: $t('_image'),
[ComponentType.Countdown]: $t('_countdown'),
[ComponentType.HTML]: 'HTML',
+ [ComponentType.Holiday]: $t('_holiday'),
}
diff --git a/src/view/system/web/index.component.html b/src/view/system/web/index.component.html
index b3b6e53a7a2..17a5b16b972 100644
--- a/src/view/system/web/index.component.html
+++ b/src/view/system/web/index.component.html
@@ -20,15 +20,14 @@
{{ $t('_backup') }}
-