diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 9a99e86..a9edca7 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,18 +5,12 @@ + - - - - - - - - - - - + + + + diff --git a/src/base/datax.add.step1.component.ts b/src/base/datax.add.step1.component.ts index 7258c64..20198f2 100644 --- a/src/base/datax.add.step1.component.ts +++ b/src/base/datax.add.step1.component.ts @@ -32,11 +32,22 @@ import {ExecModel} from "./datax.add.step7.confirm.component"; -
+ (goOn)="createIndexStep1Next()" [formDisabled]="formDisabled"> + + + + 构建MySQL到Doris批量同步通道 + 构建MySQ实时同步Doris示例,实现数据毫秒级同步 + + + +
+ + +
diff --git a/src/common/common.component.ts b/src/common/common.component.ts new file mode 100644 index 0000000..17c6fd8 --- /dev/null +++ b/src/common/common.component.ts @@ -0,0 +1,27 @@ +import { + AfterContentChecked, + AfterContentInit, + AfterViewInit, + Component, + ContentChildren, + Input, + OnInit, QueryList, TemplateRef, ViewChild, ViewContainerRef +} from "@angular/core"; +import {ItemPropVal} from "./tis.plugin"; +import {NzInputDirective} from "ng-zorro-antd/input"; +import {NzSelectComponent} from "ng-zorro-antd/select"; +import {TisInputProp} from "./form.component"; + +@Component({ + selector: 'blibli', + template: ` + + + ` +}) +export class BliBliComponent { + + @Input() + videoId:string; + +} diff --git a/src/common/common.module.ts b/src/common/common.module.ts index fb53fdf..98cd568 100644 --- a/src/common/common.module.ts +++ b/src/common/common.module.ts @@ -133,6 +133,7 @@ import {ControlPanelComponent} from "./control.panel.component"; import {SchemaEditComponent} from "./schema.edit.component"; import {FullBuildHistoryComponent} from './full.build.history.component'; import {LaunchK8SClusterWaittingProcessComponent} from './launch.waitting.process.component'; +import {BliBliComponent} from "./common.component"; // import {NgxTisCommonLibModule} from "ngx-tis-common-lib"; // angular libraries: https://angular.io/guide/creating-libraries @@ -160,7 +161,7 @@ import {LaunchK8SClusterWaittingProcessComponent} from './launch.waitting.proces NzLayoutModule, NzStatisticModule, NzEmptyModule, NzRadioModule, NzSpinModule, NzCollapseModule, NzDropDownModule, NzFormModule, NzInputModule, NzButtonModule, NzBreadCrumbModule, NzStepsModule, NzAffixModule, NzInputNumberModule, FormsModule, CommonModule, HttpClientModule, HttpClientJsonpModule, RouterModule, NzSelectModule, NzNotificationModule, NzTableModule, NzCheckboxModule, NzAlertModule, ReactiveFormsModule, NzListModule], - declarations: [LaunchK8SClusterWaittingProcessComponent, + declarations: [BliBliComponent,LaunchK8SClusterWaittingProcessComponent, NotebookwrapperComponent, ControlPanelComponent, SchemaEditComponent, TerminalComponent, ErrorDetailComponent, PluginManageComponent, SchemaExpertAppCreateEditComponent, AddAppDefSchemaComponent, TableSelectComponent, SideBarToolBar, K8SReplicsSpecComponent, PageHeaderLeftComponent, ProgressTitleComponent, ProgressComponent, ConsumeTimePipe, SnapshotsetComponent, SnapshotLinkComponent, SnapshotChangeLogComponent @@ -173,7 +174,7 @@ import {LaunchK8SClusterWaittingProcessComponent} from './launch.waitting.proces , DataxAddStep4Component, SelectedTabsComponent, DataxAddComponent, DataxAddStep1Component, DataxAddStep2Component, ViewGenerateCfgComponent, DataxAddStep5Component, DataxAddStep3Component, DataxAddStep6Component , PageHeaderComponent, TisMsgComponent, TisHeaderTool, TisHeaderToolContent, FormComponent, TisInputTool, InputContentDirective, TisInputProp, TisStepsToolbarComponent, IncrPodLogsStatusComponent ], - exports: [LaunchK8SClusterWaittingProcessComponent,SchemaEditComponent, ControlPanelComponent, PluginUpdateCenterComponent, SelectedTabsComponent, ErrorDetailComponent, SchemaExpertAppCreateEditComponent, AddAppDefSchemaComponent, K8SReplicsSpecComponent, SideBarToolBar, TableSelectComponent + exports: [BliBliComponent,LaunchK8SClusterWaittingProcessComponent,SchemaEditComponent, ControlPanelComponent, PluginUpdateCenterComponent, SelectedTabsComponent, ErrorDetailComponent, SchemaExpertAppCreateEditComponent, AddAppDefSchemaComponent, K8SReplicsSpecComponent, SideBarToolBar, TableSelectComponent , NzSpaceModule, NzDropDownModule, PageHeaderLeftComponent, NzProgressModule, NzResultModule, NzPageHeaderModule , NzAlertModule, NzDrawerModule, NzDividerModule, NzStatisticModule, ConsumeTimePipe, SnapshotsetComponent, SnapshotLinkComponent , SnapshotChangeLogComponent, SchemaXmlEditComponent, SchemaEditVisualizingModelComponent, diff --git a/src/runtime/app.module-jit.ts b/src/runtime/app.module-jit.ts index 5291742..29beac5 100644 --- a/src/runtime/app.module-jit.ts +++ b/src/runtime/app.module-jit.ts @@ -35,7 +35,10 @@ import {NZ_CODE_EDITOR_CONFIG} from "@zeppelin/share/code-editor"; import {loadMonaco} from "@zeppelin/app.module"; import {NzIconService} from "ng-zorro-antd/icon"; import {IconDefinition} from "@ant-design/icons-angular"; +import {LocalStorageService} from "angular-2-local-storage"; + +const local_endtype_icons = 'local_endtype_icons'; registerLocaleData(zh); export function markedOptionsFactory(): MarkedOptions { @@ -125,38 +128,52 @@ export function markedOptionsFactory(): MarkedOptions { }) export class AppModule { - constructor(iconService: NzIconService, tisService: TISService) { - // console.log('iconService'); - // console.log( iconService.getCachedIcons() ); - //(async function () { + private appendIconService(iconService: NzIconService, iconDefs: Array): void { - tisService.httpPost('/coredefine/corenodemanage.ajax' - , `action=plugin_action&emethod=get_endtype_icons`) - .then((result) => { - let iconDefs: Array = result.bizresult; - let id: TISIconDefinition = null; - let ref: IconDefinition = null; - let iconMap: Map = new Map(); - - for (let i = 0; i < iconDefs.length; i++) { - id = iconDefs[i]; - iconMap.set(id.name + "_" + id.theme, id); + let id: TISIconDefinition = null; + let ref: IconDefinition = null; + let iconMap: Map = new Map(); + + for (let i = 0; i < iconDefs.length; i++) { + id = iconDefs[i]; + iconMap.set(id.name + "_" + id.theme, id); + } + + for (let i = 0; i < iconDefs.length; i++) { + id = iconDefs[i]; + if (id.ref) { + ref = iconMap.get(id.ref + "_" + id.theme); + if (!ref) { + throw new Error("resource reference:'" + id.ref + "_" + id.theme + "' can not be null"); } + iconService.addIcon({name: id.name, theme: id.theme, icon: ref.icon}); + } else { + iconService.addIcon(iconDefs[i]); + } + } + } - for (let i = 0; i < iconDefs.length; i++) { - id = iconDefs[i]; - if (id.ref) { - ref = iconMap.get(id.ref + "_" + id.theme); - if (!ref) { - throw new Error("resource reference:'" + id.ref + "_" + id.theme + "' can not be null"); - } - iconService.addIcon({name: id.name, theme: id.theme, icon: ref.icon}); - } else { - iconService.addIcon(iconDefs[i]); - } + constructor(iconService: NzIconService, tisService: TISService, _localStorageService: LocalStorageService) { + let localEndTypesIcons: LocalEndtypeIcons = _localStorageService.get(local_endtype_icons) + // console.log(localEndTypesIcons); + let requestBody = `action=plugin_action&emethod=get_endtype_icons`; + if (localEndTypesIcons) { + requestBody += ("&vertoken=" + localEndTypesIcons.verToken); + this.appendIconService(iconService, localEndTypesIcons.iconsDefs); + } + + tisService.httpPost('/coredefine/corenodemanage.ajax', requestBody) + .then((result) => { + let r: LocalEndtypeIcons = result.bizresult; + + if (r.iconsDefs.length > 0) { + this.appendIconService(iconService, r.iconsDefs); + _localStorageService.set(local_endtype_icons, r); } - // console.log("xxxxxxxxxxxxxxxxxxxxx"); + + + // console.log("xxxxxxxxxxxxxxxxxxxxx"); }); // })(); // @@ -166,6 +183,12 @@ export class AppModule { } +interface LocalEndtypeIcons { + // 引用其他类型的Icon + iconsDefs: Array; + verToken: string; +} + interface TISIconDefinition extends IconDefinition { // 引用其他类型的Icon ref: string; diff --git a/src/runtime/incr.build.step0.component.ts b/src/runtime/incr.build.step0.component.ts index 3c7dbca..fa14f76 100644 --- a/src/runtime/incr.build.step0.component.ts +++ b/src/runtime/incr.build.step0.component.ts @@ -40,8 +40,7 @@ import {NzNotificationService} from "ng-zorro-antd/notification";

- - MySQL同步Doris作为示例,让初次使用者能够更快熟悉操作 + MySQ实时同步Doris作为示例,让初次使用者能够更快熟悉操作