@teamix/pro 1.2.4 → 1.2.8

package/lib/form/SchemaForm/reactions.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.$validator = exports.$request = exports.$dataSource = void 0;
+exports.$validator = exports.$request = exports.$dataSource = exports.$context = void 0;
 
 var _utils = require("@teamix/utils");
 
@@ -15,34 +15,45 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // 配置请求
 var $request = function $request(requestConfig) {
-  return function (field) {
+  return function (field, context) {
     var _field$data;
 
     var refresh = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
     var beforeRequest = requestConfig.beforeRequest,
         onSuccess = requestConfig.onSuccess;
     var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
-    var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field) : {};
+    var beforeRequestResult = (0, _utils.isFn)(beforeRequest) ? beforeRequest(field, context) : {};
     return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
       params: _objectSpread(_objectSpread(_objectSpread({}, requestConfig.params), beforeRequestResult), refreshResult),
       beforeRequest: function beforeRequest() {
         return beforeRequestResult;
       },
       onSuccess: (0, _utils.isFn)(onSuccess) ? function (res) {
-        return onSuccess(res, field);
+        return onSuccess(res, field, context);
       } : onSuccess
-    }), field);
+    }), context);
   };
-}; // 配置校验
+}; // 配置上下文
 
 
 exports.$request = $request;
 
