@teamix/pro 1.1.32 → 1.1.36

package/es/form/SchemaForm/initializeReactions.js

@@ -1,13 +1,89 @@
+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 _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 _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { isPlainObj, getValueByValue } from '@teamix/utils';
 import { mergeArrayValue } from '../utils';
+import schemaNameMap from '../schemaNameMap';
 
-var initializeReactions = function initializeReactions(reactions, innerReactions) {
-  if (reactions && innerReactions.length) {
-    return mergeArrayValue(innerReactions, reactions);
-  } else if (innerReactions.length) {
-    return innerReactions;
+var mapSchemaName = function mapSchemaName(schema) {
+  if (isPlainObj(schema)) {
+    var newSchema = {};
+    Object.entries(schema).forEach(function (_ref) {
+      var _ref2 = _slicedToArray(_ref, 2),
+          key = _ref2[0],
+          value = _ref2[1];
+
+      var _key$split = key.split('.'),
+          _key$split2 = _toArray(_key$split),
+          firstKey = _key$split2[0],
+          otherKey = _key$split2.slice(1);
+
+      var newFirstKey = getValueByValue(schemaNameMap, firstKey, {
+        inputKey: 'proForm',
+        outputKey: 'formily'
+      }) || firstKey;
+      var newKey = [newFirstKey].concat(_toConsumableArray(otherKey)).join('.');
+      newSchema[newKey] = value;
+    });
+    return newSchema;
   }
 
-  return reactions;
+  return schema;
+};
+
+var initializeReactions = function initializeReactions(reactions, innerReactions) {
+  var temp = innerReactions; // 合并reactions
+
+  if (reactions) {
+    temp = mergeArrayValue(innerReactions, reactions);
+  } // schema名称映射，由ProFormSchema映射为formilySchema
+
+
+  temp = temp.map(function (item) {
+    var _item$fulfill, _item$otherwise;
+
+    var fulfillSchema = mapSchemaName(item === null || item === void 0 ? void 0 : (_item$fulfill = item.fulfill) === null || _item$fulfill === void 0 ? void 0 : _item$fulfill.schema);
+    var otherwiseSchema = mapSchemaName(item === null || item === void 0 ? void 0 : (_item$otherwise = item.otherwise) === null || _item$otherwise === void 0 ? void 0 : _item$otherwise.schema);
+
+    if (fulfillSchema || otherwiseSchema) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        fulfill: _objectSpread(_objectSpread({}, item === null || item === void 0 ? void 0 : item.fulfill), {}, {
+          schema: fulfillSchema
+        }),
+        otherwise: _objectSpread(_objectSpread({}, item === null || item === void 0 ? void 0 : item.otherwise), {}, {
+          schema: otherwiseSchema
+        })
+      });
+    }
+
+    return item;
+  });
+  return temp;
 };
 
 export default initializeReactions;

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/form/index.d.ts

@@ -13,10 +13,10 @@ export * as formilyTeamix from '@teamix/formily';
  * 导出常用formily内容，需谨慎限制
  */
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
-import { FormConsumer } from '@formily/react';
+import { FormConsumer, useForm } from '@formily/react';
 import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
-import { getDisplayValues } from './utils';
-export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, getDisplayValues, };
+import useFormDisplayValues from './ProForm/useFormDisplayValues';
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, useForm, useFormDisplayValues, };
 /**
  * 导出 Filter 组件
  */

package/es/form/index.js

@@ -19,10 +19,10 @@ export { _formilyTeamix as formilyTeamix };
  */
 
 import { createForm, registerValidateRules as registerRules, registerValidateFormats as registerFormats, registerValidateLocale, setValidateLanguage } from '@formily/core';
-import { FormConsumer } from '@formily/react';
+import { FormConsumer, useForm } from '@formily/react';
 import { FormDialog, FormDrawer, FormStep, FormTab, FormCollapse } from '@teamix/formily';
-import { getDisplayValues } from './utils';
-export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, getDisplayValues };
+import useFormDisplayValues from './ProForm/useFormDisplayValues';
+export { createForm, FormConsumer, FormDialog, FormDrawer, FormStep, FormTab, FormCollapse, registerRules, registerFormats, registerValidateLocale, setValidateLanguage, useForm, useFormDisplayValues };
 /**
  * 导出 Filter 组件
  */

package/es/form/typing.d.ts

@@ -6,7 +6,7 @@ export interface anyObject {
     [propName: string]: any;
 }
 declare type FieldDisplayTypes = 'none' | 'hidden' | 'visible';
