fix(table-select): 修复element版本中选中记录上点击删除按钮，清空所有value后，报异常的bug

fast-crud · Oct 25, 2023 · 5d95b40 · 5d95b40
1 parent 6530c29
commit 5d95b40
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 21 deletions.
diff --git a/packages/fast-crud/src/components/crud/fs-form.vue b/packages/fast-crud/src/components/crud/fs-form.vue
@@ -249,20 +249,6 @@ export default defineComponent({
     // eslint-disable-next-line vue/no-setup-props-destructure
     const initialForm = _.cloneDeep(props.initialForm);
 
-    // eslint-disable-next-line vue/no-setup-props-destructure
-    const scope: Ref<FormScopeContext> = ref({
-      row: initialForm,
-      form,
-      index: props.index,
-      mode: props.mode,
-      attrs: ctx.attrs,
-      getComponentRef
-    } as FormScopeContext);
-
-    function getContextFn() {
-      return scope.value;
-    }
-
     // eslint-disable-next-line vue/no-setup-props-destructure
     _.each(props.columns, (item) => {
       if (item.value != null && item.value instanceof AsyncComputeValue) {
@@ -288,6 +274,23 @@ export default defineComponent({
         }
       }
     });
+
+    const scope: Ref<FormScopeContext> = computed(() => {
+      return {
+        initialForm,
+        row: form,
+        form,
+        index: props.index,
+        mode: props.mode || "add",
+        attrs: ctx.attrs,
+        getComponentRef
+      } as FormScopeContext;
+    });
+
+    function getContextFn() {
+      return scope.value;
+    }
+
     //form.valueBuilder
     function doValueBuilder(form: any) {
       if (form == null) {
@@ -335,7 +338,6 @@ export default defineComponent({
 
     const groupActiveKey = ref([]);
 
-    // eslint-disable-next-line vue/no-setup-props-destructure
     _.forEach(props.group?.groups, (groupItem, key) => {
       if (groupItem.collapsed !== true) {
         groupActiveKey.value.push(key);
@@ -414,7 +416,7 @@ export default defineComponent({
       return formRef.value;
     }
     function createInitialForm() {
-      return _.cloneDeep(props.initialForm || {});
+      return _.cloneDeep(initialForm || {});
     }
     async function reset() {
       // ui.form.resetWrap(formRef.value, { form, initialForm: createInitialForm() });

diff --git a/packages/fast-crud/src/components/extends/fs-table-select.vue b/packages/fast-crud/src/components/extends/fs-table-select.vue
@@ -61,7 +61,7 @@ type FsTableSelectProps = {
    */
   dict: Dict;
   /**
-   * 选择框配置
+   * 选择框 fs-dict-select配置
    */
   select?: any;
 
@@ -71,7 +71,7 @@ type FsTableSelectProps = {
   dialog?: any;
 
   /**
-   * 当前选中值 values-format配置
+   * 当前选中值 fs-values-format组件 配置
    */
   valuesFormat?: any;
 

diff --git a/packages/fast-crud/src/d/crud.ts b/packages/fast-crud/src/d/crud.ts
@@ -66,6 +66,13 @@ export type ComponentRenderContext = {
 } & ScopeContext;
 
 export type FormScopeContext = {
+  /**
+   * 初始form数据
+   */
+  initialForm: any;
+  /**
+   * 属性
+   */
   attrs: any;
   /**
    * 提交成功后的response

diff --git a/packages/ui/ui-antdv4/src/antdv.tsx b/packages/ui/ui-antdv4/src/antdv.tsx
@@ -520,7 +520,7 @@ export class Antdv implements UiInterface {
     vLoading: false,
     buildSelectionBinding(req) {
       const selectedRowKeys = req.selectedRowKeys;
-      const onChange = (changed: any[]) => {
+      const onChange = (changed: any[] = []) => {
         req.onSelectedKeysChanged(changed);
       };
       let type = "radio";

diff --git a/packages/ui/ui-element/src/element.tsx b/packages/ui/ui-element/src/element.tsx
@@ -474,7 +474,7 @@ export class Element implements UiInterface {
       }
 
       if (req.multiple) {
-        const onSelectionChange = (changedRows: any[]) => {
+        const onSelectionChange = (changedRows: any[] = []) => {
           const rowKey = req.getRowKey();
           let selectedKeys = changedRows.map((item: any) => item[rowKey]);
           if (req.crossPage) {
@@ -503,6 +503,10 @@ export class Element implements UiInterface {
       } else {
         //单选
         const onCurrentChange = (changed: any) => {
+          if (changed == null) {
+            req.onSelectedKeysChanged([]);
+            return;
+          }
           const rowKey = req.getRowKey();
           const selectedKeys = [changed[rowKey]];
           req.onSelectedKeysChanged(selectedKeys);

diff --git a/packages/ui/ui-naive/src/naive.tsx b/packages/ui/ui-naive/src/naive.tsx
@@ -566,7 +566,7 @@ export class Naive implements UiInterface {
       req.tableRef.value.scrollTo({ top: req.top });
     },
     buildSelectionBinding(req) {
-      const onSelectionChange = (changed: any) => {
+      const onSelectionChange = (changed: any = []) => {
         req.onSelectedKeysChanged(changed);
       };