@lingxiteam/ebe-utils 0.3.27 → 0.3.29

package/lib/pcpublic/src/components/pcfactory/src/Table/EditComponent/index.tsx

@@ -1,6 +1,6 @@
 import { DatePicker, Input, InputNumber, Select, Radio, Switch, Form } from 'antd';
 import moment, { Moment } from 'moment';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import ComSelect from '../../SuperSelect/ComSelect';
 import ModalSelect from '../../ModalSelect';
 import { initMomentLocale, getRegExp } from '../../utils/common';
@@ -55,6 +55,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
     engineApis,
     onChange,
     onBlur,
+    form,
   } = props;
   const { dataIndex } = c;
   const {
@@ -75,6 +76,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
   const [tempInputValue, updateTempInputValue] = useState<string | undefined>();
 
   const { getLocale } = useLocale(engineApis || {});
+  const fieldName = getFormItemFieldName({ compId, currentRowKey, rowData, rowId, dataIndex });
 
   const limitRangeTime: {
     startTime: Moment;
@@ -212,6 +214,21 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
     return res?.length > 0 ? res : null;
   }, [initialValueType, isNaNValue, rules, validateDateCustomExpress]);
 
+  const needFormItem = useMemo(() => supportEditComponents.includes(edittype) && validateRules,
+    [supportEditComponents, edittype,
+      validateRules]);
+
+  useEffect(() => {
+    if (needFormItem && fieldName) {
+      const currentValue = tempInputValue ?? initialValue;
+      const formValue = form.getFieldValue(fieldName);
+      if (formValue !== currentValue) {
+        // 值不一样时需要通过表单赋值更新成由外部传入的新值
+        form.setFieldValue(fieldName, currentValue);
+      }
+    }
+  }, [needFormItem, fieldName, tempInputValue, initialValue]);
+
   const getDisabledDate = useCallback((current: Moment) => {
     // custom 自定义规则通过form表单进行校验
     if (!limitRange || limitRange === 'no' || limitRange === 'custom') {
@@ -498,8 +515,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
     }
   };
 
-  if (supportEditComponents.includes(edittype) && validateRules) {
-    const fieldName = getFormItemFieldName({ compId, currentRowKey, rowData, rowId, dataIndex });
+  if (needFormItem) {
     return (
       <Form.Item
         style={{ height: 'auto' }}
@@ -507,7 +523,7 @@ const EditComponent: React.FC<MyEditComponent> = (props) => {
         // TODO: 设置的 filedName 目前实际没作用，只是为了防止formitem错误告警
         name={fieldName}
         initialValue={initialValue}
-        rules={validateRules}
+        rules={validateRules as any}
       >
         {renderComponent(true)}
       </Form.Item>

package/lib/public/src/hooks/useBaseDataSource.ts

@@ -6,7 +6,6 @@ import { cloneDeep, isPlainObject } from 'lodash';
 import { useEffect, useRef, useState } from 'react';
 
 export interface UpdateDataSourceOptions {
-
   /**
    * 数据源名称
    */
@@ -52,7 +51,6 @@ export interface DataSourceOptions {
 
 export interface BaseDataSourceType {
   _others_: {
-
     /**
      * 用户信息
      */
@@ -165,6 +163,16 @@ const useBaseDataSource = <T extends BaseDataSourceType>(options: DataSourceOpti
       [name]: params,
     });
 
+  const getParams = (params: any) => {
+    if (params?.serviceRequest) {
+      return params?.serviceRequest;
+    } else if (params?.parameters) {
+      return params?.parameters;
+    } else if (params?.params) {
+      return params?.params;
+    }
+    return params;
+  };
   /**
    * 刷新对象数据源
    */
@@ -174,15 +182,15 @@ const useBaseDataSource = <T extends BaseDataSourceType>(options: DataSourceOpti
       ...options,
       attrs: params,
     })
-      .then(res => {
+      .then((res) => {
         setData({
           [name]: res,
-          [`${name}Filter`]: params,
+          [`${name}Filter`]: getParams(params),
         });
         const snapShot = cloneDeep(res);
         setDataSnapshot({
           [name]: snapShot,
-          [`${name}Filter`]: params,
+          [`${name}Filter`]: getParams(params),
         });
         return res;
       })
@@ -195,18 +203,18 @@ const useBaseDataSource = <T extends BaseDataSourceType>(options: DataSourceOpti
   /**
    * 刷新服务数据源
    */
-  const reloadServiceDataSource = (name: string, service: any, params: any) => {
+  const reloadServiceDataSource = (name: string, url: any, params: any) => {
     setLoading(true);
-    return fetchQueryService(service, params)
-      .then(res => {
+    return fetchQueryService(url, params)
+      .then((res) => {
         setData({
           [name]: res,
-          [`${name}Filter`]: params,
+          [`${name}Filter`]: getParams(params),
         });
         const snapShot = cloneDeep(res);
         setDataSnapshot({
           [name]: snapShot,
-          [`${name}Filter`]: params,
+          [`${name}Filter`]: getParams(params),
         });
         return res;
       })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.3.27",
+  "version": "0.3.29",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.3.27"
+    "@lingxiteam/ebe": "0.3.29"
   },
   "publishConfig": {
     "access": "public"