提交 1eb4edea 编写于 作者: X xjh22222228

fix: createdAt & templateRef

上级 dd3f160b
因为 它太大了无法显示 source diff 。你可以改为 查看blob
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
> >
<a [href]="dataSource.url" target="_blank" rel="noreferer noopener"> <a [href]="dataSource.url" target="_blank" rel="noreferer noopener">
<nz-card-meta <nz-card-meta
[nzTitle]="dataSource.name" [nzTitle]="title"
[nzDescription]="dataSource.desc" [nzDescription]="description"
[nzAvatar]="avatarTemplate" [nzAvatar]="avatarTemplate"
> >
</nz-card-meta> </nz-card-meta>
...@@ -23,7 +23,10 @@ ...@@ -23,7 +23,10 @@
</nz-card> </nz-card>
<ng-template #title> <ng-template #title>
<h3 [innerHTML]="dataSource.title"></h3> <div [innerHTML]="dataSource.name"></div>
</ng-template>
<ng-template #description>
<div [innerHTML]="dataSource.desc"></div>
</ng-template> </ng-template>
<ng-template #avatarTemplate> <ng-template #avatarTemplate>
<app-logo [src]="dataSource.icon" [name]="dataSource.name"></app-logo> <app-logo [src]="dataSource.icon" [name]="dataSource.name"></app-logo>
......
...@@ -114,6 +114,9 @@ export class CreateComponent implements OnInit { ...@@ -114,6 +114,9 @@ export class CreateComponent implements OnInit {
} }
handleOk() { handleOk() {
const now = new Date()
const createdAt = now.toISOString()
try { try {
if (!this.isLogin) { if (!this.isLogin) {
return this.login(); return this.login();
...@@ -146,6 +149,7 @@ export class CreateComponent implements OnInit { ...@@ -146,6 +149,7 @@ export class CreateComponent implements OnInit {
this.websiteList.push({ this.websiteList.push({
title, title,
icon, icon,
createdAt,
nav: [] nav: []
}) })
break break
...@@ -163,6 +167,7 @@ export class CreateComponent implements OnInit { ...@@ -163,6 +167,7 @@ export class CreateComponent implements OnInit {
this.websiteList[findIdx].nav.push({ this.websiteList[findIdx].nav.push({
title, title,
icon, icon,
createdAt,
nav: [] nav: []
}) })
break break
...@@ -182,6 +187,7 @@ export class CreateComponent implements OnInit { ...@@ -182,6 +187,7 @@ export class CreateComponent implements OnInit {
this.websiteList[oIdx].nav[tIdx].nav.unshift({ this.websiteList[oIdx].nav[tIdx].nav.unshift({
title, title,
icon, icon,
createdAt,
nav: [] nav: []
}) })
break break
...@@ -202,6 +208,7 @@ export class CreateComponent implements OnInit { ...@@ -202,6 +208,7 @@ export class CreateComponent implements OnInit {
name: title, name: title,
icon, icon,
url, url,
createdAt,
desc desc
}) })
break break
......
...@@ -6,6 +6,7 @@ export type ThemeType = ...@@ -6,6 +6,7 @@ export type ThemeType =
export interface INavFourProp { export interface INavFourProp {
icon?: string | null icon?: string | null
createdAt?: string
name: string name: string
desc: string desc: string
url?: string url?: string
...@@ -17,6 +18,7 @@ export interface INavFourProp { ...@@ -17,6 +18,7 @@ export interface INavFourProp {
export interface INavThreeProp { export interface INavThreeProp {
title?: string title?: string
icon?: string | null icon?: string | null
createdAt?: string
showSideIcon?: boolean showSideIcon?: boolean
collapsed?: boolean collapsed?: boolean
nav: INavFourProp[] nav: INavFourProp[]
...@@ -25,6 +27,7 @@ export interface INavThreeProp { ...@@ -25,6 +27,7 @@ export interface INavThreeProp {
export interface INavTwoProp { export interface INavTwoProp {
title?: string title?: string
icon?: string | null icon?: string | null
createdAt?: string
collapsed?: boolean collapsed?: boolean
nav: INavThreeProp[] nav: INavThreeProp[]
} }
...@@ -33,6 +36,7 @@ export interface INavProps extends Object { ...@@ -33,6 +36,7 @@ export interface INavProps extends Object {
title: string title: string
id?: number id?: number
icon?: string | null icon?: string | null
createdAt?: string
nav: INavTwoProp[] nav: INavTwoProp[]
} }
......
...@@ -167,15 +167,18 @@ export function queryString() { ...@@ -167,15 +167,18 @@ export function queryString() {
} }
export function adapterWebsiteList(websiteList: any[], parentItem?: any) { export function adapterWebsiteList(websiteList: any[], parentItem?: any) {
const now = new Date()
for (let i = 0; i < websiteList.length; i++) { for (let i = 0; i < websiteList.length; i++) {
const item = websiteList[i] const item = websiteList[i]
item.createdAt ||= now.toISOString()
if (Array.isArray(item.nav)) { if (Array.isArray(item.nav)) {
adapterWebsiteList(item.nav, item) adapterWebsiteList(item.nav, item)
} }
if (item.url) { if (item.url) {
if (!item.icon && parentItem.icon) { if (!item.icon && parentItem?.icon) {
item.icon = parentItem.icon item.icon = parentItem.icon
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册