From 9d68c621776585567f5bc42f130cce74fe4a5fdf Mon Sep 17 00:00:00 2001
From: xingyu <xingyu4j@vip.qq.com>
Date: Thu, 11 May 2023 17:36:58 +0800
Subject: [PATCH] refactor: vben dict

---
 .../codegen/vue3_vben/views/data.ts.vm        | 37 ++++---------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm
index 1a88d5253..981b136d3 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3_vben/views/data.ts.vm
@@ -1,5 +1,5 @@
 import { BasicColumn, FormSchema, useRender } from '@/components/Table'
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getDictOpts } from '@/utils/dict'
 
 export const columns: BasicColumn[] = [
 #foreach($column in $columns)
@@ -53,14 +53,7 @@ export const searchFormSchema: FormSchema[] = [
     component: 'Select',
     componentProps: {
       #if ("" != $dictType)## 设置了 dictType 数据字典的情况
-        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-          #set ($dictMethod = "getIntDictOptions")
-        #elseif ($javaType == "String")
-          #set ($dictMethod = "getStrDictOptions")
-        #elseif ($javaType == "Boolean")
-          #set ($dictMethod = "getBoolDictOptions")
-        #end
-        options: $dictMethod(DICT_TYPE.$dictType.toUpperCase())
+        options: getDictOpts(DICT_TYPE.$dictType.toUpperCase())
       #else## 未设置 dictType 数据字典的情况
         options: []
       #end
@@ -114,14 +107,7 @@ export const createFormSchema: FormSchema[] = [
     component: 'Select',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-          #set ($dictMethod = "getIntDictOptions")
-        #elseif ($javaType == "String")
-          #set ($dictMethod = "getStrDictOptions")
-        #elseif ($javaType == "Boolean")
-          #set ($dictMethod = "getBoolDictOptions")
-        #end
-        options: $dictMethod(DICT_TYPE.$dictType.toUpperCase())
+        options: getDictOpts(DICT_TYPE.$dictType.toUpperCase())
       #else##没数据字典
         options:[]
       #end
@@ -130,7 +116,7 @@ export const createFormSchema: FormSchema[] = [
     component: 'Checkbox',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+        options: getDictOpts(DICT_TYPE.$dictType.toUpperCase())
       #else##没数据字典
         options:[]
       #end
@@ -139,7 +125,7 @@ export const createFormSchema: FormSchema[] = [
     component: 'Radio',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+        options: getDictOpts(DICT_TYPE.$dictType.toUpperCase())
       #else##没数据字典
         options:[]
       #end
@@ -187,14 +173,7 @@ export const updateFormSchema: FormSchema[] = [
     component: 'Select',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
-          #set ($dictMethod = "getIntDictOptions")
-        #elseif ($javaType == "String")
-          #set ($dictMethod = "getStrDictOptions")
-        #elseif ($javaType == "Boolean")
-          #set ($dictMethod = "getBoolDictOptions")
-        #end
-        options: $dictMethod(DICT_TYPE.$dictType.toUpperCase())
+        options: getDictOpts(DICT_TYPE.$dictType.toUpperCase())
       #else##没数据字典
         options:[]
       #end
@@ -203,7 +182,7 @@ export const updateFormSchema: FormSchema[] = [
     component: 'Checkbox',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+        options: getDictOpts(DICT_TYPE.$dictType.toUpperCase())
       #else##没数据字典
         options:[]
       #end
@@ -212,7 +191,7 @@ export const updateFormSchema: FormSchema[] = [
     component: 'Radio',
     componentProps: {
       #if ("" != $dictType)## 有数据字典
-        options: getIntDictOptions(DICT_TYPE.COMMON_STATUS)
+        options: getDictOpts(DICT_TYPE.$dictType.toUpperCase())
       #else##没数据字典
         options:[]
       #end