diff --git a/src/app.js b/src/app.js index dbc109ed..d8732f68 100644 --- a/src/app.js +++ b/src/app.js @@ -1,11 +1,14 @@ var start = true; window.eruptSiteConfig = { domain: "", - fileDomain: "https://oos.erupt.xyz", + fileDomain: "", title: "Erupt Framework", desc: "通用后台管理框架", dialogLogin: false, copyright: true, //是否保留显示版权信息 + // copyrightTxt: () => { + // return "x_x_x"; + // }, logoPath: null, loginLogoPath: null, logoText: "Erupt", @@ -61,14 +64,6 @@ window.eruptSiteConfig = { }; window.eruptRouterEvent = { - login: { - load() { - console.log("in login page"); - }, - unload() { - console.log("out login page"); - } - }, // $: { // load(e) { // // console.log('load', e) @@ -77,14 +72,6 @@ window.eruptRouterEvent = { // // console.log("unload ", e) // } // }, - EruptDict: { - load(e) { - console.log(e) - }, - unload(e) { - console.log("unload ", e) - } - } } let eruptEvent = { diff --git a/src/app/build/bi/chart-table/chart-table.component.less b/src/app/build/bi/chart-table/chart-table.component.less index 7116e3ce..7cb06271 100644 --- a/src/app/build/bi/chart-table/chart-table.component.less +++ b/src/app/build/bi/chart-table/chart-table.component.less @@ -20,3 +20,25 @@ } } } + +[data-theme='dark'] { + :host { + ::ng-deep { + table { + tr { + td, th { + color: #dcdcdc !important; + color: rgba(0, 0, 0, 0.65); + font-size: 14px; + line-height: 1; + border: 1px solid #333; + } + + &:hover { + + } + } + } + } + } +} diff --git a/src/app/build/erupt/view/table/table.component.html b/src/app/build/erupt/view/table/table.component.html index 871d5b0a..1a105c60 100644 --- a/src/app/build/erupt/view/table/table.component.html +++ b/src/app/build/erupt/view/table/table.component.html @@ -60,7 +60,7 @@ @@ -77,7 +77,7 @@ -
+
@@ -102,7 +102,7 @@ @@ -113,7 +113,7 @@
- + diff --git a/src/app/build/erupt/view/table/table.component.ts b/src/app/build/erupt/view/table/table.component.ts index 5cf838a1..b443f3c3 100644 --- a/src/app/build/erupt/view/table/table.component.ts +++ b/src/app/build/erupt/view/table/table.component.ts @@ -261,6 +261,9 @@ export class TableComponent implements OnInit { } query(page?: number, size?: number, sort?: object) { + if (!this.eruptBuildModel.power.query) { + return; + } let query = {}; query["condition"] = this.dataHandler.eruptObjectToCondition( this.dataHandler.searchEruptToObject({ @@ -812,7 +815,6 @@ export class TableComponent implements OnInit { this.showTable = true; this.eruptBuildModel.eruptModel.eruptJson.linkTree.value = event; this.searchErupt.eruptJson.linkTree.value = event; - console.log(this.dataPage) this.query(1); } diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts index 3e1c7a18..c4b80373 100644 --- a/src/app/core/startup/startup.service.ts +++ b/src/app/core/startup/startup.service.ts @@ -29,7 +29,7 @@ export class StartupService { } async load(): Promise { - console.group(WindowModel.copyright ? "Erupt All rights reserved." : WindowModel.title); + console.group(WindowModel.title); console.log("%c" + " __ \n" + " /\\ \\__ \n" + @@ -39,8 +39,8 @@ export class StartupService { "\\ \\____\\\\ \\_\\ \\ \\____/ \\ \\ ,__/ \\ \\__\\\n" + " \\/____/ \\/_/ \\/___/ \\ \\ \\/ \\/__/\n" + " \\ \\_\\ \n" + - " \\/_/ ", "color:#2196f3;font-weight:800"); - console.log("%chttps://www.erupt.xyz", "color:#2196f3;font-size:1.3em;padding:16px 0;"); + " \\/_/ \n" + + "https://www.erupt.xyz", "color:#2196f3;font-weight:800"); console.groupEnd(); (window as any).eruptWebSuccess = true; await new Promise((resolve) => { diff --git a/src/app/layout/erupt/erupt.component.less b/src/app/layout/erupt/erupt.component.less index 0a11d022..9dd77259 100644 --- a/src/app/layout/erupt/erupt.component.less +++ b/src/app/layout/erupt/erupt.component.less @@ -92,7 +92,7 @@ height: 44px; padding: 0 16px; background: #fff; - border-top: 1px solid #e5e5e5; + //border-top: 1px solid #efffff; border-bottom: 1px solid #e5e5e5; //box-shadow: 0 1px 10px rgb(0 0 0 / 20%); } diff --git a/src/app/layout/passport/passport.component.html b/src/app/layout/passport/passport.component.html index fb7bd503..6f5c2771 100644 --- a/src/app/layout/passport/passport.component.html +++ b/src/app/layout/passport/passport.component.html @@ -19,8 +19,13 @@

{{'login.account_pwd_login'|t - 2018 - {{nowYear}} - Erupt Framework  All rights reserved. + + {{copyrightTxt}} + + + 2018 - {{nowYear}} + Erupt Framework  All rights reserved. + diff --git a/src/app/layout/passport/passport.component.ts b/src/app/layout/passport/passport.component.ts index 43b35569..00dd8d39 100644 --- a/src/app/layout/passport/passport.component.ts +++ b/src/app/layout/passport/passport.component.ts @@ -19,7 +19,16 @@ export class LayoutPassportComponent implements AfterViewInit { copyright = WindowModel.copyright; + copyrightTxt = WindowModel.copyrightTxt; + constructor(private modalSrv: NzModalService) { + if (WindowModel.copyrightTxt) { + if (typeof (WindowModel.copyrightTxt) === 'function') { + this.copyrightTxt = WindowModel.copyrightTxt(); + } else { + this.copyrightTxt = WindowModel.copyrightTxt; + } + } } ngAfterViewInit(): void { diff --git a/src/app/shared/component/i18n.component.ts b/src/app/shared/component/i18n.component.ts index 965b4fb9..b1b90be3 100644 --- a/src/app/shared/component/i18n.component.ts +++ b/src/app/shared/component/i18n.component.ts @@ -46,7 +46,6 @@ export class HeaderI18nComponent { this.langs.push(lang); } } - console.log(this.langs) } change(lang: string): void { diff --git a/src/app/shared/model/window.model.ts b/src/app/shared/model/window.model.ts index 1871d043..a7019a5d 100644 --- a/src/app/shared/model/window.model.ts +++ b/src/app/shared/model/window.model.ts @@ -21,12 +21,12 @@ export class WindowModel { public static loginLogoPath: string = WindowModel.config["loginLogoPath"] === '' ? null : (WindowModel.config["loginLogoPath"] || WindowModel.logoPath); public static logoText: string = WindowModel.config["logoText"] || ""; - //注册页面地址 - public static registerPage: string = WindowModel.config["registerPage"] || undefined; - public static dialogLogin: boolean = WindowModel.config["dialogLogin"] || false; + public static registerPage: string = WindowModel.config["registerPage"] || undefined; //注册页面地址 - public static copyright: boolean = WindowModel.config["copyright"] !== false; + public static copyright: boolean = WindowModel.config["copyright"]; + + public static copyrightTxt: any = WindowModel.config["copyrightTxt"]; //授权文本 public static upload: Function = WindowModel.config["upload"] || false; diff --git a/src/index.html b/src/index.html index 5e6dcf06..e2cbd894 100644 --- a/src/index.html +++ b/src/index.html @@ -12,7 +12,8 @@ - + +