Commit 1bdde35dc9cf895687e5f8d6081d0e0e7ed587d9
1 parent
039f4a0d
fix: codegen
Showing
2 changed files
with
5 additions
and
2 deletions
yudao-dependencies/pom.xml
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | <fastjson.version>1.2.83</fastjson.version> | 50 | <fastjson.version>1.2.83</fastjson.version> |
| 51 | <guava.version>31.1-jre</guava.version> | 51 | <guava.version>31.1-jre</guava.version> |
| 52 | <guice.version>5.1.0</guice.version> | 52 | <guice.version>5.1.0</guice.version> |
| 53 | - <transmittable-thread-local.version>2.14.0</transmittable-thread-local.version> | 53 | + <transmittable-thread-local.version>2.14.2</transmittable-thread-local.version> |
| 54 | <commons-net.version>3.8.0</commons-net.version> | 54 | <commons-net.version>3.8.0</commons-net.version> |
| 55 | <jsch.version>0.1.55</jsch.version> | 55 | <jsch.version>0.1.55</jsch.version> |
| 56 | <tika-core.version>2.5.0</tika-core.version> | 56 | <tika-core.version>2.5.0</tika-core.version> |
yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/data.ts.vm
| @@ -28,6 +28,9 @@ const crudSchemas = reactive<VxeCrudSchema>({ | @@ -28,6 +28,9 @@ const crudSchemas = reactive<VxeCrudSchema>({ | ||
| 28 | { | 28 | { |
| 29 | title: '${column.columnComment}', | 29 | title: '${column.columnComment}', |
| 30 | field: '${column.javaField}', | 30 | field: '${column.javaField}', |
| 31 | + #if (!$column.listOperationResult) | ||
| 32 | + isTable: false, | ||
| 33 | + #end | ||
| 31 | #if ("" != $dictType)## 有数据字典 | 34 | #if ("" != $dictType)## 有数据字典 |
| 32 | dictType: DICT_TYPE.$dictType.toUpperCase(), | 35 | dictType: DICT_TYPE.$dictType.toUpperCase(), |
| 33 | #if (${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") | 36 | #if (${column.javaType.toLowerCase()} == "long" || ${column.javaType.toLowerCase()} == "integer") |
| @@ -76,7 +79,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ | @@ -76,7 +79,7 @@ const crudSchemas = reactive<VxeCrudSchema>({ | ||
| 76 | }, | 79 | }, |
| 77 | #end | 80 | #end |
| 78 | #end | 81 | #end |
| 79 | - #if ($column.listOperationResult) | 82 | + #if ($column.listOperation) |
| 80 | #if($column.htmlType == "input") | 83 | #if($column.htmlType == "input") |
| 81 | isSearch: true, | 84 | isSearch: true, |
| 82 | #elseif("" != $dictType) | 85 | #elseif("" != $dictType) |