diff --git a/ant-design-vue-jeecg/.github/ISSUE_TEMPLATE.md b/ant-design-vue-jeecg/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..7d63997a --- /dev/null +++ b/ant-design-vue-jeecg/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,16 @@ +##### 版本号： + + +##### 问题描述： + + +##### 截图&代码： + + + + +#### 友情提示（为了提高issue处理效率）： + - 未按格式要求发帖，会被直接删掉; + - 请自己初判问题描述是否清楚，是否方便我们调查处理； + - 描述过于简单或模糊，导致无法处理的，会被直接删掉； + diff --git a/ant-design-vue-jeecg/.gitignore b/ant-design-vue-jeecg/.gitignore index 185e6631..3f1dfba7 100644 --- a/ant-design-vue-jeecg/.gitignore +++ b/ant-design-vue-jeecg/.gitignore @@ -1,21 +1,17 @@ -.DS_Store node_modules -/dist +.DS_Store +dist +.npmrc +.cache -# local env files -.env.local -.env.*.local +## ide +**/.idea +*.iml -# Log files -npm-debug.log* -yarn-debug.log* -yarn-error.log* +## backend +**/target +**/logs +**/dist -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw* +## front +/yarn-error.log diff --git a/ant-design-vue-jeecg/README.md b/ant-design-vue-jeecg/README.md index 17019628..a5eb3348 100644 --- a/ant-design-vue-jeecg/README.md +++ b/ant-design-vue-jeecg/README.md @@ -1,34 +1,91 @@ -Ant Design Jeecg Vue +Ant Design Jeecg Vue（JeecgBoot 低代码平台） ==== -当前最新版本： 3.3.0（发布日期：20220725） +当前最新版本： 3.4.3（发布日期：20221107） + +[![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE) +[![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://www.jeecg.com) +[![](https://img.shields.io/badge/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net) +[![](https://img.shields.io/badge/version-3.4.3-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot) +[![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot) +[![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot) + + Overview ---- 基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro Vue 版 -Jeecg-boot 的前端UI框架，采用前后端分离方案，提供强大代码生成器的低代码平台。 -前端页面代码和后端功能代码一键生成，不需要写任何代码，保持jeecg一贯的强大！！ +Jeecg-boot 的前端UI框架，采用前后端分离方案，提供强大代码生成器的低代码平台。前端页面代码和后端功能代码一键生成，不需要写任何代码，保持jeecg一贯的强大！！ + +> 强大的代码生成器让前后端代码一键生成! JeecgBoot引领低代码开发模式(OnlineCoding-> 代码生成-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省成本，同时又不失灵活性 + + +## 项目介绍 + 重要说明：JeecgBoot前端提供两套解决方案，一套VUE2和一套VUE3版本，目前vue2版本最新代码只支持到jeecgboot `3.4.3版本`，一定注意。 + + +## Vue2与Vue3版本区别 +> - VUE3版本彻底抛弃IE兼容，不兼容IE和低版本浏览器，只适配高版本谷歌和Edge + （政府、事业类单位项目需要谨慎选择——国产化迁移是一个漫长的过程，万一过程中要求IE兼容，这个不可逆） +> - 所以如果对浏览器有要求的项目，请选择VUE2版本。 +> - VUE3版是全新的技术栈，紧跟主流（前端重写），各个功能都做了优化，拥有更好的体验效果 + + + + +## 项目源码 + +| 仓库 | 前端源码Vue2版 | 后端源码 | +|-|-|--------------------------------------------------------------------------| +| Github | [ant-design-vue-jeecg](https://github.com/jeecgboot/ant-design-vue-jeecg) | [jeecg-boot (v3.4.3)](https://gitee.com/jeecg/jeecg-boot/tree/v3.4.3last) | +| 码云 | [ant-design-vue-jeecg](https://gitee.com/jeecg/ant-design-vue-jeecg) | [jeecg-boot (v3.4.3)](https://github.com/jeecgboot/jeecg-boot/tree/v3.4.3) | +> 目前vue2版本最新代码只支持到jeecgboot 3.4.3版本，一定注意。 + +## 项目说明 + +| 项目名 | 说明 | +|--------------------|------------------------| +| `jeecg-boot` | JAVA后台（支持微服务） | +| `ant-design-vue-jeecg` |Vue2版前端代码 | + + +## 技术支持 + + +本项目关闭issue，使用中遇到问题或者BUG可以在 [JeecgBoot主项目上提Issues](https://github.com/jeecgboot/jeecg-boot/issues/new) + +官方支持： http://jeecg.com/doc/help + +技术文档： http://doc.jeecg.com + -#### 前端技术 +## 前端技术栈 + > 此处是Vue2版的技术栈介绍 + - 基础框架：[ant-design-vue](https://github.com/vueComponent/ant-design-vue) - Ant Design Of Vue 实现 - JavaScript框架：Vue -- Webpack - node - yarn -- eslint - @vue/cli 3.2.1 - [vue-cropper](https://github.com/xyxiao001/vue-cropper) - 头像裁剪组件 - [@antv/g2](https://antv.alipay.com/zh-cn/index.html) - Alipay AntV 数据可视化图表 - [Viser-vue](https://viserjs.github.io/docs.html#/viser/guide/installation) - antv/g2 封装实现 +- [Vue 2.6.10](https://cn.vuejs.org/),[Vuex](https://vuex.vuejs.org/zh/),[Vue Router](https://router.vuejs.org/zh/) +- [Axios](https://github.com/axios/axios) +- [webpack](https://www.webpackjs.com/),[yarn](https://yarnpkg.com/zh-Hans/) +- eslint，[@vue/cli 3.2.1](https://cli.vuejs.org/zh/guide) +- vue-print-nb-jeecg - 打印 + -项目下载和运行 ----- + +## 项目下载和运行 + - 拉取项目代码 ```bash @@ -131,3 +188,51 @@ Docker镜像启动前端（单体模式） > @vue/cli 升级后，eslint 规则更新了。由于影响到全部 .vue 文件，需要逐个验证。既暂时关闭部分原本不验证的规则，后期维护时，在逐步修正这些 rules + +系统效果 +---- +##### 大屏模板 +![输入图片说明](https://static.oschina.net/uploads/img/201912/25133248_Ag1C.jpg "在这里输入图片标题") + +![输入图片说明](https://static.oschina.net/uploads/img/201912/25133301_k9Kc.jpg "在这里输入图片标题") + +##### PC端 +![输入图片说明](https://static.oschina.net/uploads/img/201904/14155402_AmlV.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160657_cHwb.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160813_KmXS.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160935_Nibs.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14161004_bxQ4.png "在这里输入图片标题") + + +##### 在线接口文档 +![输入图片说明](https://static.oschina.net/uploads/img/201908/27095258_M2Xq.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160957_hN3X.png "在这里输入图片标题") + + +##### 报表 +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160828_pkFr.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160834_Lo23.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160842_QK7B.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160849_GBm5.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160858_6RAM.png "在这里输入图片标题") + +##### 流程 +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160623_8fwk.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160917_9Ftz.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201904/14160633_u59G.png "在这里输入图片标题") +![输入图片说明](https://static.oschina.net/uploads/img/201907/05165142_yyQ7.png "在这里输入图片标题") + + +##### 手机端 +![](https://oscimg.oschina.net/oscnet/da543c5d0d57baab0cecaa4670c8b68c521.jpg) +![](https://oscimg.oschina.net/oscnet/fda4bd82cab9d682de1c1fbf2060bf14fa6.jpg) + +##### PAD端 +![](https://oscimg.oschina.net/oscnet/e90fef970a8c33790ab03ffd6c4c7cec225.jpg) +![](https://oscimg.oschina.net/oscnet/d78218803a9e856a0aa82b45efc49849a0c.jpg) +![](https://oscimg.oschina.net/oscnet/0404054d9a12647ef6f82cf9cfb80a5ac02.jpg) +![](https://oscimg.oschina.net/oscnet/59c23b230f52384e588ee16309b44fa20de.jpg) + + + + diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index e47e4738..06ced362 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -1,6 +1,6 @@ { "name": "vue-antd-jeecg", - "version": "3.1.0", + "version": "3.4.3", "private": true, "scripts": { "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ", @@ -10,7 +10,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@jeecg/antd-online-mini": "3.1.0-beta", + "@jeecg/antd-online-mini": "3.4.3-beta2", "ant-design-vue": "^1.7.2", "@antv/data-set": "^0.11.4", "viser-vue": "^2.4.8", @@ -29,7 +29,7 @@ "vue-ls": "^3.2.0", "vue-router": "^3.0.1", "vuex": "^3.1.0", - "vue-print-nb-jeecg": "^1.0.11", + "vue-print-nb-jeecg": "^1.0.12", "clipboard": "^2.0.4", "vue-photo-preview": "^1.1.3", "vue-splitpane": "^1.0.4", diff --git a/ant-design-vue-jeecg/public/index.html b/ant-design-vue-jeecg/public/index.html index d3b55bb8..a58c86bf 100644 --- a/ant-design-vue-jeecg/public/index.html +++ b/ant-design-vue-jeecg/public/index.html @@ -255,6 +255,15 @@ + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/api/api.js b/ant-design-vue-jeecg/src/api/api.js index d03d7624..b8d9ebbb 100644 --- a/ant-design-vue-jeecg/src/api/api.js +++ b/ant-design-vue-jeecg/src/api/api.js @@ -90,7 +90,6 @@ const loadCategoryData = (params)=>getAction("/sys/category/loadAllData",params) const checkRuleByCode = (params) => getAction('/sys/checkRule/checkByCode', params) //加载我的通告信息 const getUserNoticeInfo= (params)=>getAction("/sys/sysAnnouncementSend/getMyAnnouncementSend",params); -//查询图表数据 const getTransitURL = url => `/sys/common/transitRESTful?url=${encodeURIComponent(url)}` // 中转HTTP请求 export const transitRESTful = { diff --git a/ant-design-vue-jeecg/src/components/JVxeCells/JVxePopupCell.vue b/ant-design-vue-jeecg/src/components/JVxeCells/JVxePopupCell.vue index 885933d3..52c6be8d 100644 --- a/ant-design-vue-jeecg/src/components/JVxeCells/JVxePopupCell.vue +++ b/ant-design-vue-jeecg/src/components/JVxeCells/JVxePopupCell.vue @@ -51,6 +51,10 @@ enhanced: { aopEvents: { editActived(event) { + // 【issues/3854】附表控件类型为popup必填时未选择值提交表单会报错 + if (event.$event && event.$event.type === 'valid-error') { + return; + } dispatchEvent.call(this, event, 'ant-input') }, }, diff --git a/ant-design-vue-jeecg/src/components/NumberInfo/index.less b/ant-design-vue-jeecg/src/components/NumberInfo/index.less index 719113da..fc7ddb49 100644 --- a/ant-design-vue-jeecg/src/components/NumberInfo/index.less +++ b/ant-design-vue-jeecg/src/components/NumberInfo/index.less @@ -42,7 +42,7 @@ transform: scale(0.82); margin-left: 4px; } - :global { + :deep { .anticon-caret-up { color: @red-6; } diff --git a/ant-design-vue-jeecg/src/components/dict/JDictSelectUtil.js b/ant-design-vue-jeecg/src/components/dict/JDictSelectUtil.js index a735f3fb..08f8913f 100644 --- a/ant-design-vue-jeecg/src/components/dict/JDictSelectUtil.js +++ b/ant-design-vue-jeecg/src/components/dict/JDictSelectUtil.js @@ -48,7 +48,7 @@ export function filterDictText(dictOptions, text) { for (let txt of splitText) { let dictText = txt for (let dictItem of dictOptions) { - if (txt.toString() === dictItem.value.toString()) { + if (dictItem.value && txt.toString() === dictItem.value.toString()) { dictText = (dictItem.text || dictItem.title || dictItem.label) break } diff --git a/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue b/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue index 28695f51..803b7228 100644 --- a/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue +++ b/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue @@ -14,6 +14,7 @@ @change="handleAsyncChange" allowClear :notFoundContent="loading ? undefined : null" + :mode="mode" > {{ d.text }} @@ -31,7 +32,8 @@ :filterOption="filterOption" v-model="selectedValue" allowClear - :notFoundContent="loading ? undefined : null"> + :notFoundContent="loading ? undefined : null" + :mode="mode"> {{ d.text }} @@ -74,6 +76,10 @@ type:Function, default: null }, + mode:{ + type: String, + default: '', + }, }, data(){ this.loadData = debounce(this.loadData, 800);//消抖 @@ -135,16 +141,47 @@ //update-end-author:taoyan date:20220112 for: 方法initSelectValue 根据下拉框实际值查询下拉框的显示的文本 因后台接口只处理3个参数，所以将过滤条件去掉 getAction(`/sys/dict/loadDictItem/${itemDictStr}`,{key:this.value}).then(res=>{ if(res.success){ - let obj = { - key:this.value, - label:res.result + //update-begin---author:wangshuai ---date:20221115 for：[issues/4213]JSearchSelectTag改造支持多选------------ + //判断是否多选 + if(this.mode === 'multiple'){ + if(res.result && res.result.length>0){ + let itemArray = []; + let valueArray = this.value.split(",") + for (let i = 0; i < res.result.length; i++) { + itemArray.push({ + key:valueArray[i], + label:res.result[i] + }) + } + this.selectedAsyncValue = itemArray + }else{ + this.selectedAsyncValue = [] + this.selectedValue = [] + } + }else{ + let obj = { + key:this.value, + label:res.result + } + this.selectedAsyncValue = {...obj} } - this.selectedAsyncValue = {...obj} + //update-end---author:wangshuai ---date:20221115 for：[issues/4213]JSearchSelectTag改造支持多选-------------- } }) } }else{ - this.selectedValue = this.value.toString() + //update-begin---author:wangshuai ---date:20221115 for：[issues/4213]JSearchSelectTag改造支持多选------------ + //判断是否为多选 + if(this.mode==='multiple'){ + if(this.value){ + this.selectedValue = this.value.split(","); + }else{ + this.selectedValue = [] + } + }else{ + this.selectedValue = this.value.toString() + } + //update-end---author:wangshuai ---date:20221115 for：[issues/4213]JSearchSelectTag改造支持多选------------ } }, loadData(value){ @@ -228,7 +265,17 @@ //update-begin-author:scott date:20201222 for:【搜索】搜索查询组件，删除条件，默认下拉还是上次的缓存数据，不好 JT-191 if(selectedObj){ this.selectedAsyncValue = selectedObj - this.selectedValue = selectedObj.key + //update-begin---author:wangshuai ---date:20221115 for：[issues/4213]JSearchSelectTag改造支持多选------------ + if(this.mode ==='multiple'){ + let keyArray = [] + for (let i = 0; i < selectedObj.length; i++) { + keyArray.push(selectedObj[i].key) + } + this.selectedValue = keyArray + }else{ + this.selectedValue = selectedObj.key + } + //update-end---author:wangshuai ---date:20221115 for：[issues/4213]JSearchSelectTag改造支持多选------------ }else{ this.selectedAsyncValue = null this.selectedValue = null @@ -239,7 +286,13 @@ //update-end-author:scott date:20201222 for:【搜索】搜索查询组件，删除条件，默认下拉还是上次的缓存数据，不好 JT-191 }, callback(){ - this.$emit('change', this.selectedValue); + //update-begin---author:wangshuai ---date:20221115 for：[issues/4213]JSearchSelectTag改造支持多选------------ + if(this.mode === 'multiple'){ + this.$emit('change', this.selectedValue.join(",")); + }else{ + this.$emit('change', this.selectedValue); + } + //update-end---author:wangshuai ---date:20221115 for：[issues/4213]JSearchSelectTag改造支持多选------------ }, setCurrentDictOptions(dictOptions){ this.options = dictOptions diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue index cb378f35..ec8860de 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue @@ -117,8 +117,9 @@
{ + return Promise.resolve(true); + } + } }, data() { return { @@ -1521,8 +1535,14 @@ }, /** 删除被选中的行 */ removeSelectedRows() { - this.removeRows(this.selectedRowIds) - this.selectedRowIds = [] + //update-begin-author:taoyan date:2022-8-5 for: VUEN-1767【bug】vue2 未控制住 + this.beforeDelete().then(()=>{ + this.removeRows(this.selectedRowIds) + this.selectedRowIds = [] + }).catch(e=>{ + this.$message.error(e); + }); + //update-end-author:taoyan date:2022-8-5 for: VUEN-1767【bug】vue2 未控制住 }, /** 删除一行或多行 */ removeRows(id) { diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEditor.vue b/ant-design-vue-jeecg/src/components/jeecg/JEditor.vue index 91780351..77c76c56 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEditor.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JEditor.vue @@ -163,7 +163,14 @@ }else{ this.$emit('input', newValue) } + }, + //update--begin--autor:liusq-----date:20230420------for：[issues/19]缓存路由后，页面中富文本组件会出现无法编辑的问题------ + '$route': function(newRoute) { + if(this.$route.meta.keepAlive && this.$route.meta.componentName){ + this.reload() + } } + //update--end--autor:liusq-----date:20230420------for：[issues/19]缓存路由后，页面中富文本组件会出现无法编辑的问题------ } } diff --git a/ant-design-vue-jeecg/src/components/jeecg/JModal/JModal.vue b/ant-design-vue-jeecg/src/components/jeecg/JModal/JModal.vue index e282765e..bc8936ea 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JModal/JModal.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JModal/JModal.vue @@ -171,15 +171,18 @@ export default { toggleFullscreen() { this.innerFullscreen = !this.innerFullscreen triggerWindowResizeEvent() - // 全屏的时候禁止拖动 - if (this.innerFullscreen) { - // 还原弹窗的位置为0,0 - this.setModalPosition(0, 0, false) - this.dragSettings.headerEl.style.cursor = null - } else { - // 取消全屏的时候，将弹窗移动到上次记录的位置 - this.resetModalPosition() - this.dragSettings.headerEl.style.cursor = 'move' + // 开启拖拽后的特殊处理 + if (this.draggable) { + // 全屏的时候禁止拖动 + if (this.innerFullscreen) { + // 还原弹窗的位置为0,0 + this.setModalPosition(0, 0, false) + this.dragSettings.headerEl.style.cursor = null + } else { + // 取消全屏的时候，将弹窗移动到上次记录的位置 + this.resetModalPosition() + this.dragSettings.headerEl.style.cursor = 'move' + } } }, diff --git a/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue b/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue index c771a5ca..7aad0cc4 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue @@ -446,6 +446,15 @@ display: none; } } + /*update-begin-author:taoyan date:2022-12-5 for: issues/4250 建议JUpload组件，disabled为true的时候上传button能够变灰或者其他样式图案，便于知晓无法再点击上传*/ + .ant-btn, .ant-upload-disabled{ + cursor: not-allowed; + color: rgba(0, 0, 0, 0.25); + background-color: #f5f5f5; + border-color: #d9d9d9; + } + /*update-end-author:taoyan date:2022-12-5 for: issues/4250 建议JUpload组件，disabled为true的时候上传button能够变灰或者其他样式图案，便于知晓无法再点击上传*/ + } //---------------------------- begin 图片左右换位置 ------------------------------------- .uploadty-mover-mask{ diff --git a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeTable.js b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeTable.js index bf9b1344..b9018d21 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeTable.js +++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeTable.js @@ -107,9 +107,9 @@ export default { // caseId，表格唯一标识 caseId: `_j-vxe-${randomString(8)}_`, // 内置columns - _innerColumns: [], + innerColumns: [], // 内置 EditRules - _innerEditRules: [], + innerEditRules: [], // 记录滚动条位置 scroll: {top: 0, left: 0}, // 当前是否正在滚动 @@ -156,14 +156,14 @@ export default { excludeCode:[], // 联动下拉选项（用于隔离不同的下拉选项） // 内部联动配置，map - _innerLinkageConfig: null, + innerLinkageConfig: null, } }, computed: { // vxe 最终 columns vxeColumns() { - this._innerColumns.forEach(column => { + this.innerColumns.forEach(column => { let renderOptions = { caseId: this.caseId, bordered: this.bordered, @@ -184,11 +184,11 @@ export default { } } // 处理联动列，联动列只能作用于 select 组件 - if (column.$type === JVXETypes.select && this._innerLinkageConfig != null) { + if (column.$type === JVXETypes.select && this.innerLinkageConfig != null) { // 判断当前列是否是联动列 - if (this._innerLinkageConfig.has(column.key)) { + if (this.innerLinkageConfig.has(column.key)) { renderOptions.linkage = { - config: this._innerLinkageConfig.get(column.key), + config: this.innerLinkageConfig.get(column.key), getLinkageOptionsSibling: this.getLinkageOptionsSibling, getLinkageOptionsAsync: this.getLinkageOptionsAsync, linkageSelectChange: this.linkageSelectChange, @@ -224,11 +224,11 @@ export default { } // update--end--autor:lvdandan-----date:20201211------for:JT-118 【online】 日期、时间控件长度较小 }) - return this._innerColumns + return this.innerColumns }, // vxe 最终 editRules vxeEditRules() { - return Object.assign({}, this.editRules, this._innerEditRules) + return Object.assign({}, this.editRules, this.innerEditRules) }, // vxe 最终 props vxeProps() { @@ -302,8 +302,8 @@ export default { this.$set(data, this.dragSortKey, idx + 1) } // 处理联动回显数据 - if (this._innerLinkageConfig != null) { - for (let configItem of this._innerLinkageConfig.values()) { + if (this.innerLinkageConfig != null) { + for (let configItem of this.innerLinkageConfig.values()) { this.autoSetLinkageOptionsByData(data, '', configItem, 0) } } @@ -341,8 +341,8 @@ export default { handler(columns) { //获取不需要显示列 this.loadExcludeCode() - let _innerColumns = [] - let _innerEditRules = {} + let innerColumns = [] + let innerEditRules = {} let {rowNumber, rowSelection, rowExpand, dragSort} = this let expandColumn, seqColumn, checkboxColumn, radioColumn, dragSortColumn if (Array.isArray(columns)) { @@ -422,7 +422,7 @@ export default { rules.push(Object.assign({}, rule, replace)) } } - _innerEditRules[col.key] = rules + innerEditRules[col.key] = rules } // 处理统计列 // sum = 求和、average = 平均值 @@ -435,7 +435,7 @@ export default { } }) } - _innerColumns.push(col) + innerColumns.push(col) } }) } @@ -445,7 +445,7 @@ export default { if (seqColumn) { col = Object.assign(col, seqColumn, {type: 'seq'}) } - _innerColumns.unshift(col) + innerColumns.unshift(col) } // 判断是否开启了可选择行 if (rowSelection) { @@ -462,7 +462,7 @@ export default { if (this.rowSelectionType === 'checkbox' && checkboxColumn) { col = Object.assign(col, checkboxColumn, {type: 'checkbox'}) } - _innerColumns.unshift(col) + innerColumns.unshift(col) } // 是否可展开行 if (rowExpand) { @@ -474,7 +474,7 @@ export default { if (expandColumn) { col = Object.assign(col, expandColumn, {type: 'expand'}) } - _innerColumns.unshift(col) + innerColumns.unshift(col) } // 是否可拖动排序 if (dragSort) { @@ -486,11 +486,11 @@ export default { if (dragSortColumn) { col = Object.assign(col, dragSortColumn, {type: JVXETypes.rowDragSort}) } - _innerColumns.unshift(col) + innerColumns.unshift(col) } - this._innerColumns = _innerColumns - this._innerEditRules = _innerEditRules + this.innerColumns = innerColumns + this.innerEditRules = innerEditRules } }, // watch linkageConfig @@ -501,7 +501,7 @@ export default { if (Array.isArray(this.linkageConfig) && this.linkageConfig.length > 0) { // 获取联动的key顺序 let getLcKeys = (key, arr) => { - let col = this._innerColumns.find(col => col.key === key) + let col = this.innerColumns.find(col => col.key === key) if (col) { arr.push(col.key) if (col.linkageKey) { @@ -520,9 +520,9 @@ export default { } keys.forEach(k => configMap.set(k, configItem)) }) - this._innerLinkageConfig = configMap + this.innerLinkageConfig = configMap } else { - this._innerLinkageConfig = null + this.innerLinkageConfig = null } } }, @@ -734,8 +734,8 @@ export default { this.$set(data, this.dragSortKey, idx + 1) } // 处理联动回显数据 - if (this._innerLinkageConfig != null) { - for (let configItem of this._innerLinkageConfig.values()) { + if (this.innerLinkageConfig != null) { + for (let configItem of this.innerLinkageConfig.values()) { this.autoSetLinkageOptionsByData(data, '', configItem, 0) } } @@ -1253,10 +1253,10 @@ export default { record[col.key] = createValue({row: record, column, $table: xTable}) } // update-begin--author:sunjianlei---date:20210819------for: 处理联动列，联动列只能作用于 select 组件 - if (col.$type === JVXETypes.select && this._innerLinkageConfig != null) { + if (col.$type === JVXETypes.select && this.innerLinkageConfig != null) { // 判断当前列是否是联动列 - if (this._innerLinkageConfig.has(col.key)) { - let configItem = this._innerLinkageConfig.get(col.key) + if (this.innerLinkageConfig.has(col.key)) { + let configItem = this.innerLinkageConfig.get(col.key) this.getLinkageOptionsAsync(configItem, '') } } diff --git a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue index 6f60eda2..578c9814 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeToolbar.vue @@ -55,7 +55,8 @@ }, btns() { - let arr = this.toolbarConfig.btn || ['add', 'remove', 'clearSelection'] + let {btn, btns} = this.toolbarConfig + let arr = btn || btns || ['add', 'remove', 'clearSelection'] let exclude = [...this.excludeCode] // TODO 需要将remove替换batch_delete // 系统默认的批量删除编码配置为 batch_delete 此处需要转化一下 diff --git a/ant-design-vue-jeecg/src/components/jeecg/index.js b/ant-design-vue-jeecg/src/components/jeecg/index.js index 756e9878..166f423a 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/index.js +++ b/ant-design-vue-jeecg/src/components/jeecg/index.js @@ -39,6 +39,7 @@ import lodash_object from 'lodash' import debounce from 'lodash/debounce' import pick from 'lodash.pick' import data from 'china-area-data' +import signMd5Utils from '@/utils/encryption/signMd5Utils' export default { install(Vue) { @@ -87,5 +88,6 @@ export default { Vue.prototype.$Jdebounce= debounce Vue.prototype.$Jpick = pick Vue.prototype.$Jpcaa = data + Vue.prototype.$signMd5Utils = signMd5Utils } } \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue index 1d78e124..7b0aa51b 100644 --- a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue +++ b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue @@ -191,7 +191,8 @@ \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index b641c5d4..1b134e4e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -3,7 +3,7 @@ - + <#list subTables as sub><#rt/> <#assign refKey = sub.entityName?uncap_first/> <#if sub.foreignRelationType =='1'> @@ -77,7 +77,7 @@ //表单配置 const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({ - labelWidth: 150, + //labelWidth: 150, schemas: formSchema, showActionButtonGroup: false, baseColProps: {span: ${getFormSpan(tableVo.fieldRowNum?default(1))}} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei index 37dde1fd..cc077e83 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei @@ -24,7 +24,7 @@ }, setup(props,{emit}) { const [registerForm, {setProps, resetFields, setFieldsValue,getFieldsValue,validate}] = useForm({ - labelWidth: 150, + //labelWidth: 150, schemas: ${sub.entityName?uncap_first}FormSchema, showActionButtonGroup: false, baseColProps: {span: ${getFormSpan(tableVo.fieldRowNum?default(1))}} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/subTables/[1-n]SubTable.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/subTables/[1-n]SubTable.vuei similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/subTables/[1-n]SubTable.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue3/subTables/[1-n]SubTable.vuei diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai similarity index 96% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai index f9e34dba..ff7cf501 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai @@ -100,6 +100,7 @@ public class ${entityName}Controller { */ @AutoLog(value = "${tableVo.ftlDescription}-添加") @ApiOperation(value="${tableVo.ftlDescription}-添加", notes="${tableVo.ftlDescription}-添加") + //@RequiresPermissions("${bussiPackage}:${tableName}:add") @PostMapping(value = "/add") public Result add(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); @@ -119,6 +120,7 @@ public class ${entityName}Controller { */ @AutoLog(value = "${tableVo.ftlDescription}-编辑") @ApiOperation(value="${tableVo.ftlDescription}-编辑", notes="${tableVo.ftlDescription}-编辑") + //@RequiresPermissions("${bussiPackage}:${tableName}:edit") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public Result edit(@RequestBody ${entityName}Page ${entityName?uncap_first}Page) { ${entityName} ${entityName?uncap_first} = new ${entityName}(); @@ -139,6 +141,7 @@ public class ${entityName}Controller { */ @AutoLog(value = "${tableVo.ftlDescription}-通过id删除") @ApiOperation(value="${tableVo.ftlDescription}-通过id删除", notes="${tableVo.ftlDescription}-通过id删除") + //@RequiresPermissions("${bussiPackage}:${tableName}:delete") @DeleteMapping(value = "/delete") public Result delete(@RequestParam(name="id",required=true) String id) { ${entityName?uncap_first}Service.delMain(id); @@ -153,6 +156,7 @@ public class ${entityName}Controller { */ @AutoLog(value = "${tableVo.ftlDescription}-批量删除") @ApiOperation(value="${tableVo.ftlDescription}-批量删除", notes="${tableVo.ftlDescription}-批量删除") + //@RequiresPermissions("${bussiPackage}:${tableName}:deleteBatch") @DeleteMapping(value = "/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { this.${entityName?uncap_first}Service.delBatchMain(Arrays.asList(ids.split(","))); @@ -199,6 +203,7 @@ public class ${entityName}Controller { * @param request * @param ${entityName?uncap_first} */ + //@RequiresPermissions("${bussiPackage}:${tableName}:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, ${entityName} ${entityName?uncap_first}) { // Step.1 组装查询条件查询数据 @@ -242,6 +247,7 @@ public class ${entityName}Controller { * @param response * @return */ + //@RequiresPermissions("${bussiPackage}:${tableName}:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai index 4d1b4253..940a9ab0 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai @@ -7,6 +7,7 @@ import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai index 93ddf952..fe0da61d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai @@ -7,6 +7,7 @@ import java.io.Serializable; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import com.fasterxml.jackson.annotation.JsonFormat; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/${entityName}Mapper.javai diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/[1-n]Mapper.javai diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/mapper/xml/[1-n]Mapper.xml diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/I${entityName}Service.javai diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/[1-n]Service.javai diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/service/impl/[1-n]ServiceImpl.javai diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vo/${entityName}Page.javai diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sql b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sql similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sql rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}_menu_insert.sql diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei index 7ce54cfb..599e631e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}List.vuei @@ -91,7 +91,7 @@ columns, canResize:false, formConfig: { - labelWidth: 120, + //labelWidth: 120, schemas: searchFormSchema, autoSubmitOnEnter:true, showAdvancedButton:true, @@ -204,7 +204,7 @@ let params = { flowCode: 'dev_${tableName}_001', id: record.id, - formUrl: '${entityPackage}/modules/${entityName}Form', + formUrl: '${entityPackage}/components/${entityName}Form', formUrlMobile: '' } await startProcess(params); @@ -229,7 +229,7 @@ } } ]; - if(record.bpmStatus == '1'){ + if(record.bpmStatus == '1' || !record.bpmStatus){ dropDownAction.push({ label: '发起流程', popConfirm: { diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__api.tsi diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi index 2057fad9..9cacbe62 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}__data.tsi @@ -731,4 +731,14 @@ export const ${sub.entityName?uncap_first}Columns: JVxeColumn[] = [ <#-- 循环子表的列 结束 --> ] - \ No newline at end of file + + + +/** +* 流程表单调用这个方法获取formSchema +* @param param +*/ +export function getBpmFormSchema(_formData): FormSchema[]{ +// 默认和原始表单保持一致 如果流程中配置了权限数据，这里需要单独处理formSchema + return formSchema; +} \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sql b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sql similarity index 100% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sql rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/${entityName}_menu_insert.sql diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei new file mode 100644 index 00000000..3ad37a8c --- /dev/null +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Form.vuei @@ -0,0 +1,203 @@ +<#include "/common/utils.ftl"> + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index 85ffc479..ac54465b 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -3,7 +3,7 @@ - + <#list subTables as sub><#rt/> <#assign refKey = sub.entityName?uncap_first/> <#if sub.foreignRelationType =='1'> @@ -77,7 +77,7 @@ //表单配置 const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({ - labelWidth: 150, + //labelWidth: 150, schemas: formSchema, showActionButtonGroup: false, baseColProps: {span: ${getFormSpan(tableVo.fieldRowNum?default(1))}} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei similarity index 98% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei index dbb8c091..2150db04 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/[1-n]Form.vuei @@ -24,7 +24,7 @@ }, setup(props,{emit}) { const [registerForm, {setProps, resetFields, setFieldsValue,getFieldsValue,validate}] = useForm({ - labelWidth: 150, + //labelWidth: 150, schemas: ${sub.entityName?uncap_first}FormSchema, showActionButtonGroup: false, baseColProps: {span: ${getFormSpan(tableVo.fieldRowNum?default(1))}} diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei similarity index 87% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei index a3269620..f7621642 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue3Native/${entityName}List.vuei @@ -1,3 +1,4 @@ +<#include "/common/utils.ftl"> + + + + \ No newline at end of file diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei similarity index 93% rename from jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei rename to jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei index eade8bb2..42322c2d 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei +++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue3/components/${entityName}Modal.vuei @@ -2,7 +2,7 @@