wms / wms4_xiangtancongde · Commits

Commit df76ff0cdce3aaea8da2d119d93d09eeed9d7649

Authored by zhangdaihao
1 parent 17cbf47a

1.代码生成主键换成分布式算法ID_WORKER_STR 

2.解决online代码生成，excel导入无权限问题
3.解决online代码生成，Jpopup使用问题
Inline Side-by-side
Showing 12 changed files with 9 additions and 39 deletions
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @df76ff0
... ... @@ -26,7 +26,7 @@ public class ${entityName} implements Serializable {
26 26 <#list originalColumns as po>
27 27 /**${po.filedComment}*/
28 28 <#if po.fieldName == primaryKeyField>
29   - @TableId(type = IdType.UUID)
  29 + @TableId(type = IdType.ID_WORKER_STR)
30 30 <#else>
31 31 <#if po.fieldDbType =='Date'>
32 32 <#if po.classType=='date'>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
  View file @df76ff0
... ... @@ -2,7 +2,7 @@
2 2 <a-card :bordered="false">
3 3 <!-- 查询区域 -->
4 4 <div class="table-page-search-wrapper">
5   - <a-form layout="inline">
  5 + <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <#assign query_field_no=0>
8 8 <#assign query_field_select=false>
... ... @@ -93,7 +93,7 @@
93 93 <div class="table-operator">
94 94 <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
95 95 <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
96   - <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
  96 + <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
97 97 <a-button type="primary" icon="import">导入</a-button>
98 98 </a-upload>
99 99 <a-dropdown v-if="selectedRowKeys.length > 0">
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  View file @df76ff0
... ... @@ -81,9 +81,6 @@
81 81 <#if form_file>
82 82 import JUpload from '@/components/jeecg/JUpload'
83 83 </#if>
84   - <#if form_popup>
85   - import JPopup from '@/components/jeecgbiz/JPopup'
86   - </#if>
87 84 <#if form_sel_depart>
88 85 import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
89 86 </#if>
... ... @@ -106,9 +103,6 @@
106 103 <#if form_file>
107 104 JUpload,
108 105 </#if>
109   - <#if form_popup>
110   - JPopup,
111   - </#if>
112 106 <#if form_sel_depart>
113 107 JSelectDepart,
114 108 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei
  View file @df76ff0
... ... @@ -82,9 +82,6 @@
82 82 <#if form_file>
83 83 import JUpload from '@/components/jeecg/JUpload'
84 84 </#if>
85   - <#if form_popup>
86   - import JPopup from '@/components/jeecgbiz/JPopup'
87   - </#if>
88 85 <#if form_sel_depart>
89 86 import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
90 87 </#if>
... ... @@ -107,9 +104,6 @@
107 104 <#if form_file>
108 105 JUpload,
109 106 </#if>
110   - <#if form_popup>
111   - JPopup,
112   - </#if>
113 107 <#if form_sel_depart>
114 108 JSelectDepart,
115 109 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @df76ff0
... ... @@ -23,7 +23,7 @@ public class ${entityName} implements Serializable {
23 23 <#list originalColumns as po>
24 24 /**${po.filedComment}*/
25 25 <#if po.fieldName == primaryKeyField>
26   - @TableId(type = IdType.UUID)
  26 + @TableId(type = IdType.ID_WORKER_STR)
27 27 <#else>
28 28 <#if po.fieldDbType =='Date'>
29 29 <#if po.classType=='date'>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai
  View file @df76ff0
... ... @@ -26,7 +26,7 @@ public class ${subTab.entityName} implements Serializable {
26 26 <#list subTab.originalColumns as po>
27 27 /**${po.filedComment}*/
28 28 <#if po.fieldName == primaryKeyField>
29   - @TableId(type = IdType.UUID)
  29 + @TableId(type = IdType.ID_WORKER_STR)
30 30 <#else>
31 31 <#if po.fieldDbType =='Date'>
32 32 <#if po.classType=='date'>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
  View file @df76ff0
... ... @@ -2,7 +2,7 @@
2 2 <a-card :bordered="false">
3 3 <!-- 查询区域 -->
4 4 <div class="table-page-search-wrapper">
5   - <a-form layout="inline">
  5 + <a-form layout="inline" @keyup.enter.native="searchQuery">
6 6 <a-row :gutter="24">
7 7 <#assign query_field_no=0>
8 8 <#assign query_field_select=false>
... ... @@ -93,7 +93,7 @@
93 93 <div class="table-operator">
94 94 <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
95 95 <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
96   - <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
  96 + <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
97 97 <a-button type="primary" icon="import">导入</a-button>
98 98 </a-upload>
99 99 <a-dropdown v-if="selectedRowKeys.length > 0">
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  View file @df76ff0
... ... @@ -122,9 +122,6 @@
122 122 <#if form_file>
123 123 import JUpload from '@/components/jeecg/JUpload'
124 124 </#if>
125   - <#if form_popup>
126   - import JPopup from '@/components/jeecgbiz/JPopup'
127   - </#if>
128 125 <#if form_sel_depart>
129 126 import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
130 127 </#if>
... ... @@ -153,9 +150,6 @@
153 150 <#if form_file>
154 151 JUpload,
155 152 </#if>
156   - <#if form_popup>
157   - JPopup,
158   - </#if>
159 153 <#if form_sel_depart>
160 154 JSelectDepart,
161 155 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
  View file @df76ff0
... ... @@ -81,9 +81,6 @@
81 81 <#if form_file>
82 82 import JUpload from '@/components/jeecg/JUpload'
83 83 </#if>
84   - <#if form_popup>
85   - import JPopup from '@/components/jeecgbiz/JPopup'
86   - </#if>
87 84 <#if form_sel_depart>
88 85 import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
89 86 </#if>
... ... @@ -106,9 +103,6 @@
106 103 <#if form_file>
107 104 JUpload,
108 105 </#if>
109   - <#if form_popup>
110   - JPopup,
111   - </#if>
112 106 <#if form_sel_depart>
113 107 JSelectDepart,
114 108 </#if>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
  View file @df76ff0
... ... @@ -26,7 +26,7 @@ public class ${entityName} implements Serializable {
26 26 <#list originalColumns as po>
27 27 /**${po.filedComment}*/
28 28 <#if po.fieldName == primaryKeyField>
29   - @TableId(type = IdType.UUID)
  29 + @TableId(type = IdType.ID_WORKER_STR)
30 30 <#else>
31 31 <#if po.fieldDbType =='Date'>
32 32 <#if po.classType=='date'>
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei
  View file @df76ff0
... ... @@ -15,7 +15,7 @@
15 15 <div class="table-operator">
16 16 <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
17 17 <a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</a-button>
18   - <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
  18 + <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
19 19 <a-button type="primary" icon="import">导入</a-button>
20 20 </a-upload>
21 21 <a-dropdown v-if="selectedRowKeys.length > 0">
... ...
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei
  View file @df76ff0
... ... @@ -95,9 +95,6 @@
95 95 <#if form_file>
96 96 import JUpload from '@/components/jeecg/JUpload'
97 97 </#if>
98   - <#if form_popup>
99   - import JPopup from '@/components/jeecgbiz/JPopup'
100   - </#if>
101 98 <#if form_sel_depart>
102 99 import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
103 100 </#if>
... ... @@ -123,9 +120,6 @@
123 120 <#if form_file>
124 121 JUpload,
125 122 </#if>
126   - <#if form_popup>
127   - JPopup,
128   - </#if>
129 123 <#if form_sel_depart>
130 124 JSelectDepart,
131 125 </#if>
... ...