test/postcat
1
0
Fork 0
mirror of https://gitee.com/eolink_admin/postcat.git synced 2024-11-29 18:28:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "feat: eo-ng-button"

Browse Source 
This reverts commit 5b4a96aa47.
This commit is contained in:
scarqin 2022-11-16 17:29:19 +08:00
parent 5b4a96aa47
commit 5f7ab0deae
45 changed files with 10552 additions and 60566 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49529
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

1
src/workbench/browser/angular.json
View File

@ -31,7 +31,6 @@
],
"styles": [
{ "input": "src/assets/theme/classic_forest.scss", "bundleName": "classic_forest", "inject": false },
"src/assets/theme/eoui.less",
"src/assets/theme/antd.less",
"src/styles.scss",
"src/assets/font/iconfont.css",

4
src/workbench/browser/elements/button.ts
View File

@ -55,12 +55,12 @@ export class Button extends Render implements buttonType {
type: 'element',
imports: [
{
target: [{ name: 'EoNgButtonModule', type: 'module' }],
target: [{ name: 'NzButtonModule', type: 'module' }],
from: 'ng-zorro-antd/button',
},
...this.children.imports,
],
template: `<button eo-ng-button [nzLoading]="is${this.id}BtnLoading" ${this.attr.join(' ')} class="${this.class.join(
template: `<button nz-button [nzLoading]="is${this.id}BtnLoading" ${this.attr.join(' ')} class="${this.class.join(
' '
)}" nzType="${this.type || 'primary'}" ${this.theme} ${this.eventCb.join(' ')} i18n>${label}</button>`,
data: [{ name: `is${this.id}BtnLoading`, init: false, type: ['boolean'] }],

3
src/workbench/browser/package.json
View File

@ -36,7 +36,6 @@
"@micro-zoe/micro-app": "1.0.0-alpha.9",
"@ngxs/store": "3.7.4",
"ajv": "8.11.0",
"eo-ng-button": "0.0.52",
"js-beautify": "1.14.4",
"lodash-es": "4.17.21",
"markdown-it": "13.0.1",
@ -95,4 +94,4 @@
"chrome 98"
],
"__npminstall_done": false
}
}

2
src/workbench/browser/src/app/core/services/web/download-client.component.ts
View File

