test/postcat
1
0
Fork 0
mirror of https://gitee.com/eolink_admin/postcat.git synced 2024-12-02 03:38:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:eolinker/eoapi

Browse Source
This commit is contained in:
夜鹰 2022-09-14 10:33:37 +08:00
commit f816a676a0
9 changed files with 149 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@
"dependencies": { "dependencies": {
"@angular-cli/base-href-webpack": "1.0.16", "@angular-cli/base-href-webpack": "1.0.16",
"@angular/animations": "14.0.3", "@angular/animations": "14.0.3",
"@angular/cdk": "13.3.9", "@angular/cdk": "14.0.3",
"@angular/common": "14.0.3", "@angular/common": "14.0.3",
"@angular/compiler": "14.0.3", "@angular/compiler": "14.0.3",
"@angular/core": "14.0.3", "@angular/core": "14.0.3",
@ -37,6 +37,7 @@
"angular": "1.8.2", "angular": "1.8.2",
"brace": "0.11.1", "brace": "0.11.1",
"js-beautify": "1.14.4", "js-beautify": "1.14.4",
"lodash-es": "4.17.21",
"markdown-it": "13.0.1", "markdown-it": "13.0.1",
"monaco-editor": "0.33.0", "monaco-editor": "0.33.0",
"ng-zorro-antd": "13.3.2", "ng-zorro-antd": "13.3.2",
@ -62,6 +63,7 @@
"@ngx-translate/http-loader": "7.0.0", "@ngx-translate/http-loader": "7.0.0",
"@types/jasmine": "4.0.3", "@types/jasmine": "4.0.3",
"@types/jasminewd2": "2.0.10", "@types/jasminewd2": "2.0.10",
"@types/lodash-es": "4.17.6",
"@types/markdown-it": "12.2.3", "@types/markdown-it": "12.2.3",
"@types/node": "18.0.0", "@types/node": "18.0.0",
"@typescript-eslint/eslint-plugin": "5.29.0", "@typescript-eslint/eslint-plugin": "5.29.0",

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

@ -9,33 +9,15 @@
<nz-select class="!w-[106px] flex-none" [(ngModel)]="model.request.method" formControlName="method"> <nz-select class="!w-[106px] flex-none" [(ngModel)]="model.request.method" formControlName="method">
<nz-option *ngFor="let item of REQUEST_METHOD" [nzLabel]="item.key" [nzValue]="item.value"></nz-option> <nz-option *ngFor="let item of REQUEST_METHOD" [nzLabel]="item.key" [nzValue]="item.value"></nz-option>
</nz-select> </nz-select>
<div <div *ngIf="env.hostUri" nz-typography nzEllipsis class="env_front_uri" nzTooltipTitle="{{ env.hostUri }}"
*ngIf="env.hostUri" nzTooltipPlacement="bottom" nz-tooltip>
nz-typography
nzEllipsis
class="env_front_uri"
nzTooltipTitle="{{ env.hostUri }}"
nzTooltipPlacement="bottom"
nz-tooltip
>
{{ env.hostUri }} {{ env.hostUri }}
</div> </div>
<nz-form-item nz-col class="fg1"> <nz-form-item nz-col class="fg1">
<nz-form-control <nz-form-control [nzValidateStatus]="this.validateForm.controls.uri" i18n-nzErrorTip
[nzValidateStatus]="this.validateForm.controls.uri" nzErrorTip="Please enter URL">
i18n-nzErrorTip <input type="text" i18n-placeholder placeholder="Enter URL" name="uri" nz-input formControlName="uri"
nzErrorTip="Please enter URL" [(ngModel)]="model.request.uri" (change)="changeUri()" />
>
<input
type="text"
i18n-placeholder
placeholder="Enter URL"
name="uri"
nz-input
formControlName="uri"
[(ngModel)]="model.request.uri"
(change)="changeUri()"
/>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<button type="submit" nz-button nzType="primary" class="ml10 w_100" (click)="clickTest()"> <button type="submit" nz-button nzType="primary" class="ml10 w_100" (click)="clickTest()">
@ -43,128 +25,88 @@
<span *ngIf="status === 'testing'" i18n>Abort</span> <span *ngIf="status === 'testing'" i18n>Abort</span>
<span *ngIf="status === 'testing' && waitSeconds" class="ml-1">{{ waitSeconds }}</span> <span *ngIf="status === 'testing' && waitSeconds" class="ml-1">{{ waitSeconds }}</span>
</button> </button>
<button <button type="button"
type="button" *ngIf="!route.snapshot.queryParams.uuid || route.snapshot.queryParams.uuid.includes('history_')" nz-button
*ngIf="!route.snapshot.queryParams.uuid || route.snapshot.queryParams.uuid.includes('history_')" nzType="default" (click)="saveApi()" class="ml10" i18n>
nz-button
nzType="default"
(click)="saveApi()"
class="ml10"
i18n
>
Save as API Save as API
</button> </button>
</nz-input-group> </nz-input-group>
</form> </form>
<!-- Request Info --> <!-- Request Info -->
<nz-tabset <nz-tabset [nzTabBarStyle]="{ 'padding-left': '10px' }" [nzAnimated]="false"
[nzTabBarStyle]="{ 'padding-left': '10px' }" [(nzSelectedIndex)]="model.requestTabIndex">
[nzAnimated]="false"
[(nzSelectedIndex)]="model.requestTabIndex"
>
<!-- Request Headers --> <!-- Request Headers -->
<nz-tab [nzTitle]="headerTitleTmp" [nzForceRender]="true"> <nz-tab [nzTitle]="headerTitleTmp" [nzForceRender]="true">
<ng-template #headerTitleTmp> <ng-template #headerTitleTmp>
<span i18n="@@RequestHeaders">Headers</span> <span i18n="@@RequestHeaders">Headers</span>
<span class="eo-tab-icon ml-[4px]" *ngIf="bindGetApiParamNum(model.request.requestHeaders)">{{ <span class="eo-tab-icon ml-[4px]" *ngIf="bindGetApiParamNum(model.request.requestHeaders)">{{
model.request.requestHeaders | apiParamsNum model.request.requestHeaders | apiParamsNum
}}</span> }}</span>
</ng-template> </ng-template>
<eo-api-test-header <eo-api-test-header class="eo_theme_iblock bbd" [(model)]="model.request.requestHeaders"
class="eo_theme_iblock bbd" (modelChange)="emitChangeFun('requestHeaders')"></eo-api-test-header>
[(model)]="model.request.requestHeaders"
(modelChange)="emitChangeFun('requestHeaders')"
></eo-api-test-header>
</nz-tab> </nz-tab>
<!--Request Info --> <!--Request Info -->
<nz-tab [nzTitle]="bodyTitleTmp" [nzForceRender]="true"> <nz-tab [nzTitle]="bodyTitleTmp" [nzForceRender]="true">
<ng-template #bodyTitleTmp> <ng-template #bodyTitleTmp>
<span i18n>Body</span> <span i18n>Body</span>
<span <span class="eo-tab-theme-icon" *ngIf="
class="eo-tab-theme-icon"
*ngIf="
['formData', 'json', 'xml'].includes(model.request.requestBodyType) ['formData', 'json', 'xml'].includes(model.request.requestBodyType)
? bindGetApiParamNum(model.request.requestBody) ? bindGetApiParamNum(model.request.requestBody)
: model.request.requestBody?.length : model.request.requestBody?.length
" "></span>
></span>
</ng-template> </ng-template>
<eo-api-test-body <eo-api-test-body class="eo_theme_iblock bbd" [(contentType)]="model.contentType"
class="eo_theme_iblock bbd" (contentTypeChange)="changeContentType($event)" [(bodyType)]="model.request.requestBodyType"
[(contentType)]="model.contentType" (bodyTypeChange)="changeBodyType($event)" [(model)]="model.request.requestBody"
(contentTypeChange)="changeContentType($event)" (modelChange)="emitChangeFun('requestBody')" [supportType]="['formData', 'raw', 'binary']">
[(bodyType)]="model.request.requestBodyType" </eo-api-test-body>
(bodyTypeChange)="changeBodyType($event)"
[(model)]="model.request.requestBody"
(modelChange)="emitChangeFun('requestBody')"
[supportType]="['formData', 'raw', 'binary']"
></eo-api-test-body>
</nz-tab> </nz-tab>
<nz-tab [nzTitle]="queryTitleTmp" [nzForceRender]="true"> <nz-tab [nzTitle]="queryTitleTmp" [nzForceRender]="true">
<ng-template #queryTitleTmp> <ng-template #queryTitleTmp>
<span i18n>Query</span> <span i18n>Query</span>
<span class="eo-tab-icon ml-[4px]" *ngIf="bindGetApiParamNum(model.request.queryParams)">{{ <span class="eo-tab-icon ml-[4px]" *ngIf="bindGetApiParamNum(model.request.queryParams)">{{
model.request.queryParams | apiParamsNum model.request.queryParams | apiParamsNum
}}</span> }}</span>
</ng-template> </ng-template>
<eo-api-test-query <eo-api-test-query class="eo_theme_iblock bbd" [model]="model.request.queryParams"
class="eo_theme_iblock bbd" (modelChange)="emitChangeFun('queryParams')"></eo-api-test-query>
[model]="model.request.queryParams"
(modelChange)="emitChangeFun('queryParams')"
></eo-api-test-query>
</nz-tab> </nz-tab>
<nz-tab [nzTitle]="restTitleTmp" [nzForceRender]="true"> <nz-tab [nzTitle]="restTitleTmp" [nzForceRender]="true">
<ng-template #restTitleTmp> <ng-template #restTitleTmp>
<span i18n>REST</span> <span i18n>REST</span>
<span class="eo-tab-icon ml-[4px]" *ngIf="bindGetApiParamNum(model.request.restParams)">{{ <span class="eo-tab-icon ml-[4px]" *ngIf="bindGetApiParamNum(model.request.restParams)">{{
model.request.restParams | apiParamsNum model.request.restParams | apiParamsNum
}}</span> }}</span>
</ng-template> </ng-template>
<eo-api-test-rest <eo-api-test-rest class="eo_theme_iblock bbd" [(model)]="model.request.restParams"
class="eo_theme_iblock bbd" (modelChange)="emitChangeFun('restParams')"></eo-api-test-rest>
[(model)]="model.request.restParams"
(modelChange)="emitChangeFun('restParams')"
></eo-api-test-rest>
</nz-tab> </nz-tab>
<nz-tab [nzTitle]="preScriptTitleTmp" [nzForceRender]="true"> <nz-tab [nzTitle]="preScriptTitleTmp" [nzForceRender]="true">
<ng-template #preScriptTitleTmp> <ng-template #preScriptTitleTmp>
<span i18n>Pre-request Script</span> <span i18n>Pre-request Script</span>
<span class="eo-tab-theme-icon" *ngIf="model.beforeScript?.trim()"></span> <span class="eo-tab-theme-icon" *ngIf="model.beforeScript?.trim()"></span>
</ng-template> </ng-template>
<eo-api-script <eo-api-script *ngIf="model.requestTabIndex === 4" [(code)]="model.beforeScript"
*ngIf="model.requestTabIndex === 4" (codeChange)="emitChangeFun('beforeScript')" [treeData]="BEFORE_DATA"
[(code)]="model.beforeScript" [completions]="beforeScriptCompletions" class="eo_theme_iblock bbd"></eo-api-script>
(codeChange)="emitChangeFun('beforeScript')"
[treeData]="BEFORE_DATA"
[completions]="beforeScriptCompletions"
class="eo_theme_iblock bbd"
></eo-api-script>
</nz-tab> </nz-tab>
<nz-tab [nzTitle]="suffixScriptTitleTmp" [nzForceRender]="true"> <nz-tab [nzTitle]="suffixScriptTitleTmp" [nzForceRender]="true">
<ng-template #suffixScriptTitleTmp> <ng-template #suffixScriptTitleTmp>
<span i18n>After-response Script</span> <span i18n>After-response Script</span>
<span class="eo-tab-theme-icon" *ngIf="model.afterScript?.trim()"></span> <span class="eo-tab-theme-icon" *ngIf="model.afterScript?.trim()"></span>
</ng-template> </ng-template>
<eo-api-script <eo-api-script *ngIf="model.requestTabIndex === 5" [(code)]="model.afterScript"
*ngIf="model.requestTabIndex === 5" (codeChange)="emitChangeFun('afterScript')" [treeData]="AFTER_DATA" [completions]="afterScriptCompletions"
[(code)]="model.afterScript" class="eo_theme_iblock bbd"></eo-api-script>
(codeChange)="emitChangeFun('afterScript')"
[treeData]="AFTER_DATA"
[completions]="afterScriptCompletions"
class="eo_theme_iblock bbd"
></eo-api-script>
</nz-tab> </nz-tab>
</nz-tabset> </nz-tabset>
</div> </div>
<div class="bottom_container scroll_container" bottom> <div class="bottom_container scroll_container" bottom>
<!-- Response --> <!-- Response -->
<nz-tabset <nz-tabset [nzTabBarStyle]="{ 'padding-left': '10px' }" [(nzSelectedIndex)]="model.responseTabIndex"
[nzTabBarStyle]="{ 'padding-left': '10px' }" [nzTabBarExtraContent]="extraTemplate" [nzAnimated]="false" class="mt-2.5 response_container"
[(nzSelectedIndex)]="model.responseTabIndex" (nzSelectChange)="handleBottomTabSelect($event)">
[nzAnimated]="false"
class="mt-2.5 response_container"
(nzSelectChange)="handleBottomTabSelect($event)"
>
<nz-tab i18n-nzTitle nzTitle="Response"> <nz-tab i18n-nzTitle nzTitle="Response">
<eo-api-test-result-response [model]="model.testResult.response"></eo-api-test-result-response> <eo-api-test-result-response [model]="model.testResult.response"></eo-api-test-result-response>
</nz-tab> </nz-tab>
@ -175,16 +117,21 @@
</div> </div>
<nz-tab i18n-nzTitle nzTitle="Body" [nzForceRender]="true"> <nz-tab i18n-nzTitle nzTitle="Body" [nzForceRender]="true">
<!-- TODO use isRequestBodyLoaded --> <!-- TODO use isRequestBodyLoaded -->
<eo-api-test-result-request-body <eo-api-test-result-request-body *ngIf="model.responseTabIndex === 2"
*ngIf="model.responseTabIndex === 2" [model]="model.testResult.request.requestBody || ''">
[model]="model.testResult.request.requestBody || ''"
>
</eo-api-test-result-request-body> </eo-api-test-result-request-body>
</nz-tab> </nz-tab>
<nz-tab i18n-nzTitle nzTitle="Request Headers"> <nz-tab i18n-nzTitle nzTitle="Request Headers">
<eo-api-test-result-header [model]="model.testResult.request.requestHeaders"> </eo-api-test-result-header> <eo-api-test-result-header [model]="model.testResult.request.requestHeaders"> </eo-api-test-result-header>
</nz-tab> </nz-tab>
</nz-tabset> </nz-tabset>
<ng-template #extraTemplate>
<div *ngIf="model.responseTabIndex === 0" class="px-[10px]">
<!-- <span nz-icon nzType="download" nzTheme="outline">下载</span> -->
<a nz-button nzType="link" [disabled]="isEmpty(model.testResult?.response)" (click)="downloadFile()"
i18n>Download</a>
</div>
</ng-template>
<div id="test-response"></div> <div id="test-response"></div>
</div> </div>
</eo-split-panel> </eo-split-panel>

13
src/workbench/browser/src/app/pages/api/http/test/api-test.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit, OnDestroy, ChangeDetectorRef, Input, Output, EventEmitter } from '@angular/core'; import { Component, OnInit, OnDestroy, ChangeDetectorRef, Input, Output, EventEmitter, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { FormBuilder, FormGroup, Validators } from '@angular/forms'; import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Select } from '@ngxs/store'; import { Select } from '@ngxs/store';
@ -33,6 +33,8 @@ import { LanguageService } from 'eo/workbench/browser/src/app/core/services/lang
import { ContentTypeByAbridge } from 'eo/workbench/browser/src/app/shared/services/api-test/api-test.model'; import { ContentTypeByAbridge } from 'eo/workbench/browser/src/app/shared/services/api-test/api-test.model';
import { transferUrlAndQuery } from 'eo/workbench/browser/src/app/utils/api'; import { transferUrlAndQuery } from 'eo/workbench/browser/src/app/utils/api';
import { getGlobals, setGlobals } from 'eo/workbench/browser/src/app/shared/services/api-test/api-test.utils'; import { getGlobals, setGlobals } from 'eo/workbench/browser/src/app/shared/services/api-test/api-test.utils';
import { ApiTestResultResponseComponent } from 'eo/workbench/browser/src/app/pages/api/http/test/result-response/api-test-result-response.component';
import { isEmpty } from 'lodash-es';
const API_TEST_DRAG_TOP_HEIGHT_KEY = 'API_TEST_DRAG_TOP_HEIGHT'; const API_TEST_DRAG_TOP_HEIGHT_KEY = 'API_TEST_DRAG_TOP_HEIGHT';
interface testViewModel { interface testViewModel {
@ -63,6 +65,7 @@ export class ApiTestComponent implements OnInit, OnDestroy {
@Output() modelChange = new EventEmitter<testViewModel>(); @Output() modelChange = new EventEmitter<testViewModel>();
@Output() afterTested = new EventEmitter<any>(); @Output() afterTested = new EventEmitter<any>();
@Output() eoOnInit = new EventEmitter<testViewModel>(); @Output() eoOnInit = new EventEmitter<testViewModel>();
@ViewChild(ApiTestResultResponseComponent) apiTestResultResponseComponent: ApiTestResultResponseComponent; // 通过组件类型获取
@Select(EnvState) env$: Observable<any>; @Select(EnvState) env$: Observable<any>;
validateForm!: FormGroup; validateForm!: FormGroup;
env: any = { env: any = {
@ -83,6 +86,7 @@ export class ApiTestComponent implements OnInit, OnDestroy {
REQUEST_METHOD = objectToArray(RequestMethod); REQUEST_METHOD = objectToArray(RequestMethod);
REQUEST_PROTOCOL = objectToArray(RequestProtocol); REQUEST_PROTOCOL = objectToArray(RequestProtocol);
MAX_TEST_SECONDS = 60; MAX_TEST_SECONDS = 60;
isEmpty = isEmpty;
private initTimes = 0; private initTimes = 0;
private status$: Subject<string> = new Subject<string>(); private status$: Subject<string> = new Subject<string>();
@ -343,11 +347,11 @@ export class ApiTestComponent implements OnInit, OnDestroy {
//* Other tab test finish,support multiple tab test same time //* Other tab test finish,support multiple tab test same time
this.afterTested.emit({ this.afterTested.emit({
id: queryParams.pageID, id: queryParams.pageID,
url:'/home/api/http/test', url: '/home/api/http/test',
model: { model: {
testStartTime: 0, testStartTime: 0,
testResult: tmpHistory, testResult: tmpHistory,
} },
}); });
} else { } else {
this.model.testResult = tmpHistory; this.model.testResult = tmpHistory;
@ -384,6 +388,9 @@ export class ApiTestComponent implements OnInit, OnDestroy {
}, },
}); });
} }
downloadFile() {
this.apiTestResultResponseComponent.downloadResponseText();
}
/** /**
* Change test status * Change test status
* *

66
src/workbench/browser/src/app/pages/api/http/test/result-response/api-test-result-response.component.html
View File

@ -19,36 +19,38 @@
<nz-alert class="eo_alert_bar" *ngFor="let item of model.reportList" <nz-alert class="eo_alert_bar" *ngFor="let item of model.reportList"
[nzType]="item.type === 'interrupt' ? 'error' : 'info'" [nzMessage]="item.content.toString()" nzShowIcon></nz-alert> [nzType]="item.type === 'interrupt' ? 'error' : 'info'" [nzMessage]="item.content.toString()" nzShowIcon></nz-alert>
<!-- Response --> <!-- Response -->
<div *ngIf="model.responseType" [ngSwitch]="model.responseType"> <div *ngIf="model.responseType">
<div class="text-center" *ngSwitchCase="'stream'"> <ng-container *ngIf="responseIsImg; else stream">
<div *ngIf="!responseIsImg"> <img class="maw_100percent" [src]="imgBlobUrl" />
<span i18n>Unable to preview non-text type data, you can</span> </ng-container>
<button class="eo_theme_btn_default mlr5" type="button" (click)="downloadResponseText()" <ng-template #stream>
i18n="@@downloadResponse"> <ng-container *ngIf="model.responseType === 'stream' && model.responseLength > 500000; else longText">
download response <div class="text-center">
</button> <span i18n>Unable to preview non-text type data, you can</span>
<span i18n>and open it with other programs.</span> <button class="eo_theme_btn_default mlr5" type="button" (click)="downloadResponseText()"
</div> i18n="@@downloadResponse">
<div class="mt20" *ngIf="responseIsImg" (contextmenu)="contextMenu($event, menu)"> download response
<img class="maw_100percent" [src]="imgBlobUrl" /> </button>
</div> <span i18n>and open it with other programs.</span>
<nz-dropdown-menu #menu="nzDropdownMenu"> </div>
<ul nz-menu> </ng-container>
<li nz-menu-item i18n="@@downloadResponse" (click)="downloadResponseText()">download response</li> </ng-template>
</ul> <ng-template #longText>
</nz-dropdown-menu> <ng-container *ngIf="model.responseType === 'longText' && model.responseLength > 500000; else other">
</div> <div class="text-center">
<div class="text-center" *ngSwitchCase="'longText'"> <span i18n>The response result exceeds the previewable size, you can</span>
<span i18n>The response result exceeds the previewable size, you can</span> <button i18n="@@downloadResponse" class="eo_theme_btn_default mlr5" type="button"
<button i18n="@@downloadResponse" class="eo_theme_btn_default mlr5" type="button" (click)="downloadResponseText()">
(click)="downloadResponseText()"> download response
download response </button>
</button> <!-- or
<!-- or <button class="eo_theme_btn_default" type="button" (click)="newTabResponseText()">在新标签页中显示返回结果</button>
<button class="eo_theme_btn_default" type="button" (click)="newTabResponseText()">在新标签页中显示返回结果</button> and open it with other programs. -->
and open it with other programs. --> </div>
</div> </ng-container>
<eo-monaco-editor *ngSwitchDefault class="mt20" [autoFormat]="true" [(code)]="model.body" </ng-template>
[config]="{ readOnly: true }" [eventList]="['type', 'format', 'copy', 'search']"></eo-monaco-editor> <ng-template #other>
<eo-monaco-editor class="mt20" [autoFormat]="true" [(code)]="model.body" [config]="{ readOnly: true }"
[eventList]="['type', 'format', 'copy', 'search']"></eo-monaco-editor>
</ng-template>
</div> </div>
</div>

6
src/workbench/browser/src/app/pages/api/http/test/result-response/api-test-result-response.component.ts
View File

@ -41,7 +41,11 @@ export class ApiTestResultResponseComponent implements OnInit, OnChanges {
} }
} }
} }
ngOnInit(): void {} ngOnInit(): void {
setTimeout(() => {
console.log('this.model', this.model);
}, 5000);
}
contextMenu($event: MouseEvent, menu: NzDropdownMenuComponent): void { contextMenu($event: MouseEvent, menu: NzDropdownMenuComponent): void {
this.nzContextMenuService.create($event, menu); this.nzContextMenuService.create($event, menu);

9
src/workbench/browser/src/app/shared/components/monaco-editor/monaco-editor.component.ts
View File

@ -10,7 +10,7 @@ import {
ElementRef, ElementRef,
} from '@angular/core'; } from '@angular/core';
import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service'; import { EoMessageService } from 'eo/workbench/browser/src/app/eoui/message/eo-message.service';
import { debounce, whatTextType } from '../../../utils'; import { debounce, isBase64, whatTextType } from '../../../utils';
import { ElectronService } from 'eo/workbench/browser/src/app/core/services/electron/electron.service'; import { ElectronService } from 'eo/workbench/browser/src/app/core/services/electron/electron.service';
import { editor } from 'monaco-editor'; import { editor } from 'monaco-editor';
import * as monaco from 'monaco-editor'; import * as monaco from 'monaco-editor';
@ -171,11 +171,14 @@ export class EoMonacoEditorComponent implements AfterViewInit, OnInit, OnChanges
if (val === this.$$code) { if (val === this.$$code) {
return; return;
} }
// console.log('val', val);
let code = ''; let code = '';
try { try {
code = JSON.stringify(typeof val === 'string' ? JSON.parse(val) : val, null, 4); if (isBase64(val)) {
code = window.atob(val);
} else {
code = JSON.stringify(typeof val === 'string' ? JSON.parse(val) : val, null, 4);
}
} catch { } catch {
code = String(val); code = String(val);
} }

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

@ -27,6 +27,7 @@ import { NzResizableModule } from 'ng-zorro-antd/resizable';
import { NzDividerModule } from 'ng-zorro-antd/divider'; import { NzDividerModule } from 'ng-zorro-antd/divider';
import { NzModalModule } from 'ng-zorro-antd/modal'; import { NzModalModule } from 'ng-zorro-antd/modal';
import { NzTypographyModule } from 'ng-zorro-antd/typography'; import { NzTypographyModule } from 'ng-zorro-antd/typography';
import { NzIconModule } from 'ng-zorro-antd/icon';
import { NzNotificationModule } from 'ng-zorro-antd/notification'; import { NzNotificationModule } from 'ng-zorro-antd/notification';
import { NzMessageModule } from 'ng-zorro-antd/message'; import { NzMessageModule } from 'ng-zorro-antd/message';
@ -93,6 +94,7 @@ const SHARED_MODULE = [
NzDividerModule, NzDividerModule,
NzModalModule, NzModalModule,
NzTypographyModule, NzTypographyModule,
NzIconModule,
] as const; ] as const;
@NgModule({ @NgModule({

17
src/workbench/browser/src/app/utils/index.ts
View File

@ -166,7 +166,7 @@ export function debounce(fn, wait = 50) {
let timer = null; let timer = null;
// 将 debounce 处理结果当作函数返回 // 将 debounce 处理结果当作函数返回
// 触发事件回调时执行这个返回函数 // 触发事件回调时执行这个返回函数
return function(...args) { return function (...args) {
// this保存给context // this保存给context
const context = this; const context = this;
// 如果已经设定过定时器就清空上一次的定时器 // 如果已经设定过定时器就清空上一次的定时器
@ -183,7 +183,7 @@ export function debounce(fn, wait = 50) {
export function throttle(fn, gap) { export function throttle(fn, gap) {
let timerId = null; let timerId = null;
return function(...rest) { return function (...rest) {
if (timerId === null) { if (timerId === null) {
fn(...rest); // 立即执行 fn(...rest); // 立即执行
timerId = setTimeout(() => { timerId = setTimeout(() => {
@ -232,5 +232,16 @@ export const eoDeepCopy = (obj) => {
return copy; return copy;
} }
throw new Error('Unable to copy obj! Its type isn\'t supported.'); throw new Error("Unable to copy obj! Its type isn't supported.");
}; };
export function isBase64(str) {
if (str === '' || str.trim() === '') {
return false;
}
try {
return window.btoa(window.atob(str)) === str;
} catch (err) {
return false;
}
}

34
yarn.lock
View File

@ -302,7 +302,16 @@
dependencies: dependencies:
tslib "^2.3.0" tslib "^2.3.0"
"@angular/cdk@13.3.9", "@angular/cdk@^13.0.1": "@angular/cdk@14.0.3":
version "14.0.3"
resolved "https://registry.npmmirror.com/@angular/cdk/-/cdk-14.0.3.tgz#eaa0b0736481bc9c1d24ad88e19dd20874506032"
integrity sha512-XN5+WVUFx13lW2x9gnzJprHGqcvSpKQaoXxFvlcn16i0P6Iy1jldVZm6q6chEhgX9rEi7P31nfE88OJzHmkEyw==
dependencies:
tslib "^2.3.0"
optionalDependencies:
parse5 "^5.0.0"
"@angular/cdk@^13.0.1":
version "13.3.9" version "13.3.9"
resolved "https://registry.npmmirror.com/@angular/cdk/-/cdk-13.3.9.tgz#a177196e872e29be3f84d3a50f778d361c689ff7" resolved "https://registry.npmmirror.com/@angular/cdk/-/cdk-13.3.9.tgz#a177196e872e29be3f84d3a50f778d361c689ff7"
integrity sha512-XCuCbeuxWFyo3EYrgEYx7eHzwl76vaWcxtWXl00ka8d+WAOtMQ6Tf1D98ybYT5uwF9889fFpXAPw98mVnlo3MA== integrity sha512-XCuCbeuxWFyo3EYrgEYx7eHzwl76vaWcxtWXl00ka8d+WAOtMQ6Tf1D98ybYT5uwF9889fFpXAPw98mVnlo3MA==
@ -417,9 +426,9 @@
tslib "^2.3.0" tslib "^2.3.0"
"@angular/upgrade@^14.0.3": "@angular/upgrade@^14.0.3":
version "14.1.0" version "14.2.1"
resolved "https://registry.npmmirror.com/@angular/upgrade/-/upgrade-14.1.0.tgz#e2e4ba33b8dce009e96fc9ece5e4d36061c6ce73" resolved "https://registry.npmmirror.com/@angular/upgrade/-/upgrade-14.2.1.tgz#7e154fb721a1764d0c226ac751fb04912725a78c"
integrity sha512-EOFSpcdncQiQ7A5WktKe4r5uFkEDB325ddqZsuHesMbEQFeFu+93JwJWeRtU9gEyyuVCIDN6DyKaizUw/M4yGA== integrity sha512-UxmqUBoaSFM28UBDA+heTQwNYrhq0mDdmcMt7Pg1gj0kPaQY3f6NgbrNH2UMnps+b4aZEbD/jnoJ3+I2F3VuhA==
dependencies: dependencies:
tslib "^2.3.0" tslib "^2.3.0"
@ -2300,6 +2309,18 @@
resolved "https://registry.npmmirror.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9" resolved "https://registry.npmmirror.com/@types/linkify-it/-/linkify-it-3.0.2.tgz#fd2cd2edbaa7eaac7e7f3c1748b52a19143846c9"
integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA== integrity sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==
"@types/lodash-es@4.17.6":
version "4.17.6"
resolved "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.6.tgz#c2ed4c8320ffa6f11b43eb89e9eaeec65966a0a0"
integrity sha512-R+zTeVUKDdfoRxpAryaQNRKk3105Rrgx2CFRClIgRGaqDTdjsm8h6IYA8ir584W3ePzkZfst5xIgDwYrlh9HLg==
dependencies:
"@types/lodash" "*"
"@types/lodash@*":
version "4.14.185"
resolved "https://registry.npmmirror.com/@types/lodash/-/lodash-4.14.185.tgz#c9843f5a40703a8f5edfd53358a58ae729816908"
integrity sha512-evMDG1bC4rgQg4ku9tKpuMh5iBNEwNa3tf9zRHdP1qlv+1WUg44xat4IxCE14gIpZRGUUWAx2VhItCZc25NfMA==
"@types/markdown-it@12.2.3": "@types/markdown-it@12.2.3":
version "12.2.3" version "12.2.3"
resolved "https://registry.npmmirror.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" resolved "https://registry.npmmirror.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51"
@ -8542,6 +8563,11 @@ lockfile@^1.0.4:
dependencies: dependencies:
signal-exit "^3.0.2" signal-exit "^3.0.2"
lodash-es@4.17.21:
version "4.17.21"
resolved "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
integrity sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==
lodash._baseuniq@~4.6.0: lodash._baseuniq@~4.6.0:
version "4.6.0" version "4.6.0"
resolved "https://registry.npmmirror.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" resolved "https://registry.npmmirror.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"