@teamix/pro 1.1.36 → 1.1.40

package/es/form/utils.js

@@ -24,6 +24,7 @@ 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 { isVoidField } from '@formily/core';
 import { useFormLayout, useFormShallowLayout } from '@teamix/formily';
 import { isArr, isObj, getValueByValue } from '@teamix/utils';
 import schemaNameMap from './schemaNameMap';
@@ -76,6 +77,42 @@ var mapStatus = function mapStatus(props, field) {
   });
 };
 
+var patchDataSource = function patchDataSource() {
+  var dataSource = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+
+  var removeEmptyChildren = function removeEmptyChildren(data) {
+    var result = _objectSpread({}, data);
+
+    if (!result.children || result.children.length === 0) {
+      delete result.children;
+    } else {
+      result.children = result.children.map(removeEmptyChildren);
+    }
+
+    return result;
+  };
+
+  return dataSource.map(removeEmptyChildren);
+};
+
+var mapDataSource = function mapDataSource(props, field) {
+  var _props$dataSource;
+
+  if (isVoidField(field)) {
+    return props;
+  }
+
+  return _objectSpread(_objectSpread({}, props), {}, {
+    dataSource: patchDataSource((_props$dataSource = props.dataSource) !== null && _props$dataSource !== void 0 ? _props$dataSource : field === null || field === void 0 ? void 0 : field.dataSource)
+  });
+};
+
+var mapMode = function mapMode(props, field) {
+  return _objectSpread(_objectSpread({}, props), {}, {
+    mode: (field === null || field === void 0 ? void 0 : field.readPretty) ? 'read' : 'edit'
+  });
+};
+
 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)));
@@ -131,4 +168,4 @@ var mergeArrayValue = function mergeArrayValue(arr, v) {
   return [].concat(_toConsumableArray(arr), [v]);
 };
 
-export { getRandomName, mapSize, mapStatus, mergeArrayValue, mapSchemaName };
+export { mapSize, mapStatus, mapDataSource, mapMode, mergeArrayValue, getRandomName, mapSchemaName };

package/es/form/warning.d.ts

@@ -1,3 +1,3 @@
-import type { IInitializeItem } from './typing';
-declare const warning: IInitializeItem;
+import type { ProFormInitializeItem } from './typing';
+declare const warning: ProFormInitializeItem;
 export default warning;

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.35";
+declare const version = "1.1.39";
 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.35';
+var version = '1.1.39';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils };

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

@@ -1,35 +1,93 @@
-import React, { useRef } from 'react';
+var _excluded = ["children", "url", "method", "params", "formatResult", "onSuccess", "onError", "formatParams", "beforeRequest", "extendParams", "className", "compacted", "divider", "style", "backgroundColor"];
+
+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 React, { isValidElement, useRef } from 'react';
 import { ProInfoGroupContext } from '../../utils';
 import { useSize } from '@teamix/hooks';
 import './index.scss';
