@lingxiteam/ebe-utils 0.2.21 → 0.2.23

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

@@ -1,12 +1,14 @@
+
 // @ts-ignore
-import { EngineApisType, LingxiForwardRef } from '@lingxiteam/types';
 import type { ValidationRule } from 'antd/es/form';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import CommIcon from '../Icon';
 import { handleIsValidIconCfg } from '../Icon/hooks';
+import { EngineApisType, LingxiForwardRef } from '@lingxiteam/types';
 import { FormFields, getFieldsProps, useCommonImperativeHandle } from '../utils';
-import { useLocale } from '../utils/hooks/useLocale';
 import BaseModalSelect from './BaseModalSelect';
+import { useLocale } from '../utils/hooks/useLocale';
+import { get, isEqual } from 'lodash';
 
 export interface MyModalSelectProps {
   value?: any;
@@ -144,11 +146,12 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
     ...restProps
   } = props;
 
+  const selectItemsRef = useRef();
   const engineApis = receivedEngineApis || getEngineApis?.() || {};
   const { openModal } = engineApis;
 
   const { getLocale } = useLocale(engineApis);
-
+  
   const [options, setOptions] = useState([]);
   const [postfixStyleClsName, setPostfixStyleClsName] = useState<string>('');
 
@@ -165,7 +168,7 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
       return false;
     }
   };
