perf: 优化free模式，支持默认不激活

fast-crud · Dec 19, 2023 · aeaf0a6 · aeaf0a6
1 parent deca066
commit aeaf0a6
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 12 deletions.
diff --git a/packages/fast-admin/fs-admin-antdv b/packages/fast-admin/fs-admin-antdv
diff --git a/packages/fast-admin/fs-admin-antdv4 b/packages/fast-admin/fs-admin-antdv4
diff --git a/packages/fast-admin/fs-admin-element b/packages/fast-admin/fs-admin-element
diff --git a/packages/fast-admin/fs-admin-naive-ui b/packages/fast-admin/fs-admin-naive-ui
diff --git a/packages/fast-crud/src/components/crud/editable/fs-editable-cell.tsx b/packages/fast-crud/src/components/crud/editable/fs-editable-cell.tsx
@@ -57,14 +57,22 @@ export default defineComponent({
       }
     }
     async function onSubmit() {
+      if (props.editableOpts?.mode === "free") {
+        await props.editableCell.persist();
+        return;
+      }
       await props.editableCell.save();
     }
     function onCancel() {
       props.editableCell.cancel();
     }
 
     const showAction: ComputedRef<boolean> = computed(() => {
-      return props.editableOpts?.mode === "cell" && props.editableCell.showAction !== false;
+      console.log(props.editableOpts?.mode, props.editableOpts.showAction, props.editableCell.showAction);
+      return (
+        (props.editableOpts?.mode === "cell" || props.editableOpts?.mode === "free") &&
+        props.editableCell.showAction !== false
+      );
     });
     const isDirty: ComputedRef<boolean> = computed(() => {
       return props.editableCell.isChanged && props.editableCell.isChanged();
@@ -109,7 +117,7 @@ export default defineComponent({
         return <fs-cell ref={"targetRef"} item={props.item} scope={props.scope} {...ctx.attrs} />;
       }
       const editableCell: EditableCell = props.editableCell;
-      const trigger = props.editableOpts.mode === "cell" ? props.editableOpts?.activeTrigger : false;
+      const trigger = showAction.value ? props.editableOpts?.activeTrigger : false;
       return (
         <fs-editable
           ref={"editableRef"}

diff --git a/packages/fast-crud/src/components/crud/editable/use-editable.ts b/packages/fast-crud/src/components/crud/editable/use-editable.ts
@@ -130,6 +130,9 @@ export function useEditable(props: any, ctx: any, tableRef: any): { editable: Ed
     const updateCell: any = computed(() => {
       return col.editable?.updateCell || options.value.updateCell;
     });
+    const showAction: any = computed(() => {
+      return col.editable?.showAction || options.value.showAction;
+    });
     const cell: EditableCell = reactive({
       mode: editableId < 0 ? "add" : "edit",
       oldValue: undefined,
@@ -139,7 +142,7 @@ export function useEditable(props: any, ctx: any, tableRef: any): { editable: Ed
       activeTrigger: options.value.activeTrigger,
       column: col,
       updateCell,
-      showAction: true,
+      showAction,
       isEditable: () => {
         let disabled = col?.editable?.disabled;
         if (disabled instanceof Function) {
@@ -172,11 +175,11 @@ export function useEditable(props: any, ctx: any, tableRef: any): { editable: Ed
             cancelAll();
           }
         }
-        if (opts.showAction != null) {
-          cell.showAction = opts.showAction;
-        } else {
-          cell.showAction = null;
-        }
+        // if (opts.showAction != null) {
+        //   cell.showAction = opts.showAction;
+        // } else {
+        //   cell.showAction = null;
+        // }
         cell.isEditing = true;
 
         cell.oldValue = getValue(key);

diff --git a/packages/fast-crud/src/d/crud.ts b/packages/fast-crud/src/d/crud.ts
@@ -538,6 +538,7 @@ export type TableColumnEditableProps = {
   disabled?: boolean | TableColumnEditableDisabledFunc;
   updateCell?: EditableUpdateCellRequest;
   updateColumn?: EditableUpdateColumnRequest;
+  showAction?: boolean;
 };
 
 export type ConditionalRenderProps = {