@teamix/pro 1.3.6 → 1.3.7

package/lib/form/Filter/useSpecialProps.js

@@ -24,7 +24,7 @@ var useSpecialProps = function useSpecialProps(props) {
           dataSource = item.dataSource,
           children = item.children; // 字符串变量配置default值会触发onChange
 
-      hasChangeDefault = hasChangeDefault || !!((0, _utils.isPureObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
+      hasChangeDefault = hasChangeDefault || !!((0, _utils.isPlainObj)(dataSource) && (0, _utils.isStr)(value) && value.indexOf('.dataSource'));
       hasDefault = hasDefault || (0, _utils.isUsable)(value);
       hasRequired = hasRequired || required || !!rules;
 

package/lib/form/ProForm/index.js

@@ -31,7 +31,7 @@ var _validate = _interopRequireDefault(require("../locales/validate"));
 
 require("./index.scss");
 
-var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className"];
+var _excluded = ["form", "initialValues", "initialRequest", "schema", "scope", "context", "components", "children", "layout", "labelAlign", "wrapperAlign", "labelCol", "wrapperCol", "breakpoints", "onChange", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -70,11 +70,12 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
       onSubmitFailed = _ref.onSubmitFailed,
       onInitialComplete = _ref.onInitialComplete,
       className = _ref.className,
+      validateFirst = _ref.validateFirst,
       otherProps = _objectWithoutProperties(_ref, _excluded);
 
   var form = (0, _react.useMemo)(function () {
     return outerForm || (0, _core.createForm)({
-      validateFirst: true
+      validateFirst: validateFirst
     });
   }, []);
   var prefixCls = (0, _utils.usePrefixCls)('', {
@@ -146,7 +147,8 @@ var ProForm = /*#__PURE__*/(0, _react.memo)(function (_ref) {
 });
 ProForm.defaultProps = {
   colon: false,
-  labelAlign: 'left'
+  labelAlign: 'left',
+  validateFirst: true
 };
 var _default = ProForm;
 exports.default = _default;

package/lib/form/ProForm/index.scss

@@ -197,14 +197,15 @@
     margin-right: 4px;
   }
 }
-// 数组类ArrayItem Icon 居中（移除，通过align:center配置）
-// .#{$form-array}-items-item-inner {
-//   .#{$css-prefix}space-item {
-//     > .#{$css-prefix}formily-icon {
-//       margin-top: 9px;
-//     }
-//   }
-// }
+// 数组类ArrayItem Icon text 居中
+.#{$form-array}-items-item-inner {
+  .#{$css-prefix}space-item {
+    > .#{$css-prefix}formily-icon.#{$css-prefix}btn-text {
+      line-height: inherit !important;
+      margin-right: 0;
+    }
+  }
+}
 
 // Editable预览态行高
 .#{$css-prefix}formily-editable-content {
@@ -212,6 +213,13 @@
 }
 
 // 折叠面板
+.#{$css-prefix}formily-collapse {
+  .#{$css-prefix}collapse-panel-title {
+    .#{$css-prefix}badge-count {
+      transform: translateX(4px);
+    }
+  }
+}
 .#{$css-prefix}formily-collapse,
 .#{$form-array}-collapse-item {
   .#{$css-prefix}collapse-panel-hidden {

package/lib/form/SchemaForm/reactions.js

