Jeecg-Boot 2.1.4 版本发布 (版本问题修复)

zhangdaiscott
1 parent 275ce6c9
Showing 4 changed files with 14 additions and 8 deletions
ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue
ant-design-vue-jeecg/src/components/jeecg/JUpload.vue
ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
@@ -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) {
@@ -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);
@@ -180,7 +180,6 @@
               <a-button style="margin-right: 8px;" @click="()=>modal.visible=true">点击弹出JModal</a-button>
               <span style="margin-right: 8px;">全屏化：<a-switch v-model="modal.fullscreen"/></span>
               <span style="margin-right: 8px;">允许切换全屏：<a-switch v-model="modal.switchFullscreen"/></span>
-              <span>锁定Body滚动：<a-switch v-model="modal.lockScroll"/></span>
             </a-form-item>
@@ -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(&#39;hello, world!&#39;)`
         modal: {
           title: '这里是标题',
           visible: false,
-          lockScroll: true,
           fullscreen: true,
           switchFullscreen: true,
         },
@@ -52,7 +52,8 @@
 						where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR}
 					)
 					<!--update begin Author:taoyan  Date:20200225 for：默认授权online的auto动态隐藏路由 -->
-					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') )
 					<!--update end Author:taoyan  Date:20200213 for：默认授权online的auto动态隐藏路由  -->
 			   and p.del_flag = 0
 			<!--update begin Author:lvdandan  Date:20200225 for：加入部门权限 -->