@teamix/pro 1.4.10 → 1.4.13

package/es/actions/index.scss

@@ -114,7 +114,7 @@
       margin-top: 10px;
       padding-bottom: 10px;
       .next-col.next-col-24:last-child {
-        .teamix-pro-field-info-form-item:last-child {
+        .teamix-pro-info-item:last-child {
           padding-bottom: 0px;
         }
       }

package/es/form/ProForm/index.scss

@@ -236,6 +236,11 @@
 }
 
 // 按钮样式
+.teamix-button-group-item.#{$form-item-cls}-layout-vertical {
+  > .#{$css-prefix}formily-item-label {
+    display: none;
+  }
+}
 .#{$css-prefix}formily-button-group {
   margin-top: var(--form-element-medium-height, 32px);
 }

package/es/form/SchemaForm/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["component", "type", "name", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request", "data"];
+var _excluded = ["type", "name", "component", "props", "decorator", "decoratorProps", "dataSource", "reactions", "rules", "children", "items", "tooltip", "request", "data"];
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -32,7 +32,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import React, { memo, useCallback, useRef, useMemo } from 'react';
 import { createSchemaField } from '@formily/react';
-import { isUsable } from '@teamix/utils';
+import { cls, isUsable } from '@teamix/utils';
 import adapterType from './adapterType';
 import adapterComponent from './adapterComponent';
 import adapterDecorator from './adapterDecorator';
@@ -134,9 +134,10 @@ export default /*#__PURE__*/memo(function (_ref) {
       }
 
       var _newItem2 = newItem,
-          component = _newItem2.component,
           type = _newItem2.type,
           name = _newItem2.name,
+          component = _newItem2.component,
+          props = _newItem2.props,
           decorator = _newItem2.decorator,
           decoratorProps = _newItem2.decoratorProps,
           dataSource = _newItem2.dataSource,
@@ -172,7 +173,8 @@ export default /*#__PURE__*/memo(function (_ref) {
           defaultDataSource = _initializeDataSource.dataSource,
           dataSourceReactions = _initializeDataSource.reactions,
           dataSourceScope = _initializeDataSource.scope,
-          dataSourceData = _initializeDataSource.data; // 初始化rules validator
+          dataSourceData = _initializeDataSource.data,
+          dataSourceProps = _initializeDataSource.props; // 初始化rules validator
 
 
       var _initializeRules = initializeRules(rules, "".concat(suffix, "v")),
@@ -188,10 +190,16 @@ export default /*#__PURE__*/memo(function (_ref) {
             v = _ref3[1];
 
         schemaScopeRef.current[k] = v;
+      }); // 合并字段属性
+
+      var defaultProps = _objectSpread(_objectSpread(_objectSpread({}, props), dataSourceProps), {}, {
+        className: cls(props === null || props === void 0 ? void 0 : props.className, dataSourceProps === null || dataSourceProps === void 0 ? void 0 : dataSourceProps.className)
       });
+
       var formatParam = mapSchemaName(_objectSpread(_objectSpread({}, otherProps), {}, {
         type: defaultType,
         component: component,
+        props: defaultProps,
         decorator: defaultDecorator,
         decoratorProps: defaultDecoratorProps,
         rules: defaultRules,

package/es/form/SchemaForm/initializeDataSource.d.ts

@@ -6,6 +6,9 @@ interface IInitializeDataSource {
             [x: string]: any;
         };
         data?: any;
+        props?: {
+            [x: string]: any;
+        };
     };
 }
 declare const initializeDataSource: IInitializeDataSource;

package/es/form/SchemaForm/initializeDataSource.js

@@ -1,3 +1,4 @@
+import { getTestRequestParams, getTestRequestData } from '@teamix/utils';
 import { initializeRequestExpression } from '../utils';
 
 var initializeDataSource = function initializeDataSource(dataSource, suffix) {
@@ -12,6 +13,12 @@ var initializeDataSource = function initializeDataSource(dataSource, suffix) {
     scope: scope,
     data: {
       readOnlyOnLoading: (dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$extraConf = dataSource.extraConfig) === null || _dataSource$extraConf === void 0 ? void 0 : _dataSource$extraConf.readOnly) !== false
+    },
+    props: {
+      className: 'teamix-test-request',
+      'data-teamix-test-request': "url=".concat(dataSource === null || dataSource === void 0 ? void 0 : dataSource.url, "&formatResult=").concat(!!(dataSource === null || dataSource === void 0 ? void 0 : dataSource.formatResult)),
+      'data-teamix-test-params': getTestRequestParams(dataSource === null || dataSource === void 0 ? void 0 : dataSource.params),
+      'data-teamix-test-data': getTestRequestData('dataSource')
     }
   } : {
     reactions: [],

package/es/form/SchemaForm/initializeFormButton.js

@@ -10,7 +10,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 { getMessage } from '@teamix/utils';
+import { getMessage, cls } from '@teamix/utils';
 
 var initializeButton = function initializeButton(item) {
   var component = item.component,
@@ -45,15 +45,14 @@ var initialize = function initialize(item) {
     return initializeButton(item);
   }
 
-  var commonMode = _objectSpread(_objectSpread({
-    title: ' '
-  }, item), {}, {
+  var commonMode = _objectSpread(_objectSpread({}, item), {}, {
     component: component,
     props: otherProps,
     decorator: 'FormButtonGroup.FormItem',
     decoratorProps: _objectSpread({
       inset: false,
-      fullness: true
+      fullness: true,
+      className: cls('teamix-button-group-item', decoratorProps === null || decoratorProps === void 0 ? void 0 : decoratorProps.className)
     }, decoratorProps)
   }); // 吸底模式
 

package/es/index.d.ts

@@ -28,5 +28,5 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-declare const version = "1.4.10";
+declare const version = "1.4.13";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils, };

package/es/index.js

@@ -36,6 +36,6 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.4.10';
+var version = '1.4.13';
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, // ProLayout,
 ProPageContainer, ProPageHeader, ProSkeleton, ProTable, ProSidebar, ProTimeline, TeamixIcon, hooks, nocode, templates, utils };

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

@@ -4,7 +4,7 @@ import { usePrefixCls } from '@teamix/utils';
 import React from 'react';
 import { Ellipsis, LabelIconTip } from '../../../field';
 import './index.scss';
-var cls = usePrefixCls('teamix-pro-field-info-form-item');
+var cls = usePrefixCls('teamix-pro-info-item');
 var Row = Grid.Row,
     Col = Grid.Col;
 
@@ -15,7 +15,26 @@ var ProInfoItem = function ProInfoItem(prop) {
       headerInfoLayout = prop.headerInfoLayout,
       loading = prop.loading,
       tooltip = prop.tooltip,
-      tooltipIcon = prop.tooltipIcon;
+      tooltipIcon = prop.tooltipIcon,
+      valueType = prop.valueType,
+      render = prop.render,
+      alignItems = prop.alignItems; // 判断是否需要居中
+
+  var isAlignItemsCenter = function isAlignItemsCenter() {
+    if (typeof render !== 'function') {
+      var type = render === null || render === void 0 ? void 0 : render.type;
+
+      if (valueType === 'selectGroup') {
+        return true;
+      }
+
+      if (type === 'tag' || type === 'statusIconTag' || type === 'eventLevelTag' || type === 'warningLevelTag') {
+        return true;
+      }
+    }
+
+    return false;
+  };
 
   if (baseInfoLayout) {
     var labelCol = baseInfoLayout.labelCol,
@@ -24,7 +43,13 @@ var ProInfoItem = function ProInfoItem(prop) {
       className: cls('')
     }, /*#__PURE__*/React.createElement(Row, {
       gutter: 10,
-      className: cls('base-row')
+      className: cls({
+        'base-row': true,
+        'base-row-center': isAlignItemsCenter()
+      }),
+      style: alignItems ? {
+        alignItems: alignItems
+      } : {}
     }, /*#__PURE__*/React.createElement(Col, {
       span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
       className: cls('label')
@@ -48,7 +73,11 @@ var ProInfoItem = function ProInfoItem(prop) {
     return /*#__PURE__*/React.createElement("div", {
       className: cls()
     }, /*#__PURE__*/React.createElement(Row, {
-      className: cls('header-row')
+      className: cls({
+        'header-row': true,
+        'header-row-center': isAlignItemsCenter()
+      }),
+      style: {}
     }, /*#__PURE__*/React.createElement("div", {
       className: cls('header-label')
     }, /*#__PURE__*/React.createElement(LabelIconTip, {

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

@@ -14,43 +14,50 @@ $header-text-size: var(--font-size-body-1, 12px);
 
 $item-padding-bottom: 8px;
 
-.teamix-pro-field-info-form-item {
+.teamix-pro-info-item {
   width: 100%;
   padding-bottom: $item-padding-bottom;
   &-header-row {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
+
+    &-center {
+      align-items: center;
+    }
   }
   &-base-row {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
+    &-center {
+      align-items: center;
+    }
   }
 }
 
-.teamix-pro-field-info-form-item-label {
+.teamix-pro-info-item-label {
   color: $label-color;
   font-size: $label-size;
   // font-weight: $label-weight;
   display: unset;
 }
 
-.teamix-pro-field-info-form-item-value {
+.teamix-pro-info-item-value {
   color: $text-color;
   font-size: $text-size;
-  display: unset;
+  //display: unset;
   width: 100%;
   padding-right: 20px;
 }
 
-.teamix-pro-field-info-form-item-header-label {
+.teamix-pro-info-item-header-label {
   color: $header-label-color;
   font-size: $header-label-size;
   // font-weight: $header-label-weight;
   display: inline-block;
-  white-space:nowrap;
+  white-space: nowrap;
 }
 
-.teamix-pro-field-info-form-item-header-value {
+.teamix-pro-info-item-header-value {
   color: $header-text-color;
   font-size: $header-text-size;
   display: inline-block;
@@ -58,9 +65,9 @@ $item-padding-bottom: 8px;
   padding-right: 20px;
 }
 
-.teamix-pro-field-info-form-item-base-skeleton-box {
+.teamix-pro-info-item-base-skeleton-box {
   width: 100%;
-  height: 100%;
+  height: 18px;
   display: flex;
   align-items: center;
   span {

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

@@ -78,7 +78,10 @@ var ProBaseInfo = function ProBaseInfo(props) {
         }),
         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
+        tooltipIcon: item.tooltipIcon,
+        render: item.render,
+        valueType: item.valueType,
+        alignItems: item.alignItems
       }));
     });
   };

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

@@ -1,3 +1,6 @@
 .teamix-pro-info {
   width: 100%;
-}
+}
+.teamix-pro-info-content-row {
+  align-items: flex-start;
+}

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

@@ -55,7 +55,10 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
         }),
         headerInfoLayout: layout !== null && layout !== void 0 ? layout : defaultLayout,
         tooltip: item.tooltip,
-        tooltipIcon: item.tooltipIcon
+        tooltipIcon: item.tooltipIcon,
+        render: item.render,
+        valueType: item.valueType,
+        alignItems: item.alignItems
       }));
     });
   };

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

@@ -0,0 +1,3 @@
+.teamix-pro-info-content-row {
+  align-items: flex-start;
+}

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

@@ -24,6 +24,7 @@ import { LabelIconTip } from '../../../field';
 import InfoValueItem from '../InfoValueItem';
 import { ProSkeletonRaw } from '../../..';
 import { getDataIndexValue } from '../../utils';
+import cloneDeep from 'lodash.clonedeep';
 
 var ProTableInfo = function ProTableInfo(props) {
   var columns = props.columns,
@@ -72,7 +73,7 @@ var ProTableInfo = function ProTableInfo(props) {
 
   var newDataSource = useMemo(function () {
     var nResult = [];
-    var columnsCopy = JSON.parse(JSON.stringify(columns)); // 取当前行的数据。直到取完
+    var columnsCopy = cloneDeep(columns); // 取当前行的数据。直到取完
 
     while (columnsCopy.length > 0) {
       var filterColumns = [];

package/es/info/index.js

@@ -30,7 +30,7 @@ import ProBaseInfo from './components/baseInfo';
 import ProInfoGroup from './components/InfoGroup';
 import './index.scss';
 import { ProInfoGroupContext, useActionType } from './utils';
-import { doCommonRequest } from '@teamix/utils';
+import { doCommonRequest, cls, getTestRequestData, getTestRequestParams } from '@teamix/utils';
 import { useSize } from '@teamix/hooks';
 import { ProCard } from '..';
 export * from './typing';
@@ -162,8 +162,11 @@ var ProInfo = function ProInfo(props) {
 
   return /*#__PURE__*/React.createElement("div", {
     ref: ref,
-    className: "teamix-pro-info ".concat(className !== null && className !== void 0 ? className : ''),
-    style: style
+    style: style,
+    className: cls('teamix-pro-info', className, 'teamix-test-request'),
+    "data-teamix-test-request": "url=".concat(url, "&formatResult=").concat(!!formatResult),
+    "data-teamix-test-params": getTestRequestParams(params),
+    "data-teamix-test-data": getTestRequestData(columns)
   }, /*#__PURE__*/React.createElement(ProCard, _objectSpread(_objectSpread(_objectSpread({
     compacted: true,
     hoveredShadow: false,

package/es/info/typing.d.ts

@@ -96,6 +96,8 @@ export interface ProInfoColumnsProps {
     extra?: React.ReactNode;
     /** 其他 ProField 配置 */
     props?: any;
+    /** 对齐方式 **/
+    alignItems?: 'center' | 'flex-start' | 'flex-end' | string;
 }
 export declare type ProInfoActionType = {
     /** 刷新Info */
@@ -113,7 +115,7 @@ export declare type IProProInfoItem = {
     headerInfoLayout?: ProHeaderInfoLayoutProps;
     /** loading 状态 */
     loading?: boolean;
-} & Pick<ProInfoColumnsProps, 'tooltip' | 'tooltipIcon'>;
+} & Pick<ProInfoColumnsProps, 'tooltip' | 'tooltipIcon' | 'render' | 'valueType' | 'alignItems'>;
 /** header info 定义 */
 export declare type IProHeaderInfo = {
     /** 布局值 */

package/es/table/components/Layout/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection"];
+var _excluded = ["header", "mainAction", "extra", "actionRef", "dataFilter", "dataFilterFormRef", "afterDataFilter", "rowSelection", "toolBar"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
@@ -31,6 +31,7 @@ var Layout = function Layout(props) {
       dataFilterFormRef = props.dataFilterFormRef,
       afterDataFilter = props.afterDataFilter,
       rowSelection = props.rowSelection,
+      toolBar = props.toolBar,
       otherProps = _objectWithoutProperties(props, _excluded); // 渲染主操作区
 
 
@@ -69,7 +70,8 @@ var Layout = function Layout(props) {
       quickAction: extra,
       rowSelection: rowSelection
     }), /*#__PURE__*/React.createElement(ToolBar, _objectSpread({
-      actionRef: actionRef
+      actionRef: actionRef,
+      toolBar: toolBar
     }, otherProps)));
   }; // 渲染新版 QueryFilter
 
@@ -170,7 +172,7 @@ var Layout = function Layout(props) {
     }
   };
 
-  if ((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.schema) || mainAction || header || extra) {
+  if ((dataFilter === null || dataFilter === void 0 ? void 0 : dataFilter.schema) || mainAction || header || extra || toolBar !== false) {
     return /*#__PURE__*/React.createElement("div", {
       className: cls()
     }, renderLayout());