vue3代码生成器模板优化

zhangdaiscott
1 parent e5e754f0
Showing 14 changed files with 302 additions and 68 deletions
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__api.tsi
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}__data.tsi
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/${entityName}Form.vuei
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/components/[1-n]Form.vuei
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi
@@ -94,6 +94,9 @@
   import { getAuthCache, setAuthCache } from '/@/utils/auth';
   import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum';
   </#if>
+  <#if bpm_flag==true>
+  import { startProcess } from '/@/api/common/api';
+  </#if>
    // 展开key
   const expandedRowKeys = ref<any[]>([]);
   //注册model
@@ -218,23 +221,66 @@
          }
        ]
    }
-     /**
-        * 下拉操作栏
-        */
+
+  <#if bpm_flag==true>
+  /**
+   * 提交流程
+   */
+  async function handleProcess(record) {
+    let params = {
+      flowCode: 'dev_${tableName}_001',
+      id: record.id,
+      formUrl: '${entityPackage}/modules/${entityName}Form',
+      formUrlMobile: ''
+    }
+    await startProcess(params);
+    handleSuccess();
+  }
+  </#if>
+
+  /**
+   * 下拉操作栏
+   */
   function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
+    <#if bpm_flag==true>
+    let dropDownAction = [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ];
+    if(record.bpmStatus == '1'){
+      dropDownAction.push({
+        label: '发起流程',
+        popConfirm: {
+          title: '确认提交流程吗？',
+          confirm: handleProcess.bind(null, record),
+        }
+      })
+    }
+    return dropDownAction;
+    <#else>
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+    </#if>
+  }
+
     <#if list_need_category>
    /**
     * 初始化字典配置
 import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
 enum Api {
   list = '/${entityPackage}/${entityName?uncap_first}/list',
@@ -50,7 +52,8 @@ export const deleteOne = (params,handleSuccess) =&gt; {
  * @param params
  */
 export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
