perf: 列排序

fast-crud · Aug 28, 2021 · 7c0b019 · 7c0b019
1 parent 2db661c
commit 7c0b019
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/packages/fast-crud/src/components/crud/fs-table.jsx b/packages/fast-crud/src/components/crud/fs-table.jsx
@@ -71,15 +71,10 @@ export default {
       return cellRef?.getTargetRef();
     };
 
-    const { doComputed } = useCompute();
-    const refColumns = toRef(props, "columns");
-    const computedColumns = doComputed(refColumns, null, [/\[.+\]component/]);
-
     return {
       tableRef,
       componentRefs,
       getComponentRef,
-      computedColumns,
       ...useEditable(props, ctx, tableRef)
     };
   },

diff --git a/packages/fast-crud/src/components/fs-crud.vue b/packages/fast-crud/src/components/fs-crud.vue
@@ -47,7 +47,6 @@
       ref="tableRef"
       class="fs-crud-table"
       v-bind="computedTable"
-      :columns="computedTable.columns"
       :row-handle="rowHandle"
       :data="data"
       :cell-slots="computedCellSlots"
@@ -336,7 +335,11 @@ export default defineComponent({
     /**
      * crud包裹容器的class
      */
-    customClass: {}
+    customClass: {},
+    /**
+     * 不要传到fs-table去
+     */
+    form: {}
   },
   emits: [
     "search-submit",

diff --git a/packages/fast-crud/src/use/use-compute.ts b/packages/fast-crud/src/use/use-compute.ts
@@ -87,6 +87,10 @@ function doComputed(target, getContextFn, excludes, userComputedFn) {
 
   return computed(() => {
     let targetValue = target.value;
+    if (targetValue instanceof Array) {
+      debugger;
+    }
+
     if (asyncCount > 0 || syncCount > 0) {
       targetValue = cloneDeep(targetValue);
       if (syncCount > 0) {

diff --git a/packages/fast-crud/src/use/use-crud.ts b/packages/fast-crud/src/use/use-crud.ts
@@ -372,7 +372,11 @@ export function useCrud(ctx: UseCrudProps) {
     userOptions.search = merge({ columns: baseColumnsForSearch }, { columns: searchColumns }, userOptions.search);
 
     // tableColumns
-    userOptions.table.columns = tableColumns;
+    const sortedTableColumns = _.sortBy(tableColumns, (item) => {
+      return item.order ?? 1;
+    }); //排序
+    userOptions.table.columns = sortedTableColumns;
+
     const tableColumnsMap = {};
     _.forEach(tableColumns, (item) => {
       tableColumnsMap[item.key] = item;