@lingxiteam/ebe-utils 0.5.11 → 0.6.2

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

@@ -1,19 +1,20 @@
-import type { IDynamicFormProps, Store, ValidateErrorEntity } from '@lingxiteam/dform';
+import React, { useEffect, useImperativeHandle, useMemo, useState, useRef } from 'react';
 import DynamicForm from '@lingxiteam/dform';
+import type { IDynamicFormProps, ValidateErrorEntity, Store } 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 { useCreation, useDeepCompareEffect } from '../utils/ahooks';
-import { useDynamicData } from '../utils/dynamicUtils/DynamicContext';
 import { DFormContext } from '../utils/form';
-import { useListenToggleBoolean } from '../utils/hooks/useToggleBoolean';
 import { withTransformProps } from '../utils/withTransformProps';
-import useStyle from '../View/useStyle';
-import './index.less';
 import transformProps from './transformProps';
 import { useDForm } from './useDForm';
+import useStyle from '../View/useStyle';
+import './index.less';
+import { useDebounceFn } from 'ahooks';
 import { useFormStatus } from './useFormStatus';
+import { useDynamicData } from '../utils/dynamicUtils/DynamicContext';
+import { useCreation } from '../utils/ahooks';
+import { useListenToggleBoolean } from '../utils/hooks/useToggleBoolean';
+import { useDeepCompareEffect } from '../utils/ahooks';
+import { merge } from 'lodash';
 
 export interface MyDFormProps extends Omit<IDynamicFormProps, 'onValuesChange'> {
   formWrapperProps: any;
@@ -90,22 +91,19 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       valueChangeFnRef.current(values, form.getFieldsValue());
     }
   };
-  const { run: DebounceFnRun } = useDebounceFn(
-    (values: any, formValues: any) => {
-      formValuesChange(values, formValues);
-      // 上传一下动态数据里表单数据值改变方法
-      if (dynamicContext._innerDynamicDataContainer) {
-        const keys = Object.keys(values || {});
-        if (keys.length > 0) {
-          const name = keys[0];
-          dynamicContext.onFormChange(formCode!, name, values[name]);
-        }
+  const { run: DebounceFnRun } = useDebounceFn((values: any, formValues: any) => {
+    formValuesChange(values, formValues);
+    // 上传一下动态数据里表单数据值改变方法
+    if (dynamicContext._innerDynamicDataContainer) {
+      const keys = Object.keys(values || {});
+      if (keys.length > 0) {
+        const name = keys[0];
+        dynamicContext.onFormChange(formCode!, name, values[name]);
       }
-    },
-    {
-      wait: 20,
     }
-  );
+  }, {
+    wait: 20,
+  });
   const {
     form,
     submitTypeRef,
@@ -138,64 +136,62 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
     }
   }, [relationDataSource, compatConfig.dfromAllDisabled]);
 
+
   /**
    * 需要上传给动态数据容器的表单方法
    */