-
+  
   const getValueOptions = (datas: any) => {
     const { conField, valField } = modalInfo || {};
     let valArray: any = [];
@@ -175,10 +178,7 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
     if (valueObj instanceof Array) {
       valueObj.forEach((va: any) => {
         if (va[valField] || va.value) {
-          const obj = {
-            label: va[conField] || va.label,
-            value: va[valField] || va.value,
-          };
+          const obj = { label: va[conField] || va.label, value: va[valField] || va.value };
           valArray.push(obj.value);
           optionParams.push(obj);
         } else if (va) {
@@ -216,21 +216,39 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
     return undefined;
   };
 
+  const resetSelectItems = (val?: string | string[] | null) => {
+    try {
+      const selectItem: any = selectItemsRef.current;
+    
+      const selectArr = Array.isArray(selectItem) ? selectItem : [selectItem];
+      const { valField = 'value' } = modalInfo || {};
+      const selectItemsId = selectArr.map(item => get(item, valField));
+
+      const valsId = Array.isArray(val) ? val : [val];
+
+      if (!isEqual(selectItemsId, valsId)) {
+        selectItemsRef.current = undefined;
+      }
+    } catch (error) {
+      selectItemsRef.current = undefined;
+      return val;
+    }
+    return val;
+  };
+
   const value = useMemo(() => {
-    return handleFormValue(originValue);
+    return resetSelectItems(handleFormValue(originValue));
   }, [JSON.stringify(originValue)]);
 
-  const {
-    formFieldsRef,
-    disabled,
-    readOnly,
-    required,
-    finalRules: temRules,
-  } = useCommonImperativeHandle(ref, props, {
+
+  const { formFieldsRef, disabled, readOnly, required, finalRules: temRules } = useCommonImperativeHandle(ref, props, {
     clearValue: [],
     get value() {
       return value;
     },
+    getModalSelectItem() {
+      return selectItemsRef.current;
+    },
   });
 
   // 设置前后缀样式
@@ -255,6 +273,7 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
     }
   }, [postfixStyle]);
 
+
   const getAddonAfterBtn = () => {
     const { disabled } = restProps;
     let after = null;
@@ -262,7 +281,7 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
     if (handleIsValidIconCfg(postfixIcon)) {
       after = (
         <CommIcon
-          className={disabled ? 'disabled' : ''}
+          className={`${disabled ? 'disabled' : ''} postfixIcon`}
           icon={postfixIcon}
           getEngineApis={getEngineApis}
           onClick={disabled || postfix ? null : onIconClick || undefined}
@@ -276,7 +295,7 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
         case 'after':
           after = (
             <span className="postfix" onClick={disabled ? null : onIconClick || undefined}>
-              {postfix}
+              <span>{postfix}</span>
               {after}
             </span>
           );
@@ -286,7 +305,7 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
           after = (
             <span className="postfix" onClick={disabled ? null : onIconClick || undefined}>
               {after}
-              {postfix}
+              <span>{postfix}</span>
             </span>
           );
           break;
@@ -321,19 +340,34 @@ const ModalSelect = LingxiForwardRef<any, MyModalSelectProps>((props, ref) => {
     return numReg.test(str);
   };
 
-  const handleChangeVal = (e: any) => {
+  const onChangeHandle = (e: any, opts: any, cbOpts?: any) => {
+    // 把弹窗数据转化成res
+    const { resField } = modalInfo || {};
+    let datas = cbOpts;
+    if (typeof resField === 'string') {
+      datas = get(cbOpts, resField);
+    }
+    selectItemsRef.current = datas;
     if (onChange) {
-      onChange(e, options);
+      onChange(e, opts, cbOpts);
     }
   };
 
+  const handleChangeVal = (e: any) => {
+    onChangeHandle(e, options);
+  };
+
   // 弹框回调
   const handleModalOk = (res: any) => {
-    const { valArray, optionParams } = getValueOptions(res);
-    const modeOpts = mode === 'multiple' ? optionParams : optionParams.filter((v: any) => v?.value === valArray);
-    if (onChange) {
-      onChange(valArray, modeOpts);
+    // 把弹窗数据转化成res
+    const { resField } = modalInfo || {};
+    let datas = res;
+    if (typeof resField === 'string') {
+      datas = get(res, resField);
     }
+    const { valArray, optionParams } = getValueOptions(datas);
+    const modeOpts = mode === 'multiple' ? optionParams : optionParams.filter((v: any) => v?.value === valArray);
+    onChangeHandle(valArray, modeOpts, res);
   };
   // 触发弹框弹出
   const handleClickVisible = () => {

package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/LcdpUeditorMain.tsx

@@ -1,23 +1,27 @@
-import LcdpUeditor from '@lingxiteam/lcdp-ueditor-react';
-import { ILcdpUeditorInst } from '@lingxiteam/lcdp-ueditor-react/es/type';
-import { LingXiFC } from '@lingxiteam/types';
-import { useMemo, useRef } from 'react';
 import { FormFields, getFieldsProps, useCommonImperativeHandle } from '../utils';
 import { useLocale } from '../utils/hooks/useLocale';
 import { renderRichText } from '../utils/renderReadOnly';
+import LcdpUeditor from '@lingxiteam/lcdp-ueditor-react';
+import { ILcdpUeditorInst } from '@lingxiteam/lcdp-ueditor-react/es/type';
+import { LingXiFC } from '@lingxiteam/types';
+import React, { useMemo, useRef } from 'react';
 import { DEFAULT_TOOLBARS, DEFAULT_TOOLBARS_GROUP } from './const';
+import IdleContainer from '../utils/IdleContainer';
 
-const LcdpUeditorMain: LingXiFC<{ [key: string]: any }> = props => {
-  const { value, onChange, style, className, rootRef: ref, funcTypes } = props;
+const LcdpUeditorMain: LingXiFC <{[key: string]: any}> = (props => {
+  const { value, onChange, style, className, rootRef: ref, funcTypes, pasteplain = false } = props;
   const editorRef = useRef<ILcdpUeditorInst | null>(null);
 
   const engineApis = props.getEngineApis();
   const { getLocale, lang } = useLocale(engineApis);
 
   const { disabled, required, readOnly, formFieldsRef } = useCommonImperativeHandle(ref, props, {
-    setValue: (val: string) => {
+    setValue: (val:string) => {
       if (editorRef.current) {
         editorRef.current.setContent(val);
+      } else {
+        // 编辑器未挂载先设置到value
+        onChange(val);
       }
     },
   });
@@ -71,59 +75,62 @@ const LcdpUeditorMain: LingXiFC<{ [key: string]: any }> = props => {
         return 'zh-cn';
     }
   }, [lang]);
-
+  
   return (
-    <FormFields
-      {...getFieldsProps(props)}
-      ref={formFieldsRef}
-      trigger="onChange"
-      required={required}
-      disabled={disabled as any}
-      readOnly={readOnly}
-      rules={finalRules}
-      render={renderRichText}
-    >
-      <LcdpUeditor
-        lang={getLang}
-        style={style}
-        onMount={inst => {
-          editorRef.current = inst;
-        }}
-        className={className}
-        disabled={disabled}
-        value={value}
-        onChange={onChange}
-        config={{
-          imageType: props.imageType,
-          height: props.height,
-          maximumWords: props.maximumWords,
-        }}
-        toolbars={toolbars}
-        uploadFunction={async file => {
-          const formData = new FormData();
-          formData.append('attach', file, file.name);
-          const res: any = await engineApis?.service?.uploadFileByFetch(formData);
-          if (res?.fileId) {
-            const link = engineApis?.getAppFileUrlById(res?.fileId);
-            console.log(link, res.fileId);
+    <IdleContainer>
+      <FormFields
+        {...getFieldsProps(props)}
+        ref={formFieldsRef}
+        trigger="onChange"
+        required={required}
+        disabled={disabled as any}
+        readOnly={readOnly}
+        rules={finalRules}
+        render={renderRichText}
+      >
+        <LcdpUeditor
+          lang={getLang}
+          style={style}
+          onMount={(inst) => {
+            editorRef.current = inst;
+          }}
+          className={className}
+          disabled={disabled}
+          value={value}
+          onChange={onChange}
+          config={{
+            imageType: props.imageType,
+            height: props.height,
+            maximumWords: props.maximumWords,
+            pasteplain,
+          }}
+          toolbars={toolbars}
+          uploadFunction={async (file) => {
+            const formData = new FormData();
+            formData.append('attach', file, file.name);
+            const res: any = await engineApis?.service?.uploadFileByFetch(formData);
+            if (res?.fileId) {
+              const link = engineApis?.getAppFileUrlById(res?.fileId);
+              console.log(link, res.fileId);
+              return new Promise((resolve, reject) => {
+                resolve({
+                  state: 'SUCCESS',
+                  url: link,
+                  title: file.name,
+                  original: file.name,
+                });
+              });
+            }
             return new Promise((resolve, reject) => {
               resolve({
-                state: 'SUCCESS',
-                url: link,
-                title: file.name,
-                original: file.name,
+                state: 'FAIL',
               });
             });
-          }
-          return new Promise((resolve, reject) => {
-            resolve({
-              state: 'FAIL',
-            });
-          });
-        }}
-      />
-    </FormFields>
+          }}
+        />
+      </FormFields>
+    </IdleContainer>
   );
-};
+});
 
 export default LcdpUeditorMain;

package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/RichTextEditor.tsx

@@ -3,7 +3,7 @@ import { LingxiForwardRef } from '@lingxiteam/types';
 import type { FormItemProps } from 'antd/lib/form';
 import classnames from 'classnames';
 import React, { CSSProperties, useMemo } from 'react';
-import { filterHtmlNode, FormFields, getFieldsProps } from '../utils';
+import { FormFields, filterHtmlNode, getFieldsProps } from '../utils';
 import { useLocale } from '../utils/hooks/useLocale';
 
 export interface MyRichTextEditorProps extends FormItemProps {
@@ -73,11 +73,7 @@ const BaseRichTextEditor = React.forwardRef((props: BaseRichTextEditorPropsType,
   const heightStyle = useMemo(
     () =>
       heightType === 'auto'
-        ? {
-          minHeight: minHeight ? `${minHeight}px` : '',
-          maxHeight: maxHeight ? `${maxHeight}px` : '',
-          height: 'auto',
-        }
+        ? { minHeight: minHeight ? `${minHeight}px` : '', maxHeight: maxHeight ? `${maxHeight}px` : '', height: 'auto' }
         : { height: height ? `${height}px` : '' },
     [heightType, height, maxHeight, minHeight]
   );

package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/RichTextEditorMain.tsx

@@ -1,4 +1,4 @@
-import { useRef } from 'react';
+import React, { useRef } from 'react';
 import { useCommonImperativeHandle } from '../utils';
 import RichTextEditorLoad from './loader';
 
@@ -6,15 +6,15 @@ import { LingXiFC } from '@lingxiteam/types';
 
 export interface RichTextEditorProps {
   height: number;
-  rootRef: any;
+  rootRef: any
 }
 
-const RichTextEditorMain: LingXiFC<RichTextEditorProps> = props => {
+const RichTextEditorMain: LingXiFC<RichTextEditorProps> = ((props) => {
   const { rootRef: ref } = props;
   const gridViewRef = useRef<any>(null);
   const richTextRef = useRef<any>(null);
   const { disabled, required, readOnly, formFieldsRef } = useCommonImperativeHandle(ref, props, {
-    setValue: (val: string) => {
+    setValue: (val:string) => {
       if (richTextRef.current) {
         richTextRef.current.setHTML(val);
       }
@@ -35,6 +35,6 @@ const RichTextEditorMain: LingXiFC<RichTextEditorProps> = props => {
       richTextRef={richTextRef}
     />
   );
-};
+});
 
 export default RichTextEditorMain;

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

@@ -1,7 +1,9 @@
-import { LingxiForwardRef } from '@lingxiteam/types';
 import React from 'react';
 import LcdpUeditorMain from './LcdpUeditorMain';
 import RichTextEditorMain from './RichTextEditorMain';
+import { LingxiForwardRef } from '@lingxiteam/types';
+import IdleContainer from '../utils/IdleContainer';
+
 
 class RichTextEditor extends React.Component<any, {}> {
   state = {
@@ -28,6 +30,11 @@ class RichTextEditor extends React.Component<any, {}> {
   }
 }
 
+
 export default LingxiForwardRef<any, any>((props, ref) => {
-  return <RichTextEditor {...props} rootRef={ref} />;
+  return (
+    <IdleContainer>
+      <RichTextEditor {...props} rootRef={ref} />
+    </IdleContainer>
+  );
 });

package/lib/pcpublic/src/components/pcfactory/src/RichTextEditor/loader.ts

@@ -2,7 +2,7 @@ import Loadable from 'react-loadable';
 import { LoadingComponennt } from '../utils/LoaderHelper';
 
 const GanttLoader = Loadable({
-  loader: async () => (await import(/* webpackChunkName: 'pcFactory-RichTextEditor' */ './RichTextEditor')) as unknown as React.ComponentType<any>,
+  loader: async () => (await import/* webpackChunkName: 'pcFactory-RichTextEditor' */('./RichTextEditor')) as unknown as React.ComponentType<any>,
   loading: LoadingComponennt,
 });