fix: import dataType problem (#269)

Co-authored-by: sunzhouyang <sunzhouyang@eolink.com>
Postcatlab · Mar 14, 2023 · bf7694d · bf7694d
1 parent 6cbe019
commit bf7694d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/workbench/browser/src/app/modules/api-shared/params-import/params-import.component.ts b/src/workbench/browser/src/app/modules/api-shared/params-import/params-import.component.ts
@@ -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) => {

diff --git a/src/workbench/browser/src/app/utils/data-transfer/data-transfer.utils.ts b/src/workbench/browser/src/app/utils/data-transfer/data-transfer.utils.ts
@@ -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]))
     };

diff --git a/src/workbench/browser/src/app/utils/pc-merge.ts b/src/workbench/browser/src/app/utils/pc-merge.ts
@@ -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
@@ -33,7 +33,7 @@ export interface RootObject {
 export const pcMerge = (
   baseArr: RootObject[],
   newDataArr: RootObject[],
-  mergerKey: string,
+  mergerKey: string[],
   childKey: string,
   isChild: boolean
 ): RootObject[] => {
@@ -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