-  const formRefHandler = useCreation(
-    () => ({
-      // 设置禁用状态
-      setDisabled: (v: boolean | 'toggle') => {
-        run('disabled', v === 'toggle' ? !status.disabled : v);
-      },
-      // 设置只读状态
-      setReadOnly: (v: boolean | 'toggle') => {
-        run('readonly', v === 'toggle' ? !status.readonly : v);
-      },
-      resetFields: () => {
-        const values = form.getFieldsValue();
-        const obj: any = {};
-        Object.keys(values).forEach(key => {
-          obj[key] = undefined;
-        });
-        form.setFieldsValue(obj);
-      },
-      setFieldsValue: form.setFieldsValue,
+  const formRefHandler = useCreation(() => ({
+    // 设置禁用状态
+    setDisabled: (v: boolean | 'toggle') => {
+      run('disabled', v === 'toggle' ? !status.disabled : v);
+    },
+    // 设置只读状态
+    setReadOnly: (v: boolean | 'toggle') => {
+      run('readonly', v === 'toggle' ? !status.readonly : v);
+    },
+    resetFields: () => {
+      const values = form.getFieldsValue();
+      const obj: any = {};
+      Object.keys(values).forEach((key) => {
+        obj[key] = undefined;
+      });
+      form.setFieldsValue(obj);
+    },
+    setFieldsValue: form.setFieldsValue,
 
-      /**
-       * 校验并滚动到某字段
-       */
-      validateFormAndScroll: () => {
-        return form.validateFields().catch((errorInfo: any) => {
-          throw errorInfo;
+    /**
+   * 校验并滚动到某字段
+   */
+    validateFormAndScroll: () => {
+      return form.validateFields().catch((errorInfo: any) => {
+        throw errorInfo;
+      });
+    },
+    getFieldsValue: async (onSuccess: () => void, onFail: () => void, isFormList = false) => {
+      if (typeof onSuccess === 'function') {
+        resultFunRef.current.onSuccess = onSuccess;
+      }
+      if (typeof onFail === 'function') {
+        resultFunRef.current.onFail = onFail;
+      }
+      submitTypeRef.current = '0';
+      if (formListRef.current && !isFormList) {
+        const actions = Object.keys(formListRef.current || {}).map((key) =>
+          // @ts-ignore
+          formListRef.current[key].childFormGetFieldsValue(),
+        );
+        const formData = await Promise.all(actions);
+        formData.forEach((data: any) => {
+          Object.assign(formList, data);
         });
-      },
-      getFieldsValue: async (onSuccess: () => void, onFail: () => void, isFormList = false) => {
-        if (typeof onSuccess === 'function') {
-          resultFunRef.current.onSuccess = onSuccess;
-        }
-        if (typeof onFail === 'function') {
-          resultFunRef.current.onFail = onFail;
-        }
-        submitTypeRef.current = '0';
-        if (formListRef.current && !isFormList) {
-          const actions = Object.keys(formListRef.current || {}).map(key =>
-            // @ts-ignore
-            formListRef.current[key].childFormGetFieldsValue()
-          );
-          const formData = await Promise.all(actions);
-          formData.forEach((data: any) => {
-            Object.assign(formList, data);
-          });
-        }
-        const values = form.getFieldsValue();
-        Object.assign(values, formList);
-        resultFunRef.current.onSuccess(values);
-        return values;
-      },
-      form,
-    }),
-    [status]
-  );
+      }
+      const values = form.getFieldsValue();
+      Object.assign(values, formList);
+      resultFunRef.current.onSuccess(values);
+      return values;
+    },
+    form,
+  }), [status]);
 
   /**
    * 动态数据容器ref上报
@@ -204,6 +200,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
     dynamicContext.updateFormChildRef(formCode!, formRefHandler);
   }
 
+
   useImperativeHandle(ref, () => ({
     isFormList: props.isFormList,
     version,
@@ -216,9 +213,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) => {
@@ -233,9 +230,9 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       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) => {
@@ -253,9 +250,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) => {
@@ -310,7 +307,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
   const getAllError = (errorInfo: any) => {
     const { errorFields = [] } = errorInfo;
     const errorObj: any = {};
-    errorFields.forEach((item: { name: string[]; errors: any[] }) => {
+    errorFields.forEach((item: { name: string[]; errors: any[]; }) => {
       const [key] = item.name;
       const [err] = item.errors;
       errorObj[key] = err;
@@ -374,7 +371,7 @@ const DForm = LingxiForwardRef<any, MyDFormProps>((props, ref) => {
       ...props,
       src: imgSrc,
     },
-    viewRef
+    viewRef,
   );
   const MyDForm = DynamicForm as any;
   return visible ? (
@@ -396,7 +393,11 @@ 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}

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

@@ -1,5 +1,5 @@
-import { useForm } from '@lingxiteam/dform';
 import { useRef, useState } from 'react';
+import { useForm } from '@lingxiteam/dform';
 
 export const useDForm: any = () => {
   const [form] = useForm();
@@ -11,14 +11,14 @@ export const useDForm: any = () => {
     onSuccess: (e: any) => {},
     onFail: (e: any) => {},
   });
-  // // 重写setFieldsValue方法
-  // const originalSetFieldsValue = form.setFieldsValue;
-  // form.setFieldsValue = (values) => {
-  //   // 调用原始setFieldsValue方法
-  //   originalSetFieldsValue.call(form, values);
-  //   // 触发onValuesChange回调函数
-  //   formValuesChange(values, form.getFieldsValue())
-  // };
+    // // 重写setFieldsValue方法
+    // const originalSetFieldsValue = form.setFieldsValue;
+    // form.setFieldsValue = (values) => {
+    //   // 调用原始setFieldsValue方法
+    //   originalSetFieldsValue.call(form, values);
+    //   // 触发onValuesChange回调函数
+    //   formValuesChange(values, form.getFieldsValue())
+    // };
 
   // const { run } = useDebounceFn((values, target) => {
   //   formValuesChange(values, target.getFieldsValue());

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

@@ -1,14 +1,18 @@
-import { isUndefined } from 'lodash';
 import { useRef } from 'react';
-import { useUpdateEffect } from '../utils/ahooks';
-import { StatusType } from '../utils/form';
 import useMonitor from './useMonitor';
+import { StatusType } from '../utils/form';
+import { useUpdateEffect } from '../utils/ahooks';
+import { isUndefined } from 'lodash';
 
 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/DGroup/CustomBtn.tsx

@@ -1,8 +1,8 @@
-import { EngineBaseProps } from '@lingxiteam/types';
-import React, { useEffect, useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import ReactDOM from 'react-dom';
 import Icon from '../Icon';
 import { evalMyFunction } from '../utils';
+import { EngineBaseProps } from '@lingxiteam/types';
 import { useFuncExpExecute } from '../utils/hooks/useFuncExpExecute';
 
 interface CustomBtnProps {
@@ -14,7 +14,7 @@ interface CustomBtnProps {
   isEngine?: boolean;
   getEngineApis?: EngineBaseProps['getEngineApis'];
 }
-const CustomBtn: React.FC<CustomBtnProps> = props => {
+const CustomBtn: React.FC<CustomBtnProps> = (props) => {
   const { customCode, icon, title, isIcon, onClick, isEngine = false, getEngineApis } = props;
   const [dangerHTML, setDangerHTML] = useState('');
 

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

@@ -1,12 +1,12 @@
-import DynamicForm from '@lingxiteam/dform';
-import { LingxiForwardRef } from '@lingxiteam/types';
 import React, { useMemo } from 'react';
-import Icon from '../Icon';
-import CustomModule from '../utils/CustomModule';
+import DynamicForm from '@lingxiteam/dform';
 import { useFormItem } from '../utils/hooks/useFormItem';
+import Icon from '../Icon';
 import CustomBtn from './CustomBtn';
 import './index.less';
+import { LingxiForwardRef } from '@lingxiteam/types';
 import { isJSX } from './utils';
+import CustomModule from '../utils/CustomModule';
 
 const { Group } = DynamicForm;
 const prefixCls = 'lcdp-dgroup';
@@ -70,18 +70,23 @@ const DGroup = LingxiForwardRef<any, MyDGroupProps>((props, ref) => {
     //     />
     //   );
     // } else {
-    const { prefixIconType, prefixIconTheme, prefixIconIsIconFont, prefixIconFontAddress, prefixIconiconFile } = iconInfo;
+    const { prefixIconType, prefixIconTheme, prefixIconIsIconFont, prefixIconFontAddress, prefixIconiconFile } =
+      iconInfo;
     iconView = (
       <span className={`${prefixCls}-icon`}>
         {/** @ts-ignore */}
         <Icon
-          type={prefixIconType}
-          theme={prefixIconTheme}
-          isIconFont={prefixIconIsIconFont}
-          fontAddress={prefixIconFontAddress}
+          icon={{
+            isSystem: iconInfo.isSystem,
+            systemIconKey: iconInfo.systemIconKey,
+            type: prefixIconType,
+            theme: prefixIconTheme,
+            isIconFont: prefixIconIsIconFont,
+            fontAddress: prefixIconFontAddress,
+            iconFile: prefixIconiconFile,
+          }}
           name={props.name}
           getEngineApis={getEngineApis}
-          iconFile={prefixIconiconFile}
         />
       </span>
     );