+import cls from 'classnames';
+import ProInfo from '../..';
 
 var ProInfoGroup = function ProInfoGroup(props) {
   var children = props.children,
       url = props.url,
       method = props.method,
       params = props.params,
-      formatResult = props.formatResult;
+      formatResult = props.formatResult,
+      onSuccess = props.onSuccess,
+      onError = props.onError,
+      formatParams = props.formatParams,
+      beforeRequest = props.beforeRequest,
+      extendParams = props.extendParams,
+      _props$className = props.className,
+      className = _props$className === void 0 ? '' : _props$className,
+      _props$compacted = props.compacted,
+      compacted = _props$compacted === void 0 ? true : _props$compacted,
+      _props$divider = props.divider,
+      divider = _props$divider === void 0 ? true : _props$divider,
+      style = props.style,
+      _props$backgroundColo = props.backgroundColor,
+      backgroundColor = _props$backgroundColo === void 0 ? '' : _props$backgroundColo,
+      others = _objectWithoutProperties(props, _excluded);
+
   var ref = useRef();
   var size = useSize(ref);
-  return /*#__PURE__*/React.createElement(ProInfoGroupContext.Provider, {
-    value: {
-      visible: true,
-      size: size,
-      url: url,
-      method: method,
-      params: params,
-      formatResult: formatResult
+  var infoType = 'infoDom';
+
+  if (Array.isArray(children)) {
+    if ( /*#__PURE__*/isValidElement(children === null || children === void 0 ? void 0 : children[0])) {
+      infoType = 'infoDomGroup';
+    } else {
+      infoType = 'infoPropsGroup';
     }
+  }
+
+  var providerValue = {
+    visible: true,
+    size: size,
+    url: url,
+    method: method,
+    params: params,
+    formatResult: formatResult,
+    onSuccess: onSuccess,
+    onError: onError,
+    formatParams: formatParams,
+    beforeRequest: beforeRequest,
+    extendParams: extendParams
+  };
+  var proInfoClassName = cls({
+    'teamix-pro-info-group-item': true,
+    'teamix-pro-info-group-item-divider': divider
+  });
+  return /*#__PURE__*/React.createElement(ProInfoGroupContext.Provider, {
+    value: providerValue
   }, /*#__PURE__*/React.createElement("div", {
-    className: "teamix-pro-info-group",
+    className: "teamix-pro-info-group ".concat(backgroundColor, " ").concat(className),
+    style: style,
     ref: ref
-  }, Array.isArray(children) && (children === null || children === void 0 ? void 0 : children.map(function (item, index) {
+  }, infoType === 'infoDomGroup' && (children === null || children === void 0 ? void 0 : children.map(function (item, index) {
     return /*#__PURE__*/React.createElement("div", {
-      className: "teamix-pro-info-group-item",
+      className: proInfoClassName,
       key: index
     }, item);
-  })), !Array.isArray(children) && /*#__PURE__*/React.createElement("div", {
-    className: "teamix-pro-info-group-item"
+  })), infoType === 'infoPropsGroup' && (children === null || children === void 0 ? void 0 : children.map(function (item, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      className: proInfoClassName,
+      key: index
+    }, /*#__PURE__*/React.createElement(ProInfo, _objectSpread({
+      compacted: compacted
+    }, item)));
+  })), infoType === 'infoDom' && /*#__PURE__*/React.createElement("div", {
+    className: proInfoClassName
   }, children)));
 };
 

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

@@ -1,14 +1,32 @@
 .teamix-pro-info-group {
   &-item {
+ 
     margin-top: 16px;
-    border-bottom: 1px solid var(--color-line1-1, #eaeaea);
-    margin-bottom: 16px;
+    margin-bottom: 0;
 
     .teamix-pro-info {
-      padding-bottom: 8px;
+      padding-bottom: 0;
+
+      .teamix-pro-card-content {
+        padding-bottom: calc(var(--card-body-padding-bottom, 16px) - 8px)
+      }
+      
+      .compacted {
+        margin-bottom: -8px;
+      }
+    }
+
+    &-divider {
+      border-bottom: 1px solid var(--color-line1-1, #eaeaea);
+      margin-bottom: 16px;
+      .teamix-pro-info {
+        padding-bottom: 16px;
+      }
     }
     
   }
+
+
   .teamix-pro-info-group-item:last-child {
     border-bottom: 0;
     margin-bottom: 0;
@@ -19,4 +37,28 @@
   .teamix-pro-info-group-item:first-child {
     margin-top: 0;
   }
+
+  &.blue {
+    background-color: var(--color-notice-1);
+  }
+
+  &.orange {
+    background-color: var(--color-warning-1);
+  }
+
+  &.yellow {
+    background-color: var(--color-help-1);
+  }
+
+  &.red {
+    background-color: var(--color-error-1);
+  }
+
+  &.green {
+    background-color: var(--color-success-1);
+  }
+
+  &.grey {
+    background-color: var(--color-fill1-2);
+  }
 }

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

@@ -38,7 +38,7 @@ import React, { useMemo, useState } from 'react';
 import './index.scss';
 import ProForm, { createForm, formilyReactive } from '../../../form';
 import { Message } from '@alicloudfe/components';
-import { ActionGroup } from '../../../actions';
+import { ProActionGroup } from '../../../actions';
 var cls = baseClass('teamix-pro-info');
 var toJS = formilyReactive.toJS;
 
@@ -70,7 +70,9 @@ var InfoValueItem = function InfoValueItem(props) {
     var _processRenderFunctio;
 
     if (typeof render === 'function') {
-      return render;
+      return function () {
+        render(value, record);
+      };
     }
 
     var newRender = processBuriedPoint((_processRenderFunctio = processRenderFunction(render !== null && render !== void 0 ? render : {}, value, record)) !== null && _processRenderFunctio !== void 0 ? _processRenderFunctio : {}, value, record);
@@ -126,11 +128,14 @@ var InfoValueItem = function InfoValueItem(props) {
 
   var renderAction = function renderAction() {
     if (actions) {
-      return /*#__PURE__*/React.createElement(ActionGroup, {
+      return /*#__PURE__*/React.createElement(ProActionGroup, {
         actions: actions,
         type: "text",
         style: {
           marginLeft: '8px'
+        },
+        context: {
+          record: record
         }
       });
     }
@@ -303,7 +308,7 @@ var InfoValueItem = function InfoValueItem(props) {
   }
 
   return /*#__PURE__*/React.createElement("div", {
-    className: cls()
+    className: cls('item-value')
   }, /*#__PURE__*/React.createElement(ProField, _objectSpread({
     type: type,
     value: value,

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

@@ -17,5 +17,9 @@
   }
 }
 .teamix-pro-info {
-  display: flex;
+  &-item-value {
+    display: flex;
+    align-items: center;
+  }
+  
 }

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

@@ -1,5 +1,5 @@
 import { Grid } from '@alicloudfe/components';
-import { BaseSkeleton } from '../../..';
+import { ProSkeletonRaw } from '../../..';
 import { baseClass, Ellipsis, LabelIconTip } from '@teamix/utils';
 import React from 'react';
 import './index.scss';
@@ -35,7 +35,7 @@ var ProInfoItem = function ProInfoItem(prop) {
       className: cls('value')
     }, loading && /*#__PURE__*/React.createElement("div", {
       className: cls('base-skeleton-box')
-    }, /*#__PURE__*/React.createElement(BaseSkeleton.Info, null)), !loading && /*#__PURE__*/React.createElement("div", null, value))));
+    }, /*#__PURE__*/React.createElement(ProSkeletonRaw.Info.Item, null)), !loading && /*#__PURE__*/React.createElement("div", null, value))));
   }
 
   if (headerInfoLayout) {
@@ -56,7 +56,7 @@ var ProInfoItem = function ProInfoItem(prop) {
       }
     }, loading && /*#__PURE__*/React.createElement("div", {
       className: cls('base-skeleton-box')
-    }, /*#__PURE__*/React.createElement(BaseSkeleton.Info, null)), !loading && /*#__PURE__*/React.createElement(React.Fragment, null, value))));
+    }, /*#__PURE__*/React.createElement(ProSkeletonRaw.Info.Item, null)), !loading && /*#__PURE__*/React.createElement(React.Fragment, null, value))));
   }
 
   return /*#__PURE__*/React.createElement(React.Fragment, null);

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

