@cloudbase/weda-ui 3.5.3 → 3.6.0

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

@@ -0,0 +1,10 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useContext } from 'react';
+import { createContext } from '../../../utils/global-context';
+const FormWidgetContext = createContext(null, 'FormWidgetContext');
+export function FormWidgetProvider({ children, $widget, }) {
+    return (_jsx(FormWidgetContext.Provider, { value: $widget, children: children }));
+}
+export function useFormWidget() {
+    return useContext(FormWidgetContext);
+}

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

@@ -1,5 +1,5 @@
 import type { CommonPropsType } from '../../types';
-export declare function getFormDataFromItemMap(formItemMap: Map<string, CommonPropsType['$widget']>, formType: string): Record<string, unknown>;
+export declare function getFormDataFromItemMap(formItemMap: Map<string, Array<CommonPropsType['$widget']>>, formType: string): Record<string, unknown>;
 export declare function getErrorObjectFromValidateResult(errObj: Record<string, Array<{
     message: string;
     format?: string;

package/dist/web/components/wd-form/form-utils.js

@@ -1,22 +1,26 @@
 import lodashSet from 'lodash.set';
-function getFormDetailValueIsNull({ formData, formItemMap }) {
+function getFormDetailValueIsNull({ formData, formItemMap, }) {
     const formDetailList = [];
-    formItemMap.forEach((item, name) => {
-        var _a, _b;
-        if (((_b = (_a = item.getConfig) === null || _a === void 0 ? void 0 : _a.call(item)) === null || _b === void 0 ? void 0 : _b.componentType) === 'formdetail') {
-            formDetailList.push(name);
-        }
+    formItemMap.forEach((items, name) => {
+        items.forEach((item) => {
+            var _a, _b;
+            if (((_b = (_a = item.getConfig) === null || _a === void 0 ? void 0 : _a.call(item)) === null || _b === void 0 ? void 0 : _b.componentType) === 'formdetail') {
+                formDetailList.push(name);
+            }
+        });
     });
     const arr = formDetailList.filter((i) => !Object.keys(formData).find((j) => i === j));
     return arr;
 }
 export function getFormDataFromItemMap(formItemMap, formType) {
     const formData = {};
-    formItemMap.forEach((item, name) => {
-        var _a, _b, _c;
-        if (((_b = (_a = item.getConfig) === null || _a === void 0 ? void 0 : _a.call(item)) === null || _b === void 0 ? void 0 : _b.componentType) !== 'formdetail') {
-            lodashSet(formData, name, (_c = item === null || item === void 0 ? void 0 : item.getValue) === null || _c === void 0 ? void 0 : _c.call(item));
-        }
+    formItemMap.forEach((items, name) => {
+        items.forEach((item) => {
+            var _a, _b, _c;
+            if (((_b = (_a = item.getConfig) === null || _a === void 0 ? void 0 : _a.call(item)) === null || _b === void 0 ? void 0 : _b.componentType) !== 'formdetail') {
+                lodashSet(formData, name, (_c = item === null || item === void 0 ? void 0 : item.getValue) === null || _c === void 0 ? void 0 : _c.call(item));
+            }
+        });
     });
     const result = getFormDetailValueIsNull({ formData, formItemMap });
     // 编辑或查看场景，提交表单时，若子表单内容为空，则赋值为空

package/dist/web/components/wd-form/hooks/use-remote-value.d.ts

@@ -6,7 +6,7 @@ import type { LiteralUnion } from 'type-fest';
  * 从数据源拉值
  *
  */
-export declare function useRemoteValue({ formType, _id, dataSourceName, methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields, eventsRef, }: Pick<WdFromProps, 'appCloud' | '_id' | 'dataSourceName' | 'formType' | 'methodGetItem' | 'paramGetItem'> & {
+export declare function useRemoteValue({ formType, _id, dataSourceName, methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields, eventsRef, datasourceType, value, }: Pick<WdFromProps, 'appCloud' | '_id' | 'dataSourceName' | 'formType' | 'methodGetItem' | 'value' | 'paramGetItem' | 'datasourceType'> & {
     isDataModel: boolean;
     allSelectFields: Record<string, string[]>;
 } & {
@@ -18,9 +18,9 @@ export declare function useRemoteValue({ formType, _id, dataSourceName, methodGe
     error: any;
     loadingStatus: "loading" | "hidden" | "done";
 };
-export declare function useInitValueFromRemote(dataSourceProfile: any, fetchedInitialValues: any): import("swr/_internal").SWRResponse<{}, any, Required<{
+export declare function useInitValueFromRemote(dataSourceType: WdFromProps['datasourceType'], dataSourceProfile: any, fetchedInitialValues: any): import("swr/_internal").SWRResponse<any, any, {
     onError(err: any): void;
-}>>;
+}>;
 type useRemoteParamsFromValueParams = {
     dataSourceProfile: {
         schema: Record<string, any>;

package/dist/web/components/wd-form/hooks/use-remote-value.js

@@ -6,6 +6,7 @@ import { useTimeoutEffect } from '@react-hookz/web';
 import useSWR from 'swr';
 import { emptyObject } from '../../../utils/constant';
 import { WdCompError } from '../../../utils/error';
+import useDebouncedCallback from '../../../utils/hooks/use-debounced-callback';
 const LOADING_THRESHOLD = 1000;
 const formTypeWithInitValue = ['edit', 'read'];
 const logger = debug('wd-form:remote-values');
@@ -17,7 +18,7 @@ const logger = debug('wd-form:remote-values');
 export function useRemoteValue({ formType, _id, dataSourceName, 
 // methodCreate,
 // methodUpdate,
-methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields = emptyObject, eventsRef, }) {
+methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields = emptyObject, eventsRef, datasourceType, value, }) {
     // const platform = usePlatform();
     const onInitialValuesError = useCallback((err) => {
         console.error(err);
@@ -48,7 +49,13 @@ methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields = emptyObjec
         }
         return true;
     }, [_id, dataSourceName, formType, isDataModel, methodGetItem, paramGetItem]);
+    const { querySuccess: triggerQuerySuccessEvent, queryEmpty, queryFail, } = eventsRef.current;
+    // eslint-disable-next-line @typescript-eslint/no-magic-numbers -- 试了一下大概300 -400毫秒
+    const querySuccess = useDebouncedCallback(triggerQuerySuccessEvent, 500);
     const { data: remoteValue, error, isLoading, mutate, } = useSWR(() => {
+        if (datasourceType === 'expression') {
+            return { value, datasourceType };
+        }
         if (!whetherNeedToFetchInitValue) {
             return null;
         }
@@ -62,7 +69,9 @@ methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields = emptyObjec
             isDataModel,
             methodGetItem,
             paramGetItem,
-            allSelectFields: Object.keys(allSelectFields).reduce((acc, key) => {
+            allSelectFields: Object.keys(allSelectFields)
+                .filter((item) => !item.includes('[')) // 避免出现 {\"select\":{\"$master\":true,\"gzjl[0].gl\":{\"name\":true}},
+                .reduce((acc, key) => {
                 acc[key] = allSelectFields[key].reduce((fieldAcc, field) => {
                     fieldAcc[field] = true;
                     return fieldAcc;
@@ -70,10 +79,14 @@ methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields = emptyObjec
                 return acc;
             }, {}),
             fetcher: isDataModel ? appCloud.callDataSource : appCloud.callConnector,
+            datasourceType,
         };
-    }, async ({ dataSourceName, _id, isDataModel, allSelectFields }) => {
+    }, async (params) => {
         var _a, _b, _c, _d;
-        const { querySuccess, queryEmpty, queryFail } = eventsRef.current;
+        const { dataSourceName, _id, isDataModel, allSelectFields, value, datasourceType, } = params;
+        if (datasourceType === 'expression') {
+            return value !== null && value !== void 0 ? value : {};
+        }
         if (isDataModel) {
             try {
                 const initValue = await appCloud.callDataSource({
@@ -145,7 +158,7 @@ methodGetItem, paramGetItem, appCloud, isDataModel, allSelectFields = emptyObjec
     });
     // 1 秒后仍在loading 才显示 loading
     useTimeoutEffect(() => {
-        setLoadingStatus(isLoading ? 'loading' : 'done');
+        setLoadingStatus(isLoading && !remoteValue ? 'loading' : 'done');
     }, LOADING_THRESHOLD);
     useEffect(() => {
         if (isLoading === false && remoteValue) {
@@ -170,12 +183,14 @@ const SINGLE_SELECT_FORMATS = [
     'one-one-r',
 ];
 const MULTI_SELECT_FORMATS = ['many-many', 'one-many'];
-export function useInitValueFromRemote(dataSourceProfile, fetchedInitialValues) {
+export function useInitValueFromRemote(dataSourceType, dataSourceProfile, fetchedInitialValues) {
     return useSWR(() => {
-        if (dataSourceProfile && fetchedInitialValues) {
-            logger.debug('datasourceProfile', dataSourceProfile, fetchedInitialValues);
+        if ((dataSourceType === 'expression' || dataSourceProfile) &&
+            fetchedInitialValues) {
+            logger.debug('datasourceProfile', dataSourceProfile, fetchedInitialValues, dataSourceType);
             return [
                 'useInitValueFromRemote',
+                dataSourceType,
                 dataSourceProfile,
                 fetchedInitialValues,
             ];
@@ -183,6 +198,9 @@ export function useInitValueFromRemote(dataSourceProfile, fetchedInitialValues)
         return null;
     }, () => {
         logger.debug(dataSourceProfile, fetchedInitialValues);
+        if (dataSourceType === 'expression') {
+            return fetchedInitialValues;
+        }
         const result = Object.keys(fetchedInitialValues).reduce((acc, field) => {
             var _a, _b, _c;
             const format = (_c = (_b = (_a = dataSourceProfile.schema) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b[field]) === null || _c === void 0 ? void 0 : _c.format;

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

@@ -8,20 +8,25 @@ export type WdFromProps = CommonPropsType & DataType & EventsType & {
 };
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<CommonPropsType & import("type-fest").Simplify<{
     _id?: string;
+    value: Record<string, any>;
     formType: "create" | "edit" | "read";
     contentSlot: React.ReactNode;
     layout: "vertical" | "horizontal";
     dataSourceName: string;
-    datasourceType: "connector" | "custom-connector" | "model";
+    labelAlign: "left" | "right";
+    datasourceType: "connector" | "custom-connector" | "expression" | "model";
     methodGetItem: string;
     paramGetItem: Record<string, unknown>;
     methodCreate: string;
     methodUpdate: string;
+    isDisabledSubmit: boolean;
     formType_bind: boolean;
     fields: {
         name: string;
         componentType: string;
     }[];
+    colNum: never;
+    lgWidth: "lg" | "sm" | "md" | "hundred";
     initialValues: Record<string, unknown>;
 }> & import("type-fest").Simplify<import("../../../configs/type-utils").StaticEventsType<[{
     readonly title: "提交";