@hzab/form-render 1.7.18 → 1.7.19

package/package.json

@@ -1,72 +1,79 @@
-{
-  "name": "@hzab/form-render",
-  "version": "1.7.18",
-  "description": "",
-  "main": "src",
-  "scripts": {
-    "dev": "webpack serve -c ./config/webpack.config.js --env local",
-    "build": "webpack -c ./config/webpack.config.js --env production",
-    "test": "vitest run",
-    "test:watch": "vitest",
-    "test:coverage": "vitest run --coverage",
-    "version:alpha": "npm version prerelease --preid=alpha",
-    "publish:alpha": "npm publish --tag alpha",
-    "version:beta": "npm version prerelease --preid=beta",
-    "publish:beta": "npm publish --tag beta",
-    "version:patch": "npm version patch",
-    "version:minior": "npm version minor",
-    "version:major": "npm version major",
-    "publish:stable": "npm publish --access public"
-  },
-  "files": [
-    "src",
-    "docs",
-    "CHANGELOG.md"
-  ],
-  "keywords": [],
-  "author": "CaiYansong",
-  "license": "ISC",
-  "devDependencies": {
-    "@hzab/data-model": "^1.8.8",
-    "@hzab/permissions": "^0.1.1",
-    "@hzab/utils": "^1.0.16",
-    "@hzab/webpack-config": "0.0.12",
-    "@testing-library/jest-dom": "^5.17.0",
-    "@testing-library/react": "^12.1.5",
-    "@testing-library/user-event": "^13.5.0",
-    "@types/react": "^17.0.62",
-    "@types/react-dom": "^17.0.20",
-    "antd": "^4.24.12",
-    "dayjs": "1.11.10",
-    "eslint": "^8.30.0",
-    "jsdom": "^30.0.1",
-    "less": "^4.1.3",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-router-dom": "^6.8.1",
-    "typescript": "^4.9.4",
-    "vitest": "^4.1.10"
-  },
-  "peerDependencies": {
-    "@hzab/utils": ">=1.0.6",
-    "antd": "4.x",
-    "axios": ">=1.6.2",
-    "react": ">=16.8.0",
-    "react-dom": ">=16.8.0"
-  },
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@formily/core": "2.3.1",
-    "@formily/react": "2.3.1",
-    "@formily/reactive-react": "2.3.1",
-    "@turf/turf": "^6.5.0",
-    "@wangeditor/editor": "^5.1.23",
-    "@wangeditor/editor-for-react": "^1.0.6",
-    "ajv": "^8.12.0",
-    "c-formily-antd": "^2.3.1",
-    "nanoid": "^3.3.7"
-  },
-  "directories": {
-    "src": "src"
-  }
-}
+{
+  "name": "@hzab/form-render",
+  "version": "1.7.19",
+  "private": false,
+  "src-direct": true,
+  "type": "module",
+  "description": "基于 Formily 的动态表单渲染",
+  "license": "ISC",
+  "author": "CaiYansong",
+  "engines": {
+    "node": ">=24"
+  },
+  "main": "src",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "src",
+    "dist",
+    "docs",
+    "CHANGELOG.md"
+  ],
+  "sideEffects": [
+    "**/*.less"
+  ],
+  "peerDependencies": {
+    "antd": "4.x",
+    "axios": ">=1.4.0",
+    "react": ">=16.8.0",
+    "react-dom": ">=16.8.0"
+  },
+  "dependencies": {
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@ant-design/icons": "^4.8.0",
+    "@formily/core": "2.3.1",
+    "@formily/json-schema": "2.3.1",
+    "@formily/react": "2.3.1",
+    "@formily/reactive-react": "2.3.1",
+    "@formily/shared": "2.3.1",
+    "@turf/turf": "^6.5.0",
+    "@wangeditor/editor": "^5.1.23",
+    "@wangeditor/editor-for-react": "^1.0.6",
+    "ajv": "^8.12.0",
+    "c-formily-antd": "^2.3.1",
+    "classnames": "^2.3.2",
+    "dayjs": "^1.11.7",
+    "lodash": "^4.17.21",
+    "nanoid": "^3.3.7",
+    "@hzab/utils": ">=1.0.6"
+  },
+  "devDependencies": {
+    "@formily/core": "2.3.1",
+    "@formily/json-schema": "2.3.1",
+    "@formily/react": "2.3.1",
+    "@formily/reactive-react": "2.3.1",
+    "@formily/shared": "2.3.1",
+    "@types/lodash": "^4.17.12",
+    "@types/react": "^17.0.62",
+    "@types/react-dom": "^17.0.20",
+    "@vitest/coverage-v8": "4.1.10",
+    "antd": "^4.24.12",
+    "axios": "^1.4.0",
+    "c-formily-antd": "^2.3.1",
+    "happy-dom": "^20.11.1",
+    "less": "^4.1.3",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "typescript": "^5.9.3",
+    "vite": "^8.0.0",
+    "vitest": "^4.1.10",
+    "@hzab/typescript-config": "^0.0.0",
+    "@hzab/eslint-config": "^0.0.0",
+    "@hzab/vite-config": "^0.0.3-alpha.0"
+  },
+  "scripts": {
+    "build": "vite build && tsc -p tsconfig.build.json",
+    "typecheck": "tsc -p tsconfig.json",
+    "test": "vitest run --passWithNoTests",
+    "test:watch": "vitest"
+  }
+}