@ -5,7 +5,7 @@ import { WebService } from 'eo/workbench/browser/src/app/core/services';
selector: 'eo-download-client',
template: `
<span i18n>Don't have Eoapi Client?</span>
<a eo-ng-button nzType="link" nz-dropdown [nzDropdownMenu]="download" i18n> Download </a>.
<a nz-button nzType="link" nz-dropdown [nzDropdownMenu]="download" i18n> Download </a>.
<nz-dropdown-menu #download="nzDropdownMenu">
<ul nz-menu>
<ng-container *ngFor="let item of resourceInfo; let index = index">

4
src/workbench/browser/src/app/eoui/eoui.module.ts
View File

@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { NzTableModule } from 'ng-zorro-antd/table';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzInputModule } from 'ng-zorro-antd/input';
import { NzSelectModule } from 'ng-zorro-antd/select';
@ -14,7 +14,7 @@ import { EoMessageComponent } from './message/eo-message.component';
import { CellDirective } from './table/eo-table/cell.directive';
import { EoIconparkIconModule } from 'eo/workbench/browser/src/app/eoui/iconpark-icon/eo-iconpark-icon.module';
const antdModules = [NzTableModule, EoNgButtonModule, NzInputModule, NzSelectModule];
const antdModules = [NzTableModule, NzButtonModule, NzInputModule, NzSelectModule];
@NgModule({
declarations: [EoTableComponent, EoMessageComponent, CellDirective],

4
src/workbench/browser/src/app/pages/account.component.ts
View File

@ -23,7 +23,7 @@ import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-m
<section class="">
<button
eo-ng-button
nz-button
[nzLoading]="isSaveUsernameBtnLoading"
type="submit"
class="w-[84px]"
@ -76,7 +76,7 @@ import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-m
<section class="">
<button
eo-ng-button
nz-button
[nzLoading]="isResetBtnBtnLoading"
type="submit"
class="w-[84px]"

13
src/workbench/browser/src/app/pages/api/api.component.html
View File

@ -83,7 +83,7 @@
<a
*ngIf="!status.isShare"
class="text-sx manager-env"
eo-ng-button
nz-button
nzType="link"
(click)="gotoEnvManager()"
i18n
@ -123,11 +123,7 @@
</p>
<div *ngIf="!web.isWeb || !tab.onlyDestop">
<a *nzTabLink nz-tab-link [routerLink]="['http/' + tab.routerLink]" queryParamsHandling="merge">
{{ tab.title }}
<nz-badge
*ngIf="apiTabComponent.getCurrentTab()?.extends?.hasChanged?.[tab.routerLink]"
nzStatus="success"
></nz-badge
{{ tab.title }} <nz-badge *ngIf="apiTabComponent.getCurrentTab()?.extends?.hasChanged?.[tab.routerLink]" nzStatus="success"></nz-badge
></a>
</div>
</nz-tab>
@ -147,8 +143,7 @@
[ngClass]="{ 'left-line': !activeBar }"
[ngStyle]="{ width: activeBar ? dyWidth + 'px' : '40px' }"
>
<button
type="button"
<div
class="flex items-center justify-center w-[40px] p-2 h-10 env-icon"
[ngClass]="activeBar ? 'active' : ''"
(click)="toggleRightBar()"
@ -158,7 +153,7 @@
nzTooltipTitle="Environment Setting"
>
<eo-iconpark-icon name="instruction"></eo-iconpark-icon>
</button>
</div>
<eo-env *ngIf="activeBar" class="flex-auto" (statusChange)="toggleRightBar(false)"></eo-env>
</div>
</section>

4
src/workbench/browser/src/app/pages/api/api.module.ts
View File

@ -15,7 +15,7 @@ import { SyncApiComponent } from '../../shared/components/sync-api/sync-api.comp
import { ImportApiComponent } from '../../shared/components/import-api/import-api.component';
import { ExtensionSelectComponent } from '../../shared/components/extension-select/extension-select.component';
import { NzRadioModule } from 'ng-zorro-antd/radio';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
import { NzTabsModule } from 'ng-zorro-antd/tabs';
import { NzLayoutModule } from 'ng-zorro-antd/layout';
@ -62,7 +62,7 @@ const COMPONENTS = [
ReactiveFormsModule,
CommonModule,
ApiRoutingModule,
EoNgButtonModule,
NzButtonModule,
NzTabsModule,
NzLayoutModule,
NzTreeModule,

4
src/workbench/browser/src/app/pages/api/group/tree/api-group-tree.component.html
View File

@ -10,8 +10,8 @@
<button
*ngIf="!status.isShare"
nzType="primary"
eo-ng-button
class="flex w-[32px] items-center justify-center ml-3 text-base shrink-0"
nz-button
class="flex w-[20px] items-center justify-center ml-3 text-base shrink-0"
nz-dropdown
[nzDropdownMenu]="menu"
nzPlacement="bottomRight"

2
src/workbench/browser/src/app/pages/api/grpc/grpc.component.html
View File

@ -17,7 +17,7 @@
<nz-form-item>
<nz-form-control>
<button eo-ng-button nzType="primary" [disabled]="!validateForm.valid">Log in</button>
<button nz-button nzType="primary" [disabled]="!validateForm.valid">Log in</button>
</nz-form-control>
</nz-form-item>
</form>

4
src/workbench/browser/src/app/pages/api/http/detail/api-detail.module.ts
View File

@ -6,7 +6,7 @@ import { Ng1Module } from '../../../../ng1/ng1.module';
import { EouiModule } from '../../../../eoui/eoui.module';
import { SharedModule } from '../../../../shared/shared.module';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzTagModule } from 'ng-zorro-antd/tag';
import { NzModalModule } from 'ng-zorro-antd/modal';
import { NzFormModule } from 'ng-zorro-antd/form';
@ -23,7 +23,7 @@ import { NzCollapseModule } from 'ng-zorro-antd/collapse';
import { RouterModule } from '@angular/router';
import { ApiMockComponent } from 'eo/workbench/browser/src/app/pages/api/http/mock/api-mock.component';
const NZ_COMPONETS = [EoNgButtonModule, NzCollapseModule, NzTagModule, NzModalModule, NzFormModule, NzToolTipModule];
const NZ_COMPONETS = [NzButtonModule, NzCollapseModule, NzTagModule, NzModalModule, NzFormModule, NzToolTipModule];
const COMPONENTS = [
ApiDetailComponent,
ApiDetailHeaderComponent,

2
src/workbench/browser/src/app/pages/api/http/edit/api-edit.component.html
View File

@ -1,7 +1,7 @@
<eo-message></eo-message>
<div class="!pt-0 p15">
<div class="top-save-bar">
<button type="submit" eo-ng-button nztype="primary" class="eo_theme_btn_success" (click)="saveApi()" i18n>Save</button>
<button type="submit" nz-button nztype="primary" class="eo_theme_btn_success" (click)="saveApi()" i18n>Save</button>
</div>
<form nz-form [formGroup]="validateForm" [nzLayout]="'vertical'">
<nz-form-label class="mt-4" nzFor="uri" i18n>API Path</nz-form-label>

4
src/workbench/browser/src/app/pages/api/http/edit/api-edit.module.ts
View File

@ -10,7 +10,7 @@ import { ParamsImportModule } from '../../../../shared/components/params-import/
import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
import { NzModalModule } from 'ng-zorro-antd/modal';
import { NzInputModule } from 'ng-zorro-antd/input';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzFormModule } from 'ng-zorro-antd/form';
import { NzSelectModule } from 'ng-zorro-antd/select';
import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select';
@ -37,7 +37,7 @@ const NZ_COMPONETS = [
NzDropDownModule,
NzModalModule,
NzInputModule,
EoNgButtonModule,
NzButtonModule,
NzFormModule,
NzSelectModule,
NzTreeSelectModule,

2
src/workbench/browser/src/app/pages/api/http/edit/body/api-edit-body.component.html
View File

@ -6,7 +6,7 @@
</div>
<span class="flex-shrink mx-0.5 text-gray-200">｜</span>
<!-- <nz-divider nzType="vertical"></nz-divider> -->
<div *ngIf="['formData','json','xml'].includes(bodyType)" class="inline-flex items-center mt-1">
<div *ngIf="['formData','json','xml'].includes(bodyType)" class="inline-flex items-center px-2 mt-1">
<params-import [baseData]="model" [contentType]="bodyType" (baseDataChange)="handleParamsImport($event)"
(beforeHandleImport)="beforeHandleImport($event)" [rootType]="jsonRootType"></params-import>
</div>

10
src/workbench/browser/src/app/pages/api/http/mock/api-mock.component.html
View File

@ -1,6 +1,6 @@
<div>
<ng-container *ngIf="showToolBar">
<button eo-ng-button nzType="primary" (click)="addOrEditModal()" i18n>New Mock</button>
<button nz-button nzType="primary" (click)="addOrEditModal()" i18n>New Mock</button>
</ng-container>
<div class="mt-[20px]">
@ -25,7 +25,7 @@
<ng-template cell="action" let-scope="scope" let-index="index">
<div class="flex">
<a
eo-ng-button
nz-button
nzType="link"
*ngIf="scope.name || scope.url"
[ngSwitch]="scope.createWay"
@ -35,7 +35,7 @@
<span *ngSwitchDefault i18n>Edit</span>
</a>
<a
eo-ng-button
nz-button
nzType="link"
*ngIf="(scope.name || scope.url) && scope.createWay !== 'system'"
nz-popconfirm
@ -80,7 +80,7 @@
</div>
</section>
<div *nzModalFooter class="footer">
<button *ngIf="!isSystemMock" eo-ng-button nzType="primary" i18n (click)="handleSave()">Save</button>
<button eo-ng-button nzType="default" i18n (click)="handleCancel()">Cancel</button>
<button *ngIf="!isSystemMock" nz-button nzType="primary" i18n (click)="handleSave()">Save</button>
<button nz-button nzType="default" i18n (click)="handleCancel()">Cancel</button>
</div>
</nz-modal>

4
src/workbench/browser/src/app/pages/api/http/test/api-test.component.html
View File

@ -37,7 +37,7 @@
/>
</nz-form-control>
</nz-form-item>
<button type="submit" id="btn-test" eo-ng-button nzType="primary" class="ml10 w_100" (click)="clickTest()">
<button type="submit" id="btn-test" nz-button nzType="primary" class="ml10 w_100" (click)="clickTest()">
<span *ngIf="status !== 'testing'" i18n><span>Send</span></span>
<span *ngIf="status === 'testing'" i18n>Abort</span>
<span *ngIf="status === 'testing' && waitSeconds" class="ml-1">{{ waitSeconds }}</span>
@ -48,7 +48,7 @@
!statusS.isShare &&
(!route.snapshot.queryParams.uuid || route.snapshot.queryParams.uuid.includes('history_'))
"
eo-ng-button
nz-button
nzType="default"
(click)="saveApi()"
class="ml10"

4
src/workbench/browser/src/app/pages/api/http/test/api-test.module.ts
View File

@ -10,7 +10,7 @@ import { ParamsImportModule } from '../../../../shared/components/params-import/
import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
import { NzModalModule } from 'ng-zorro-antd/modal';
import { NzInputModule } from 'ng-zorro-antd/input';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzFormModule } from 'ng-zorro-antd/form';
import { NzSelectModule } from 'ng-zorro-antd/select';
import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select';
@ -50,7 +50,7 @@ const NZ_COMPONETS = [
NzDropDownModule,
NzModalModule,
NzInputModule,
EoNgButtonModule,
NzButtonModule,
NzFormModule,
NzSelectModule,
NzTreeSelectModule,

2
src/workbench/browser/src/app/pages/api/http/test/body/api-test-body.component.html
View File

@ -4,7 +4,7 @@
</nz-radio-group>
<nz-divider *ngIf="['formData', 'raw'].includes(bodyType)" nzType="vertical"></nz-divider>
<!-- Import -->
<div *ngIf="['formData'].includes(bodyType)" class="inline-flex items-center">
<div *ngIf="['formData'].includes(bodyType)" class="inline-flex items-center px-2">
<params-import [baseData]="model" [contentType]="bodyType" (baseDataChange)="handleParamsImport($event)">
</params-import>
</div>

8
src/workbench/browser/src/app/pages/api/websocket/websocket.component.html
View File

@ -30,20 +30,20 @@
<button
class="mx-1 w-28"
*ngIf="wsStatus === 'disconnect'"
eo-ng-button
nz-button
nzType="primary"
i18n
(click)="handleConnect('connecting')"
>
Connect
</button>
<button i18n class="mx-1 w-28" *ngIf="wsStatus === 'connecting'" disabled eo-ng-button nzType="default">
<button i18n class="mx-1 w-28" *ngIf="wsStatus === 'connecting'" disabled nz-button nzType="default">
Connecting
</button>
<button
class="mx-1 w-28"
*ngIf="wsStatus === 'connected'"
eo-ng-button
nz-button
nzDanger
i18n
nzType="default"
@ -117,7 +117,7 @@
<nz-option nzValue="json" nzLabel="json"></nz-option>
</nz-select>
<button
eo-ng-button
nz-button
class="mx-1"
nzType="primary"
i18n

4
src/workbench/browser/src/app/pages/api/websocket/websocket.module.ts
View File

@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzInputModule } from 'ng-zorro-antd/input';
import { NzSelectModule } from 'ng-zorro-antd/select';
import { NzTabsModule } from 'ng-zorro-antd/tabs';
@ -16,7 +16,7 @@ import { SharedModule } from 'eo/workbench/browser/src/app/shared/shared.module'
import { ApiSharedModule } from 'eo/workbench/browser/src/app/pages/api/api-shared.module';
import { ApiTestModule } from 'eo/workbench/browser/src/app/pages/api/http/test/api-test.module';
const ANTDS = [EoNgButtonModule, NzInputModule, NzSelectModule, NzTabsModule];
const ANTDS = [NzButtonModule, NzInputModule, NzSelectModule, NzTabsModule];
@NgModule({
imports: [

2
src/workbench/browser/src/app/pages/extension/detail/components/extensions.component.ts
View File

@ -11,7 +11,7 @@ import { NzMessageService } from 'ng-zorro-antd/message';
class="bg-white sticky top-0 py-[10px] border-solid border-0 border-b-[1px] z-10 mb-[3px]"
style="border-color: var(--BORDER)"
>
<button eo-ng-button nzType="primary" (click)="handleSave()">Save</button>
<button nz-button nzType="primary" (click)="handleSave()">Save</button>
</div>
<form nz-form [nzLayout]="'vertical'" [formGroup]="validateForm" class="form">

6
src/workbench/browser/src/app/pages/extension/detail/extension-detail.component.html
View File

@ -2,7 +2,7 @@
<div class="sticky top-0 z-50 px-2 bg-white">
<div class="pb-3 flex justify-between h-[36px]">
<div class="flex items-center">
<a eo-ng-button nzType="link" (click)="backToList()">
<a nz-button nzType="link" (click)="backToList()">
<eo-iconpark-icon name="left" class="anticon" size="16px"></eo-iconpark-icon><span i18n>Back</span>
</a>
<nz-divider nzType="vertical"></nz-divider>
@ -26,7 +26,7 @@
<p class="w-full text-[#888] text-[12px]">{{ extensionDetail.description }}</p>
<div>
<button
eo-ng-button
nz-button
[nzSize]="extensionDetail?.installed ? 'small' : 'default'"
[nzType]="extensionDetail?.installed ? 'default' : 'primary'"
class="mt-[8px]"
@ -84,7 +84,7 @@
<eo-shadow-dom *ngIf="!changeLogNotFound" class="md-preview" [text]="changeLog"> </eo-shadow-dom>
<nz-result nzStatus="info" i18n-nzTitle nzTitle="Changelog failed to load" *ngIf="changeLogNotFound">
<div nz-result-extra>
<button eo-ng-button nzType="primary" i18n (click)="fetchChangelog()">Reacquire</button>
<button nz-button nzType="primary" i18n (click)="fetchChangelog()">Reacquire</button>
</div>
</nz-result>
</nz-skeleton>

4
src/workbench/browser/src/app/pages/extension/extension.module.ts
View File

@ -7,7 +7,7 @@ import { ExtensionComponent } from './extension.component';
import { ExtensionListComponent } from './list/extension-list.component';
import { ExtensionDetailModule } from './detail/extension-detail.module';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzInputModule } from 'ng-zorro-antd/input';
import { NzTabsModule } from 'ng-zorro-antd/tabs';
import { NzDescriptionsModule } from 'ng-zorro-antd/descriptions';
@ -30,7 +30,7 @@ import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
NzTagModule,
NzDescriptionsModule,
NzInputModule,
EoNgButtonModule,
NzButtonModule,
ExtensionRoutingModule,
CommonModule,
NzDividerModule,

4
src/workbench/browser/src/app/pages/extension/list/extension-list.component.html
View File

@ -17,10 +17,10 @@
</div>
<div class="btn-group" *ngIf="type === 'installed'">
<ng-container *ngIf="it.features?.configuration">
<a eo-ng-button nzType="link" i18n>Setting</a>
<a nz-button nzType="link" i18n>Setting</a>
<nz-divider nzType="vertical"></nz-divider>
</ng-container>
<a eo-ng-button nzType="link"><span data-id="details" i18n="@@ExtensionDetail">Details</span></a>
<a nz-button nzType="link"><span data-id="details" i18n="@@ExtensionDetail">Details</span></a>
</div>
</div>
</div>

4
src/workbench/browser/src/app/pages/member.component.ts
View File

@ -23,7 +23,7 @@ import { Component, OnInit } from '@angular/core';
<input nz-input [(ngModel)]="inputPersonValue" i18n-placeholder placeholder="Search by username" />
<section class="h-4"></section>
<button
eo-ng-button
nz-button
[nzLoading]="isSelectBtnLoading"
class=""
nzType="primary"
@ -40,7 +40,7 @@ import { Component, OnInit } from '@angular/core';
<h2 class="text-lg flex justify-between items-center">
<span i18n>Manage access</span
><button
eo-ng-button
nz-button
[nzLoading]="isAddPeopleBtnLoading"
class=""
nzType="primary"

4
src/workbench/browser/src/app/pages/member.module.ts
View File

@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common';
import { NzModalService, NzModalModule } from 'ng-zorro-antd/modal';
import { NzInputModule } from 'ng-zorro-antd/input';
import { FormsModule } from '@angular/forms';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { MessageService } from 'eo/workbench/browser/src/app/shared/services/message/message.service';
import { ManageAccessComponent } from 'eo/workbench/browser/src/app/shared/components/manage-access/manage-access.component';
import { SharedModule } from 'eo/workbench/browser/src/app/shared/shared.module';
@ -12,7 +12,7 @@ import { MemberRoutingModule } from './member-routing.module';
import { MemberComponent } from './member.component';
@NgModule({
imports: [MemberRoutingModule, CommonModule, NzModalModule, NzInputModule, FormsModule, EoNgButtonModule, SharedModule],
imports: [MemberRoutingModule, CommonModule, NzModalModule, NzInputModule, FormsModule, NzButtonModule, SharedModule],
declarations: [MemberComponent, ManageAccessComponent],
exports: [],
providers: [NzModalService, MessageService],

8
src/workbench/browser/src/app/pages/navbar/navbar.component.html
View File

@ -38,7 +38,7 @@
i18n-nzTooltipTitle
nzTooltipTitle="New Workspace"
nzType="primary"
eo-ng-button
nz-button
(click)="addWorkspace()"
class="flex w-[20px] items-center justify-center ml-3 text-base shrink-0"
>
@ -63,7 +63,7 @@
<div class="flex items-center can_be_click">
<button
*ngIf="!workspaceService.isLocal && !status.isShare"
eo-ng-button
nz-button
nzType="default"
class="mx-2 btn_scondary"
nz-popover
@ -86,8 +86,8 @@
</div>
</ng-template>
<ng-template #suffixIconButton>
<button eo-ng-button nzType="primary" *ngIf="!isCopy" (click)="handleCopy()">Copy</button>
<button eo-ng-button nzType="default" *ngIf="isCopy" class="text-[#158565]">Copied</button>
<button nz-button nzType="primary" *ngIf="!isCopy" (click)="handleCopy()">Copy</button>
<button nz-button nzType="default" *ngIf="isCopy" class="text-[#158565]">Copied</button>
</ng-template>
<nz-select *ngIf="status.isShare" [(ngModel)]="langValue" nzBorderless (ngModelChange)="handleSwitchLang($event)">
<nz-option nzValue="en-US" nzLabel="English"></nz-option>

14
src/workbench/browser/src/app/pages/user-modal.component.ts
View File

@ -36,7 +36,7 @@ import { StatusService } from 'eo/workbench/browser/src/app/shared/services/stat
</ng-container>
<ng-template #modalSyncFooter>
<button
eo-ng-button
nz-button
[nzLoading]="isSyncCancelBtnLoading"
class=""
nzType="default"
@ -46,7 +46,7 @@ import { StatusService } from 'eo/workbench/browser/src/app/shared/services/stat
Cancel
</button>
<button
eo-ng-button
nz-button
[nzLoading]="isSyncSyncBtnLoading"
class=""
nzType="primary"
@ -73,7 +73,7 @@ import { StatusService } from 'eo/workbench/browser/src/app/shared/services/stat
</ng-container>
<ng-template #modalCheckConnectFooter>
<button
eo-ng-button
nz-button
[nzLoading]="isCheckConnectCancelBtnLoading"
class=""
nzType="default"
@ -83,7 +83,7 @@ import { StatusService } from 'eo/workbench/browser/src/app/shared/services/stat
Cancel
</button>
<button
eo-ng-button
nz-button
[nzLoading]="isCheckConnectRetryBtnLoading"
class=""
nzType="primary"
@ -138,7 +138,7 @@ import { StatusService } from 'eo/workbench/browser/src/app/shared/services/stat
<section class="">
<button
eo-ng-button
nz-button
[nzLoading]="isLoginBtnBtnLoading"
type="submit"
class="h-10 mt-2"
@ -195,7 +195,7 @@ import { StatusService } from 'eo/workbench/browser/src/app/shared/services/stat
<section class="flex justify-end">
<button
eo-ng-button
nz-button
[nzLoading]="isCancelBtnLoading"
type="button"
class="mr-3"
@ -206,7 +206,7 @@ import { StatusService } from 'eo/workbench/browser/src/app/shared/services/stat
Cancel
</button>
<button
eo-ng-button
nz-button
[nzLoading]="isSaveBtnLoading"
type="submit"
class=""

4
src/workbench/browser/src/app/pages/workspace.component.ts
View File

@ -29,7 +29,7 @@ import { ViewChild, ElementRef, Component, OnInit } from '@angular/core';
<section class="">
<button
eo-ng-button
nz-button
[nzLoading]="isSaveBtnBtnLoading"
class=""
nzType="primary"
@ -48,7 +48,7 @@ import { ViewChild, ElementRef, Component, OnInit } from '@angular/core';
<span i18n> After deleting a workspace, all data in the workspace will be permanently deleted. </span>
</section>
<button
eo-ng-button
nz-button
[nzLoading]="isDelWspBtnLoading"
class=""
nzType="primary"

4
src/workbench/browser/src/app/pages/workspace.module.ts
View File

@ -9,7 +9,7 @@ import { NzCardModule } from 'ng-zorro-antd/card';
import { ReactiveFormsModule } from '@angular/forms';
import { NzFormModule } from 'ng-zorro-antd/form';
import { NzInputModule } from 'ng-zorro-antd/input';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { WorkspaceRoutingModule } from './workspace-routing.module';
import { WorkspaceComponent } from './workspace.component';
@ -25,7 +25,7 @@ import { WorkspaceComponent } from './workspace.component';
ReactiveFormsModule,
NzFormModule,
NzInputModule,
EoNgButtonModule,
NzButtonModule,
],
declarations: [WorkspaceComponent, ApiOverviewComponent],
exports: [],

4
src/workbench/browser/src/app/shared/components/env/env.component.html vendored
View File

@ -60,7 +60,7 @@
</div>
</section>
<div *nzModalFooter class="px-2 footer">
<button eo-ng-button nzType="default" (click)="handleCancel()" i18n>Cancel</button>
<button eo-ng-button nzType="primary" (click)="handleSaveEnv(activeUuid)" i18n>Save</button>
<button nz-button nzType="default" (click)="handleCancel()" i18n>Cancel</button>
<button nz-button nzType="primary" (click)="handleSaveEnv(activeUuid)" i18n>Save</button>
</div>
</nz-modal>

4
src/workbench/browser/src/app/shared/components/env/env.module.ts vendored
View File

@ -5,7 +5,7 @@ import { CommonModule } from '@angular/common';
import { EnvComponent } from './env.component';
import { NzModalModule } from 'ng-zorro-antd/modal';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzListModule } from 'ng-zorro-antd/list';
import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
import { NzInputModule } from 'ng-zorro-antd/input';
@ -18,7 +18,7 @@ import { SharedModule } from 'eo/workbench/browser/src/app/shared/shared.module'
const ANTDMODULES = [
NzModalModule,
EoNgButtonModule,
NzButtonModule,
NzListModule,
NzInputModule,
NzFormModule,

2
src/workbench/browser/src/app/shared/components/local-workspace-tip/local-workspace-tip.component.ts
View File

@ -11,7 +11,7 @@ import { StorageUtil } from '../../../utils/storage/Storage';
template: ` <div *ngIf="isShowNotification" class="remote-notification">
<eo-iconpark-icon name="link-cloud-faild" class="text-[13px] mr-[5px]"></eo-iconpark-icon>
<span i18n>The current data is stored locally,If you want to collaborate,Please</span>
<button class="ml-[5px]" eo-ng-button nzType="default" nzSize="small" (click)="switchToTheCloud()" i18n>
<button class="ml-[5px]" nz-button nzType="default" nzSize="small" (click)="switchToTheCloud()" i18n>
switch to the cloud workspace
</button>
<eo-iconpark-icon

