@lingxiteam/ebe-utils 0.5.11 → 0.6.2

package/lib/h5public/src/components/factory/src/CardFooter/CardFooter.tsx

@@ -14,14 +14,23 @@ export interface MyCardFooterProps {
   customStyle?: any;
 }
 
+
 const CardFooter = AppForwardRef<MyCardFooterProps>((props, ref) => {
-  const { children, content = '', extra = '', cardType = '1', showFooter = true, style, isContainer, visible } = props;
+  const {
+    children,
+    content = '',
+    extra = '',
+    cardType = '1',
+    showFooter = true,
+    style,
+    isContainer,
+    visible,
+  } = props;
 
   if (!visible) {
     return <></>;
   }
-  if (!isContainer) {
-    // 兼容旧数据
+  if (!isContainer) { // 兼容旧数据
     return (
       <div className={`${prefixCls}-old-date-cell`}>
         <div>{content}</div>
@@ -31,11 +40,15 @@ const CardFooter = AppForwardRef<MyCardFooterProps>((props, ref) => {
   }
   return (
     <>
-      {showFooter ? (
-        <div className={`${cardType}` === '1' ? `${prefixCls}-draw-box-border` : `${prefixCls}-draw-box`} style={style}>
+      {
+      showFooter ?
+        <div
+          className={`${cardType}` === '1' ? `${prefixCls}-draw-box-border` : `${prefixCls}-draw-box`}
+          style={style}
+        >
           {children}
-        </div>
-      ) : null}
+        </div> : null
+    }
     </>
   );
 });

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { LingxiForwardRef } from '@lingxiteam/types';
-import type { MyCardFooterProps } from './CardFooter';
 import CardFooterLoader from './loader';
+import type { MyCardFooterProps } from './CardFooter';
 
 const CardFooter = LingxiForwardRef<unknown, MyCardFooterProps>((props, ref) => {
   return <CardFooterLoader {...props} />;

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

@@ -1,8 +1,8 @@
 /* eslint-disable consistent-return */
+import React, { useMemo, useState, useImperativeHandle, useRef } from 'react';
 import { LingxiForwardRef } from '@lingxiteam/types';
 import { Swiper } from 'antd-mobile-5';
 import classNames from 'classnames';
-import React, { useImperativeHandle, useMemo, useRef, useState } from 'react';
 import './index.less';
 
 export interface MyCarouselProps {
@@ -88,12 +88,7 @@ const MyCarousel = LingxiForwardRef<any, MyCarouselProps>((props, ref) => {
       if (swiperRef.current) {
         swiperRef.current.swipeNext();
       }
-      if (!children) {
-        return {
-          status: false,
-          msg: getLocale('Carousel.switchEmpty', '轮播图组件没有内容，无法切换'),
-        };
-      }
+      if (!children) return { status: false, msg: getLocale('Carousel.switchEmpty', '轮播图组件没有内容，无法切换') };
       if (showChildren) {
         if (infinite) {
           if (index === children.length - 1) {
@@ -102,10 +97,7 @@ const MyCarousel = LingxiForwardRef<any, MyCarouselProps>((props, ref) => {
           return { status: true, targetIndex: index + 1 };
         }
         if (index === children.length - 1) {
-          return {
-            status: false,
-            msg: getLocale('Carousel.isLast', '已是最后一项'),
-          };
+          return { status: false, msg: getLocale('Carousel.isLast', '已是最后一项') };
         }
         return { status: true, targetIndex: index + 1 };
       }
@@ -113,34 +105,18 @@ const MyCarousel = LingxiForwardRef<any, MyCarouselProps>((props, ref) => {
         if (index === data.length - 1) {
           return { status: true, targetIndex: 0, targetData: data[0] };
         }
-        return {
-          status: true,
-          targetIndex: index + 1,
-          targetData: data[index + 1],
-        };
+        return { status: true, targetIndex: index + 1, targetData: data[index + 1] };
       }
       if (index === data.length - 1) {
-        return {
-          status: false,
-          msg: getLocale('Carousel.isLast', '已是最后一项'),
-        };
+        return { status: false, msg: getLocale('Carousel.isLast', '已是最后一项') };
       }
-      return {
-        status: true,
-        targetIndex: index + 1,
-        targetData: data[index + 1],
-      };
+      return { status: true, targetIndex: index + 1, targetData: data[index + 1] };
     },
     swipePrev: () => {
       if (swiperRef.current) {
         swiperRef.current.swipePrev();
       }
-      if (!children) {
-        return {
-          status: false,
-          msg: getLocale('Carousel.switchEmpty', '轮播图组件没有内容，无法切换'),
-        };
-      }
+      if (!children) return { status: false, msg: getLocale('Carousel.switchEmpty', '轮播图组件没有内容，无法切换') };
       if (showChildren) {
         // 循环
         if (infinite) {
@@ -150,61 +126,32 @@ const MyCarousel = LingxiForwardRef<any, MyCarouselProps>((props, ref) => {
           return { status: true, targetIndex: index - 1 };
         }
         if (!index) {
-          return {
-            status: false,
-            msg: getLocale('Carousel.isFirst', '已是第一项'),
-          };
+          return { status: false, msg: getLocale('Carousel.isFirst', '已是第一项') };
         }
         return { status: true, targetIndex: index - 1 };
       }
       if (infinite) {
         if (!index) {
-          return {
-            status: true,
-            targetIndex: data.length - 1,
-            targetData: data[data.length - 1],
-          };
+          return { status: true, targetIndex: data.length - 1, targetData: data[data.length - 1] };
         }
-        return {
-          status: true,
-          targetIndex: index - 1,
-          targetData: data[index - 1],
-        };
+        return { status: true, targetIndex: index - 1, targetData: data[index - 1] };
       }
       if (!index) {
-        return {
-          status: false,
-          msg: getLocale('Carousel.isFirst', '已是第一项'),
-        };
+        return { status: false, msg: getLocale('Carousel.isFirst', '已是第一项') };
       }
-      return {
-        status: true,
-        targetIndex: index - 1,
-        targetData: data[index - 1],
-      };
+      return { status: true, targetIndex: index - 1, targetData: data[index - 1] };
     },
     swipeTo: (i: number) => {
       if (swiperRef.current) {
         swiperRef.current.swipeTo(i);
       }
-      if (!children) {
-        return {
-          status: false,
-          msg: getLocale('Carousel.switchEmpty', '轮播图组件没有内容，无法切换'),
-        };
-      }
+      if (!children) return { status: false, msg: getLocale('Carousel.switchEmpty', '轮播图组件没有内容，无法切换') };
       if (showChildren) {
         if (children[i]) return { status: true, targetIndex: i };
-        return {
-          status: false,
-          msg: getLocale('Carousel.noExist', '轮播图组件没有此项'),
-        };
+        return { status: false, msg: getLocale('Carousel.noExist', '轮播图组件没有此项') };
       }
       if (data[i]) return { status: true, targetIndex: i, targetData: data[i] };
-      return {
-        status: false,
-        msg: getLocale('Carousel.noExist', '轮播图组件没有此项'),
-      };
+      return { status: false, msg: getLocale('Carousel.noExist', '轮播图组件没有此项') };
     },
   }));
 
@@ -304,7 +251,8 @@ const MyCarousel = LingxiForwardRef<any, MyCarouselProps>((props, ref) => {
 
       if (
         childProps.children &&
-        ((isArray && !!childProps.children.length) || (!isArray && childProps.children.type && !!Object.keys(childProps.children).length))
+        ((isArray && !!childProps.children.length) ||
+          (!isArray && childProps.children.type && !!Object.keys(childProps.children).length))
       ) {
         const newChilds = React.Children.toArray(childProps?.children);
         if (isSwiper) {
@@ -360,7 +308,7 @@ const MyCarousel = LingxiForwardRef<any, MyCarouselProps>((props, ref) => {
         slideSize={mSlideSize}
         autoplayInterval={mAutoplayInterval}
         // autoplay={other}
-        onIndexChange={i => {
+        onIndexChange={(i) => {
           setIndex(i);
           if (onIndexChange) onIndexChange(i);
         }}

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

@@ -1,5 +1,5 @@
-import { LingxiForwardRef } from '@lingxiteam/types';
 import React from 'react';
+import { LingxiForwardRef } from '@lingxiteam/types';
 
 export interface MyConditionprops {
   visible?: boolean;

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

@@ -1,4 +1,4 @@
-import { AddressPicker, CASCADER_LOADING, IAddressPickerProps } from '@lingxiteam/dform';
+import { AddressPicker, IAddressPickerProps, CASCADER_LOADING } from '@lingxiteam/dform';
 import { LingxiForwardRef } from '@lingxiteam/types';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { DFormWrapper } from '../BasicComponents';
@@ -30,7 +30,7 @@ const LEVEL_FIRST_CODE = 'parentCode';
 const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref) => {
   const {
     defaultValue,
-    onChange = () => {},
+    onChange = () => { },
     shouldDefaultData,
     level,
     dataSource,
@@ -62,10 +62,10 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
   // 每一级节点的子数据
   const [valueToOptions, setValueToOptions] = useState({});
   const data = useMemo(() => {
-    const generate = (v: string, levelIndex: number) => {
+    const generate = (v: string, levelIndex:number) => {
       // @ts-ignore
       const options = valueToOptions[v];
-      if (level !== undefined && levelIndex > level - 1) {
+      if (level !== undefined && levelIndex > (level - 1)) {
         return undefined;
       }
       if ((Array.isArray(options) && options?.length === 0) || options === null) {
@@ -76,7 +76,7 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
         // 初始值回填时，查当前初始值末级数据，若不限制将导致末级的下一级也出现待加载
         return isLoading.current === v ? CASCADER_LOADING : undefined;
       }
-      return options.map((option: any) => ({
+      return options.map((option:any) => ({
         ...option,
         label: option[alias?.label || 'label'],
         value: option[alias?.value || 'value'],
@@ -87,7 +87,7 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
   }, [valueToOptions, alias, level]);
 
   const latestValueOptionRef = useRef<Record<string, any>>({});
-  const setLoading = (v: string, loading: boolean, res?: any[]) => {
+  const setLoading = (v:string, loading:boolean, res?:any[]) => {
     isLoading.current = loading ? v : '';
     setValueToOptions(pre => ({
       ...pre,
@@ -100,10 +100,10 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
   }, [valueToOptions]);
 
   // 从选项值中转换层级对象
-  const generateValueToOptionsFromDataSource = (source: any, prev: string, dataMap = {}) => {
+  const generateValueToOptionsFromDataSource = (source:any, prev:string, dataMap = {}) => {
     const preLevenCode = prev;
     const map: any = dataMap;
-    source.forEach((item: any) => {
+    source.forEach((item:any) => {
       if (!map[preLevenCode]) {
         map[preLevenCode] = [];
       }
@@ -129,10 +129,10 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
   }, [dataSource, alias]);
 
   // 值初始化时设置层级数据
-  const generateValueToOptionsFromLevel = (originData: any[], prev: string) => {
+  const generateValueToOptionsFromLevel = (originData:any[], prev:string) => {
     let prevLevelCode = prev;
     const map: any = {};
-    (originData || []).forEach((item: any) => {
+    (originData || []).forEach((item:any) => {
       if (!map[prevLevelCode]) {
         map[prevLevelCode] = [];
       }
@@ -142,36 +142,29 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
     setValueToOptions(map);
   };
 
-  const initPickerValue = (val: string[], changeFunc = setValue) => {
+  const initPickerValue = (val:string[], changeFunc = setValue) => {
     // 赋值/值更新时判断该值对应的层级是否已经加载，是的话不再进行设置
-    const checkIfReq = (v: string[]) => {
-      let preValueOpt: any = [];
-      return (v || []).every((item: string, index: number) => {
+    const checkIfReq = (v:string[]) => {
+      let preValueOpt:any = [];
+      return (v || []).every((item:string, index:number) => {
         if (index !== v?.length - 1) {
           preValueOpt = (latestValueOptionRef.current || {})[item];
           return !!preValueOpt;
         }
-        return !!preValueOpt?.find((c: any) => c.value === item);
+        return !!preValueOpt?.find((c:any) => c.value === item);
       });
     };
     if (val) {
       const defaultVal = val;
       if (Array.isArray(defaultVal)) {
         if (!checkIfReq(defaultVal)) {
-          setPickerValue(
-            shouldDefaultData,
-            defaultVal,
-            (valMap: any, curLevelData: any[]) => {
-              changeFunc(valMap);
-              // 根据值请求
-              if (curLevelData) {
-                generateValueToOptionsFromLevel(curLevelData, LEVEL_FIRST_CODE);
-              }
-            },
-            dataSource || [],
-            alias,
-            service?.commonFetch
-          );
+          setPickerValue(shouldDefaultData, defaultVal, (valMap: any, curLevelData: any[]) => {
+            changeFunc(valMap);
+            // 根据值请求
+            if (curLevelData) {
+              generateValueToOptionsFromLevel(curLevelData, LEVEL_FIRST_CODE);
+            }
+          }, dataSource || [], alias, service?.commonFetch);
         } else {
           // 已经存在层级数据，从层级中拼接label
           let preLevelCode = LEVEL_FIRST_CODE;
@@ -219,7 +212,7 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
   };
 
   const requestArea = async (values: any[] = [], isSetLoading = true) => {
-    let areaList: any = [];
+    let areaList:any = [];
     const parCode = values[values.length - 1];
     try {
       if (parCode) {
@@ -242,7 +235,7 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
     return areaList;
   };
 
-  const setServiceData = async (values: any[], isSetLoading = true) => {
+  const setServiceData = async(values: any[], isSetLoading = true) => {
     const { length } = values || [];
     if (length === 0) {
       // eslint-disable-next-line no-return-await
@@ -252,7 +245,7 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
     return await requestArea(values, isSetLoading);
   };
 
-  const onChangeLevel = async (values: any[], isSetLoading = true) => {
+  const onChangeLevel = async(values: any[], isSetLoading = true) => {
     // 默认选项值切换下一级时
     const parCode = values?.length ? values[values.length - 1] : undefined;
     // 设置了总层级数时，加载到对应层级后不再请求接口获取
@@ -284,9 +277,9 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
 
   // 切换tab面板时上级选中项值和当前tab选中项值
   // @ts-ignore
-  const handleOnTabsChange = (parLevelValues: any, curLevelValues: string[]) => {
+  const handleOnTabsChange = (parLevelValues:any, curLevelValues:string[]) => {
     // 设置了总层级数时，加载到对应层级后不再请求接口获取
-    if (level !== undefined && curLevelValues?.length >= level) {
+    if ((level !== undefined && curLevelValues?.length >= level)) {
       return;
     }
     // 切换层级的时候，重新查询数据
@@ -299,13 +292,13 @@ const MyDAddressPicker = LingxiForwardRef<any, AddressPickerProps>((props, ref)
   const finalPlaceholderList = useMemo(() => {
     if (Array.isArray(placeholderList)) {
       return placeholderList;
-    }
-    if (typeof placeholderList === 'string') {
+    } if (typeof placeholderList === 'string') {
       return (placeholderList as string).split(',');
     }
     return [];
   }, [placeholderList]);
 
+
   return (
     <DFormWrapper visible={visible} getEngineApis={props.getEngineApis}>
       <IAddressPicker

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

@@ -2,11 +2,11 @@ import { Form } from '@lingxiteam/dform';
 import { LingxiForwardRef } from '@lingxiteam/types';
 import React, { useMemo, useRef } from 'react';
 import { FormItem } from '../BasicComponents';
-import useDefaultValue from '../utils/hooks/useDefaultValue';
-import { useFormItem } from '../utils/hooks/useFormItem';
-import { withTransformProps } from '../utils/withTransformProps';
 import AddressPicker from './AddressPicker';
+import { withTransformProps } from '../utils/withTransformProps';
 import transformProps from './transformProps';
+import { useFormItem } from '../utils/hooks/useFormItem';
+import useDefaultValue from '../utils/hooks/useDefaultValue';
 
 export interface MyDAddressPickerProps {
   title: string;
@@ -16,8 +16,8 @@ export interface MyDAddressPickerProps {
   defaultValue?: any;
   fieldName?: string;
   placeholderList: any;
-  visible: boolean;
-  readOnly: boolean;
+  visible: boolean,
+  readOnly: boolean,
   disabled: boolean;
 }
 

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

@@ -1,22 +1,25 @@
 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', {
     pageNum: 1,
     pageSize: 1000,
     divisionLevel: '1',
-  }).then((res: any) => {
-    const { list = [] } = res || {};
-    return list.map((item: { divisionName: any; divisionCode: any }) => ({
-      ...item,
-      [alias?.label || 'label']: item.divisionName,
-      [alias?.value || 'value']: item.divisionCode,
-    }));
-  });
+  })
+    .then((res: any) => {
+      const { list = [] } = res || {};
+      return list.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) => {
@@ -25,14 +28,14 @@ export const findAreaByCode = async (params: any, alias: any, commonFetch: any)
       ...item,
       [alias?.label || 'label']: item.divisionName,
       [alias?.value || 'value']: item.divisionCode,
-    }))
+    })),
   );
 };
 
 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) => {
@@ -81,21 +84,18 @@ export const setPickerValue = (
         // @ts-ignore
         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']),
-              // @ts-ignore
-              value: result.map((item: { value: any }) => item[alias?.value || 'value']),
-            },
-            result
-          );
+          callback({
+            // @ts-ignore
+            label: result.map((item: { label: any }) => item[alias?.label || 'label']),
+            // @ts-ignore
+            value: result.map((item: { value: any }) => item[alias?.value || 'value']),
+          }, result);
         }
       });
     }
   };
 
-  const setDefaultValue = (origin: string | string[] = '') => {
+  const setDefaultValue = (origin:string | string[] = '') => {
     const divisionCodeList = getDivisionCodeList(origin);
     if (shouldDefaultData) {
       findAreaNameByCode(divisionCodeList);
@@ -105,7 +105,7 @@ export const setPickerValue = (
         callback({
           label: areaName,
           value: divisionCodeList,
-        });
+        },);
       }
     }
   };

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

@@ -1,6 +1,6 @@
+import React, { useEffect } from 'react';
 import { DformCheckBox } from '@lingxiteam/dform';
 import { LingxiForwardRef } from '@lingxiteam/types';
-import React, { useEffect } from 'react';
 import { DFormWrapper, FormItem } from '../BasicComponents';
 import { useFormItem, UseFormItemProps } from '../utils/hooks/useFormItem';
 import { withTransformProps } from '../utils/withTransformProps';
@@ -8,39 +8,48 @@ import transformProps from './transformProps';
 
 import useDefaultValue from '../utils/hooks/useDefaultValue';
 
-export interface MyDCheckboxProps extends UseFormItemProps {
+export interface MyDCheckboxProps extends UseFormItemProps{
   title: string;
   dataSource: any[];
   min: number;
   max: number;
 }
 
+
 const DCheckbox = LingxiForwardRef<any, MyDCheckboxProps>((props, ref) => {
   const { defaultValue, onChange, dataSource, getEngineApis, min, max, ...restProps } = props;
   const { getLocale } = getEngineApis?.() || {};
-  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 => {
-          if (params.labelKey && params.valueKey) {
-            if (item[params.labelKey]) {
-              return {
-                label: item[params.labelKey],
-                value: item[params.valueKey],
-              };
-            }
+  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) => {
+        if (params.labelKey && params.valueKey) {
+          if (item[params.labelKey]) {
+            return {
+              label: item[params.labelKey],
+              value: item[params.valueKey],
+            };
           }
-          return item;
-        });
-        setData(temDataSoure);
-      },
-    }
-  );
+        }
+        return item;
+      });
+      setData(temDataSoure);
+    },
+  });
 
   const [data, setData] = React.useState<any[]>([]);