@lingxiteam/ebe-utils 0.5.11 → 0.6.2

package/lib/pcpublic/src/components/pcfactory/src/Slider/index.tsx

@@ -1,8 +1,8 @@
-import { InputNumber, Slider as AntdSlider } from 'antd';
-import classNames from 'classnames';
 import React, { CSSProperties, useMemo } from 'react';
-import CommonIcon from '../Icon';
+import { Slider as AntdSlider, InputNumber } from 'antd';
 import { FormFields, getFieldsProps, useCommonImperativeHandle } from '../utils';
+import CommonIcon from '../Icon';
+import classNames from 'classnames';
 
 interface BaseSliderPropsType {
   step: any;
@@ -20,14 +20,14 @@ interface BaseSliderPropsType {
   style: CSSProperties;
   showInput: any;
   getEngineApis?: any;
-  value?: any;
+  value?: any,
   onChange?: (value: any) => void;
   onMouseEnter: any;
   onMouseLeave: any;
   onClick: any;
 }
 
-export interface MySliderProps extends Omit<BaseSliderPropsType, 'options'> {
+export interface MySliderProps extends Omit<BaseSliderPropsType, 'options'>{
   defaultValue: any;
   showMarks: any;
   marks: any;
@@ -91,9 +91,8 @@ const BaseSlider = (props: BaseSliderPropsType) => {
 
   const curValue = useMemo(() => {
     // 单滑动时，设置了默认值，防止滑动到0时，会跳动到默认值上
-    let newVal = typeof value === 'number' && value === 0 ? 0 : value || 0;
-    if (range) {
-      // 双滑块
+    let newVal = (typeof value === 'number' && value === 0) ? 0 : (value || 0);
+    if (range) { // 双滑块
       newVal = Array.isArray(newVal) ? newVal : [newVal, newVal];
     } else if (!range && Array.isArray(newVal)) {
       newVal = newVal[1];
@@ -128,8 +127,7 @@ const BaseSlider = (props: BaseSliderPropsType) => {
             }}
             getEngineApis={getEngineApis}
           />
-        </div>
-      );
+        </div>);
     }
     return undefined;
   };
@@ -175,23 +173,25 @@ const BaseSlider = (props: BaseSliderPropsType) => {
               }
             }}
           />
-          {range && (
-            <>
-              <span className={`${prefixCls}_line`} />
-              <InputNumber
-                min={curValue[0]}
-                max={max}
-                step={step}
-                value={curValue[1]}
-                disabled={disabled}
-                onChange={(e: any) => {
-                  if (onChange) {
-                    onChange(range ? [curValue[0], e] : e);
-                  }
-                }}
-              />
-            </>
-          )}
+          {
+            range && (
+              <>
+                <span className={`${prefixCls}_line`} />
+                <InputNumber
+                  min={curValue[0]}
+                  max={max}
+                  step={step}
+                  value={curValue[1]}
+                  disabled={disabled}
+                  onChange={(e: any) => {
+                    if (onChange) {
+                      onChange(range ? [curValue[0], e] : e);
+                    }
+                  }}
+                />
+              </>
+            )
+          }
         </div>
       )}
       {maxIcon && renderIconFont(maxIcon, isMaxIconHL)}
