@teamix/pro 1.1.6 → 1.1.7

package/dist/pro.min.js.LICENSE.txt

@@ -20,7 +20,7 @@ object-assign
 
 /*!
 * screenfull
-* v5.1.0 - 2020-12-24
+* v5.2.0 - 2021-11-03
 * (c) Sindre Sorhus; MIT License
 */
 

package/es/form/ProForm/index.scss

@@ -37,9 +37,13 @@ $form-item-cls: #{$css-prefix}formily-item;
         > .teamix-pro-field-checkbox,
         .teamix-pro-field-radio,
         .teamix-pro-field-switch,
-        .teamix-pro-field-colorradio {
+        .teamix-pro-field-colorradio,
+        .#{$css-prefix}btn-text {
           line-height: var(--form-element-medium-height, 32px);
         }
+        > .#{$css-prefix}btn-text {
+          width: auto;
+        }
       }
     }
   }
@@ -93,9 +97,11 @@ $form-item-cls: #{$css-prefix}formily-item;
     .#{$form-item-cls}-control-content {
       .#{$form-item-cls}-addon-before {
         margin-right: 16px;
+        color: var(--color-text1-8, #848484);
       }
       .#{$form-item-cls}-addon-after {
         margin-left: 16px;
+        color: var(--color-text1-8, #848484);
       }
     }
   }

package/es/form/SchemaForm/index.js

@@ -236,9 +236,10 @@ export default /*#__PURE__*/memo(function (_ref) {
 
       var recursiveProperties = (children === null || children === void 0 ? void 0 : children.length) ? {
         properties: formatSchema(children)
-      } : {}; // 递归items（类似子组件）
+      } : {}; // 递归items（类似子组件，会先由各initialize方法格式化为固定形式，type不同不统一处理）
+      // 例如：[{ name: 'items', type: 'object', children: items }]
 
-      var recursiveItems = items ? formatSchema(items) : {}; // 配置组件属性
+      var recursiveItems = items ? formatSchema([items]) : {}; // 配置组件属性
 
       schemaProperties[name] = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, otherProps), formatParam), recursiveProperties), recursiveItems);
     });

package/es/form/SchemaForm/initializeArrayCards.js

