diff --git a/src/base/datax.worker.add.step3.component.ts b/src/base/datax.worker.add.step3.component.ts
index a1c6af0..ee83b4e 100644
--- a/src/base/datax.worker.add.step3.component.ts
+++ b/src/base/datax.worker.add.step3.component.ts
@@ -16,94 +16,173 @@
* limitations under the License.
*/
-import {AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild} from "@angular/core";
-import {TISService} from "../common/tis.service";
-import {AppFormComponent, BasicFormComponent, CurrentCollection} from "../common/basic.form.component";
-
-import {ActivatedRoute} from "@angular/router";
+import {
+ AfterContentInit,
+ AfterViewInit,
+ Component,
+ EventEmitter,
+ Input, NgZone,
+ OnDestroy,
+ OnInit,
+ Output,
+ ViewChild
+} from "@angular/core";
+import {EventSourceSubject, EventType, ExecuteStep, MessageData, TISService} from "../common/tis.service";
+import {BasicFormComponent, CurrentCollection} from "../common/basic.form.component";
import {NzModalService} from "ng-zorro-antd/modal";
import {NzNotificationService} from "ng-zorro-antd/notification";
import {K8SReplicsSpecComponent} from "../common/k8s.replics.spec.component";
-import {DataXJobWorkerStatus, DataxWorkerDTO} from "../runtime/misc/RCDeployment";
-import {SavePluginEvent} from "../common/tis.plugin";
-import {PowerjobCptType} from "./datax.worker.component";
+import {DataxWorkerDTO, ScalaLog} from "../runtime/misc/RCDeployment";
+import {DataxWorkerComponent, PowerjobCptType} from "./datax.worker.component";
+import {NzDrawerRef, NzDrawerService} from "ng-zorro-antd/drawer";
+import {NgTerminal} from "ng-terminal";
+import {Subscription} from "rxjs";
+import {HeteroList} from "../common/tis.plugin";
+import {NzStatusType} from "ng-zorro-antd/steps/steps.component";
+
@Component({
+ selector: 'k8s-res-config',
template: `
-
-
-
-
-
-
-
-
PowerJob-Server
-
-
-
-
-
-
-
-
-
- PowerJob-Worker
-
-
-
-
-
-
+
+
+
+
+
+
+
+
- PowerJob-Job
-
-
-
+
+
+
+ {{cpt.cptType.toString()}}
+
+
+ 基本配置
+
+
+
+
+
+
+
+
+
-
+
+
+
+ 资源规格
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
`
, styles: [
`
`]
})
-export class DataxWorkerAddStep3Component extends BasicFormComponent implements AfterViewInit, OnInit {
+export class DataxWorkerAddStep3Component extends BasicFormComponent implements AfterViewInit, OnInit, OnDestroy {
savePlugin = new EventEmitter();
@ViewChild('k8sReplicsSpec', {read: K8SReplicsSpecComponent, static: true}) k8sReplicsSpec: K8SReplicsSpecComponent;
@Output() nextStep = new EventEmitter();
@Output() preStep = new EventEmitter();
@Input() dto: DataxWorkerDTO;
- constructor(tisService: TISService, modalService: NzModalService, notification: NzNotificationService) {
+ @Input() displayHeader = true;
+
+ constructor(tisService: TISService, modalService: NzModalService, notification: NzNotificationService, private drawerService: NzDrawerService) {
super(tisService, modalService, notification);
}
ngOnInit(): void {
- if (this.dto.processMeta.supportK8SReplicsSpecSetter && !this.dto.usingPowderJobUseExistCluster && !this.dto.powderJobServerRCSpec) {
+ // console.log(this.dto);
+ if (this.dto.processMeta.supportK8SReplicsSpecSetter && !this.dto.usingPowderJobUseExistCluster && !this.dto.primaryRCSpec) {
throw new Error("rcSpec can not be null");
}
- // console.log(this.dto.processMeta);
+
let appTisService: TISService = this.tisService;
+ // console.log(this.dto);
appTisService.currentApp = new CurrentCollection(0, this.dto.processMeta.targetName);
+
}
get currentApp(): CurrentCollection {
@@ -111,23 +190,75 @@ export class DataxWorkerAddStep3Component extends BasicFormComponent implements
return new CurrentCollection(0, this.dto.processMeta.targetName);
}
+ // private drawerRef: NzDrawerRef
+
+
launchK8SController() {
- let e = new SavePluginEvent();
- e.notShowBizMsg = true;
- this.jsonPost(`/coredefine/corenodemanage.ajax?action=datax_action&emethod=launch_datax_worker&targetName=${this.dto.processMeta.targetName}`
- , {}, e)
- .then((r) => {
- if (r.success) {
- this.successNotify("已经成功在K8S集群中启动" + this.dto.processMeta.pageHeader);
- let dataXWorkerStatus: DataXJobWorkerStatus
- = Object.assign(new DataXJobWorkerStatus(), r.bizresult, {'processMeta': this.dto.processMeta});
- this.nextStep.emit(dataXWorkerStatus);
- }
- });
+ // console.log(this.dto);
+ let subject = DataxWorkerAddStep3Component.createLaunchingEventSubject(this.dto.processMeta.launchClusterMethod, this.tisService, this.dto.processMeta.targetName);
+
+
+ const drawerRef = this.drawerService.create({
+ nzWidth: "60%",
+ nzHeight: "100%",
+ nzPlacement: "right",
+ nzContent: LaunchK8SClusterWaittingProcessComponent,
+ nzContentParams: {"obserable": subject},
+ nzClosable: false,
+ nzMaskClosable: false
+ });
+
+ drawerRef.afterClose.subscribe((status: NzStatusType) => {
+ subject.close();
+ if (status === 'finish') {
+ this.successNotify("已经成功在K8S集群中启动" + this.dto.processMeta.pageHeader);
+ // let dataXWorkerStatus: DataXJobWorkerStatus
+ // = Object.assign(new DataXJobWorkerStatus(), r.bizresult, {'processMeta': this.dto.processMeta});
+
+ DataxWorkerComponent.getJobWorkerMeta(this, this.dto.processMeta)
+ .then((dataXWorkerStatus) => {
+ this.nextStep.emit(dataXWorkerStatus);
+ });
+
+
+ }
+ })
+
+ // let e = new SavePluginEvent();
+ // e.notShowBizMsg = true;
+ //
+ // this.jsonPost(`/coredefine/corenodemanage.ajax?action=datax_action&emethod=launch_datax_worker&targetName=${this.dto.processMeta.targetName}`
+ // , {'usingPowderJobUseExistCluster': this.dto.usingPowderJobUseExistCluster}, e)
+ // .then((r) => {
+ // if (r.success) {
+ // this.successNotify("已经成功在K8S集群中启动" + this.dto.processMeta.pageHeader);
+ // let dataXWorkerStatus: DataXJobWorkerStatus
+ // = Object.assign(new DataXJobWorkerStatus(), r.bizresult, {'processMeta': this.dto.processMeta});
+ // this.nextStep.emit(dataXWorkerStatus);
+ // }
+ // });
+ }
+
+ /**
+ * 'launch_datax_worker'
+ * @param targetMethodName
+ * @param tisService
+ * @param targetName
+ */
+ public static createLaunchingEventSubject(targetMethodName: string, tisService: TISService, targetName: string, extraParams?: string): EventSourceSubject {
+ let sseUrl = `/coredefine/corenodemanage.ajax?resulthandler=exec_null&action=datax_action&emethod=${targetMethodName}&targetName=${targetName}`;
+ if (extraParams) {
+ sseUrl += ('&' + extraParams);
+ }
+ return tisService.createEventSource(targetName, sseUrl);
+
+ }
+
+ ngOnDestroy(): void {
}
protected initialize(app: CurrentCollection): void {
- console.log(app);
+ // console.log(app);
}
ngAfterViewInit() {
@@ -141,3 +272,244 @@ export class DataxWorkerAddStep3Component extends BasicFormComponent implements
public readonly PowerjobCptType = PowerjobCptType;
}
+/**
+ * private _zone: NgZone
+ */
+@Component({
+ selector: "k8s-cluster-launching",
+ template: `
+
+
+
+
+
+
+
+
+ 启动执行状态
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+ , styles: [
+ `
+ .process-height {
+ height: 800px
+ }
+
+ nz-page-header {
+ padding: 0 0 0 20px;
+ }
+ `
+ ]
+})
+export class LaunchK8SClusterWaittingProcessComponent implements OnInit, OnDestroy, AfterViewInit {
+
+ @ViewChild('term', {static: true}) terminal: NgTerminal;
+ @Input()
+ obserable: EventSourceSubject;
+
+ execSteps: Array = [];
+
+ _execStatus: NzStatusType;
+ _currentExecIndex: number = -1;
+ formDisabled: boolean = true;
+
+ @Input()
+ errScalaLog: ScalaLog;
+
+ constructor(private drawer: NzDrawerRef<{ hetero: HeteroList }>, protected tisService: TISService, public _zone: NgZone) {
+ }
+
+ get execStatus(): NzStatusType {
+ if (!this._execStatus && this.execSteps.length > 0) {
+ let execStep: ExecuteStep = null;
+ let allComplete = true;
+ // console.log(this.execSteps);
+ for (let i = 0; i < this.execSteps.length; i++) {
+ execStep = this.execSteps[i];
+ if (execStep.complete) {
+ if (!execStep.success) {
+ this.execSteps.forEach((s) => s._processing = false);
+ return this._execStatus = 'error'
+
+ }
+ } else {
+ allComplete = false;
+ }
+ }
+ return this._execStatus = allComplete ? 'finish' : 'process';
+ }
+ return this._execStatus;
+ }
+
+ get index(): number {
+ let execStepsLength = this.execSteps.length;
+ if (this._currentExecIndex < 0 && execStepsLength > 0) {
+ let execStep: ExecuteStep = null;
+ try {
+ for (let i = execStepsLength - 1; i >= 0; i--) {
+ execStep = this.execSteps[i];
+ if (execStep.complete) {
+ this._currentExecIndex = i;
+ // 设置当前步骤的后一步为执行的状态
+ if (execStep.success && (i + 1) <= (execStepsLength - 1)) {
+ this.execSteps.forEach((s) => s._processing = false);
+ this.execSteps[i + 1]._processing = true;
+ }
+ return this._currentExecIndex;
+ }
+ }
+ } catch (e) {
+ throw e;
+ }
+ return this._currentExecIndex = 0;
+ }
+ return this._currentExecIndex;
+ }
+
+ private subscript: Subscription;
+
+ ngAfterViewInit(): void {
+ if (this.errScalaLog) {
+ // console.log(this.errScalaLog);
+ //this._zone.runOutsideAngular(()=>{
+
+
+ // throw new Error("errScalaLog shall not be empty");
+ this.errScalaLog.logs.forEach((log) => {
+ if (log) {
+ this.terminal.write(log.msg + "\r\n");
+ }
+ });
+ //});
+
+ }
+ }
+
+
+ reExecute() {
+ this.subscript.unsubscribe();
+ this.obserable.close();
+ this.resortInitState();
+ this.execSteps = [];
+ this.formDisabled = true;
+ this.obserable = DataxWorkerAddStep3Component.createLaunchingEventSubject(
+ "relaunch_datax_worker", this.tisService, this.obserable.targetResName);
+ this.ngOnInit();
+ }
+
+ ngOnInit(): void {
+ // console.log(this.obserable);
+ if (!this.obserable) {
+ this.formDisabled = false;
+ if (this.errScalaLog) {
+ this._execStatus = this.errScalaLog.faild ? 'error' : 'finish';
+ this.execSteps = [];
+ this.errScalaLog.milestones.forEach((mile) => {
+ let et = new ExecuteStep();
+ et.success = mile.success;
+ et.name = mile.name;
+ et.complete = mile.complete;
+ et.describe = mile.describe;
+ this.execSteps.push(et);
+ });
+ }
+ return;
+ }
+ this.subscript = this.obserable.events.subscribe((msg: [EventType, Array | MessageData | ExecuteStep]) => {
+ // console.log(msg[0]);
+ // console.log(msg[1]);
+
+ switch (msg[0]) {
+ case EventType.LOG_MESSAGE:
+ let msgLog: MessageData = msg[1];
+ this.terminal.write(msgLog.msg + "\r\n");
+ break;
+ case EventType.TASK_EXECUTE_STEPS:
+ let steps = >msg[1];
+ let copys = [];
+ for (let i = 0; i < steps.length; i++) {
+ copys.push(Object.assign(new ExecuteStep(), steps[i]));
+ }
+ this.execSteps = copys;
+ this.formDisabled = false;
+ break;
+ case EventType.TASK_MILESTONE:
+
+ let execStep = Object.assign(new ExecuteStep(), msg[1]);
+ let idxOf = this.execSteps.findIndex((s) => s.name === execStep.name);
+
+ if (idxOf > -1) {
+ this.execSteps[idxOf] = execStep;
+ this.resortInitState();
+ }
+ // console.log([execStep, idxOf, this.execStatus, this.index])
+ break;
+ case EventType.SSE_CLOSE:
+ break;
+ default:
+ throw new Error("err event type:" + msg[0]);
+ }
+ }, (err) => {
+ console.log(err);
+ });
+ }
+
+ private resortInitState() {
+ this._currentExecIndex = -1;
+ this._execStatus = undefined;
+ this.execStatus;
+ this.index;
+ }
+
+ ngOnDestroy(): void {
+ if (this.subscript) {
+ this.subscript.unsubscribe();
+ }
+ }
+
+ active(event: any) {
+ }
+
+ onIndexChange($event: number) {
+
+ }
+
+ closeDrawer() {
+ this.drawer.close(this.execStatus);
+ }
+
+
+}
+
diff --git a/src/base/datax.worker.component.ts b/src/base/datax.worker.component.ts
index 0095c3b..fd8017a 100644
--- a/src/base/datax.worker.component.ts
+++ b/src/base/datax.worker.component.ts
@@ -26,7 +26,7 @@ import {
ViewContainerRef
} from "@angular/core";
import {TISService} from "../common/tis.service";
-import {AppFormComponent, CurrentCollection} from "../common/basic.form.component";
+import {AppFormComponent, BasicFormComponent, CurrentCollection} from "../common/basic.form.component";
import {ActivatedRoute} from "@angular/router";
@@ -42,6 +42,7 @@ import {DataxWorkerAddStep22Component} from "./datax.worker.add.step2-2.componen
import {isBooleanLiteralLike} from "codelyzer/util/utils";
import {K8SReplicsSpecComponent} from "../common/k8s.replics.spec.component";
import {DataxWorkerAddExistPowerjobClusterComponent} from "./datax.worker.add.exist.powerjob.cluster.component";
+import {TisResponseResult} from "../common/tis.plugin";
export enum PowerjobCptType {
Server = ("powerjob-server"),
@@ -49,7 +50,8 @@ export enum PowerjobCptType {
JobTpl = ("powerjob-job-tpl"),
UsingExistCluster = ("powerjob-use-exist-cluster"),
// applicationAware
- JobTplAppOverwrite = ("powerjob-job-tpl-app-overwrite")
+ JobTplAppOverwrite = ("powerjob-job-tpl-app-overwrite"),
+ FlinkCluster =("flink-cluster")
}
@Component({
@@ -123,21 +125,45 @@ export class DataxWorkerComponent extends AppFormComponent implements AfterViewI
});
this.multiViewDAG = new MultiViewDAG(configFST, this._componentFactoryResolver, this.containerRef);
- this.httpPost('/coredefine/corenodemanage.ajax'
- , `action=datax_action&emethod=get_job_worker_meta&targetName=${this.processMeta.targetName}`)
- .then((r) => {
- if (r.success) {
- let dataXWorkerStatus: DataXJobWorkerStatus = Object.assign(new DataXJobWorkerStatus(), r.bizresult, {processMeta: this.processMeta});
- if (dataXWorkerStatus.k8sReplicationControllerCreated) {
- this.multiViewDAG.loadComponent(DataxWorkerRunningComponent, dataXWorkerStatus);
- } else {
- this.multiViewDAG.loadComponent(DataxWorkerAddStep0Component, Object.assign(new DataxWorkerDTO(), {processMeta: this.processMeta}));
-
- // this.multiViewDAG.loadComponent(DataxWorkerAddStep3Component, Object.assign(new DataxWorkerDTO(), {processMeta: this.processMeta,powderJobServerRCSpec:K8SReplicsSpecComponent.createInitRcSpec()}));
-
- }
- }
- });
+
+ DataxWorkerComponent.getJobWorkerMeta(this,this.processMeta).then((dataXWorkerStatus)=>{
+ if (dataXWorkerStatus.k8sReplicationControllerCreated) {
+ this.multiViewDAG.loadComponent(DataxWorkerRunningComponent, dataXWorkerStatus);
+ } else {
+ this.multiViewDAG.loadComponent(DataxWorkerAddStep0Component, Object.assign(new DataxWorkerDTO(), {processMeta: this.processMeta}));
+
+ // this.multiViewDAG.loadComponent(DataxWorkerAddStep3Component
+ // , Object.assign(new DataxWorkerDTO(), {processMeta: this.processMeta,powderJobServerRCSpec:K8SReplicsSpecComponent.createInitRcSpec()}));
+
+ }
+ })
+
+ // this.httpPost('/coredefine/corenodemanage.ajax'
+ // , `action=datax_action&emethod=get_job_worker_meta&targetName=${this.processMeta.targetName}`)
+ // .then((r) => {
+ // if (r.success) {
+ // let dataXWorkerStatus: DataXJobWorkerStatus = Object.assign(new DataXJobWorkerStatus(), r.bizresult, {processMeta: this.processMeta});
+ // if (dataXWorkerStatus.k8sReplicationControllerCreated) {
+ // this.multiViewDAG.loadComponent(DataxWorkerRunningComponent, dataXWorkerStatus);
+ // } else {
+ // // this.multiViewDAG.loadComponent(DataxWorkerAddStep0Component, Object.assign(new DataxWorkerDTO(), {processMeta: this.processMeta}));
+ //
+ // this.multiViewDAG.loadComponent(DataxWorkerAddStep3Component, Object.assign(new DataxWorkerDTO(), {processMeta: this.processMeta,powderJobServerRCSpec:K8SReplicsSpecComponent.createInitRcSpec()}));
+ //
+ // }
+ // }
+ // });
+ }
+
+ public static getJobWorkerMeta(cpt:BasicFormComponent,processMeta: ProcessMeta) :Promise{
+ return cpt.httpPost('/coredefine/corenodemanage.ajax'
+ , `action=datax_action&emethod=get_job_worker_meta&targetName=${processMeta.targetName}`)
+ .then((r) => {
+ if (r.success) {
+ let dataXWorkerStatus: DataXJobWorkerStatus = Object.assign(new DataXJobWorkerStatus(), r.bizresult, {processMeta: processMeta});
+ return dataXWorkerStatus
+ }
+ });
}
}
diff --git a/src/base/datax.worker.running.component.ts b/src/base/datax.worker.running.component.ts
index 493fea5..557ad55 100644
--- a/src/base/datax.worker.running.component.ts
+++ b/src/base/datax.worker.running.component.ts
@@ -16,432 +16,830 @@
* limitations under the License.
*/
-import {AfterViewInit, Component, EventEmitter, Input, OnInit, Output} from "@angular/core";
-import {TISService} from "../common/tis.service";
-import {AppFormComponent, CurrentCollection, WSMessage} from "../common/basic.form.component";
+import {AfterViewInit, Component, EventEmitter, Input, NgZone, OnInit, Output} from "@angular/core";
+import {EventSourceSubject, EventType, ExecuteStep, MessageData, TISService} from "../common/tis.service";
+import {AppFormComponent, BasicFormComponent, CurrentCollection, WSMessage} from "../common/basic.form.component";
import {ActivatedRoute, Router} from "@angular/router";
import {NzModalService} from "ng-zorro-antd/modal";
import {NzNotificationService} from "ng-zorro-antd/notification";
-import {Subject} from "rxjs";
+import {interval, Observable, of, Subject, timer} from "rxjs";
import {
- DataXJobWorkerStatus,
- DataxWorkerDTO,
- K8sPodState,
- LogType,
- PowerJobWorkflow,
- RcHpaStatus
+ DataXJobWorkerStatus,
+ DataxWorkerDTO,
+ K8sPodState,
+ LogType,
+ PowerJobWorkflow, ProcessMeta, RCDeployment,
+ RcHpaStatus
} from "../runtime/misc/RCDeployment";
import {ControlPanelComponent} from "../common/control.panel.component";
import {Pager} from "../common/pagination.component";
import {DataxWorkerAddStep0Component} from "./datax.worker.add.step0.component";
+import {
+ debounceTime,
+ distinctUntilChanged,
+ map,
+ reduce,
+ scan,
+ switchMap,
+ takeUntil,
+ throttleTime
+} from 'rxjs/operators';
+import {
+ DataxWorkerAddStep3Component,
+ LaunchK8SClusterWaittingProcessComponent
+} from "./datax.worker.add.step3.component";
+import {NzProgressStatusType} from "ng-zorro-antd/progress/typings";
+import {NzDrawerService} from "ng-zorro-antd/drawer";
+
@Component({
- template: `
-
-
-
-
-
-
-
-
-
-
- | 名称 |
- 状态 |
- 重启次数 |
- 创建时间 |
-
-
-
-
- |
-
- |
-
- {{pod.phase}}
- |
-
- {{pod.restartCount}}
- |
- {{pod.startTime | date:'yyyy/MM/dd HH:mm:ss'}} |
-
-
-
-
-
-
-
- {{rcHpaStatus.autoscalerSpec.minReplicas}}
- {{rcHpaStatus.autoscalerSpec.maxReplicas}}
- {{rcHpaStatus.autoscalerSpec.targetCPUUtilizationPercentage}}
- %
-
-
-
- {{rcHpaStatus.autoscalerStatus.currentCPUUtilizationPercentage}}
- {{rcHpaStatus.autoscalerStatus.currentReplicas}}
- {{rcHpaStatus.autoscalerStatus.desiredReplicas}}
- {{rcHpaStatus.autoscalerStatus.lastScaleTime | date: 'yyyy/MM/dd HH:mm'}}
-
-
-
扩缩容事件
-
-
-
-
-
-
-
-
-
+
+
+
+ 可直接打开PowerJob控制台 控制台
+
+
+
+
+
+
+
+ {{u.wfName}}
+
+
+
+
+
+
+
+
+
+ {{u.gmtCreate|date : "yyyy/MM/dd HH:mm:ss"}}
+
+
+
+ {{u.gmtModified|date : "yyyy/MM/dd HH:mm:ss"}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+ , styles: [
+ ` .h2-header {
+ padding: 3px;
+ background-color: #e1e1e1;
+ }
- .danger-control-title {
- margin-top: 10px;
- padding: 0px 0;
- }
+ .desc-block {
+ margin-top: 20px;
+ }
- .ant-advanced-search-form {
- padding: 10px;
- #background: #fbfbfb;
- border: 2px solid #d97f85;
- border-radius: 6px;
- margin-bottom: 10px;
- clear: both;
- }
- `]
+ .danger-control-title {
+ margin-top: 10px;
+ padding: 0px 0;
+ }
+
+ .ant-advanced-search-form {
+ padding: 10px;
+ #background: #fbfbfb;
+ border: 2px solid #d97f85;
+ border-radius: 6px;
+ margin-bottom: 10px;
+ clear: both;
+ }
+ `]
})
export class DataxWorkerRunningComponent extends AppFormComponent implements AfterViewInit, OnInit {
- // savePlugin = new EventEmitter
();
- // @ViewChild('k8sReplicsSpec', {read: K8SReplicsSpecComponent, static: true}) k8sReplicsSpec: K8SReplicsSpecComponent;
- @Output() nextStep = new EventEmitter();
- @Output() preStep = new EventEmitter();
- // @Input() dto: DataxWorkerDTO;
+ // savePlugin = new EventEmitter();
+ // @ViewChild('k8sReplicsSpec', {read: K8SReplicsSpecComponent, static: true}) k8sReplicsSpec: K8SReplicsSpecComponent;
+ @Output() nextStep = new EventEmitter();
+ @Output() preStep = new EventEmitter();
+ // @Input() dto: DataxWorkerDTO;
+
+ msgSubject: Subject;
+ dto: DataXJobWorkerStatus = new DataXJobWorkerStatus();
+ tabSelectIndex = 0;
+ selectedPod: K8sPodState = null;
+ logtype = LogType.DATAX_WORKER_POD_LOG;
+
+ workerCfg: DataxWorkerDTO;
+
+
+ podNameSub;
+
+ /**
+ * ========================
+ */
+ pager: Pager = new Pager(1, 2);
+ workflows: PowerJobWorkflow[] = [];
+
+
+ constructor(tisService: TISService, route: ActivatedRoute, modalService: NzModalService, private router: Router, notification: NzNotificationService, public _zone: NgZone) {
+ super(tisService, route, modalService, notification);
+ }
+
+ public gotoPage(page: number): void {
+ // this.tisService._zone.runOutsideAngular(()=>{
+ this.httpPost('/coredefine/corenodemanage.ajax'
+ , 'action=datax_action&emethod=get_all_powerjob_workflow_record&page=' + page)
+ .then((r) => {
+ if (r.success) {
+ this.workflows = r.bizresult.rows;
+ this.pager = new Pager(r.bizresult.curPage, r.bizresult.totalPage);
+ }
+ });
+ // })
+
+ }
+
+ get currentApp(): CurrentCollection {
+ return new CurrentCollection(0, this.dto.processMeta.targetName);
+ }
+
+ ngOnInit(): void {
+ // super.ngOnInit();
+ // console.log("==========================");
+ this.route.params.subscribe((p) => {
+ let targetTab = p['targetTab'];
+ console.log(targetTab);
+ switch (targetTab) {
+ case 'log':
+ if (!this.podNameSub) {
+ this.podNameSub = this.route.fragment.subscribe((podName) => {
+ // console.log(`podName:${podName}`);
+ if (this.route.snapshot.params['targetTab'] !== 'log') {
+ return;
+ }
+ if (!this.selectedPod) {
+ // 取得容器第一个pod
+ let pods = this.dto.rcDeployment.pods;
+ if (pods.length < 1) {
+ this.errNotify("容器还未分配Pod资源");
+ return;
+ }
+ this.selectedPod = pods[0];
+ }
+ if (!!podName && podName !== this.selectedPod.name) {
+ this.selectedPod = this.dto.findPod(podName);//.pods.find((pp) => (pp.name === podName));
+ if (!this.selectedPod) {
+ throw new Error("can not find podName:" + podName + " in:" + this.dto.rcDeployment.pods.map((pp) => pp.name).join(","));
+ }
+ }
+ let logtype = this.logtype + ":" + this.selectedPod.name;
+ if (!this.msgSubject) {
+ this.msgSubject = this.getWSMsgSubject(logtype);
+ } else {
+ this.msgSubject.next(new WSMessage(logtype));
+ }
+ this.tabSelectIndex = 2;
+ });
+ }
+
+ break;
+ case 'profile':
+ this.profileViewSelect();
+ this.tabSelectIndex = 0;
+ break;
+ case 'config': {
+ this.tisService.currentApp = this.currentApp;
+ if (this.workerCfg) {
+ break;
+ }
+ this.httpPost('/coredefine/corenodemanage.ajax?action=datax_action'
+ , "emethod=get_datax_worker_config&targetName=" + this.dto.processMeta.targetName)
+ .then((r) => {
+ //
+ this._zone.run(() => {
+ if (r.success) {
- msgSubject: Subject;
- dto: DataXJobWorkerStatus = new DataXJobWorkerStatus();
- tabSelectIndex = 0;
- selectedPod: K8sPodState = null;
- logtype = LogType.DATAX_WORKER_POD_LOG;
+ // setTimeout(()=>{
- rcHpaStatus: RcHpaStatus;
+ this.workerCfg = Object.assign(new DataxWorkerDTO(), r.bizresult, {"processMeta": this.dto.processMeta});
- podNameSub;
+ // },3000);
+ // DataxWorkerDTO
+ }
+ });
+ });
+ break;
+ }
+ case 'manage':
+ // this.tabSelectIndex = 3;
+ break;
+ case 'env':
+ break;
+ case 'wf-list':
+ default : {
+ this.tabSelectIndex = 0;
+ // this.workflowSelect();
+ this.gotoPage(this.pager.curPage)
+ break;
+ }
+ }
+ });
+ }
- /**
- * ========================
- */
- pager: Pager = new Pager(1, 2);
- workflows: PowerJobWorkflow[] = [];
+ protected initialize(app: CurrentCollection): void {
+ }
- constructor(tisService: TISService, route: ActivatedRoute, modalService: NzModalService, private router: Router, notification: NzNotificationService) {
- super(tisService, route, modalService, notification);
- }
+ ngAfterViewInit() {
+ }
- public gotoPage(page: number): void {
- this.httpPost('/coredefine/corenodemanage.ajax'
- , 'action=datax_action&emethod=get_all_powerjob_workflow_record&page=' + page)
- .then((r) => {
- if (r.success) {
- this.workflows = r.bizresult.rows;
- this.pager = new Pager(r.bizresult.curPage, r.bizresult.totalPage);
- }
- });
- }
- get currentApp(): CurrentCollection {
- return new CurrentCollection(0, this.dto.processMeta.targetName);
- }
+ prestep() {
+ // this.preStep.next(this.dto);
+ }
- ngOnInit(): void {
- // super.ngOnInit();
- // console.log("==========================");
- this.route.params.subscribe((p) => {
- let targetTab = p['targetTab'];
- switch (targetTab) {
- case 'log':
- if (!this.podNameSub) {
- this.podNameSub = this.route.fragment.subscribe((podName) => {
- // console.log(`podName:${podName}`);
- if (this.route.snapshot.params['targetTab'] !== 'log') {
- return;
- }
- if (!this.selectedPod) {
- // 取得容器第一个pod
- let pods = this.dto.rcDeployment.pods;
- if (pods.length < 1) {
- this.errNotify("容器还未分配Pod资源");
- return;
- }
- this.selectedPod = pods[0];
- }
- if (!!podName && podName !== this.selectedPod.name) {
- this.selectedPod = this.dto.rcDeployment.pods.find((pp) => (pp.name === podName));
- if (!this.selectedPod) {
- throw new Error("can not find podName:" + podName + " in:" + this.dto.rcDeployment.pods.map((pp) => pp.name).join(","));
- }
- }
- let logtype = this.logtype + ":" + this.selectedPod.name;
- if (!this.msgSubject) {
- this.msgSubject = this.getWSMsgSubject(logtype);
- } else {
- this.msgSubject.next(new WSMessage(logtype));
- }
- this.tabSelectIndex = 2;
- });
- }
-
- break;
- case 'profile':
- this.profileViewSelect();
- this.tabSelectIndex = 0;
- break;
- case 'manage':
- this.tabSelectIndex = 3;
- break;
- case 'env':
- break;
- case 'wf-list':
- default : {
- this.tabSelectIndex = 0;
- this.workflowSelect();
- break;
- }
- }
- });
- }
+ dataXWorkerDelete(cpt: ControlPanelComponent) {
+ // this.confirm(`是否确定要将${this.dto.processMeta.pageHeader}从K8S容器中删除`, () => {
+ //
+ // });
- protected initialize(app: CurrentCollection): void {
- }
+ this.jsonPost('/coredefine/corenodemanage.ajax?action=datax_action&emethod=remove_datax_worker&targetName=' + this.dto.processMeta.targetName
+ , {})
+ .then((r) => {
+ // console.log("xxxxxxxx");
+ cpt.enableComponent();
+ if (r.success) {
+ this.nextStep.emit(Object.assign(new DataxWorkerDTO(), {processMeta: this.dto.processMeta}));
+ }
+ });
- ngAfterViewInit() {
- }
+ }
+ profileTabSelect() {
+ this.activeTab('profile');
+ }
- prestep() {
- // this.preStep.next(this.dto);
+ private activeTab(tabName: string) {
+ let currentTab = this.route.snapshot.params['targetTab'];
+ if (currentTab !== tabName) {
+ this.router.navigate([`/base/${this.dto.processMeta.targetName}`, tabName], {relativeTo: this.route});
}
+ }
+
+ envTabSelect() {
+ this.activeTab('env');
+ }
+
+ workflowSelect() {
+ // this.gotoPage(this.pager.curPage)
+ this.activeTab('wf-list');
+ }
+
+ profileViewSelect(): void {
+ this.jsonPost(`/coredefine/corenodemanage.ajax?action=datax_action&emethod=get_datax_worker_hpa&targetName=${this.dto.processMeta.targetName}`
+ , {})
+ .then((r) => {
+ if (r.success) {
+ // this.rcHpaStatus = r.bizresult;
+ }
+ });
+ }
- dataXWorkerDelete(cpt: ControlPanelComponent) {
+ logtypeSelect() {
+ this.activeTab('log');
+ // if (!this.route.snapshot.params['targetTab']) {
+ // this.router.navigate(["/base/datax-worker/log"], {relativeTo: this.route});
+ // }
+ }
- // this.confirm(`是否确定要将${this.dto.processMeta.pageHeader}从K8S容器中删除`, () => {
- //
- // });
- this.jsonPost('/coredefine/corenodemanage.ajax?action=datax_action&emethod=remove_datax_worker&targetName=' + this.dto.processMeta.targetName
- , {})
- .then((r) => {
- // console.log("xxxxxxxx");
- cpt.enableComponent();
- if (r.success) {
- this.nextStep.emit(Object.assign(new DataxWorkerDTO(), {processMeta: this.dto.processMeta}));
- }
- });
+ manageSelect() {
+ this.activeTab('manage');
+ }
- }
+ k8sResConfigSelect() {
+ // dto: DataxWorkerDTO
+ this.activeTab('config');
+ }
- profileTabSelect() {
- this.activeTab('profile');
+ startPowerJobTplAppOverwrite(u: PowerJobWorkflow) {
+ if (!u.wfName) {
+ throw new Error("property wfName can not be null");
}
+ DataxWorkerAddStep0Component.startPowerJobTplAppOverwrite(this, [{
+ key: "appname",
+ val: u.wfName
+ }]).subscribe((plugin: PowerJobWorkflow) => {
+ // console.log(plugin);
+ // this.workflowSelect();
+
+ let idxOf = this.workflows.findIndex((wf) => wf.id === plugin.id);
+ if (idxOf > -1) {
+ this.workflows[idxOf] = plugin;
+ this.workflows = [...this.workflows];
+ }
+ });
+ }
- private activeTab(tabName: string) {
- let currentTab = this.route.snapshot.params['targetTab'];
- if (currentTab !== tabName) {
- this.router.navigate([`/base/${this.dto.processMeta.targetName}`, tabName], {relativeTo: this.route});
- }
- }
- envTabSelect() {
- this.activeTab('env');
- }
+}
- workflowSelect() {
- this.gotoPage(this.pager.curPage)
- this.activeTab('wf-list');
+@Component({
+ selector: `pod-list`,
+ template: `
+
+ {{rcDeployment.name}}
+
+
+
+
+
+
+ {{this.rcDeployment.pods.length}}/{{this.toPodNum.targetPodNum}}
+
+
+
+
+
+
+
+
+
pods
+
+
+
+ | 名称 |
+ 状态 |
+ 重启次数 |
+ 创建时间 |
+
+
+
+
+ |
+
+ |
+
+ {{pod.phase}}
+ |
+
+ {{pod.restartCount}}
+ |
+ {{pod.startTime | date:'yyyy/MM/dd HH:mm:ss'}} |
+
+
+
+
+ hap
+
+
+
+ {{rcHpaStatus.autoscalerSpec.minReplicas}}
+ {{rcHpaStatus.autoscalerSpec.maxReplicas}}
+ {{rcHpaStatus.autoscalerSpec.targetCPUUtilizationPercentage}}
+ %
+
+
+
+ {{rcHpaStatus.autoscalerStatus.currentCPUUtilizationPercentage}}
+ {{rcHpaStatus.autoscalerStatus.currentReplicas}}
+ {{rcHpaStatus.autoscalerStatus.desiredReplicas}}
+ {{rcHpaStatus.autoscalerStatus.lastScaleTime | date: 'yyyy/MM/dd HH:mm'}}
+
+
+
扩缩容事件
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
{{controlErr('pods')}}
-
-
-
-
-
-
-
-
-
-
-
-
{{controlErr('cuprequest')}}
-
-
-
-
-
-
-
-
-
-
-
-
{{controlErr('cuplimit')}}
-
-
-
-
-
-
-
-
-
-
-
-
-
{{controlErr('memoryrequest')}}
-
-
-
-
-
-
-
-
-
-
-
-
{{controlErr('memorylimit')}}
-
-
+ selector: `k8s-replics-spec`,
+ template: `
+
+
+
+
+
+
+
{{controlErr('pods')}}
+
+
+
+
+
+
+
+
+
+
+
+
{{controlErr('cuprequest')}}
+
+
+
+
+
+
+
+
+
+
+
+
{{controlErr('cuplimit')}}
+
+
+
+
+
+
+
+
+
+
+
+
+
{{controlErr('memoryrequest')}}
+
+
+
+
+
+
+
+
+
+
+
+
{{controlErr('memorylimit')}}
+
+
-
-
-
-
-
-
-
-
{{controlErr('cpuAverageUtilization')}}
-
-
-
-
-
-
{{controlErr('minHpaPod')}}
-
-
-
-
-
-
{{controlErr('maxHpaPod')}}
-
-
-
个
- `
- , styles: [`
- .resource-spec {
- display: flex;
- }
+
+
+
+
+
+
+
{{controlErr('cpuAverageUtilization')}}
+
+
+
+
+
+
{{controlErr('minHpaPod')}}
+
+
+
+
+
+
{{controlErr('maxHpaPod')}}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ selector: 'tis-plugins',
+ changeDetection: ChangeDetectionStrategy.OnPush,
+ template: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- ;
- let subFromItems: Array
- ;
- let subFormVals: { [tabname: string]: { [propKey: string]: ItemPropVal } } = {};
-
- for (let subFieldPk in rawVal) {
- subFrom = >rawVal[subFieldPk];
- // console.log([subFrom, subFieldPk]);
- subFromItems = new Array
- ();
- subFrom.forEach((form) => {
- let subformDesc: Descriptor = h.descriptors.get(form.impl);
- // console.log([h.descriptors, form.impl]);
- if (!subformDesc) {
- if ((pm).skipSubformDescNullError) {
- return;
- }
-
- throw new Error("desc impl:" + form.impl + " relevant desc can not be null");
- }
- let ii = Object.assign(new Item(subformDesc), form);
- // ii.vals = subFrom;
- ii.wrapItemVals();
- subFromItems.push(ii);
- });
- // console.log([subFrom, desc]);
- // console.log(i.itemVals);
- // console.log([subFrom, ii.vals]);
- // @ts-ignore
- subFormVals[subFieldPk] = subFromItems;
- }
- i.vals = subFormVals;
- // console.log(i);
- // i.subFormRawVals = rawVal;
- } else {
- i = Object.assign(new Item(desc), item);
- i.wrapItemVals();
- // console.log(i);
- }
- // console.log(i);
- items.push(i);
- });
- h.items = items;
- // console.log(h);
- return h;
+ if (opts.savePluginEventCreator) {
+ addDb.savePluginEventCreator = opts.savePluginEventCreator;
}
- public static initializePluginItems(ctx: BasicFormComponent, pm: PluginType[]
- , useCache: boolean, callback: (success: boolean, _heteroList: HeteroList[], showExtensionPoint: boolean) => void): Promise {
- let pluginMeta = PluginsComponent.getPluginMetaParams(pm);
- let url = '/coredefine/corenodemanage.ajax?event_submit_do_get_plugin_config_info=y&action=plugin_action&plugin=' + pluginMeta + '&use_cache=' + useCache;
-
- return ctx.jsonPost(url, {}).then((r) => {
- let _heteroList: HeteroList[] = [];
- if (r.success) {
- let bizArray: HeteroList[] = r.bizresult.plugins;
- // console.log([pm, bizArray]);
- for (let i = 0; i < pm.length; i++) {
- //
- let h: HeteroList = PluginsComponent.wrapperHeteroList(bizArray[i], pm[i]);
- // console.log([bizArray[i], pm[i], h]);
- _heteroList.push(h);
- }
- }
- callback(r.success, _heteroList, r.success ? r.bizresult.showExtensionPoint : false);
- return r;
- })
- }
-
- public static wrapDescriptors(descriptors: Map)
- : Map {
- let descMap: Map = new Map();
- let d: Descriptor = null;
- let attrs: AttrDesc[];
- let attr: AttrDesc;
- // console.log(descriptors);
- for (let impl in descriptors) {
- d = Object.assign(new Descriptor(), descriptors[impl]);
- attrs = [];
- d.attrs.forEach((a) => {
-
- attr = Object.assign(new AttrDesc(), a);
- if (attr.describable) {
- attr.descriptors = this.wrapDescriptors(attr.descriptors);
- }
- if (attr.options) {
- let opts: ValOption[] = [];
- attr.options.forEach((opt) => {
- opts.push(Object.assign(new ValOption(), opt));
- });
- attr.options = opts;
- }
- attrs.push(attr);
- });
- d.attrs = attrs;
- descMap.set(impl, d);
+ addDb.showSaveButton = true;
+ addDb.afterSave.subscribe((r: PluginSaveResponse) => {
+ // console.log(r);
+ if (r && r.saveSuccess && r.hasBiz()) {
+ modalRef.close();
+ let db = r.biz();
+
+ onSuccess(db);
+ }
+ });
+ return modalRef;
+ }
+
+
+ public static getPluginMetaParams(pluginMeta: PluginType[]): string {
+ return pluginMeta.map((p) => {
+ let param: any = p;
+ // console.log(param);
+ if (param.name) {
+ let t: PluginMeta = param;
+ let metaParam = `${t.name}:${t.require ? 'require' : ''}${t.extraParam ? (',' + t.extraParam) : ''}`
+ if (Array.isArray(t.appendParams) && t.appendParams.length > 0) {
+ metaParam += ("&" + t.appendParams.map((p) => p.key + "=" + p.val).join("&"));
}
- // console.log(descMap);
- return descMap;
- }
-
-
- public static postHeteroList(basicModule: BasicFormComponent, pluginMetas: PluginType[], heteroList: HeteroList[]
- , savePluginEvent: SavePluginEvent, errorsPageShow: boolean, processCallback: (r: TisResponseResult) => void, errProcessCallback?: (r: TisResponseResult) => void): void {
-
- let pluginMeta = PluginsComponent.getPluginMetaParams(pluginMetas);
-
- let url = `/coredefine/corenodemanage.ajax?event_submit_do_save_plugin_config=y&action=plugin_action&plugin=${pluginMeta}&errors_page_show=${errorsPageShow}&verify=${savePluginEvent.verifyConfig}&getNotebook=${savePluginEvent.createOrGetNotebook}`;
-
- let items: Array = [];
- heteroList.forEach((h) => {
- items.push(h.items);
- });
- let postData: any = {"items": items};
-
- if (savePluginEvent.serverForward) {
- postData.serverForward = savePluginEvent.serverForward;
- if (savePluginEvent.postPayload) {
- postData = Object.assign(postData, savePluginEvent.postPayload);
- }
+ return metaParam;
+ } else {
+ return p;
+ }
+ }).join("&plugin=");
+ }
+
+ public static wrapperHeteroList(he: HeteroList, pm: PluginType): HeteroList {
+ let h: HeteroList = Object.assign(new HeteroList(), he, {"pluginCategory": pm});
+ let descMap = PluginsComponent.wrapDescriptors(h.descriptors);
+ // console.log(descMap);
+ h.descriptors = descMap;
+ // 遍历item
+ let items: Item[] = [];
+ let i: Item;
+ h.items.forEach((item) => {
+
+ let desc: Descriptor = h.descriptors.get(item.impl);
+ if (!desc) {
+ if ((pm).skipSubformDescNullError) {
+ return;
}
- // console.log([postData,savePluginEvent.postPayload]);
- // console.log([heteroList.length, heteroList]);
-
- basicModule.jsonPost(url, postData, savePluginEvent).then((r) => {
- processCallback(r);
- }).catch((e) => {
- if (errProcessCallback) {
- errProcessCallback(e);
- }
- });
- }
-
- @Input()
- public set getCurrentAppCache(val: boolean) {
- super.getCurrentAppCache = val;
- }
+ // console.log([he, pm]);
+ throw new Error("desc impl:" + item.impl + " relevant desc can not be null");
+ }
+ // console.log([item.impl, desc]);
+ if (desc.subForm) {
+ i = new Item(desc);
+ i.displayName = item.displayName;
+ // i.containAdvance = item.containAdvance;
+ let rawVal = item.vals;
+ // delete item.vals;
+ let subFrom: Array
- ;
+ let subFromItems: Array
- ;
+ let subFormVals: { [tabname: string]: { [propKey: string]: ItemPropVal } } = {};
+
+ for (let subFieldPk in rawVal) {
+ subFrom = >rawVal[subFieldPk];
+ // console.log([subFrom, subFieldPk]);
+ subFromItems = new Array
- ();
+ subFrom.forEach((form) => {
+ let subformDesc: Descriptor = h.descriptors.get(form.impl);
+ // console.log([h.descriptors, form.impl]);
+ if (!subformDesc) {
+ if ((pm).skipSubformDescNullError) {
+ return;
+ }
- filterDescriptor(h: HeteroList, pluginMetas: PluginType[], desc: Descriptor) {
- let pt: PluginType;
- let o: any;
- let meta: PluginMeta;
- for (let i = 0; i < pluginMetas.length; i++) {
- pt = pluginMetas[i];
- o = pt;
- if (o.name && o.descFilter && h.identityId === o.name) {
- meta = o;
- return meta.descFilter.localDescFilter(desc);
+ throw new Error("desc impl:" + form.impl + " relevant desc can not be null");
}
+ let ii = Object.assign(new Item(subformDesc), form);
+ // ii.vals = subFrom;
+ ii.wrapItemVals();
+ subFromItems.push(ii);
+ });
+ // console.log([subFrom, desc]);
+ // console.log(i.itemVals);
+ // console.log([subFrom, ii.vals]);
+ // @ts-ignore
+ subFormVals[subFieldPk] = subFromItems;
}
- return true;
- }
-
-
- configCheck(h: HeteroList, item: Item, event: MouseEvent) {
- let savePlugin = new SavePluginEvent();
- savePlugin.verifyConfig = true;
- savePlugin.notShowBizMsg = false;
- // this.savePluginSetting(event, savePlugin);
- if (!h.pluginCategory) {
- throw new Error("pluginCategory can not be null");
+ i.vals = subFormVals;
+ // console.log(i);
+ // i.subFormRawVals = rawVal;
+ } else {
+ i = Object.assign(new Item(desc), item);
+ i.wrapItemVals();
+ // console.log(i);
+ }
+ // console.log(i);
+ items.push(i);
+ });
+ h.items = items;
+ // console.log(h);
+ return h;
+ }
+
+ public static initializePluginItems(ctx: BasicFormComponent, pm: PluginType[]
+ , useCache: boolean, callback: (success: boolean, _heteroList: HeteroList[], showExtensionPoint: boolean) => void): Promise {
+ let pluginMeta = PluginsComponent.getPluginMetaParams(pm);
+ let url = '/coredefine/corenodemanage.ajax?event_submit_do_get_plugin_config_info=y&action=plugin_action&plugin=' + pluginMeta + '&use_cache=' + useCache;
+
+ return ctx.jsonPost(url, {}).then((r) => {
+ let _heteroList: HeteroList[] = [];
+ if (r.success) {
+ let bizArray: HeteroList[] = r.bizresult.plugins;
+ // console.log([pm, bizArray]);
+ for (let i = 0; i < pm.length; i++) {
+ //
+ let h: HeteroList = PluginsComponent.wrapperHeteroList(bizArray[i], pm[i]);
+ // console.log([bizArray[i], pm[i], h]);
+ _heteroList.push(h);
+ }
+ }
+ callback(r.success, _heteroList, r.success ? r.bizresult.showExtensionPoint : false);
+ return r;
+ })
+ }
+
+ public static wrapDescriptors(descriptors: Map)
+ : Map {
+ let descMap: Map = new Map();
+ let d: Descriptor = null;
+ let attrs: AttrDesc[];
+ let attr: AttrDesc;
+ // console.log(descriptors);
+ for (let impl in descriptors) {
+ d = Object.assign(new Descriptor(), descriptors[impl]);
+ attrs = [];
+ d.attrs.forEach((a) => {
+
+ attr = Object.assign(new AttrDesc(), a);
+ if (attr.describable) {
+ attr.descriptors = this.wrapDescriptors(attr.descriptors);
+ }
+ if (attr.options) {
+ let opts: ValOption[] = [];
+ attr.options.forEach((opt) => {
+ opts.push(Object.assign(new ValOption(), opt));
+ });
+ attr.options = opts;
}
- // console.log([this.plugins, h.pluginCategory]);
- let nh = Object.assign(new HeteroList(), h);
- nh.items = [item];
- this._savePluginInfo(event, savePlugin, [h.pluginCategory], [nh]);
+ attrs.push(attr);
+ });
+ d.attrs = attrs;
+ descMap.set(impl, d);
}
+ // console.log(descMap);
+ return descMap;
+ }
- openNotebook(h: HeteroList, item: Item, event: MouseEvent) {
- if (!item.dspt.notebook.activate) {
- this.modalService.warning({
- nzTitle: "错误",
- nzContent: this.notebookNotActivate,
- nzOkText: "知道啦"
- });
- return;
- }
+ public static postHeteroList(basicModule: BasicFormComponent, pluginMetas: PluginType[], heteroList: HeteroList[]
+ , savePluginEvent: SavePluginEvent, errorsPageShow: boolean, processCallback: (r: TisResponseResult) => void, errProcessCallback?: (r: TisResponseResult) => void): void {
- let savePlugin = new SavePluginEvent();
- savePlugin.createOrGetNotebook = true;
- if (!h.pluginCategory) {
- throw new Error("pluginCategory can not be null");
- }
- let nh = Object.assign(new HeteroList(), h);
- nh.items = [item];
- this._savePluginInfo(event, savePlugin, [h.pluginCategory], [nh]);
- }
+ let pluginMeta = PluginsComponent.getPluginMetaParams(pluginMetas);
- @Input()
- set plugins(metas: PluginType[]) {
- // console.log(metas);
- this.setPluginMeta(metas);
- if (!this.shallInitializePluginItems) {
- this.initializePluginItems();
- }
- }
+ let url = `/coredefine/corenodemanage.ajax?event_submit_do_save_plugin_config=y&action=plugin_action&plugin=${pluginMeta}&errors_page_show=${errorsPageShow}&verify=${savePluginEvent.verifyConfig}&getNotebook=${savePluginEvent.createOrGetNotebook}`;
- @Input()
- set pluginMeta(metas: PluginType[]) {
- this.setPluginMeta(metas);
- }
+ let items: Array = [];
+ heteroList.forEach((h) => {
+ items.push(h.items);
+ });
+ let postData: any = {"items": items};
- public setPluginMeta(metas: PluginType[]): void {
- if (!metas || metas.length < 1) {
- return;
- }
- this._plugins = metas;
+ if (savePluginEvent.serverForward) {
+ postData.serverForward = savePluginEvent.serverForward;
+ if (savePluginEvent.postPayload) {
+ postData = Object.assign(postData, savePluginEvent.postPayload);
+ }
}
-
- get plugins(): PluginType[] {
- return this._plugins;
+ // console.log([postData,savePluginEvent.postPayload]);
+ // console.log([heteroList.length, heteroList]);
+
+ basicModule.jsonPost(url, postData, savePluginEvent).then((r) => {
+ processCallback(r);
+ }).catch((e) => {
+ if (errProcessCallback) {
+ errProcessCallback(e);
+ }
+ });
+ }
+
+ @Input()
+ public set getCurrentAppCache(val: boolean) {
+ super.getCurrentAppCache = val;
+ }
+
+ filterDescriptor(h: HeteroList, pluginMetas: PluginType[], desc: Descriptor) {
+ let pt: PluginType;
+ let o: any;
+ let meta: PluginMeta;
+ for (let i = 0; i < pluginMetas.length; i++) {
+ pt = pluginMetas[i];
+ o = pt;
+ if (o.name && o.descFilter && h.identityId === o.name) {
+ meta = o;
+ return meta.descFilter.localDescFilter(desc);
+ }
}
+ return true;
+ }
- constructor(tisService: TISService, private router: Router, route: ActivatedRoute, modalService: NzModalService
- , notification: NzNotificationService
- , private cdr: ChangeDetectorRef, private drawerService: NzDrawerService) {
- super(tisService, route, modalService, notification);
- this.cdr.detach();
+ configCheck(h: HeteroList, item: Item, event: MouseEvent) {
+ let savePlugin = new SavePluginEvent();
+ savePlugin.verifyConfig = true;
+ savePlugin.notShowBizMsg = false;
+ // this.savePluginSetting(event, savePlugin);
+ if (!h.pluginCategory) {
+ throw new Error("pluginCategory can not be null");
}
-
- ngAfterViewInit(): void {
+ // console.log([this.plugins, h.pluginCategory]);
+ let nh = Object.assign(new HeteroList(), h);
+ nh.items = [item];
+ this._savePluginInfo(event, savePlugin, [h.pluginCategory], [nh]);
+ }
+
+ openNotebook(h: HeteroList, item: Item, event: MouseEvent) {
+
+ if (!item.dspt.notebook.activate) {
+ this.modalService.warning({
+ nzTitle: "错误",
+ nzContent: this.notebookNotActivate,
+ nzOkText: "知道啦"
+ });
+ return;
}
- ngOnInit() {
- // super.ngOnInit();
+ let savePlugin = new SavePluginEvent();
+ savePlugin.createOrGetNotebook = true;
+ if (!h.pluginCategory) {
+ throw new Error("pluginCategory can not be null");
}
-
- ngOnDestroy(): void {
- if (this.subscription) {
- this.subscription.unsubscribe();
- }
+ let nh = Object.assign(new HeteroList(), h);
+ nh.items = [item];
+ this._savePluginInfo(event, savePlugin, [h.pluginCategory], [nh]);
+ }
+
+ @Input()
+ set plugins(metas: PluginType[]) {
+ // console.log(metas);
+ this.setPluginMeta(metas);
+ if (!this.shallInitializePluginItems) {
+ this.initializePluginItems();
}
+ }
+ @Input()
+ set pluginMeta(metas: PluginType[]) {
+ this.setPluginMeta(metas);
+ }
- ngAfterContentInit(): void {
- if (this.savePlugin) {
- this.subscription = this.savePlugin.subscribe((e: SavePluginEvent) => {
- this.savePluginSetting(null, e || new SavePluginEvent());
- });
- }
- this.ajaxOccur.emit(new PluginSaveResponse(false, true));
- // console.log("shallInitializePluginItems:"+ this.shallInitializePluginItems);
- if (this.shallInitializePluginItems) {
- if (!this.plugins || this.plugins.length < 1) {
- throw new Error("plugin argument can not be null");
- }
- this.initializePluginItems();
- } else {
- this.cdr.reattach();
- this.cdr.detectChanges();
- }
+ public setPluginMeta(metas: PluginType[]): void {
+ if (!metas || metas.length < 1) {
+ return;
}
+ this._plugins = metas;
+ }
+ get plugins(): PluginType[] {
+ return this._plugins;
+ }
- public initializePluginItems() {
- // console.log(this.plugins);
- PluginsComponent.initializePluginItems(this, this.plugins, true, (success: boolean, hList: HeteroList[], showExtensionPoint: boolean) => {
- if (success) {
- this.showExtensionPoint.open = showExtensionPoint;
- this._heteroList = hList;
- this.afterInit.emit(this._heteroList);
- this.cdr.reattach();
- this.cdr.detectChanges();
- }
- this.ajaxOccur.emit(new PluginSaveResponse(success, false));
- });
- }
+ constructor(tisService: TISService, private router: Router, route: ActivatedRoute, modalService: NzModalService
+ , notification: NzNotificationService
+ , private cdr: ChangeDetectorRef, private drawerService: NzDrawerService) {
+ super(tisService, route, modalService, notification);
+ this.cdr.detach();
+ }
- submitForm(value: any): void {
- }
+ ngAfterViewInit(): void {
+ // console.log("ngAfterViewInit");
+ }
- protected initialize(app: CurrentCollection): void {
- }
+ ngOnInit() {
+ // super.ngOnInit();
+ }
- _savePlugin(event: MouseEvent) {
- let e = this.savePluginEventCreator();// new SavePluginEvent();
- e.verifyConfig = false;
- this.savePluginSetting(event, e);
+ ngOnDestroy(): void {
+ if (this.subscription) {
+ this.subscription.unsubscribe();
}
+ }
- @Input()
- private savePluginEventCreator = () => new SavePluginEvent();
- savePluginSetting(event: MouseEvent, savePluginEvent: SavePluginEvent) {
- this._savePluginInfo(event, savePluginEvent, this.plugins, this._heteroList);
+ ngAfterContentInit(): void {
+ if (this.savePlugin) {
+ this.subscription = this.savePlugin.subscribe((e: SavePluginEvent) => {
+ this.savePluginSetting(null, e || new SavePluginEvent());
+ });
}
+ this.ajaxOccur.emit(new PluginSaveResponse(false, true, null));
+ // console.log("shallInitializePluginItems:"+ this.shallInitializePluginItems);
+ if (this.shallInitializePluginItems) {
+ if (!this.plugins || this.plugins.length < 1) {
+ throw new Error("plugin argument can not be null");
+ }
+ this.initializePluginItems();
+ } else {
+ this.cdr.reattach();
+ this.cdr.detectChanges();
+ this.ajaxOccur.emit(new PluginSaveResponse(true, false, null));
+ }
+ }
+
+
+ public initializePluginItems() {
+ // console.log(this.plugins);
+ PluginsComponent.initializePluginItems(this, this.plugins, true, (success: boolean, hList: HeteroList[], showExtensionPoint: boolean) => {
+ if (success) {
+ this.showExtensionPoint.open = showExtensionPoint;
+ this._heteroList = hList;
+ this.afterInit.emit(this._heteroList);
+ this.cdr.reattach();
+ this.cdr.detectChanges();
+ }
+
+ this.ajaxOccur.emit(new PluginSaveResponse(success, false,null));
+ });
+ }
+
+ submitForm(value: any): void {
+ }
+
+ protected initialize(app: CurrentCollection): void {
+ }
+
+ _savePlugin(event: MouseEvent) {
+ let e = this.savePluginEventCreator();// new SavePluginEvent();
+ e.verifyConfig = false;
+ this.savePluginSetting(event, e);
+ }
+
+ @Input()
+ private savePluginEventCreator = () => new SavePluginEvent();
+
+ savePluginSetting(event: MouseEvent, savePluginEvent: SavePluginEvent) {
+ this._savePluginInfo(event, savePluginEvent, this.plugins, this._heteroList);
+ }
+
+ _savePluginInfo(event: MouseEvent, savePluginEvent: SavePluginEvent, pluginTypes: PluginType[], _heteroList: HeteroList[]) {
+ // console.log(JSON.stringify(this._heteroList.items));
+ this.ajaxOccur.emit(new PluginSaveResponse(false, true, savePluginEvent));
+ // console.log(this.plugins);
+ // let pluginMeta = PluginsComponent.getPluginMetaParams(this.plugins);
+ // 如果 传入的tisService 中设置了appname的header那可以通过plugin的表单提交一并提交到服务端
+ let formContext = !!savePluginEvent.basicModule ? savePluginEvent.basicModule : this;
+ // console.log(_heteroList);
+ PluginsComponent.postHeteroList(formContext, pluginTypes, _heteroList, savePluginEvent, this.errorsPageShow, (r) => {
+ // 成功了
+ this.ajaxOccur.emit(new PluginSaveResponse(r.success, false, savePluginEvent));
+ if (!savePluginEvent.verifyConfig && !savePluginEvent.createOrGetNotebook) {
+ this.afterSave.emit(new PluginSaveResponse(r.success, false, savePluginEvent ,r.bizresult));
+ } else {
+ if (savePluginEvent.verifyConfig && r.success) {
+ if (!r.msg || r.msg.length < 1) {
+ this.notification.create('success', '校验成功', "表单配置无误");
+ }
+ }
- _savePluginInfo(event: MouseEvent, savePluginEvent: SavePluginEvent, pluginTypes: PluginType[], _heteroList: HeteroList[]) {
- // console.log(JSON.stringify(this._heteroList.items));
- this.ajaxOccur.emit(new PluginSaveResponse(false, true));
- // console.log(this.plugins);
- // let pluginMeta = PluginsComponent.getPluginMetaParams(this.plugins);
- // 如果 传入的tisService 中设置了appname的header那可以通过plugin的表单提交一并提交到服务端
- let formContext = !!savePluginEvent.basicModule ? savePluginEvent.basicModule : this;
- // console.log(_heteroList);
- PluginsComponent.postHeteroList(formContext, pluginTypes, _heteroList, savePluginEvent, this.errorsPageShow, (r) => {
- // 成功了
- this.ajaxOccur.emit(new PluginSaveResponse(r.success, false));
- if (!savePluginEvent.verifyConfig && !savePluginEvent.createOrGetNotebook) {
- this.afterSave.emit(new PluginSaveResponse(r.success, false, r.bizresult));
- } else {
- if (savePluginEvent.verifyConfig && r.success) {
- if (!r.msg || r.msg.length < 1) {
- this.notification.create('success', '校验成功', "表单配置无误");
- }
- }
-
- if (savePluginEvent.createOrGetNotebook && r.success) {
- if (this.startNotebook.observers.length > 0) {
- this.startNotebook.emit(new PluginSaveResponse(r.success, false, r.bizresult));
- } else {
- const drawerRef = this.drawerService.create({
- nzWidth: "80%",
- nzPlacement: "right",
- nzContent: NotebookwrapperComponent,
- nzContentParams: {},
- nzClosable: false
- });
- // this.router.navigate()
-
- this.router.navigate(["/", {outlets: {"zeppelin": `z/zeppelin/notebook/${r.bizresult}`}}], {relativeTo: this.route})
- }
- }
- }
-
- if (!this.errorsPageShow && r.success) {
- // 如果在其他流程中嵌入执行（showSaveButton = false） 一般不需要显示成功信息
- if (this.showSaveButton && r.msg.length > 0) {
- // this.notification.create('success', '成功dd', r.msg[0]);
- }
- return;
- }
-
- this.processResult(r);
- this.cdr.detectChanges();
- let pluginErrorFields = r.errorfields;
- // console.log(pluginErrorFields);
- let index = 0;
- // let tmpHlist: HeteroList[] = [];
- _heteroList.forEach((h) => {
- let items: Item[] = h.items;
- let errorFields = pluginErrorFields[index++];
- // console.log(errorFields);
- Item.processErrorField(errorFields, items);
+ if (savePluginEvent.createOrGetNotebook && r.success) {
+ if (this.startNotebook.observers.length > 0) {
+ this.startNotebook.emit(new PluginSaveResponse(r.success, false, r.bizresult));
+ } else {
+ const drawerRef = this.drawerService.create({
+ nzWidth: "80%",
+ nzPlacement: "right",
+ nzContent: NotebookwrapperComponent,
+ nzContentParams: {},
+ nzClosable: false
});
- this.cdr.detectChanges();
- }, (err) => {
- this.ajaxOccur.emit(new PluginSaveResponse(false, false));
- });
+ // this.router.navigate()
- if (event) {
- event.stopPropagation();
+ this.router.navigate(["/", {outlets: {"zeppelin": `z/zeppelin/notebook/${r.bizresult}`}}], {relativeTo: this.route})
+ }
}
- }
+ }
- removeItem(hlist: HeteroList, i: Item) {
- let arr = hlist.items;
- let newArr: Item[] = [];
- arr.forEach(function (e) {
- if (e !== i) {
- newArr.push(e);
- }
- });
- hlist.items = newArr;
- }
-
- startScroll(event: NzAnchorLinkComponent) {
- // console.log(event);
- }
-
- addNewPluginItem(h: HeteroList, d: Descriptor) {
- Descriptor.addNewItem(h, d, false, (_, propVal) => propVal);
+ if (!this.errorsPageShow && r.success) {
+ // 如果在其他流程中嵌入执行（showSaveButton = false） 一般不需要显示成功信息
+ if (this.showSaveButton && r.msg.length > 0) {
+ // this.notification.create('success', '成功dd', r.msg[0]);
+ }
+ return;
+ }
+
+ this.processResult(r);
+ this.cdr.detectChanges();
+ let pluginErrorFields = r.errorfields;
+ // console.log(pluginErrorFields);
+ let index = 0;
+ // let tmpHlist: HeteroList[] = [];
+ _heteroList.forEach((h) => {
+ let items: Item[] = h.items;
+ let errorFields = pluginErrorFields[index++];
+ // console.log(errorFields);
+ Item.processErrorField(errorFields, items);
+ });
+ this.cdr.detectChanges();
+ }, (err) => {
+ this.ajaxOccur.emit(new PluginSaveResponse(false, false, savePluginEvent));
+ });
+
+ if (event) {
+ event.stopPropagation();
}
+ }
+
+ removeItem(hlist: HeteroList, i: Item) {
+ let arr = hlist.items;
+ let newArr: Item[] = [];
+ arr.forEach(function (e) {
+ if (e !== i) {
+ newArr.push(e);
+ }
+ });
+ hlist.items = newArr;
+ }
+
+ startScroll(event: NzAnchorLinkComponent) {
+ // console.log(event);
+ }
+
+ addNewPluginItem(h: HeteroList, d: Descriptor) {
+ Descriptor.addNewItem(h, d, false, (_, propVal) => propVal);
+ }
+
+
+ updateHeteroListDesc(h: HeteroList) {
+
+ PluginsComponent.getAllDesc(this, h.extensionPoint, h.endType)
+ .then((descMap) => {
+ if (h.descriptors.size !== descMap.size) {
+ h.updateDescriptor(descMap);
+ this.cdr.detectChanges();
+ }
+ });
+ }
- updateHeteroListDesc(h: HeteroList) {
+ static getAllDesc(form: BasicFormComponent, extensionPoint: string, entype: string): Promise> {
+ let params = "action=plugin_action&emethod=get_descs_by_extendpoint&extendpoint=" + extensionPoint;
- PluginsComponent.getAllDesc(this, h.extensionPoint, h.endType)
- .then((descMap) => {
- if (h.descriptors.size !== descMap.size) {
- h.updateDescriptor(descMap);
- this.cdr.detectChanges();
- }
- });
+ if (entype) {
+ params += `${PARAM_END_TYPE}${entype}`
}
-
- static getAllDesc(form: BasicFormComponent, extensionPoint: string, entype: string): Promise> {
- let params = "action=plugin_action&emethod=get_descs_by_extendpoint&extendpoint=" + extensionPoint;
-
- if (entype) {
- params += `${PARAM_END_TYPE}${entype}`
+ let url = "/coredefine/corenodemanage.ajax";
+ return form.httpPost(url, params)
+ .then((r) => {
+ if (r.success) {
+ let descMap = PluginsComponent.wrapDescriptors(r.bizresult)
+ return descMap;
}
-
- let url = "/coredefine/corenodemanage.ajax";
- return form.httpPost(url, params)
- .then((r) => {
- if (r.success) {
- let descMap = PluginsComponent.wrapDescriptors(r.bizresult)
- return descMap;
- }
- });
- }
+ });
+ }
}
@Component({
- selector: "notebook-cpt",
- template: `
-
+ selector: "notebook-cpt",
+ template: `
+
+ `
+ , styles: [
`
- , styles: [
- `
- `
- ]
+ `
+ ]
})
export class NotebookwrapperComponent implements OnInit {
- constructor(private router: Router, private route: ActivatedRoute) {
- }
+ constructor(private router: Router, private route: ActivatedRoute) {
+ }
- ngOnInit(): void {
- }
+ ngOnInit(): void {
+ }
- active(event: any) {
- }
+ active(event: any) {
+ }
}
// 如果不加这个component的话在父组件中添加一个新的item，之前已经输入值的input控件上的值就会消失，确实很奇怪
@Component({
- selector: 'item-prop-val',
- changeDetection: ChangeDetectionStrategy.Default,
- template: `
-
- {{_pp.label}}
-
-
-
-
+ selector: 'item-prop-val',
+ changeDetection: ChangeDetectionStrategy.Default,
+ template: `
+
+ {{_pp.label}}
+
+
+
+
@@ -881,591 +883,591 @@ export class NotebookwrapperComponent implements OnInit {
>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- `,
- styles: [
- `
- .form-label-verical {
- margin-top: 8px;
- }
-
- .field-help {
- cursor: pointer;
- display: inline-block;
- width: 20px;
- height: 16px;
- }
-
- .assist-btn i {
- margin-left: 2px;
- }
-
- .sub-prop {
- clear: both;
- margin-left: 0px;
- background-color: #f6f6f6;
- padding: 3px;
- border-left: 1px solid #cccccc;
- border-bottom: 1px solid #cccccc;
- border-right: 1px solid #cccccc;
- }
-
- .has-help-url {
- width: calc(100% - 10em);
- display: inline-block;
- }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- .desc-prop-descs {
- width: calc(100% - 4em);
- display: inline-block;
- }
- `
- ]
+
+
+
+
+
+
+
+
+ `,
+ styles: [
+ `
+ .form-label-verical {
+ margin-top: 8px;
+ }
+
+ .field-help {
+ cursor: pointer;
+ display: inline-block;
+ width: 20px;
+ height: 16px;
+ }
+
+ .assist-btn i {
+ margin-left: 2px;
+ }
+
+ .sub-prop {
+ clear: both;
+ margin-left: 0px;
+ background-color: #f6f6f6;
+ padding: 3px;
+ border-left: 1px solid #cccccc;
+ border-bottom: 1px solid #cccccc;
+ border-right: 1px solid #cccccc;
+ }
+
+ .has-help-url {
+ width: calc(100% - 10em);
+ display: inline-block;
+ }
+
+ .desc-prop-descs {
+ width: calc(100% - 4em);
+ display: inline-block;
+ }
+ `
+ ]
})
export class ItemPropValComponent extends BasicFormComponent implements AfterContentInit {
- _pp: ItemPropVal;
+ _pp: ItemPropVal;
- _pluginImpl: string;
+ _pluginImpl: string;
- passwordVisible = false;
+ passwordVisible = false;
- helpUrl: string = null;
- _disabled = false;
- createRouter: CreatorRouter = null;
- descContent: string = null;
- descContentShow = false;
- asyncHelp = false;
- @Input()
- formLevel: number;
+ helpUrl: string = null;
+ _disabled = false;
+ createRouter: CreatorRouter = null;
+ descContent: string = null;
+ descContentShow = false;
+ asyncHelp = false;
+ @Input()
+ formLevel: number;
- @Input()
- hide = false;
+ @Input()
+ hide = false;
- fieldTypeEnums = TYPE_ENUM;
+ fieldTypeEnums = TYPE_ENUM;
- @Input()
- pluginMeta: PluginType;
- @Input()
- formControlSpan = 13;
+ @Input()
+ pluginMeta: PluginType;
+ @Input()
+ formControlSpan = 13;
- @Input()
- set disabled(val: boolean) {
- this._disabled = val;
- }
+ @Input()
+ set disabled(val: boolean) {
+ this._disabled = val;
+ }
- @Input()
- set pluginImpl(val: string) {
- this._pluginImpl = val;
- }
+ @Input()
+ set pluginImpl(val: string) {
+ this._pluginImpl = val;
+ }
- get valSpan(): number {
- if (this.formLevel > 1) {
- return 18;
- }
- return this.formControlSpan;
+ get valSpan(): number {
+ if (this.formLevel > 1) {
+ return 18;
}
+ return this.formControlSpan;
+ }
+
+ constructor(tisService: TISService, modalService: NzModalService
+ , private cdr: ChangeDetectorRef, private drawerService: NzDrawerService, notification: NzNotificationService) {
+ super(tisService, modalService, notification);
+ }
+
+ freshDescPropDescriptors(pluginImpl: string, ip: ItemPropVal) {
+ let descVal = ip.descVal;
+ this.getAllDesc(pluginImpl, ip.key)
+ .then((descMap) => {
+ if (descVal.descriptors.size !== descMap.size) {
+ descVal.descriptors = descMap;
+ // h.updateDescriptor(descMap);
+ this.cdr.detectChanges();
+ // this.notification
+ this.notification.create('success', '成功', "已经成功更新\"" + ip.label + "\"的可选项");
+ } else {
+ this.notification.create('warning', '通知', "\"" + ip.label + "\"的可选项并没有变化");
+ }
+ });
+ }
- constructor(tisService: TISService, modalService: NzModalService
- , private cdr: ChangeDetectorRef, private drawerService: NzDrawerService, notification: NzNotificationService) {
- super(tisService, modalService, notification);
- }
+ addNewPlugin(pluginImpl: string, ip: ItemPropVal) {
+ let descVal = ip.descVal;
+ const drawerRef = PluginManageComponent.openPluginManage(this.drawerService, descVal.extendPoint, null, []);
- freshDescPropDescriptors(pluginImpl: string, ip: ItemPropVal) {
- let descVal = ip.descVal;
- this.getAllDesc(pluginImpl, ip.key)
- .then((descMap) => {
- if (descVal.descriptors.size !== descMap.size) {
- descVal.descriptors = descMap;
- // h.updateDescriptor(descMap);
- this.cdr.detectChanges();
- // this.notification
- this.notification.create('success', '成功', "已经成功更新\"" + ip.label + "\"的可选项");
- } else {
- this.notification.create('warning', '通知', "\"" + ip.label + "\"的可选项并没有变化");
- }
- });
- }
+ drawerRef.afterClose.subscribe((result) => {
+ this.freshDescPropDescriptors(pluginImpl, ip);
+ })
+ }
- addNewPlugin(pluginImpl: string, ip: ItemPropVal) {
- let descVal = ip.descVal;
- const drawerRef = PluginManageComponent.openPluginManage(this.drawerService, descVal.extendPoint, null, []);
+ private getAllDesc(extImpl: string, field: string): Promise> {
+ let params = "action=plugin_action&emethod=get_descs_by_field_of_desc&extImpl=" + extImpl + "&field=" + field;
- drawerRef.afterClose.subscribe((result) => {
- this.freshDescPropDescriptors(pluginImpl, ip);
- })
- }
- private getAllDesc(extImpl: string, field: string): Promise> {
- let params = "action=plugin_action&emethod=get_descs_by_field_of_desc&extImpl=" + extImpl + "&field=" + field;
+ let url = "/coredefine/corenodemanage.ajax";
+ return this.httpPost(url, params)
+ .then((r) => {
+ if (r.success) {
+ let descMap = PluginsComponent.wrapDescriptors(r.bizresult)
+ return descMap;
+ }
+ });
+ }
+ get horizontal(): boolean {
+ return this.formLevel < CONST_FORM_LAYOUT_VERTICAL;
+ }
- let url = "/coredefine/corenodemanage.ajax";
- return this.httpPost(url, params)
- .then((r) => {
- if (r.success) {
- let descMap = PluginsComponent.wrapDescriptors(r.bizresult)
- return descMap;
- }
- });
- }
+ get childHorizontal(): boolean {
+ return (this.formLevel + 1) < CONST_FORM_LAYOUT_VERTICAL;
+ }
- get horizontal(): boolean {
- return this.formLevel < CONST_FORM_LAYOUT_VERTICAL;
- }
+ get disabled(): boolean {
+ return (this._pp && this._pp.pk && this._pp.updateModel) || this._disabled;
+ }
- get childHorizontal(): boolean {
- return (this.formLevel + 1) < CONST_FORM_LAYOUT_VERTICAL;
- }
- get disabled(): boolean {
- return (this._pp && this._pp.pk && this._pp.updateModel) || this._disabled;
+ @Input() set pp(item: ItemPropVal) {
+ this._pp = item;
+ let hUrl = item.getEProp('helpUrl');
+ if (hUrl) {
+ this.helpUrl = hUrl;
}
+ this.asyncHelp = item.getEProp('asyncHelp');
- @Input() set pp(item: ItemPropVal) {
- this._pp = item;
- let hUrl = item.getEProp('helpUrl');
- if (hUrl) {
- this.helpUrl = hUrl;
- }
-
- this.asyncHelp = item.getEProp('asyncHelp');
-
- let descContent = item.getEProp('help');
- if (descContent) {
- this.descContent = descContent;
- }
-
- let creator = item.getEProp("creator");
- if (creator) {
- this.createRouter = creator;
- }
+ let descContent = item.getEProp('help');
+ if (descContent) {
+ this.descContent = descContent;
}
- openPluginDialog(_pp: ItemPropVal, targetPlugin: TargetPlugin) {
- let descName = targetPlugin.descName;
- let url = "/coredefine/corenodemanage.ajax";
- //console.log(this.pluginMeta);
- this.httpPost(url, "action=plugin_action&emethod=get_descriptor&name=" + descName + "&hetero=" + targetPlugin.hetero)
- .then((r) => {
- if (!r.success) {
- if (r.bizresult.notFoundExtension) {
- this.modalService.confirm({
- nzTitle: '确认',
- nzContent: `系统还没有安装名称为'${descName}'的插件，是否需要安装？`,
- nzOkText: '开始安装',
- nzCancelText: '取消',
- nzOnOk: () => {
- let endType = null;
-
- if (HeteroList.isDescFilterDefined(this.pluginMeta)) {
- endType = this.pluginMeta.descFilter.endType();
- }
- const drawerRef = PluginManageComponent.openPluginManage(this.drawerService, r.bizresult.notFoundExtension, endType, []);
- drawerRef.afterClose.subscribe(() => {
- // this.afterPluginAddClose.emit();
- })
- }
- });
- }
- return;
+ let creator = item.getEProp("creator");
+ if (creator) {
+ this.createRouter = creator;
+ }
+ }
+
+ openPluginDialog(_pp: ItemPropVal, targetPlugin: TargetPlugin) {
+ let descName = targetPlugin.descName;
+ let url = "/coredefine/corenodemanage.ajax";
+ //console.log(this.pluginMeta);
+ this.httpPost(url, "action=plugin_action&emethod=get_descriptor&name=" + descName + "&hetero=" + targetPlugin.hetero)
+ .then((r) => {
+ if (!r.success) {
+ if (r.bizresult.notFoundExtension) {
+ this.modalService.confirm({
+ nzTitle: '确认',
+ nzContent: `系统还没有安装名称为'${descName}'的插件，是否需要安装？`,
+ nzOkText: '开始安装',
+ nzCancelText: '取消',
+ nzOnOk: () => {
+ let endType = null;
+
+ if (HeteroList.isDescFilterDefined(this.pluginMeta)) {
+ endType = this.pluginMeta.descFilter.endType();
}
- let desc = PluginsComponent.wrapDescriptors(r.bizresult);
- desc.forEach((d) => {
- // console.log(targetPlugin);
- let pluginTp: PluginType = {
- name: targetPlugin.hetero,
- require: true,
- extraParam: "append_true,targetItemDesc_" + d.displayName
- };
- if (targetPlugin.extraParam) {
- pluginTp.extraParam += (',' + targetPlugin.extraParam);
- }
-
- PluginsComponent.openPluginInstanceAddDialog(this, d, pluginTp, "添加" + d.displayName, (biz) => {
- // console.log(_pp);
- switch (_pp.type) {
- case TYPE_ENUM: // enum
- // enum
- // db detail
- // let item: Item = Object.assign(new Item(d), );
- // let nn = new ValOption();
- // n.name = biz.detailed.identityName;
- // n.impl = d.impl;
-
- if (biz.detailed) {
- let db = biz.detailed;
- let enums = _pp.getEProp('enum');
- // console.log(enums);
- _pp.setEProp('enum', [{val: db.identityName, label: db.identityName}, ...enums]);
- } else {
- // console.log(biz);
- throw new Error('invalid biz:' + d.displayName);
- }
- break;
- case TYPE_PLUGIN_SELECTION: // select
- if (Array.isArray(biz)) {
- // select
- let ids: Array = biz;
- ids.forEach((id) => {
- let n = new ValOption();
- n.name = id;
- n.impl = d.impl;
- _pp.options = [n, ..._pp.options]
- });
- }
- break;
- default:
- throw new Error(`error type:${_pp.type}`);
- }
- });
- });
+ const drawerRef = PluginManageComponent.openPluginManage(this.drawerService, r.bizresult.notFoundExtension, endType, []);
+ drawerRef.afterClose.subscribe(() => {
+ // this.afterPluginAddClose.emit();
+ })
+ }
});
- }
-
- toggleDescContentShow() {
- if (this.asyncHelp) {
+ }
+ return;
+ }
+ let desc = PluginsComponent.wrapDescriptors(r.bizresult);
+ desc.forEach((d) => {
+ // console.log(targetPlugin);
+ let pluginTp: PluginType = {
+ name: targetPlugin.hetero,
+ require: true,
+ extraParam: "append_true,targetItemDesc_" + d.displayName
+ };
+ if (targetPlugin.extraParam) {
+ pluginTp.extraParam += (',' + targetPlugin.extraParam);
+ }
+
+ PluginsComponent.openPluginInstanceAddDialog(this, d, pluginTp, "添加" + d.displayName, (biz) => {
+ // console.log(_pp);
+ switch (_pp.type) {
+ case TYPE_ENUM: // enum
+ // enum
+ // db detail
+ // let item: Item = Object.assign(new Item(d), );
+ // let nn = new ValOption();
+ // n.name = biz.detailed.identityName;
+ // n.impl = d.impl;
+
+ if (biz.detailed) {
+ let db = biz.detailed;
+ let enums = _pp.getEProp('enum');
+ // console.log(enums);
+ _pp.setEProp('enum', [{val: db.identityName, label: db.identityName}, ...enums]);
+ } else {
+ // console.log(biz);
+ throw new Error('invalid biz:' + d.displayName);
+ }
+ break;
+ case TYPE_PLUGIN_SELECTION: // select
+ if (Array.isArray(biz)) {
+ // select
+ let ids: Array = biz;
+ ids.forEach((id) => {
+ let n = new ValOption();
+ n.name = id;
+ n.impl = d.impl;
+ _pp.options = [n, ..._pp.options]
+ });
+ }
+ break;
+ default:
+ throw new Error(`error type:${_pp.type}`);
+ }
+ });
+ });
+ });
+ }
- if (!this.descContent && !this.descContentShow) {
- let url = "/coredefine/corenodemanage.ajax";
+ toggleDescContentShow() {
+ if (this.asyncHelp) {
- let metas: PluginType[] = [];
- if (this.pluginMeta) {
- metas = [this.pluginMeta];
- }
+ if (!this.descContent && !this.descContentShow) {
+ let url = "/coredefine/corenodemanage.ajax";
- this.httpPost(url, `action=plugin_action&emethod=get_plugin_field_help&impl=${this._pluginImpl}&field=${this._pp.key}&plugin=${PluginsComponent.getPluginMetaParams(metas)}`).then((r) => {
- this.descContent = r.bizresult;
- this.descContentShow = true;
- this.cdr.detectChanges();
- });
- return;
- }
+ let metas: PluginType[] = [];
+ if (this.pluginMeta) {
+ metas = [this.pluginMeta];
}
- this.descContentShow = !this.descContentShow;
- }
- ngAfterContentInit(): void {
+ this.httpPost(url, `action=plugin_action&emethod=get_plugin_field_help&impl=${this._pluginImpl}&field=${this._pp.key}&plugin=${PluginsComponent.getPluginMetaParams(metas)}`).then((r) => {
+ this.descContent = r.bizresult;
+ this.descContentShow = true;
+ this.cdr.detectChanges();
+ });
+ return;
+ }
}
-
- changePlugin(_pp: ItemPropVal, impl: string) {
- // console.log(impl);
- delete _pp.error;
- _pp.descVal.clearPropVals();
- if (!impl) {
- return;
- }
- let dspt = _pp.descVal.descriptors.get(impl);
- _pp.descVal.newDesc = dspt;
- // console.log([_pp.descVal.impl,_pp.descVal.dspt]);
+ this.descContentShow = !this.descContentShow;
+ }
+
+ ngAfterContentInit(): void {
+ }
+
+ changePlugin(_pp: ItemPropVal, impl: string) {
+ // console.log(impl);
+ delete _pp.error;
+ _pp.descVal.clearPropVals();
+ if (!impl) {
+ return;
}
-
- inputValChange(_pp: ItemPropVal, $event: Event) {
- // console.log($event);
- delete _pp.error;
- // console.log("inputValChange");
- // $event.stopPropagation();
+ let dspt = _pp.descVal.descriptors.get(impl);
+ _pp.descVal.newDesc = dspt;
+ // console.log([_pp.descVal.impl,_pp.descVal.dspt]);
+ }
+
+ inputValChange(_pp: ItemPropVal, $event: Event) {
+ // console.log($event);
+ delete _pp.error;
+ // console.log("inputValChange");
+ // $event.stopPropagation();
+ }
+
+ updateAllChecked(itemVal: ItemPropVal) {
+ itemVal.error = undefined;
+ let _eprops: { string: any } = itemVal._eprops;
+ let checkOptionsOne = _eprops["enum"];
+ _eprops['indeterminate'] = false;
+ if (_eprops['allChecked']) {
+ checkOptionsOne = checkOptionsOne.map(item => {
+ return {
+ ...item,
+ checked: true
+ };
+ });
+ } else {
+ checkOptionsOne = checkOptionsOne.map(item => {
+ return {
+ ...item,
+ checked: false
+ };
+ });
}
-
- updateAllChecked(itemVal: ItemPropVal) {
- itemVal.error = undefined;
- let _eprops: { string: any } = itemVal._eprops;
- let checkOptionsOne = _eprops["enum"];
- _eprops['indeterminate'] = false;
- if (_eprops['allChecked']) {
- checkOptionsOne = checkOptionsOne.map(item => {
- return {
- ...item,
- checked: true
- };
- });
- } else {
- checkOptionsOne = checkOptionsOne.map(item => {
- return {
- ...item,
- checked: false
- };
- });
- }
- _eprops["enum"] = checkOptionsOne;
+ _eprops["enum"] = checkOptionsOne;
+ }
+
+ updateSingleChecked(itemVal: ItemPropVal) {
+ itemVal.error = undefined;
+ let _eprops: { string: any } = itemVal._eprops;
+ if (_eprops["enum"].every((item) => !item.checked)) {
+ // 全部都没有选中
+ _eprops['allChecked'] = false;
+ _eprops['indeterminate'] = false;
+ } else if (_eprops["enum"].every((item) => item.checked)) {
+ // 全部都选中了
+ _eprops['allChecked'] = true;
+ _eprops['indeterminate'] = false;
+ } else {
+ // 部分选中
+ _eprops['indeterminate'] = true;
}
-
- updateSingleChecked(itemVal: ItemPropVal) {
- itemVal.error = undefined;
- let _eprops: { string: any } = itemVal._eprops;
- if (_eprops["enum"].every((item) => !item.checked)) {
- // 全部都没有选中
- _eprops['allChecked'] = false;
- _eprops['indeterminate'] = false;
- } else if (_eprops["enum"].every((item) => item.checked)) {
- // 全部都选中了
- _eprops['allChecked'] = true;
- _eprops['indeterminate'] = false;
- } else {
- // 部分选中
- _eprops['indeterminate'] = true;
+ }
+
+
+ openSelectableInputManager(createRouter: CreatorRouter) {
+ // console.log(createRouter);
+ const drawerRef = this.drawerService.create({
+ nzWidth: "60%",
+ nzPlacement: "right",
+ nzTitle: `基础配置录入`,
+ nzContent: SelectionInputAssistComponent,
+ // nzWrapClassName: 'get-gen-cfg-file',
+ nzContentParams: {'createCfg': createRouter}
+ });
+ drawerRef.afterClose.subscribe(() => {
+ let cpt = drawerRef.getContentComponent();
+ if (cpt.hasSaved) {
+ this.reloadSelectableItems();
+ }
+ });
+ }
+
+ reloadSelectableItems() {
+ let url = "/coredefine/corenodemanage.ajax";
+ this.httpPost(url, `action=plugin_action&emethod=get_fresh_enum_field&impl=${this._pluginImpl}&field=${this._pp.key}`)
+ .then((r) => {
+ if (!r.success) {
+ return;
}
- }
-
-
- openSelectableInputManager(createRouter: CreatorRouter) {
- // console.log(createRouter);
- const drawerRef = this.drawerService.create({
- nzWidth: "60%",
- nzPlacement: "right",
- nzTitle: `基础配置录入`,
- nzContent: SelectionInputAssistComponent,
- // nzWrapClassName: 'get-gen-cfg-file',
- nzContentParams: {'createCfg': createRouter}
- });
- drawerRef.afterClose.subscribe(() => {
- let cpt = drawerRef.getContentComponent();
- if (cpt.hasSaved) {
- this.reloadSelectableItems();
+ switch (this._pp.type) {
+ case TYPE_ENUM:
+ if (!Array.isArray(r.bizresult)) {
+ throw new Error('bizresult must be a Array');
}
- });
- }
-
- reloadSelectableItems() {
- let url = "/coredefine/corenodemanage.ajax";
- this.httpPost(url, `action=plugin_action&emethod=get_fresh_enum_field&impl=${this._pluginImpl}&field=${this._pp.key}`)
- .then((r) => {
- if (!r.success) {
- return;
- }
- switch (this._pp.type) {
- case TYPE_ENUM:
- if (!Array.isArray(r.bizresult)) {
- throw new Error('bizresult must be a Array');
- }
- let cols: Array<{ name: string, value: string }> = [];
- (>r.bizresult).forEach((e) => {
- cols.push({name: e.label, value: e.val})
- })
- this._pp.setPropValEnums(cols, (optVal) => this._pp.primary === optVal);
-
- break;
- case TYPE_PLUGIN_SELECTION:
- let opts: ValOption[] = [];
- if (!Array.isArray(r.bizresult)) {
- throw new Error(r.bizresult);
- }
- r.bizresult.forEach((opt) => {
- opts.push(Object.assign(new ValOption(), opt));
- });
- this._pp.options = opts;
- break;
- default:
- throw new Error(`illegal field type:${this._pp.type}`);
- }
- this.successNotify(`'${this._pp.label}'可选内容已经刷新`, 2000);
- this.cdr.detectChanges();
+ let cols: Array<{ name: string, value: string }> = [];
+ (>r.bizresult).forEach((e) => {
+ cols.push({name: e.label, value: e.val})
+ })
+ this._pp.setPropValEnums(cols, (optVal) => this._pp.primary === optVal);
+
+ break;
+ case TYPE_PLUGIN_SELECTION:
+ let opts: ValOption[] = [];
+ if (!Array.isArray(r.bizresult)) {
+ throw new Error(r.bizresult);
+ }
+ r.bizresult.forEach((opt) => {
+ opts.push(Object.assign(new ValOption(), opt));
});
- }
-
- handleFileUploadChange(_pp: ItemPropVal, event: NzUploadChangeParam) {
- if (event.file.status === 'done') {
- _pp.primary = event.file.response.bizresult.file + ";" + event.file.name;
- // console.log([event, _pp.primary]);
+ this._pp.options = opts;
+ break;
+ default:
+ throw new Error(`illegal field type:${this._pp.type}`);
}
-
+ this.successNotify(`'${this._pp.label}'可选内容已经刷新`, 2000);
+ this.cdr.detectChanges();
+ });
+ }
+
+ handleFileUploadChange(_pp: ItemPropVal, event: NzUploadChangeParam) {
+ if (event.file.status === 'done') {
+ _pp.primary = event.file.response.bizresult.file + ";" + event.file.name;
+ // console.log([event, _pp.primary]);
}
+
+ }
}
@Component({
- changeDetection: ChangeDetectionStrategy.Default,
- template: `
- `
+ changeDetection: ChangeDetectionStrategy.Default,
+ template: `
+ `
})
export class SelectionInputAssistComponent extends BasicFormComponent implements OnInit {
- @Input()
- createCfg: CreatorRouter;
- pluginTyps: PluginType[] = [];
- hasSaved: boolean;
-
- constructor(tisService: TISService, modalService: NzModalService, notification: NzNotificationService, private drawerRef: NzDrawerRef) {
- super(tisService, modalService, notification);
+ @Input()
+ createCfg: CreatorRouter;
+ pluginTyps: PluginType[] = [];
+ hasSaved: boolean;
+
+ constructor(tisService: TISService, modalService: NzModalService, notification: NzNotificationService, private drawerRef: NzDrawerRef) {
+ super(tisService, modalService, notification);
+ }
+
+ private reducePluginType(): Map> {
+ let tp: TargetPlugin;
+ let reducePluginType: Map> = new Map>();
+ let tplugins: Array;
+ for (let i = 0; i < this.createCfg.plugin.length; i++) {
+ tp = this.createCfg.plugin[i];
+ tplugins = reducePluginType.get(tp.hetero);
+ if (!tplugins) {
+ tplugins = new Array();
+ reducePluginType.set(tp.hetero, tplugins);
+ }
+ tplugins.push(tp);
}
-
- private reducePluginType(): Map> {
- let tp: TargetPlugin;
- let reducePluginType: Map> = new Map>();
- let tplugins: Array;
- for (let i = 0; i < this.createCfg.plugin.length; i++) {
- tp = this.createCfg.plugin[i];
- tplugins = reducePluginType.get(tp.hetero);
- if (!tplugins) {
- tplugins = new Array();
- reducePluginType.set(tp.hetero, tplugins);
- }
- tplugins.push(tp);
+ return reducePluginType;
+ }
+
+ ngOnInit(): void {
+ // let tp: TargetPlugin;
+ this.pluginTyps = [];
+
+ let reducePluginType: Map> = this.reducePluginType();
+
+ for (const [key, val] of reducePluginType.entries()) {
+ // console.log(key);
+ // console.log(val);
+ let extraParam = null;
+ let descFilter = {
+ localDescFilter: (desc) => true
+ };
+ let tp: TargetPlugin = {hetero: key};
+ if (val.length === 1) {
+ tp = val[0];
+ extraParam = "targetItemDesc_" + tp.descName;
+ if (tp.extraParam) {
+ extraParam += (',' + tp.extraParam);
}
- return reducePluginType;
+ descFilter = {
+ localDescFilter: (desc) => {
+ return desc.displayName === tp.descName;
+ }
+ };
+ }
+
+ this.pluginTyps.push({
+ name: tp.hetero
+ , require: true
+ , extraParam: extraParam
+ , descFilter: descFilter
+ });
}
- ngOnInit(): void {
- // let tp: TargetPlugin;
- this.pluginTyps = [];
-
- let reducePluginType: Map> = this.reducePluginType();
-
- for (const [key, val] of reducePluginType.entries()) {
- // console.log(key);
- // console.log(val);
- let extraParam = null;
- let descFilter = {
- localDescFilter: (desc) => true
- };
- let tp: TargetPlugin = {hetero: key};
- if (val.length === 1) {
- tp = val[0];
- extraParam = "targetItemDesc_" + tp.descName;
- if (tp.extraParam) {
- extraParam += (',' + tp.extraParam);
- }
- descFilter = {
- localDescFilter: (desc) => {
- return desc.displayName === tp.descName;
- }
- };
- }
-
- this.pluginTyps.push({
- name: tp.hetero
- , require: true
- , extraParam: extraParam
- , descFilter: descFilter
- });
- }
-
- // for (let i = 0; i < this.createCfg.plugin.length; i++) {
- // tp = this.createCfg.plugin[i];
- // let extraParam = "targetItemDesc_" + tp.descName;
- // if (tp.extraParam) {
- // extraParam += (',' + tp.extraParam);
- // }
- // this.pluginTyps.push({
- // name: tp.hetero
- // , require: true
- // , extraParam: extraParam
- // , descFilter: {
- // localDescFilter: (desc) => {
- // return desc.displayName === tp.descName;
- // }
- // }
- // });
- // }
- }
-
- whenAjaxOccur(e: PluginSaveResponse) {
-
- }
-
- afterSave(e: PluginSaveResponse) {
- this.hasSaved = e.saveSuccess;
- if (e.saveSuccess) {
- this.drawerRef.close();
- }
+ // for (let i = 0; i < this.createCfg.plugin.length; i++) {
+ // tp = this.createCfg.plugin[i];
+ // let extraParam = "targetItemDesc_" + tp.descName;
+ // if (tp.extraParam) {
+ // extraParam += (',' + tp.extraParam);
+ // }
+ // this.pluginTyps.push({
+ // name: tp.hetero
+ // , require: true
+ // , extraParam: extraParam
+ // , descFilter: {
+ // localDescFilter: (desc) => {
+ // return desc.displayName === tp.descName;
+ // }
+ // }
+ // });
+ // }
+ }
+
+ whenAjaxOccur(e: PluginSaveResponse) {
+
+ }
+
+ afterSave(e: PluginSaveResponse) {
+ this.hasSaved = e.saveSuccess;
+ if (e.saveSuccess) {
+ this.drawerRef.close();
}
+ }
}
interface CreatorRouter {
- routerLink: string;
- label: string;
- plugin: Array;
+ routerLink: string;
+ label: string;
+ plugin: Array;
}
interface TargetPlugin {
- hetero: PluginName;
- extraParam?: string;
- descName?: string;
+ hetero: PluginName;
+ extraParam?: string;
+ descName?: string;
}
export interface OpenPluginDialogOptions {
- shallLoadSavedItems: boolean;
- /**
- * 是否要覆写创建SavePluginEvent的行为
- */
- savePluginEventCreator?: () => SavePluginEvent;
+ shallLoadSavedItems: boolean;
+ /**
+ * 是否要覆写创建SavePluginEvent的行为
+ */
+ savePluginEventCreator?: () => SavePluginEvent;
}
diff --git a/src/common/tis.plugin.ts b/src/common/tis.plugin.ts
index c0a54f0..d97e4cf 100644
--- a/src/common/tis.plugin.ts
+++ b/src/common/tis.plugin.ts
@@ -33,32 +33,32 @@ export const PARAM_END_TYPE = "&endType=";
export const KEY_OPTIONS_ENUM = "enum";
export declare type PluginName =
- 'mq'
- | 'incr-config'
- | 'sinkFactory'
- | 'k8s-config'
- | 'fs'
- | 'datasource'
- | 'dataxReader'
- | 'params-cfg'
- | 'appSource'
- | 'dataxWriter'
- | 'datax-worker'
- // @ts-ignore
- | PowerjobCptType.JobTplAppOverwrite // 'powerjob-job-tpl-app-overwrite'
+ 'mq'
+ | 'incr-config'
+ | 'sinkFactory'
+ | 'k8s-config'
+ | 'fs'
+ | 'datasource'
+ | 'dataxReader'
+ | 'params-cfg'
+ | 'appSource'
+ | 'dataxWriter'
+ | 'datax-worker'
+ // @ts-ignore
+ | PowerjobCptType.JobTplAppOverwrite // 'powerjob-job-tpl-app-overwrite'
export declare type PluginMeta = {
- skipSubformDescNullError?: boolean;
- name: PluginName, require: boolean
- // key1_val1,key2_val2
- , extraParam?: string
- // &key=val&key=val
- , appendParams?: Array<{key:string,val:string}>
- // 服务端对目标Item的desc进行过滤
- , descFilter?:
- { // 插件安装panel需要过滤的端类型
- endType?: () => string,
- localDescFilter: (desc: Descriptor) => boolean
- }
+ skipSubformDescNullError?: boolean;
+ name: PluginName, require: boolean
+ // key1_val1,key2_val2
+ , extraParam?: string
+ // &key=val&key=val
+ , appendParams?: Array<{ key: string, val: string }>
+ // 服务端对目标Item的desc进行过滤
+ , descFilter?:
+ { // 插件安装panel需要过滤的端类型
+ endType?: () => string,
+ localDescFilter: (desc: Descriptor) => boolean
+ }
};
export declare type PluginType = PluginName | PluginMeta;
@@ -68,886 +68,893 @@ export const TYPE_PLUGIN_MULTI_SELECTION = 8;
export const KEY_DEFAULT_VALUE = 'dftVal';
export class ErrorFeedback {
- _error: string | any;
+ _error: string | any;
- constructor(error?: string) {
- this._error = error;
- }
+ constructor(error?: string) {
+ this._error = error;
+ }
- public get error(): string | any {
- return this._error;
- }
+ public get error(): string | any {
+ return this._error;
+ }
- public set error(content: string | any) {
- this._error = content;
- }
+ public set error(content: string | any) {
+ this._error = content;
+ }
- get hasFeedback(): boolean {
- let err = this.error;
- return !(!err) && typeof err === "string";
- }
+ get hasFeedback(): boolean {
+ let err = this.error;
+ return !(!err) && typeof err === "string";
+ }
- get validateStatus(): string {
- return this.hasFeedback ? 'error' : '';
- }
+ get validateStatus(): string {
+ return this.hasFeedback ? 'error' : '';
+ }
}
// 某一插件某一属性行
export class ItemPropVal extends ErrorFeedback {
- key: string;
- type: number;
- options: Array;
- required: boolean;
- // 如果考到通用性的化这里应该是数组类型，现在考虑到简单实现，线默认用一个单独的
- descVal: DescribleVal;
- advance: boolean;
- // _error: string | any;
- public _eprops: { string: any };
- private dftVal: any;
- placeholder: string;
- _primaryVal: any = undefined;
- // 是否是主键
- pk: boolean;
- has_set_primaryVal = false;
- disabled = false;
-
-
- constructor(public updateModel = false) {
- // console.log("create");
- super();
- }
-
-
- set eprops(vals: { String: any }) {
- // @ts-ignore
- this._eprops = vals || {};
- this.dftVal = this._eprops[KEY_DEFAULT_VALUE];
- this.placeholder = this._eprops['placeholder'] || '';
- }
-
- public setMcolsEnums(elementKeys: Array, dbLatestMcols: Array, mcols: Array, typeMetas: Array) {
- let tabView = new TabletView(elementKeys, dbLatestMcols, mcols, typeMetas);
- this.setEProp(KEY_OPTIONS_ENUM, tabView);
- }
-
- public get isMcolsEnums(): boolean {
- let enumVal = this.getEProp(KEY_OPTIONS_ENUM)
- return enumVal instanceof TabletView;
- }
-
- public get mcolsEnums(): TabletView {
- let enumVal = this.getEProp(KEY_OPTIONS_ENUM)
- return enumVal;
- }
-
- public setPropValEnums(cols: Array<{ name: string, value: string }>, colItemChecked?: (optVal) => boolean) {
- // console.log([cols, colItemChecked]);
- if (!colItemChecked) {
- colItemChecked = (_) => true;
- }
- let enums: Array = [];
- cols.forEach((s) => {
- enums.push({label: s.name, val: s.value, checked: colItemChecked(s.value)})
- });
- this.setEProp(KEY_OPTIONS_ENUM, enums);
- }
-
-
- get label(): string {
- let label = this._eprops['label'];
- return label ? label : this.key;
- }
-
- /**
- * 当
- */
- get enumMode(): NzSelectModeType {
- return this.getEProp('enumMode') || 'default';
- }
-
- public getEProp(key: string): any {
- return this._eprops[key];
- }
-
- public setEProp(key: string, val: any): void {
- this._eprops[key] = val;
- }
-
-
- set primary(val: any) {
- this._primaryVal = val;
- }
-
- get primary(): any {
-
- if (!this.updateModel && !this.has_set_primaryVal && this.dftVal !== undefined) {
- // 新增模式下
- this._primaryVal = this.dftVal;
- this.has_set_primaryVal = true;
- }
- if (this._primaryVal === undefined) {
- this._primaryVal = (this.type === TYPE_ENUM && this.enumMode === 'multiple') ? [] : '';
- }
- return this._primaryVal;
- // return this.updateModel ? this._primaryVal : this.dftVal;
- }
-
- get primaryVal(): boolean {
- return !(this.descVal);
- }
+ key: string;
+ type: number;
+ options: Array;
+ required: boolean;
+ // 如果考到通用性的化这里应该是数组类型，现在考虑到简单实现，线默认用一个单独的
+ descVal: DescribleVal;
+ advance: boolean;
+ // _error: string | any;
+ public _eprops: { string: any };
+ private dftVal: any;
+ placeholder: string;
+ _primaryVal: any = undefined;
+ // 是否是主键
+ pk: boolean;
+ has_set_primaryVal = false;
+ disabled = false;
+
+
+ constructor(public updateModel = false) {
+ // console.log("create");
+ super();
+ }
+
+
+ set eprops(vals: { String: any }) {
+ // @ts-ignore
+ this._eprops = vals || {};
+ this.dftVal = this._eprops[KEY_DEFAULT_VALUE];
+ this.placeholder = this._eprops['placeholder'] || '';
+ }
+
+ public setMcolsEnums(elementKeys: Array, dbLatestMcols: Array, mcols: Array, typeMetas: Array) {
+ let tabView = new TabletView(elementKeys, dbLatestMcols, mcols, typeMetas);
+ this.setEProp(KEY_OPTIONS_ENUM, tabView);
+ }
+
+ public get isMcolsEnums(): boolean {
+ let enumVal = this.getEProp(KEY_OPTIONS_ENUM)
+ return enumVal instanceof TabletView;
+ }
+
+ public get mcolsEnums(): TabletView {
+ let enumVal = this.getEProp(KEY_OPTIONS_ENUM)
+ return enumVal;
+ }
+
+ public setPropValEnums(cols: Array<{ name: string, value: string }>, colItemChecked?: (optVal) => boolean) {
+ // console.log([cols, colItemChecked]);
+ if (!colItemChecked) {
+ colItemChecked = (_) => true;
+ }
+ let enums: Array = [];
+ cols.forEach((s) => {
+ enums.push({label: s.name, val: s.value, checked: colItemChecked(s.value)})
+ });
+ this.setEProp(KEY_OPTIONS_ENUM, enums);
+ }
+
+
+ get label(): string {
+ let label = this._eprops['label'];
+ return label ? label : this.key;
+ }
+
+ /**
+ * 当
+ */
+ get enumMode(): NzSelectModeType {
+ return this.getEProp('enumMode') || 'default';
+ }
+
+ public getEProp(key: string): any {
+ return this._eprops[key];
+ }
+
+ public setEProp(key: string, val: any): void {
+ this._eprops[key] = val;
+ }
+
+
+ set primary(val: any) {
+ this._primaryVal = val;
+ }
+
+ get primary(): any {
+
+ if (!this.updateModel && !this.has_set_primaryVal && this.dftVal !== undefined) {
+ // 新增模式下
+ this._primaryVal = this.dftVal;
+ this.has_set_primaryVal = true;
+ }
+ if (this._primaryVal === undefined) {
+ this._primaryVal = (this.type === TYPE_ENUM && this.enumMode === 'multiple') ? [] : '';
+ }
+ return this._primaryVal;
+ // return this.updateModel ? this._primaryVal : this.dftVal;
+ }
+
+ get primaryVal(): boolean {
+ return !(this.descVal);
+ }
}
export class Descriptor {
- // 表单内嵌深度，深度到达一定深度，表单的布局需要调整一下
- formLevel: number;
- impl: string;
- implUrl: string;
- containAdvance: boolean;
- displayName: string;
- extendPoint: string;
- attrs: AttrDesc[];
- extractProps: { string: any };
- veriflable: boolean;
- pkField: string;
- // subform relevant
-
- subFormMeta: {
- behaviorMeta: any,
- fieldName: string,
- idList: Array
- id?: string,
- }
- subForm: boolean;
-
- public get endtype(): string {
- return this.extractProps['endType'];
- }
-
- public get supportIcon(): boolean {
- return !!this.extractProps['supportIcon'];
- }
-
- /**
- *
- * @param h
- * @param des
- * @param updateModel 是否是更新模式，在更新模式下，插件的默认值不能设置到控件上去
- */
- public static addNewItem(h: HeteroList, des: Descriptor, updateModel: boolean
- , itemPropSetter: (key: string, propVal: ItemPropVal) => ItemPropVal): void {
- let nItem = new Item(des);
- nItem.displayName = des.displayName;
- nItem.implUrl = des.implUrl;
- // nItem.containAdvance = des.containAdvance;
- des.attrs.forEach((attr) => {
- nItem.vals[attr.key] = itemPropSetter(attr.key, attr.addNewEmptyItemProp(updateModel));
- });
- let nitems: Item[] = [];
- // console.log(h.items);
- h.items.forEach((r) => {
- nitems.push(r);
- });
- //
- nitems.push(nItem);
-
- h.items = nitems;
- }
-
-
- public static addNewItemByDescs(h: HeteroList, decs: Array, updateModel: boolean
- , itemPropSetter: (key: string, propVal: ItemPropVal) => ItemPropVal): void {
- let des: Descriptor;
- // let nitems: Item[] = [];
- for (let index = 0; index < decs.length; index++) {
- des = decs[index];
- Descriptor.addNewItem(h, des, updateModel, itemPropSetter);
- }
- }
-
- public get eprops(): PluginExtraProps {
- let extraProps: PluginExtraProps = this.extractProps;
- return extraProps;
- }
-
- public get notebook(): NotebookMeta {
- let note: NotebookMeta = this.extractProps["notebook"];
- return note;
- }
-
- public get supportBatch(): boolean {
- return !!this.extractProps["supportBatch"];
- }
+ // 表单内嵌深度，深度到达一定深度，表单的布局需要调整一下
+ formLevel: number;
+ impl: string;
+ implUrl: string;
+ containAdvance: boolean;
+ displayName: string;
+ extendPoint: string;
+ attrs: AttrDesc[];
+ extractProps: { string: any };
+ veriflable: boolean;
+ pkField: string;
+ // subform relevant
+
+ subFormMeta: {
+ behaviorMeta: any,
+ fieldName: string,
+ idList: Array
+ id?: string,
+ }
+ subForm: boolean;
+
+ public get endtype(): string {
+ return this.extractProps['endType'];
+ }
+
+ public get supportIcon(): boolean {
+ return !!this.extractProps['supportIcon'];
+ }
+
+ /**
+ *
+ * @param h
+ * @param des
+ * @param updateModel 是否是更新模式，在更新模式下，插件的默认值不能设置到控件上去
+ */
+ public static addNewItem(h: HeteroList, des: Descriptor, updateModel: boolean
+ , itemPropSetter: (key: string, propVal: ItemPropVal) => ItemPropVal): void {
+ let nItem = new Item(des);
+ nItem.displayName = des.displayName;
+ nItem.implUrl = des.implUrl;
+ // nItem.containAdvance = des.containAdvance;
+ des.attrs.forEach((attr) => {
+ nItem.vals[attr.key] = itemPropSetter(attr.key, attr.addNewEmptyItemProp(updateModel));
+ });
+ let nitems: Item[] = [];
+ // console.log(h.items);
+ h.items.forEach((r) => {
+ nitems.push(r);
+ });
+ //
+ nitems.push(nItem);
+
+ h.items = nitems;
+ }
+
+
+ public static addNewItemByDescs(h: HeteroList, decs: Array, updateModel: boolean
+ , itemPropSetter: (key: string, propVal: ItemPropVal) => ItemPropVal): void {
+ let des: Descriptor;
+ // let nitems: Item[] = [];
+ for (let index = 0; index < decs.length; index++) {
+ des = decs[index];
+ Descriptor.addNewItem(h, des, updateModel, itemPropSetter);
+ }
+ }
+
+ public get eprops(): PluginExtraProps {
+ let extraProps: PluginExtraProps = this.extractProps;
+ return extraProps;
+ }
+
+ public get notebook(): NotebookMeta {
+ let note: NotebookMeta = this.extractProps["notebook"];
+ return note;
+ }
+
+ public get supportBatch(): boolean {
+ return !!this.extractProps["supportBatch"];
+ }
}
export interface NotebookMeta {
- // 是否可用
- ability: boolean;
- // 服务端是否激活
- activate: boolean;
+ // 是否可用
+ ability: boolean;
+ // 服务端是否激活
+ activate: boolean;
}
export interface TisResponseResult {
- bizresult?: any;
- success: boolean;
- errormsg?: string[];
- action_error_page_show?: boolean;
- msg?: Array;
- errorfields?: Array>>;
+ bizresult?: any;
+ success: boolean;
+ errormsg?: string[];
+ action_error_page_show?: boolean;
+ msg?: Array;
+ errorfields?: Array>>;
}
export class TabletView implements NextObserver {
- /**
- *
- * @param _elementKeys ReaderColMeta 中包含哪些keys
- * @param _dbLatestMcols
- * @param _mcols
- * @param _typeMetas
- */
- constructor(private _elementKeys: Array, private _dbLatestMcols: Array, private _mcols: Array, private _typeMetas: Array) {
- let index = 0;
- // console.log(this._mcols);
- // console.log(this._dbLatestMcols);
- this._mcols.forEach((c: ReaderColMeta) => {
- c.index = ++index;
- c.ip = new ItemPropVal();
- // @ts-ignore
- c.extraProps = c.extraProps | {}
-
- RowAssist.setDocFieldSplitMetas(c
- , RowAssist.getDocFieldSplitMetas(c).map((r) => new RowAssist(r.name, r.jsonPath, r.type)));
- });
-
- // 删除字段测试
- // let tmp = [];
- // this._dbLatestMcols.forEach((cm) => {
- // if (cm.name !== "member_price") {
- // tmp.push(cm);
- // }
- // });
- // this._dbLatestMcols = tmp;
- index = 0;
- this._dbLatestMcols.forEach((c) => {
- c.index = ++index;
- c.ip = new ItemPropVal();
- // @ts-ignore
- c.extraProps = c.extraProps | {}
- RowAssist.setDocFieldSplitMetas(c
- , RowAssist.getDocFieldSplitMetas(c).map((r) => new RowAssist(r.name, r.jsonPath, r.type)));
- });
- }
-
- next(errorContent: any): void {
- // console.log(errorContent);
- }
-
-
- public get isContainDBLatestMcols(): boolean {
- return !!this._dbLatestMcols;
- }
-
- public get mcols(): Array {
- return this._mcols;
- }
-
- /**
- * 数据库中可能添加了新的字段，或者已经删除了某列
- */
- public synchronizeMcols(): SynchronizeMcolsResult {
- // return this._mcols;
- let syncResult: SynchronizeMcolsResult;
- if (this._dbLatestMcols) {
- let result = [];
- syncResult = new SynchronizeMcolsResult(result);
- let lastestCol: ReaderColMeta;
- let col: ReaderColMeta;
- let idxCol = 0;
- outter: for (let i = 0; i < this._dbLatestMcols.length; i++) {
- lastestCol = this._dbLatestMcols[i];
- while (idxCol < this._mcols.length) {
- col = this._mcols[idxCol];
- if (lastestCol.name === col.name) {
- col.index = i + 1;
- result.push(col);
- idxCol++;
- } else {
- let find = -1;
- if ((find = this.findRemain(lastestCol, idxCol + 1)) < 0) {
- // 说明 lastestCol 是数据库中新增的
- syncResult.newAddCols.push(lastestCol.name);
- } else {
- // 说明 col 已经在数据库中被删除了，那应该跳过了
- syncResult.deletedCols.push(col.name);
- idxCol = find;
- lastestCol = this._mcols[idxCol++];
- }
- lastestCol.index = i + 1;
- result.push(lastestCol);
- // 需要遍历需要的所有
-
- }
- continue outter;
- }
+ /**
+ *
+ * @param _elementKeys ReaderColMeta 中包含哪些keys
+ * @param _dbLatestMcols
+ * @param _mcols
+ * @param _typeMetas
+ */
+ constructor(private _elementKeys: Array, private _dbLatestMcols: Array, private _mcols: Array, private _typeMetas: Array) {
+ let index = 0;
+ // console.log(this._mcols);
+ // console.log(this._dbLatestMcols);
+ this._mcols.forEach((c: ReaderColMeta) => {
+ c.index = ++index;
+ c.ip = new ItemPropVal();
+ // @ts-ignore
+ c.extraProps = c.extraProps | {}
+
+ RowAssist.setDocFieldSplitMetas(c
+ , RowAssist.getDocFieldSplitMetas(c).map((r) => new RowAssist(r.name, r.jsonPath, r.type)));
+ });
+
+ // 删除字段测试
+ // let tmp = [];
+ // this._dbLatestMcols.forEach((cm) => {
+ // if (cm.name !== "member_price") {
+ // tmp.push(cm);
+ // }
+ // });
+ // this._dbLatestMcols = tmp;
+ index = 0;
+ this._dbLatestMcols.forEach((c) => {
+ c.index = ++index;
+ c.ip = new ItemPropVal();
+ // @ts-ignore
+ c.extraProps = c.extraProps | {}
+ RowAssist.setDocFieldSplitMetas(c
+ , RowAssist.getDocFieldSplitMetas(c).map((r) => new RowAssist(r.name, r.jsonPath, r.type)));
+ });
+ }
+
+ next(errorContent: any): void {
+ // console.log(errorContent);
+ }
+
+
+ public get isContainDBLatestMcols(): boolean {
+ return !!this._dbLatestMcols;
+ }
+
+ public get mcols(): Array {
+ return this._mcols;
+ }
+
+ /**
+ * 数据库中可能添加了新的字段，或者已经删除了某列
+ */
+ public synchronizeMcols(): SynchronizeMcolsResult {
+ // return this._mcols;
+ let syncResult: SynchronizeMcolsResult;
+ if (this._dbLatestMcols) {
+ let result = [];
+ syncResult = new SynchronizeMcolsResult(result);
+ let lastestCol: ReaderColMeta;
+ let col: ReaderColMeta;
+ let idxCol = 0;
+ outter: for (let i = 0; i < this._dbLatestMcols.length; i++) {
+ lastestCol = this._dbLatestMcols[i];
+ while (idxCol < this._mcols.length) {
+ col = this._mcols[idxCol];
+ if (lastestCol.name === col.name) {
+ col.index = i + 1;
+ result.push(col);
+ idxCol++;
+ } else {
+ let find = -1;
+ if ((find = this.findRemain(lastestCol, idxCol + 1)) < 0) {
+ // 说明 lastestCol 是数据库中新增的
+ syncResult.newAddCols.push(lastestCol.name);
+ } else {
+ // 说明 col 已经在数据库中被删除了，那应该跳过了
+ syncResult.deletedCols.push(col.name);
+ idxCol = find;
+ lastestCol = this._mcols[idxCol++];
}
- delete this._dbLatestMcols
- // 需要将最新引用设置上，不然表单提交时无法将最新的表单内容提交到服务端
- this._mcols = result;
- return syncResult;
- } else {
- return new SynchronizeMcolsResult(this._mcols);
+ lastestCol.index = i + 1;
+ result.push(lastestCol);
+ // 需要遍历需要的所有
+
+ }
+ continue outter;
}
+ }
+ delete this._dbLatestMcols
+ // 需要将最新引用设置上，不然表单提交时无法将最新的表单内容提交到服务端
+ this._mcols = result;
+ return syncResult;
+ } else {
+ return new SynchronizeMcolsResult(this._mcols);
}
+ }
- private findRemain(target: ReaderColMeta, startIdxCol: number): number {
- let find = -1;
- for (let idx = startIdxCol; idx < this._mcols.length; idx++) {
- if (target.name === this._mcols[idx].name) {
- return (find = idx);
- }
- }
-
- return find;
+ private findRemain(target: ReaderColMeta, startIdxCol: number): number {
+ let find = -1;
+ for (let idx = startIdxCol; idx < this._mcols.length; idx++) {
+ if (target.name === this._mcols[idx].name) {
+ return (find = idx);
+ }
}
- public get typeMetas(): Array {
- return this._typeMetas;
- }
+ return find;
+ }
- elementContainKey(testElementKey: string): boolean {
- return this._elementKeys.indexOf(testElementKey) > -1;
- }
+ public get typeMetas(): Array {
+ return this._typeMetas;
+ }
+
+ elementContainKey(testElementKey: string): boolean {
+ return this._elementKeys.indexOf(testElementKey) > -1;
+ }
}
export class SynchronizeMcolsResult {
- syncCols: Array = [];
- newAddCols: Array = [];
- deletedCols: Array = [];
+ syncCols: Array = [];
+ newAddCols: Array = [];
+ deletedCols: Array = [];
- constructor(syncCols: Array) {
- this.syncCols = syncCols;
- }
+ constructor(syncCols: Array) {
+ this.syncCols = syncCols;
+ }
- get hasAnyDiff(): boolean {
- return this.newAddCols.length > 0 || this.deletedCols.length > 0;
- }
+ get hasAnyDiff(): boolean {
+ return this.newAddCols.length > 0 || this.deletedCols.length > 0;
+ }
- get differSummary(): string {
- let differ = '';
- if (this.newAddCols.length > 0) {
- differ += " 新增：" + this.newAddCols.map((c) => "'" + c + "'").join(",");
- }
- if (this.deletedCols.length > 0) {
- differ += " 删除：" + this.deletedCols.map((c) => "'" + c + "'").join(",");
- }
- return differ;
+ get differSummary(): string {
+ let differ = '';
+ if (this.newAddCols.length > 0) {
+ differ += " 新增：" + this.newAddCols.map((c) => "'" + c + "'").join(",");
+ }
+ if (this.deletedCols.length > 0) {
+ differ += " 删除：" + this.deletedCols.map((c) => "'" + c + "'").join(",");
}
+ return differ;
+ }
}
export interface ReaderColMeta {
- index: number;
- name: string;
- type: string | any;
- disable: boolean;
- ip: ItemPropVal;
- // extraProps?: { string?: any };
+ index: number;
+ name: string;
+ type: string | any;
+ disable: boolean;
+ ip: ItemPropVal;
+ // extraProps?: { string?: any };
}
export interface DataTypeMeta {
- colsSizeRange: { min: number, max: number };
- decimalRange: { min: number, max: number };
- containColSize: boolean;
- "containDecimalRange": boolean,
- "type": DataTypeDesc
- // {
- // "columnSize": number,
- // "decimalDigits": number,
- // //"s": "12,32,",
- // "type": number,
- // //"typeDesc": "varchar(32)",
- // "typeName": string,
- // // "unsigned": false,
- // // "unsignedToken": ""
- // }
+ colsSizeRange: { min: number, max: number };
+ decimalRange: { min: number, max: number };
+ containColSize: boolean;
+ "containDecimalRange": boolean,
+ "type": DataTypeDesc
+ // {
+ // "columnSize": number,
+ // "decimalDigits": number,
+ // //"s": "12,32,",
+ // "type": number,
+ // //"typeDesc": "varchar(32)",
+ // "typeName": string,
+ // // "unsigned": false,
+ // // "unsignedToken": ""
+ // }
}
export interface DataTypeDesc {
- "columnSize": number,
- "decimalDigits": number,
- //"s": "12,32,",
- "type": number,
- //"typeDesc": "varchar(32)",
- "typeName": string,
- // "unsigned": false,
- // "unsignedToken": ""
+ "columnSize": number,
+ "decimalDigits": number,
+ //"s": "12,32,",
+ "type": number,
+ //"typeDesc": "varchar(32)",
+ "typeName": string,
+ // "unsigned": false,
+ // "unsignedToken": ""
}
/**
* 对应一个plugin的输入项
*/
export class Item {
- impl = '';
- implUrl: string;
- public dspt: Descriptor;
- // vals: Map = new Map();
- // vals: Map = new Map();
- // 后一种类型支持subform的类型
- /**
- * subform format:
- *
- * vals:{
- * tableName:[
- * {
- * impl:""
- * vals:{ k1:v1,k2:v2,k3:v3}
- * },{},{}
- * ]
- * }
- *
- *
- */
- public vals: { [key: string]: ItemPropVal }
- | { [key: string]: { [key: string]: ItemPropVal } }
- | { [key: string]: Array- } = {};
- displayName = '';
- private _propVals: ItemPropVal[];
-
- /**
- * 表单中有高级字段，是否显示全部？
- */
- public showAllField = false;
-
- /**
- * 创建一个新的Item
- *
- * @param fieldNames
- */
- public static create(fieldNames: string[]): Item {
- let item = new Item(null);
- fieldNames.forEach((fname) => {
- item.vals[fname] = new ItemPropVal();
+ impl = '';
+ implUrl: string;
+ public dspt: Descriptor;
+ // vals: Map = new Map();
+ // vals: Map = new Map();
+ // 后一种类型支持subform的类型
+ /**
+ * subform format:
+ *
+ * vals:{
+ * tableName:[
+ * {
+ * impl:""
+ * vals:{ k1:v1,k2:v2,k3:v3}
+ * },{},{}
+ * ]
+ * }
+ *
+ *
+ */
+ public vals: { [key: string]: ItemPropVal }
+ | { [key: string]: { [key: string]: ItemPropVal } }
+ | { [key: string]: Array- } = {};
+ displayName = '';
+ private _propVals: ItemPropVal[];
+
+ /**
+ * 表单中有高级字段，是否显示全部？
+ */
+ public showAllField = false;
+
+ /**
+ * 创建一个新的Item
+ *
+ * @param fieldNames
+ */
+ public static create(fieldNames: string[]): Item {
+ let item = new Item(null);
+ fieldNames.forEach((fname) => {
+ item.vals[fname] = new ItemPropVal();
+ });
+ return item;
+ }
+
+ public static processErrorField(errorFields: Array>, items: Item[]) {
+ let item: Item = null;
+ let fieldsErrs: Array = null;
+
+ if (errorFields) {
+ for (let index = 0; index < errorFields.length; index++) {
+ fieldsErrs = errorFields[index];
+ item = items[index];
+ let itemProp: ItemPropVal;
+ fieldsErrs.forEach((fieldErr) => {
+
+ let ip = item.vals[fieldErr.name];
+ // console.log([item.vals, fieldErr, item.vals[fieldErr.name], ip]);
+ if (ip instanceof ItemPropVal) {
+ itemProp = ip;
+ itemProp.error = fieldErr.content;
+
+ if (!itemProp.primaryVal) {
+ if (fieldErr.errorfields.length !== 1) {
+ throw new Error(`errorfields length ${fieldErr.errorfields.length} shall be 1`);
+ }
+ Item.processErrorField(fieldErr.errorfields, [itemProp.descVal]);
+ }
+ } else {
+ throw new Error("illegal type");
+ }
});
+ }
+ }
+ }
+
+ public static processFieldsErr(result: TisResponseResult): Item {
+ let errFields = result.errorfields;
+ if (errFields && errFields.length > 0) {
+ let pluginsErr = errFields[0];
+ if (pluginsErr.length > 0) {
+ let pluginErr: Array = pluginsErr[0];
+ let errKeys = pluginErr.map((r) => r.name);
+ let item: Item = Item.create(errKeys);
+ Item.processErrorField(pluginsErr, [item]);
return item;
+ }
}
+ return Item.create([]);
+ }
- public static processErrorField(errorFields: Array>, items: Item[]) {
- let item: Item = null;
- let fieldsErrs: Array = null;
-
- if (errorFields) {
- for (let index = 0; index < errorFields.length; index++) {
- fieldsErrs = errorFields[index];
- item = items[index];
- let itemProp: ItemPropVal;
- fieldsErrs.forEach((fieldErr) => {
-
- let ip = item.vals[fieldErr.name];
- // console.log([item.vals, fieldErr, item.vals[fieldErr.name], ip]);
- if (ip instanceof ItemPropVal) {
- itemProp = ip;
- itemProp.error = fieldErr.content;
-
- if (!itemProp.primaryVal) {
- if (fieldErr.errorfields.length !== 1) {
- throw new Error(`errorfields length ${fieldErr.errorfields.length} shall be 1`);
- }
- Item.processErrorField(fieldErr.errorfields, [itemProp.descVal]);
- }
- } else {
- throw new Error("illegal type");
- }
- });
- }
- }
+ public static wrapItemPropVal(v: any, at: AttrDesc): ItemPropVal {
+ if (v === undefined || v === null) {
+ return;
}
-
- public static processFieldsErr(result: TisResponseResult): Item {
- let errFields = result.errorfields;
- if (errFields && errFields.length > 0) {
- let pluginsErr = errFields[0];
- if (pluginsErr.length > 0) {
- let pluginErr: Array = pluginsErr[0];
- let errKeys = pluginErr.map((r) => r.name);
- let item: Item = Item.create(errKeys);
- Item.processErrorField(pluginsErr, [item]);
- return item;
- }
+ let newVal: ItemPropVal = at.addNewEmptyItemProp(true);
+ // console.log([at.key, at]);
+ if (at.describable) {
+ let d = at.descriptors.get(v.impl);
+ if (!d) {
+ //
+ throw new Error(`impl:${v.impl} can not find relevant descriptor`);
+ }
+ let ii: Item = Object.assign(new Item(d), v);
+ ii.wrapItemVals();
+ // console.log([ii,at]);
+ newVal.descVal = at.createDescribleVal(ii);
+ } else {
+ if (at.isMultiSelectableType) {
+ if (!Array.isArray(v)) {
+ // console.log(v);
+ throw new Error("expect val type is array but is not");
}
- return Item.create([]);
- }
-
- public static wrapItemPropVal(v: any, at: AttrDesc): ItemPropVal {
- if (v === undefined || v === null) {
- return;
+ // console.log([at, v, at.eprops[KEY_OPTIONS_ENUM]]);
+ if (!at.eprops) {
+ // console.log(at);
+ throw new Error("at.eprops can not be null");
}
- let newVal: ItemPropVal = at.addNewEmptyItemProp(true);
- // console.log([at.key, at]);
- if (at.describable) {
- let d = at.descriptors.get(v.impl);
- if (!d) {
- //
- throw new Error(`impl:${v.impl} can not find relevant descriptor`);
- }
- let ii: Item = Object.assign(new Item(d), v);
- ii.wrapItemVals();
- // console.log([ii,at]);
- newVal.descVal = at.createDescribleVal(ii);
+ let enumVal = at.eprops[KEY_OPTIONS_ENUM];
+ let mcols: Array;
+ let typeMetas: Array;
+ if (mcols = enumVal["tabMapper"]) {
+
+ let elementKeys: Array = enumVal["elementKeys"];
+ typeMetas = enumVal["colMetas"];
+ newVal.setMcolsEnums(elementKeys || [], mcols, (v.length > 0) ? v : mcols, typeMetas);
} else {
- if (at.isMultiSelectableType) {
- if (!Array.isArray(v)) {
- // console.log(v);
- throw new Error("expect val type is array but is not");
- }
- // console.log([at, v, at.eprops[KEY_OPTIONS_ENUM]]);
- if (!at.eprops) {
- // console.log(at);
- throw new Error("at.eprops can not be null");
- }
- let enumVal = at.eprops[KEY_OPTIONS_ENUM];
- let mcols: Array;
- let typeMetas: Array;
- if (mcols = enumVal["tabMapper"]) {
-
- let elementKeys: Array = enumVal["elementKeys"];
- typeMetas = enumVal["colMetas"];
- newVal.setMcolsEnums(elementKeys || [], mcols, (v.length > 0) ? v : mcols, typeMetas);
- } else {
- let selectableCol: Array<{ val: string, label: string }> = at.eprops[KEY_OPTIONS_ENUM];
- if (!selectableCol) {
- throw new Error("selectableCol can not be null");
- }
- let cols: Array<{ name: string, value: string }> = null;
- if (selectableCol.length < 1) {
- cols = v.map((r) => {
- return {name: r, value: r}
- });
- newVal.setPropValEnums(cols, (_) => true);
- } else {
- cols = selectableCol.map((c) => {
- return {"name": c.label, "value": c.val}
- });
- newVal.setPropValEnums(cols, (sval) => {
- return !!v.find((optVal) => optVal === sval);
- });
- }
- }
-
- // console.log([selectableCol, cols]);
-
- } else {
- newVal._primaryVal = v;
- }
- // newVal.pk = (at.key === this.dspt.pkField);
+ let selectableCol: Array<{ val: string, label: string }> = at.eprops[KEY_OPTIONS_ENUM];
+ if (!selectableCol) {
+ throw new Error("selectableCol can not be null");
+ }
+ let cols: Array<{ name: string, value: string }> = null;
+ if (selectableCol.length < 1) {
+ cols = v.map((r) => {
+ return {name: r, value: r}
+ });
+ newVal.setPropValEnums(cols, (_) => true);
+ } else {
+ cols = selectableCol.map((c) => {
+ return {"name": c.label, "value": c.val}
+ });
+ newVal.setPropValEnums(cols, (sval) => {
+ return !!v.find((optVal) => optVal === sval);
+ });
+ }
}
- // console.log([newVal.key,newVal]);
- return newVal;
- }
+ // console.log([selectableCol, cols]);
- // containAdvance = false;
-
- /**
- * 字段中是否包含高级字段（可以隐藏）
- */
- public get containAdvanceField(): boolean {
- return this.dspt.containAdvance;
+ } else {
+ newVal._primaryVal = v;
+ }
+ // newVal.pk = (at.key === this.dspt.pkField);
}
+ // console.log([newVal.key,newVal]);
+ return newVal;
+ }
- constructor(_dspt: Descriptor, public updateModel = false) {
- // if (dspt) {
- // this.impl = dspt.impl;
- // }
- this.newDesc = _dspt;
- }
+ // containAdvance = false;
- public set newDesc(desc: Descriptor) {
- this.dspt = desc;
- if (desc) {
- this.impl = desc.impl;
- } else {
- this.impl = null;
- }
- }
-
- public get implVal() {
- if (!this.updateModel) {
-
- }
- return '';
- }
-
- public wrapItemVals(): void {
- let newVals = {};
- let ovals: any /**map*/ = this.vals;
- // console.log([this.dspt.impl, this.vals]);
- let newVal: ItemPropVal;
- // console.log(this.dspt.attrs);
- this.dspt.attrs.forEach((at) => {
- let v = ovals[at.key];
- // console.log([at.key, v, at]);
- newVal = Item.wrapItemPropVal(v, at);
- // console.log([at.key, newVal]);
- if (newVal) {
- newVals[at.key] = (newVal);
- }
- });
- this.vals = newVals;
- }
+ /**
+ * 字段中是否包含高级字段（可以隐藏）
+ */
+ public get containAdvanceField(): boolean {
+ return this.dspt.containAdvance;
+ }
- public clearPropVals(dspClear = true): void {
- delete this._propVals;
- this.vals = {};
- if (dspClear) {
- this.dspt = null;
- }
- }
- public get propVals(): ItemPropVal[] {
- if (this._propVals) {
- return this._propVals;
- }
- if (!this.dspt) {
- this._propVals = [];
- return this._propVals;
- }
- this._propVals = [];
- this.dspt.attrs.forEach((attr /**AttrDesc*/) => {
- let ip: ItemPropVal | { [key: string]: ItemPropVal } | Array
- = this.vals[attr.key];
- if (!ip) {
- // throw new Error(`attrKey:${attr.key} can not find relevant itemProp`);
- ip = attr.addNewEmptyItemProp(this.updateModel);
- this.vals[attr.key] = ip;
- }
- // console.log(ip);
- if (ip instanceof ItemPropVal) {
- this._propVals.push(ip);
- } else {
- throw new Error("illegal ip type");
- }
- });
- return this._propVals;
- }
+ constructor(_dspt: Descriptor, public updateModel = false) {
+ // if (dspt) {
+ // this.impl = dspt.impl;
+ // }
+ this.newDesc = _dspt;
+ }
+
+ public set newDesc(desc: Descriptor) {
+ this.dspt = desc;
+ if (desc) {
+ this.impl = desc.impl;
+ } else {
+ this.impl = null;
+ }
+ }
+
+ public get implVal() {
+ if (!this.updateModel) {
+
+ }
+ return '';
+ }
+
+ public wrapItemVals(): void {
+ let newVals = {};
+ let ovals: any /**map*/ = this.vals;
+ // console.log([this.dspt.impl, this.vals]);
+ let newVal: ItemPropVal;
+ // console.log(this.dspt.attrs);
+ this.dspt.attrs.forEach((at) => {
+ let v = ovals[at.key];
+ // console.log([at.key, v, at]);
+ newVal = Item.wrapItemPropVal(v, at);
+ // console.log([at.key, newVal]);
+ if (newVal) {
+ newVals[at.key] = (newVal);
+ }
+ });
+ this.vals = newVals;
+ }
+
+ public clearPropVals(dspClear = true): void {
+ delete this._propVals;
+ this.vals = {};
+ if (dspClear) {
+ this.dspt = null;
+ }
+ }
+
+ public get propVals(): ItemPropVal[] {
+ if (this._propVals) {
+ return this._propVals;
+ }
+ if (!this.dspt) {
+ this._propVals = [];
+ return this._propVals;
+ }
+ this._propVals = [];
+ this.dspt.attrs.forEach((attr /**AttrDesc*/) => {
+ let ip: ItemPropVal | { [key: string]: ItemPropVal } | Array
- = this.vals[attr.key];
+ if (!ip) {
+ // throw new Error(`attrKey:${attr.key} can not find relevant itemProp`);
+ ip = attr.addNewEmptyItemProp(this.updateModel);
+ this.vals[attr.key] = ip;
+ }
+ // console.log(ip);
+ if (ip instanceof ItemPropVal) {
+ this._propVals.push(ip);
+ } else {
+ throw new Error("illegal ip type");
+ }
+ });
+ return this._propVals;
+ }
}
export class DescribleVal
- extends Item {
- // impl: string;
- // displayName: string;
- // vals: string[] | DescribleVal[];
- descriptors: Map = new Map();
- extendPoint: string;
- extensible: boolean;
+ extends Item {
+ // impl: string;
+ // displayName: string;
+ // vals: string[] | DescribleVal[];
+ descriptors: Map = new Map();
+ extendPoint: string;
+ extensible: boolean;
}
export class AttrDesc {
- key: string;
- ord: number;
- // 是否是主键
- pk: boolean;
- advance: boolean;
- /**
- * 当describable为true时descriptors 应该有内容
- * */
- descriptors: Map;
- describable: boolean;
- extendPoint: string;
- // 实现类型是否可以在运行期添加
- extensible: boolean;
- type: number;
- options: Array;
- required: boolean;
- eprops: { String: any };
-
- // MULTI_SELECTABLE
- public get isMultiSelectableType(): boolean {
- return this.type === TYPE_PLUGIN_MULTI_SELECTION;
- }
-
- /**
- *
- * @param updateModel 是否是更新模式，在更新模式下，插件的默认值不能设置到控件上去
- */
- public addNewEmptyItemProp(updateModel: boolean): ItemPropVal {
- let desVal = new ItemPropVal(updateModel);
- desVal.key = this.key;
- desVal.pk = this.pk;
- desVal.advance = this.advance;
- desVal.eprops = Object.assign({}, this.eprops);
- desVal.required = this.required;
- desVal.type = this.type;
- // 当type为6时，options应该有内容
- desVal.options = this.options;
- if (this.describable) {
- desVal.descVal = this.createDescribleVal(new Item(null, updateModel));
- if (this.eprops) {
- let displayName = this.eprops[KEY_DEFAULT_VALUE];
- // displayName
- if (!updateModel && displayName) {
- // 在新建时候
- for (let e of desVal.descVal.descriptors.values()) {
- if (displayName === e.displayName) {
- desVal.descVal.impl = e.impl;
- desVal.descVal.dspt = e;
- break;
- }
- }
- }
+ key: string;
+ ord: number;
+ // 是否是主键
+ pk: boolean;
+ advance: boolean;
+ /**
+ * 当describable为true时descriptors 应该有内容
+ * */
+ descriptors: Map;
+ describable: boolean;
+ extendPoint: string;
+ // 实现类型是否可以在运行期添加
+ extensible: boolean;
+ type: number;
+ options: Array;
+ required: boolean;
+ eprops: { String: any };
+
+ // MULTI_SELECTABLE
+ public get isMultiSelectableType(): boolean {
+ return this.type === TYPE_PLUGIN_MULTI_SELECTION;
+ }
+
+ /**
+ *
+ * @param updateModel 是否是更新模式，在更新模式下，插件的默认值不能设置到控件上去
+ */
+ public addNewEmptyItemProp(updateModel: boolean): ItemPropVal {
+ let desVal = new ItemPropVal(updateModel);
+ desVal.key = this.key;
+ desVal.pk = this.pk;
+ desVal.advance = this.advance;
+ desVal.eprops = Object.assign({}, this.eprops);
+ desVal.required = this.required;
+ desVal.type = this.type;
+ // 当type为6时，options应该有内容
+ desVal.options = this.options;
+ if (this.describable) {
+ desVal.descVal = this.createDescribleVal(new Item(null, updateModel));
+ if (this.eprops) {
+ let displayName = this.eprops[KEY_DEFAULT_VALUE];
+ // displayName
+ if (!updateModel && displayName) {
+ // 在新建时候
+ for (let e of desVal.descVal.descriptors.values()) {
+ if (displayName === e.displayName) {
+ desVal.descVal.impl = e.impl;
+ desVal.descVal.dspt = e;
+ break;
}
+ }
}
- return desVal;
- }
-
- public createDescribleVal(v: Item): DescribleVal {
- // console.log(v);
- let descVal = new DescribleVal(v.dspt, v.updateModel);
- descVal.extensible = this.extensible;
- descVal.extendPoint = this.extendPoint;
- descVal.displayName = v.displayName;
- // descVal.containAdvance = v.containAdvance;
- // descVal.impl = v.impl;
- descVal.vals = v.vals;
- this.descriptors.forEach((entry) => {
- descVal.descriptors.set(entry.impl, entry);
- });
- return descVal;
- }
+ }
+ }
+ return desVal;
+ }
+
+ public createDescribleVal(v: Item): DescribleVal {
+ // console.log(v);
+ let descVal = new DescribleVal(v.dspt, v.updateModel);
+ descVal.extensible = this.extensible;
+ descVal.extendPoint = this.extendPoint;
+ descVal.displayName = v.displayName;
+ // descVal.containAdvance = v.containAdvance;
+ // descVal.impl = v.impl;
+ descVal.vals = v.vals;
+ this.descriptors.forEach((entry) => {
+ descVal.descriptors.set(entry.impl, entry);
+ });
+ return descVal;
+ }
}
/*HeteroList*/
export class HeteroList {
- descriptors: Map = new Map();
- private _descriptorList: Array;
-
- identityId: string;
- // item 可选数量
- cardinality: string;
- caption: string;
- extensionPoint: string;
- extensionPointUrl: string;
- items: Item[] = [];
-
- pluginCategory: PluginType;
-
- public static isDescFilterDefined(type: PluginType): type is PluginMeta {
- let filter = (type).descFilter;
- return !!filter && !!filter.endType;
- }
+ descriptors: Map = new Map();
+ private _descriptorList: Array;
- public get descriptorList(): Array {
- if (!this._descriptorList) {
- this._descriptorList = Array.from(this.descriptors.values());
- }
- return this._descriptorList;
- }
+ identityId: string;
+ // item 可选数量
+ cardinality: string;
+ caption: string;
+ extensionPoint: string;
+ extensionPointUrl: string;
+ items: Item[] = [];
- public get endType(): string {
- // console.log(this.pluginCategory);
- if (HeteroList.isDescFilterDefined(this.pluginCategory)) {
- return this.pluginCategory.descFilter.endType();
- }
- return null;
- }
+ pluginCategory: PluginType;
+ public static isDescFilterDefined(type: PluginType): type is PluginMeta {
+ let filter = (type).descFilter;
+ return !!filter && !!filter.endType;
+ }
- public get identity(): string {
- return this.extensionPoint.replace(/\./g, '-');
+ public get descriptorList(): Array {
+ if (!this._descriptorList) {
+ this._descriptorList = Array.from(this.descriptors.values());
}
+ return this._descriptorList;
+ }
- public updateDescriptor(newDescriptors: Map): void {
- this.descriptors = newDescriptors;
- this._descriptorList = undefined;
+ public get endType(): string {
+ // console.log(this.pluginCategory);
+ if (HeteroList.isDescFilterDefined(this.pluginCategory)) {
+ return this.pluginCategory.descFilter.endType();
}
+ return null;
+ }
- public get addItemDisabled(): boolean {
- return (this.cardinality === '1' && this.items.length > 0);
- }
+
+ public get identity(): string {
+ return this.extensionPoint.replace(/\./g, '-');
+ }
+
+ public updateDescriptor(newDescriptors: Map): void {
+ this.descriptors = newDescriptors;
+ this._descriptorList = undefined;
+ }
+
+ public get addItemDisabled(): boolean {
+ return (this.cardinality === '1' && this.items.length > 0);
+ }
}
export class PluginSaveResponse {
- constructor(public saveSuccess: boolean, public formDisabled: boolean, private bizResult?: any) {
+ constructor(public saveSuccess: boolean, public formDisabled: boolean, private savePluginEvent: SavePluginEvent, private bizResult?: any) {
- }
+ }
- public hasBiz(): boolean {
- return !!this.bizResult;
- }
+ public get verify(): boolean {
+ return this.savePluginEvent && this.savePluginEvent.verifyConfig;
+ }
- public biz(): any {
- return this.bizResult;
- }
+ public hasBiz(): boolean {
+ return !!this.bizResult;
+ }
+
+ public biz(): any {
+ return this.bizResult;
+ }
}
export interface IFieldError {
- name: string;
- content?: string;
- errorfields?: Array>
+ name: string;
+ content?: string;
+ errorfields?: Array>
}
export class ValOption {
- public impl: string;
- public name: string;
+ public impl: string;
+ public name: string;
}
export interface OptionEnum {
- // {label: s.name, val: s.value, checked: colItemChecked(s.value)}
- label: string;
- val: string;
- checked: boolean;
+ // {label: s.name, val: s.value, checked: colItemChecked(s.value)}
+ label: string;
+ val: string;
+ checked: boolean;
}
export class SavePluginEvent {
- // savePlugin: EventEmitter<{ ?: boolean, ?: boolean }>;
- // 创建notebook
- public createOrGetNotebook = false;
- public verifyConfig = false;
- public notShowBizMsg = false;
- // 顺带要在服务端执行一段脚本
- // namespace:corename:method
- public serverForward;
- public postPayload: { [key: string]: any };
- public basicModule: BasicFormComponent;
+ // savePlugin: EventEmitter<{ ?: boolean, ?: boolean }>;
+ // 创建notebook
+ constructor(public notShowBizMsg = false) {
+ }
+
+ public createOrGetNotebook = false;
+ public verifyConfig = false;
+ // public notShowBizMsg = false;
+ // 顺带要在服务端执行一段脚本
+ // namespace:corename:method
+ public serverForward;
+ public postPayload: { [key: string]: any };
+ public basicModule: BasicFormComponent;
}
export interface DataType {
- typeDesc: string;
+ typeDesc: string;
}
export interface IColumnMeta {
- key: string;
- pk: boolean;
- index: number;
+ key: string;
+ pk: boolean;
+ index: number;
- nullable: boolean;
+ nullable: boolean;
- comment: string;
+ comment: string;
- type: DataType;
+ type: DataType;
}
//{ tableid?: number, dbId?: string, dbName?: string, isNew: boolean }
export class DataBase {
- constructor(public dbId: string, public dbName: string) {
- }
+ constructor(public dbId: string, public dbName: string) {
+ }
}
export class SuccessAddedDBTabs {
- public db: DataBase;
+ public db: DataBase;
- constructor(tab: TablePojo, private tabs: { [key: string]: Array
- }) {
- this.db = new DataBase(tab.dbId, tab.dbName);
- }
+ constructor(tab: TablePojo, private tabs: { [key: string]: Array
- }) {
+ this.db = new DataBase(tab.dbId, tab.dbName);
+ }
- public get tabKeys(): Array {
- let tabs: Array = [];
- for (let tabName in this.tabs) {
- tabs.push(tabName);
- }
- return tabs;
+ public get tabKeys(): Array {
+ let tabs: Array = [];
+ for (let tabName in this.tabs) {
+ tabs.push(tabName);
}
+ return tabs;
+ }
}
export const KEY_DOC_FIELD_SPLIT_METAS = "docFieldSplitMetas";
@@ -956,30 +963,30 @@ export const KEY_DOC_FIELD_SPLIT_METAS = "docFieldSplitMetas";
* 该类目前只为mongo 的document 类型的field拆解而用
*/
export class RowAssist {
- public _ip: Map;
+ public _ip: Map;
- public static getDocFieldSplitMetas(u: ReaderColMeta): Array {
- let rowAssist: Array = u[KEY_DOC_FIELD_SPLIT_METAS];
- if (!rowAssist) {
- rowAssist = [];
- }
- return rowAssist;
+ public static getDocFieldSplitMetas(u: ReaderColMeta): Array {
+ let rowAssist: Array = u[KEY_DOC_FIELD_SPLIT_METAS];
+ if (!rowAssist) {
+ rowAssist = [];
}
+ return rowAssist;
+ }
- static setDocFieldSplitMetas(u: ReaderColMeta, rowAssist: Array) {
- u[KEY_DOC_FIELD_SPLIT_METAS] = [...rowAssist];
- }
+ static setDocFieldSplitMetas(u: ReaderColMeta, rowAssist: Array) {
+ u[KEY_DOC_FIELD_SPLIT_METAS] = [...rowAssist];
+ }
- constructor(public name: string, public jsonPath: string, public type: DataTypeDesc) {
- this._ip = new Map();
- }
+ constructor(public name: string, public jsonPath: string, public type: DataTypeDesc) {
+ this._ip = new Map();
+ }
- public getIp(propName: string): ErrorFeedback {
- let ip = this._ip.get(propName);
- if (!ip) {
- ip = new ItemPropVal();
- this._ip.set(propName, ip);
- }
- return ip;
+ public getIp(propName: string): ErrorFeedback {
+ let ip = this._ip.get(propName);
+ if (!ip) {
+ ip = new ItemPropVal();
+ this._ip.set(propName, ip);
}
+ return ip;
+ }
}
diff --git a/src/common/tis.service.ts b/src/common/tis.service.ts
index 7c09798..54f1de8 100644
--- a/src/common/tis.service.ts
+++ b/src/common/tis.service.ts
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import {Injectable} from '@angular/core';
+import {Injectable, NgZone} from '@angular/core';
import 'rxjs/add/operator/toPromise';
import {CurrentCollection, WSMessage} from './basic.form.component';
@@ -59,7 +59,7 @@ export class TISService {
constructor(protected http: HttpClient
// , private modalService: NgbModal
- , public notification: NzNotificationService, private drawerService: NzDrawerService) {
+ , public notification: NzNotificationService, private drawerService: NzDrawerService, public _zone: NgZone) {
}
public set tisMeta(meta: TISBaseProfile) {
@@ -289,7 +289,127 @@ export class TISService {
return Promise.reject(error.message || error);
}
+ /**
+ * https://dev.to/icolomina/subscribing-to-server-sent-events-with-angular-ee8
+ *
+ * 好奇 zone.js 的作用
+ * https://medium.com/@chrisbautistaaa/server-sent-events-in-angular-node-908830cc29aa
+ * @param sseUrl
+ */
+ public createEventSource(targetResName: string, sseUrl: string): EventSourceSubject {
+
+ const eventSource = new EventSource("/tjs" + sseUrl);
+ console.log("onmessage");
+
+
+ // eventSource.onmessage = (event: MessageEvent) => {
+ // console.log(event);
+ // const messageData: MessageData = JSON.parse(event.data);
+ // //observer.next(messageData);
+ // };
+ // eventSource.addEventListener('message', (event) => {
+ // console.log(event);
+ // }, false);
+ // eventSource.addEventListener('other', (event: MessageEvent) => {
+ // console.log(['other', event.data]);
+ // }, false);
+
+ return new EventSourceSubject(targetResName, eventSource, new Observable(observer => {
+
+ eventSource.onmessage = (event: MessageEvent) => {
+ this._zone.run(() => {
+ // console.log(event.data);
+ const messageData: MessageData = JSON.parse(event.data);
+ observer.next([EventType.LOG_MESSAGE, messageData]);
+ });
+
+
+ };
+ eventSource.addEventListener(EventType.TASK_MILESTONE, (event: MessageEvent) => {
+ // console.log(['other', event.data]);
+ try {
+ const messageData: ExecuteStep = JSON.parse(event.data);
+ observer.next([EventType.TASK_MILESTONE, messageData]);
+ } catch (e) {
+ console.log(['catch err', e])
+ }
+ }, false);
+ //
+ //
+ eventSource.addEventListener(EventType.TASK_EXECUTE_STEPS, (event: MessageEvent) => {
+ try {
+ const messageData: Array = JSON.parse(event.data);
+ observer.next([EventType.TASK_EXECUTE_STEPS, messageData]);
+ } catch (e) {
+ console.log(['catch err', e])
+ }
+ }, false);
+
+
+ eventSource.onerror = (event) => {
+ this._zone.run(() => {
+ // 服务端colse也会在客户端trigger error 消息
+ //throw new Error();
+ console.log(["receive error", event]);
+ // observer.error(event);
+ observer.next([EventType.SSE_CLOSE, null]);
+ eventSource.close();
+ observer.complete();
+ });
+ }
+
+
+ }));
+
+
+ }
+}
+
+export class EventSourceSubject {
+ constructor(public targetResName: string, private eventSource: EventSource, private observable: Observable<[EventType, Array | MessageData | ExecuteStep]>) {
+
+ }
+
+ public close(): void {
+ this.eventSource.close();
+ }
+
+ public get events(): Observable<[EventType, Array | MessageData | ExecuteStep]> {
+ return this.observable;
+ }
+
+
+}
+
+export enum EventType {
+ TASK_MILESTONE = 'taskMilestone',
+ TASK_EXECUTE_STEPS = "executeSteps",
+ LOG_MESSAGE = 'message',
+ SSE_CLOSE = 'sseClose'
+}
+
+export interface MessageData {
+ level: string;
+ time: number;
+ msg: string;
+}
+
+export class ExecuteStep {
+ name: string;
+ describe: string;
+ complete: boolean;
+ success: boolean;
+
+ _processing: boolean = false;
+
+ get processIcon(): string {
+ return this._processing ? 'loading' : null;
+ }
}
+// interface SubTaskMilestoneData {
+// jobName: string;
+// success: boolean;
+// }
diff --git a/src/runtime/incr.build.step1.component.ts b/src/runtime/incr.build.step1.component.ts
index 7b5491e..548f35f 100644
--- a/src/runtime/incr.build.step1.component.ts
+++ b/src/runtime/incr.build.step1.component.ts
@@ -201,6 +201,7 @@ export class IncrBuildStep1Component extends AppFormComponent implements AfterCo
}
createIndexStep1Next() {
+ console.log("createIndexStep1Next");
let e = new SavePluginEvent();
e.notShowBizMsg = true;
e.serverForward = "coredefine:core_action:create_incr_sync_channal";
@@ -232,9 +233,11 @@ export class IncrBuildStep1Component extends AppFormComponent implements AfterCo
}
buildStep1ParamsSetComponentAjax(event: PluginSaveResponse) {
+ // console.log(event);
if (event.saveSuccess) {
if (event.hasBiz()) {
let biz = event.biz();
+
this.dto.incrSourceDesc = biz.incrSourceDesc;
this.dto.incrSinkDesc = biz.incrSinkDesc;
this.dto.incrScriptMainFileContent = biz.incrScriptMainFileContent;
diff --git a/src/runtime/incr.build.step2.setSink.components.ts b/src/runtime/incr.build.step2.setSink.components.ts
index 49daca5..cc8ca04 100644
--- a/src/runtime/incr.build.step2.setSink.components.ts
+++ b/src/runtime/incr.build.step2.setSink.components.ts
@@ -103,6 +103,7 @@ export class IncrBuildStep2SetSinkComponent extends AppFormComponent implements
ngOnInit(): void {
super.ngOnInit();
+ console.log(this.dto);
}
ngAfterViewInit(): void {
diff --git a/src/runtime/incr.build.step4.running.component.ts b/src/runtime/incr.build.step4.running.component.ts
index 7fc5022..1909896 100644
--- a/src/runtime/incr.build.step4.running.component.ts
+++ b/src/runtime/incr.build.step4.running.component.ts
@@ -334,7 +334,7 @@ export class IncrBuildStep4RunningComponent extends AppFormComponent implements
reload() {
IndexIncrStatus.getIncrStatusThenEnter(this, (incrStatus) => {
// if(this.dto.state !== incrStatus.state){
- console.log(this.dto);
+ // console.log(this.dto);
this.dto = incrStatus;
this.successNotify("状态已更新");
// }
diff --git a/src/runtime/incr.pod.logs.status.component.ts b/src/runtime/incr.pod.logs.status.component.ts
index bf01d34..f5b5d45 100644
--- a/src/runtime/incr.pod.logs.status.component.ts
+++ b/src/runtime/incr.pod.logs.status.component.ts
@@ -25,38 +25,59 @@ import {NzModalService} from "ng-zorro-antd/modal";
import {NzNotificationService} from "ng-zorro-antd/notification";
import {Subject} from "rxjs";
-import {IndexIncrStatus, K8sPodState, LogType} from "./misc/RCDeployment";
+import {IndexIncrStatus, K8sPodState, LogType, ProcessMeta, RCDeployment} from "./misc/RCDeployment";
+import {PodsListComponent} from "../base/datax.worker.running.component";
@Component({
selector: 'incr-pod-logs-status',
template: `
-
-
-
-
- 日志监听已经超时，请重连
-
-
-
- {{this.selectedPod?.name}}
- {{this.selectedPod?.phase}}
-
-
-
-
-
-
-
-
+
+
+
+
+ 日志监听已经超时，请重连
+
+
+
+
+
+
+
+
+
+
+
+
+ {{this._selectedPod?.phase}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
`,
styles: [
- ` nz-page-header {
- padding: 4px;
- }
+ ` nz-page-header {
+ padding: 4px;
+ }
- nz-alert {
- margin: 10px 0 10px 0;
- }
+ nz-alert {
+ margin: 10px 0 10px 0;
+ }
`
]
})
@@ -64,13 +85,34 @@ export class IncrPodLogsStatusComponent extends AppFormComponent implements Afte
private currCollection: CurrentCollection;
@ViewChild('term', {static: true}) terminal: NgTerminal;
private componentDestroy = false;
+ @Input() processMeta: ProcessMeta
@Input()
msgSubject: Subject;
@Input()
incrStatus: IndexIncrStatus;
logMonitorTimeout = false;
+ _selectedPod: K8sPodState;
+
@Input()
- selectedPod: K8sPodState;
+ rcDeployments: Array =[];
+
+ // podStatChange: Subject = new Subject();
+ targetPodChange(targetPod: any) {
+ // console.log(event);
+
+ PodsListComponent.viewPodLog(this.processMeta, this.route, this.router, {name:targetPod});
+ }
+ @Input()
+ set selectedPod(podStat: K8sPodState) {
+ // console.log("set selectedPod");
+ // this.podStatChange.next(podStat);
+ this._selectedPod = podStat;
+ }
+
+ get selectedPod(): K8sPodState {
+ return this._selectedPod;
+ }
+
@Input()
logType: LogType = LogType.INCR_DEPLOY_STATUS_CHANGE;
@@ -84,17 +126,21 @@ export class IncrPodLogsStatusComponent extends AppFormComponent implements Afte
ngOnInit(): void {
super.ngOnInit();
+ // console.log("podStatChange.subscribe");
this.sendIncrdeployChange();
+ // this.podStatChange.subscribe((podStat) => {
+ // console.log("set selectedPod:"+ podStat.name);
+ // let lt = this.logType + ":" + podStat.name;
+ // if (!this.msgSubject) {
+ // this.msgSubject = this.getWSMsgSubject(lt);
+ //
+ // } else {
+ // this.msgSubject.next(new WSMessage(lt));
+ // }
+ // });
}
ngAfterViewInit(): void {
- }
-
- ngOnDestroy(): void {
- this.componentDestroy = true;
- }
-
- ngAfterContentInit(): void {
this.msgSubject.subscribe((response: WSMessage): void => {
if (!response || this.componentDestroy) {
return;
@@ -115,6 +161,14 @@ export class IncrPodLogsStatusComponent extends AppFormComponent implements Afte
});
}
+ ngOnDestroy(): void {
+ this.componentDestroy = true;
+ }
+
+ ngAfterContentInit(): void {
+
+ }
+
protected initialize(app: CurrentCollection): void {
this.currCollection = app;
}
@@ -147,11 +201,12 @@ export class IncrPodLogsStatusComponent extends AppFormComponent implements Afte
this._transactionProcessing = true;
switch (this.logType) {
case LogType.DATAX_WORKER_POD_LOG:
- this.httpPost('/coredefine/corenodemanage.ajax', "event_submit_do_relaunch_pod_process=y&action=datax_action&podName=" + this.selectedPod.name)
+ this.httpPost('/coredefine/corenodemanage.ajax'
+ , "event_submit_do_relaunch_pod_process=y&action=datax_action&podName=" + this.selectedPod.name + "&targetName=" + this.processMeta.targetName)
.then((r) => {
if (r.success) {
- this.successNotify(`已经成功触发重启DataX Worker实例${this.selectedPod.name}`);
+ this.successNotify(`已经成功触发重启Powerjob实例${this.selectedPod.name}`);
setTimeout(() => {
// console.log("navigate");
this.router.navigate(["/base/datax-worker", "profile"], {relativeTo: this.route});
@@ -160,6 +215,8 @@ export class IncrPodLogsStatusComponent extends AppFormComponent implements Afte
} else {
this._transactionProcessing = false;
}
+ }, (reason) => {
+ this._transactionProcessing = false;
});
return;
case LogType.INCR_DEPLOY_STATUS_CHANGE:
@@ -178,7 +235,11 @@ export class IncrPodLogsStatusComponent extends AppFormComponent implements Afte
} else {
this._transactionProcessing = false;
}
+ }, (reason) => {
+ this._transactionProcessing = false;
});
}
}
+
+
}
diff --git a/src/runtime/misc/RCDeployment.ts b/src/runtime/misc/RCDeployment.ts
index 22503f8..5e9d381 100644
--- a/src/runtime/misc/RCDeployment.ts
+++ b/src/runtime/misc/RCDeployment.ts
@@ -20,7 +20,11 @@ import {BasicFormComponent} from "../../common/basic.form.component";
import {K8SRCSpec} from "../../common/k8s.replics.spec.component";
import {StepType} from "../../common/steps.component";
import FlinkJobDetail = flink.job.detail.FlinkJobDetail;
-import {HeteroList} from "../../common/tis.plugin";
+import {Descriptor, HeteroList, SavePluginEvent} from "../../common/tis.plugin";
+import {ExecuteStep, MessageData} from "../../common/tis.service";
+import {DataxWorkerAddStep0Component} from "../../base/datax.worker.add.step0.component";
+import {PowerjobCptType} from "../../base/datax.worker.component";
+import {DataxWorkerAddStep1Component} from "../../base/datax.worker.add.step1.component";
/**
* Copyright (c) 2020 QingLang, Inc.
@@ -38,216 +42,270 @@ import {HeteroList} from "../../common/tis.plugin";
*/
export interface CpuLimit {
- unit: string;
- unitEmpty: boolean;
- val: number;
+ unit: string;
+ unitEmpty: boolean;
+ val: number;
}
export interface CpuRequest {
- unit: string;
- unitEmpty: boolean;
- val: number;
+ unit: string;
+ unitEmpty: boolean;
+ val: number;
}
export interface MemoryLimit {
- unit: string;
- unitEmpty: boolean;
- val: number;
+ unit: string;
+ unitEmpty: boolean;
+ val: number;
}
export interface MemoryRequest {
- unit: string;
- unitEmpty: boolean;
- val: number;
+ unit: string;
+ unitEmpty: boolean;
+ val: number;
}
export interface Status {
- availableReplicas: number;
- fullyLabeledReplicas: number;
- observedGeneration: number;
- readyReplicas: number;
- replicas: number;
+ availableReplicas: number;
+ fullyLabeledReplicas: number;
+ observedGeneration: number;
+ readyReplicas: number;
+ replicas: number;
+}
+
+export class ScalaLog {
+ faild: boolean;
+ launchingTokenExist: boolean;
+ logs: Array
+ milestones: Array
}
export interface RCDeployment {
- cpuLimit: CpuLimit;
- cpuRequest: CpuRequest;
- creationTimestamp: number;
- dockerImage: string;
- envs: Map;
- pods: Array;
- memoryLimit: MemoryLimit;
- memoryRequest: MemoryRequest;
- replicaCount: number;
- status: Status;
+ name: string;
+ cpuLimit: CpuLimit;
+ cpuRequest: CpuRequest;
+ creationTimestamp: number;
+ dockerImage: string;
+ envs: Map;
+ pods: Array;
+ memoryLimit: MemoryLimit;
+ memoryRequest: MemoryRequest;
+ replicaCount: number;
+ replicaScalable: boolean;
+ rcScalaLog: ScalaLog
+ status: Status;
}
export interface K8sPodState {
- name: string;
- phase?: string;
- startTime?: string;
- restartCount?: number;
+ name: string;
+ phase?: string;
+ startTime?: string;
+ restartCount?: number;
}
export enum LogType {
- INCR_DEPLOY_STATUS_CHANGE = "incrdeploy-change",
- DATAX_WORKER_POD_LOG = "datax-worker-pod-log"
+ INCR_DEPLOY_STATUS_CHANGE = "incrdeploy-change",
+ DATAX_WORKER_POD_LOG = "datax-worker-pod-log"
}
export interface RcHpaStatus {
- conditions: Array;
- currentMetrics: Array;
- autoscalerStatus: HpaAutoscalerStatus;
- autoscalerSpec: HpaAutoscalerSpec;
+ conditions: Array;
+ currentMetrics: Array;
+ autoscalerStatus: HpaAutoscalerStatus;
+ autoscalerSpec: HpaAutoscalerSpec;
}
export interface HpaConditionEvent {
- type: string;
- status: string;
- lastTransitionTime: string;
- reason: string;
- message: string;
+ type: string;
+ status: string;
+ lastTransitionTime: string;
+ reason: string;
+ message: string;
}
export interface HpaAutoscalerStatus {
- currentCPUUtilizationPercentage: number;
- currentReplicas: number;
- desiredReplicas: number;
- lastScaleTime: number;
+ currentCPUUtilizationPercentage: number;
+ currentReplicas: number;
+ desiredReplicas: number;
+ lastScaleTime: number;
}
export interface HpaAutoscalerSpec {
- maxReplicas: number;
- minReplicas: number;
- targetCPUUtilizationPercentage: number;
+ maxReplicas: number;
+ minReplicas: number;
+ targetCPUUtilizationPercentage: number;
}
export interface HpaMetrics {
- type: string;
+ type: string;
- resource: UsingResource;
+ resource: UsingResource;
}
export interface UsingResource {
- name: string;
- currentAverageUtilization: any;
- currentAverageValue: any;
+ name: string;
+ currentAverageUtilization: any;
+ currentAverageValue: any;
}
export class K8SControllerStatus {
- public k8sReplicationControllerCreated: boolean;
+ public k8sReplicationControllerCreated: boolean;
+ public payloads: { string?: any } = {};
+
+ public state: "NONE" | "STOPED" | "RUNNING" | "DISAPPEAR";
+ // 由于本地执行器没有安装，导致datax执行器无法执行
+ public installLocal: boolean;
+ public rcDeployments: Array;
+
+ public get rcDeployment(): RCDeployment {
+ if (!this.rcDeployments) {
+ return null;
+ }
+ for (let idx = 0; idx < this.rcDeployments.length; idx++) {
+ return this.rcDeployments[idx];
+ }
+ return null;
+ }
- public state: "NONE" | "STOPED" | "RUNNING" | "DISAPPEAR";
- // 由于本地执行器没有安装，导致datax执行器无法执行
- public installLocal: boolean;
- public rcDeployment: RCDeployment;
+ public findPod(podName: string): K8sPodState {
+ if (!this.rcDeployments) {
+ throw new Error("rcDeployments can not be null");
+ }
+ let pod: K8sPodState = null;
+ for (let idx = 0; idx < this.rcDeployments.length; idx++) {
+ pod = this.rcDeployments[idx].pods.find((pp) => (pp.name === podName));
+ if (pod) {
+ return pod;
+ }
+ }
+ throw new Error(" has not found pod with name:" + podName);
+ }
}
export interface PluginExtraProps {
- endType: string;
- extendPoint: string;
- supportIncr: boolean;
- impl: string;
- displayName: string;
+ endType: string;
+ extendPoint: string;
+ supportIncr: boolean;
+ impl: string;
+ displayName: string;
}
export interface IncrDesc extends PluginExtraProps {
- extendSelectedTabProp: boolean;
+ extendSelectedTabProp: boolean;
}
export class IndexIncrStatus extends K8SControllerStatus {
- public incrScriptCreated: boolean;
- public incrScriptMainFileContent: string;
- public restorableByCheckpoint: boolean;
- public k8sPluginInitialized: boolean;
- public flinkJobDetail: FlinkJobDetail;
- public incrProcess: IncrProcess;
-
- public incrSourceDesc: IncrDesc;
- public incrSinkDesc: IncrDesc;
- public readerDesc: PluginExtraProps;
- public writerDesc: PluginExtraProps;
-
-
- public static getIncrStatusThenEnter(basicForm: BasicFormComponent, hander: ((r: IndexIncrStatus) => void), cache = true) {
- basicForm.httpPost('/coredefine/corenodemanage.ajax'
- , `action=core_action&emethod=get_incr_status&cache=${cache}`)
- .then((r) => {
- if (r.success) {
- let incrStatus: IndexIncrStatus = Object.assign(new IndexIncrStatus(), r.bizresult);
- hander(incrStatus);
- }
- });
- }
-
- /**
- * 增量处理节点启动有异常
- */
- public get incrProcessLaunchHasError(): boolean {
- return this.k8sReplicationControllerCreated
- && this.incrProcess
- && !this.incrProcess.incrGoingOn
- && !!this.rcDeployment
- && !!this.rcDeployment.status
- && this.rcDeployment.status.readyReplicas > 0;
- }
-
- public getFirstPod(): K8sPodState {
- for (let i = 0; i < this.rcDeployment.pods.length; i++) {
- return this.rcDeployment.pods[i];
- break;
+ public incrScriptCreated: boolean;
+ public incrScriptMainFileContent: string;
+ public restorableByCheckpoint: boolean;
+ public k8sPluginInitialized: boolean;
+ public flinkJobDetail: FlinkJobDetail;
+ public incrProcess: IncrProcess;
+
+ public incrSourceDesc: IncrDesc;
+ public incrSinkDesc: IncrDesc;
+ public readerDesc: PluginExtraProps;
+ public writerDesc: PluginExtraProps;
+
+
+ public static getIncrStatusThenEnter(basicForm: BasicFormComponent, hander: ((r: IndexIncrStatus) => void), cache = true) {
+ basicForm.httpPost('/coredefine/corenodemanage.ajax'
+ , `action=core_action&emethod=get_incr_status&cache=${cache}`)
+ .then((r) => {
+ if (r.success) {
+ let incrStatus: IndexIncrStatus = Object.assign(new IndexIncrStatus(), r.bizresult);
+ hander(incrStatus);
}
- return null;
+ });
+ }
+
+ /**
+ * 增量处理节点启动有异常
+ */
+ public get incrProcessLaunchHasError(): boolean {
+ return this.k8sReplicationControllerCreated
+ && this.incrProcess
+ && !this.incrProcess.incrGoingOn
+ && !!this.rcDeployment
+ && !!this.rcDeployment.status
+ && this.rcDeployment.status.readyReplicas > 0;
+ }
+
+ public getFirstPod(): K8sPodState {
+ for (let i = 0; i < this.rcDeployment.pods.length; i++) {
+ return this.rcDeployment.pods[i];
+ break;
}
+ return null;
+ }
}
export interface IncrProcess {
- incrGoingOn: boolean;
- incrProcessPaused: boolean;
+ incrGoingOn: boolean;
+ incrProcessPaused: boolean;
}
export interface ProcessMeta {
- targetName: string;
- pageHeader: string;
- stepsType: StepType
- supportK8SReplicsSpecSetter: boolean;
- // step0
- notCreateTips: string;
- createButtonLabel: string;
+ targetName: string;
+ pageHeader: string;
+ stepsType: StepType
+ supportK8SReplicsSpecSetter: boolean;
+ // step0
+ notCreateTips: string;
+ //createButtonLabel: string;
+
+ step1Buttons?: Array<{ label: string, click: (cpt: DataxWorkerAddStep0Component) => void }>;
+ confirmStepCpts?: Array<{ cptType: PowerjobCptType, cptShow: (dto: DataxWorkerDTO) => boolean, cpuMemorySpecGetter: (dto: DataxWorkerDTO) => K8SRCSpec }>;
+
+ step0InitDescriptorProcess: (cpt: DataxWorkerAddStep0Component, desc: Array) => void
+
+ step1CreateSaveEvent: (step1: DataxWorkerAddStep1Component) => SavePluginEvent
+
+ step1HeteroGetter: (dto: DataxWorkerDTO) => HeteroList[]
+
+ launchClusterMethod: string;
+ relaunchClusterMethod: string;
}
export class DataXJobWorkerStatus extends K8SControllerStatus {
- processMeta: ProcessMeta;
+ processMeta: ProcessMeta;
}
export class DataxWorkerDTO {
- powderJobServerRCSpec: K8SRCSpec;
- powderJobWorkerRCSpec: K8SRCSpec;
- processMeta: ProcessMeta;
+ primaryRCSpec: K8SRCSpec;
+ powderJobWorkerRCSpec: K8SRCSpec;
+ processMeta: ProcessMeta;
- powderJobServerHetero: HeteroList[] = [];
- powderJobUseExistClusterHetero: HeteroList[] = [];
- powderJobWorkerHetero: HeteroList[] = [];
- powderjobJobTplHetero: HeteroList[] = [];
+ powderJobServerHetero: HeteroList[] = [];
+ powderJobUseExistClusterHetero: HeteroList[] = [];
+ powderJobWorkerHetero: HeteroList[] = [];
+ powderjobJobTplHetero: HeteroList[] = [];
- usingPowderJobUseExistCluster = false;
+ usingPowderJobUseExistCluster = false;
- public get containPowerJob(): boolean {
- return this.powderJobServerHetero.length > 0 && this.powderJobWorkerHetero.length > 0 && this.powderjobJobTplHetero.length > 0;
- }
+
+ flinkClusterHetero: HeteroList[] = [];
+
+ public get step1Hetero(): HeteroList[] {
+ return this.processMeta.step1HeteroGetter(this);
+ }
+
+ public get containPowerJob(): boolean {
+ return this.powderJobServerHetero.length > 0 && this.powderJobWorkerHetero.length > 0 && this.powderjobJobTplHetero.length > 0;
+ }
}
export interface PowerJobWorkflow {
- wfName: string;
- id: number;
- cronInfo: string;
- enable: true,
- gmtCreate: number;//1699937621000,
- gmtModified: number,
- // "id":16,
- // "maxWfInstanceNum":1,
- // "timeExpression":"0 0 12 * * ?",
- // "timeExpressionType":"CRON",
+ wfName: string;
+ id: number;
+ cronInfo: string;
+ enable: true,
+ gmtCreate: number;//1699937621000,
+ gmtModified: number,
+ // "id":16,
+ // "maxWfInstanceNum":1,
+ // "timeExpression":"0 0 12 * * ?",
+ // "timeExpressionType":"CRON",
}