@teamix/pro 1.1.4 → 1.1.8

package/lib/form/index.js

@@ -12,16 +12,29 @@ var _exportNames = {
   registerValidateLocale: true,
   setValidateLanguage: true,
   formilyCore: true,
-  createSchemaField: true,
-  Field: true,
   FormConsumer: true,
   formilyReact: true,
-  toJS: true
+  formilyReactive: true,
+  FormDialog: true,
+  FormDrawer: true,
+  FormStep: true,
+  FormTab: true,
+  FormCollapse: true,
+  formilyTeamix: true,
+  AdvancedFilter: true,
+  SimpleFilter: true,
+  QueryFilter: true
 };
-Object.defineProperty(exports, "Field", {
+Object.defineProperty(exports, "AdvancedFilter", {
   enumerable: true,
   get: function get() {
-    return _formilyReact.Field;
+    return _Filter.AdvancedFilter;
+  }
+});
+Object.defineProperty(exports, "FormCollapse", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormCollapse;
   }
 });
 Object.defineProperty(exports, "FormConsumer", {
@@ -30,19 +43,49 @@ Object.defineProperty(exports, "FormConsumer", {
     return _formilyReact.FormConsumer;
   }
 });
-Object.defineProperty(exports, "createForm", {
+Object.defineProperty(exports, "FormDialog", {
   enumerable: true,
   get: function get() {
-    return _formilyCore.createForm;
+    return _formilyTeamix.FormDialog;
+  }
+});
+Object.defineProperty(exports, "FormDrawer", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormDrawer;
+  }
+});
+Object.defineProperty(exports, "FormStep", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormStep;
+  }
+});
+Object.defineProperty(exports, "FormTab", {
+  enumerable: true,
+  get: function get() {
+    return _formilyTeamix.FormTab;
+  }
+});
+Object.defineProperty(exports, "QueryFilter", {
+  enumerable: true,
+  get: function get() {
+    return _Filter.QueryFilter;
+  }
+});
+Object.defineProperty(exports, "SimpleFilter", {
+  enumerable: true,
+  get: function get() {
+    return _Filter.SimpleFilter;
   }
 });
-Object.defineProperty(exports, "createSchemaField", {
+Object.defineProperty(exports, "createForm", {
   enumerable: true,
   get: function get() {
-    return _formilyReact.createSchemaField;
+    return _formilyCore.createForm;
   }
 });
-exports.formilyReact = exports.formilyCore = exports.default = void 0;
+exports.formilyTeamix = exports.formilyReactive = exports.formilyReact = exports.formilyCore = exports.default = void 0;
 Object.defineProperty(exports, "registerFormats", {
   enumerable: true,
   get: function get() {
@@ -67,48 +110,6 @@ Object.defineProperty(exports, "setValidateLanguage", {
     return _formilyCore.setValidateLanguage;
   }
 });
-Object.defineProperty(exports, "toJS", {
-  enumerable: true,
-  get: function get() {
-    return _reactive.toJS;
-  }
-});
-
-var _formilyCore = _interopRequireWildcard(require("@formily/core"));
-
-exports.formilyCore = _formilyCore;
-
-var _formilyReact = _interopRequireWildcard(require("@formily/react"));
-
-exports.formilyReact = _formilyReact;
-
-var _formily = require("@teamix/formily");
-
-Object.keys(_formily).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _formily[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _formily[key];
-    }
-  });
-});
-
-var _Filter = require("./Filter");
-
-Object.keys(_Filter).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _Filter[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _Filter[key];
-    }
-  });
-});
 
 var _typing = require("./typing");
 
@@ -124,7 +125,23 @@ Object.keys(_typing).forEach(function (key) {
   });
 });
 
-var _reactive = require("@formily/reactive");
+var _formilyCore = _interopRequireWildcard(require("@formily/core"));
+
+exports.formilyCore = _formilyCore;
+
+var _formilyReact = _interopRequireWildcard(require("@formily/react"));
+
+exports.formilyReact = _formilyReact;
+
+var _formilyReactive = _interopRequireWildcard(require("@formily/reactive"));
+
+exports.formilyReactive = _formilyReactive;
+
+var _formilyTeamix = _interopRequireWildcard(require("@teamix/formily"));
+
+exports.formilyTeamix = _formilyTeamix;
+
+var _Filter = require("./Filter");
 
 var _ProForm = _interopRequireDefault(require("./ProForm"));
 