-var $validator = function $validator(services, onComplete) {
+var $context = function $context(services, onComplete, context) {
+  return function (field) {
+    return services(field, context).then(function (res) {
+      return onComplete && onComplete(res, field, context);
+    });
+  };
+}; // 配置校验
+
+
+exports.$context = $context;
+
+var $validator = function $validator(services, onComplete, context) {
   return function (value, rules, _ref) {
     var field = _ref.field;
-    return services(field).then(function (res) {
-      return onComplete && onComplete(res, field);
+    return services(field, context).then(function (res) {
+      return onComplete && onComplete(res, field, context);
     });
   };
 }; // 配置DataSource
@@ -50,13 +61,13 @@ var $validator = function $validator(services, onComplete) {
 
 exports.$validator = $validator;
 
-var $dataSource = function $dataSource(services, onComplete) {
+var $dataSource = function $dataSource(services, onComplete, context) {
   return function (field) {
     field.setState({
       loading: true,
       readOnly: true
     });
-    return services(field).then(function (res) {
+    return services(field, context).then(function (res) {
       var _res$map;
 
       var isValueInDataSource = res === null || res === void 0 ? void 0 : (_res$map = res.map(function (v) {
@@ -70,7 +81,7 @@ var $dataSource = function $dataSource(services, onComplete) {
         loading: false,
         readOnly: false
       }, clearValue));
-      return onComplete && onComplete(res, field);
+      return onComplete && onComplete(res, field, context);
     }).catch(function () {
       field.setState({
         loading: false,

package/lib/form/locales/validate.d.ts

@@ -0,0 +1,159 @@
+declare const _default: {
+    en: {
+        pattern: string;
+        required: string;
+        number: string;
+        integer: string;
+        url: string;
+        email: string;
+        ipv6: string;
+        ipv4: string;
+        idcard: string;
+        taodomain: string;
+        qq: string;
+        phone: string;
+        money: string;
+        zh: string;
+        date: string;
+        zip: string;
+        len: string;
+        min: string;
+        maximum: string;
+        exclusiveMaximum: string;
+        minimum: string;
+        exclusiveMinimum: string;
+        max: string;
+        whitespace: string;
+    };
+    'en-us': {
+        pattern: string;
+        required: string;
+        number: string;
+        integer: string;
+        url: string;
+        email: string;
+        ipv6: string;
+        ipv4: string;
+        idcard: string;
+        taodomain: string;
+        qq: string;
+        phone: string;
+        money: string;
+        zh: string;
+        date: string;
+        zip: string;
+        len: string;
+        min: string;
+        maximum: string;
+        exclusiveMaximum: string;
+        minimum: string;
+        exclusiveMinimum: string;
+        max: string;
+        whitespace: string;
+    };
+    zh: {
+        pattern: string;
+        required: string;
+        number: string;
+        integer: string;
+        url: string;
+        email: string;
+        ipv6: string;
+        ipv4: string;
+        idcard: string;
+        taodomain: string;
+        qq: string;
+        phone: string;
+        money: string;
+        zh: string;
+        date: string;
+        zip: string;
+        len: string;
+        min: string;
+        max: string;
+        maximum: string;
+        exclusiveMaximum: string;
+        minimum: string;
+        exclusiveMinimum: string;
+        whitespace: string;
+    };
+    'zh-cn': {
+        pattern: string;
+        required: string;
+        number: string;
+        integer: string;
+        url: string;
+        email: string;
+        ipv6: string;
+        ipv4: string;
+        idcard: string;
+        taodomain: string;
+        qq: string;
+        phone: string;
+        money: string;
+        zh: string;
+        date: string;
+        zip: string;
+        len: string;
+        min: string;
+        max: string;
+        maximum: string;
+        exclusiveMaximum: string;
+        minimum: string;
+        exclusiveMinimum: string;
+        whitespace: string;
+    };
+    'zh-tw': {
+        pattern: string;
+        required: string;
+        number: string;
+        integer: string;
+        url: string;
+        email: string;
+        ipv6: string;
+        ipv4: string;
+        idcard: string;
+        taodomain: string;
+        qq: string;
+        phone: string;
+        money: string;
+        zh: string;
+        date: string;
+        zip: string;
+        len: string;
+        min: string;
+        max: string;
+        maximum: string;
+        exclusiveMaximum: string;
+        minimum: string;
+        exclusiveMinimum: string;
+        whitespace: string;
+    };
+    ja: {
+        url: string;
+        whitespace: string;
+        zh: string;
+        zip: string;
+        date: string;
+        email: string;
+        exclusiveMaximum: string;
+        exclusiveMinimum: string;
+        idcard: string;
+        integer: string;
+        ipv4: string;
+        ipv6: string;
+        len: string;
+        max: string;
+        maximum: string;
+        min: string;
+        minimum: string;
+        money: string;
+        number: string;
+        pattern: string;
+        phone: string;
+        qq: string;
+        required: string;
+        taodomain: string;
+    };
+};
+export default _default;

package/lib/form/locales/validate.js

@@ -0,0 +1,165 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  en: {
+    pattern: 'This field  does not match any pattern',
+    required: 'This field is required',
+    number: 'This field is not a number',
+    integer: 'This field is not an integer number',
+    url: 'This field is a invalid url',
+    email: 'This field is not a email format',
+    ipv6: 'This field is not a ipv6 format',
+    ipv4: 'This field is not a ipv4 format',
+    idcard: 'This field is not an idcard format',
+    taodomain: 'This field is not a taobao domain format',
+    qq: 'This field is not a qq number format',
+    phone: 'This field is not a phone number format',
+    money: 'This field is not a currency format',
+    zh: 'This field is not a chinese string',
+    date: 'This field is not a valid date format',
+    zip: 'This field is not a zip format',
+    len: 'The length or number of entries must be {{len}}',
+    min: 'The length or number of entries must be at least {{min}}',
+    maximum: 'The value cannot be greater than {{maximum}}',
+    exclusiveMaximum: 'The value must be less than {{exclusiveMaximum}}',
+    minimum: 'The value cannot be less than {{minimum}}',
+    exclusiveMinimum: 'The value must be greater than {{exclusiveMinimum}}',
+    max: 'The length or number of entries must be at most {{max}}',
+    whitespace: 'This field cannot be blank string.'
+  },
+  'en-us': {
+    pattern: 'This field  does not match any pattern',
+    required: 'This field is required',
+    number: 'This field is not a number',
+    integer: 'This field is not an integer number',
+    url: 'This field is a invalid url',
+    email: 'This field is not a email format',
+    ipv6: 'This field is not a ipv6 format',
+    ipv4: 'This field is not a ipv4 format',
+    idcard: 'This field is not an idcard format',
+    taodomain: 'This field is not a taobao domain format',
+    qq: 'This field is not a qq number format',
+    phone: 'This field is not a phone number format',
+    money: 'This field is not a currency format',
+    zh: 'This field is not a chinese string',
+    date: 'This field is not a valid date format',
+    zip: 'This field is not a zip format',
+    len: 'The length or number of entries must be {{len}}',
+    min: 'The length or number of entries must be at least {{min}}',
+    maximum: 'The value cannot be greater than {{maximum}}',
+    exclusiveMaximum: 'The value must be less than {{exclusiveMaximum}}',
+    minimum: 'The value cannot be less than {{minimum}}',
+    exclusiveMinimum: 'The value must be greater than {{exclusiveMinimum}}',
+    max: 'The length or number of entries must be at most {{max}}',
+    whitespace: 'This field cannot be blank string.'
+  },
+  zh: {
+    pattern: '该字段不是一个合法的字段',
+    required: '该字段是必填字段',
+    number: '该字段不是合法的数字',
+    integer: '该字段不是合法的整型数字',
+    url: '该字段不是合法的url',
+    email: '该字段不是合法的邮箱格式',
+    ipv6: '该字段不是合法的ipv6格式',
+    ipv4: '该字段不是合法的ipv4格式',
+    idcard: '该字段不是合法的身份证格式',
+    taodomain: '该字段不符合淘系域名规则',
+    qq: '该字段不符合QQ号格式',
+    phone: '该字段不是有效的手机号',
+    money: '该字段不是有效货币格式',
+    zh: '该字段不是合法的中文字符串',
+    date: '该字段不是合法的日期格式',
+    zip: '该字段不是合法的邮编格式',
+    len: '长度或条目数必须为{{len}}',
+    min: '长度或条目数不能小于{{min}}',
+    max: '长度或条目数不能大于{{max}}',
+    maximum: '数值不能大于{{maximum}}',
+    exclusiveMaximum: '数值必须小于{{exclusiveMaximum}}',
+    minimum: '数值不能小于{{minimum}}',
+    exclusiveMinimum: '数值必须大于{{exclusiveMinimum}}',
+    whitespace: '不能为纯空白字符串'
+  },
+  'zh-cn': {
+    pattern: '该字段不是一个合法的字段',
+    required: '该字段是必填字段',
+    number: '该字段不是合法的数字',
+    integer: '该字段不是合法的整型数字',
+    url: '该字段不是合法的url',
+    email: '该字段不是合法的邮箱格式',
+    ipv6: '该字段不是合法的ipv6格式',
+    ipv4: '该字段不是合法的ipv4格式',
+    idcard: '该字段不是合法的身份证格式',
+    taodomain: '该字段不符合淘系域名规则',
+    qq: '该字段不符合QQ号格式',
+    phone: '该字段不是有效的手机号',
+    money: '该字段不是有效货币格式',
+    zh: '该字段不是合法的中文字符串',
+    date: '该字段不是合法的日期格式',
+    zip: '该字段不是合法的邮编格式',
+    len: '长度或条目数必须为{{len}}',
+    min: '长度或条目数不能小于{{min}}',
+    max: '长度或条目数不能大于{{max}}',
+    maximum: '数值不能大于{{maximum}}',
+    exclusiveMaximum: '数值必须小于{{exclusiveMaximum}}',
+    minimum: '数值不能小于{{minimum}}',
+    exclusiveMinimum: '数值必须大于{{exclusiveMinimum}}',
+    whitespace: '不能为纯空白字符串'
+  },
+  'zh-tw': {
+    pattern: '該字段不是一個合法的字段',
+    required: '該字段是必填字段',
+    number: '該字段不是合法的數字',
+    integer: '該字段不是合法的整型數字',
+    url: '該字段不是合法的url',
+    email: '該字段不是合法的郵箱格式',
+    ipv6: '該字段不是合法的ipv6格式',
+    ipv4: '該字段不是合法的ipv4格式',
+    idcard: '該字段不是合法的身份證格式',
+    taodomain: '該字段不符合淘系域名規則',
+    qq: '該字段不符合QQ號格式',
+    phone: '該字段不是有效的手機號',
+    money: '該字段不是有效貨幣格式',
+    zh: '該字段不是合法的中文字符串',
+    date: '該字段不是合法的日期格式',
+    zip: '該字段不是合法的郵編格式',
+    len: '長度或條目數必須為{{len}}',
+    min: '長度或條目數不能小於{{min}}',
+    max: '長度或條目數不能大於{{max}}',
+    maximum: '數值不能大於{{maximum}}',
+    exclusiveMaximum: '數值必須小於{{exclusiveMaximum}}',
+    minimum: '數值不能小於{{minimum}}',
+    exclusiveMinimum: '數值必須大於{{exclusiveMinimum}}',
+    whitespace: '不能為純空白字符串'
+  },
+  ja: {
+    url: 'このフィールドは無効なURLです',
+    whitespace: 'このフィールドを空の文字列にすることはできません。',
+    zh: 'このフィールドは中国語の文字列ではありません',
+    zip: 'このフィールドはzip形式ではありません',
+    date: 'このフィールドは有効な日付形式ではありません',
+    email: 'このフィールドはメール形式ではありません',
+    exclusiveMaximum: '値は{{exclusiveMaximum}}未満である必要があります',
+    exclusiveMinimum: '値は{{exclusiveMinimum}}より大きい必要があります',
+    idcard: 'このフィールドはIDカード形式ではありません',
+    integer: 'このフィールドは整数ではありません',
+    ipv4: 'このフィールドはIPv4形式ではありません',
+    ipv6: 'このフィールドはIPv6形式ではありません',
+    len: 'エントリの長さまたは数は{{len}}でなければなりません',
+    max: 'エントリの長さまたは数は最大{{max}}でなければなりません',
+    maximum: '値は{{最大}}を超えることはできません',
+    min: 'エントリの長さまたは数は、少なくとも{{min}}である必要があります',
+    minimum: '値は{{minimum}}以上にする必要があります',
+    money: 'このフィールドは通貨形式ではありません',
+    number: 'このフィールドは数値ではありません',
+    pattern: 'このフィールドはどのパターンとも一致しません',
+    phone: 'このフィールドは電話番号の形式ではありません',
+    qq: 'このフィールドはqq数値形式ではありません',
+    required: 'この項目は必須です',
+    taodomain: 'このフィールドは淘宝網ドメイン形式ではありません'
+  }
+};
+exports.default = _default;

package/lib/form/typing.d.ts

@@ -14,9 +14,9 @@ declare type IButtonComponent = 'Submit' | 'Reset';
 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';
 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 ProFormRequestConfig extends CommonRequestConfig {
-    beforeRequest?: (field?: any) => any;
-    onSuccess?: (res?: any, field?: any) => any;
-    onComplete?: (res?: any, field?: any) => any;
+    beforeRequest?: (field?: any, context?: any) => any;
+    onSuccess?: (res?: any, field?: any, context?: any) => any;
+    onComplete?: (res?: any, field?: any, context?: any) => any;
 }
 export interface ProFormSchemaItem {
     type?: string;
@@ -51,6 +51,7 @@ export interface ProFormProps extends IFormLayoutProps {
     form?: FormType | false;
     schema: ProFormSchema;
     scope?: any;
+    context?: any;
     components?: {
         [key: string]: React.FC | React.ComponentClass;
     };

package/lib/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.2.3";
+declare const version = "1.2.7";
 export { version, ProAction, ProCard, ProField, ProForm, ProInfo, ProPageContainer, ProPageHeader, ProSkeleton, ProTable, hooks, nocode, templates, utils, };

package/lib/index.js

@@ -248,8 +248,10 @@ 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; }
 
 // import ProLayout from './layout';
+// import ProSidebar from './sidebar'
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.2.3';
+// export * from './sidebar';
+var version = '1.2.7';
 exports.version = version;

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

@@ -19,7 +19,7 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _ = _interopRequireDefault(require("../.."));
 
-var _excluded = ["children", "url", "method", "params", "formatResult", "onSuccess", "onError", "formatParams", "beforeRequest", "extendParams", "className", "compacted", "divider", "style", "backgroundColor"];
+var _excluded = ["children", "url", "method", "params", "formatResult", "onSuccess", "onError", "formatParams", "beforeRequest", "extendParams", "className", "compacted", "divider", "style", "backgroundColor", "context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -57,6 +57,8 @@ var ProInfoGroup = function ProInfoGroup(props) {
       style = props.style,
       _props$backgroundColo = props.backgroundColor,
       backgroundColor = _props$backgroundColo === void 0 ? '' : _props$backgroundColo,
+      _props$context = props.context,
+      context = _props$context === void 0 ? {} : _props$context,
       others = _objectWithoutProperties(props, _excluded);
 
   var ref = (0, _react.useRef)();
@@ -82,7 +84,8 @@ var ProInfoGroup = function ProInfoGroup(props) {
     onError: onError,
     formatParams: formatParams,
     beforeRequest: beforeRequest,
-    extendParams: extendParams
+    extendParams: extendParams,
+    context: context
   };
   var proInfoClassName = (0, _classnames.default)({
     'teamix-pro-info-group-item': true,

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

@@ -25,7 +25,7 @@ var _components = require("@alicloudfe/components");
 
 var _actions = require("../../../actions");
 
-var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource"];
+var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource", "context"];
 
 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); }
 
@@ -75,6 +75,7 @@ var InfoValueItem = function InfoValueItem(props) {
       record = props.record,
       actionRef = props.actionRef,
       dataSource = props.dataSource,
+      context = props.context,
       others = _objectWithoutProperties(props, _excluded);
 
   var dataIndex = infoItem.dataIndex,
@@ -117,9 +118,8 @@ var InfoValueItem = function InfoValueItem(props) {
               v = _ref2[1];
 
           return [k, (0, _utils.getTargetValue)(v, _objectSpread(_objectSpread({}, record), {}, {
-            record: record,
             value: value
-          }))];
+          }, context))];
         }));
       });
     }
@@ -158,9 +158,7 @@ var InfoValueItem = function InfoValueItem(props) {
         style: {
           marginLeft: '8px'
         },
-        context: {
-          record: record
-        }
+        context: _objectSpread({}, context)
       });
     }
 

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

@@ -35,7 +35,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
       result = props.result,
       actionRef = props.actionRef,
       layout = props.layout,
-      size = props.size;
+      size = props.size,
+      context = props.context;
 
   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)]; // 获取列内的布局参数
 
@@ -90,7 +91,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
           dataSource: item.dataSource,
           infoItem: item,
           record: dataSource !== null && dataSource !== void 0 ? dataSource : result,
-          actionRef: actionRef
+          actionRef: actionRef,
+          context: context
         }),
         baseInfoLayout: getFormItemLayout((_item$colSpan = item === null || item === void 0 ? void 0 : item.colSpan) !== null && _item$colSpan !== void 0 ? _item$colSpan : 0),
         tooltip: item.tooltip,

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

@@ -58,8 +58,9 @@ var ProTableInfo = function ProTableInfo(props) {
       _layout$labelGutter = layout.labelGutter,
       labelGutter = _layout$labelGutter === void 0 ? '80px' : _layout$labelGutter;
 
-  var newColumns = function newColumns() {
-    return _toConsumableArray(new Array(colNum)).map(function (_, index) {
+  var getNewColumns = function getNewColumns() {
+    // 需要 fill 填充 否则有可能不执行
+    return _toConsumableArray(new Array(colNum)).fill(1).map(function (_, index) {
       return [{
         dataIndex: "label_".concat(index),
         align: 'left',
@@ -104,9 +105,7 @@ var ProTableInfo = function ProTableInfo(props) {
           var needCol = 1 + ((_columnsItem$colSpan = columnsItem === null || columnsItem === void 0 ? void 0 : columnsItem.colSpan) !== null && _columnsItem$colSpan !== void 0 ? _columnsItem$colSpan : 1); // 如果剩余的col能满足下一组数据那么就放在这一组
 
           if (needCol <= col) {
-            var _columnsItem$colSpan2;
-
-            col = col - 1 - ((_columnsItem$colSpan2 = columnsItem === null || columnsItem === void 0 ? void 0 : columnsItem.colSpan) !== null && _columnsItem$colSpan2 !== void 0 ? _columnsItem$colSpan2 : 1);
+            col = col - needCol;
             filterColumns.push(columnsItem);
           } else {
             var _filterColumns$0$colS;
@@ -119,6 +118,11 @@ var ProTableInfo = function ProTableInfo(props) {
             col = 0;
           }
         }
+
+        if (columnsCopy.length === 0) {
+          // 如果剩余仍有列数并且已经没有columns分配了
+          col = 0;
+        }
       }
 
       var itemData = filterColumns.map(function (item, index) {
@@ -185,7 +189,7 @@ var ProTableInfo = function ProTableInfo(props) {
   return /*#__PURE__*/_react.default.createElement(_components.Table.StickyLock, {
     className: "teamix-pro-info-table",
     cellProps: setCellProps,
-    columns: newColumns(),
+    columns: getNewColumns(),
     hasHeader: false,
     hasBorder: true,
     dataSource: newDataSource

package/lib/info/index.js

@@ -41,7 +41,8 @@ Object.keys(_typing).forEach(function (key) {
     }
   });
 });
-var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra"];
+var _excluded = ["type", "url", "method", "formatResult", "formatParams", "params", "actionRef", "header", "onSuccess", "onError", "beforeRequest", "extendParams", "className", "style", "columns", "layout", "dataSource", "loading", "extra", "context"],
+    _excluded2 = ["context"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -96,6 +97,7 @@ var ProInfo = function ProInfo(props) {
       dataSource = props.dataSource,
       userLoading = props.loading,
       extra = props.extra,
+      infoContext = props.context,
       others = _objectWithoutProperties(props, _excluded);
 
   var _useContext = (0, _react.useContext)(_utils.ProInfoGroupContext),
@@ -109,7 +111,9 @@ var ProInfo = function ProInfo(props) {
       contextOnError = _useContext.onError,
       contextFormatParams = _useContext.formatParams,
       contextBeforeRequest = _useContext.beforeRequest,
-      contextExtendParams = _useContext.extendParams; // 获取容器宽度
+      contextExtendParams = _useContext.extendParams,
+      _useContext$context = _useContext.context,
+      contextContext = _useContext$context === void 0 ? {} : _useContext$context; // 获取容器宽度
 
 
   var ref = (0, _react.useRef)();
@@ -146,7 +150,12 @@ var ProInfo = function ProInfo(props) {
     } else {
       setLoading(false);
     }
-  }, []); // 获取数据
+  }, []);
+  var context = (0, _react.useMemo)(function () {
+    return _objectSpread(_objectSpread({}, infoContext), {}, {
+      record: dataSource !== null && dataSource !== void 0 ? dataSource : data
+    }, contextContext);
+  }, [dataSource, data]); // 获取数据
 
   var request = function request() {
     setLoading(true);
@@ -179,10 +188,12 @@ var ProInfo = function ProInfo(props) {
       return extra;
     }
 
-    return _objectSpread(_objectSpread({}, extra), {}, {
-      context: {
-        record: dataSource !== null && dataSource !== void 0 ? dataSource : data
-      }
+    var _extra$context = extra.context,
+        actionContext = _extra$context === void 0 ? {} : _extra$context,
+        others = _objectWithoutProperties(extra, _excluded2);
+
+    return _objectSpread(_objectSpread({}, others), {}, {
+      context: _objectSpread(_objectSpread({}, context), actionContext)
     });
   };
 
@@ -203,7 +214,8 @@ var ProInfo = function ProInfo(props) {
     loading: userLoading || loading,
     result: data,
     actionRef: actionRef,
-    layout: layout
+    layout: layout,
+    context: context
   }), type === 'header' && /*#__PURE__*/_react.default.createElement(_headerInfo.default, {
     dataSource: dataSource,
     columns: columns,
@@ -212,7 +224,8 @@ var ProInfo = function ProInfo(props) {
     result: data,
     actionRef: actionRef,
     layout: layout,
-    size: size
+    size: size,
+    context: context
   }), type === 'base' && /*#__PURE__*/_react.default.createElement(_baseInfo.default, {
     dataSource: dataSource,
     columns: columns,
@@ -220,7 +233,8 @@ var ProInfo = function ProInfo(props) {
     result: data,
     actionRef: actionRef,
     layout: layout,
-    size: size
+    size: size,
+    context: context
   })));
 };