@hzab/form-render 1.4.1-beta → 1.4.1

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @hzab/form-render@1.4.1
 
-fix: ArrayTable & ArrayCards key nanoid 生成
+fix: Upload 修复历史遗留问题，解决 单项上传始终解析为 对象/字符串 无法切换会数组的情况
 
 # @hzab/form-render@1.4.0
 

package/package.json

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

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;

package/src/components/index.tsx

@@ -1,7 +1,5 @@
 import Text from "./Text";
 
-export * from "./ArrayTable";
-export * from "./ArrayCards";
 export * from "./Upload";
 
 export * from "./UserSelect";

package/src/components/ArrayCards/index.tsx

@@ -1,158 +0,0 @@
-import React, { useMemo } from "react";
-import { Card, Empty } from "antd";
-import { CardProps } from "antd/lib/card";
-import { ArrayField } from "@formily/core";
-import { useField, observer, useFieldSchema, RecursionField } from "@formily/react";
-import cls from "classnames";
-import { ISchema } from "@formily/json-schema";
-import { usePrefixCls } from "c-formily-antd/lib/__builtins__";
-import { ArrayBase, ArrayBaseMixins, IArrayBaseProps } from "c-formily-antd/lib/array-base";
-import { nanoid } from "nanoid";
-type ComposedArrayCards = React.FC<React.PropsWithChildren<CardProps & IArrayBaseProps>> & ArrayBaseMixins;
-
-const isAdditionComponent = (schema: ISchema) => {
-  return schema["x-component"]?.indexOf("Addition") > -1;
-};
-
-const isIndexComponent = (schema: ISchema) => {
-  return schema["x-component"]?.indexOf?.("Index") > -1;
-};
-
-const isRemoveComponent = (schema: ISchema) => {
-  return schema["x-component"]?.indexOf?.("Remove") > -1;
-};
-
-const isCopyComponent = (schema: ISchema) => {
-  return schema["x-component"]?.indexOf?.("Copy") > -1;
-};
-
-const isMoveUpComponent = (schema: ISchema) => {
-  return schema["x-component"]?.indexOf?.("MoveUp") > -1;
-};
-
-const isMoveDownComponent = (schema: ISchema) => {
-  return schema["x-component"]?.indexOf?.("MoveDown") > -1;
-};
-
-const isOperationComponent = (schema: ISchema) => {
-  return (
-    isAdditionComponent(schema) ||
-    isRemoveComponent(schema) ||
-    isCopyComponent(schema) ||
-    isMoveDownComponent(schema) ||
-    isMoveUpComponent(schema)
-  );
-};
-
-export const ArrayCards: ComposedArrayCards = observer((props) => {
-  const field = useField<ArrayField>();
-  const schema = useFieldSchema();
-  const prefixCls = usePrefixCls("formily-array-cards", props);
-  const { onAdd, onCopy, onRemove, onMoveDown, onMoveUp } = props;
-  const dataSource = useMemo(() => {
-    return Array.isArray(field.value)
-      ? field.value?.map((item) => {
-          return {
-            ...item,
-            _key: item?.id || nanoid(),
-          };
-        })
-      : [];
-  }, [field.value?.length]);
-  if (!schema) throw new Error("can not found schema object");
-  const renderItems = () => {
-    return dataSource?.map((item, index) => {
-      const items = Array.isArray(schema.items) ? schema.items[index] || schema.items[0] : schema.items;
-      const title = (
-        <span>
-          <RecursionField
-            schema={items}
-            name={index}
-            filterProperties={(schema) => {
-              if (!isIndexComponent(schema)) return false;
-              return true;
-            }}
-            onlyRenderProperties
-          />
-          {props.title || field.title}
-        </span>
-      );
-      const extra = (
-        <span>
-          <RecursionField
-            schema={items}
-            name={index}
-            filterProperties={(schema) => {
-              if (!isOperationComponent(schema)) return false;
-              return true;
-            }}
-            onlyRenderProperties
-          />
-          {props.extra}
-        </span>
-      );
-
-      const content = (
-        <RecursionField
-          schema={items}
-          name={index}
-          filterProperties={(schema) => {
-            if (isIndexComponent(schema)) return false;
-            if (isOperationComponent(schema)) return false;
-            return true;
-          }}
-        />
-      );
-      return (
-        <ArrayBase.Item key={item?._key} index={index} record={() => field.value?.[index]}>
-          <Card
-            {...props}
-            onChange={() => {}}
-            className={cls(`${prefixCls}-item`, props.className)}
-            title={title}
-            extra={extra}
-          >
-            {content}
-          </Card>
-        </ArrayBase.Item>
-      );
-    });
-  };
-
-  const renderAddition = () => {
-    return schema.reduceProperties((addition, schema, key) => {
-      if (isAdditionComponent(schema)) {
-        return <RecursionField schema={schema} name={key} />;
-      }
-      return addition;
-    }, null);
-  };
-
-  const renderEmpty = () => {
-    if (dataSource?.length) return;
-    return (
-      <Card
-        {...props}
-        onChange={() => {}}
-        className={cls(`${prefixCls}-item`, props.className)}
-        title={props.title || field.title}
-      >
-        <Empty />
-      </Card>
-    );
-  };
-
-  return (
-    <ArrayBase onAdd={onAdd} onCopy={onCopy} onRemove={onRemove} onMoveUp={onMoveUp} onMoveDown={onMoveDown}>
-      {renderEmpty()}
-      {renderItems()}
-      {renderAddition()}
-    </ArrayBase>
-  );
-});
-
-ArrayCards.displayName = "ArrayCards";
-
-ArrayBase.mixin(ArrayCards);
-
-export default ArrayCards;

