@teamix/pro 1.4.12 → 1.4.15

package/lib/form/SchemaForm/index.js

@@ -55,7 +55,7 @@ var _utils2 = require("../utils");
 
 var _warning = _interopRequireDefault(require("../warning"));
 
-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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -173,9 +173,10 @@ var _default = /*#__PURE__*/(0, _react.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,
@@ -211,7 +212,8 @@ var _default = /*#__PURE__*/(0, _react.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 = (0, _initializeRules2.default)(rules, "".concat(suffix, "v")),
@@ -227,10 +229,16 @@ var _default = /*#__PURE__*/(0, _react.memo)(function (_ref) {
             v = _ref3[1];
 
         schemaScopeRef.current[k] = v;
+      }); // 合并字段属性
+
+      var defaultProps = _objectSpread(_objectSpread(_objectSpread({}, props), dataSourceProps), {}, {
+        className: (0, _utils.cls)(props === null || props === void 0 ? void 0 : props.className, dataSourceProps === null || dataSourceProps === void 0 ? void 0 : dataSourceProps.className)
       });
+
       var formatParam = (0, _utils2.mapSchemaName)(_objectSpread(_objectSpread({}, otherProps), {}, {
         type: defaultType,
         component: component,
+        props: defaultProps,
         decorator: defaultDecorator,
         decoratorProps: defaultDecoratorProps,
         rules: defaultRules,

package/lib/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/lib/form/SchemaForm/initializeDataSource.js

@@ -5,12 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _utils = require("../utils");
+var _utils = require("@teamix/utils");
+
+var _utils2 = require("../utils");
 
 var initializeDataSource = function initializeDataSource(dataSource, suffix) {
   var _dataSource$extraConf;
 
-  var _initializeRequestExp = (0, _utils.initializeRequestExpression)(dataSource, '$dataSource', suffix),
+  var _initializeRequestExp = (0, _utils2.initializeRequestExpression)(dataSource, '$dataSource', suffix),
       expression = _initializeRequestExp.expression,
       scope = _initializeRequestExp.scope;
 
@@ -19,6 +21,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': (0, _utils.getTestRequestParams)(dataSource === null || dataSource === void 0 ? void 0 : dataSource.params),
+      'data-teamix-test-data': (0, _utils.getTestRequestData)('dataSource')
     }
   } : {
     reactions: [],

package/lib/form/SchemaForm/initializeFormButton.js

@@ -52,15 +52,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: (0, _utils.cls)('teamix-button-group-item', decoratorProps === null || decoratorProps === void 0 ? void 0 : decoratorProps.className)
     }, decoratorProps)
   }); // 吸底模式
 

package/lib/form/typing.d.ts

@@ -59,6 +59,9 @@ export interface ProFormSchemaItem {
     data?: AnyObject;
 }
 export declare type ProFormSchema = ProFormSchemaItem[];
+interface AutoLayout {
+    autoLabel?: boolean;
+}
 export interface ProFormProps extends Omit<IFormLayoutProps, 'breakpoints'> {
     form?: FormType | false;
     schema?: ProFormSchema;
@@ -78,6 +81,7 @@ export interface ProFormProps extends Omit<IFormLayoutProps, 'breakpoints'> {
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
     onInitialComplete?: (form: FormType) => void;
     breakpoints?: number[] | boolean;
+    autoLayout?: AutoLayout | boolean;
 }
 export interface FilterProps extends ProFormProps {
     form: FormType;

package/lib/index.d.ts

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

package/lib/index.js

@@ -317,5 +317,5 @@ if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMI
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
 
-var version = '1.4.12';
+var version = '1.4.15';
 exports.version = version;

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

@@ -19,7 +19,7 @@ require("./index.scss");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var cls = (0, _utils.usePrefixCls)('teamix-pro-field-info-form-item');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-info-item');
 var Row = _components.Grid.Row,
     Col = _components.Grid.Col;
 
@@ -30,7 +30,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,
@@ -39,7 +58,13 @@ var ProInfoItem = function ProInfoItem(prop) {
       className: cls('')
     }, /*#__PURE__*/_react.default.createElement(Row, {
       gutter: 10,
-      className: cls('base-row')
+      className: cls({
+        'base-row': true,
+        'base-row-center': isAlignItemsCenter()
+      }),
+      style: alignItems ? {
+        alignItems: alignItems
+      } : {}
     }, /*#__PURE__*/_react.default.createElement(Col, {
       span: labelCol === null || labelCol === void 0 ? void 0 : labelCol.span,
       className: cls('label')
@@ -63,7 +88,11 @@ var ProInfoItem = function ProInfoItem(prop) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls()
     }, /*#__PURE__*/_react.default.createElement(Row, {
-      className: cls('header-row')
+      className: cls({
+        'header-row': true,
+        'header-row-center': isAlignItemsCenter()
+      }),
+      style: {}
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: cls('header-label')
     }, /*#__PURE__*/_react.default.createElement(_field.LabelIconTip, {

package/lib/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/lib/info/components/baseInfo/index.js

@@ -97,7 +97,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/lib/info/components/baseInfo/index.scss

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

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

@@ -73,7 +73,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/lib/info/components/headerInfo/index.scss

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

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

@@ -21,6 +21,8 @@ var _2 = require("../../..");
 
 var _utils = require("../../utils");
 
+var _lodash = _interopRequireDefault(require("lodash.clonedeep"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -92,7 +94,7 @@ var ProTableInfo = function ProTableInfo(props) {
 
   var newDataSource = (0, _react.useMemo)(function () {
     var nResult = [];
-    var columnsCopy = JSON.parse(JSON.stringify(columns)); // 取当前行的数据。直到取完
+    var columnsCopy = (0, _lodash.default)(columns); // 取当前行的数据。直到取完
 
     while (columnsCopy.length > 0) {
       var filterColumns = [];

package/lib/info/index.js

@@ -199,8 +199,11 @@ var ProInfo = function ProInfo(props) {
 
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
-    className: "teamix-pro-info ".concat(className !== null && className !== void 0 ? className : ''),
-    style: style
+    style: style,
+    className: (0, _utils2.cls)('teamix-pro-info', className, 'teamix-test-request'),
+    "data-teamix-test-request": "url=".concat(url, "&formatResult=").concat(!!formatResult),
+    "data-teamix-test-params": (0, _utils2.getTestRequestParams)(params),
+    "data-teamix-test-data": (0, _utils2.getTestRequestData)(columns)
   }, /*#__PURE__*/_react.default.createElement(_.ProCard, _objectSpread(_objectSpread(_objectSpread({
     compacted: true,
     hoveredShadow: false,

package/lib/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/lib/nocode/index.scss

@@ -1,4 +1,4 @@
-.teamix-nocode {
+.teamix-pro-nocode {
   &-empty {
     display: flex;
     flex-direction: column;
@@ -75,7 +75,7 @@
       right: 20px;
       bottom: 20px;
 
-      &>i {
+      & > i {
         cursor: pointer;
         color: var(--color-text1-8, #848484);
         background-color: rgba(0, 0, 0, 0.06);

package/lib/nocode/pages/playground.js

@@ -51,7 +51,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.usePrefixCls)('teamix-nocode');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-nocode');
 
 var PagePlayground = function PagePlayground(props) {
   var _useState = (0, _react.useState)(undefined),

package/lib/nocode/pages/renderer.js

@@ -57,7 +57,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; }
 
-var cls = (0, _utils.usePrefixCls)('teamix-nocode');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-nocode');
 
 var Loading = function Loading(props) {
   return /*#__PURE__*/_react.default.createElement(_pageContainer.default, _objectSpread({

package/lib/nocode/playground.js

@@ -37,7 +37,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var cls = (0, _utils.usePrefixCls)('teamix-nocode-playground');
+var cls = (0, _utils.usePrefixCls)('teamix-pro-nocode-playground');
 
 var PlayGroundLayout = function PlayGroundLayout(props) {
   return /*#__PURE__*/_react.default.createElement("div", {

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

@@ -143,14 +143,18 @@ var Layout = function Layout(props) {
       }
     } else if (mainAction) {
       // 没传 dataFilter 但是传了 mainAction
-      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
         addonBefore: renderMainAction(),
         addonAfter: renderAddonAfter()
-      });
+      }), afterDataFilter && /*#__PURE__*/_react.default.createElement("div", {
+        className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+      }, afterDataFilter));
     } else {
-      return /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_form.QueryFilterLayout, {
         addonAfter: renderAddonAfter()
-      });
+      }), ' ', afterDataFilter && /*#__PURE__*/_react.default.createElement("div", {
+        className: "mb8 ".concat(cls('after-data-filter-wrapper'))
+      }, afterDataFilter));
     }
   }; // 区域组合渲染
 

package/lib/table/components/QuickAction/index.js

@@ -26,7 +26,7 @@ var QuickAction = function QuickAction(props) {
       actionRef = props.actionRef,
       rowSelection = props.rowSelection; // 如果传对象的话，默认为主要文字类型的 ProActionButton
 
-  if (_typeof(quickAction) === 'object') {
+  if (_typeof(quickAction) === 'object' && (quickAction === null || quickAction === void 0 ? void 0 : quickAction.config)) {
     // 默认 context
     var defaultContext = {
       action: actionRef.current,