Merge branch 'master' of https://github.com/zhangdaiscott/jeecg-boot.git

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi

@@ -247,8 +247,13 @@ export const formSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi

@@ -233,10 +233,15 @@ export const formSchema: FormSchema[] = [
     componentProps:{
       dictCode: "${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
     componentProps:{
-      dictCode: "${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
      },
     <#elseif po.classType=='sel_search'>
     component: 'JSearchSelect',

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei

@@ -102,6 +102,7 @@
          title: '${tableVo.ftlDescription}',
          columns,
          canResize:false,
+         isTreeTable: true,
          formConfig: {
            //labelWidth: 120,
            schemas: searchFormSchema,

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi

@@ -273,8 +273,13 @@ export const formSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi

@@ -263,10 +263,15 @@ export const formSchema: FormSchema[] = [
     componentProps:{
         dictCode: "${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
     componentProps:{
-        dictCode: "${form_field_dictCode}"
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
      },
     <#elseif po.classType=='sel_search'>
     component: 'JSearchSelect',

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi

@@ -240,8 +240,13 @@ export const formSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
@@ -507,8 +512,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi

@@ -240,8 +240,13 @@ export const formSchema: FormSchema[] = [
     componentProps:{
       dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
@@ -507,8 +512,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     componentProps:{
       dictCode:"${form_field_dictCode}"
     },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi

@@ -243,8 +243,13 @@ export const formSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
@@ -508,8 +513,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi

@@ -243,8 +243,13 @@ export const formSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
@@ -448,11 +453,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
     componentProps:{
         dictCode:"${form_field_dictCode}"
-     }
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
     <#elseif po.classType=='sel_search'>
     component: 'JSearchSelect',
     componentProps:{

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi

@@ -229,8 +229,13 @@ export const formSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
@@ -425,11 +430,16 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
     componentProps:{
         dictCode:"${form_field_dictCode}"
-     }
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
     <#elseif po.classType=='sel_search'>
     component: 'JSearchSelect',
     componentProps:{

jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi

@@ -240,8 +240,13 @@ export const formSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
@@ -442,8 +447,13 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },
-    <#elseif po.classType=='list_multi' || po.classType=='checkbox'>
+    <#elseif po.classType=='list_multi'>
     component: 'JSelectMultiple',
+    componentProps:{
+        dictCode:"${form_field_dictCode}"
+     },
+    <#elseif po.classType=='checkbox'>
+    component: 'JCheckbox',
     componentProps:{
         dictCode:"${form_field_dictCode}"
      },