package/src/components/ArrayCards/style.less

@@ -1,15 +0,0 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
-@array-base-prefix-cls: ~'@{ant-prefix}-formily-array-base';
-@array-cards-prefix-cls: ~'@{ant-prefix}-formily-array-cards';
-
-.@{array-cards-prefix-cls}-item {
-  margin-bottom: 10px !important;
-}
-
-.ant-card-extra {
-  .@{array-base-prefix-cls}-copy {
-    margin-left: 6px;
-  }
-}

package/src/components/ArrayCards/style.ts

@@ -1,4 +0,0 @@
-import 'antd/lib/card/style/index'
-import 'antd/lib/empty/style/index'
-import 'antd/lib/button/style/index'
-import './style.less'

package/src/components/ArrayTable/index.tsx

@@ -1,413 +0,0 @@
-import React, { Fragment, useState, useRef, useEffect, createContext, useContext, useCallback, useMemo } from "react";
-import { Table, Pagination, Space, Select, Badge } from "antd";
-import { PaginationProps } from "antd/lib/pagination";
-import { TableProps, ColumnProps } from "antd/lib/table";
-import { SelectProps } from "antd/lib/select";
-import cls from "classnames";
-import { GeneralField, FieldDisplayTypes, ArrayField } from "@formily/core";
-import { useField, observer, useFieldSchema, RecursionField, ReactFC } from "@formily/react";
-import { isArr, isBool, isFn } from "@formily/shared";
-import { Schema } from "@formily/json-schema";
-import { usePrefixCls, SortableContainer, SortableElement } from "c-formily-antd/lib/__builtins__";
-import { ArrayBase, ArrayBaseMixins, IArrayBaseProps } from "c-formily-antd/lib/array-base";
-import { nanoid } from "nanoid";
-
-interface ObservableColumnSource {
-  field: GeneralField;
-  columnProps: ColumnProps<any>;
-  schema: Schema;
-  display: FieldDisplayTypes;
-  name: string;
-}
-interface IArrayTablePaginationProps extends PaginationProps {
-  dataSource?: any[];
-  showPagination?: boolean;
-  children?: (
-    dataSource: any[],
-    pagination: React.ReactNode,
-    options: {
-      startIndex: number;
-    },
-  ) => React.ReactElement;
-}
-
-interface IStatusSelectProps extends SelectProps<any> {
-  pageSize?: number;
-}
-
-type ComposedArrayTable = React.FC<React.PropsWithChildren<TableProps<any> & IArrayBaseProps>> &
-  ArrayBaseMixins & {
-    Column?: React.FC<React.PropsWithChildren<ColumnProps<any>>>;
-  };
-
-interface PaginationAction {
-  totalPage?: number;
-  pageSize?: number;
-  showPagination?: boolean;
-  changePage?: (page: number) => void;
-}
-
-const SortableRow = SortableElement((props: any) => <tr {...props} />);
-const SortableBody = SortableContainer((props: any) => <tbody {...props} />);
-
-const isColumnComponent = (schema: Schema) => {
-  return schema["x-component"]?.indexOf("Column") > -1;
-};
-
-const isOperationsComponent = (schema: Schema) => {
-  return schema["x-component"]?.indexOf("Operations") > -1;
-};
-
-const isAdditionComponent = (schema: Schema) => {
-  return schema["x-component"]?.indexOf("Addition") > -1;
-};
-
-const useArrayTableSources = () => {
-  const arrayField = useField();
-  const schema = useFieldSchema();
-  const parseSources = (schema: Schema): ObservableColumnSource[] => {
-    if (isColumnComponent(schema) || isOperationsComponent(schema) || isAdditionComponent(schema)) {
-      if (!schema["x-component-props"]?.["dataIndex"] && !schema["name"]) return [];
-      const name = schema["x-component-props"]?.["dataIndex"] || schema["name"];
-      const field = arrayField.query(arrayField.address.concat(name)).take();
-      const columnProps = field?.component?.[1] || schema["x-component-props"] || {};
-      const display = field?.display || schema["x-display"] || "visible";
-      return [
-        {
-          name,
-          display,
-          field,
-          schema,
-          columnProps,
-        },
-      ];
-    } else if (schema.properties) {
-      return schema.reduceProperties((buf, schema) => {
-        return buf.concat(parseSources(schema));
-      }, []);
-    }
-  };
-
-  const parseArrayItems = (schema: Schema["items"]) => {
-    if (!schema) return [];
-    const sources: ObservableColumnSource[] = [];
-    const items = isArr(schema) ? schema : [schema];
-    return items.reduce((columns, schema) => {
-      const item = parseSources(schema);
-      if (item) {
-        return columns.concat(item);
-      }
-      return columns;
-    }, sources);
-  };
-
-  if (!schema) throw new Error("can not found schema object");
-
-  return parseArrayItems(schema.items);
-};
-
-const useArrayTableColumns = (
-  dataSource: any[],
-  field: ArrayField,
-  sources: ObservableColumnSource[],
-): TableProps<any>["columns"] => {
-  return sources.reduce((buf, { name, columnProps, schema, display }, key) => {
-    if (display !== "visible") return buf;
-    if (!isColumnComponent(schema)) return buf;
-    return buf.concat({
-      ...columnProps,
-      key,
-      dataIndex: name,
-      render: (value: any, record: any) => {
-        const index = dataSource?.indexOf(record);
-        const children = (
-          <ArrayBase.Item index={index} record={() => field?.value?.[index]}>
-            <RecursionField schema={schema} name={index} onlyRenderProperties />
-          </ArrayBase.Item>
-        );
-        return children;
-      },
-    });
-  }, []);
-};
-
-const useAddition = () => {
-  const schema = useFieldSchema();
-  return schema.reduceProperties((addition, schema, key) => {
-    if (isAdditionComponent(schema)) {
-      return <RecursionField schema={schema} name={key} />;
-    }
-    return addition;
-  }, null);
-};
-
-const schedulerRequest = {
-  request: null,
-};
-
-const StatusSelect: ReactFC<IStatusSelectProps> = observer(
-  (props) => {
-    const field = useField<ArrayField>();
-    const prefixCls = usePrefixCls("formily-array-table");
-    const errors = field.errors;
-    const parseIndex = (address: string) => {
-      return Number(address.slice(address.indexOf(field.address.toString()) + 1).match(/(\d+)/)?.[1]);
-    };
-    const options = props.options?.map(({ label, value }) => {
-      const val = Number(value);
-      const hasError = errors.some(({ address }) => {
-        const currentIndex = parseIndex(address);
-        const startIndex = (val - 1) * props.pageSize;
-        const endIndex = val * props.pageSize;
-        return currentIndex >= startIndex && currentIndex <= endIndex;
-      });
-      return {
-        label: hasError ? <Badge dot>{label}</Badge> : label,
-        value,
-      };
-    });
-
-    const width = String(options?.length).length * 15;
-
-    return (
-      <Select
-        value={props.value}
-        onChange={props.onChange}
-        options={options}
-        virtual
-        style={{
-          width: width < 60 ? 60 : width,
-        }}
-        className={cls(`${prefixCls}-status-select`, {
-          "has-error": errors?.length,
-        })}
-      />
-    );
-  },
-  {
-    scheduler: (update) => {
-      clearTimeout(schedulerRequest.request);
-      schedulerRequest.request = setTimeout(() => {
-        update();
-      }, 100);
-    },
-  },
-);
-
-const PaginationContext = createContext<PaginationAction>({});
-const usePagination = () => {
-  return useContext(PaginationContext);
-};
-
-const ArrayTablePagination: ReactFC<IArrayTablePaginationProps> = (props) => {
-  const [current, setCurrent] = useState(1);
-  const prefixCls = usePrefixCls("formily-array-table");
-  const showPagination = props.showPagination ?? true;
-  const pageSize = props.pageSize || 10;
-  const size = props.size || "default";
-  const dataSource = props.dataSource || [];
-  const startIndex = (current - 1) * pageSize;
-  const endIndex = startIndex + pageSize - 1;
-  const total = dataSource?.length || 0;
-  const totalPage = Math.ceil(total / pageSize);
-  const pages = Array.from(new Array(totalPage)).map((_, index) => {
-    const page = index + 1;
-    return {
-      label: page,
-      value: page,
-    };
-  });
-  const handleChange = (current: number) => {
-    setCurrent(current);
-  };
-
-  useEffect(() => {
-    if (totalPage > 0 && totalPage < current) {
-      handleChange(totalPage);
-    }
-  }, [totalPage, current]);
-
-  const renderPagination = () => {
-    if (totalPage <= 1 || !showPagination) return;
-    return (
-      <div className={`${prefixCls}-pagination`}>
-        <Space>
-          <StatusSelect
-            value={current}
-            pageSize={pageSize}
-            onChange={handleChange}
-            options={pages}
-            notFoundContent={false}
-          />
-          <Pagination
-            {...props}
-            pageSize={pageSize}
-            current={current}
-            total={dataSource.length}
-            size={size}
-            showSizeChanger={false}
-            onChange={handleChange}
-          />
-        </Space>
-      </div>
-    );
-  };
-
-  return (
-    <Fragment>
-      <PaginationContext.Provider
-        value={{
-          totalPage,
-          pageSize,
-          changePage: handleChange,
-          showPagination,
-        }}
-      >
-        {props.children?.(
-          showPagination ? dataSource?.slice(startIndex, endIndex + 1) : dataSource,
-          renderPagination(),
-          { startIndex },
-        )}
-      </PaginationContext.Provider>
-    </Fragment>
-  );
-};
-
-const RowComp: ReactFC<React.HTMLAttributes<HTMLTableRowElement>> = (props) => {
-  const prefixCls = usePrefixCls("formily-array-table");
-  const index = props["data-row-key"] || 0;
-  return (
-    <SortableRow
-      lockAxis="y"
-      {...props}
-      index={index}
-      className={cls(props.className, `${prefixCls}-row-${index + 1}`)}
-    />
-  );
-};
-
-export const ArrayTable: ComposedArrayTable = observer((props) => {
-  const ref = useRef<HTMLDivElement>();
-  const field = useField<ArrayField>();
-  const prefixCls = usePrefixCls("formily-array-table");
-  const dataSource = useMemo(() => {
-    return Array.isArray(field.value)
-      ? field.value?.slice().map((item) => {
-          return {
-            ...item,
-            _key: item?.id || nanoid(),
-          };
-        })
-      : [];
-  }, [field.value.length]);
-  const sources = useArrayTableSources();
-  const columns = useArrayTableColumns(dataSource, field, sources);
-  const pagination = isBool(props.pagination) ? { showPagination: props.pagination } : props.pagination;
-  const addition = useAddition();
-  const { onAdd, onCopy, onRemove, onMoveDown, onMoveUp } = props;
-  const defaultRowKey = (record: any) => {
-    return record?._key;
-  };
-  const addTdStyles = (id: number) => {
-    const node = ref.current?.querySelector(`.${prefixCls}-row-${id}`);
-    const helper = document.body.querySelector(`.${prefixCls}-sort-helper`);
-    if (!helper) return;
-    const tds = node?.querySelectorAll("td");
-    if (!tds) return;
-    requestAnimationFrame(() => {
-      helper.querySelectorAll("td").forEach((td, index) => {
-        if (tds[index]) {
-          td.style.width = getComputedStyle(tds[index]).width;
-        }
-      });
-    });
-  };
-  const getWrapperComp = useCallback(
-    (dataSource: any[], start: number) => (props: any) =>
-      (
-        <SortableBody
-          {...props}
-          start={start}
-          list={dataSource.slice()}
-          accessibility={{
-            container: ref.current || undefined,
-          }}
-          onSortStart={(event) => {
-            addTdStyles(event.active.id as number);
-          }}
-          onSortEnd={({ oldIndex, newIndex }) => {
-            field.move(oldIndex, newIndex);
-          }}
-          className={cls(`${prefixCls}-sort-helper`, props.className)}
-        />
-      ),
-    [field],
-  );
-  return (
-    <ArrayTablePagination {...pagination} dataSource={dataSource}>
-      {(dataSource, pager, { startIndex }) => (
-        <div ref={ref} className={prefixCls}>
-          <ArrayBase onAdd={onAdd} onCopy={onCopy} onRemove={onRemove} onMoveUp={onMoveUp} onMoveDown={onMoveDown}>
-            <Table
-              size="small"
-              bordered
-              rowKey={defaultRowKey}
-              {...props}
-              onChange={() => {}}
-              pagination={false}
-              columns={columns}
-              dataSource={dataSource}
-              components={{
-                body: {
-                  wrapper: getWrapperComp(dataSource, startIndex),
-                  row: RowComp,
-                },
-              }}
-            />
-            <div style={{ marginTop: 5, marginBottom: 5 }}>{pager}</div>
-            {sources.map((column, key) => {
-              //专门用来承接对Column的状态管理
-              if (!isColumnComponent(column.schema)) return;
-              return React.createElement(RecursionField, {
-                name: column.name,
-                schema: column.schema,
-                onlyRenderSelf: true,
-                key,
-              });
-            })}
-            {addition}
-          </ArrayBase>
-        </div>
-      )}
-    </ArrayTablePagination>
-  );
-});
-
-ArrayTable.displayName = "ArrayTable";
-
-ArrayTable.Column = () => {
-  return <Fragment />;
-};
-
-ArrayBase.mixin(ArrayTable);
-
-const Addition: ArrayBaseMixins["Addition"] = (props) => {
-  const array = ArrayBase.useArray();
-  const { totalPage = 0, pageSize = 10, changePage, showPagination } = usePagination();
-  return (
-    <ArrayBase.Addition
-      {...props}
-      onClick={(e) => {
-        // 如果添加数据后将超过当前页，则自动切换到下一页
-        const total = array?.field?.value.length || 0;
-        if (showPagination && total === totalPage * pageSize + 1 && isFn(changePage)) {
-          changePage(totalPage + 1);
-        }
-        props.onClick?.(e);
-      }}
-    />
-  );
-};
-ArrayTable.Addition = Addition;
-
-export default ArrayTable;

