Browse Source

Merge branch '1.2.2' of http://git.platomix.net/yangfan/workflow into 1.2.2

hml 5 months ago
parent
commit
1b39bef723
2 changed files with 3 additions and 3 deletions
  1. 1 1
      src/components/Generator/components/InputTable/index.vue
  2. 2 2
      src/utils/request.js

+ 1 - 1
src/components/Generator/components/InputTable/index.vue

@@ -565,7 +565,7 @@ export default {
           isText: t.isText || false,
           ...additionalType
         }
-        if (this.config.relationColumnList && this.config.relationColumnList.length){
+        if (relationFlag && this.config.relationColumnList && this.config.relationColumnList.length){
           let relationColumn = this.config.relationColumnList.find(item => item.foreignId == res.__vModel__)
           if (relationColumn) {
             res.value = val ? val[relationColumn.primaryId] : null

File diff suppressed because it is too large
+ 2 - 2
src/utils/request.js