2
src/workbench/browser/src/app/shared/components/page-not-found/page-not-found.component.html
View File

@ -1,5 +1,5 @@
<nz-result nzStatus="404" nzTitle="404" nzSubTitle="迷路啦，页面不存在">
<div nz-result-extra>
<button eo-ng-button nzType="primary" (click)="backHome()">回到主页</button>
<button nz-button nzType="primary" (click)="backHome()">回到主页</button>
</div>
</nz-result>

10
src/workbench/browser/src/app/shared/components/params-import/params-import.component.html
View File

@ -1,4 +1,4 @@
<button eo-ng-button [disabled]="disabled" nzType="text" type="button" class="menu" (click)="showModal('json')">
<button [disabled]="disabled" type="button" class="menu" (click)="showModal('json')">
<eo-iconpark-icon name="afferent-three" size="14px"></eo-iconpark-icon>
<span class="fs12 ml5" i18n>Import</span>
</button>
@ -29,9 +29,9 @@
></eo-monaco-editor>
</div>
<div *nzModalFooter>
<button eo-ng-button nzType="default" (click)="handleCancel()" i18n>Cancel</button>
<button eo-ng-button nzType="default" (click)="handleImport('append')" i18n>Insert at the end</button>
<button eo-ng-button nzType="default" (click)="handleImport('overwrite')" i18n>Replace All</button>
<button eo-ng-button nzType="default" (click)="handleImport('mixin')" i18n>Replace Changed</button>
<button nz-button nzType="default" (click)="handleCancel()" i18n>Cancel</button>
<button nz-button nzType="default" (click)="handleImport('append')" i18n>Insert at the end</button>
<button nz-button nzType="default" (click)="handleImport('overwrite')" i18n>Replace All</button>
<button nz-button nzType="default" (click)="handleImport('mixin')" i18n>Replace Changed</button>
</div>
</nz-modal>