+  createConfirm({
+    iconType: 'warning',
     title: '确认删除',
     content: '是否删除选中数据',
     okText: '确认',
@@ -123,7 +123,8 @@ export const searchFormSchema: FormSchema[] = [
 <#elseif po.classType=='datetime'>
       component: 'DatePicker',
       componentProps: {
-         showTime:true
+         showTime:true,
+         valueFormat: 'YYYY-MM-DD HH:mm:ss'
        },
 <#elseif po.classType=='pca'>
       component: 'JAreaLinkage',
@@ -190,6 +191,15 @@ export const formSchema: FormSchema[] = [
   {
     label: '${po.filedComment}',
     field: ${autoStringSuffix(po)},
+<#-- update-begin-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+  <#if po.defaultVal??>
+    <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
+    defaultValue: ${po.defaultVal},
+    <#else>
+    defaultValue: "${po.defaultVal}",
+    </#if>
+  </#if>
+<#-- update-end-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
     <#if po.classType =='date'>
     component: 'DatePicker',
      <#elseif po.classType =='datetime'>
@@ -321,7 +331,7 @@ export const formSchema: FormSchema[] = [
                  { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            <#-- 邮政编码 -->
            <#elseif fieldValidType == 'p'>
-                 { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+                 { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
            <#-- 字母 -->
            <#elseif fieldValidType == 's'>
                  { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
@@ -449,6 +459,15 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
   {
     label: '${po.filedComment}',
     field: ${autoStringSuffix(po)},
+<#-- update-begin-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+  <#if po.defaultVal??>
+    <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
+    defaultValue: ${po.defaultVal},
+    <#else>
+    defaultValue: "${po.defaultVal}",
+    </#if>
+  </#if>
+<#-- update-end-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
     <#if po.classType =='date'>
     component: 'DatePicker',
      <#elseif po.classType =='datetime'>
@@ -580,7 +599,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
                  { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            <#-- 邮政编码 -->
            <#elseif fieldValidType == 'p'>
-                 { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+                 { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
            <#-- 字母 -->
            <#elseif fieldValidType == 's'>
                  { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
@@ -77,6 +77,9 @@
   import { getAuthCache, setAuthCache } from '/@/utils/auth';
   import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum';
   </#if>
+  <#if bpm_flag==true>
+  import { startProcess } from '/@/api/common/api';
+  </#if>
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
@@ -192,23 +195,66 @@
          }
        ]
    }
-     /**
-        * 下拉操作栏
-        */
+
+  <#if bpm_flag==true>
+  /**
+   * 提交流程
+   */
+  async function handleProcess(record) {
+    let params = {
+      flowCode: 'dev_${tableName}_001',
+      id: record.id,
+      formUrl: '${entityPackage}/modules/${entityName}Form',
+      formUrlMobile: ''
+    }
+    await startProcess(params);
+    handleSuccess();
+  }
+  </#if>
+
+  /**
+   * 下拉操作栏
+   */
   function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
+    <#if bpm_flag==true>
+    let dropDownAction = [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ];
+    if(record.bpmStatus == '1'){
+      dropDownAction.push({
+        label: '发起流程',
+        popConfirm: {
+          title: '确认提交流程吗？',
+          confirm: handleProcess.bind(null, record),
+        }
+      })
+    }
+    return dropDownAction;
+    <#else>
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+    </#if>
+  }
+
     <#if list_need_category>
    /**
     * 初始化字典配置
 import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
 enum Api {
   list = '/${entityPackage}/${entityName?uncap_first}/list',
@@ -50,7 +52,8 @@ export const deleteOne = (params,handleSuccess) =&gt; {
  * @param params
  */
 export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
+  createConfirm({
+    iconType: 'warning',
     title: '确认删除',
     content: '是否删除选中数据',
     okText: '确认',
@@ -123,7 +123,8 @@ export const searchFormSchema: FormSchema[] = [
 <#elseif po.classType=='datetime'>
       component: 'DatePicker',
       componentProps: {
-         showTime:true
+         showTime:true,
+         valueFormat: 'YYYY-MM-DD HH:mm:ss'
        },
 <#elseif po.classType=='pca'>
       component: 'JAreaLinkage',
@@ -190,6 +191,15 @@ export const formSchema: FormSchema[] = [
   {
     label: '${po.filedComment}',
     field: ${autoStringSuffix(po)},
+<#-- update-begin-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+  <#if po.defaultVal??>
+    <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
+    defaultValue: ${po.defaultVal},
+    <#else>
+    defaultValue: "${po.defaultVal}",
+    </#if>
+  </#if>
+<#-- update-end-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
     <#if po.classType =='date'>
     component: 'DatePicker',
      <#elseif po.classType =='datetime'>
@@ -321,7 +331,7 @@ export const formSchema: FormSchema[] = [
                  { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            <#-- 邮政编码 -->
            <#elseif fieldValidType == 'p'>
-                 { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+                 { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
            <#-- 字母 -->
            <#elseif fieldValidType == 's'>
                  { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
@@ -386,6 +396,15 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
   {
     label: '${po.filedComment}',
     field: ${autoStringSuffix(po)},
+<#-- update-begin-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+  <#if po.defaultVal??>
+    <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
+    defaultValue: ${po.defaultVal},
+    <#else>
+    defaultValue: "${po.defaultVal}",
+    </#if>
+  </#if>
+<#-- update-end-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
     <#if po.classType =='date'>
     component: 'DatePicker',
      <#elseif po.classType =='datetime'>
@@ -517,7 +536,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
                  { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            <#-- 邮政编码 -->
            <#elseif fieldValidType == 'p'>
-                 { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+                 { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
            <#-- 字母 -->
            <#elseif fieldValidType == 's'>
                  { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
@@ -18,6 +18,7 @@
     <#assign need_image_upload = false>
     <#assign need_editor = false>
     <#assign need_checkbox = false>
+    <#assign query_flag = false>
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
@@ -27,6 +28,9 @@
             <#if po.fieldDbName=='bpm_status'>
               <#assign bpm_flag=true>
             </#if>
+            <#if po.isQuery=='Y'>
+              <#assign query_flag=true>
+            </#if>
             <#if po.classType=='cat_tree' && po.dictText?default("")?trim?length == 0>
               <#assign need_category=true>
             </#if>
 import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
 enum Api {
   list = '/${entityPackage}/${entityName?uncap_first}/list',
@@ -53,7 +55,8 @@ export const deleteOne = (params,handleSuccess) =&gt; {
  * @param params
  */
 export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
+  createConfirm({
+    iconType: 'warning',
     title: '确认删除',
     content: '是否删除选中数据',
     okText: '确认',
@@ -122,7 +122,8 @@ export const searchFormSchema: FormSchema[] = [
 <#elseif po.classType=='datetime'>
       component: 'DatePicker',
       componentProps: {
-         showTime:true
+         showTime:true,
+         valueFormat: 'YYYY-MM-DD HH:mm:ss'
        },
 <#elseif po.classType=='pca'>
       component: 'JAreaLinkage',
@@ -320,7 +321,7 @@ export const formSchema: FormSchema[] = [
                  { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            <#-- 邮政编码 -->
            <#elseif fieldValidType == 'p'>
-                 { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+                 { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
            <#-- 字母 -->
            <#elseif fieldValidType == 's'>
                  { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
@@ -516,7 +517,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
                  { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            <#-- 邮政编码 -->
            <#elseif fieldValidType == 'p'>
-                 { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+                 { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
            <#-- 字母 -->
            <#elseif fieldValidType == 's'>
                  { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
@@ -137,6 +137,7 @@
       </#list>
       const activeKey = ref('${subTabActiveKey}');
       const formData = reactive<Record<string, any>>({
+        id: '',
       <#list columns as po>
       <#if po.isShow == 'Y'>
         ${po.fieldName}: '',
@@ -229,6 +230,15 @@
         }
       }
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+
       <#list columns as po>
       <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
       async function ${po.fieldName}Duplicatevalidate(_r, value) {
@@ -252,6 +262,7 @@
         loading,
         formData,
         setFieldsValue,
+        handleFormChange,
         formItemLayout,
         formDisabled,
         getFormData,
@@ -74,6 +74,7 @@
       const isForm = true;
       const loading = ref(false);
       const formData = reactive<Record<string, any>>({
+        id: '',
     <#list sub.colums as po>
     <#if po.isShow == 'Y'>
         ${po.fieldName}: '',
@@ -124,6 +125,15 @@
         }
       }
+      /**
+       * 值改变事件触发-树控件回调
+       * @param key
+       * @param value
+       */
+      function handleFormChange(key, value) {
+        formData[key] = value;
+      }
+
     <#list sub.colums as po>
     <#if po.isShow == 'Y' && po.fieldValidType?default("") == 'only'>
       async function ${po.fieldName}Duplicatevalidate(_r, value) {
@@ -139,6 +149,7 @@
         initFormData,
         getFormData,
         setFieldsValue,
+        handleFormChange,
         isForm,
         validateInfos
       }
@@ -77,6 +77,9 @@
   import { getAuthCache, setAuthCache } from '/@/utils/auth';
   import { DB_DICT_DATA_KEY } from '/@/enums/cacheEnum';
   </#if>
+  <#if bpm_flag==true>
+  import { startProcess } from '/@/api/common/api';
+  </#if>
   const checkedKeys = ref<Array<string | number>>([]);
   //注册model
   const [registerModal, {openModal}] = useModal();
@@ -192,23 +195,66 @@
          }
        ]
    }
-     /**
-        * 下拉操作栏
-        */
+
+  <#if bpm_flag==true>
+  /**
+   * 提交流程
+   */
+  async function handleProcess(record) {
+    let params = {
+      flowCode: 'dev_${tableName}_001',
+      id: record.id,
+      formUrl: '${entityPackage}/modules/${entityName}Form',
+      formUrlMobile: ''
+    }
+    await startProcess(params);
+    handleSuccess();
+  }
+  </#if>
+
+  /**
+   * 下拉操作栏
+   */
   function getDropDownAction(record){
-      return [
-           {
-             label: '详情',
-             onClick: handleDetail.bind(null, record),
-           }, {
-             label: '删除',
-             popConfirm: {
-               title: '是否确认删除',
-               confirm: handleDelete.bind(null, record),
-             }
-           }
-      ]
-   }
+    <#if bpm_flag==true>
+    let dropDownAction = [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ];
+    if(record.bpmStatus == '1'){
+      dropDownAction.push({
+        label: '发起流程',
+        popConfirm: {
+          title: '确认提交流程吗？',
+          confirm: handleProcess.bind(null, record),
+        }
+      })
+    }
+    return dropDownAction;
+    <#else>
+    return [
+      {
+        label: '详情',
+        onClick: handleDetail.bind(null, record),
+      }, {
+        label: '删除',
+        popConfirm: {
+          title: '是否确认删除',
+          confirm: handleDelete.bind(null, record),
+        }
+      }
+    ]
+    </#if>
+  }
+
     <#if list_need_category>
    /**
     * 初始化字典配置
 import {defHttp} from '/@/utils/http/axios';
-import {Modal} from 'ant-design-vue';
+import { useMessage } from "/@/hooks/web/useMessage";
+
+const { createConfirm } = useMessage();
 enum Api {
   list = '/${entityPackage}/${entityName?uncap_first}/list',
@@ -50,7 +52,8 @@ export const deleteOne = (params,handleSuccess) =&gt; {
  * @param params
  */
 export const batchDelete = (params, handleSuccess) => {
-  Modal.confirm({
+  createConfirm({
+    iconType: 'warning',
     title: '确认删除',
     content: '是否删除选中数据',
     okText: '确认',
@@ -123,7 +123,8 @@ export const searchFormSchema: FormSchema[] = [
 <#elseif po.classType=='datetime'>
       component: 'DatePicker',
       componentProps: {
-         showTime:true
+         showTime:true,
+         valueFormat: 'YYYY-MM-DD HH:mm:ss'
        },
 <#elseif po.classType=='pca'>
       component: 'JAreaLinkage',
@@ -190,6 +191,15 @@ export const formSchema: FormSchema[] = [
   {
     label: '${po.filedComment}',
     field: ${autoStringSuffix(po)},
+<#-- update-begin-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+  <#if po.defaultVal??>
+    <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
+    defaultValue: ${po.defaultVal},
+    <#else>
+    defaultValue: "${po.defaultVal}",
+    </#if>
+  </#if>
+<#-- update-end-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
     <#if po.classType =='date'>
     component: 'DatePicker',
      <#elseif po.classType =='datetime'>
@@ -318,7 +328,7 @@ export const formSchema: FormSchema[] = [
                  { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            <#-- 邮政编码 -->
            <#elseif fieldValidType == 'p'>
-                 { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+                 { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
            <#-- 字母 -->
            <#elseif fieldValidType == 's'>
                  { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},
@@ -383,6 +393,15 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
   {
     label: '${po.filedComment}',
     field: ${autoStringSuffix(po)},
+<#-- update-begin-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
+  <#if po.defaultVal??>
+    <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
+    defaultValue: ${po.defaultVal},
+    <#else>
+    defaultValue: "${po.defaultVal}",
+    </#if>
+  </#if>
+<#-- update-end-author:taoyan date:2022-6-24 for: VUEN-1190【代码生成】默认值未生成 -->
     <#if po.classType =='date'>
     component: 'DatePicker',
      <#elseif po.classType =='datetime'>
@@ -511,7 +530,7 @@ export const ${sub.entityName?uncap_first}FormSchema: FormSchema[] = [
                  { pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
            <#-- 邮政编码 -->
            <#elseif fieldValidType == 'p'>
-                 { pattern: /^[1-9]\d{5}$/, message: '请输入正确的邮政编码!'},
+                 { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮政编码!'},
            <#-- 字母 -->
            <#elseif fieldValidType == 's'>
                  { pattern: /^[A-Z|a-z]+$/, message: '请输入字母!'},