@@ -37,7 +37,7 @@ var $request = function $request(field, _ref, context, type) {
   // 触发所有配置的请求
 
   var refresh = (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.refresh;
-  var refreshResult = (0, _utils.isPureObj)(refresh) ? refresh : {};
+  var refreshResult = (0, _utils.isPlainObj)(refresh) ? refresh : {};
   return (0, _utils.doCommonRequest)(_objectSpread(_objectSpread({}, requestConfig), {}, {
     params: _objectSpread(_objectSpread(_objectSpread({}, params), beforeRequestResult), refreshResult),
     beforeRequest: function beforeRequest() {

package/lib/form/typing.d.ts

@@ -66,6 +66,7 @@ export interface ProFormProps extends IFormLayoutProps {
     initialValues?: AnyObject;
     initialRequest?: ProFormRequestConfig;
     previewTextPlaceholder?: ReactNode;
+    validateFirst?: boolean;
     onChange?: (values: any, fieldValue?: any, fieldName?: any) => any;
     onSubmit?: ((values: any) => any) | CommonRequestConfig;
     onSubmitFailed?: (feedbacks: IFormFeedback[]) => void;

package/lib/index.d.ts

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

package/lib/index.js

@@ -305,5 +305,5 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // 设置图标源
 _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 
-var version = '1.3.6';
+var version = '1.3.7';
 exports.version = version;

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

@@ -28,17 +28,13 @@ var ProInfoItem = function ProInfoItem(prop) {
       headerInfoLayout = prop.headerInfoLayout,
       loading = prop.loading,
       tooltip = prop.tooltip,
-      tooltipIcon = prop.tooltipIcon,
-      _isLastRow = prop._isLastRow;
+      tooltipIcon = prop.tooltipIcon;
 
   if (baseInfoLayout) {
     var labelCol = baseInfoLayout.labelCol,
         wrapperCol = baseInfoLayout.wrapperCol;
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: cls({
-        '': true,
-        isLastRow: _isLastRow
-      })
+      className: cls('')
     }, /*#__PURE__*/_react.default.createElement(Row, {
       gutter: 10,
       className: cls('base-row')

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

@@ -17,10 +17,6 @@ $item-padding-bottom: 8px;
 .teamix-pro-field-info-form-item {
   width: 100%;
   padding-bottom: $item-padding-bottom;
-  &-isLastRow{
-    padding-bottom: unset;
-  }
-
   &-header-row {
     display: flex;
     align-items: center;

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

@@ -84,7 +84,6 @@ var ProBaseInfo = function ProBaseInfo(props) {
       }, /*#__PURE__*/_react.default.createElement(_ProInfoItem.default, {
         label: (_item$title = item === null || item === void 0 ? void 0 : item.title) !== null && _item$title !== void 0 ? _item$title : '',
         loading: loading,
-        _isLastRow: !!(0, _utils2.isLastRow)(columns.length, layoutSpan, index),
         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.getDataIndexValue)(item.dataIndex, (_ref = dataSource !== null && dataSource !== void 0 ? dataSource : result) !== null && _ref !== void 0 ? _ref : {}),

package/lib/info/typing.d.ts

@@ -113,8 +113,6 @@ export declare type IProProInfoItem = {
     headerInfoLayout?: ProHeaderInfoLayoutProps;
     /** loading 状态 */
     loading?: boolean;
-    /** isLastRow 是否是最后一行的元素 */
-    _isLastRow?: boolean;
 } & Pick<ProInfoColumnsProps, 'tooltip' | 'tooltipIcon'>;
 /** header info 定义 */
 export declare type IProHeaderInfo = {

package/lib/info/utils/index.d.ts

@@ -10,11 +10,3 @@ export declare const ProInfoGroupContext: React.Context<ProInfoGroupContextProps
  * @returns
  */
 export declare function getDataIndexValue(dataIndex: ProInfoColumnsProps['dataIndex'], dataSource: object): any;
-/**
- * 是否是最后一样的元素
- * @param columnsLength
- * @param layoutSpan
- * @params itemIndex
- * @returns
- */
-export declare const isLastRow: (columnsLength: number, layoutSpan: number, itemIndex: number) => boolean | undefined;

package/lib/info/utils/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ProInfoGroupContext = void 0;
 exports.getDataIndexValue = getDataIndexValue;
-exports.isLastRow = void 0;
 exports.useActionType = useActionType;
 
 var _utils = require("@teamix/utils");
@@ -48,34 +47,4 @@ function getDataIndexValue(dataIndex, dataSource) {
   }
 
   return (0, _utils.getDeepValue)(dataIndex !== null && dataIndex !== void 0 ? dataIndex : '', dataSource);
-}
-/**
- * 是否是最后一样的元素
- * @param columnsLength
- * @param layoutSpan
- * @params itemIndex
- * @returns
- */
-
-
-var isLastRow = function isLastRow(columnsLength, layoutSpan, itemIndex) {
-  if (!columnsLength || !layoutSpan) return;
-  var lastRowColumnsIndexList = [];
-  var rowCount = 24 / layoutSpan;
-
-  if (columnsLength % rowCount === 0) {
-    while (rowCount--) {
-      lastRowColumnsIndexList.push(columnsLength--);
-    }
-  } else {
-    var lastRowCount = columnsLength % rowCount;
-
-    while (lastRowCount--) {
-      lastRowColumnsIndexList.push(columnsLength--);
-    }
-  }
-
-  return lastRowColumnsIndexList.includes(itemIndex + 1);
-};
-
-exports.isLastRow = isLastRow;
+}

package/lib/sidebar/components/tree/index.js

@@ -13,7 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _treeNode = require("../tree-node");
 
-var _lodash = require("lodash");
+var _lodash = _interopRequireDefault(require("lodash.debounce"));
 
 require("./index.scss");
 
@@ -235,7 +235,7 @@ var ProSidebarTree = function ProSidebarTree(props) {
   }; // 过滤
 
 
-  var filterDataSource = (0, _lodash.debounce)(function (value) {
+  var filterDataSource = (0, _lodash.default)(function (value) {
     var searchDataSource = processDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
     var expandedKeys = [];
 

package/lib/sidebar/components/tree-node/components/IconSwitch/index.js

@@ -53,7 +53,7 @@ var ProIconSwitch = function ProIconSwitch(props) {
       setVisible = _useState2[1];
 
   (0, _react.useEffect)(function () {
-    setVisible(visibleProp !== null && visibleProp !== void 0 ? visibleProp : false);
+    setVisible(visibleProp !== null && visibleProp !== void 0 ? visibleProp : true);
   }, [visibleProp]); // 点击操作
 
   var clickHandle = function clickHandle(e, state) {

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

@@ -178,7 +178,7 @@ var _default = function _default(props) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls('custom-jumper')
     }, /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "next-prev next-pagination-item",
+      className: "".concat((0, _utils.usePrefixCls)(), "prev ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
       onClick: handlePrevClick,
       disabled: Number(currentPage) <= 1
     }, /*#__PURE__*/_react.default.createElement(_components.Icon, {
@@ -200,7 +200,7 @@ var _default = function _default(props) {
         marginRight: 4
       }
     }, "/"), getTotalPage(total, pageSize)), /*#__PURE__*/_react.default.createElement(_components.Button, {
-      className: "next-next next-pagination-item",
+      className: "".concat((0, _utils.usePrefixCls)(), "next ").concat((0, _utils.usePrefixCls)(), "pagination-item"),
       onClick: handleNextClick,
       //@ts-ignore
       disabled: total && Number(currentPage) >= getTotalPage(total, pageSize)
@@ -218,7 +218,7 @@ var _default = function _default(props) {
         }, otherProps));
       } else {
         return /*#__PURE__*/_react.default.createElement("div", {
-          className: "".concat(cls('custom-mini-pagination'), "  next-pagination")
+          className: "".concat(cls('custom-mini-pagination'), "  ").concat((0, _utils.usePrefixCls)(), "pagination")
         }, customTotalRender(total), customJumpRender());
       }
     }

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

@@ -64,8 +64,12 @@ var processColumns = function processColumns(columns) {
     columns = columns.filter(function (item) {
       return item.valueType !== 'selectGroup';
     });
-  }
+  } // hidden 为 true 时不展示
+
 
+  columns = columns.filter(function (item) {
+    return (item === null || item === void 0 ? void 0 : item.hidden) !== true;
+  });
   return columns.map(function (item) {
     if (item.columnFilters === false) {
       return item;

package/lib/table/index.js

@@ -109,7 +109,7 @@ var processColumns = function processColumns(columns, initialColumns) {
   var _filterColumns;
 
   var filterColumns = columns.filter(function (item) {
-    return item.columnFilters !== false;
+    return item.columnFilters !== false && (item === null || item === void 0 ? void 0 : item.hidden) !== true;
   });
 
   if (isRoot) {
@@ -313,7 +313,7 @@ var ProTable = function ProTable(props) {
 
     var tableDom = tableRef.current;
     var headerDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) === null || _tableDom$getElements === void 0 ? void 0 : _tableDom$getElements[0];
-    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName('next-table-header-inner')) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
+    var tableHeaderDom = tableDom === null || tableDom === void 0 ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName("".concat((0, _utils.usePrefixCls)(), "table-header-inner"))) === null || _tableDom$getElements2 === void 0 ? void 0 : _tableDom$getElements2[0];
     return new Promise(function (resolve) {
       setTimeout(function () {
         var _headerDom$offsetHeig, _tableHeaderDom$offse;
@@ -736,6 +736,11 @@ var ProTable = function ProTable(props) {
             setTotal(total || (data === null || data === void 0 ? void 0 : data.length));
             setShowSkeleton(false);
             setCustomTableLoading(false);
+          } // 重新计算是否需要吸底
+
+
+          if (footerSuction) {
+            getFooterSuctionState();
           }
         });
       } else {
@@ -794,7 +799,7 @@ var ProTable = function ProTable(props) {
     onInit: function onInit(values) {
       // 表单初始化请求处理
       (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit) && (propsDataFilter === null || propsDataFilter === void 0 ? void 0 : propsDataFilter.onInit(values));
-      !fullscreenState && _request({}, false, values);
+      !fullscreenState && requestWhenMount && _request({}, false, values);
       return true;
     },
     onFilter: function onFilter(values) {

package/lib/table/typing.d.ts

@@ -33,7 +33,9 @@ export declare type ProTableColumnProps = {
     tooltipIcon?: React.ReactNode;
     /** 对应 ProField 里面的 type */
     valueType?: ProFieldType;
-    /** 【列配置】是否默认隐藏列 */
+    /** 是否隐藏表格列，列配置也不显示 */
+    hidden?: boolean;
+    /** 【列配置】是否默认隐藏表格列，但列配置显示 */
     columnFilters?: boolean;
     /** 【列配置】是否禁用隐藏列 */
     columnFiltersDisabled?: boolean;

package/package.json

@@ -1,7 +1,21 @@
 {
   "name": "@teamix/pro",
-  "version": "1.3.6",
+  "version": "1.3.7",
   "description": "TeamixPro大包",
+  "keywords": [
+    "aliyun",
+    "hybridcloud",
+    "teamix",
+    "pro",
+    "components",
+    "ui",
+    "ui library",
+    "react",
+    "frontend",
+    "protable",
+    "proform",
+    "proaction"
+  ],
   "repository": "http://gitlab.alibaba-inc.com/teamix/pro",
   "author": "Velociraptor(迅猛龙)",
   "license": "MIT",
@@ -22,9 +36,9 @@
   ],
   "private": false,
   "dependencies": {
-    "@formily/core": "2.0.11",
-    "@formily/react": "2.0.11",
-    "@teamix/formily": "2.0.11",
+    "@formily/core": "2.0.15",
+    "@formily/react": "2.0.15",
+    "@teamix/formily": "2.0.15",
     "@teamix/hooks": "^0.1.0",
     "@teamix/pop-confirm": "^1.2.4",
     "@teamix/pro-field": "^1.0.0",