@@ -92,11 +97,17 @@ const DGroup = LingxiForwardRef<any, MyDGroupProps>((props, ref) => {
     switch (titleIcon) {
       case 'vStyle':
       case 'hStyle':
-        return <span className={titleIcon === 'vStyle' ? `${prefixCls}-vStyle` : `${prefixCls}-hStyle`} />;
+        return (
+          <span
+            className={titleIcon === 'vStyle' ? `${prefixCls}-vStyle` : `${prefixCls}-hStyle`}
+          />
+        );
       case 'icon':
         return renderIcon(prefixIcon);
       case 'auto': // 自定义图片
-        return groupTitleImg ? <img src={groupTitleImg} className={`${prefixCls}-groupLeftView`} alt="" /> : null;
+        return groupTitleImg ? (
+          <img src={groupTitleImg} className={`${prefixCls}-groupLeftView`} alt="" />
+        ) : null;
       default:
         return null;
     }
@@ -106,13 +117,13 @@ const DGroup = LingxiForwardRef<any, MyDGroupProps>((props, ref) => {
       const showRowActions = rowActions?.filter(it => it?.checked !== false);
       return (
         <div className={`${prefixCls}-rigthView`}>
-          {showRowActions.map(item => {
+          {showRowActions.map((item) => {
             const { title, iconPos, icon, customStyle, customCode, isIcon, type } = item;
             let subTitle = title;
             if (subTitle && title.length > 4) {
               subTitle = `${title.substring(0, 4)}...`;
             }
-            let onClick: any = () => {};
+            let onClick: any = () => { };
             switch (type) {
               case 'detail':
                 onClick = onRowDetail;
@@ -126,11 +137,17 @@ const DGroup = LingxiForwardRef<any, MyDGroupProps>((props, ref) => {
               default:
                 break;
             }
-            const svgContent = (icon && icon?.iconFileInfo && icon?.iconFileInfo?.svgContent) || null;
+            const svgContent =
+              (icon && icon?.iconFileInfo && icon?.iconFileInfo?.svgContent) || null;
             let view = <></>;
 
             const iconView = (
-              <Icon {...icon} svgContent={svgContent} size={12} style={{ width: '12px', height: '12px' }} getEngineApis={getEngineApis} />
+              <Icon
+                icon={{ ...icon, svgContent }}
+                size={12}
+                style={{ width: '12px', height: '12px' }}
+                getEngineApis={getEngineApis}
+              />
             );
             if (iconPos === 'left') {
               view = (
@@ -184,7 +201,8 @@ const DGroup = LingxiForwardRef<any, MyDGroupProps>((props, ref) => {
                         code={customCode.tVal}
                         compProps={{
                           isIcon,
-                          icon: <Icon {...iconInfo} getEngineApis={getEngineApis} />,
+                          // @ts-ignore
+                          icon: <Icon icon={iconInfo} getEngineApis={getEngineApis} />,
                           title,
                         }}
                         sandBoxLoadModule={getEngineApis().sandBoxLoadModule}
@@ -233,7 +251,7 @@ const DGroup = LingxiForwardRef<any, MyDGroupProps>((props, ref) => {
           leftView={renderLeftView}
           extandPostion={extandPostion === 'header' ? 'top' : undefined}
           rightView={renderRigthView()}
-          extandChange={isShow => {
+          extandChange={(isShow) => {
             if (onChange) {
               onChange(isShow);
             }

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

@@ -1,18 +1,18 @@
+import React, { useState, useEffect } from 'react';
 import { MultiplePicker } from '@lingxiteam/dform';
 import { LingxiForwardRef } from '@lingxiteam/types';
-import React, { useEffect, useState } from 'react';
 import { DFormWrapper, FormItem } from '../BasicComponents';
-import { MyIconProps } from '../Icon';
-import useDefaultValue from '../utils/hooks/useDefaultValue';
+import { MyIconProps } from '../Icon/Icon';
 import { useFormItem, UseFormItemProps } from '../utils/hooks/useFormItem';
 import { withTransformProps } from '../utils/withTransformProps';
 import transformProps from './transformProps';
+import useDefaultValue from '../utils/hooks/useDefaultValue';
 
 export interface MyIMultiplePickerProps extends UseFormItemProps {
   regexp?: any[];
   dataSource?: any[];
   postfix?: any;
-  icon?: MyIconProps;
+  icon?:MyIconProps;
   postfixIconPosition?: string;
   iconColor?: string;
   valueType?: any;
@@ -25,30 +25,37 @@ export interface MyIMultiplePickerProps extends UseFormItemProps {
 const MyMultiplePicker = LingxiForwardRef<any, MyIMultiplePickerProps>((props, ref) => {
   const { defaultValue, onChange, dataSource, regexp, maxValueLength, getEngineApis, leftContent, rightContent, ...restProps } = props;
   const { getLocale } = getEngineApis?.() || {};
-  const { disabled, val, onInputChange, required, readOnly, visible } = useFormItem(
-    ref,
-    {
-      ...props,
-      defaultValue: useDefaultValue(defaultValue, restProps?.max),
-    },
-    {
-      setDataWithLabelAndValue: (params: { dataSource: any[]; labelKey?: string; valueKey?: string }) => {
-        const temDataSoure = params.dataSource?.map(item => {
-          if (params.labelKey && params.valueKey) {
-            if (item[params.labelKey]) {
-              return {
-                ...item,
-                label: item[params.labelKey],
-                value: item[params.valueKey],
-              };
-            }
+  const {
+    disabled,
+    val,
+    onInputChange,
+    required,
+    readOnly,
+    visible,
+  } = useFormItem(ref, {
+    ...props,
+    defaultValue: useDefaultValue(defaultValue, restProps?.max),
+  }, {
+    setDataWithLabelAndValue: (params: {
+      dataSource: any[];
+      labelKey?: string;
+      valueKey?: string;
+    }) => {
+      const temDataSoure = params.dataSource?.map((item) => {
+        if (params.labelKey && params.valueKey) {
+          if (item[params.labelKey]) {
+            return {
+              ...item,
+              label: item[params.labelKey],
+              value: item[params.valueKey],
+            };
           }
-          return item;
-        });
-        setData(temDataSoure);
-      },
-    }
-  );
+        }
+        return item;
+      });
+      setData(temDataSoure);
+    },
+  });
   const [data, setData] = useState<MyIMultiplePickerProps['dataSource']>([]);
   const dealProps = {
     icon: {

package/lib/h5public/src/components/factory/src/DatePicker/InnerDatePicker.tsx

@@ -1,10 +1,10 @@
-import React, { useCallback, useEffect, useImperativeHandle, useMemo, useState } from 'react';
-import { LingxiForwardRef } from '@lingxiteam/types';
+import React, { useState, useImperativeHandle, useMemo, useEffect, useCallback } from 'react';
+import { FormItem } from '../BasicComponents';
+import { toDate, subtractDate, dateToFormatter, useLocaleFormatter } from '../utils/date';
 import DatePicker from 'antd-mobile-5/es/components/date-picker';
 import Picker from 'antd-mobile-5/es/components/picker';
-import { FormItem } from '../BasicComponents';
-import { dateToFormatter, subtractDate, toDate, useLocaleFormatter } from '../utils/date';
 import { useToggleBoolean } from '../utils/hooks/useToggleBoolean';
+import { LingxiForwardRef } from '@lingxiteam/types';
 
 export interface MyDatePickerProps {
   name?: string;
@@ -14,9 +14,9 @@ export interface MyDatePickerProps {
   maxDate?: string;
   value?: string;
   onChange?: (e?: string) => void;
-  visible: boolean;
-  mode: 'datetime' | 'date' | 'month' | 'year' | 'time';
-  title: string;
+  visible: boolean,
+  mode: 'datetime' | 'date' | 'month' | 'year' | 'time',
+  title: string,
 }
 
 const MyDatePicker = LingxiForwardRef<any, MyDatePickerProps>((props, ref) => {
@@ -41,37 +41,29 @@ const MyDatePicker = LingxiForwardRef<any, MyDatePickerProps>((props, ref) => {
   const lanv = getLocaleEnv?.();
   const { showFormat: formatter } = useLocaleFormatter(newFormatter, lanv);
 
-  useImperativeHandle(ref, () => ({
-    visible: show,
-    setVisible: setShow,
-  }));
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      visible: show,
+      setVisible: setShow,
+    }),
+  );
 
   const labelRenderer = useCallback((type: string, data: number) => {
     switch (type) {
       case 'year':
-        return getLocale('DformRangePicker.year', `${data}年`, {
-          year: `${data}`,
-        });
+        return getLocale('DformRangePicker.year', `${data}年`, { year: `${data}` });
       case 'month':
-        return getLocale('DformRangePicker.month', `${data}月`, {
-          month: `${data}`,
-        });
+        return getLocale('DformRangePicker.month', `${data}月`, { month: `${data}` });
       case 'day':
-        return getLocale('DformRangePicker.day', `${data}日`, {
-          day: `${data}`,
-        });
+        return getLocale('DformRangePicker.day', `${data}日`, { day: `${data}` });
       case 'hour':
-        return getLocale('DformRangePicker.hour', `${data}时`, {
-          hour: `${data}`,
-        });
+        return getLocale('DformRangePicker.hour', `${data}时`, { hour: `${data}` });
       case 'minute':
-        return getLocale('DformRangePicker.minute', `${data}分`, {
-          minute: `${data}`,
-        });
+        return getLocale('DformRangePicker.minute', `${data}分`, { minute: `${data}` });
       case 'second':
-        return getLocale('DformRangePicker.second', `${data}秒`, {
-          second: `${data}`,
-        });
+        return getLocale('DformRangePicker.second', `${data}秒`, { second: `${data}` });
       default:
         return data;
     }
@@ -129,19 +121,11 @@ const MyDatePicker = LingxiForwardRef<any, MyDatePickerProps>((props, ref) => {
       const minutes = [];
       // eslint-disable-next-line no-plusplus
       for (let i = 0; i < 24; i++) {
-        hours.push({
-          label: getLocale('DformRangePicker.hour', `${i}时`, { hour: `${i}` }),
-          value: i,
-        });
+        hours.push({ label: getLocale('DformRangePicker.hour', `${i}时`, { hour: `${i}` }), value: i });
       }
       // eslint-disable-next-line no-plusplus
       for (let i = 0; i < 60; i++) {
-        minutes.push({
-          label: getLocale('DformRangePicker.minute', `${i}分`, {
-            minute: `${i}`,
-          }),
-          value: i,
-        });
+        minutes.push({ label: getLocale('DformRangePicker.minute', `${i}分`, { minute: `${i}` }), value: i });
       }
       setHourMinuteData([hours, minutes]);
 

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { LingxiForwardRef } from '@lingxiteam/types';
-import DformCustom from '../DformCustom';
 import InnerDatePicker from './InnerDatePicker';
+import DformCustom from '../DformCustom';
 
 const DatePicker = LingxiForwardRef<any, any>((props, ref) => {
   return (