-export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'Range' | 'Search';
+export declare type IBaseComponent = 'Input' | 'Password' | 'TextArea' | 'NumberPicker' | 'Percent' | 'Money' | 'Select' | 'MultipleSelect' | 'TreeSelect' | 'Cascader' | 'MultipleCascader' | 'ArbitraryCascader' | 'Radio' | 'Checkbox' | 'Switch' | 'DatePicker' | 'TimePicker' | 'DateTimePicker' | 'WeekPicker' | 'MonthPicker' | 'YearPicker' | 'QuarterPicker' | 'DateRangePicker' | 'TimeRangePicker' | 'DateTimeRangePicker' | 'WeekRangePicker' | 'MonthRangePicker' | 'YearRangePicker' | 'QuarterRangePicker' | 'Transfer' | 'Upload' | 'ColorPicker' | 'ColorRadio' | 'IconPicker' | 'JsonInput' | 'TagPicker' | 'MultipleTagPicker' | 'Range' | 'Search';
 export declare type IButtonComponent = 'Submit' | 'Reset';
 export declare type IComboComponent = 'ArrayCards' | 'ArrayCards.Addition' | 'ArrayCards.Remove' | 'ArrayCards.MoveUp' | 'ArrayCards.MoveDown' | 'ArrayCards.Index' | 'ArrayCollapse' | 'ArrayCollapse.CollapsePanel' | 'ArrayCollapse.Addition' | 'ArrayCollapse.Remove' | 'ArrayCollapse.MoveUp' | 'ArrayCollapse.MoveDown' | 'ArrayCollapse.Index' | 'ArrayTable' | 'ArrayTable.Column' | 'ArrayTable.SortHandle' | 'ArrayTable.Addition' | 'ArrayTable.Remove' | 'ArrayTable.MoveDown' | 'ArrayTable.MoveUp' | 'ArrayTable.Index' | 'ArrayItems' | 'ArrayItems.Item' | 'ArrayItems.SortHandle' | 'ArrayItems.Addition' | 'ArrayItems.Remove' | 'ArrayItems.MoveDown' | 'ArrayItems.MoveUp' | 'ArrayItems.Index' | 'Editable' | 'Editable.Popover' | 'Editable.Dialog' | 'Editable.Drawer';
 export declare type ILayoutComponent = 'FormFlex' | 'FormGrid' | 'FormGroup' | 'FormGroup.GroupPanel' | 'Search' | 'Search.SearchPanel' | 'FormTab' | 'FormTab.TabPane' | 'FormStep' | 'FormStep.StepPane' | 'FormCollapse' | 'FormCollapse.CollapsePanel' | 'FormButtonGroup' | 'FormDialog' | 'FormDrawer' | 'FormDialog.Footer' | 'FormDrawer.Footer';
@@ -57,7 +57,7 @@ export interface IFormProps extends IFormLayoutProps {
     initialValues?: anyObject;
     initialRequest?: CommonRequestConfig;
     previewTextPlaceholder?: ReactNode;
-    onChange?: (values: any, displayValues: any) => any;
+    onChange?: (values: any, displayValues?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }

package/es/form/utils.d.ts

@@ -1,14 +1,37 @@
-import { getValueByValue } from '@teamix/utils';
+/**
+ * 映射字段size，主要是default转medium
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+declare const mapSize: (props: any, field: any) => any;
+/**
+ * 映射字段state
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+declare const mapStatus: (props: any, field: any) => any;
+/**
+ * 为未配置name的字段添加随机字段名称
+ * @param prefix 随机字段名称前缀，默认为name
+ * @returns 随机字段名称
+ */
 interface IGetRandomName {
     (prefix?: string): string;
 }
-declare const mapSize: (props: any, field: any) => any;
-declare const mapStatus: (props: any, field: any) => any;
 declare const getRandomName: IGetRandomName;
+/**
+ * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
+ * @param obj
+ * @returns
+ */
 declare const mapSchemaName: (obj: any) => any;
+/**
+ * 合并数组或非数组，不移除无效值
+ * @param arr 数组
+ * @param v 数组或其他
+ * @returns 合并数组或合并其他值
+ */
 declare const mergeArrayValue: (arr: any[], v?: any) => any[];
-interface IGetDisplayValues {
-    (form: any, values: any, prefix?: string): any;
-}
-declare const getDisplayValues: IGetDisplayValues;
-export { getRandomName, getValueByValue, getDisplayValues, mapSize, mapStatus, mergeArrayValue, mapSchemaName, };
+export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };

package/es/form/utils.js

@@ -27,6 +27,12 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { useFormLayout, useFormShallowLayout } from '@teamix/formily';
 import { isArr, isObj, getValueByValue } from '@teamix/utils';
 import schemaNameMap from './schemaNameMap';