package/src/common/schema-handler.ts

@@ -50,7 +50,7 @@ export const bindOnChange = (schema, opt) => {
   let _schema = isCloneDeep ? _.cloneDeep(schema) : schema;
   _schema = _schema.schema || _schema;
   Object.keys(_schema.properties || {})?.forEach((key) => {
-    let item = _schema.properties[key];
+    const item = _schema.properties[key];
     if (!item) {
       return;
     }
@@ -216,7 +216,7 @@ export const handleSchemaStrVal = (strKey, schemaScope) => {
   if (!_str) {
     return strKey;
   }
-  let fn = getScopeKeyVal(_str, schemaScope);
+  const fn = getScopeKeyVal(_str, schemaScope);
   if (fn) {
     return fn;
   }

package/src/components/ArrayBase/index.tsx

@@ -1,11 +1,13 @@
 import { CopyOutlined, DeleteOutlined, DownOutlined, MenuOutlined, PlusOutlined, UpOutlined } from "@ant-design/icons";
-import { ArrayField } from "@formily/core";
-import { JSXComponent, Schema, useField, useFieldSchema } from "@formily/react";
+import type { ArrayField } from "@formily/core";
+import type { JSXComponent, Schema} from "@formily/react";
+import { useField, useFieldSchema } from "@formily/react";
 import { clone, isUndef, isValid } from "@formily/shared";
 import { Button, Popconfirm } from "antd";
-import { ButtonProps } from "antd/lib/button";
+import type { ButtonProps } from "antd/lib/button";
 import cls from "classnames";
-import React, { createContext, ReactNode, useContext } from "react";
+import type { ReactNode} from "react";
+import React, { createContext, useContext } from "react";
 import { SortableHandle, usePrefixCls } from "c-formily-antd/lib/__builtins__";
 
 export interface IArrayBaseAdditionProps extends ButtonProps {
@@ -88,7 +90,7 @@ export const getSchemaDefaultValue = (schema: Schema) => {
   if (schema?.type === "array") return [];
   if (schema?.type === "object") return {};
   if (schema?.type === "void") {
-    for (let key in schema.properties) {
+    for (const key in schema.properties) {
       const value = getSchemaDefaultValue(schema.properties[key]);
       if (isValid(value)) return value;
     }

package/src/components/ArrayCards/index.tsx

@@ -1,12 +1,13 @@
 import React from "react";
 import { Card, Empty } from "antd";
-import { CardProps } from "antd/lib/card";
-import { ArrayField } from "@formily/core";
+import type { CardProps } from "antd/lib/card";
+import type { ArrayField } from "@formily/core";
 import { useField, observer, useFieldSchema, RecursionField } from "@formily/react";
 import cls from "classnames";
-import { ISchema } from "@formily/json-schema";
+import type { ISchema } from "@formily/json-schema";
 import { usePrefixCls } from "c-formily-antd/lib/__builtins__";
-import { ArrayBase, ArrayBaseMixins, IArrayBaseProps } from "../ArrayBase";
+import type { ArrayBaseMixins, IArrayBaseProps } from "../ArrayBase";
+import { ArrayBase } from "../ArrayBase";
 
 export type ComposedArrayCards = React.FC<React.PropsWithChildren<CardProps & IArrayBaseProps>> & ArrayBaseMixins;
 

package/src/components/ArrayTable/index.tsx

@@ -1,15 +1,17 @@
 import React, { Fragment, useState, useRef, useEffect, createContext, useContext, useCallback } 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 type { PaginationProps } from "antd/lib/pagination";
+import type { TableProps, ColumnProps } from "antd/lib/table";
+import type { 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 type { GeneralField, FieldDisplayTypes, ArrayField } from "@formily/core";
+import type { ReactFC } from "@formily/react";
+import { useField, observer, useFieldSchema, RecursionField } from "@formily/react";
 import { isArr, isBool, isFn } from "@formily/shared";
-import { Schema } from "@formily/json-schema";
+import type { Schema } from "@formily/json-schema";
 import { usePrefixCls, SortableContainer, SortableElement } from "c-formily-antd/lib/__builtins__";
-import { ArrayBase, ArrayBaseMixins, IArrayBaseProps } from "../ArrayBase";
+import type { ArrayBaseMixins, IArrayBaseProps } from "../ArrayBase";
+import { ArrayBase } from "../ArrayBase";
 
 export interface ObservableColumnSource {
   field: GeneralField;

package/src/components/DatePicker/index.tsx

@@ -1,7 +1,7 @@
 import { useField, useFieldSchema, connect, mapProps } from "@formily/react";
 import { DatePicker as AntdDatePicker } from "c-formily-antd";
 
-import { DatePickerProps, RangePickerProps } from "antd/lib/date-picker";
+import type { DatePickerProps, RangePickerProps } from "antd/lib/date-picker";
 
 import { getParentValue } from "../../common/formily-utils";
 import { dateable } from "../../common/date-utils";

package/src/components/LocationListPicker/components/Popup/index.tsx

@@ -13,7 +13,7 @@ import "./index.less";
 export interface IPopupProps {
   formProps?: {
     schema;
-    initialValues?: Object;
+    initialValues?: object;
   };
   mountElement?: HTMLElement;
 }

package/src/components/LocationListPicker/index.tsx

@@ -10,7 +10,7 @@ import Popup from "./components/Popup";
 
 import AMapCom from "../LocationPicker/Map/AMap";
 import MapSearch from "../LocationPicker/components/MapSearch";
-import { MapUtils } from "../LocationPicker/Map/AMap/common/utils";
+import type { MapUtils } from "../LocationPicker/Map/AMap/common/utils";
 import { getAddress } from "../LocationPicker/servers";
 import { markerIconBase64 } from "../LocationPicker/assets/svg-icon";
 
@@ -172,8 +172,8 @@ export const LocationListPicker = observer((props) => {
 
   function getPolygonCenter(coordinate) {
     if (coordinate.length > 0) {
-      let features = turf.featureCollection(coordinate.map((item) => turf.point(item)));
-      let center = turf.center(features).geometry.coordinates;
+      const features = turf.featureCollection(coordinate.map((item) => turf.point(item)));
+      const center = turf.center(features).geometry.coordinates;
       return center;
     }
     return [];

package/src/components/LocationPicker/Map/AMap/common/utils.ts

@@ -35,12 +35,12 @@ export interface IMarker {
 export type setMarkerOptT = {
   id?: number | string;
   marker?: IMarker;
-  map?: Object;
-  AMap?: Object;
-  markerIconConf?: Object;
-  markerConf?: Object;
+  map?: object;
+  AMap?: object;
+  markerIconConf?: object;
+  markerConf?: object;
   onClick?: Function;
-  data?: Object;
+  data?: object;
 };
 
 export type markersT = {
@@ -141,7 +141,7 @@ export class MapUtils {
     }
 
     const position = new AMap.LngLat(lon, lat);
-    let _marker = marker || this.markers[id];
+    const _marker = marker || this.markers[id];
 
     // 创建 Marker 或修改位置
     if (_marker) {
@@ -343,7 +343,7 @@ export class MapUtils {
     // circles
 
     const center = new AMap.LngLat(lon, lat);
-    let _circle = circle || this.circles[id];
+    const _circle = circle || this.circles[id];
 
     // 创建 Marker 或修改位置
     if (_circle) {
@@ -412,8 +412,8 @@ export class MapUtils {
 
   getPolygonCenter(coordinate) {
     if (coordinate.length > 0) {
-      let features = turf.featureCollection(coordinate.map((item) => turf.point(item)));
-      let center = turf.center(features).geometry.coordinates;
+      const features = turf.featureCollection(coordinate.map((item) => turf.point(item)));
+      const center = turf.center(features).geometry.coordinates;
       return center;
     }
     return [];

package/src/components/LocationPicker/common/utils.ts

@@ -13,11 +13,11 @@
 export function getPropsValue(value = {}, opt) {
   const { lonKey = "longitude", latKey = "latitude", addrKey = "address", pointsKey = "points", rangeKey = "range" } = opt || {};
 
-  let lon = value[lonKey];
-  let lat = value[latKey];
-  let addr = value[addrKey];
-  let points = value[pointsKey];
-  let range =  value[rangeKey];
+  const lon = value[lonKey];
+  const lat = value[latKey];
+  const addr = value[addrKey];
+  const points = value[pointsKey];
+  const range =  value[rangeKey];
 
   const res = {
     lon,

package/src/components/LocationPicker/components/ModalContent/index.tsx

@@ -8,7 +8,7 @@ import Notice from "../Notice";
 import MapSearch from "../MapSearch";
 
 import { getCurrentPosition } from "../../../../common/location-utils";
-import { MapUtils } from "../../Map/AMap/common/utils";
+import type { MapUtils } from "../../Map/AMap/common/utils";
 import { getAddress } from "../../servers";
 import { getPropsValue } from "../../common/utils";
 
@@ -85,9 +85,9 @@ export const ModalContent = observer((props: any) => {
   useEffect(() => {
     if (isShowMode) {
       // mode === 'show' 的情况
-      let _lon = formatVal.lon;
-      let _lat = formatVal.lat;
-      let _points = formatVal.points;
+      const _lon = formatVal.lon;
+      const _lat = formatVal.lat;
+      const _points = formatVal.points;
       formatValRef.current = {
         ...formatVal,
       };
@@ -116,7 +116,7 @@ export const ModalContent = observer((props: any) => {
       // 处理弹窗展示数据回显逻辑
       let _lon = defaultLocation.lon;
       let _lat = defaultLocation.lat;
-      let _points = defaultLocation.points || [];
+      const _points = defaultLocation.points || [];
       let addr = defaultLocation.addr;
       if (formatVal.lon && formatVal.lat) {
         _lon = formatVal.lon;

package/src/components/PersonnelSelect/type.ts

@@ -1,5 +1,5 @@
 import type { SelectProps } from "antd/lib/select";
-import React from "react";
+import type React from "react";
 import type { AvatarProps } from "antd/lib/avatar";
 
 export interface ScrollPagination {

package/src/components/RichEditor/components/handleMobileRem/index.tsx

@@ -6,8 +6,8 @@ const HandleMobileRem: any = (props) => {
 
   const init = () => {
     const newStr = content.replace(/(\d+(\.\d+)?)px/g, function (match) {
-      var num = parseInt(match); // 提取数字部分
-      var remValue = num / (designWidth / 10); // 根据换算比例计算 rem 值
+      const num = parseInt(match); // 提取数字部分
+      const remValue = num / (designWidth / 10); // 根据换算比例计算 rem 值
       return remValue + 'rem';
     });
     (editorArticleRef.current as HTMLElement).innerHTML = newStr

package/src/components/RichEditor/components/handleMobileVw/index.tsx

@@ -10,7 +10,7 @@ const HandleMobileVw: any = (props) => {
 
   const init = () => {
     const newStr = content.replace(/(\d+(\.\d+)?)px/g, function (match) {
-      var num = parseInt(match); // 提取数字部分
+      const num = parseInt(match); // 提取数字部分
       return `${getClientRate(num, designWidth) * 100}vw`;
     });
     (editorArticleRef.current as HTMLElement).innerHTML = newStr

package/src/components/RichEditor/index.tsx

@@ -1,7 +1,7 @@
 import "@wangeditor/editor/dist/css/style.css"; // 引入 css
 import React, { useState, useEffect, useImperativeHandle, forwardRef } from "react";
 import { Editor as WangEditor, Toolbar } from "@wangeditor/editor-for-react";
-import { IDomEditor, IEditorConfig, IToolbarConfig } from "@wangeditor/editor";
+import type { IDomEditor, IEditorConfig, IToolbarConfig } from "@wangeditor/editor";
 import { getOssUploadRequest, getOfflineUploadRequest } from "../Upload/common/customRequest";
 import { handlePreviewUrls } from "../Upload/common/OfflineUpload";
 import "./index.less";

package/src/components/TreeCheckbox/common/utils.ts

@@ -25,7 +25,7 @@ export function getTabTableData(_treeData = [], opt: ITabTableDataOpt = {}) {
   const treeData = _.cloneDeep(_treeData);
   const { tabLevel = 0, _level = 0, fieldNames } = opt || {};
   const { value, children } = fieldNames || {};
-  let resList = [];
+  const resList = [];
   // 当前层级小于 tabLevel，视为当前层级渲染为 tab
   const isTab = _level < tabLevel;
 

package/src/components/Upload/common/handleIOFileList.ts

@@ -70,7 +70,7 @@ export interface IHandlerOpt {
   /** 子项数据模式： 格式化对象 | file 文件格式 | url 地址 | JSON 序列化字符串 */
   itemMode: "object" | "file" | "url" | "jsonStr";
   /** 预览配置参数 */
-  previewConfig?: Object;
+  previewConfig?: object;
   thumbnailParams?: string;
   /** maxCount === 1 时是否去除数组，直接返回内容 */
   isResRemoveArr: boolean;
@@ -153,7 +153,7 @@ export const handleInputItem = (data, opt: IHandlerOpt) => {
   }
   const { thumbnailParams } = opt;
 
-  let file = {
+  const file = {
     ...fileTpl,
   };
   // 对象字符串 转为 对象

package/src/components/Upload/uploader-input.jsx

@@ -4,7 +4,7 @@ import _ from "lodash";
 
 import ItemList from "./components/ItemList";
 
-import { handleMaxCount } from "@hzab/utils/upload/uploadUtils";
+import { handleMaxCount } from "@hzab/utils/src/upload/uploadUtils";
 import { handleInputFileList, handleOutputFileList } from "./common/handleIOFileList";
 import { handleOssUpload } from "./common/ossUpload";
 

package/src/components/Upload/uploader.jsx

@@ -68,7 +68,7 @@ export function Uploader({ onChange, ...props }) {
     isFileJson = false,
     thumbnailParams = { image_process: "resize,w_200" },
     readPretty,
-    afterUpload
+    afterUpload,
   } = props;
   const isPrivateStore =
     props.uploadParams?.fileAcl === "private" || props.ossOpt?.signatureParams?.fileAcl === "private";
@@ -120,7 +120,6 @@ export function Uploader({ onChange, ...props }) {
    * @returns
    */
   const handleChange = async ({ fileList, file, event }) => {
-
     setFileList(fileList);
     // 上传中不进行处理，结局 ossPromise 不存在的问题
     if (file.status !== "done") {
@@ -128,7 +127,6 @@ export function Uploader({ onChange, ...props }) {
     }
 
     let _files = [...fileList];
-
     // 取出异步 url
     for (let i = 0; i < _files.length; i++) {
       let _file = _files[i]?.originFileObj || _files[i];
@@ -158,16 +156,15 @@ export function Uploader({ onChange, ...props }) {
     });
 
     onChange && onChange?.(_files);
-    afterUpload && await afterUpload({
-      files: fileList,
-      urls: _files
-    })
 
-    setChecking(false);
+    // 上传完成后回调（同步自源仓 1.7.18）
+    if (afterUpload) {
+      await afterUpload({ files: fileList, urls: _files });
+    }
 
+    setChecking(false);
   };
 
-
   useEffect(() => {
     const list = handleInputFileList(value, {
       ...fileListConf,
@@ -345,7 +342,6 @@ export function Uploader({ onChange, ...props }) {
     // },
     ...(props || {}),
   };
-
   const isShowUploadBtn = useMemo(() => {
     if (disabled || readOnly || readPretty) {
       return null;
@@ -364,8 +360,6 @@ export function Uploader({ onChange, ...props }) {
       )
     ) : null;
   }, [maxCount, fileList, disabled, readOnly, readPretty, checking, btnText, listType]);
-
-
   return (
     <>
       <AUpload className="oss-uploader" {..._uploadProps}>

package/src/components/UserSelect/index.tsx

@@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from "react";
 import { Select as AntdSelect, Avatar, type AvatarProps } from "antd";
 import { useField, useFieldSchema } from "@formily/react";
 import { observer } from "@formily/reactive-react";
-import { SelectProps as AntdSelectProps } from "antd/lib/select";
+import type { SelectProps as AntdSelectProps } from "antd/lib/select";
 
 import styles from "./index.module.less";
 

package/src/global.d.ts

@@ -0,0 +1,12 @@
+export {};
+declare global {
+  interface Window {
+    AMap?: any;
+    _AMapLoaderTemp?: any;
+    _AMapSecurityConfig?: { securityJsCode?: string };
+    formRenderPCGlobalServeConfig?: Record<string, any>;
+    // 下潜进 @hzab/utils 源码（node10）时会 typecheck 到 utils 的全局，需在此声明。
+    _$offlineSignatureRes?: any;
+    formilyGlobalComponents?: Record<string, any>;
+  }
+}

package/src/index.tsx

@@ -39,7 +39,7 @@ import { bindOnChange } from "./common/schema-handler";
 
 import "./index.less";
 
-const antdComponents = {
+const antdComponents: any = {
   Form,
   FormItem,
   DatePicker,
@@ -70,7 +70,7 @@ const antdComponents = {
 
 const FormRender = forwardRef((props: any, parentRef) => {
   /** schema scope 解决父级无 schema Scope 导致 scope 对象刷新的问题 */
-  const schemaScopeRef = useRef<{ _$tempData: Object }>({
+  const schemaScopeRef = useRef<{ _$tempData: object }>({
     scenario: "form-render",
     _$tempData: {},
     ...props.schemaScope,

package/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />