@cloudbase/weda-ui 3.19.0 → 3.20.1

package/dist/web/components/formdetail/index.js

@@ -1,9 +1,9 @@
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-import { useEffect, forwardRef, useImperativeHandle, useState, useCallback, useRef, } from 'react';
-import { useResizeObserver, useDebouncedEffect } from '@react-hookz/web';
+import { useEffect, forwardRef, useImperativeHandle, useState, useCallback, useRef } from 'react';
+import { useResizeObserver } from '@react-hookz/web';
 import { WdFormItem } from '../wd-form-item';
 import classNames from '../../utils/classnames';
-import { usePlatform, randomStr, isInIde } from '../../utils/platform';
+import { usePlatform, randomStr } from '../../utils/platform';
 import isObjectEqual from '../../utils/isObjectEqual';
 import { useFormInputTrait, useParentForm } from '../form-input-hooks';
 import { FormDetailStatusContext } from '../../utils/widget-api';
@@ -45,9 +45,7 @@ export const reorderContext = (data, name, isPureArray) => data.map((i, index) =
     Object.keys(i).forEach((j) => {
         var _a;
         if ((_a = item[j]) === null || _a === void 0 ? void 0 : _a.name) {
-            item[j].name = isPureArray
-                ? `${name}[${index}]`
-                : `${name}[${index}].${j}`;
+            item[j].name = isPureArray ? `${name}[${index}]` : `${name}[${index}].${j}`;
         }
     });
     item.index = index;
@@ -65,7 +63,7 @@ export const newContextItem = (childFormItem, name, isPureArray, parent) => {
     });
     return mock;
 };
-export const changeHandle = ({ type, name, data, childFormItem, isPureArray, params, parent, }) => {
+export const changeHandle = ({ type, name, data, childFormItem, isPureArray, params, parent }) => {
     switch (type) {
         case 'add': {
             const mock = newContextItem(childFormItem, name, isPureArray, parent);
@@ -118,9 +116,8 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
     });
     const tableRef = useRef(null);
     const [isTableView, setIsTableView] = useState(false);
-    const [detailValue, setDetailValue] = useState([]);
+    const [detailValue, setDetailValue] = useState(props.value || []);
     const [contextData, setContextData] = useState([]);
-    const [isInit, setIsInit] = useState(false);
     const [childFormItem, setChildFormItem] = useState([]);
     const [hasScroll, setHasScroll] = useState(false);
     const platform = usePlatform();
@@ -163,6 +160,9 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
         }
         const mock = newContextItem(childFormItem, name, isPureArray, parent);
         let data = (initialValues === null || initialValues === void 0 ? void 0 : initialValues.length) ? initialValues : [mock];
+        if (!(childFormItem === null || childFormItem === void 0 ? void 0 : childFormItem.length)) {
+            data = [];
+        }
         // 新的明细组件，开放初始值，根据初始值设置上下文
         if (isWdFormDetail) {
             data = initialValues;
@@ -194,30 +194,29 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
             setChildFormItem(childFormItem);
         }
     }, [initDetailValue, isPureArray, name, (_a = parent === null || parent === void 0 ? void 0 : parent.dataSourceProfile) === null || _a === void 0 ? void 0 : _a.name]);
-    const setFormDetailValue = useCallback((value) => {
-        if (!isObjectEqual(value, detailValue) && childFormItem.length > 0) {
+    const setFormDetailValue = useCallback((value, _childFormItem = childFormItem) => {
+        if (!isObjectEqual(value, detailValue) && _childFormItem.length > 0) {
             setDetailValue(value || []);
             init(value || [], isWdFormDetail);
-            setIsInit(true);
+            // setIsInit(true);
         }
     }, [childFormItem, detailValue, init, isWdFormDetail]);
     // 初始化context的值
     useEffect(() => {
         logger.debug('initDetailValue', initDetailValue);
-        setFormDetailValue(initDetailValue);
+        let _childFormItem = childFormItem;
+        if ((_childFormItem === null || _childFormItem === void 0 ? void 0 : _childFormItem.length) === 0) {
+            _childFormItem = getChildFormItem({
+                isPureArray,
+                name,
+                parent,
+                defaultValue: initDetailValue,
+            });
+        }
+        setFormDetailValue(initDetailValue, _childFormItem);
         // 只有initDetailValue的值改变的时候才执行
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [initDetailValue]);
-    useDebouncedEffect(() => {
-        var _a;
-        // 子表单默认值变化时，若form值不同步，则主动同步（默认值为变量的情况）
-        if (isInit &&
-            detailValue &&
-            !isObjectEqual((_a = parent === null || parent === void 0 ? void 0 : parent.value) === null || _a === void 0 ? void 0 : _a[name], detailValue)) {
-            parent.__setValueImmediate__({ [name]: detailValue }, false);
-            setIsInit(false);
-        }
-    }, [detailValue, isInit, name], 15);
     useEffect(() => {
         var _a;
         const childFormItem = getChildFormItem({
@@ -228,11 +227,12 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
         });
         setChildFormItem(childFormItem);
         // 只有在编辑器里,或存在初始值的时候,或新明细组件（wdFormDetail），才初始化明细单项
-        if (isInIde() || hasInitValue || isWdFormDetail) {
+        if (hasInitValue || isWdFormDetail) {
             setDetailValue(initDetailValue || []);
             init(initDetailValue, isWdFormDetail);
         }
         else {
+            setDetailValue([]);
             (_a = events === null || events === void 0 ? void 0 : events.onDataChange) === null || _a === void 0 ? void 0 : _a.call(events, { data: [] });
         }
         // 组件卸载时触发
@@ -261,10 +261,7 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
     }, [_onChange, childFormItem, isPureArray]);
     const onChange = useCallback((type, params) => {
         var _a;
-        if (disabled ||
-            readOnly ||
-            !(fieldAuth === null || fieldAuth === void 0 ? void 0 : fieldAuth.includes('w')) ||
-            (parent === null || parent === void 0 ? void 0 : parent.formType) === 'read') {
+        if (disabled || readOnly || !(fieldAuth === null || fieldAuth === void 0 ? void 0 : fieldAuth.includes('w')) || (parent === null || parent === void 0 ? void 0 : parent.formType) === 'read') {
             return;
         }
         let data;
@@ -291,9 +288,9 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
             parent,
         });
         if (!isObjectEqual(data, contextData)) {
-            updateFormDetailValue(data);
             setContextData(data);
             (_a = events === null || events === void 0 ? void 0 : events.onDataChange) === null || _a === void 0 ? void 0 : _a.call(events, { data });
+            updateFormDetailValue(data);
         }
     }, [
         disabled,
@@ -353,18 +350,7 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
             disabled,
             readOnly,
         };
-    }, [
-        innerHandle,
-        onChange,
-        isTableView,
-        name,
-        detailValue,
-        label,
-        visible,
-        disabled,
-        readOnly,
-        setFormDetailValue,
-    ]);
+    }, [innerHandle, onChange, isTableView, name, detailValue, label, visible, disabled, readOnly, setFormDetailValue]);
     // useEffect(() => {
     //   const initArr = lodashGet(parent, 'initialValues.name', null);
     //   logger.debug('initialValue', initArr, name);
@@ -413,6 +399,6 @@ const FormDetailCom = forwardRef(function FormDetail(props, ref) {
     const layout = platform === 'h5' ? 'vertical' : _currentLayout;
     const formItemProps = { ...props, classRoot, layout, isWdFormDetail };
     // 组件规范化后再考虑是否改动
-    return isWdFormDetail ? (_jsx(WdFormItem, { ...formItemProps, children: formDetailRender() })) : (formDetailRender());
+    return isWdFormDetail ? _jsx(WdFormItem, { ...formItemProps, children: formDetailRender() }) : formDetailRender();
 });
 export default FormDetailCom;

package/dist/web/components/richText/index.js

@@ -83,7 +83,7 @@ initialContent, placeholder, iconPack, maxSize, cloudPath, visible, }) {
         cloudToHttpsMap: {},
     });
     const previousValueRef = React.useRef();
-    const onDataChange = function (value) {
+    const onDataChange = React.useCallback((value) => {
         var _a;
         if (previousValueRef.current !== value) {
             previousValueRef.current = value;
@@ -97,7 +97,7 @@ initialContent, placeholder, iconPack, maxSize, cloudPath, visible, }) {
                 }
             }
         }
-    };
+    }, [events, onChange]);
     const isSizeAccept = (file) => {
         if (file.size > maxSize * 1024 * 1024) {
             alertErrorMessage({
@@ -313,8 +313,14 @@ initialContent, placeholder, iconPack, maxSize, cloudPath, visible, }) {
                 ref.current.editor.setHTML(tempValue);
             }
             window.setTimeout(() => {
+                var _a, _b;
                 if (currentCursor) {
-                    ref.current.editor.selection(currentCursor, currentCursor);
+                    try {
+                        (_b = (_a = ref.current) === null || _a === void 0 ? void 0 : _a.editor) === null || _b === void 0 ? void 0 : _b.selection(currentCursor, currentCursor);
+                    }
+                    catch {
+                        // 避免组件销毁，执行报错
+                    }
                 }
             }, 0);
         }

package/dist/web/components/wd-form/contexts/form-field-arr-context.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+interface FormFieldArrContext {
+    isInformArrContainer?: boolean;
+    namePath?: string[];
+    status?: 'edit' | 'disabled' | 'readOnly';
+    getFieldValue?: (arg: {
+        namePath: string[];
+        initialValue?: any;
+    }) => any;
+    setFieldValue?: (arg: {
+        namePath: string[];
+        value?: any;
+    }) => void;
+}
+interface FormFieldArrContextProviderProps extends FormFieldArrContext {
+    children?: React.ReactNode;
+}
+declare const FormFieldArrContext: React.Context<FormFieldArrContext>;
+export declare function FormFieldArrProvider({ children, isInformArrContainer, namePath, status, setFieldValue, getFieldValue, }: FormFieldArrContextProviderProps): JSX.Element;
+export declare function useFormFieldArr(): FormFieldArrContext | null;
+export {};

package/dist/web/components/wd-form/contexts/form-field-arr-context.js

@@ -0,0 +1,10 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useContext, useMemo } from 'react';
+import { createContext } from '../../../utils/global-context';
+const FormFieldArrContext = createContext(null, 'FormFieldArrContext');
+export function FormFieldArrProvider({ children, isInformArrContainer, namePath, status, setFieldValue, getFieldValue, }) {
+    return (_jsx(FormFieldArrContext.Provider, { value: useMemo(() => ({ status, isInformArrContainer, namePath, setFieldValue, getFieldValue }), [status, isInformArrContainer, namePath, setFieldValue, getFieldValue]), children: children }));
+}
+export function useFormFieldArr() {
+    return useContext(FormFieldArrContext);
+}

