fix: 修复 useFs返回值里面没有context的bug

fast-crud · Sep 3, 2023 · b88fea7 · b88fea7
1 parent 699f432
commit b88fea7
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 3 deletions.
diff --git a/packages/fast-crud/src/components/crud/fs-form.vue b/packages/fast-crud/src/components/crud/fs-form.vue
@@ -601,6 +601,23 @@ export default defineComponent({
   .fs-form-invalid {
   }
 
+  .fs-form-item-component {
+    .ant-picker,
+    .ant-input-number,
+    .el-cascader,
+    .el-date-editor,
+    .el-input-number {
+      width: 100%;
+    }
+
+    .el-date-editor .el-range__icon {
+      margin-left: 10px;
+    }
+    .el-date-editor .el-range__close-icon {
+      margin-right: 10px;
+    }
+  }
+
   //.el-date-editor.el-input__wrapper {
   //  width: 100%;
   //}

diff --git a/packages/fast-crud/src/components/search/layout-default.vue b/packages/fast-crud/src/components/search/layout-default.vue
@@ -186,6 +186,20 @@ export default defineComponent({
           &:first-child {
             // margin-left: 0;
           }
+
+          .ant-input-number,
+          .ant-picker,
+          .el-input-number,
+          .el-cascader,
+          .el-date-editor {
+            width: 100%;
+          }
+          .el-date-editor .el-range__icon {
+            margin-left: 10px;
+          }
+          .el-date-editor .el-range__close-icon {
+            margin-right: 10px;
+          }
         }
       }
     }

diff --git a/packages/fast-crud/src/use/use-crud.ts b/packages/fast-crud/src/use/use-crud.ts
@@ -429,6 +429,7 @@ export type UseFsRet = {
   crudRef: Ref;
   crudBinding: Ref<CrudBinding>;
   crudExpose: CrudExpose;
+  context: UseFsContext;
 } & UseCrudRet &
   CreateCrudOptionsRet;
 
@@ -510,7 +511,8 @@ function useFsImpl(props: UseFsProps): UseFsRet | Promise<UseCrudRet> {
       ...useCrudRet,
       crudRef,
       crudExpose,
-      crudBinding
+      crudBinding,
+      context
     };
   }
 

diff --git a/packages/ui/ui-antdv/src/antdv.tsx b/packages/ui/ui-antdv/src/antdv.tsx
@@ -492,7 +492,10 @@ export class Antdv implements UiInterface {
     vLoading: false,
     scrollTo(req: TableScrollReq) {
       try {
-        req.fsTableRef.vnode.el.querySelector(".ant-table-body").scrollTop = req.top;
+        const body = req.fsTableRef.vnode.el.querySelector(".ant-table-body");
+        if (body) {
+          body.scrollTop = req.top;
+        }
       } catch (e) {
         console.error("scroll to top error:", e);
       }

diff --git a/packages/ui/ui-antdv4/src/antdv.tsx b/packages/ui/ui-antdv4/src/antdv.tsx
@@ -492,7 +492,10 @@ export class Antdv implements UiInterface {
     vLoading: false,
     scrollTo(req: TableScrollReq) {
       try {
-        req.fsTableRef.vnode.el.querySelector(".ant-table-body").scrollTop = req.top;
+        const body = req.fsTableRef.vnode.el.querySelector(".ant-table-body");
+        if (body) {
+          body.scrollTop = req.top;
+        }
       } catch (e) {
         console.error("scroll to top error:", e);
       }