@hzab/form-render 1.5.0-beta → 1.5.0-beta2

package/CHANGELOG.md

@@ -3,6 +3,10 @@
 feat: 上传组件多模式上传，出参格式配置
 fix: 字符串事件处理（onChange）
 
+# @hzab/form-render@1.4.1
+
+fix: Upload 修复历史遗留问题，解决 单项上传始终解析为 对象/字符串 无法切换会数组的情况
+
 # @hzab/form-render@1.4.0
 
 break: location-list-picker 添加多区域规划

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/form-render",
-  "version": "1.5.0-beta",
+  "version": "1.5.0-beta2",
   "description": "",
   "main": "src",
   "scripts": {
@@ -51,4 +51,4 @@
   "directories": {
     "lib": "lib"
   }
-}
+}

package/src/common/schema-handler.ts

@@ -7,8 +7,30 @@ import { customAlphabet } from "nanoid";
 export const alphabet = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 export const nanoid = customAlphabet(alphabet, 20);
 
+/**
+ * You can use the built-in context variables
+ *
+ * 1. `$self` is the current Field Model
+ *
+ * 2. `$form` is the current Form Model
+ *
+ * 3. `$deps` is the dependencies value
+ *
+ * 4. `$observable` function is used to create an persistent observable state object
+ *
+ * 5. `$memo` function is is used to create a persistent data
+ *
+ * 6. `$effect` function is used to handle side-effect logic
+ *
+ * 7. `$props` function is used to set component props to current field
+ *
+ * Document Links
+ *
+ * https://react.formilyjs.org/api/shared/schema#%E5%86%85%E7%BD%AE%E8%A1%A8%E8%BE%BE%E5%BC%8F%E4%BD%9C%E7%94%A8%E5%9F%9F
+ **/
+
 /** formily 执行函数作用域相关参数 */
-export const formilyDataKeys = ["$form", "$self", "$observable", "$effect", "$memo", "$props", "$values"];
+export const formilyDataKeys = ["$form", "$self", "$observable", "$effect", "$memo", "$props", "$values", "$deps"];
 
 /** 自增容器 */
 export const arrayList = ["ArrayTable", "ArrayCards"];
@@ -105,9 +127,9 @@ export const bindCallback = (opt) => {
   }
   // 设置一个唯一的函数名，用于从 schema scope 传入 formily 事件执行中
   const fnKey = "fnKey_" + nanoid();
-  // 设置 schemaScope 中的唯一函数,获取执行函数作用域 $form, $self, $observable, $effect, $memo, $props, $values 相关参数
+  // 设置 schemaScope 中的唯一函数,获取执行函数作用域 $form, $self, $observable, $effect, $memo, $props, $values, $deps 相关参数
   schemaScope._$tempData[fnKey] = function (params, sourceArgs) {
-    const { $form, $self, $observable, $effect, $memo, $props, $values } = params;
+    const { $form, $self, $observable, $effect, $memo, $props, $values, $deps } = params;
     // 处理结果数据，各组件返回数据格式不一致
     const res = handleChangeValue({
       ...opt,

package/src/components/Upload/index.tsx

@@ -4,35 +4,14 @@ import { useGlobalPropsContext } from "../../common/global-props-context";
 export const Upload = (props) => {
   // 组件外部传入的 props
   const globalProps = useGlobalPropsContext() || {};
-  const { field = {}, onChange, value } = props;
-  const { name, mode, componentProps = {} } = field;
-  const { multiple } = componentProps;
-
-  async function onUploadChange(files) {
-    let _files = files;
-    if (field?.autoUpload && props.fieldsConf[name]?.onUpload) {
-      _files = await props.fieldsConf[name]?.onUpload(files);
-      if (!_files) {
-        return;
-      }
-    }
-    // 若单选模式，默认只返回对应数据，而非嵌套一层数组
-    if (!multiple && _files && _files.length === 1) {
-      _files = _files[0];
-    }
-    onChange && onChange(_files);
-  }
 
   const _props = {
-    mode: mode,
-    ...props,
-    value: typeof value === "string" ? [value] : value,
     axios: globalProps?.axios,
     axiosConf: globalProps?.axiosConf,
-    ...componentProps,
+    ...props,
   };
 
-  return <UploaderCom {..._props} onChange={onUploadChange} />;
+  return <UploaderCom {..._props} />;
 };
 
 export default Upload;