@hzab/list-render 1.10.8 → 1.10.10

package/CHANGELOG.md

@@ -1,6 +1,14 @@
+# @hzab/list-render@1.10.10
+
+fix: 解决 FormModal 与 DetailModal 相互影响的问题
+
+# @hzab/list-render@1.10.9
+
+fix: 行内编辑 解决 select 等表单项 focus 报错问题
+
 # @hzab/list-render@1.10.8
 
-feat: 行内编辑事件通过onEdit抛出 添加保存前自定义处理函数onEditReqVerify，返回Promise用于截断或正常执行
+feat: 行内编辑事件通过 onEdit 抛出 添加保存前自定义处理函数 onEditReqVerify，返回 Promise 用于截断或正常执行
 
 # @hzab/list-render@1.10.7
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.10.8",
+  "version": "1.10.10",
   "description": "",
   "main": "src",
   "scripts": {

package/src/DetailModal/index.jsx

@@ -18,7 +18,7 @@ function DetailModal(props, parentRef) {
     setOpen(true);
     // 处理 formRef.current 为 undefined 的问题
     setData(formData);
-    setTitle(title || '详情')
+    setTitle(title || "详情");
   }
 
   function close() {
@@ -34,10 +34,15 @@ function DetailModal(props, parentRef) {
     formRef,
   }));
 
+  // Hack: 解决 FormModal DetailModal 相互影响的问题
+  if (!open) {
+    return null;
+  }
+
   let footer = undefined;
   const options = {
     close,
-    form: formRef.current?.formRender,
+    formRef,
     scenario: "detail",
   };
   if (modalConf?.footer) {

package/src/FormModal/index.tsx

@@ -62,6 +62,11 @@ export function FormModal(props, parentRef) {
     formRef,
   }));
 
+  // Hack: 解决 FormModal DetailModal 相互影响的问题
+  if (!open) {
+    return null;
+  }
+
   function onOk() {
     validate().then(async () => {
       const submitForm = _.cloneDeep(await formRef.current?.formRender?.values);
@@ -111,7 +116,7 @@ export function FormModal(props, parentRef) {
     cancel: close,
     onOk,
     close,
-    form: formRef.current?.formRender,
+    formRef,
     validate,
     scenario: scenarioRef.current,
   };
@@ -177,7 +182,7 @@ export function FormModal(props, parentRef) {
   return (
     <CModal {..._modalProps}>
       {FormSlot ? (
-        <FormSlot {...props} formRef={formRef} scenario={scenarioRef.current} schema={props.schema?.schema} />
+        <FormSlot {...props} formRef={formRef} scenario={scenarioRef.current} schema={props.schema} />
       ) : (
         <FormRender
           {...props.formProps}

package/src/common/handleReactions.js

@@ -1,72 +1,72 @@
-import { cloneDeep } from "lodash";
-import { autorun, observable } from "@formily/reactive";
-import { getStateFunc } from "./formily-utils";
-
-/**
- * 处理自己添加的变量
- * @param {Array} fieldList
- * @param {Object} opt
- * @returns
- */
-export function handleReactions(fieldList, opt = {}) {
-  if (!Array.isArray(fieldList)) {
-    console.warn("Error handleReactions: fieldList not array");
-    return fieldList;
-  }
-  const resList = [];
-  cloneDeep(fieldList).forEach((item) => {
-    handleReaction(item, opt);
-    resList.push(item);
-  });
-  return resList;
-}
-
-/**
- * 处理自己添加的变量
- * @param {Object} fieldSchema
- * @param {Object} opt
- * @returns
- */
-export function handleReaction(fieldSchema, opt = {}) {
-  const { scope, formilyRef = {}, scenario } = opt || {};
-
-  const field = fieldSchema?.field || fieldSchema;
-  const { state, run } = field["x-reactions"]?.fulfill || {};
-  const args = {
-    scope,
-    // $deps,
-    $self: field,
-    $effect: autorun.effect,
-    // $form: $form,
-    // $values: $values,
-    $observable: observable,
-    $memo: autorun.memo,
-    $props: {
-      // formilyRef.current.fields  formilyRef.current.fieldSchemas
-      formilyRef,
-    },
-  };
-
-  // 自身变量
-  if (field.inTable) {
-    const inTableEffectFn = getStateFunc(field.inTable, args);
-    if (inTableEffectFn) {
-      const inTable = inTableEffectFn(args);
-      field.inTable = inTable;
-    }
-  }
-
-  // 属性响应器
-  if (state) {
-  }
-
-  // 动作响应器
-  // if (run) {
-  //   getFunc(run)(args);
-  // }
-
-  if (field.visible === false) {
-    return field;
-  }
-  return field;
-}
+import { cloneDeep } from "lodash";
+import { autorun, observable } from "@formily/reactive";
+import { getStateFunc } from "./formily-utils";
+
+/**
+ * 处理自己添加的变量
+ * @param {Array} fieldList
+ * @param {Object} opt
+ * @returns
+ */
+export function handleReactions(fieldList, opt = {}) {
+  if (!Array.isArray(fieldList)) {
+    console.warn("Error handleReactions: fieldList not array");
+    return fieldList;
+  }
+  const resList = [];
+  cloneDeep(fieldList).forEach((item) => {
+    handleReaction(item, opt);
+    resList.push(item);
+  });
+  return resList;
+}
+
+/**
+ * 处理自己添加的变量
+ * @param {Object} fieldSchema
+ * @param {Object} opt
+ * @returns
+ */
+export function handleReaction(fieldSchema, opt = {}) {
+  const { scope, formilyRef = {}, scenario } = opt || {};
+
+  const field = fieldSchema?.field || fieldSchema;
+  const { state, run } = field["x-reactions"]?.fulfill || {};
+  const args = {
+    scope,
+    // $deps,
+    $self: field,
+    $effect: autorun.effect,
+    // $form: $form,
+    // $values: $values,
+    $observable: observable,
+    $memo: autorun.memo,
+    $props: {
+      // formilyRef.current.fields  formilyRef.current.fieldSchemas
+      formilyRef,
+    },
+  };
+
+  // 自身变量
+  if (field.inTable) {
+    const inTableEffectFn = getStateFunc(field.inTable, args);
+    if (inTableEffectFn) {
+      const inTable = inTableEffectFn(args);
+      field.inTable = inTable;
+    }
+  }
+
+  // 属性响应器
+  if (state) {
+  }
+
+  // 动作响应器
+  // if (run) {
+  //   getFunc(run)(args);
+  // }
+
+  if (field.visible === false) {
+    return field;
+  }
+  return field;
+}

package/src/components/Formily/FormilyEditTable.tsx

@@ -181,7 +181,10 @@ export const useEditTable = (props) => {
 
   useEffect(() => {
     if (editingId || editingKey) {
-      editingFiledRef.current?.current?.focus?.();
+      try {
+        // HACK: try catch 解决 select 等表单项 focus 报错问题
+        editingFiledRef.current?.current?.focus?.();
+      } catch (error) {}
     }
   }, [editingId, editingKey]);
 
@@ -212,7 +215,7 @@ export const useEditTable = (props) => {
     try {
       // 点击保存，数据抛出
       (await formRender?.validate()) as Item;
-      onEditSubmit && await onEditSubmit(formRender.values);
+      onEditSubmit && (await onEditSubmit(formRender.values));
       // 清除编辑目标
       setEditingId("");
       setEditingKey("");