From 808881558099f502f49d7893d9482c94cc134b5f Mon Sep 17 00:00:00 2001
From: zhangdaihao <zhangdaiscott@163.com>
Date: Mon, 2 Sep 2019 12:03:11 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=B8=BB?=
 =?UTF-8?q?=E9=94=AE=E6=8D=A2=E6=88=90=E5=88=86=E5=B8=83=E5=BC=8F=E7=AE=97?=
 =?UTF-8?q?=E6=B3=95ID=5FWORKER=5FSTR=202.=E8=A7=A3=E5=86=B3online?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=8Cexcel=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=97=A0=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98=203.?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3online=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=EF=BC=8CJpopup=E4=BD=BF=E7=94=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../${entityPackage}/entity/${entityName}.javai             | 2 +-
 .../${entityPackage}/vue/${entityName}List.vuei             | 4 ++--
 .../${entityPackage}/vue/modules/${entityName}Modal.vuei    | 6 ------
 .../vue/modules/${entityName}Modal__Style#Drawer.vuei       | 6 ------
 .../${entityPackage}/entity/${entityName}.javai             | 2 +-
 .../${entityPackage}/entity/[1-n]Entity.javai               | 2 +-
 .../${entityPackage}/vue/${entityName}List.vuei             | 4 ++--
 .../${entityPackage}/vue/modules/${entityName}Modal.vuei    | 6 ------
 .../${entityPackage}/vue/modules/[1-n]Form.vuei             | 6 ------
 .../${entityPackage}/entity/${entityName}.javai             | 2 +-
 .../${entityPackage}/vue/${entityName}List.vuei             | 2 +-
 .../${entityPackage}/vue/modules/${entityName}Modal.vuei    | 6 ------
 12 files changed, 9 insertions(+), 39 deletions(-)

diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index bd44231..f98eae7 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -26,7 +26,7 @@ public class ${entityName} implements Serializable {
     <#list originalColumns as po>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
+	@TableId(type = IdType.ID_WORKER_STR)
 	<#else>
   		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index f564b4f..a8e274c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -2,7 +2,7 @@
   <a-card :bordered="false">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
-      <a-form layout="inline">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
 <#assign query_field_no=0>
 <#assign query_field_select=false>
@@ -93,7 +93,7 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index 5f1c194..2e1a010 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -81,9 +81,6 @@
   <#if form_file>
   import JUpload from '@/components/jeecg/JUpload'
   </#if>
-  <#if form_popup>
-  import JPopup from '@/components/jeecgbiz/JPopup'
-  </#if>
   <#if form_sel_depart>
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   </#if>
@@ -106,9 +103,6 @@
     <#if form_file>
       JUpload,
     </#if>
-    <#if form_popup>
-      JPopup,
-    </#if>
     <#if form_sel_depart>
       JSelectDepart,
     </#if>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
index f1171c5..92d1bf2 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
@@ -82,9 +82,6 @@
   <#if form_file>
   import JUpload from '@/components/jeecg/JUpload'
   </#if>
-  <#if form_popup>
-  import JPopup from '@/components/jeecgbiz/JPopup'
-  </#if>
   <#if form_sel_depart>
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   </#if>
@@ -107,9 +104,6 @@
     <#if form_file>
       JUpload,
     </#if>
-    <#if form_popup>
-      JPopup,
-    </#if>
     <#if form_sel_depart>
       JSelectDepart,
     </#if>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index ae7f61e..12cb804 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -23,7 +23,7 @@ public class ${entityName} implements Serializable {
     <#list originalColumns as po>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
+	@TableId(type = IdType.ID_WORKER_STR)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
index deb1dcd..730916c 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
@@ -26,7 +26,7 @@ public class ${subTab.entityName} implements Serializable {
     <#list subTab.originalColumns as po>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
+	@TableId(type = IdType.ID_WORKER_STR)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index 0217fd0..c4e7795 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -2,7 +2,7 @@
   <a-card :bordered="false">
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
-      <a-form layout="inline">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
 <#assign query_field_no=0>
 <#assign query_field_select=false>
@@ -93,7 +93,7 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index a1e43ca..9df9ad7 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -122,9 +122,6 @@
   <#if form_file>
   import JUpload from '@/components/jeecg/JUpload'
   </#if>
-  <#if form_popup>
-  import JPopup from '@/components/jeecgbiz/JPopup'
-  </#if>
   <#if form_sel_depart>
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   </#if>
@@ -153,9 +150,6 @@
     <#if form_file>
       JUpload,
     </#if>
-    <#if form_popup>
-      JPopup,
-    </#if>
     <#if form_sel_depart>
       JSelectDepart,
     </#if>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
index 60a83e1..a8fd62e 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
@@ -81,9 +81,6 @@
   <#if form_file>
   import JUpload from '@/components/jeecg/JUpload'
   </#if>
-  <#if form_popup>
-  import JPopup from '@/components/jeecgbiz/JPopup'
-  </#if>
   <#if form_sel_depart>
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   </#if>
@@ -106,9 +103,6 @@
     <#if form_file>
       JUpload,
     </#if>
-    <#if form_popup>
-      JPopup,
-    </#if>
     <#if form_sel_depart>
       JSelectDepart,
     </#if>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
index bd44231..f98eae7 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
@@ -26,7 +26,7 @@ public class ${entityName} implements Serializable {
     <#list originalColumns as po>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.UUID)
+	@TableId(type = IdType.ID_WORKER_STR)
 	<#else>
   		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
index 4137119..f69208b 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
@@ -15,7 +15,7 @@
     <div class="table-operator">
       <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
       <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload>
       <a-dropdown v-if="selectedRowKeys.length > 0">
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
index e6105eb..75cf5d5 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
@@ -95,9 +95,6 @@
   <#if form_file>
   import JUpload from '@/components/jeecg/JUpload'
   </#if>
-  <#if form_popup>
-  import JPopup from '@/components/jeecgbiz/JPopup'
-  </#if>
   <#if form_sel_depart>
   import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
   </#if>
@@ -123,9 +120,6 @@
     <#if form_file>
       JUpload,
     </#if>
-    <#if form_popup>
-      JPopup,
-    </#if>
     <#if form_sel_depart>
       JSelectDepart,
     </#if>
-- 
GitLab