4
src/workbench/browser/src/app/shared/components/params-import/params-import.module.ts
View File

@ -7,12 +7,12 @@ import { SharedModule } from 'eo/workbench/browser/src/app/shared/shared.module'
import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
import { NzModalModule } from 'ng-zorro-antd/modal';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { EoIconparkIconModule } from 'eo/workbench/browser/src/app/eoui/iconpark-icon/eo-iconpark-icon.module';
@NgModule({
declarations: [ParamsImportComponent],
imports: [FormsModule, EoIconparkIconModule, NzDropDownModule, NzModalModule, EoNgButtonModule, SharedModule],
imports: [FormsModule, EoIconparkIconModule, NzDropDownModule, NzModalModule, NzButtonModule, SharedModule],
exports: [ParamsImportComponent]
})
export class ParamsImportModule {}

2
src/workbench/browser/src/app/shared/components/setting/common/data-storage.component.ts
View File

@ -29,7 +29,7 @@ import { UserService } from 'eo/workbench/browser/src/app/shared/services/user/u
</ng-container>
<nz-form-item>
<nz-form-control>
<button eo-ng-button nzType="primary" [nzLoading]="loading" i18n>Connect</button>
<button nz-button nzType="primary" [nzLoading]="loading" i18n>Connect</button>
</nz-form-control>
</nz-form-item>
</form>

