mooho-base-admin-plus 0.4.60 → 0.4.61

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "0.4.60",
+  "version": "0.4.61",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "dotnetVersion": "1.4.0",
   "license": "MIT",

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

@@ -408,6 +408,22 @@
               custom-icon="fa fa-trash-alt"
               @click="remove(rowData(row, index), index)"
             ></Button>
+            <Button
+              v-if="this.static && tableView.adjustEnable && !readonly"
+              size="small"
+              :title="$t('Front_Btn_Up')"
+              type="primary"
+              custom-icon="fa fa-chevron-up"
+              @click="up(rowData(row, index), index)"
+            ></Button>
+            <Button
+              v-if="this.static && tableView.adjustEnable && !readonly"
+              size="small"
+              :title="$t('Front_Btn_Down')"
+              type="primary"
+              custom-icon="fa fa-chevron-down"
+              @click="down(rowData(row, index), index)"
+            ></Button>
             <Button
               v-for="(item, index) in commandButtons"
               :key="index"
@@ -2334,6 +2350,26 @@
             return column.name;
           }
         }
+      },
+      // 上移
+      up(row, index) {
+        let data = this.$refs.table.data;
+        if (index > 0) {
+          data.splice(index, 1);
+          data.splice(index - 1, 0, row);
+
+          this.$refs.table.loadData(data);
+        }
+      },
+      // 下移
+      down(row, index) {
+        let data = this.$refs.table.data;
+        if (index < data.length - 1) {
+          data.splice(index, 1);
+          data.splice(index + 1, 0, row);
+
+          this.$refs.table.loadData(data);
+        }
       }
     }
   };

package/src/pages/system/permission.vue

@@ -16,6 +16,8 @@
             return row.hasChildren;
           }
         "
+        :before-load-data="beforeLoadData"
+        @on-load-data="onLoadData"
         @create="create()"
         @edit="({ row, index }) => edit(row)"
       >
@@ -168,6 +170,61 @@
         } else {
           this.$refs.table.loadData();
         }
+      },
+      beforeLoadData() {
+        if (!(this.filter['keyword'] || '').trim()) {
+          // 普通查询，只查询顶层包装
+          this.filter['parentID'] = 'null';
+        } else {
+          // 根据关键词查询，查询所有层级
+          this.filter['parentID'] = null;
+        }
+      },
+      async onLoadData() {
+        if (!!(this.filter['keyword'] || '').trim()) {
+          // 根据关键词查询的结果，递归查找所有上层
+          let data = this.$refs.table.data;
+          if (data.length > 0) {
+            let dataWithParent = [];
+            for (let i = 0; i < data.length; i++) {
+              await this.loadParentData(data[i], dataWithParent);
+            }
+
+            dataWithParent.forEach(item => {
+              if (item.parentID) {
+                let parent = dataWithParent.find(p => p.id == item.parentID);
+                if (!parent.children) {
+                  parent.children = [];
+                }
+
+                parent.children.push(item);
+                parent._showChildren = true;
+              }
+            });
+
+            data.length = 0;
+            dataWithParent
+              .filter(item => item.parentID == null)
+              .forEach(item => {
+                data.push(item);
+              });
+          }
+        }
+      },
+      async loadParentData(data, dataWithParent) {
+        dataWithParent.push(data);
+
+        if (data.parentID && !dataWithParent.some(item => item.id == data.parentID)) {
+          let res = await modelApi.query('Permission', {
+            id: data.parentID,
+            page: 1,
+            per: 1
+          });
+
+          await this.loadParentData(res.data[0], dataWithParent);
+        } else {
+          return;
+        }
       }
     }
   };