package/src/components/ArrayTable/style.less

@@ -1,53 +0,0 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
-
-@array-table-prefix-cls: ~'@{ant-prefix}-formily-array-table';
-
-.@{array-table-prefix-cls} {
-  .@{array-table-prefix-cls}-pagination {
-    display: flex;
-    justify-content: center;
-
-    .@{array-table-prefix-cls}-status-select.has-error {
-      .@{ant-prefix}-select-selector {
-        border-color: @error-color !important;
-      }
-    }
-  }
-
-  .@{ant-prefix}-table {
-    table {
-      overflow: hidden;
-    }
-
-    td {
-      visibility: visible;
-
-      .@{ant-prefix}-formily-item:not(.@{ant-prefix}-formily-item-feedback-layout-popover) {
-        margin-bottom: 0 !important;
-
-        .@{ant-prefix}-formily-item-help {
-          position: absolute;
-          font-size: 12px;
-          top: 100%;
-          background: #fff;
-          width: 100%;
-          margin-top: 3px;
-          padding: 3px;
-          z-index: 1;
-          border-radius: 3px;
-          box-shadow: 0 0 10px #eee;
-          animation: none;
-          transform: translateY(0);
-          opacity: 1;
-        }
-      }
-    }
-  }
-
-  .@{array-table-prefix-cls}-sort-helper {
-    background: #fff;
-    border: 1px solid #eee;
-    z-index: 10;
-  }
-}

package/src/components/ArrayTable/style.ts

@@ -1,7 +0,0 @@
-import 'antd/lib/table/style/index'
-import 'antd/lib/button/style/index'
-import 'antd/lib/select/style/index'
-import 'antd/lib/space/style/index'
-import 'antd/lib/badge/style/index'
-import 'antd/lib/pagination/style/index'
-import './style.less'