Skip to content

Commit e3fc974

Browse files
committed
set new version:v4.2.0
1 parent caeabe6 commit e3fc974

3 files changed

Lines changed: 96 additions & 22 deletions

File tree

.idea/workspace.xml

Lines changed: 2 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml.4.2.0

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--~
3+
~ Licensed to the Apache Software Foundation (ASF) under one
4+
~ or more contributor license agreements. See the NOTICE file
5+
~ distributed with this work for additional information
6+
~ regarding copyright ownership. The ASF licenses this file
7+
~ to you under the Apache License, Version 2.0 (the
8+
~ "License"); you may not use this file except in compliance
9+
~ with the License. You may obtain a copy of the License at
10+
~
11+
~ http://www.apache.org/licenses/LICENSE-2.0
12+
~
13+
~ Unless required by applicable law or agreed to in writing, software
14+
~ distributed under the License is distributed on an "AS IS" BASIS,
15+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
~ See the License for the specific language governing permissions and
17+
~ limitations under the License.
18+
-->
19+
20+
<project
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
22+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
23+
<modelVersion>4.0.0</modelVersion>
24+
25+
<parent>
26+
<groupId>com.qlangtech.tis</groupId>
27+
<artifactId>tis-parent</artifactId>
28+
<version>1.1.0</version>
29+
</parent>
30+
31+
<groupId>com.qlangtech.tis</groupId>
32+
<artifactId>ng-tis</artifactId>
33+
34+
35+
<packaging>pom</packaging>
36+
<name>tis</name>
37+
<url>http://maven.apache.org</url>
38+
<properties>
39+
<!-- <tisasm-maven-plugin.version>1.0.7</tisasm-maven-plugin.version>-->
40+
</properties>
41+
42+
<build>
43+
<!-- <plugins>-->
44+
<!-- <plugin>-->
45+
<!-- <groupId>com.qlangtech.tis</groupId>-->
46+
<!-- <artifactId>tisasm-maven-plugin</artifactId>-->
47+
<!-- <configuration>-->
48+
<!-- <appendDeplpyFileName>ng-tis.tar.gz</appendDeplpyFileName>-->
49+
<!-- </configuration>-->
50+
<!-- </plugin>-->
51+
<!-- </plugins>-->
52+
</build>
53+
54+
</project>

src/base/end.cpt.list.component.ts

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,13 @@ import {TISService} from "../common/tis.service";
2323
import {NzModalService} from "ng-zorro-antd/modal";
2424
import {ActivatedRoute, Router} from "@angular/router";
2525
import {DataxDTO} from "./datax.add.component";
26-
import {Descriptor, HeteroList, PluginType} from "../common/tis.plugin";
26+
import {Descriptor, HeteroList, PluginMeta, PluginType} from "../common/tis.plugin";
2727
import {PluginsComponent} from "../common/plugins.component";
2828
import {DATAX_PREFIX_DB} from "./datax.add.base";
29+
import {DataxAddStep4Component, ISubDetailTransferMeta} from "./datax.add.step4.component";
2930

3031
const KEY_END_TYPE = 'desc'
32+
const KEY_TRANSFORMER_END_TYPE = 'transformer_desc'
3133
const DATAX_READER = 'dataxReader'
3234
const DATAX_WRITER = 'dataxWriter'
3335

@@ -167,22 +169,45 @@ export class EndCptListComponent extends BasicFormComponent implements OnInit {
167169
ngOnInit(): void {
168170

169171
let queryParams = this.route.snapshot.queryParamMap;
170-
this.tisService.currentApp = new CurrentCollection(0, "mysql_mysql");
172+
let pipeName = "mysql_mysql";
173+
this.tisService.currentApp = new CurrentCollection(0, pipeName);
174+
175+
let transformerEndType: string[] = queryParams.getAll(KEY_TRANSFORMER_END_TYPE);
176+
if (transformerEndType && transformerEndType.length > 0) {
177+
178+
let pluginMeta: PluginType = {
179+
name: 'transformerUDF',
180+
require: true,
181+
"extraParam": ('dataxName_' + pipeName),
182+
descFilter: {
183+
localDescFilter: (d) => {
184+
return transformerEndType[0] === d.impl;
185+
}
186+
}
187+
}
188+
let meta: ISubDetailTransferMeta = {
189+
id: 'orderdetail',
190+
// behaviorMeta: ISubDetailClickBehaviorMeta;
191+
fieldName: null,
192+
idList: [],
193+
// 是否已经设置子表单
194+
setted: false
195+
};
196+
DataxAddStep4Component.processSubFormHeteroList(this, pluginMeta, meta, [])
197+
.then((hlist: HeteroList[]) => {
198+
console.log(hlist);
199+
for(let hetero of hlist){
200+
PluginsComponent.addDefaultItem(pluginMeta as PluginMeta, hetero);
201+
}
202+
203+
this.assistHeteroList = hlist;
204+
this.assistMetas = [pluginMeta];
205+
});
206+
return;
207+
}
208+
171209
let assistEndType: string[] = queryParams.getAll(KEY_END_TYPE);
172210
if (assistEndType && assistEndType.length > 0) {
173-
//console.log(assistEndType);
174-
// this.httpPost('/coredefine/corenodemanage.ajax'
175-
// , 'action=plugin_action&emethod=get_descs&'
176-
// + assistEndType.map((desc) => KEY_END_TYPE + "=" + desc).join("&"))
177-
// .then((r) => {
178-
// if (!r.success) {
179-
// return;
180-
// }
181-
//
182-
// let descMap = Descriptor.wrapDescriptors(r.bizresult)
183-
// return descMap;
184-
//
185-
// });
186211

187212
let pluginMeta: PluginType[] = new Array();
188213
for (let i of assistEndType) {

0 commit comments

Comments
 (0)