@teamix/pro 1.1.33 → 1.1.37

package/es/actions/dialog-form.d.ts

@@ -3,11 +3,18 @@ import { IFormProps, IFormSchema } from '../form';
 import { RequestAction } from './request';
 import { DialogAction } from './dialog';
 export interface DialogFormAction extends DialogAction {
+    /** 表单初始值 */
     initialValues?: any;
+    /** 表单初始化数据请求 */
     initialRequest?: RequestAction;
+    /** 表单提交发送数据请求时，是否携带全部表单数据。默认携带 */
     useFieldValuesForRequest?: boolean;
+    /**
+     * @deprecated 建议使用 schema 配置 IFormProps 代替
+     */
     formProps?: Omit<IFormProps, 'schema'>;
-    schema: IFormSchema;
+    /** 同时支持两种配置方式，如果想完整定制表单，可使用完整的表单配置项 IFormProps，否则可以只配置 IFormSchema */
+    schema: IFormSchema | IFormProps;
 }
 export declare function useDialogFormAction(action: DialogFormAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;

package/es/actions/dialog-form.js

@@ -1,14 +1,5 @@
-var _excluded = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "onCancel"];
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+var _excluded = ["schema"],
+    _excluded2 = ["schema", "useFieldValuesForRequest", "initialValues", "initialRequest", "formProps", "size", "onFinish", "onCancel"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -22,6 +13,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 import React, { useState, useRef, useEffect } from 'react';
 import { useHistory } from 'react-router-dom';
 import { Loading } from '@alicloudfe/components';
@@ -62,15 +63,31 @@ function getDefaultFormPropsByDialogSize(size) {
   };
 }
 
