diff --git a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue index 7197d974..59155ae4 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue @@ -1268,7 +1268,8 @@ // 同步更改 this.rows = rows this.$nextTick(() => { - this.updateFormValues() + this.recalcSortNumber() + this.forceUpdateFormValues() }) // 触发 insert 事件 this.$emit('inserted', { @@ -1911,12 +1912,19 @@ sort(this.rows) sort(this.inputValues) - // 重置排序字段 - this.inputValues.forEach((val, idx) => val[this.dragSortKey] = (idx + 1)) + this.recalcSortNumber() this.forceUpdateFormValues() }, + /** 重新计算排序字段的数值 */ + recalcSortNumber() { + if (this.dragSort) { + // 重置排序字段 + this.inputValues.forEach((val, idx) => val[this.dragSortKey] = (idx + 1)) + } + }, + /** 当前行向上移一位 */ _handleRowMoveUp(rowIndex) { if (rowIndex > 0) { diff --git a/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue b/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue index 6a1271fd..998b0ab9 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue @@ -221,7 +221,7 @@ }).map((file) => { var fileJson = { fileName:file.name, - filePath:file.url, + filePath:file.response.message, fileSize:file.size }; this.newFileList.push(fileJson); diff --git a/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue b/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue index cfc787d3..164c4c53 100644 --- a/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue +++ b/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue @@ -180,7 +180,6 @@ 点击弹出JModal 全屏化: 允许切换全屏: - 锁定Body滚动: @@ -188,7 +187,6 @@ :visible.sync="modal.visible" :width="1200" :title="modal.title" - :lockScroll="modal.lockScroll" :fullscreen.sync="modal.fullscreen" :switchFullscreen="modal.switchFullscreen" > @@ -390,7 +388,6 @@ sayHi('hello, world!')` modal: { title: '这里是标题', visible: false, - lockScroll: true, fullscreen: true, switchFullscreen: true, }, diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml index 5cf617b7..8f3dcc6e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml @@ -52,7 +52,8 @@ where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR} ) - or (p.url like '%:code' and p.url like '/online%' and p.hidden = 1) ) + or (p.url like '%:code' and p.url like '/online%' and p.hidden = 1) + or (p.url = '/online') ) and p.del_flag = 0