@lingxiteam/ebe-utils 0.2.4 → 0.2.5

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

@@ -64,9 +64,9 @@ class UploadHandle implements UploadOpts {
   // filePrefix文件前缀是系统默认时传该方法
   getAppFileUrlById?: (fileId: string) => string; // 根据id获取文件url（带签名）
 
-  getFormData() {
+  getFormData(file: Blob) {
     const formFile = new FormData();
-    formFile.append(this.fileName, this.file);
+    formFile.append(this.fileName, file);
     if (this.extendUploadData) {
       Object.keys(this.extendUploadData).forEach((key: string) => {
         if (this.extendUploadData?.[key]) {
@@ -78,7 +78,7 @@ class UploadHandle implements UploadOpts {
   }
 
   async setProps(opts: UploadOpts) {
-    Object.keys(opts).forEach((key) => {
+    Object.keys(opts).forEach(key => {
       if (key && opts[key]) {
         // @ts-ignore
         this[key] = opts[key];
@@ -100,26 +100,28 @@ class UploadHandle implements UploadOpts {
   }
 
   setHooks(hooks = {}) {
-    Object.keys(hooks).forEach((h) => {
+    Object.keys(hooks).forEach(h => {
       // @ts-ignore
       this.hooks[h] = hooks[h];
     });
   }
 
-  sendRequestAfter(value: any) {
+  // 当传入hooks，优先执行传入的hooks，图片多张上传使用
+  sendRequestAfter(value: { hooks?: UploadHooks; [key: string]: any }) {
+    const { hooks, ...resProps } = value;
     if (this.onChange) {
       this.onChange(value.resultObject);
     }
-    if (typeof this.hooks.uploadAfter === 'function') {
-      this.hooks.uploadAfter(value);
+    if (typeof hooks?.uploadAfter === 'function') {
+      hooks.uploadAfter(resProps);
+    } else if (typeof this.hooks.uploadAfter === 'function') {
+      this.hooks.uploadAfter(resProps);
     }
   }
 
   getUrl(url: string, fileId: string) {
     // 应用引擎接口补充签名
-    return typeof this.getAppFileUrlById === 'function'
-      ? this.getAppFileUrlById(fileId)
-      : url;
+    return typeof this.getAppFileUrlById === 'function' ? this.getAppFileUrlById(fileId) : url;
   }
 
   value(resultObj: any) {
@@ -138,16 +140,14 @@ class UploadHandle implements UploadOpts {
         result[c._id] = obj[c._id];
       });
     }
-    result.url = this.getUrl(
-      `${this.filePrefix}${result[this.fileIdKey]}`,
-      result[this.fileIdKey],
-    );
+    result.url = this.getUrl(`${this.filePrefix}${result[this.fileIdKey]}`, result[this.fileIdKey]);
     return result;
   }
 
-  values() {
+  values(data: any[]) {
     const result: any[] = [];
-    const resultObjs = this.resultObjs || [];
+    // 如果是外部传进来的data，优先使用，图片多张上传需要使用
+    const resultObjs = data || this.resultObjs || [];
     resultObjs.forEach((r: any) => {
       result.push(this.value(r.resultObject));
     });
@@ -159,14 +159,16 @@ class UploadHandle implements UploadOpts {
     this.resultObjs = undefined;
   }
 
-  async sendRequest() {
-    const { hooks, ...restOpts } = this.opts as UploadOpts;
+  // 当发送请求的时候传入hooks， 和file 优先使用参数的，图片多张上传使用
+  async sendRequest(params?: { hooks: UploadHooks; file: Blob }) {
+    const { hooks = params?.hooks, ...restOpts } = this.opts as UploadOpts;
     const { uploadBefore, uploadError } = hooks as UploadHooks;
-    const formData = this.getFormData();
+    const file = params?.file || this.file;
+    const formData = this.getFormData(file);
     if (typeof uploadBefore === 'function') {
       uploadBefore({
         ...(restOpts || {}),
-        file: this.file,
+        file,
       });
     }
     if (this.customHeaders && Object.keys(this.customHeaders).length > 0) {
@@ -179,9 +181,7 @@ class UploadHandle implements UploadOpts {
       }
       Object.keys(this.customHeaders).forEach((key: string) => {
         // 将自定义头部里非ISO-8859-1字符 转码下
-        this.headers.headers[key] = encodeURIComponent(
-          this.customHeaders?.[key] || '',
-        );
+        this.headers.headers[key] = encodeURIComponent(this.customHeaders?.[key] || '');
       });
     }
 
@@ -189,23 +189,20 @@ class UploadHandle implements UploadOpts {
       .post(this.url, formData, this.headers)
       .then((data: any) => {
         if (!data) {
-          return Promise.reject(
-            new Error(
-              this.getLocale('Upload.exception', '请求失败，网关响应异常'),
-            ),
-          );
+          return Promise.reject(new Error(this.getLocale('Upload.exception', '请求失败，网关响应异常')));
         }
         const resp = {
           ...data,
           url: `${this.filePrefix}${data[this.fileIdKey]}`,
-          fileType: this.file?.type,
+          fileType: file?.type,
         };
         this.resultObj = resp;
         this.sendRequestAfter({
           ...restOpts,
           resultObject: data,
-          file: this.file,
+          file,
           realUrl: `${this.filePrefix}${data[this.fileIdKey]}`,
+          hooks: params?.hooks,
         });
         return resp;
       })
@@ -248,9 +245,12 @@ class UploadHandle implements UploadOpts {
     reqList.forEach((req: any, index) => {
       sequence = sequence
         .then(() => req(files[index]))
-        .then((data) => {
-          this.resultObjs.push(data);
-          return req;
+        .then(data => {
+          if (Array.isArray(this.resultObjs)) {
+            this.resultObjs.push(data);
+          }
+          // 返回结果
+          return data;
         });
     });
     return sequence;

package/lib/h5public/src/components/factory/src/utils/withTransformProps.tsx

@@ -17,15 +17,10 @@ function defaultTransformProps(props: ComponentProps) {
   return newProps;
 }
 
-const withTransformProps = (
-  Componnent: React.FC<any>,
-  transformProps: (props: any) => any = defaultTransformProps,
-) => {
-  const WrappedComponent: React.FC<ComponentProps> = (props) => {
+const withTransformProps = (Componnent: React.FC<any>, transformProps: (props: any) => any = defaultTransformProps) => {
+  const WrappedComponent: React.FC<ComponentProps> = props => {
     const { forwardedRef, ...rest } = props;
-    const newProps = rest?.$$componentItem?.fusionMode
-      ? transformProps(rest)
-      : rest;
+    const newProps = rest?.$$componentItem?.fusionMode ? transformProps(rest) : rest;
     return <Componnent ref={forwardedRef} {...newProps} />;
   };
   return React.forwardRef((props: ComponentProps, ref) => {

package/lib/h5public/src/components/factory/typings.d.ts

@@ -14,10 +14,7 @@ interface Window {
     BUILD_DATE: string;
   };
   wufengController: {
-    getAction: (
-      key: ActionType,
-      params: WufengAction | WufengAction[],
-    ) => Promise<any>;
+    getAction: (key: ActionType, params: WufengAction | WufengAction[]) => Promise<any>;
     registerIcons: (key: string, e: any) => void;
   };
   appId: string;

package/lib/h5public/src/hooks/usePageForm.ts

@@ -19,7 +19,7 @@ const usePageForm = (refs: Record<string, any>) => {
    */
   const resetForm = (compId: string) => {
     if (!refs[compId]) return;
-    const compName = refs[compId].compName;
+    const { compName } = refs[compId];
     if (compName === 'BOFramer') {
       const forms = getFormsByBoframerId({
         refs,
@@ -27,15 +27,13 @@ const usePageForm = (refs: Record<string, any>) => {
         compId,
       });
 
-      forms.forEach((form) => {
+      forms.forEach(form => {
         form?.resetFields?.();
       });
     } else {
       const forms = getComponentsByCompId({ compId, refs });
       // 支持循环容器中的表单重置
-      (Array.isArray(forms) ? forms : [forms]).forEach((form) =>
-        form?.resetFields(),
-      );
+      (Array.isArray(forms) ? forms : [forms]).forEach(form => form?.resetFields());
     }
   };
 
@@ -61,10 +59,11 @@ const usePageForm = (refs: Record<string, any>) => {
    * @param compId
    */
   const validateForm = async (compId: string): Promise<any> => {
-    if (!refs[compId]) return Promise.reject(new Error(`表单不存在`));
+    if (!refs[compId]) return Promise.reject(new Error('表单不存在'));
     const { compName } = refs[compId];
-    if (!['BOFramer', 'DForm'].includes(compName))
+    if (!['BOFramer', 'DForm'].includes(compName)) {
       return Promise.reject(new Error(`表单校验并取值不支持 ${compName} 组件`));
+    }
 
     if (compName === 'DForm') {
       return getFormValueByFormId({ refs, compId });
@@ -79,12 +78,9 @@ const usePageForm = (refs: Record<string, any>) => {
    * @param compId 组件id
    * @param formValues 表单值
    */
-  const setFormValues = (
-    compId: string,
-    formValues: Record<string, any> = {},
-  ) => {
+  const setFormValues = (compId: string, formValues: Record<string, any> = {}) => {
     if (!refs[compId]) return;
-    const compName = refs[compId].compName;
+    const { compName } = refs[compId];
 
     if (compName === 'BOFramer') {
       const forms = getFormsByBoframerId({
@@ -93,7 +89,7 @@ const usePageForm = (refs: Record<string, any>) => {
         compId,
       });
 
-      forms.forEach((form) => {
+      forms.forEach(form => {
         form?.setFieldsValue(formValues, refs);
       });
     } else {
@@ -107,16 +103,14 @@ const usePageForm = (refs: Record<string, any>) => {
    * 获取页面下的所有表单，包含当前页面下的表单、页面容器下的表单、业务组件下的表单。
    * 不包含所有弹窗类组件的表单数据
    */
-  const validateAllForm = () =>
-    validateFields({ refs, renderRefs }, formCodeSubmit);
+  const validateAllForm = () => validateFields({ refs, renderRefs }, formCodeSubmit);
 
   /**
    * 获取所有表单值 但不校验
    * 获取页面下的所有表单，包含当前页面下的表单、页面容器下的表单、业务组件下的表单。
    * 不包含所有弹窗类组件的表单数据
    */
-  const getAllFormValues = () =>
-    validateFields({ refs, renderRefs }, getFieldsValueByCode);
+  const getAllFormValues = () => validateFields({ refs, renderRefs }, getFieldsValueByCode);
 
   /**
    * 设置表单是否可编辑
@@ -125,7 +119,7 @@ const usePageForm = (refs: Record<string, any>) => {
    */
   const setFormDisabled = async (compId: string, editor: boolean) => {
     if (!refs[compId]) return;
-    const compName = refs[compId].compName;
+    const { compName } = refs[compId];
 
     if (compName === 'BOFramer') {
       const forms = getFormsByBoframerId({
@@ -134,7 +128,7 @@ const usePageForm = (refs: Record<string, any>) => {
         compId,
       });
 
-      forms.forEach((form) => {
+      forms.forEach(form => {
         form?.setDisabled(editor);
       });
     } else {

package/lib/h5public/src/utils/LcdpSpin/index.tsx

@@ -6,16 +6,14 @@ interface LcdpSpinProps extends DotLoadingProps {
   spinning: boolean;
 }
 
-const LcdpSpin: React.FC<LcdpSpinProps> = (props) => {
+const LcdpSpin: React.FC<LcdpSpinProps> = props => {
   const { spinning = true, ...restProps } = props;
 
   if (!spinning) {
     return null;
   }
 
-  return (
-    <DotLoading {...restProps} className="lcdp-dynamicPage-spinning-mask" />
-  );
+  return <DotLoading {...restProps} className="lcdp-dynamicPage-spinning-mask" />;
 };
 
 export default LcdpSpin;

package/lib/h5public/src/utils/formUtils.ts

@@ -7,25 +7,20 @@ export const formSubmit = async (form: RefsType, isFormList?: boolean) =>
     form.submit(resolve, reject, isFormList);
   });
 
-export const formCodeSubmit = async (form: Record<string, any>) =>
-  new Promise(form.submitByCode);
+export const formCodeSubmit = async (form: Record<string, any>) => new Promise(form.submitByCode);
 
-export const getFieldsValueByCode = (form: Record<string, any>) =>
-  new Promise(form.getFieldsValueByCode);
+export const getFieldsValueByCode = (form: Record<string, any>) => new Promise(form.getFieldsValueByCode);
 
 /**
  * 通过组件id获取所有的组件
  * @param options
  * @returns
  */
-export const getComponentsByCompId = (options: {
-  compId: string;
-  refs: RefsType;
-}) => {
+export const getComponentsByCompId = (options: { compId: string; refs: RefsType }) => {
   const { refs, compId } = options;
   return Object.keys(refs)
-    .filter((uid) => refs[uid]?.compId === compId)
-    .map((uid) => refs[uid]);
+    .filter(uid => refs[uid]?.compId === compId)
+    .map(uid => refs[uid]);
 };
 
 /**
@@ -35,15 +30,9 @@ export const getComponentsByCompId = (options: {
  * @param uid
  * @returns
  */
-export const getFormsByBoframerId = (options: {
-  renderRefs: RefsManager;
-  compId: string;
-  refs: RefsType;
-}) => {
+export const getFormsByBoframerId = (options: { renderRefs: RefsManager; compId: string; refs: RefsType }) => {
   const { renderRefs, compId, refs } = options;
-  const boframerUids = Object.keys(refs).filter(
-    (id) => refs[id].compId === compId || id === compId,
-  );
+  const boframerUids = Object.keys(refs).filter(id => refs[id].compId === compId || id === compId);
 
   // 如果没找到组件，就返回null
   if (!boframerUids.length) {
@@ -52,13 +41,13 @@ export const getFormsByBoframerId = (options: {
 
   const forms: RefsType[] = [];
   const getAllForms = (refs: RefsType | null) => {
-    Object.keys(refs || {}).forEach((uid) => {
+    Object.keys(refs || {}).forEach(uid => {
       // const engineRef = engineRelation.getEngineRefsByUid(uid, routerId);
       const renderId = uid;
       if (renderId) {
         const engineRefs = renderRefs.getComRefs(renderId);
         if (engineRefs) {
-          Object.keys(engineRefs).forEach((compUid) => {
+          Object.keys(engineRefs).forEach(compUid => {
             const r = engineRefs[compUid];
             getAllForms(r);
             if (r.compName === 'DForm' && !r.isFormList) {
@@ -74,7 +63,7 @@ export const getFormsByBoframerId = (options: {
     boframerUids.reduce((pre, uid) => {
       pre[uid] = refs[uid];
       return pre;
-    }, {} as RefsType),
+    }, {} as RefsType)
   );
 
   return forms;
@@ -90,7 +79,7 @@ export const getBoframerValueByForms = async (forms: RefsType[] = []) => {
   const errorValues: Record<string, any> = {};
 
   try {
-    const values = await Promise.all(forms.map((form) => formSubmit(form)));
+    const values = await Promise.all(forms.map(form => formSubmit(form)));
     return values.reduce((pre, item) => Object.assign(pre as any, item), {});
   } catch (error) {
     const { errorFields, values } = (error || {}) as any;
@@ -116,7 +105,7 @@ export const getFormsValueByForms = async (forms: RefsType[] = []) => {
   const errorValues: Record<string, any> = {};
 
   try {
-    const values = await Promise.all(forms.map((form) => formSubmit(form)));
+    const values = await Promise.all(forms.map(form => formSubmit(form)));
     return values.reduce((pre, item) => Object.assign(pre as any, item), {});
   } catch (error) {
     const { errorFields, values } = (error || {}) as any;
@@ -138,11 +127,7 @@ export const getFormsValueByForms = async (forms: RefsType[] = []) => {
  * @param options
  * @returns
  */
-export const getFormValueByBOFramerId = async (options: {
-  refs: RefsType;
-  renderRefs: RefsManager;
-  compId: string;
-}) => {
+export const getFormValueByBOFramerId = async (options: { refs: RefsType; renderRefs: RefsManager; compId: string }) => {
   const forms = getFormsByBoframerId(options);
   return getBoframerValueByForms(forms);
 };
@@ -152,19 +137,16 @@ export const getFormValueByBOFramerId = async (options: {
  * @param options
  * @returns
  */
-export const getFormValueByFormId = async (options: {
-  refs: RefsType;
-  compId: string;
-}) => {
+export const getFormValueByFormId = async (options: { refs: RefsType; compId: string }) => {
   const { compId, refs } = options;
-  const formUids = Object.keys(refs).filter((id) => refs[id].compId === compId);
+  const formUids = Object.keys(refs).filter(id => refs[id].compId === compId);
 
   // 如果没找到组件，就返回null
   if (!formUids.length) {
     return [];
   }
 
-  return getFormsValueByForms(formUids.map((uid) => refs[uid]));
+  return getFormsValueByForms(formUids.map(uid => refs[uid]));
 };
 
 /**
@@ -177,11 +159,11 @@ export const getFormsByCompName = (
     refs: RefsType;
     renderRefs: RefsManager;
   },
-  forms: any[] = [],
+  forms: any[] = []
 ) => {
   const { refs, renderRefs } = options;
 
-  Object.keys(refs || {}).forEach((uid) => {
+  Object.keys(refs || {}).forEach(uid => {
     const item = refs[uid];
     if (!item) return;
     if (item.compName === 'DForm') {
@@ -193,7 +175,7 @@ export const getFormsByCompName = (
           refs: renderRefs.getComRefs(uid),
           renderRefs,
         },
-        forms,
+        forms
       );
     }
   });
@@ -209,14 +191,14 @@ export const validateFields = async (
     refs: RefsType;
     renderRefs: RefsManager;
   },
-  getFormValue: (form: Record<string, any>) => Promise<any>,
+  getFormValue: (form: Record<string, any>) => Promise<any>
 ) => {
   const forms = getFormsByCompName(options);
   const actions: any = forms.map(getFormValue);
   const formValues: any = {};
   const values = await Promise.all(actions);
   values.forEach((val = {}) => {
-    Object.keys(val || {}).forEach((key) => {
+    Object.keys(val || {}).forEach(key => {
       const isIncludesKey = Object.keys(formValues).includes(key);
       if (isIncludesKey) {
         Object.assign(formValues[key], { ...(val[key] || {}) });
@@ -237,10 +219,10 @@ export const registerFormListenerOnValueChange = (
     renderRefs: RefsManager;
     compId: string;
   },
-  onValuesChange: (changedValues: any, values: any, form: RefsType) => void,
+  onValuesChange: (changedValues: any, values: any, form: RefsType) => void
 ) => {
   const forms = getFormsByBoframerId(options);
-  forms.forEach((form) => {
+  forms.forEach(form => {
     form.listenerOnValueChange((changedValues: any, values: any) => {
       onValuesChange(changedValues, values, form);
     });

package/lib/h5public/src/utils/i18n/i18n.ts

@@ -1,12 +1,8 @@
 // eslint-disable-next-line max-len
 export const getCalendarLocale = (
-  getLocale: (
-    t: string,
-    placelhoder?: string,
-    tempValue?: Record<string, any>,
-  ) => string | undefined,
+  getLocale: (t: string, placelhoder?: string, tempValue?: Record<string, any>) => string | undefined,
   t: string,
-  tempValue?: Record<string, any>,
+  tempValue?: Record<string, any>
 ) => {
   if (t === 'confirm') {
     return getLocale(t, '', tempValue);

package/lib/h5public/src/utils/i18n/locale/app/en_US.ts

@@ -22,14 +22,10 @@ export default merge(baseEnUS, {
   'DatePicker.minuteTip': 'Select Date and Time',
   'BannerModal.scaleMax': 'Scaled to maximum',
   'BannerModal.scaleMin': 'Scaled to minimum',
-  'NoPermission.description':
-    'You do not have access permission, please contact the administrator~',
-  'NotFound.description':
-    'Sorry, the page you are trying to access does not exist.',
-  'Modal.missParams':
-    'Modal operation failed: Missing page instance ID or page path.',
-  'DformRangePicker.startLessEnd':
-    'The start time should not be greater than the end time.',
+  'NoPermission.description': 'You do not have access permission, please contact the administrator~',
+  'NotFound.description': 'Sorry, the page you are trying to access does not exist.',
+  'Modal.missParams': 'Modal operation failed: Missing page instance ID or page path.',
+  'DformRangePicker.startLessEnd': 'The start time should not be greater than the end time.',
   'DformRangePicker.yearTip': 'Select Year',
   'DformRangePicker.monthTip': 'Please Select Time',
   'DformRangePicker.timeTip': 'Please Select Time',
@@ -54,8 +50,7 @@ export default merge(baseEnUS, {
   'DynamicList.dataError': 'Dynamic list data format error!',
   'DynamicList.clickToMore': 'click to load more',
   'DynamicList.noMore': 'no more available',
-  'Carousel.switchEmpty':
-    'The carousel component has no content and cannot be switched',
+  'Carousel.switchEmpty': 'The carousel component has no content and cannot be switched',
   'Carousel.isLast': 'It is the last item',
   'Carousel.isFirst': 'Already the first item',
   'Carousel.noExist': 'The carousel component does not have this item',
@@ -68,8 +63,7 @@ export default merge(baseEnUS, {
   'DformFile.somePicFailed': 'Some pictures failed to upload',
   'DformFile.noUrl': 'The current data has no url/fileId',
   'DformFile.updateTime': 'Upload time',
-  'DformPicker.searchPlaceholder':
-    'Please enter the options you want to search for',
+  'DformPicker.searchPlaceholder': 'Please enter the options you want to search for',
   'DynamicTable.more': 'more',
   'DynamicTable.total': 'total',
   uploading: 'uploading',