+function getSchemaAndFormProps(schema, formProps) {
+  if (schema instanceof Array) {
+    return _objectSpread({
+      schema: schema
+    }, formProps);
+  }
+
+  var formSchema = schema;
+  return formSchema;
+}
+
 var DialogForm = function DialogForm(props) {
   var initialValues = props.initialValues,
       initialRequest = props.initialRequest,
-      schema = props.schema,
       _props$size = props.size,
       size = _props$size === void 0 ? 'small' : _props$size,
+      schema = props.schema,
       formProps = props.formProps,
       context = props.context,
       formRef = props.formRef;
+
+  var _getSchemaAndFormProp = getSchemaAndFormProps(schema, formProps),
+      formSchema = _getSchemaAndFormProp.schema,
+      others = _objectWithoutProperties(_getSchemaAndFormProp, _excluded);
+
   var form = createForm({
     initialValues: getTargetValue(initialValues, context)
   });
@@ -101,8 +118,8 @@ var DialogForm = function DialogForm(props) {
     }
   }, /*#__PURE__*/React.createElement(ProForm, _objectSpread(_objectSpread({
     form: form,
-    schema: getTargetValue(schema, context)
-  }, getDefaultFormPropsByDialogSize(size)), getTargetValue(formProps, context))));
+    schema: getTargetValue(formSchema, context)
+  }, getDefaultFormPropsByDialogSize(size)), getTargetValue(others, context))));
 };
 
 export function useDialogFormAction(action, context) {
@@ -117,7 +134,7 @@ export function useDialogFormAction(action, context) {
       size = _action$size === void 0 ? 'small' : _action$size,
       _onFinish = action.onFinish,
       _onCancel = action.onCancel,
-      others = _objectWithoutProperties(action, _excluded);
+      others = _objectWithoutProperties(action, _excluded2);
 
   var formRef = useRef();
   return useDialogAction(Object.assign({

package/es/actions/dialog-info.d.ts

@@ -0,0 +1,9 @@
+import { DialogAction } from './dialog';
+import { ProInfoProps } from '..';
+export interface DialogInfoAction extends DialogAction {
+    schema: ProInfoProps;
+}
+export declare function useDialogInfoAction(action: DialogInfoAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+};
+export default useDialogInfoAction;

package/es/actions/dialog-info.js

@@ -0,0 +1,23 @@
+var _excluded = ["schema"];
+
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+
+import useDialogAction from './dialog';
+import { ProInfo } from '..';
+export function useDialogInfoAction(action, context) {
+  var schema = action.schema,
+      others = _objectWithoutProperties(action, _excluded);
+
+  return useDialogAction(Object.assign({
+    component: ProInfo,
+    closeable: true,
+    size: 'mini',
+    schema: Object.assign({
+      backgroundColor: 'grey',
+      compacted: false
+    }, schema)
+  }, others), context);
+}
+export default useDialogInfoAction;

package/es/actions/dialog.d.ts

@@ -7,6 +7,8 @@ export interface DialogAction extends Omit<RequestAction, 'url'>, Omit<QuickShow
     dialogType?: 'dialog' | 'drawer';
     dialogQuickShowType?: 'alert' | 'confirm';
     messageType?: 'success' | 'warning' | 'error' | 'notice' | 'help' | 'loading';
+    beforeContent?: React.ReactNode;
+    afterContent?: React.ReactNode;
 }
 export declare function useDialogAction(action: DialogAction, context?: any): {
     [x: string]: (e: React.MouseEvent<HTMLElement, MouseEvent>) => void;

package/es/actions/dialog.js

@@ -1,5 +1,5 @@
 var _excluded = ["url", "method", "params", "data", "extendParams", "successMsg", "errorMsg", "formatParams", "formatResult", "onSuccess", "onError"],
-    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link"];
+    _excluded2 = ["title", "content", "component", "schema", "onFinish", "dialogType", "dialogQuickShowType", "messageType", "beforeRequest", "onTrigger", "link", "beforeContent", "afterContent"];
 
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
@@ -77,6 +77,8 @@ export function useDialogAction(action, context) {
         beforeRequest = _getTargetValue.beforeRequest,
         onTrigger = _getTargetValue.onTrigger,
         link = _getTargetValue.link,
+        beforeContent = _getTargetValue.beforeContent,
+        afterContent = _getTargetValue.afterContent,
         dialogOtherProps = _objectWithoutProperties(_getTargetValue, _excluded2);
 
     var dialogMethod = dialogType === 'drawer' ? Drawer : Dialog;
@@ -152,13 +154,18 @@ export function useDialogAction(action, context) {
     var dialogContext = Object.assign({}, context, {
       hide: hide
     });
+    var dialogContent = Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({
+      key: uuid()
+    }, componentProps)) : addContextForReactNode(content, dialogContext);
     var ret = dialogMethod.show(_objectSpread(_objectSpread({
       // @ts-ignore
       onOk: onOk,
       title: addContextForReactNode(title, dialogContext),
-      content: Component ? /*#__PURE__*/React.createElement(Component, _objectSpread({
-        key: uuid()
-      }, componentProps)) : addContextForReactNode(content, dialogContext),
+      content: /*#__PURE__*/React.createElement(React.Fragment, null, beforeContent && /*#__PURE__*/React.createElement("div", {
+        className: "teamix-pro-dialog-before-content"
+      }, beforeContent), dialogContent, afterContent && /*#__PURE__*/React.createElement("div", {
+        className: "teamix-pro-dialog-after-content"
+      }, afterContent)),
       closeable: !loading
     }, dialogProps), dialogOtherProps));
     store.hide = ret.hide;

package/es/actions/drawer-info.d.ts

@@ -0,0 +1,6 @@
+import { DialogInfoAction } from './dialog-info';
+export declare type DrawerInfoAction = DialogInfoAction;
+export declare function useDrawerInfoAction(action: DrawerInfoAction, context?: any): {
+    [x: string]: (e: import("react").MouseEvent<HTMLElement, MouseEvent>) => void;
+};
+export default useDrawerInfoAction;

package/es/actions/drawer-info.js

@@ -0,0 +1,7 @@
+import { useDialogInfoAction } from './dialog-info';
+export function useDrawerInfoAction(action, context) {
+  return useDialogInfoAction(Object.assign({
+    dialogType: 'drawer'
+  }, action), context);
+}
+export default useDrawerInfoAction;

package/es/actions/index.d.ts

@@ -10,17 +10,17 @@ import { NoticeAction } from './notice';
 import { ErrorAction } from './error';
 import { DialogFormAction } from './dialog-form';
 import { DialogTableAction } from './dialog-table';
+import { DialogInfoAction } from './dialog-info';
 import { DrawerAction } from './drawer';
 import { DrawerFormAction } from './drawer-form';
 import { DrawerTableAction } from './drawer-table';
+import { DrawerInfoAction } from './drawer-info';
 import './index.scss';
 export declare type ActionConfig = ({
     type: 'link';
 } & LinkAction) | ({
     type: 'request';
 } & RequestAction) | ({
-    type: 'dialog';
-} & DialogAction) | ({
     type: 'confirm';
 } & ConfirmAction) | ({
     type: 'danger-confirm';
@@ -29,16 +29,22 @@ export declare type ActionConfig = ({
 } & NoticeAction) | ({
     type: 'error';
 } & ErrorAction) | ({
+    type: 'dialog';
+} & DialogAction) | ({
     type: 'dialog-form';
 } & DialogFormAction) | ({
+    type: 'dialog-table';
+} & DialogTableAction) | ({
+    type: 'dialog-info';
+} & DialogInfoAction) | ({
     type: 'drawer';
 } & DrawerAction) | ({
     type: 'drawer-form';
 } & DrawerFormAction) | ({
-    type: 'dialog-table';
-} & DialogTableAction) | ({
     type: 'drawer-table';
-} & DrawerTableAction);
+} & DrawerTableAction) | ({
+    type: 'drawer-info';
+} & DrawerInfoAction);
 export declare function registerActionHandler(id: string, extendActionId: string, defaultConfig: any): void;
 export declare const useAction: any;
 export interface IActionButton extends ButtonProps {

package/es/actions/index.js

@@ -43,9 +43,11 @@ import { useNoticeAction } from './notice';
 import { useErrorAction } from './error';
 import { useDialogFormAction } from './dialog-form';
 import { useDialogTableAction } from './dialog-table';
+import { useDialogInfoAction } from './dialog-info';
 import { useDrawerAction } from './drawer';
 import { useDrawerFormAction } from './drawer-form';
 import { useDrawerTableAction } from './drawer-table';
+import { useDrawerInfoAction } from './drawer-info';
 import './index.scss';
 var RegistedActions = new Map();
 export function registerActionHandler(id, extendActionId, defaultConfig) {
@@ -98,6 +100,10 @@ export var useAction = function useAction(config, context) {
     return useDialogTableAction(others, context);
   }
 
+  if (type === 'dialog-info') {
+    return useDialogInfoAction(others, context);
+  }
+
   if (type === 'drawer') {
     return useDrawerAction(others, context);
   }
@@ -110,6 +116,10 @@ export var useAction = function useAction(config, context) {
     return useDrawerTableAction(others, context);
   }
 
+  if (type === 'drawer-info') {
+    return useDrawerInfoAction(others, context);
+  }
+
   var registedAction = RegistedActions.get(type);
 
   if (!registedAction) {
@@ -160,33 +170,39 @@ export var ActionButton = function ActionButton(props) {
 };
 
 function renderMenuButtonItem(item, key, context) {
-  var menuItemActionConfig = Object.assign({}, item.config, {
+  var config = item.config,
+      btnContext = item.context,
+      _onClick2 = item.onClick,
+      children = item.children,
+      icon = item.icon,
+      disabled = item.disabled;
+  var menuItemActionConfig = Object.assign({}, config, {
     trigger: 'onClick'
   });
 
-  var _useAction = useAction(menuItemActionConfig, item.context || context),
+  var _useAction = useAction(menuItemActionConfig, btnContext || context),
       loading = _useAction.loading,
       menuItemProps = _objectWithoutProperties(_useAction, _excluded3);
 
-  var buttonProps = item.onClick ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
+  var buttonProps = _onClick2 ? _objectSpread(_objectSpread({}, menuItemProps), {}, {
     onClick: function onClick(e) {
-      return item.onClick(e, context);
+      return _onClick2(e, context);
     }
   }) : _objectSpread({}, menuItemProps);
   return /*#__PURE__*/React.createElement(MenuButton.Item, _objectSpread({
-    key: key
-  }, buttonProps), buttonContent(item.children, item.icon, undefined, context));
+    key: key,
+    disabled: disabled
+  }, buttonProps), buttonContent(children, icon, undefined, context));
 }
 
 function renderCommonActionButtonMenuItem(action, key, context) {
-  // @ts-ignore
-  if (action.actions && action.actions.length) {
+  var menuBtn = action;
+
+  if (menuBtn.actions && menuBtn.actions.length && menuBtn.disabled !== true) {
     return /*#__PURE__*/React.createElement(Menu.SubMenu, {
       key: key,
-      label: // @ts-ignore
-      action.label || action.children
-    }, //@ts-ignore
-    action.actions.map(function (a, j) {
+      label: menuBtn.label || menuBtn.children
+    }, menuBtn.actions.map(function (a, j) {
       return renderCommonActionButtonMenuItem(a, j, context);
     }));
   }

package/es/actions/index.scss

@@ -29,6 +29,14 @@
   }
 }
 
+.teamix-pro-dialog-before-content {
+  margin-bottom: var(--s-2);
+}
+
+.teamix-pro-dialog-after-content {
+  margin-top: var(--s-2);
+}
+
 .next-menu-divider + .next-menu-divider {
   display: none;
 }

package/es/actions/link.js

@@ -5,21 +5,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 import { getTargetValue, goToLink } from '@teamix/utils';
+import { useHistory } from 'react-router-dom';
 import { eventHandler } from './base';
 export function useLinkAction(action, context) {
-  var _getTargetValue = getTargetValue(action, context),
-      to = _getTargetValue.to,
-      search = _getTargetValue.search,
-      hash = _getTargetValue.hash,
-      blank = _getTargetValue.blank;
-
+  var history = useHistory();
   return _objectSpread({}, eventHandler(action, function () {
-    goToLink({
-      to: to,
-      search: search,
-      hash: hash,
-      blank: blank
-    });
+    var linkAction = getTargetValue(action, context);
+    goToLink(linkAction, history);
   }));
 }
 export default useLinkAction;

package/es/form/SchemaForm/reactions.js

@@ -8,6 +8,8 @@ import { isFn, doCommonRequest } from '@teamix/utils'; // 配置请求
 
 var useRequest = function useRequest(requestConfig) {
   return function (field) {
+    var _field$form;
+
     var beforeRequest = requestConfig.beforeRequest,
         onSuccess = requestConfig.onSuccess;
     var beforeRequestResult = isFn(beforeRequest) ? beforeRequest(field) : {};
@@ -21,8 +23,8 @@ var useRequest = function useRequest(requestConfig) {
       } : onSuccess
     }), {
       $self: field,
-      $form: field.form,
-      $values: field.form.values
+      $form: field === null || field === void 0 ? void 0 : field.form,
+      $values: field === null || field === void 0 ? void 0 : (_field$form = field.form) === null || _field$form === void 0 ? void 0 : _field$form.values
     });
   };
 }; // 配置校验

package/es/index.d.ts

@@ -21,5 +21,5 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.1.32";
+declare const version = "1.1.35";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/es/index.js

@@ -25,6 +25,6 @@ export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-var version = '1.1.32';
+var version = '1.1.35';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils };

package/es/info/components/InfoValueItem/index.js

@@ -1,4 +1,18 @@
-var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef"];
+var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource"];
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -12,19 +26,13 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import TeamixIcon from '@teamix/icon';
 import ProField from '../../../field';
-import { baseClass, request } from '@teamix/utils';
+import { baseClass, getTargetValue, request } from '@teamix/utils';
 import PopConfirm from '@teamix/pop-confirm';
 import React, { useMemo, useState } from 'react';
 import './index.scss';
@@ -42,6 +50,7 @@ var InfoValueItem = function InfoValueItem(props) {
       infoItem = props.infoItem,
       record = props.record,
       actionRef = props.actionRef,
+      dataSource = props.dataSource,
       others = _objectWithoutProperties(props, _excluded);
 
   var dataIndex = infoItem.dataIndex,
@@ -55,28 +64,41 @@ var InfoValueItem = function InfoValueItem(props) {
       _infoItem$successMess = infoItem.successMessage,
       successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
       actions = infoItem.actions,
-      extra = infoItem.extra; // 由info接管field中的value。重新实现
-  // let fieldRender = render;
-  // let newValue = value;
-  // if (render && typeof render !== 'function') {
-  //   const { value, ...others } = render;
-  //   fieldRender = others;
-  //   if (value) {
-  //     newValue = getTargetValue(`${value}`, { ...record, record });
-  //     console.log("newValue", newValue);
-  //   }
-  // }
-  // 获取render
+      extra = infoItem.extra; // 获取处理过的 render
 
   var getRender = function getRender() {
+    var _processRenderFunctio;
+
     if (typeof render === 'function') {
       return render;
     }
 
-    return _objectSpread({
-      ellipsis: true,
-      emptyText: '-'
-    }, render);
+    var newRender = processBuriedPoint((_processRenderFunctio = processRenderFunction(render !== null && render !== void 0 ? render : {}, value, record)) !== null && _processRenderFunctio !== void 0 ? _processRenderFunctio : {}, value, record);
+    return newRender;
+  }; // 获取处理过的 dataSource
+
+
+  var getDataSource = function getDataSource() {
+    var newDataSource = null;
+
+    if (typeof dataSource === 'function') {
+      newDataSource = dataSource === null || dataSource === void 0 ? void 0 : dataSource(value, record);
+    } else {
+      newDataSource = (dataSource !== null && dataSource !== void 0 ? dataSource : []).map(function (item) {
+        return Object.fromEntries(Object.entries(item).map(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+              k = _ref2[0],
+              v = _ref2[1];
+
+          return [k, getTargetValue(v, _objectSpread(_objectSpread({}, record), {}, {
+            record: record,
+            value: value
+          }))];
+        }));
+      });
+    }
+
+    return newDataSource;
   }; // 浮层的显隐状态
 
 
@@ -115,6 +137,64 @@ var InfoValueItem = function InfoValueItem(props) {
 
     return /*#__PURE__*/React.createElement(React.Fragment, null);
   };
+  /**
+   * 处理 render 配置项是函数的情况
+   * @param render ProFieldRender
+   * @param value table cell value
+   * @param record table cell record
+   * @returns
+   */
+
+
+  var processRenderFunction = function processRenderFunction(render, value, record) {
+    var external = ['linkOnClick', 'link', 'value'];
+    return Object.fromEntries(Object.entries(render).map(function (_ref3) {
+      var _ref4 = _slicedToArray(_ref3, 2),
+          k = _ref4[0],
+          v = _ref4[1];
+
+      if (typeof v === 'function') {
+        var _v;
+
+        if (external.includes(k)) {
+          return [k, function () {
+            for (var _len = arguments.length, others = new Array(_len), _key = 0; _key < _len; _key++) {
+              others[_key] = arguments[_key];
+            }
+
+            return v === null || v === void 0 ? void 0 : v.apply(void 0, [value, record].concat(others));
+          }];
+        }
+
+        return [k, (_v = v === null || v === void 0 ? void 0 : v(value, record)) !== null && _v !== void 0 ? _v : ''];
+      }
+
+      return [k, v];
+    }));
+  };
+  /**
+   * 处理 render 数据，取出 {{xxx}} 匹配值
+   * @param render ProFieldRender
+   * @param record table cell record
+   * @returns
+   */
+
+
+  var processBuriedPoint = function processBuriedPoint(render, value, record) {
+    return Object.fromEntries([// 默认 ellipsis、descriptionEllipsis 为 true
+    // emptyText 默认为 '-'
+    ['ellipsis', true], ['descriptionEllipsis', true], ['emptyText', '-']].concat(_toConsumableArray(Object.entries(render).map(function (_ref5) {
+      var _ref6 = _slicedToArray(_ref5, 2),
+          k = _ref6[0],
+          v = _ref6[1];
+
+      return [k, getTargetValue(v, _objectSpread(_objectSpread({}, record), {}, {
+        record: record,
+        value: value
+      }))];
+    }))));
+  }; // 重写编辑逻辑替代field原有逻辑
+
 
   if (isEdit) {
     // 渲染表单
@@ -195,7 +275,8 @@ var InfoValueItem = function InfoValueItem(props) {
     }, /*#__PURE__*/React.createElement(ProField, _objectSpread({
       type: type,
       value: value,
-      render: getRender()
+      render: getRender(),
+      dataSource: getDataSource()
     }, others)), /*#__PURE__*/React.createElement(PopConfirm, {
       visible: popConfirmVisible,
       content: renderContent(),
@@ -226,7 +307,8 @@ var InfoValueItem = function InfoValueItem(props) {
   }, /*#__PURE__*/React.createElement(ProField, _objectSpread({
     type: type,
     value: value,
-    render: getRender()
+    render: getRender(),
+    dataSource: getDataSource()
   }, others)), renderAction(), extra && extra);
 };
 

package/es/info/components/baseInfo/index.d.ts

@@ -2,6 +2,8 @@ import React from 'react';
 import { ProInfoBaseProps, ProInfoTransparentBase } from '../../typing';
 import './index.scss';
 import { IUseInfoRequestResult } from '../../utils/useInfoRequest';
-declare type ProBaseInfoProps = ProInfoBaseProps & IUseInfoRequestResult & ProInfoTransparentBase;
+declare type ProBaseInfoProps = ProInfoBaseProps & IUseInfoRequestResult & ProInfoTransparentBase & {
+    size?: any;
+};
 declare const ProBaseInfo: React.FC<ProBaseInfoProps>;
 export default ProBaseInfo;