@@ -135,15 +152,23 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 /**
- * 导出全部 @teamix/formily 方法，支持完全自主定义表单
+ * 导出ProForm的TS
+ */
+
+/**
+ * 使用别名导出formily相关内容
+ */
+
+/**
+ * 导出常用formily内容，需谨慎限制
  */
 
 /**
- * 导出常用方法等
+ * 导出 Filter 组件
  */
 
 /**
- * 导出封装的 ProForm 组件，支持快速搭建表单
+ * 导出 ProForm 组件，支持快速搭建表单
  */
 var _default = _ProForm.default;
 exports.default = _default;

package/lib/form/typing.d.ts

@@ -1,28 +1,22 @@
 import type { ReactNode } from 'react';
-import type { Method } from 'axios';
 import type { IFormFeedback, Form as FormType, FieldPatternTypes } from '@formily/core';
 import type { IFormLayoutProps } from '@teamix/formily';
+import { CommonRequestConfig } from '@teamix/utils';
 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' | 'ColorSwatches' | 'ColorTwitter' | 'IconPicker' | 'JsonInput';
+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 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';
-export interface IRequestConfig {
-    url?: string;
-    method?: Method;
-    params?: any;
-    data?: any;
+export interface IRequestConfig extends CommonRequestConfig {
     when?: (field: any) => any;
-    formatter?: (res: any, utils: any) => any;
-    successMsg?: string;
-    errorMsg?: string;
+    formatResult?: (res: any, utils?: any) => any;
     onSuccess?: (res: any, field?: any) => any;
-    onError?: (error: any) => any;
+    onError?: (res: any) => any;
 }
-export interface ISchemaProItem {
+export interface IFormSchemaItem {
     type?: string;
     name?: string;
     description?: React.ReactNode;
@@ -34,8 +28,8 @@ export interface ISchemaProItem {
     dataSource?: any[];
     reactions?: any;
     rules?: any;
-    items?: ISchemaProItem[];
-    children?: ISchemaProItem[];
+    items?: IFormSchemaItem;
+    children?: IFormSchemaItem[];
     content?: any;
     tooltip?: string;
     required?: boolean;
@@ -49,16 +43,13 @@ export interface ISchemaProItem {
     default?: any;
     request?: IRequestConfig;
 }
-export declare type ISchemaPro = ISchemaProItem[];
-export interface IInitialize {
-    (items: ISchemaProItem[], props?: any): ISchemaProItem[];
-}
+export declare type IFormSchema = IFormSchemaItem[];
 export interface IInitializeItem {
-    (items: ISchemaProItem, props?: any): ISchemaProItem;
+    (item: IFormSchemaItem, props?: any): IFormSchemaItem;
 }
-export interface IProFormProps extends IFormLayoutProps {
+export interface IFormProps extends IFormLayoutProps {
     form?: FormType | false;
-    schema: ISchemaPro;
+    schema: IFormSchema;
     scope?: any;
     components?: {
         [key: string]: React.FC | React.ComponentClass;
@@ -70,7 +61,7 @@ export interface IProFormProps extends IFormLayoutProps {
     onSubmit?: (values: any) => any;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;
 }
-export interface IFilterProps extends IProFormProps {
+export interface IFilterProps extends IFormProps {
     triggerType?: 'keydown' | 'change' | 'submit';
     onFilter?: (values: any) => void;
     onReset?: (payload?: any) => void;

package/lib/form/warning.js

@@ -12,12 +12,8 @@ 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 warning = function warning(item) {
-  var newItem = _objectSpread({}, item); // if (newItem.formItem) {
-  //   newItem.decorator = newItem.formItem;
-  //   delete newItem.formItem;
-  //   console.warn(
-  //     '请尽快将“formItem”属性名称升级为“decorator”，正式版将不再支持该名称。',
-  //   );
+  var newItem = _objectSpread({}, item); // if (xxx) {
+  //   console.warn('xxx');
   // }
 
 

package/lib/index.d.ts

@@ -1,4 +1,4 @@
-import ProAction from './actions';
+import ProActions from './actions';
 import ProCard from './card';
 import ProField from './field';
 import ProForm from './form';
@@ -15,9 +15,10 @@ export * from './actions';
 export * from './card';
 export * from './field';
 export * from './form';
+export * from './info';
 export * from './page-container';
 export * from './page-header';
 export * from './skeleton';
 export * from './table';
-declare const version = "1.1.3";
-export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };
+declare const version = "1.1.7";
+export { version, ProActions, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 var _exportNames = {
   version: true,
-  ProAction: true,
+  ProActions: true,
   ProCard: true,
   ProField: true,
   ProForm: true,
@@ -21,7 +21,7 @@ var _exportNames = {
   nocode: true,
   templates: true
 };
-Object.defineProperty(exports, "ProAction", {
+Object.defineProperty(exports, "ProActions", {
   enumerable: true,
   get: function get() {
     return _actions.default;
@@ -148,7 +148,19 @@ Object.keys(_form).forEach(function (key) {
 
 var _hooks = _interopRequireDefault(require("./hooks"));
 
-var _info = _interopRequireDefault(require("./info"));
+var _info = _interopRequireWildcard(require("./info"));
+
+Object.keys(_info).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _info[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _info[key];
+    }
+  });
+});
 
 var _pageContainer = _interopRequireWildcard(require("./page-container"));
 
@@ -228,5 +240,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.1.3';
+var version = '1.1.7';
 exports.version = version;

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

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

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

@@ -1,26 +1,66 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
+
+var _utils = require("../../utils");
+
+var _hooks = require("@teamix/hooks");
 
 require("./index.scss");
 
+var _useInfoRequest2 = _interopRequireDefault(require("../../utils/useInfoRequest"));
+
 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); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 var ProInfoGroup = function ProInfoGroup(props) {
-  var children = props.children;
-  return /*#__PURE__*/_react.default.createElement("div", {
-    className: "teamix-pro-info-group"
-  }, children === null || children === void 0 ? void 0 : children.map(function (item, index) {
+  var children = props.children,
+      url = props.url,
+      method = props.method,
+      params = props.params,
+      formatResult = props.formatResult;
+  var ref = (0, _react.useRef)();
+  var size = (0, _hooks.useSize)(ref); // 请求数据
+
+  var _useInfoRequest = (0, _useInfoRequest2.default)({
+    url: url,
+    method: method,
+    params: params,
+    formatResult: formatResult
+  }),
+      loading = _useInfoRequest.loading,
+      result = _useInfoRequest.result,
+      refresh = _useInfoRequest.refresh;
+
+  return /*#__PURE__*/_react.default.createElement(_utils.ProInfoGroupContext.Provider, {
+    value: {
+      visible: true,
+      size: size,
+      loading: loading,
+      result: result,
+      refresh: refresh
+    }
+  }, /*#__PURE__*/_react.default.createElement("div", {
+    className: "teamix-pro-info-group",
+    ref: ref
+  }, Array.isArray(children) && (children === null || children === void 0 ? void 0 : children.map(function (item, index) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: "teamix-pro-info-group-item",
       key: index
     }, item);
-  }));
+  })), !Array.isArray(children) && /*#__PURE__*/_react.default.createElement("div", {
+    className: "teamix-pro-info-group-item"
+  }, children)));
 };
 
 var _default = ProInfoGroup;

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

@@ -1,8 +1,14 @@
 .teamix-pro-info-group {
   &-item {
+    margin-top: 16px;
     border-bottom: 1px solid var(--color-line1-1, #eaeaea);
+    margin-bottom: 16px;
   }
   .teamix-pro-info-group-item:last-child {
     border-bottom: 0;
+    margin-bottom: 0;
+  }
+  .teamix-pro-info-group-item:first-child {
+    margin-top: 0;
   }
 }

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

@@ -56,6 +56,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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 cls = (0, _utils.baseClass)('teamix-pro-info');
+var toJS = _form.formilyReactive.toJS;
 
 var InfoValueItem = function InfoValueItem(props) {
   var _props$type = props.type,
@@ -78,7 +79,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 = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -132,7 +144,7 @@ var InfoValueItem = function InfoValueItem(props) {
 
 
     var onConfirm = function onConfirm(e) {
-      var formData = (0, _form.toJS)(dataFilterForm.values); // 如果传入了 editUrl 则内置请求
+      var formData = toJS(dataFilterForm.values); // 如果传入了 editUrl 则内置请求
 
       if (editUrl) {
         setConfirmLoading(true);
@@ -175,7 +187,7 @@ var InfoValueItem = function InfoValueItem(props) {
 
 
     var onCancel = function onCancel(e) {
-      var formData = (0, _form.toJS)(dataFilterForm.values);
+      var formData = toJS(dataFilterForm.values);
 
       if (editOnCancel) {
         editOnCancel === null || editOnCancel === void 0 ? void 0 : editOnCancel(formData, e);

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

@@ -21,12 +21,12 @@ var _hooks = require("@teamix/hooks");
 
 var _utils = require("../../utils/utils");
 
-var _utils2 = require("@teamix/utils");
-
 var _layout = _interopRequireDefault(require("../../utils/layout"));
 
 var _InfoValueItem = _interopRequireDefault(require("../InfoValueItem"));
 
+var _utils2 = require("../../utils");
+
 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); }
@@ -50,16 +50,16 @@ var ProBaseInfo = function ProBaseInfo(props) {
       dataSource = props.dataSource,
       loading = props.loading,
       result = props.result,
-      actionRef = props.actionRef; // TODO: 自动响应式。日后会更改成hooks
-
+      actionRef = props.actionRef;
+  var context = (0, _react.useContext)(_utils2.ProInfoGroupContext);
   var ref = (0, _react.useRef)();
-  var size = (0, _hooks.useSize)(ref);
+  var size = context.visible ? context.size : (0, _hooks.useSize)(ref);
 
-  var defaultLayout = _layout.default[(0, _utils.getLayout)((_size$width = size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
+  var defaultLayout = _layout.default[(0, _utils.getLayout)((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
 
   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.default.createElement(Col, {
@@ -70,7 +70,7 @@ var ProBaseInfo = function ProBaseInfo(props) {
         loading: loading,
         value: /*#__PURE__*/_react.default.createElement(_InfoValueItem.default, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-          value: (0, _utils2.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: (0, _utils2.getDataIndexValue)(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,
@@ -87,7 +87,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
     className: "teamix-pro-info"
-  }, size.width && /*#__PURE__*/_react.default.createElement(_.ProCard, _objectSpread({
+  }, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/_react.default.createElement(_.ProCard, _objectSpread({
+    compacted: true,
     hoveredShadow: false,
     bordered: false
   }, header), /*#__PURE__*/_react.default.createElement(Row, {

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

@@ -11,8 +11,6 @@ var _components = require("@alicloudfe/components");
 
 var _card = _interopRequireDefault(require("../../../card"));
 
-var _utils = require("@teamix/utils");
-
 var _react = _interopRequireWildcard(require("react"));
 
 var _FormItem = _interopRequireDefault(require("../FormItem"));
@@ -23,10 +21,12 @@ var _layout = _interopRequireDefault(require("../../utils/layout"));
 
 var _hooks = require("@teamix/hooks");
 
-var _utils2 = require("../../utils/utils");
+var _utils = require("../../utils/utils");
 
 var _InfoValueItem = _interopRequireDefault(require("../InfoValueItem"));
 
+var _utils2 = require("../../utils");
+
 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); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -51,16 +51,16 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
       layout = props.layout,
       loading = props.loading,
       result = props.result,
-      actionRef = props.actionRef; // TODO: 自动响应式。日后会更改成hooks
-
+      actionRef = props.actionRef;
+  var context = (0, _react.useContext)(_utils2.ProInfoGroupContext);
   var ref = (0, _react.useRef)();
-  var size = (0, _hooks.useSize)(ref);
+  var size = context.visible ? context.size : (0, _hooks.useSize)(ref);
 
-  var defaultLayout = _layout.default[(0, _utils2.getLayout)((_size$width = size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
+  var defaultLayout = _layout.default[(0, _utils.getLayout)((_size$width = size === null || size === void 0 ? void 0 : size.width) !== null && _size$width !== void 0 ? _size$width : 0)];
 
   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;
 
@@ -82,7 +82,7 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
         loading: loading,
         value: /*#__PURE__*/_react.default.createElement(_InfoValueItem.default, {
           type: (_item$valueType = item === null || item === void 0 ? void 0 : item.valueType) !== null && _item$valueType !== void 0 ? _item$valueType : 'text',
-          value: (0, _utils.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: (0, _utils2.getDataIndexValue)(item.dataIndex, dataSource !== null && dataSource !== void 0 ? dataSource : result),
           render: item.render,
           dataSource: item.dataSource,
           infoItem: item,
@@ -99,7 +99,8 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: ref,
     className: "teamix-pro-info"
-  }, size.width && /*#__PURE__*/_react.default.createElement(_card.default, _objectSpread({
+  }, (size === null || size === void 0 ? void 0 : size.width) && /*#__PURE__*/_react.default.createElement(_card.default, _objectSpread({
+    compacted: true,
     hoveredShadow: false,
     bordered: false
   }, header), /*#__PURE__*/_react.default.createElement(Row, {