mooho-base-admin-plus 2.10.11 → 2.10.13

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.11",
+  "version": "2.10.13",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/view-form.vue

@@ -833,6 +833,12 @@
           }
         }
 
+        // 必填表格增加一行
+        let tables = this.columns.filter(item => item.controlType == 'Table' && item.isRequired);
+        for (let column of tables) {
+          this.$refs['table_' + column.code][0].addNew();
+        }
+
         this.clearValidate();
       },
       /**

package/src/components/view/view-table.vue

@@ -714,7 +714,7 @@
         width: widthSetting[item.code] ? widthSetting[item.code] : item.controlWidth,
         minWidth: 100,
         align: item.align ? item.align.toLowerCase() : 'center',
-        sortable: !view.dataView.sortDisable && !item.sortDisable && (!item.isVirtual || isStatic) ? 'custom' : false,
+        sortable: !view.dataView.sortDisable && !view.dataView.adjustEnable && !item.sortDisable && (!item.isVirtual || isStatic) ? 'custom' : false,
         resizable: true,
         slot: 'normal'
       };
@@ -1724,14 +1724,24 @@
         }
 
         data.forEach(item => {
-          delete item._checked;
-          delete item._dataSource;
-          delete item._needRefresh;
-          delete item._needClear;
-          delete item._rawData;
-          delete item._disabled;
+          for (let key in item) {
+            if (key.startsWith('_')) {
+              delete item[key];
+            }
+          }
         });
 
+        console.log('data', data);
+
+        // 调整顺序
+        if (this.tableView.adjustEnable) {
+          let i = 0;
+          for (let item of data) {
+            item.orderNo = i;
+            i += 10;
+          }
+        }
+
         return data;
       },
       /**
@@ -2798,9 +2808,9 @@
           data.splice(index, 1);
           data.splice(index - 1, 0, row);
 
-          for (let item of data) {
-            delete item.id;
-          }
+          // for (let item of data) {
+          //   delete item.id;
+          // }
 
           this.loadData(data);
         }
@@ -2812,9 +2822,9 @@
           data.splice(index, 1);
           data.splice(index + 1, 0, row);
 
-          for (let item of data) {
-            delete item.id;
-          }
+          // for (let item of data) {
+          //   delete item.id;
+          // }
 
           this.loadData(data);
         }