@teamix/pro 1.2.0 → 1.2.5

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

package/lib/index.js

@@ -251,5 +251,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.1.39';
+var version = '1.2.4';
 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,
@@ -95,7 +96,7 @@ var InfoValueItem = function InfoValueItem(props) {
 
     if (typeof render === 'function') {
       return function () {
-        render(value, record);
+        return render(value, record);
       };
     }
 
@@ -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/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
   })));
 };
 

package/lib/info/typing.d.ts

@@ -48,6 +48,8 @@ export declare type ProInfoBaseProps = {
     layout?: ProBaseInfoLayoutProps;
     /** 加载动画 */
     loading?: boolean;
+    /** 上下文传递 */
+    context?: object;
 } & ProInfoHeaderProps & ProInfoRequestProps;
 /** ProInfoColumnsProps info 单元格 定义 */
 export declare type ProInfoItemProps = ProInfoColumnsProps;
@@ -155,6 +157,8 @@ export declare type ProInfoGroupProps = {
     compacted?: ProCardProps['compacted'];
     /** 背景颜色 */
     backgroundColor?: ProCardProps['backgroundColor'];
+    /** 上下文 */
+    context?: object;
 } & ProInfoRequestProps & React.HTMLAttributes<HTMLElement>;
 export declare type TableInfoLayoutProps = {} & ProHeaderInfoLayoutProps;
 export declare type InfoValueItemProps = {
@@ -163,6 +167,7 @@ export declare type InfoValueItemProps = {
     actionRef?: React.MutableRefObject<ProInfoActionType | undefined>;
     render?: ProInfoCellRender;
     dataSource?: ProFieldDataSourceItem[] | ProInfoCellFunProp;
+    context?: object;
 } & Omit<ProFieldProps, 'render' | 'dataSource'>;
 export declare type ProInfoHeaderProps = Omit<ProCardProps, 'loading'>;
 /** ProInfoGroupContextProps */
@@ -174,6 +179,7 @@ export declare type ProInfoGroupContextProps = {
         width?: number;
         height?: number;
     };
+    context?: object;
 } & ProInfoRequestProps;
 /** 基本透传类型 */
 export declare type ProInfoTransparentBase = {

package/lib/nocode/configurators/Card.js

@@ -27,6 +27,14 @@ var schema = [{
           name: 'subTitle',
           title: '副标题',
           component: 'Input'
+        }, {
+          name: 'tooltip',
+          title: '介绍信息',
+          component: 'Input'
+        }, {
+          name: 'description',
+          title: '描述文字',
+          component: 'Input'
         }, {
           name: 'extra',
           title: '额外信息',
@@ -55,10 +63,6 @@ var schema = [{
           name: 'bordered',
           title: '边框',
           component: 'Switch'
-        }, {
-          name: 'hoveredShadow',
-          title: '悬浮阴影',
-          component: 'Switch'
         }, {
           name: 'divider',
           title: '头部分割线',

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

@@ -122,7 +122,7 @@ var Layout = function Layout(props) {
   var renderPanelFilter = function renderPanelFilter() {
     var _dataFilter$schema2;
 
-    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) > 0) {
+    if (dataFilter && (dataFilter === null || dataFilter === void 0 ? void 0 : (_dataFilter$schema2 = dataFilter.schema) === null || _dataFilter$schema2 === void 0 ? void 0 : _dataFilter$schema2.length) >= 0) {
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('panel-filter'),
         style: {

package/lib/table/components/ToolBar/FilterColumnIcon.js

@@ -95,27 +95,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
 
   (0, _react.useEffect)(function () {
     setNewColumns(processColumns(columns));
-  }, [columns]); // useEffect(() => {
-  //   console.log("这个函数被触发");
-  //   setTimeout(() => {
-  //     setFullscreen(actionRef?.current?.getState?.().fullScreenState ?? false);
-  //   }, 0)
-  // }, [])
-  // // 销毁监听函数
-  // useEffect(() => {
-  //   return () => {
-  //     actionRef.current?.off?.('filterColumnIcon');
-  //   };
-  // }, []);
-  // // 监听全屏变化
-  // actionRef.current?.on?.(
-  //   (state: boolean) => {
-  //     setFullscreen(state);
-  //   },
-  //   'fullScreenState',
-  //   'filterColumnIcon',
-  // );
-  // 全选
+  }, [columns]); // 全选
 
   var onChangeAllColumns = function onChangeAllColumns(check) {
     setAllVisible(check);
@@ -314,9 +294,7 @@ var FilterColumnIcon = function FilterColumnIcon(props) {
       onOk: onChangeColumnsForDialog,
       onCancel: dialogOnClose,
       onClose: dialogOnClose,
-      style: {
-        width: '440px'
-      }
+      width: 480
     }, /*#__PURE__*/_react.default.createElement(Row, {
       gutter: 20,
       wrap: true,

package/lib/table/components/ToolBar/index.scss

@@ -67,8 +67,6 @@
       }
     }
   }
-
-  
 }
 .teamix-pro-table-toolbar-filter-column-col {
   height: 28px;
@@ -78,7 +76,6 @@
   }
 }
 
-
 // fullscreen
 .teamix-pro-table-full-screen {
   width: 100vw;

package/lib/table/index.js

@@ -40,6 +40,8 @@ var _lodash = _interopRequireDefault(require("lodash.debounce"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _pageContainer = _interopRequireDefault(require("../page-container"));
+
 var _typing = require("./typing");
 
 Object.keys(_typing).forEach(function (key) {
@@ -279,10 +281,10 @@ var ProTable = function ProTable(props) {
 
   var dataFilterForm = (0, _react.useMemo)(function () {
     return (0, _form.createForm)();
-  }, []); // 获取内容区是否超出一屏（仅支持全家桶）
+  }, []); // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
   var getFooterSuctionState = function getFooterSuctionState() {
-    var containerDom = document.querySelector('.teamix-pro-page-container');
+    var containerDom = document.querySelector('.teamix-pro-page-container-scroll-container');
 
     if (containerDom) {
       var offsetHeight = containerDom.offsetHeight;
@@ -293,6 +295,11 @@ var ProTable = function ProTable(props) {
       } else {
         setFooterSuctionState(false);
       }
+    } else {
+      // 非全家桶用户暂时不判断滚动条逻辑
+      if (footerSuction) {
+        setFooterSuctionState(true);
+      }
     }
   }; // rowSelection 相关
 
@@ -408,7 +415,9 @@ var ProTable = function ProTable(props) {
       return _request(params);
     },
     request: function request(params) {
-      return _request(params);
+      if (dataFilterForm.validate()) {
+        _request(params);
+      }
     },
     reset: function reset() {
       var _actionRef$current, _actionRef$current$se;
@@ -695,7 +704,7 @@ var ProTable = function ProTable(props) {
   var renderFooterAction = function renderFooterAction() {
     var _footerAction$actions;
 
-    if (_typeof(footerAction) === 'object' && (footerAction === null || footerAction === void 0 ? void 0 : (_footerAction$actions = footerAction.actions) === null || _footerAction$actions === void 0 ? void 0 : _footerAction$actions.length) > 0) {
+    if (_typeof(footerAction) === 'object' && (footerAction === null || footerAction === void 0 ? void 0 : (_footerAction$actions = footerAction.actions) === null || _footerAction$actions === void 0 ? void 0 : _footerAction$actions.length) >= 0) {
       // 默认 context
       var defaultContext = {
         action: actionRef.current,
@@ -795,11 +804,11 @@ var ProTable = function ProTable(props) {
   }, /*#__PURE__*/_react.default.createElement("div", {
     className: cls({
       '': true,
-      fullscreen: fullscreenState,
-      'footer-suction': footerSuctionState && footerSuction
+      fullscreen: fullscreenState // 'footer-suction': footerSuctionState && footerSuction,
+
     }),
     ref: tableRef
-  }, renderTable(), renderFooter()));
+  }, renderTable(), footerSuctionState && footerSuction && /*#__PURE__*/_react.default.createElement(_pageContainer.default.FixedFooter, null, renderFooter()), !(footerSuctionState && footerSuction) && renderFooter()));
 };
 
 var _default = ProTable;

package/lib/table/typing.d.ts

@@ -4,7 +4,7 @@
 import { ColumnProps, TableProps } from '@alicloudfe/components/types/table';
 import { ProFieldType, ProFieldRenderProps, ProFieldDataSourceItem } from '../field';
 import { IFilterProps } from '../form';
-import { ActionGroupProps, ProActionButtonProps } from '../actions';
+import { ProActionGroupProps, ProActionButtonProps } from '../actions';
 import { PaginationProps } from '@alicloudfe/components/types/pagination';
 import { HeaderProps as ProTableHeaderProps } from '@teamix/utils';
 import { Method } from 'axios';
@@ -50,7 +50,7 @@ export declare type ProTableColumnProps = {
     /** 表头的过滤菜单宽度 */
     filtersWidth?: string | number;
     /** 操作组配置 */
-    actionSchema?: ActionGroupProps;
+    actionSchema?: ProActionGroupProps;
     /** 指定列对应的字段，支持`a.b`形式的快速取值 和 数组取值 */
     dataIndex?: string | string[];
     /** 指定 valueType 为日期时间格式时，可以格式化日期时间 */
@@ -99,7 +99,7 @@ export declare type ProTableProps = {
     /** 获取内置 rowSelection */
     getRowSelection?: (rowSelection: rowSelectionType) => void;
     /** 表格底部（左侧）配置 */
-    footerAction?: ActionGroupProps | React.ReactNode;
+    footerAction?: ProActionGroupProps | React.ReactNode;
     /** 筛选区自动搜索的防抖时间（毫秒） */
     filterDebounce?: number;
     /** ProTable action 的引用，便于手动触发一些方法  */
@@ -211,7 +211,7 @@ export declare type ProTableTopAreaProps = {
     /** 标题区 */
     header?: ProTableHeaderProps;
     /** 主操作区 */
-    mainAction?: ActionGroupProps | React.ReactNode;
+    mainAction?: ProActionGroupProps | React.ReactNode;
     /** 工具栏区 */
     toolBar?: boolean | ProTableToolBarItem[];
     /** 快捷操作区 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.2.0",
+  "version": "1.2.5",
   "description": "TeamixPro大包",
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
@@ -22,9 +22,9 @@
   ],
   "private": false,
   "dependencies": {
-    "@formily/core": "2.0.2",
-    "@formily/react": "2.0.2",
-    "@teamix/formily": "2.0.2",
+    "@formily/core": "2.0.4",
+    "@formily/react": "2.0.4",
+    "@teamix/formily": "2.0.4",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.2",
     "@teamix/pro-field": "^1.0.0",
@@ -32,6 +32,7 @@
     "@teamix/pro-skeleton": "^1.0.0",
     "@teamix/svg": "^1.0.11",
     "@teamix/utils": "^0.1.0",
+    "@teamix/result": "^1.0.29",
     "classnames": "^2.3.1",
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",