perf: 优化排序

fast-crud · Oct 18, 2021 · 2577698 · 2577698
1 parent 9a35214
commit 2577698
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 11 deletions.
diff --git a/packages/fast-admin/fs-admin-antdv b/packages/fast-admin/fs-admin-antdv
diff --git a/packages/fast-crud/src/components/search/index.vue b/packages/fast-crud/src/components/search/index.vue
@@ -71,6 +71,7 @@ import { uiContext } from "../../ui";
 import { useI18n } from "../../locale";
 import logger from "../../utils/util.log";
 
+import { Constants } from "../../utils/util.constants";
 /**
  * 查询框组件
  */
@@ -172,19 +173,20 @@ export default {
     });
     const computedColumns = doComputed(props.columns, getContextFn, null, (value) => {
       if (!props.validate) {
-        //去掉rules
+        //如果关闭validate则去掉rules
         _.forEach(value, (item) => {
           delete item.rules;
         });
       }
 
+      //字段排序
       let sortArr = [];
-      for (let key in value) {
-        value[key]._key = key;
-        sortArr.push(value[key]);
-      }
+      _.forEach(value, (v, key) => {
+        v._key = key;
+        sortArr.push(v);
+      });
       sortArr = _.sortBy(sortArr, (item) => {
-        return [null, undefined].includes(item.order) ? 100 : item.order;
+        return item.order ?? Constants.orderDefault;
       });
 
       const sortedColumns = {};
@@ -195,9 +197,9 @@ export default {
         sortedColumns[_key] = item;
       });
       return sortedColumns;
-
     });
 
+    //默认值
     _.forEach(computedColumns.value, (column, key) => {
       if (column.value === undefined) {
         return;

diff --git a/packages/fast-crud/src/components/toolbar/index.vue b/packages/fast-crud/src/components/toolbar/index.vue
@@ -21,6 +21,7 @@ import { ref, computed, getCurrentInstance } from "vue";
 import traceUtil from "../../utils/util.trace";
 import { useI18n } from "../../locale";
 import FsSlotRender from "../render/fs-slot-render";
+import { Constants } from "../../utils/util.constants";
 
 /**
  * 工具条
@@ -141,7 +142,6 @@ export default {
         defaultButtons.compact.type = props.compact ? "primary" : "default";
       }
 
-
       let sortArr = [];
       for (let defaultButtonsKey in defaultButtons) {
         sortArr.push({
@@ -150,7 +150,7 @@ export default {
         });
       }
       sortArr = _.sortBy(sortArr, (item) => {
-        return [null, undefined].includes(item.order) ? 100 : item.order;
+        return item.order ?? Constants.orderDefault;
       });
 
       const sortedButtons = {};

diff --git a/packages/fast-crud/src/use/use-crud.ts b/packages/fast-crud/src/use/use-crud.ts
@@ -9,6 +9,7 @@ import { useI18n } from "../locale";
 import { useMerge } from "./use-merge";
 import { CrudExpose } from "../d.ts";
 import { useCompute } from "./use-compute";
+import { Constants } from "../utils/util.constants";
 export interface CrudOptions {
   table?: {};
   columns?: {};
@@ -375,7 +376,7 @@ export function useCrud(ctx: UseCrudProps) {
     function sortBy(arr) {
       return _.sortBy(arr, (item) => {
         sortChildren(item);
-        return item.order ?? 1;
+        return item.order ?? Constants.orderDefault;
       });
     }
     function sortChildren(column) {

diff --git a/packages/fast-crud/src/utils/index.ts b/packages/fast-crud/src/utils/index.ts
@@ -4,6 +4,7 @@ import trace from "./util.trace";
 import vite from "./util.vite";
 import store from "./util.store";
 export * from "./util.log";
+
 export default {
   logger,
   strings,

diff --git a/packages/fast-crud/src/utils/util.constants.ts b/packages/fast-crud/src/utils/util.constants.ts
@@ -0,0 +1,3 @@
+export const Constants = {
+  orderDefault: 100
+};