@lingxiteam/ebe-utils 0.2.4 → 0.2.5

package/lib/h5public/src/components/factory/src/DAddressPicker/index.tsx

@@ -21,70 +21,54 @@ export interface MyDAddressPickerProps {
   disabled: boolean;
 }
 
-const MyDAddressPicker = LingxiForwardRef<any, MyDAddressPickerProps>(
-  (props, ref) => {
-    const {
-      dataSource,
-      title,
-      fieldProps,
-      fieldName,
-      defaultValue: newDefaultValue,
-      ...restProps
-    } = props;
-    const imperativeHandleRef = useRef({});
-    const defaultValue = useDefaultValue(newDefaultValue);
-    const formItem = useFormItem(
-      ref,
-      { ...props, defaultValue },
-      imperativeHandleRef.current,
-    );
-    const { isForm, error } = formItem;
-    // 应该加载的内置默认的服务
-    const shouldDefaultData = useMemo(
-      () => !dataSource || dataSource?.length === 0,
-      [dataSource?.length],
+const MyDAddressPicker = LingxiForwardRef<any, MyDAddressPickerProps>((props, ref) => {
+  const { dataSource, title, fieldProps, fieldName, defaultValue: newDefaultValue, ...restProps } = props;
+  const imperativeHandleRef = useRef({});
+  const defaultValue = useDefaultValue(newDefaultValue);
+  const formItem = useFormItem(ref, { ...props, defaultValue }, imperativeHandleRef.current);
+  const { isForm, error } = formItem;
+  // 应该加载的内置默认的服务
+  const shouldDefaultData = useMemo(() => !dataSource || dataSource?.length === 0, [dataSource?.length]);
+  if (!isForm) {
+    return (
+      <AddressPicker
+        {...restProps}
+        fieldProps={fieldProps || fieldName}
+        title={title}
+        defaultValue={defaultValue}
+        shouldDefaultData={shouldDefaultData}
+        ref={ref}
+        imperativeHandleRef={imperativeHandleRef}
+        dataSource={dataSource}
+        formItem={formItem}
+      />
     );
-    if (!isForm) {
-      return (
+  }
+  return (
+    <FormItem>
+      <Form.DFormField
+        name={fieldProps || fieldName}
+        initialValue={defaultValue}
+        valuePropName="defaultValue"
+        rules={formItem.getRules()}
+        params={{ formFlag: true, hidden: formItem.visible }} // 统一由AddressPicker组件的hidden校验
+      >
         <AddressPicker
           {...restProps}
           fieldProps={fieldProps || fieldName}
-          title={title}
+          dataSource={dataSource}
           defaultValue={defaultValue}
+          title={title}
           shouldDefaultData={shouldDefaultData}
           ref={ref}
+          error={error}
           imperativeHandleRef={imperativeHandleRef}
-          dataSource={dataSource}
           formItem={formItem}
         />
-      );
-    }
-    return (
-      <FormItem>
-        <Form.DFormField
-          name={fieldProps || fieldName}
-          initialValue={defaultValue}
-          valuePropName="defaultValue"
-          rules={formItem.getRules()}
-          params={{ formFlag: true, hidden: formItem.visible }} // 统一由AddressPicker组件的hidden校验
-        >
-          <AddressPicker
-            {...restProps}
-            fieldProps={fieldProps || fieldName}
-            dataSource={dataSource}
-            defaultValue={defaultValue}
-            title={title}
-            shouldDefaultData={shouldDefaultData}
-            ref={ref}
-            error={error}
-            imperativeHandleRef={imperativeHandleRef}
-            formItem={formItem}
-          />
-        </Form.DFormField>
-      </FormItem>
-    );
-  },
-);
+      </Form.DFormField>
+    </FormItem>
+  );
+});
 
 MyDAddressPicker.displayName = 'addressPicker';
 

package/lib/h5public/src/components/factory/src/DAddressPicker/utils.ts

@@ -1,13 +1,8 @@
 import _ from 'lodash';
 
-export const isEmptyStaticData = (props: {
-  attr: any;
-  data: any;
-  options: any;
-}) => !props.attr && !props.data && !props.options;
+export const isEmptyStaticData = (props: { attr: any; data: any; options: any }) => !props.attr && !props.data && !props.options;
 
-export const getAreaItemById = (id: string, data: any[] = []) =>
-  data.find((item) => item.value === id);
+export const getAreaItemById = (id: string, data: any[] = []) => data.find(item => item.value === id);
 
 export const findAreaPage = async (alias: any, commonFetch: any) => {
   return commonFetch('post', '/lcdp/area/findAreaPage', {
@@ -24,29 +19,20 @@ export const findAreaPage = async (alias: any, commonFetch: any) => {
   });
 };
 
-export const findAreaByCode = async (
-  params: any,
-  alias: any,
-  commonFetch: any,
-) => {
-  return commonFetch('post', '/lcdp/area/findAreaByCode', params).then(
-    (res: any) =>
-      (res || []).map((item: { divisionName: any; divisionCode: any }) => ({
-        ...item,
-        [alias?.label || 'label']: item.divisionName,
-        [alias?.value || 'value']: item.divisionCode,
-      })),
+export const findAreaByCode = async (params: any, alias: any, commonFetch: any) => {
+  return commonFetch('post', '/lcdp/area/findAreaByCode', params).then((res: any) =>
+    (res || []).map((item: { divisionName: any; divisionCode: any }) => ({
+      ...item,
+      [alias?.label || 'label']: item.divisionName,
+      [alias?.value || 'value']: item.divisionCode,
+    }))
   );
 };
 
-export const findAreaNameWithStaticData = (
-  staticData: any[] = [],
-  ids = [],
-  alias: any,
-) => {
+export const findAreaNameWithStaticData = (staticData: any[] = [], ids = [], alias: any) => {
   let targetData = _.cloneDeep(staticData);
   const target: any[] = [];
-  ids.forEach((id) => {
+  ids.forEach(id => {
     if (targetData?.length > 0) {
       const item =
         targetData.find((data: any) => {
@@ -79,7 +65,7 @@ export const setPickerValue = (
   callback: any = () => {},
   data: any[],
   alias: any,
-  commonFetch: any,
+  commonFetch: any
 ) => {
   const findAreaNameByCode = (divisionCodeList: any) => {
     if (divisionCodeList?.length) {
@@ -88,29 +74,21 @@ export const setPickerValue = (
           divisionCodeList,
         },
         alias,
-        commonFetch,
+        commonFetch
       ).then((result: any[]) => {
         // @ts-ignore
-        const label = result.map(
-          (item: { label: any }) => item[alias?.label || 'label'],
-        );
+        const label = result.map((item: { label: any }) => item[alias?.label || 'label']);
         // @ts-ignore
-        const value = result.map(
-          (item: { value: any }) => item[alias?.value || 'value'],
-        );
+        const value = result.map((item: { value: any }) => item[alias?.value || 'value']);
         if (label.length === value.length) {
           callback(
             {
               // @ts-ignore
-              label: result.map(
-                (item: { label: any }) => item[alias?.label || 'label'],
-              ),
+              label: result.map((item: { label: any }) => item[alias?.label || 'label']),
               // @ts-ignore
-              value: result.map(
-                (item: { value: any }) => item[alias?.value || 'value'],
-              ),
+              value: result.map((item: { value: any }) => item[alias?.value || 'value']),
             },
-            result,
+            result
           );
         }
       });
@@ -122,11 +100,7 @@ export const setPickerValue = (
     if (shouldDefaultData) {
       findAreaNameByCode(divisionCodeList);
     } else {
-      const areaName = findAreaNameWithStaticData(
-        data,
-        divisionCodeList,
-        alias,
-      );
+      const areaName = findAreaNameWithStaticData(data, divisionCodeList, alias);
       if (areaName.length === divisionCodeList.length) {
         callback({
           label: areaName,

package/lib/h5public/src/components/factory/src/DCheckbox/index.tsx

@@ -16,37 +16,17 @@ export interface MyDCheckboxProps extends UseFormItemProps {
 }
 
 const DCheckbox = LingxiForwardRef<any, MyDCheckboxProps>((props, ref) => {
-  const {
-    defaultValue,
-    onChange,
-    dataSource,
-    getEngineApis,
-    min,
-    max,
-    ...restProps
-  } = props;
+  const { defaultValue, onChange, dataSource, getEngineApis, min, max, ...restProps } = props;
   const { getLocale } = getEngineApis?.() || {};
-  const {
-    disabled,
-    val,
-    getRules,
-    onInputChange,
-    required,
-    readOnly,
-    visible,
-  } = useFormItem(
+  const { disabled, val, getRules, onInputChange, required, readOnly, visible } = useFormItem(
     ref,
     {
       ...props,
       defaultValue: useDefaultValue(defaultValue),
     },
     {
-      setDataWithLabelAndValue: (params: {
-        dataSource: any[];
-        labelKey?: string;
-        valueKey?: string;
-      }) => {
-        const temDataSoure = params.dataSource?.map((item) => {
+      setDataWithLabelAndValue: (params: { dataSource: any[]; labelKey?: string; valueKey?: string }) => {
+        const temDataSoure = params.dataSource?.map(item => {
           if (params.labelKey && params.valueKey) {
             if (item[params.labelKey]) {
               return {
@@ -59,7 +39,7 @@ const DCheckbox = LingxiForwardRef<any, MyDCheckboxProps>((props, ref) => {
         });
         setData(temDataSoure);
       },
-    },
+    }
   );
 
   const [data, setData] = React.useState<any[]>([]);
@@ -85,10 +65,7 @@ const DCheckbox = LingxiForwardRef<any, MyDCheckboxProps>((props, ref) => {
           disabled={disabled}
           onChange={(v: any[]) => onInputChange(v)}
           readonly={readOnly}
-          getLocale={(
-            t: string,
-            tempValue: Record<string, any> | undefined,
-          ) => {
+          getLocale={(t: string, tempValue: Record<string, any> | undefined) => {
             return getLocale?.(`DCheckbox.${t}`, '', tempValue);
           }}
         />

package/lib/h5public/src/components/factory/src/DForm/index.tsx

@@ -1,19 +1,9 @@
-import type {
-  IDynamicFormProps,
-  Store,
-  ValidateErrorEntity,
-} from '@lingxiteam/dform';
+import type { IDynamicFormProps, Store, ValidateErrorEntity } from '@lingxiteam/dform';
 import DynamicForm from '@lingxiteam/dform';
 import { LingxiForwardRef } from '@lingxiteam/types';
 import { useDebounceFn } from 'ahooks';
 import { merge } from 'lodash';
-import React, {
-  useEffect,
-  useImperativeHandle,
-  useMemo,
-  useRef,
-  useState,
-} from 'react';
+import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { useCreation, useDeepCompareEffect } from '../utils/ahooks';
 import { useDynamicData } from '../utils/dynamicUtils/DynamicContext';
 import { DFormContext } from '../utils/form';
@@ -25,8 +15,7 @@ import transformProps from './transformProps';
 import { useDForm } from './useDForm';
 import { useFormStatus } from './useFormStatus';
 
-export interface MyDFormProps
-  extends Omit<IDynamicFormProps, 'onValuesChange'> {
+export interface MyDFormProps extends Omit<IDynamicFormProps, 'onValuesChange'> {
   formWrapperProps: any;
   version: string;
   style: React.CSSProperties;
@@ -115,7 +104,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
     },
     {
       wait: 20,
-    },
+    }
   );
   const {
     form,
@@ -165,7 +154,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       resetFields: () => {
         const values = form.getFieldsValue();
         const obj: any = {};
-        Object.keys(values).forEach((key) => {
+        Object.keys(values).forEach(key => {
           obj[key] = undefined;
         });
         form.setFieldsValue(obj);
@@ -180,11 +169,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
           throw errorInfo;
         });
       },
-      getFieldsValue: async (
-        onSuccess: () => void,
-        onFail: () => void,
-        isFormList = false,
-      ) => {
+      getFieldsValue: async (onSuccess: () => void, onFail: () => void, isFormList = false) => {
         if (typeof onSuccess === 'function') {
           resultFunRef.current.onSuccess = onSuccess;
         }
@@ -193,9 +178,9 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
         }
         submitTypeRef.current = '0';
         if (formListRef.current && !isFormList) {
-          const actions = Object.keys(formListRef.current || {}).map((key) =>
+          const actions = Object.keys(formListRef.current || {}).map(key =>
             // @ts-ignore
-            formListRef.current[key].childFormGetFieldsValue(),
+            formListRef.current[key].childFormGetFieldsValue()
           );
           const formData = await Promise.all(actions);
           formData.forEach((data: any) => {
@@ -209,7 +194,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       },
       form,
     }),
-    [status],
+    [status]
   );
 
   /**
@@ -222,11 +207,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
   useImperativeHandle(ref, () => ({
     isFormList: props.isFormList,
     version,
-    submit: async (
-      onSuccess: () => void,
-      onFail: () => void,
-      isFormList = false,
-    ) => {
+    submit: async (onSuccess: () => void, onFail: () => void, isFormList = false) => {
       if (typeof onSuccess === 'function') {
         resultFunRef.current.onSuccess = onSuccess;
       }
@@ -235,9 +216,9 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       }
       submitTypeRef.current = '0';
       if (formListRef.current && !isFormList) {
-        const actions = Object.keys(formListRef.current || {}).map((key) =>
+        const actions = Object.keys(formListRef.current || {}).map(key =>
           // @ts-ignore
-          formListRef.current[key].childFormSubmit(),
+          formListRef.current[key].childFormSubmit()
         );
         const formData = await Promise.all(actions);
         formData.forEach((data: any) => {
@@ -247,18 +228,14 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       form.submit();
     },
     getChildRelation: () => formChildRelation.current,
-    submitByCode: async (
-      onSuccess: () => void,
-      onFail: () => void,
-      isFormList = false,
-    ) => {
+    submitByCode: async (onSuccess: () => void, onFail: () => void, isFormList = false) => {
       formCodeFunRef.current.onSuccess = onSuccess;
       formCodeFunRef.current.onFail = onFail;
       submitTypeRef.current = '1';
       if (formListRef.current && !isFormList) {
-        const actions = Object.keys(formListRef.current || {}).map((key) =>
+        const actions = Object.keys(formListRef.current || {}).map(key =>
           // @ts-ignore
-          formListRef.current[key].childFormSubmit(),
+          formListRef.current[key].childFormSubmit()
         );
         const formData = await Promise.all(actions);
         formData.forEach((data: any) => {
@@ -267,11 +244,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       }
       form.submit();
     },
-    getFieldsValueByCode: async (
-      onSuccess: () => void,
-      onFail: () => void,
-      isFormList = false,
-    ) => {
+    getFieldsValueByCode: async (onSuccess: () => void, onFail: () => void, isFormList = false) => {
       if (typeof onSuccess === 'function') {
         formCodeFunRef.current.onSuccess = onSuccess;
       }
@@ -280,9 +253,9 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       }
       submitTypeRef.current = '1';
       if (formListRef.current && !isFormList) {
-        const actions = Object.keys(formListRef.current || {}).map((key) =>
+        const actions = Object.keys(formListRef.current || {}).map(key =>
           // @ts-ignore
-          formListRef.current[key].childFormGetFieldsValue(),
+          formListRef.current[key].childFormGetFieldsValue()
         );
         const formData = await Promise.all(actions);
         formData.forEach((data: any) => {
@@ -401,7 +374,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       ...props,
       src: imgSrc,
     },
-    viewRef,
+    viewRef
   );
   const MyDForm = DynamicForm as any;
   return visible ? (
@@ -423,20 +396,13 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
         },
       }}
     >
-      <div
-        style={{ ...restStyle, ...style }}
-        {...formWrapperProps}
-        className={`dynamic-form-wrapper ${className}`}
-      >
+      <div style={{ ...restStyle, ...style }} {...formWrapperProps} className={`dynamic-form-wrapper ${className}`}>
         <MyDForm
           {...restProps}
           itemHasStar={itemHasStar}
           lineStyle={lineStyle}
           onValuesChange={(values: any) => {
-            const { success = false, errorObj } = resetErrorField(
-              errorValues,
-              values,
-            );
+            const { success = false, errorObj } = resetErrorField(errorValues, values);
             if (success) setErrorValues(errorObj);
             DebounceFnRun(values, form.getFieldsValue());
           }}

package/lib/h5public/src/components/factory/src/DForm/useFormStatus.tsx

@@ -8,11 +8,7 @@ export type FormStatusType = {
   [key in StatusType]?: unknown;
 };
 
-const useSubscriptionStatus = (options: {
-  run: (type: StatusType, v: unknown) => void;
-  type: StatusType;
-  listened: unknown;
-}) => {
+const useSubscriptionStatus = (options: { run: (type: StatusType, v: unknown) => void; type: StatusType; listened: unknown }) => {
   const { run, type, listened } = options;
   useUpdateEffect(() => {
     if (!isUndefined(listened)) {

package/lib/h5public/src/components/factory/src/DForm/useMonitor.ts

@@ -17,7 +17,7 @@ const useMonitor = () => {
    * 移除监听事件
    */
   const removeListener = useCallback((fn: MonitorFn) => {
-    const index = monitor.findIndex((v) => v === fn);
+    const index = monitor.findIndex(v => v === fn);
     if (index > -1) {
       monitor.splice(index, 1);
     }
@@ -27,7 +27,7 @@ const useMonitor = () => {
    * 执行监听事件
    */
   const execListeners = useCallback((v: unknown, type: StatusType) => {
-    monitor.forEach((fn) => fn(v, type));
+    monitor.forEach(fn => fn(v, type));
   }, []);
 
   return {

package/lib/h5public/src/components/factory/src/DGroup/CustomBtn.tsx

@@ -14,16 +14,8 @@ interface CustomBtnProps {
   isEngine?: boolean;
   getEngineApis?: EngineBaseProps['getEngineApis'];
 }
-const CustomBtn: React.FC<CustomBtnProps> = (props) => {
-  const {
-    customCode,
-    icon,
-    title,
-    isIcon,
-    onClick,
-    isEngine = false,
-    getEngineApis,
-  } = props;
+const CustomBtn: React.FC<CustomBtnProps> = props => {
+  const { customCode, icon, title, isIcon, onClick, isEngine = false, getEngineApis } = props;
   const [dangerHTML, setDangerHTML] = useState('');
 
   const {
@@ -42,38 +34,29 @@ const CustomBtn: React.FC<CustomBtnProps> = (props) => {
     tempDOM.id = '__ICON_TYPE_ID__';
     tempDOM.style.display = 'none';
     document.body.appendChild(tempDOM);
-    ReactDOM.render(
-      <Icon {...props} getEngineApis={getEngineApis} />,
-      tempDOM,
-      () => {
-        const htmlText = tempDOM.innerHTML;
+    ReactDOM.render(<Icon {...props} getEngineApis={getEngineApis} />, tempDOM, () => {
+      const htmlText = tempDOM.innerHTML;
 
-        if (Array.isArray(customCode) && customCode.length) {
-          // 兼容旧数据 原先获取弹窗的数据是取数组的格式
-          const codeStr = customCode.join('');
-          const targetStr = codeStr.replace('{{code}}', htmlText);
-          setDangerHTML(targetStr);
-        } else if (customCode?.tVal) {
-          // 改造之后，取的数据则是实际可以添加条件的函数
-          if (isEngine) {
-            let targetStr = '';
-            // 自定义渲染函数
-            if (customCode?.tVal && typeof customCode.tVal === 'string') {
-              targetStr = customCode?.tVal.replace(
-                '{{code}}',
-                htmlText.replace(/"/g, '\\"'),
-              );
-            }
-            setDangerHTML(targetStr);
-          } else {
-            const targetStr = customCode?.valueArr
-              .join('')
-              .replace('{{code}}', htmlText);
-            setDangerHTML(targetStr);
+      if (Array.isArray(customCode) && customCode.length) {
+        // 兼容旧数据 原先获取弹窗的数据是取数组的格式
+        const codeStr = customCode.join('');
+        const targetStr = codeStr.replace('{{code}}', htmlText);
+        setDangerHTML(targetStr);
+      } else if (customCode?.tVal) {
+        // 改造之后，取的数据则是实际可以添加条件的函数
+        if (isEngine) {
+          let targetStr = '';
+          // 自定义渲染函数
+          if (customCode?.tVal && typeof customCode.tVal === 'string') {
+            targetStr = customCode?.tVal.replace('{{code}}', htmlText.replace(/"/g, '\\"'));
           }
+          setDangerHTML(targetStr);
+        } else {
+          const targetStr = customCode?.valueArr.join('').replace('{{code}}', htmlText);
+          setDangerHTML(targetStr);
         }
-      },
-    );
+      }
+    });
     document.querySelector('#__ICON_TYPE_ID__')?.remove();
     return '';
   };