diff --git a/nav.config.yaml b/nav.config.yaml index 40843bf7c72..e2dac7bd871 100644 --- a/nav.config.yaml +++ b/nav.config.yaml @@ -9,7 +9,7 @@ # 仓库地址,填写 Fork 后的仓库地址,支持 Gitee / GitHub # 作者 Gitee 仓库地址 https://gitee.com/xiejiahe/nav -gitRepoUrl: https://github.com/xjh22222228/nav +gitRepoUrl: https://github.com/nuo-ai/nav # Fork 部署分支 branch: main diff --git a/scripts/start.mjs b/scripts/start.mjs index f36eedcd228..4aaafca94fb 100644 --- a/scripts/start.mjs +++ b/scripts/start.mjs @@ -120,6 +120,7 @@ try { type: 4, id: -4, url: 'https://gcore.jsdelivr.net/gh/xjh22222228/public@gh-pages/nav/component1.jpg', + go: '', text: '只有认可,才能强大', } if (idx >= 0) { @@ -183,6 +184,20 @@ try { } else { components.push(html) } + idx = components.findIndex((item) => item.type === 7) + const holiday = { + type: 7, + id: -7, + items: [], + } + if (idx >= 0) { + components[idx] = { + ...holiday, + ...components[idx], + } + } else { + components.push(holiday) + } fs.writeFileSync(componentPath, JSON.stringify(components)) } diff --git a/scripts/util.mjs b/scripts/util.mjs index 86b0e0f4d8c..d770ef59b87 100644 --- a/scripts/util.mjs +++ b/scripts/util.mjs @@ -78,6 +78,7 @@ export function setWeb(nav, settings, tags = []) { if (typeof item.icon === 'string' && item.icon.startsWith('icon')) { item.icon = '' } + item.icon = replaceJsdelivrCDN(item.icon, settings) } function formatDate(item) { diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 3c527b42579..e0f245f0c59 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -79,6 +79,8 @@ import { CountdownComponent } from '../components/countdown/index.component' import { CountdownDrawerComponent } from '../components/countdown/drawer/index.component' import { HTMLComponent } from '../components/html/index.component' import { HTMLDrawerComponent } from '../components/html/drawer/index.component' +import { HolidayComponent } from '../components/holiday/index.component' +import { HolidayDrawerComponent } from '../components/holiday/drawer/index.component' import LightComponent from '../view/light/index.component' import SuperComponent from '../view/super/index.component' @@ -175,6 +177,8 @@ const icons: IconDefinition[] = [ CountdownDrawerComponent, HTMLComponent, HTMLDrawerComponent, + HolidayComponent, + HolidayDrawerComponent, OffWorkDrawerComponent, CalendarDrawerComponent, ComponentGroupComponent, diff --git a/src/assets/img/component/rest.svg b/src/assets/img/component/rest.svg deleted file mode 100644 index bb2fae54547..00000000000 --- a/src/assets/img/component/rest.svg +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/src/assets/img/component/runtime.svg b/src/assets/img/component/runtime.svg deleted file mode 100644 index 646e11104f9..00000000000 --- a/src/assets/img/component/runtime.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/components/calendar/index.component.scss b/src/components/calendar/index.component.scss index e4a66280623..b28b3c070d4 100644 --- a/src/components/calendar/index.component.scss +++ b/src/components/calendar/index.component.scss @@ -1,7 +1,6 @@ .calendar { width: 130px; height: var(--componentHeight); - max-width: 100%; max-height: 100%; border-radius: 12px; text-align: center; diff --git a/src/components/calendar/index.component.ts b/src/components/calendar/index.component.ts index 8b593fb4ef3..240b57d5711 100644 --- a/src/components/calendar/index.component.ts +++ b/src/components/calendar/index.component.ts @@ -15,14 +15,14 @@ export class CalendarComponent { @Input() data!: IComponentProps date = '' - day = 0 + day = '' week = '' dayOfYear = 0 constructor() { const date = getDateTime() this.date = `${date.year}年${date.month}月` - this.day = date.date + this.day = date.zeroDate this.week = date.dayText this.dayOfYear = getDayOfYear() } diff --git a/src/components/component-group/index.component.html b/src/components/component-group/index.component.html index 8aa4ea00822..93fd3405a22 100644 --- a/src/components/component-group/index.component.html +++ b/src/components/component-group/index.component.html @@ -15,6 +15,7 @@ [data]="item" [class.hidden]="!item['html']" /> + diff --git a/src/components/component-group/index.component.scss b/src/components/component-group/index.component.scss index 15bcf466739..fa008634fcc 100644 --- a/src/components/component-group/index.component.scss +++ b/src/components/component-group/index.component.scss @@ -21,15 +21,21 @@ user-select: none; column-gap: 15px; justify-content: flex-start; + max-width: 100%; &.directionCol { flex-wrap: wrap; justify-content: center; row-gap: 15px; overflow-x: hidden; + ::ng-deep { + > .ng-star-inserted, + .citems { + max-width: 100%; + } + } } ::ng-deep { > .ng-star-inserted { - max-width: 100%; animation-duration: 0.5s; animation-fill-mode: both; animation-name: zoomInDown; diff --git a/src/components/countdown/index.component.scss b/src/components/countdown/index.component.scss index e19d70663e4..7b9f81dbf04 100644 --- a/src/components/countdown/index.component.scss +++ b/src/components/countdown/index.component.scss @@ -2,7 +2,6 @@ position: relative; width: 160px; height: var(--componentHeight); - max-width: 100%; max-height: 100%; border-radius: 12px; overflow: hidden; diff --git a/src/components/create-web/index.component.html b/src/components/create-web/index.component.html index 16be5d81a88..1f2008f50fb 100644 --- a/src/components/create-web/index.component.html +++ b/src/components/create-web/index.component.html @@ -35,7 +35,6 @@ @@ -132,7 +131,6 @@