@@ -201,48 +201,11 @@ const BaseSlider = (props: BaseSliderPropsType) => {
 
 const Slider = React.forwardRef<any, MySliderProps>((props, ref) => {
   const {
-    showMarks,
-    marks,
-    stepNull,
-    included,
-    className,
-    style,
-    range = false,
-    defaultValue,
-    direction,
-    step,
-    value,
-    minIcon,
-    maxIcon,
-    max,
-    min,
-    wrapperContainer: WrapperContainer,
-    showInput,
-    showLabel,
-    labelPlacement,
-    draggableTrack,
-    onChange,
-    showWrapperContainer,
-    selfSpan,
-    colSpan,
-    label,
-    tipContent,
-    regexp,
-    message,
-    hidden,
-    compId,
-    tipIcon,
-    tipLocation,
-    titleTip,
-    tipPlacement,
-    labelCol,
-    wrapperCol,
-    colon,
-    fieldName: rawFieldName,
-    onValueRelease,
-    getCompPropMapState,
-    isFormChild,
-    getEngineApis,
+    showMarks, marks, stepNull, included, className, style,
+    range = false, defaultValue, direction, step, value, minIcon, maxIcon, max, min, wrapperContainer: WrapperContainer,
+    showInput, showLabel, labelPlacement, draggableTrack, onChange, showWrapperContainer,
+    selfSpan, colSpan, label, tipContent, regexp, message, hidden, compId, tipIcon, tipLocation, titleTip, tipPlacement,
+    labelCol, wrapperCol, colon, fieldName: rawFieldName, onValueRelease, getCompPropMapState, isFormChild, getEngineApis,
     tipSize,
     tipWidth,
     tipHeight,
@@ -259,8 +222,7 @@ const Slider = React.forwardRef<any, MySliderProps>((props, ref) => {
       reverse: direction === 'reverse',
     };
     const marksAttr = marks?.filter((mark: any) => mark.checked);
-    if (showMarks && marks?.length) {
-      // 显示刻度
+    if (showMarks && marks?.length) { // 显示刻度
       const marksObj: any = {};
       marksAttr.forEach((mark: any) => {
         const { key, unit, fontFamily } = mark || {};
@@ -289,6 +251,7 @@ const Slider = React.forwardRef<any, MySliderProps>((props, ref) => {
     return params;
   }, [range, step, direction, marks, stepNull, draggableTrack]);
 
+
   return (
     <FormFields
       {...getFieldsProps(props)}
@@ -300,13 +263,11 @@ const Slider = React.forwardRef<any, MySliderProps>((props, ref) => {
       handleFormValue={val => {
         if (val !== undefined) {
           // 绑定内容有可能返回number类型或者是array类型，全部转换为string类型处理
-          const valueArr = (typeof val === 'number' || val ? val.toString() : val)
-            ?.replace(/\[|]/g, '')
-            ?.split(',')
-            ?.filter((v: any) => !!v);
-          const _valueArr = valueArr?.map((v: any) => (v && Number(v)) || 0);
-          const _value =
-            range && Array.isArray(_valueArr) && _valueArr?.length > 1 ? _valueArr.sort((a, b) => a - b) : (_valueArr && _valueArr[0]) || 0;
+          const valueArr = (typeof val === 'number' || val ? val.toString() : val)?.replace(/\[|]/g, '')?.split(',')?.filter((v: any) => !!v);
+          const _valueArr = valueArr?.map((v: any) => ((v && Number(v)) || 0));
+          const _value = range && Array.isArray(_valueArr) && _valueArr?.length > 1
+            ? _valueArr.sort((a, b) => (a - b))
+            : ((_valueArr && _valueArr[0]) || 0);
 
           return _value;
         }

package/lib/pcpublic/src/components/pcfactory/src/StdUpload/DownloadProgress/DownloadProgress.tsx

@@ -1,5 +1,5 @@
-import { Progress } from 'antd';
 import React, { forwardRef, useImperativeHandle, useState } from 'react';
+import { Progress } from 'antd';
 
 const DownloadProgress = forwardRef((_, ref) => {
   const [percent, setPercent] = useState<number>(0);

package/lib/pcpublic/src/components/pcfactory/src/StdUpload/UploadItem.tsx

@@ -1,18 +1,18 @@
-import { FileOutlined, LoadingOutlined, PaperClipOutlined } from '@ant-design/icons';
-import { Progress, Spin } from 'antd';
+import React, { Progress, Spin } from 'antd';
+import { LoadingOutlined, PaperClipOutlined, FileOutlined } from '@lingxiteam/icons';
 import { UploadFile } from 'antd/lib/upload/interface';
+import { ReactElement, ReactNode } from 'react';
 import classNames from 'classnames';
-import React, { ReactElement, ReactNode } from 'react';
 // import fileIcon from './assets/fileName.png';
-import defaultIcon from './assets/default.png';
-import pptIcon from './assets/ppt.png';
 import wordIcon from './assets/word.png';
+import pptIcon from './assets/ppt.png';
 import xlsIcon from './assets/xls.png';
+import defaultIcon from './assets/default.png';
 // import imgIcon from './assets/img.png';
-import jsIcon from './assets/js.png';
+import zipIcon from './assets/zip.png';
 import pdfIcon from './assets/pdf.png';
+import jsIcon from './assets/js.png';
 import txtIcon from './assets/txt.png';
-import zipIcon from './assets/zip.png';
 import './uploadItem.less';
 
 interface UploadItemProps {
@@ -56,18 +56,29 @@ const prefix = 'ued-stdUpload-item';
 const UploadItem = (props: UploadItemProps) => {
   const { file, actions, showUploadList, listType, originNode, onFileNameClick } = props || {};
   const { status, percent, fileName = '', originFileObj } = file || {};
-  const { showDownloadIcon, showPreviewIcon, showRemoveIcon, previewIcon, removeIcon, downloadIcon } = showUploadList || {};
+  const {
+    showDownloadIcon,
+    showPreviewIcon,
+    showRemoveIcon,
+    previewIcon,
+    removeIcon,
+    downloadIcon,
+  } = showUploadList || {};
 
   const renderIcon = () => {
     if (status === 'error') {
-      return listType === 'picture' ? <FileOutlined rev="" /> : <PaperClipOutlined rev="" />;
+      return listType === 'picture' ? <FileOutlined /> : <PaperClipOutlined />;
     }
     if (status !== 'uploading') {
       let imgSource = defaultIcon;
       if (/\.(jpg|jpeg|png|gif|bmp|GIF|JPG|PNG)$/.test(file.name)) {
         imgSource = file.thumbUrl || file.url;
       }
-      return listType === 'picture' ? <img src={imgSource} alt={file.name} /> : <PaperClipOutlined rev="" />;
+      return listType === 'picture' ? (
+        <img src={imgSource} alt={file.name} />
+      ) : (
+        <PaperClipOutlined />
+      );
     }
     return null;
   };
@@ -75,13 +86,17 @@ const UploadItem = (props: UploadItemProps) => {
   const renderItem = () => {
     return (
       <div className={classNames(prefix, `${prefix}-${listType}`, `${prefix}-${status}`)}>
-        <Spin indicator={<LoadingOutlined spin rev="" />} className={`${prefix}-loading`} spinning={status === 'uploading'}>
+        <Spin
+          indicator={<LoadingOutlined spin />}
+          className={`${prefix}-loading`}
+          spinning={status === 'uploading'}
+        >
           <div className={`${prefix}-icon`}>{renderIcon()}</div>
         </Spin>
         <div className={`${prefix}-info`}>
           <a
             className={`${prefix}-name`}
-            onClick={e => {
+            onClick={(e) => {
               e?.preventDefault();
               if (typeof onFileNameClick === 'function') {
                 onFileNameClick(file);
@@ -94,7 +109,14 @@ const UploadItem = (props: UploadItemProps) => {
             {file.name}
           </a>
           {status === 'uploading' && (
-            <Progress strokeWidth={2} className={`${prefix}-progress`} type="line" size="small" percent={percent} showInfo={false} />
+            <Progress
+              strokeWidth={2}
+              className={`${prefix}-progress`}
+              type="line"
+              size="small"
+              percent={percent}
+              showInfo={false}
+            />
           )}
         </div>
         <div className={`${prefix}-action`}>