Skip to content

J
jeecg-boot

Jahson / jeecg-boot
与 Fork 源项目一致

Fork自 jeecg / jeecg-boot

通知 1
Star 0
Fork 0
J
jeecg-boot

体验新版 GitCode，发现更多精彩内容 >>

提交 80888155 编写于 作者: JEECG低代码平台's avatar JEECG低代码平台
浏览文件
操作

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

2.解决online代码生成，excel导入无权限问题
3.解决online代码生成，Jpopup使用问题
上级 527007f7
隐藏空白更改
内联 并排
Showing with 9 addition and 39 deletion
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @ 80888155
...@@ -26,7 +26,7 @@ public class ${entityName} implements Serializable { ...@@ -26,7 +26,7 @@ public class ${entityName} implements Serializable {
<#list originalColumns as po> <#list originalColumns as po>
/**${po.filedComment}*/ /**${po.filedComment}*/
<#if po.fieldName == primaryKeyField> <#if po.fieldName == primaryKeyField>
@TableId(type = IdType.UUID) @TableId(type = IdType.ID_WORKER_STR)
<#else> <#else>
<#if po.fieldDbType =='Date'> <#if po.fieldDbType =='Date'>
<#if po.classType=='date'> <#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
浏览文件 @ 80888155
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<a-card :bordered="false"> <a-card :bordered="false">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<#assign query_field_no=0> <#assign query_field_no=0>
<#assign query_field_select=false> <#assign query_field_select=false>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</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-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <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
浏览文件 @ 80888155
...@@ -81,9 +81,6 @@ ...@@ -81,9 +81,6 @@
<#if form_file> <#if form_file>
import JUpload from '@/components/jeecg/JUpload' import JUpload from '@/components/jeecg/JUpload'
</#if> </#if>
<#if form_popup>
import JPopup from '@/components/jeecgbiz/JPopup'
</#if>
<#if form_sel_depart> <#if form_sel_depart>
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
</#if> </#if>
...@@ -106,9 +103,6 @@ ...@@ -106,9 +103,6 @@
<#if form_file> <#if form_file>
JUpload, JUpload,
</#if> </#if>
<#if form_popup>
JPopup,
</#if>
<#if form_sel_depart> <#if form_sel_depart>
JSelectDepart, JSelectDepart,
</#if> </#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
浏览文件 @ 80888155
...@@ -82,9 +82,6 @@ ...@@ -82,9 +82,6 @@
<#if form_file> <#if form_file>
import JUpload from '@/components/jeecg/JUpload' import JUpload from '@/components/jeecg/JUpload'
</#if> </#if>
<#if form_popup>
import JPopup from '@/components/jeecgbiz/JPopup'
</#if>
<#if form_sel_depart> <#if form_sel_depart>
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
</#if> </#if>
...@@ -107,9 +104,6 @@ ...@@ -107,9 +104,6 @@
<#if form_file> <#if form_file>
JUpload, JUpload,
</#if> </#if>
<#if form_popup>
JPopup,
</#if>
<#if form_sel_depart> <#if form_sel_depart>
JSelectDepart, JSelectDepart,
</#if> </#if>
......
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @ 80888155
...@@ -23,7 +23,7 @@ public class ${entityName} implements Serializable { ...@@ -23,7 +23,7 @@ public class ${entityName} implements Serializable {
<#list originalColumns as po> <#list originalColumns as po>
/**${po.filedComment}*/ /**${po.filedComment}*/
<#if po.fieldName == primaryKeyField> <#if po.fieldName == primaryKeyField>
@TableId(type = IdType.UUID) @TableId(type = IdType.ID_WORKER_STR)
<#else> <#else>
<#if po.fieldDbType =='Date'> <#if po.fieldDbType =='Date'>
<#if po.classType=='date'> <#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
浏览文件 @ 80888155
...@@ -26,7 +26,7 @@ public class ${subTab.entityName} implements Serializable { ...@@ -26,7 +26,7 @@ public class ${subTab.entityName} implements Serializable {
<#list subTab.originalColumns as po> <#list subTab.originalColumns as po>
/**${po.filedComment}*/ /**${po.filedComment}*/
<#if po.fieldName == primaryKeyField> <#if po.fieldName == primaryKeyField>
@TableId(type = IdType.UUID) @TableId(type = IdType.ID_WORKER_STR)
<#else> <#else>
<#if po.fieldDbType =='Date'> <#if po.fieldDbType =='Date'>
<#if po.classType=='date'> <#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
浏览文件 @ 80888155
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<a-card :bordered="false"> <a-card :bordered="false">
<!-- 查询区域 --> <!-- 查询区域 -->
<div class="table-page-search-wrapper"> <div class="table-page-search-wrapper">
<a-form layout="inline"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<#assign query_field_no=0> <#assign query_field_no=0>
<#assign query_field_select=false> <#assign query_field_select=false>
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</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-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <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
浏览文件 @ 80888155
...@@ -122,9 +122,6 @@ ...@@ -122,9 +122,6 @@
<#if form_file> <#if form_file>
import JUpload from '@/components/jeecg/JUpload' import JUpload from '@/components/jeecg/JUpload'
</#if> </#if>
<#if form_popup>
import JPopup from '@/components/jeecgbiz/JPopup'
</#if>
<#if form_sel_depart> <#if form_sel_depart>
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
</#if> </#if>
...@@ -153,9 +150,6 @@ ...@@ -153,9 +150,6 @@
<#if form_file> <#if form_file>
JUpload, JUpload,
</#if> </#if>
<#if form_popup>
JPopup,
</#if>
<#if form_sel_depart> <#if form_sel_depart>
JSelectDepart, JSelectDepart,
</#if> </#if>
......
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei
浏览文件 @ 80888155
...@@ -81,9 +81,6 @@ ...@@ -81,9 +81,6 @@
<#if form_file> <#if form_file>
import JUpload from '@/components/jeecg/JUpload' import JUpload from '@/components/jeecg/JUpload'
</#if> </#if>
<#if form_popup>
import JPopup from '@/components/jeecgbiz/JPopup'
</#if>
<#if form_sel_depart> <#if form_sel_depart>
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
</#if> </#if>
...@@ -106,9 +103,6 @@ ...@@ -106,9 +103,6 @@
<#if form_file> <#if form_file>
JUpload, JUpload,
</#if> </#if>
<#if form_popup>
JPopup,
</#if>
<#if form_sel_depart> <#if form_sel_depart>
JSelectDepart, JSelectDepart,
</#if> </#if>
......
jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai
浏览文件 @ 80888155
...@@ -26,7 +26,7 @@ public class ${entityName} implements Serializable { ...@@ -26,7 +26,7 @@ public class ${entityName} implements Serializable {
<#list originalColumns as po> <#list originalColumns as po>
/**${po.filedComment}*/ /**${po.filedComment}*/
<#if po.fieldName == primaryKeyField> <#if po.fieldName == primaryKeyField>
@TableId(type = IdType.UUID) @TableId(type = IdType.ID_WORKER_STR)
<#else> <#else>
<#if po.fieldDbType =='Date'> <#if po.fieldDbType =='Date'>
<#if po.classType=='date'> <#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
浏览文件 @ 80888155
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('${tableVo.ftlDescription}')">导出</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-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
<a-dropdown v-if="selectedRowKeys.length > 0"> <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
浏览文件 @ 80888155
...@@ -95,9 +95,6 @@ ...@@ -95,9 +95,6 @@
<#if form_file> <#if form_file>
import JUpload from '@/components/jeecg/JUpload' import JUpload from '@/components/jeecg/JUpload'
</#if> </#if>
<#if form_popup>
import JPopup from '@/components/jeecgbiz/JPopup'
</#if>
<#if form_sel_depart> <#if form_sel_depart>
import JSelectDepart from '@/components/jeecgbiz/JSelectDepart' import JSelectDepart from '@/components/jeecgbiz/JSelectDepart'
</#if> </#if>
...@@ -123,9 +120,6 @@ ...@@ -123,9 +120,6 @@
<#if form_file> <#if form_file>
JUpload, JUpload,
</#if> </#if>
<#if form_popup>
JPopup,
</#if>
<#if form_sel_depart> <#if form_sel_depart>
JSelectDepart, JSelectDepart,
</#if> </#if>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或