@@ -1,68 +1,23 @@
-var _excluded = ["props", "children", "items"],
-    _excluded2 = ["itemType"];
-
-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 initializeChildren = function initializeChildren(item) {
-  return item;
-};
+var initializeItems = function initializeItems(items) {
+  if (items) {
+    return _objectSpread(_objectSpread({}, items), {}, {
+      name: 'items'
+    });
+  }
 
-var initializeAddition = function initializeAddition(item) {
-  return _objectSpread(_objectSpread({}, item), {}, {
-    component: 'ArrayCards.Addition'
-  });
-};
-
-var initializeString = function initializeString(items) {
-  return [{
-    name: 'items',
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
-};
-
-var initializeObject = function initializeObject(items) {
-  return [{
-    name: 'items',
-    type: 'object',
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
+  return items;
 };
 
 var initialize = function initialize(item) {
-  var _item$props = item.props,
-      props = _item$props === void 0 ? {} : _item$props,
-      _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children,
-      _item$items = item.items,
-      items = _item$items === void 0 ? [] : _item$items,
-      other = _objectWithoutProperties(item, _excluded);
-
-  var _props$itemType = props.itemType,
-      itemType = _props$itemType === void 0 ? 'string' : _props$itemType,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var renderItemsMap = {
-    string: initializeString(items),
-    object: initializeObject(items)
-  };
-  return _objectSpread(_objectSpread({}, other), {}, {
-    props: otherProps,
-    children: children.map(function (item) {
-      return initializeAddition(item);
-    }),
-    items: renderItemsMap[itemType]
+  var items = item.items;
+  return _objectSpread(_objectSpread({}, item), {}, {
+    items: items ? initializeItems(items) : {}
   });
 };
 

package/es/form/SchemaForm/initializeArrayCollapse.js

@@ -1,77 +1,23 @@
-var _excluded = ["props", "children", "items"],
-    _excluded2 = ["itemType", "title"];
-
-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 initializeChildren = function initializeChildren(item) {
-  return item;
-};
+var initializeItems = function initializeItems(items) {
+  if (items) {
+    return _objectSpread(_objectSpread({}, items), {}, {
+      name: 'items'
+    });
+  }
 
-var initializeAddition = function initializeAddition(item) {
-  return _objectSpread(_objectSpread({}, item), {}, {
-    component: 'ArrayCollapse.Addition'
-  });
-};
-
-var initializeString = function initializeString(items, props) {
-  return [{
-    name: 'items',
-    component: 'ArrayCollapse.CollapsePanel',
-    props: props,
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
-};
-
-var initializeObject = function initializeObject(items, props) {
-  return [{
-    type: 'object',
-    name: 'items',
-    component: 'ArrayCollapse.CollapsePanel',
-    props: props,
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
+  return items;
 };
 
 var initialize = function initialize(item) {
-  var _item$props = item.props,
-      props = _item$props === void 0 ? {} : _item$props,
-      _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children,
-      _item$items = item.items,
-      items = _item$items === void 0 ? [] : _item$items,
-      other = _objectWithoutProperties(item, _excluded);
-
-  var _props$itemType = props.itemType,
-      itemType = _props$itemType === void 0 ? 'string' : _props$itemType,
-      title = props.title,
-      otherProps = _objectWithoutProperties(props, _excluded2);
-
-  var renderItemsMap = {
-    string: initializeString(items, {
-      title: title
-    }),
-    object: initializeObject(items, {
-      title: title
-    })
-  };
-  return _objectSpread(_objectSpread({}, other), {}, {
-    props: otherProps,
-    children: children.map(function (item) {
-      return initializeAddition(item);
-    }),
-    items: renderItemsMap[itemType]
+  var items = item.items;
+  return _objectSpread(_objectSpread({}, item), {}, {
+    items: items ? initializeItems(items) : {}
   });
 };
 

package/es/form/SchemaForm/initializeArrayIcon.js

@@ -1,4 +1,5 @@
-var _excluded = ["component", "props"];
+var _excluded = ["component", "props"],
+    _excluded2 = ["icon"];
 
 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; }
 
@@ -15,12 +16,18 @@ import TeamixIcon from '@teamix/icon';
 
 var initialize = function initialize(item) {
   var component = item.component,
-      props = item.props,
+      _item$props = item.props,
+      props = _item$props === void 0 ? {} : _item$props,
       other = _objectWithoutProperties(item, _excluded);
 
+  var icon = props.icon,
+      otherProps = _objectWithoutProperties(props, _excluded2);
+
   var iconType = '';
 
-  if (component) {
+  if (icon) {
+    iconType = icon;
+  } else if (component) {
     if (/Addition/.test(component)) {
       iconType = 'add-line';
     } else if (/Remove/.test(component)) {
@@ -38,12 +45,12 @@ var initialize = function initialize(item) {
     component: component,
     props: _objectSpread({
       icon: function icon(props) {
-        return /*#__PURE__*/React.createElement(TeamixIcon, _objectSpread({
+        return /*#__PURE__*/React.createElement(TeamixIcon, _objectSpread(_objectSpread({}, props), {}, {
           type: iconType,
           size: "small"
-        }, props));
+        }));
       }
-    }, props)
+    }, otherProps)
   });
 };
 

package/es/form/SchemaForm/initializeArrayItems.js

@@ -1,96 +1,37 @@
-var _excluded = ["decoratorProps"],
-    _excluded2 = ["props", "children", "items"];
-
 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; }
+var initializeItems = function initializeItems(items) {
+  if (items) {
+    return _objectSpread(_objectSpread({}, items), {}, {
+      name: 'items'
+    });
+  }
 
-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; }
+  return items;
+};
 
 var initializeChildren = function initializeChildren(item) {
-  var decoratorProps = item.decoratorProps,
-      otherProps = _objectWithoutProperties(item, _excluded);
-
-  return _objectSpread({
+  var decoratorProps = item.decoratorProps;
+  return _objectSpread(_objectSpread({}, item), decoratorProps ? {
     decoratorProps: _objectSpread({
       feedbackLayout: 'none'
     }, decoratorProps)
-  }, otherProps);
-};
-
-var initializeAddition = function initializeAddition(item) {
-  return _objectSpread(_objectSpread({}, item), {}, {
-    component: 'ArrayItems.Addition'
-  });
-};
-
-var initializeString = function initializeString(items, props) {
-  return [{
-    name: 'items',
-    component: 'FormFlex',
-    props: props,
-    decoratorProps: {
-      feedbackLayout: 'none'
-    },
-    children: items.map(function (item) {
-      return initializeChildren(item);
-    })
-  }];
-};
-
-var initializeObject = function initializeObject(items, props) {
-  return [{
-    name: 'items',
-    type: 'object',
-    children: [{
-      component: 'FormFlex',
-      props: props,
-      children: items.map(function (item) {
-        return initializeChildren(item);
-      })
-    }]
-  }];
-};
-
-var initializeItems = function initializeItems(items, decoratorProps) {
-  return [{
-    name: 'items',
-    type: 'object',
-    decorator: 'ArrayItems.Item',
-    decoratorProps: decoratorProps,
-    children: items
-  }];
+  } : {});
 };
 
 var initialize = function initialize(item) {
-  var _item$props = item.props,
-      props = _item$props === void 0 ? {} : _item$props,
-      _item$children = item.children,
+  var _item$children = item.children,
       children = _item$children === void 0 ? [] : _item$children,
-      _item$items = item.items,
-      items = _item$items === void 0 ? [] : _item$items,
-      otherProps = _objectWithoutProperties(item, _excluded2);
-
-  var _props$itemType = props.itemType,
-      itemType = _props$itemType === void 0 ? 'string' : _props$itemType,
-      _props$itemTypeProps = props.itemTypeProps,
-      itemTypeProps = _props$itemTypeProps === void 0 ? {} : _props$itemTypeProps;
-  var renderItemsMap = {
-    string: initializeString(items, itemTypeProps),
-    object: initializeObject(items, itemTypeProps),
-    card: initializeItems(items, {
-      type: 'card'
-    })
-  };
-  return _objectSpread(_objectSpread({}, otherProps), {}, {
+      items = item.items;
+  return _objectSpread(_objectSpread({}, item), {}, {
     children: children.map(function (item) {
-      return initializeAddition(item);
+      return initializeChildren(item);
     }),
-    items: renderItemsMap[itemType]
+    items: items ? initializeItems(items) : {}
   });
 };
 

package/es/form/SchemaForm/initializeArrayTable.js

@@ -1,9 +1,4 @@
-var _excluded = ["title", "decoratorProps"],
-    _excluded2 = ["props", "children", "items"];
-
-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; }
+var _excluded = ["title", "decoratorProps"];
 
 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; }
 
@@ -11,55 +6,50 @@ 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; }
 
-var initializeChildren = function initializeChildren(item) {
-  return _objectSpread(_objectSpread({}, item), {}, {
-    component: 'ArrayTable.Addition'
-  });
-};
+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; }
 
 var initializeColumn = function initializeColumn(item) {
   var title = item.title,
       decoratorProps = item.decoratorProps,
-      otherProps = _objectWithoutProperties(item, _excluded);
+      children = _objectWithoutProperties(item, _excluded);
 
-  return _objectSpread(_objectSpread({}, otherProps), {}, {
+  return {
     component: 'ArrayTable.Column',
     props: _objectSpread(_objectSpread({}, decoratorProps), {}, {
       title: title
     }),
-    children: [_objectSpread({}, otherProps)]
-  });
+    children: [_objectSpread({}, children)]
+  };
 };
 
 var initializeItems = function initializeItems(items) {
-  return [{
-    name: 'items',
-    type: 'object',
-    children: items.map(function (item) {
-      return initializeColumn(item);
-    })
-  }];
+  if (items) {
+    var _items$children;
+
+    return _objectSpread(_objectSpread({}, items), {}, {
+      name: 'items',
+      children: (_items$children = items.children) === null || _items$children === void 0 ? void 0 : _items$children.map(function (item) {
+        return initializeColumn(item);
+      })
+    });
+  }
+
+  return items;
 };
 
 var initialize = function initialize(item) {
   var _item$props = item.props,
       props = _item$props === void 0 ? {} : _item$props,
-      _item$children = item.children,
-      children = _item$children === void 0 ? [] : _item$children,
-      _item$items = item.items,
-      items = _item$items === void 0 ? [] : _item$items,
-      otherProps = _objectWithoutProperties(item, _excluded2);
-
-  return _objectSpread(_objectSpread({}, otherProps), {}, {
+      items = item.items;
+  return _objectSpread(_objectSpread({}, item), {}, {
     props: _objectSpread({
       pagination: {
         pageSize: 10
       }
     }, props),
-    children: children.map(function (item) {
-      return initializeChildren(item);
-    }),
-    items: initializeItems(items)
+    items: items ? initializeItems(items) : {}
   });
 };
 

package/es/form/typing.d.ts

@@ -28,7 +28,7 @@ export interface IFormSchemaItem {
     dataSource?: any[];
     reactions?: any;
     rules?: any;
-    items?: IFormSchemaItem[];
+    items?: IFormSchemaItem;
     children?: IFormSchemaItem[];
     content?: any;
     tooltip?: string;
@@ -44,11 +44,8 @@ export interface IFormSchemaItem {
     request?: IRequestConfig;
 }
 export declare type IFormSchema = IFormSchemaItem[];
-export interface IInitialize {
-    (items: IFormSchemaItem[], props?: any): IFormSchemaItem[];
-}
 export interface IInitializeItem {
-    (items: IFormSchemaItem, props?: any): IFormSchemaItem;
+    (item: IFormSchemaItem, props?: any): IFormSchemaItem;
 }
 export interface IFormProps extends IFormLayoutProps {
     form?: FormType | false;

package/es/index.d.ts

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

package/es/index.js

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

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

@@ -32,9 +32,7 @@ var FormItem = function FormItem(prop) {
       span: wrapperCol.span,
       className: cls('value')
     }, loading && /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: '100%'
-      }
+      className: cls('base-skeleton-box')
     }, /*#__PURE__*/React.createElement(BaseSkeleton.Info, null)), !loading && /*#__PURE__*/React.createElement("div", null, value))));
   }
 
@@ -54,7 +52,9 @@ var FormItem = function FormItem(prop) {
       style: {
         marginLeft: labelGutter
       }
-    }, loading && /*#__PURE__*/React.createElement(BaseSkeleton.Info, null), !loading && /*#__PURE__*/React.createElement(React.Fragment, null, value))));
+    }, loading && /*#__PURE__*/React.createElement("div", {
+      className: cls('base-skeleton-box')
+    }, /*#__PURE__*/React.createElement(BaseSkeleton.Info, null)), !loading && /*#__PURE__*/React.createElement(React.Fragment, null, value))));
   }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null);

