Skip to content

fix: import dataType problem #269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
scarqin merged 1 commit into from
Mar 14, 2023
Merged

fix: import dataType problem #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/workbench/browser/src/app/modules/api-shared/params-import/params-import.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ export class ParamsImportComponent implements OnInit {
const combineFunc = {
overwrite: data => data,
append: (data, base) => base.concat(data),
mixin: (data, base) => pcMerge(base, data, 'paramAttr.example', 'childList', false)
mixin: (data, base) => pcMerge(base, data, ['dataType', 'paramAttr.example'], 'childList', false)
};

const endParse = (data, type) => {
Expand Down
2 changes: 1 addition & 1 deletion src/workbench/browser/src/app/utils/data-transfer/data-transfer.utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const parseTree = (key, value): BodyParam | unknown => {
paramAttr: {
example: ''
},
dataType: ApiParamsType.string,
dataType: ApiParamsType.object,
description: '',
childList: Object.keys(value).map(it => parseTree(it, value[it]))
};
Expand Down
8 changes: 5 additions & 3 deletions src/workbench/browser/src/app/utils/pc-merge.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export interface RootObject {
* @description Merge specified key
* @param {RootObject[]} baseArr baseArr
* @param {RootObject[]} newDataArr newDataArr
* @param {string} mergerKey specified key
* @param {string[]} mergerKey specified key
* @param {string} childKey childList correspondence key
* @param {boolean} childKey isChild
* @return {RootObject[]} assginArr
Expand All @@ -33,7 +33,7 @@ export interface RootObject {
export const pcMerge = (
baseArr: RootObject[],
newDataArr: RootObject[],
mergerKey: string,
mergerKey: string[],
childKey: string,
isChild: boolean
): RootObject[] => {
Expand All @@ -45,7 +45,9 @@ export const pcMerge = (
for (let ele of handleData) {
if (item.name === ele.name) {
//Assigns the specified key
ele[mergerKey] = item[mergerKey];
mergerKey.forEach(e => {
ele[e] = item[e];
});
if (item[childKey] && item[childKey].length !== 0) {
if (ele[childKey]) {
//Subtree recursion
Expand Down