@@ -47,6 +47,7 @@ $item-padding-bottom: 8px;
   font-size: $header-text-size;
   display: inline-block;
   width: 100%;
+  padding-right: 20px;
 }
 
 .teamix-pro-field-info-form-item-base-skeleton-box {

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

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

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

@@ -19,28 +19,47 @@ var ProBaseInfo = function ProBaseInfo(props) {
       actionRef = props.actionRef,
       layout = props.layout,
       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 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(colspan) {
+    var formItemLayout = JSON.parse(JSON.stringify(defaultLayout.formItemLayout)); // 自定义布局
 
-  var getFormItemLayout = function getFormItemLayout() {
     if (layout) {
       var _layout$labelCol, _layout$wrapperCol;
 
-      return {
-        labelCol: (_layout$labelCol = layout === null || layout === void 0 ? void 0 : layout.labelCol) !== null && _layout$labelCol !== void 0 ? _layout$labelCol : defaultLayout.formItemLayout.labelCol,
-        wrapperCol: (_layout$wrapperCol = layout === null || layout === void 0 ? void 0 : layout.wrapperCol) !== null && _layout$wrapperCol !== void 0 ? _layout$wrapperCol : defaultLayout.formItemLayout.wrapperCol
-      };
+      var labelCol = (_layout$labelCol = layout === null || layout === void 0 ? void 0 : layout.labelCol) !== null && _layout$labelCol !== void 0 ? _layout$labelCol : defaultLayout.formItemLayout.labelCol;
+      var wrapperCol = (_layout$wrapperCol = layout === null || layout === void 0 ? void 0 : layout.wrapperCol) !== null && _layout$wrapperCol !== void 0 ? _layout$wrapperCol : defaultLayout.formItemLayout.wrapperCol;
+      formItemLayout.labelCol = labelCol;
+      formItemLayout.wrapperCol = wrapperCol;
+    }
+
+    var newLabelSpan = formItemLayout.labelCol.span;
+    var newWrapperSpan = formItemLayout.wrapperCol.span; // 计算合并列情况。label与wrapper需要重新计算
+
+    if (colspan) {
+      newLabelSpan = newLabelSpan / colspan;
+      newWrapperSpan = newWrapperSpan + (formItemLayout.labelCol.span - newLabelSpan);
     }
 
-    return defaultLayout.formItemLayout;
+    var newFormItemLayout = {
+      labelCol: {
+        span: newLabelSpan
+      },
+      wrapperCol: {
+        span: newWrapperSpan
+      }
+    };
+    return Object.assign(formItemLayout, newFormItemLayout);
   };
 
   var renderContent = function renderContent() {
     return columns.map(function (item, index) {
-      var _layout$span, _item$title, _item$valueType, _ref;
+      var _layout$span, _layout$span2, _item$title, _item$valueType, _ref, _item$colSpan;
 
       var span = item.colSpan ? defaultLayout.span * item.colSpan : defaultLayout.span;
+      var layoutSpan = item.colSpan ? ((_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span) * item.colSpan : (_layout$span2 = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span2 !== void 0 ? _layout$span2 : span;
       return /*#__PURE__*/React.createElement(Col, {
-        span: (_layout$span = layout === null || layout === void 0 ? void 0 : layout.span) !== null && _layout$span !== void 0 ? _layout$span : span,
+        span: layoutSpan,
         key: index
       }, /*#__PURE__*/React.createElement(ProInfoItem, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
@@ -54,7 +73,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
           actionRef: actionRef
         }),
-        baseInfoLayout: getFormItemLayout(),
+        baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
         tooltip: item.tooltip,
         tooltipIcon: item.tooltipIcon
       }));

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

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

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

@@ -1,8 +1,7 @@
 import React from 'react';
 import './index.scss';
-import { IProTableInfo, ProInfoTransparentBase } from '../../typing';
+import { IProTableInfo, ProInfoTransparentBase, ProInfoTransRequestResult } from '../../typing';
 import './index.scss';
-import { IUseInfoRequestResult } from '../../utils/useInfoRequest';
-declare type ProTableInfoProps = IProTableInfo & IUseInfoRequestResult & ProInfoTransparentBase;
+declare type ProTableInfoProps = IProTableInfo & ProInfoTransRequestResult & ProInfoTransparentBase;
 declare const ProTableInfo: React.FC<ProTableInfoProps>;
 export default ProTableInfo;

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

@@ -22,7 +22,7 @@ import { Table } from '@alicloudfe/components';
 import './index.scss';
 import { LabelIconTip } from '@teamix/utils';
 import InfoValueItem from '../InfoValueItem';
-import { BaseSkeleton } from '../../..';
+import { ProSkeletonRaw } from '../../..';
 import { getDataIndexValue } from '../../utils';
 
 var ProTableInfo = function ProTableInfo(props) {
@@ -108,7 +108,7 @@ var ProTableInfo = function ProTableInfo(props) {
           label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
           tooltip: item.tooltip,
           icon: item.tooltipIcon
-        })), _defineProperty(_data, "value_".concat(index), /*#__PURE__*/React.createElement(React.Fragment, null, loading && /*#__PURE__*/React.createElement(BaseSkeleton.Info, null), !loading && getInfoValueItem(item))), _data);
+        })), _defineProperty(_data, "value_".concat(index), /*#__PURE__*/React.createElement(React.Fragment, null, loading && /*#__PURE__*/React.createElement(ProSkeletonRaw.Info.Item, null), !loading && getInfoValueItem(item))), _data);
 
         if (item.colSpan) {
           data['formatter'] = {