package/es/info/components/FormItem/index.scss

@@ -31,6 +31,7 @@ $item-padding-bottom: 8px;
   font-size: $text-size;
   display: unset;
   width: 100%;
+  padding-right: 20px;
 }
 
 .teamix-pro-field-info-form-item-header-label {
@@ -47,3 +48,13 @@ $item-padding-bottom: 8px;
   display: inline-block;
   width: 100%;
 }
+
+.teamix-pro-field-info-form-item-base-skeleton-box {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  span {
+    width: 100%
+  }
+}

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

@@ -55,7 +55,18 @@ var InfoValueItem = function InfoValueItem(props) {
       _infoItem$successMess = infoItem.successMessage,
       successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
       actions = infoItem.actions,
-      extra = infoItem.extra; // 浮层的显隐状态
+      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);
+  //   }
+  // }
+  // 浮层的显隐状态
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),

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

@@ -11,10 +11,9 @@ import FormItem from '../FormItem';
 import './index.scss';
 import { useSize } from '@teamix/hooks';
 import { getLayout } from '../../utils/utils';
-import { getTargetValue } from '@teamix/utils';
 import defaultLayoutMap from '../../utils/layout';
 import InfoValueItem from '../InfoValueItem';
-import { ProInfoGroupContext } from '../../utils';
+import { getDataIndexValue, ProInfoGroupContext } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -34,7 +33,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _item$title, _item$valueType, _item$dataIndex;
+      var _item$title, _item$valueType;
 
       var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
       return /*#__PURE__*/React.createElement(Col, {
@@ -45,7 +44,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
         loading: loading,
         value: /*#__PURE__*/React.createElement(InfoValueItem, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-          value: getTargetValue("{{".concat((_item$dataIndex = item === null || item === void 0 ? void 0 : item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : '', "}}"), dataSource !== null && dataSource !== void 0 ? dataSource : result),
+          value: getDataIndexValue(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,

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

@@ -6,7 +6,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { Grid } from '@alicloudfe/components';
 import ProCard from '../../../card';
-import { getTargetValue } from '@teamix/utils';
 import React, { useContext, useRef } from 'react';
 import FormItem from '../FormItem';
 import './index.scss';
@@ -14,7 +13,7 @@ import defaultLayoutMap from '../../utils/layout';
 import { useSize } from '@teamix/hooks';
 import { getLayout } from '../../utils/utils';
 import InfoValueItem from '../InfoValueItem';
-import { ProInfoGroupContext } from '../../utils';
+import { getDataIndexValue, ProInfoGroupContext } from '../../utils';
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -35,7 +34,7 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _item$title, _item$valueType, _item$dataIndex;
+      var _item$title, _item$valueType;
 
       var span = 24;
 
@@ -57,7 +56,7 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
         loading: loading,
         value: /*#__PURE__*/React.createElement(InfoValueItem, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-          value: getTargetValue("{{".concat((_item$dataIndex = item === null || item === void 0 ? void 0 : item.dataIndex) !== null && _item$dataIndex !== void 0 ? _item$dataIndex : '', "}}"), dataSource !== null && dataSource !== void 0 ? dataSource : result),
+          value: getDataIndexValue(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,