4
src/workbench/browser/src/app/shared/components/setting/setting.module.ts
View File

@ -3,7 +3,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { SettingComponent } from './setting.component';
import { NzModalModule } from 'ng-zorro-antd/modal';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzListModule } from 'ng-zorro-antd/list';
import { NzInputModule } from 'ng-zorro-antd/input';
import { NzCheckboxModule } from 'ng-zorro-antd/checkbox';
@ -34,7 +34,7 @@ import { NzIconModule } from 'ng-zorro-antd/icon';
const icons: IconDefinition[] = [CaretDownFill];
const ANTDMODULES = [
NzModalModule,
EoNgButtonModule,
NzButtonModule,
NzListModule,
NzInputModule,
NzIconModule.forRoot(icons),

4
src/workbench/browser/src/app/shared/components/toolbar/toolbar.component.html
View File

@ -1,7 +1,7 @@
<div class="app_toolbar f_row">
<div class="flex">
<button
eo-ng-button
nz-button
nzType="text"
class="f_row_ac"
i18n-nzTooltipTitle
@ -13,7 +13,7 @@
<eo-iconpark-icon *ngIf="!sidebar.collapsed" name="expand-right"></eo-iconpark-icon>
<eo-iconpark-icon *ngIf="sidebar.collapsed" name="expand-left"></eo-iconpark-icon>
</button>
<!-- <button eo-ng-button nzType="text" class="f_row_ac" (click)="changeTheme()">
<!-- <button nz-button nzType="text" class="f_row_ac" (click)="changeTheme()">
<i class=" icon-zhuti_yifu"></i>
</button> -->
</div>

4
src/workbench/browser/src/app/shared/shared.module.ts
View File

@ -14,7 +14,7 @@ import { NzAvatarModule } from 'ng-zorro-antd/avatar';
import { NzSwitchModule } from 'ng-zorro-antd/switch';
import { NzTabsModule } from 'ng-zorro-antd/tabs';
import { NzSkeletonModule } from 'ng-zorro-antd/skeleton';
import { EoNgButtonModule } from 'eo-ng-button';
import { NzButtonModule } from 'ng-zorro-antd/button';
import { NzToolTipModule } from 'ng-zorro-antd/tooltip';
import { NzResultModule } from 'ng-zorro-antd/result';
import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
@ -74,7 +74,7 @@ const SHARED_MODULE = [
NzFormModule,
NzDrawerModule,
NzRadioModule,
EoNgButtonModule,
NzButtonModule,
NzToolTipModule,
NzResultModule,
NzDropDownModule,

9
src/workbench/browser/src/assets/theme/antd.less
View File

@ -24,10 +24,18 @@ body {
.ant-divider-horizontal {
margin: 10px 0;
}
// .ant-message-notice-content {
// background-color: @theme-color;
// color: #fff;
// .ant-message-success .anticon {
// color: #fff;
// }
// }
.ant-drawer {
.ant-drawer-content-wrapper {
height: calc(100vh - 25px);
top: 10px;
/* box-shadow: var(--MODAL_SHADOW); */
}
.ant-drawer-content {
border-radius: 3px;
@ -89,4 +97,3 @@ p {
.ant-empty-description {
color: #999;
}

39
src/workbench/browser/src/assets/theme/eoui.less
View File

@ -1,39 +0,0 @@
//From EOUI
.ant-tabs-tab {
padding: 8px 0;
}
.ant-collapse-content > .ant-collapse-content-box {
padding: 0px;
}
.ant-tabs-tab {
margin: 0 0 0 var(--PADDING); //编剧调整为主题的 padding
}
.ant-tabs-tab + .ant-tabs-tab {
margin: 0 0 0 14px;
}
.ant-tabs-bottom > .ant-tabs-nav,
.ant-tabs-bottom > div > .ant-tabs-nav,
.ant-tabs-top > .ant-tabs-nav,
.ant-tabs-top > div > .ant-tabs-nav {
margin: 0 0 8px;
}
.ant-collapse-icon-position-right > .ant-collapse-item > .ant-collapse-header {
padding: 4px 40px 4px 16px;
color: var(--NAV_TEXT_COLOR_DISABLED);
background-color: var(--MAIN_BG);
}
.ant-btn-icon-only {
width: 16px;
height: 16px;
padding: 2px 0;
vertical-align: -2px;
}
.ant-btn-sm {
padding: 0 9px;
}
.ant-modal-header {
padding: 16px;
}
.ant-modal-body {
padding: 16px;
}

4
src/workbench/browser/src/styles.scss
View File

@ -3,9 +3,6 @@
@import "tailwindcss/components";
@import "tailwindcss/utilities";
@import '../../../node_modules/eo-ng-button/styles.scss';
html,
body {
margin: 0;
@ -66,7 +63,6 @@ img, svg, video, canvas, audio, iframe, embed, object {
border-color: #158565;
}
}
::-webkit-scrollbar {
width: 16px;
height: 16px;

21358
yarn.lock
View File

File diff suppressed because it is too large Load Diff