package/dist/web/components/wd-form/contexts/form-field-context.d.ts

@@ -0,0 +1,19 @@
+import React from 'react';
+interface FormFieldContext {
+    setFieldValue: (arg: {
+        namePath: string[];
+        value?: any;
+    }) => void;
+    getFieldValue: (arg: {
+        namePath: string[];
+        initialValue?: any;
+    }) => any;
+    isInformContainer?: boolean;
+}
+interface FormFieldContextProviderProps extends FormFieldContext {
+    children?: React.ReactNode;
+}
+export declare const FormFieldContext: React.Context<FormFieldContext>;
+export declare function FormFieldProvider({ children, isInformContainer, setFieldValue, getFieldValue, }: FormFieldContextProviderProps): JSX.Element;
+export declare function useFormField(): FormFieldContext | null;
+export {};

package/dist/web/components/wd-form/contexts/form-field-context.js

@@ -0,0 +1,10 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useContext, useMemo } from 'react';
+import { createContext } from '../../../utils/global-context';
+export const FormFieldContext = createContext(null, 'FormFieldContext');
+export function FormFieldProvider({ children, isInformContainer, setFieldValue, getFieldValue, }) {
+    return (_jsx(FormFieldContext.Provider, { value: useMemo(() => ({ setFieldValue, isInformContainer, getFieldValue }), [setFieldValue, isInformContainer, getFieldValue]), children: children }));
+}
+export function useFormField() {
+    return useContext(FormFieldContext);
+}

package/dist/web/components/wd-form/contexts/form-field-obj-context.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+interface FormFieldObjContext {
+    namePath?: string[];
+    status?: 'edit' | 'disabled' | 'readOnly';
+    objType?: string;
+}
+interface FormFieldObjContextProviderProps extends FormFieldObjContext {
+    children?: React.ReactNode;
+}
+declare const FormFieldObjContext: React.Context<FormFieldObjContext>;
+export declare function FormFieldObjProvider({ children, namePath, status, objType }: FormFieldObjContextProviderProps): JSX.Element;
+export declare function useFormFieldObj(): FormFieldObjContext | null;
+export {};

package/dist/web/components/wd-form/contexts/form-field-obj-context.js

@@ -0,0 +1,10 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useContext, useMemo } from 'react';
+import { createContext } from '../../../utils/global-context';
+const FormFieldObjContext = createContext(null, 'FormFieldObjContext');
+export function FormFieldObjProvider({ children, namePath, status, objType }) {
+    return (_jsx(FormFieldObjContext.Provider, { value: useMemo(() => ({ objType, status, namePath }), [objType, status, namePath]), children: children }));
+}
+export function useFormFieldObj() {
+    return useContext(FormFieldObjContext);
+}

package/dist/web/components/wd-form/index.d.ts

@@ -14,17 +14,17 @@ declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponen
     layout: "vertical" | "horizontal";
     dataSourceName: string;
     labelAlign: "left" | "right";
-    isDisabledSubmit: boolean;
+    datasourceType: "connector" | "custom-connector" | "model" | "expression";
+    methodGetItem: string;
+    paramGetItem: Record<string, unknown>;
     methodCreate: string;
     methodUpdate: string;
+    isDisabledSubmit: boolean;
     formType_bind: boolean;
-    datasourceType: "connector" | "model" | "expression" | "custom-connector";
     fields: {
         name: string;
         componentType: string;
     }[];
-    methodGetItem: string;
-    paramGetItem: Record<string, unknown>;
     colNum: never;
     lgWidth: "lg" | "sm" | "md" | "hundred";
     initialValues: Record<string, unknown>;