+/**
+ * 映射字段size，主要是default转medium
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
 
 var mapSize = function mapSize(props, field) {
   var layout = _objectSpread(_objectSpread({}, useFormShallowLayout()), useFormLayout());
@@ -39,6 +45,13 @@ var mapSize = function mapSize(props, field) {
     size: props.size || takeSize()
   });
 };
+/**
+ * 映射字段state
+ * @param props component的props
+ * @param field 当前字段实例
+ * @returns 映射后的字段属性
+ */
+
 
 var mapStatus = function mapStatus(props, field) {
   var takeStatus = function takeStatus() {
@@ -66,7 +79,12 @@ var mapStatus = function mapStatus(props, field) {
 var getRandomName = function getRandomName() {
   var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'name';
   return "".concat(prefix, "_").concat(Math.floor(Math.random() * Math.pow(10, 18)));
-}; // 将ProForm的key映射为formily的key，然后筛除掉无效的keyvalue
+};
+/**
+ * 将ProForm的key映射为formily的key，然后筛除掉无效的key/value
+ * @param obj
+ * @returns
+ */
 
 
 var mapSchemaName = function mapSchemaName(obj) {
@@ -97,6 +115,13 @@ var mapSchemaName = function mapSchemaName(obj) {
   });
   return temp;
 };
+/**
+ * 合并数组或非数组，不移除无效值
+ * @param arr 数组
+ * @param v 数组或其他
+ * @returns 合并数组或合并其他值
+ */
+
 
 var mergeArrayValue = function mergeArrayValue(arr, v) {
   if (isArr(v)) {
@@ -104,48 +129,6 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
   }
 
   return [].concat(_toConsumableArray(arr), [v]);
-}; // 获取form的displayValues
-
-
-var getDisplayValues = function getDisplayValues(form, values) {
-  var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
-  var displayValues = {}; // 在form实例中，通过name获取该field的值在dataSource对应的label
-
-  var getLabelByKey = function getLabelByKey(name, value) {
-    var address = form.indexes[name] || '';
-    var field = form.query(address).take() || {};
-    var dataSource = field.dataSource;
-    return getValueByValue(dataSource, value);
-  };
-
-  Object.entries(values).forEach(function (_ref3) {
-    var _ref4 = _slicedToArray(_ref3, 2),
-        key = _ref4[0],
-        value = _ref4[1];
-
-    var label;
-
-    if (isArr(value)) {
-      value.map(function (v, i) {
-        if (isObj(v)) {
-          // 值是对象数组
-          label = getDisplayValues(form, v, "".concat(prefix).concat(key, ".").concat(i, "."));
-        } else if (isArr(v)) {
-          // 值是多重数组
-          console.warn('Multiple array, Please dingding qilou.zhl.');
-        } else if (v !== undefined && v !== null) {
-          label = getLabelByKey("".concat(prefix).concat(key, ".").concat(i), value);
-        }
-      });
-    } else if (isObj(value)) {
-      label = getDisplayValues(form, value, "".concat(key, "."));
-    } else {
-      label = getLabelByKey("".concat(prefix).concat(key), value);
-    }
-
-    displayValues[key] = label;
-  });
-  return displayValues;
 };
 
-export { getRandomName, getValueByValue, getDisplayValues, mapSize, mapStatus, mergeArrayValue, mapSchemaName };
+export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };

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.31";
+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.31';
+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;

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

@@ -1,44 +1,24 @@
-var _excluded = ["header", "columns", "dataSource", "loading", "result", "actionRef", "className", "layout"];
-
-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 { Grid } from '@alicloudfe/components';
-import { ProCard } from '../../../';
-import React, { useContext, useRef } from 'react';
+import React from 'react';
 import ProInfoItem from '../ProInfoItem';
 import './index.scss';
-import { useSize } from '@teamix/hooks';
 import { getLayout } from '../../utils/utils';
 import defaultLayoutMap from '../../utils/layout';
 import InfoValueItem from '../InfoValueItem';
-import { getDataIndexValue, ProInfoGroupContext } from '../../utils';
+import { getDataIndexValue } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
 var ProBaseInfo = function ProBaseInfo(props) {
   var _size$width;
 
-  var header = props.header,
-      columns = props.columns,
+  var columns = props.columns,
       dataSource = props.dataSource,
       loading = props.loading,
       result = props.result,
       actionRef = props.actionRef,
-      className = props.className,
       layout = props.layout,
-      others = _objectWithoutProperties(props, _excluded);
-
-  var context = useContext(ProInfoGroupContext);
-  var ref = useRef();
-  var size = context.visible ? context.size : useSize(ref);
+      size = props.size;
   var defaultLayout = defaultLayoutMap[getLayout((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)]; // 获取列的布局参数
 
   var getFormItemLayout = function getFormItemLayout() {
@@ -81,17 +61,10 @@ var ProBaseInfo = function ProBaseInfo(props) {
     });
   };
 
-  return /*#__PURE__*/React.createElement("div", _objectSpread({
-    ref: ref,
-    className: "teamix-pro-info ".concat(className !== null && className !== void 0 ? className : '')
-  }, others), (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(ProCard, _objectSpread({
-    compacted: true,
-    hoveredShadow: false,
-    bordered: false
-  }, header), /*#__PURE__*/React.createElement(Row, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/React.createElement(Row, {
     wrap: true,
     className: "teamix-pro-info-content-row"
-  }, renderContent())));
+  }, renderContent()));
 };
 
 export default ProBaseInfo;

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

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