@teamix/pro 1.5.26 → 1.5.27

package/es/card/index.scss

@@ -310,4 +310,8 @@
     background: transparent;
   }
 
+  .next-card-content-container:has(.cloud-wnumbercard-data-overview-container) {
+    margin-top: -4px;
+  }
+
 }

package/es/form/SchemaForm/adapterType.js

@@ -12,7 +12,10 @@ var typeMap = (_typeMap = {
   Money: 'number',
   Select: 'string',
   MenuSelect: 'string',
+  MultipleMenuSelect: 'array',
   MultipleSelect: 'array',
+  MenuCascaderSelect: 'string',
+  MultipleMenuCascaderSelect: 'array',
   TreeSelect: 'string',
   Cascader: 'string',
   MultipleCascader: 'array',

package/es/form/fieldTypeMap.js

@@ -7,6 +7,9 @@ var fieldTypeMap = {
   Money: 'money',
   Select: 'select',
   MenuSelect: 'menuSelect',
+  MultipleMenuSelect: 'multipleMenuSelect',
+  MenuCascaderSelect: 'menuCascaderSelect',
+  MultipleMenuCascaderSelect: 'multipleMenuCascaderSelect',
   MultipleSelect: 'multipleSelect',
   TreeSelect: 'treeSelect',
   Cascader: 'cascader',

package/es/form/global.scss

@@ -12,3 +12,10 @@ $inset-font-weight-medium: calc(
 $noborder-font-weight-medium: calc(
   var(--form-element-medium-height, 32px) - var(--input-border-width, 1px) * 2
 );
+.next-formily-item.next-formily-item.next-formily-item {
+  display: flex;
+  font-size: var(--font-size-body-1,12px);
+}
+.next-formily-item-inset.next-formily-item-inset.next-formily-item-inset {
+  line-height: calc(var(--form-element-medium-height, 32px) - var(--input-border-width, 1px)*2);
+}

package/es/index.d.ts

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

package/es/index.js

@@ -37,7 +37,7 @@ export * from './sidebar';
 export * from './utils';
 export * from './timeline';
 export * from './image';
-var version = '1.5.26';
+var version = '1.5.27';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

package/es/table/components/Filter/index.js

@@ -77,7 +77,7 @@ var Filter = function Filter(props) {
     }
     // console.log(filters);
     return filters;
-  }, []);
+  }, [column]);
   // 点击确定回调
   var onFilterOk = function onFilterOk() {
     var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s, _actionRef$current5, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$r, _actionRef$current9, _actionRef$current9$c;
@@ -159,7 +159,7 @@ var Filter = function Filter(props) {
           setSelected([valueStr]);
         }
       }, /*#__PURE__*/React.createElement(ProField, {
-        type: 'text',
+        type: "text",
         value: label,
         render: {
           ellipsis: true
@@ -187,7 +187,7 @@ var Filter = function Filter(props) {
           }
         }
       }, /*#__PURE__*/React.createElement(ProField, {
-        type: 'text',
+        type: "text",
         value: label,
         render: {
           ellipsis: true

package/es/table/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "autoWidth", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps", "bindUrlProps", "bindUrl", "autoRedirect", "useMaxData"],
-  _excluded2 = ["onChange"];
+  _excluded2 = ["onChange", "onPageSizeChange"];
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -148,7 +148,7 @@ var ProTable = function ProTable(props) {
     disableSelectAll = props.disableSelectAll,
     context = props.context,
     _props$autoWidth = props.autoWidth,
-    autoWidth = _props$autoWidth === void 0 ? false : _props$autoWidth,
+    autoWidthProp = _props$autoWidth === void 0 ? false : _props$autoWidth,
     _props$fixedTableBody = props.fixedTableBody,
     fixedTableBody = _props$fixedTableBody === void 0 ? false : _props$fixedTableBody,
     isTree = props.isTree,
@@ -212,6 +212,11 @@ var ProTable = function ProTable(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     filteredColumns = _useState16[0],
     setFilteredColumns = _useState16[1];
+  // 全局状态 ： 自适应表格
+  var autoWidth = useMemo(function () {
+    var _getGlobalConfig2;
+    return ((_getGlobalConfig2 = getGlobalConfig('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.autoWidth) || autoWidthProp;
+  }, [autoWidthProp]);
   // 判断是否有操作列，有的话则渲染一个 shadow dom
   var hasActionColumn = false;
   if (autoWidth) {
@@ -400,8 +405,8 @@ var ProTable = function ProTable(props) {
   });
   // 全局状态 ： 大数据截断
   var globalUseMaxData = useMemo(function () {
-    var _getGlobalConfig2;
-    return (_getGlobalConfig2 = getGlobalConfig('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.useMaxData;
+    var _getGlobalConfig3;
+    return (_getGlobalConfig3 = getGlobalConfig('ProTable')) === null || _getGlobalConfig3 === void 0 ? void 0 : _getGlobalConfig3.useMaxData;
   }, []);
   // 非全屏状态下的
   var normalDataFilterFormRef = useRef();
@@ -581,7 +586,7 @@ var ProTable = function ProTable(props) {
         emit('refreshFilterState', newColumns);
       }
       if (autoWidth) {
-        reGenFilteredColumnsByAutoWidth();
+        reGenFilteredColumnsByAutoWidth(columns);
       }
     },
     size: size,
@@ -653,6 +658,9 @@ var ProTable = function ProTable(props) {
     filterEnableRef: filterEnableRef,
     setData: function setData(data) {
       _setData(data);
+      if (autoWidth) {
+        reGenFilteredColumnsByAutoWidth();
+      }
     },
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight(offset) {
       getHeaderHeight(fullscreenState, offset);
@@ -699,12 +707,12 @@ var ProTable = function ProTable(props) {
   if (propsActionRef) {
     propsActionRef.current = actionRef.current;
   }
-  function reGenFilteredColumnsByAutoWidth() {
+  function reGenFilteredColumnsByAutoWidth(columns) {
     if (!autoWidth) {
       return;
     }
     setShowShadowContainer(true);
-    var authWidthedColumns = genAutoWidthColumns(filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
+    var authWidthedColumns = genAutoWidthColumns(columns !== null && columns !== void 0 ? columns : filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
     setFilteredColumns(authWidthedColumns);
     // 移除 shadow dom
     // setTimeout(() => {
@@ -926,7 +934,7 @@ var ProTable = function ProTable(props) {
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
               // 自动刷新不显示 loading
-              _request({}, true);
+              _request(params, true);
             }, Number(time));
             emit('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
           }
@@ -1133,6 +1141,7 @@ var ProTable = function ProTable(props) {
       var _props$paginationProp3;
       var _ref8 = (_props$paginationProp3 = props === null || props === void 0 ? void 0 : props.paginationProps) !== null && _props$paginationProp3 !== void 0 ? _props$paginationProp3 : {},
         onPaginationPropsChange = _ref8.onChange,
+        onPageSizeChangeProp = _ref8.onPageSizeChange,
         othersPaginationProps = _objectWithoutProperties(_ref8, _excluded2);
       return /*#__PURE__*/React.createElement("div", {
         className: cls('footer', {
@@ -1157,7 +1166,8 @@ var ProTable = function ProTable(props) {
         pageSizeSelector: total > (props.pageSize || 10) * 2 ? 'dropdown' : false,
         type: total / pageSize <= 2 ? 'simple' : 'normal',
         onPageSizeChange: function onPageSizeChange(number) {
-          return onChangePaginationSize(number);
+          onChangePaginationSize(number);
+          onPageSizeChangeProp === null || onPageSizeChangeProp === void 0 ? void 0 : onPageSizeChangeProp(number);
         },
         useMaxData: globalUseMaxData !== null && globalUseMaxData !== void 0 ? globalUseMaxData : useMaxData
       }, othersPaginationProps)))));

package/lib/card/index.scss

@@ -310,4 +310,8 @@
     background: transparent;
   }
 
+  .next-card-content-container:has(.cloud-wnumbercard-data-overview-container) {
+    margin-top: -4px;
+  }
+
 }

package/lib/form/SchemaForm/adapterType.js

@@ -18,7 +18,10 @@ var typeMap = (_typeMap = {
   Money: 'number',
   Select: 'string',
   MenuSelect: 'string',
+  MultipleMenuSelect: 'array',
   MultipleSelect: 'array',
+  MenuCascaderSelect: 'string',
+  MultipleMenuCascaderSelect: 'array',
   TreeSelect: 'string',
   Cascader: 'string',
   MultipleCascader: 'array',

package/lib/form/fieldTypeMap.js

@@ -13,6 +13,9 @@ var fieldTypeMap = {
   Money: 'money',
   Select: 'select',
   MenuSelect: 'menuSelect',
+  MultipleMenuSelect: 'multipleMenuSelect',
+  MenuCascaderSelect: 'menuCascaderSelect',
+  MultipleMenuCascaderSelect: 'multipleMenuCascaderSelect',
   MultipleSelect: 'multipleSelect',
   TreeSelect: 'treeSelect',
   Cascader: 'cascader',

package/lib/form/global.scss

@@ -12,3 +12,10 @@ $inset-font-weight-medium: calc(
 $noborder-font-weight-medium: calc(
   var(--form-element-medium-height, 32px) - var(--input-border-width, 1px) * 2
 );
+.next-formily-item.next-formily-item.next-formily-item {
+  display: flex;
+  font-size: var(--font-size-body-1,12px);
+}
+.next-formily-item-inset.next-formily-item-inset.next-formily-item-inset {
+  line-height: calc(var(--form-element-medium-height, 32px) - var(--input-border-width, 1px)*2);
+}

package/lib/index.d.ts

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

package/lib/index.js

@@ -299,7 +299,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 if (!((_window = window) === null || _window === void 0 ? void 0 : _window.TEAMIXPRO_WITHOUT_ICON)) {
   _icon.default.setConfig(_utils.default.getTeamixIconConfig());
 }
-var version = '1.5.26';
+var version = '1.5.27';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

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

@@ -86,7 +86,7 @@ var Filter = function Filter(props) {
     }
     // console.log(filters);
     return filters;
-  }, []);
+  }, [column]);
   // 点击确定回调
   var onFilterOk = function onFilterOk() {
     var _actionRef$current2, _actionRef$current2$f, _actionRef$current$ge6, _actionRef$current3, _actionRef$current3$g, _actionRef$current3$g2, _actionRef$current4, _actionRef$current4$s, _actionRef$current5, _actionRef$current7, _actionRef$current7$r, _actionRef$current8, _actionRef$current8$r, _actionRef$current9, _actionRef$current9$c;
@@ -168,7 +168,7 @@ var Filter = function Filter(props) {
           setSelected([valueStr]);
         }
       }, /*#__PURE__*/_react.default.createElement(_field.default, {
-        type: 'text',
+        type: "text",
         value: label,
         render: {
           ellipsis: true
@@ -196,7 +196,7 @@ var Filter = function Filter(props) {
           }
         }
       }, /*#__PURE__*/_react.default.createElement(_field.default, {
-        type: 'text',
+        type: "text",
         value: label,
         render: {
           ellipsis: true

package/lib/table/index.js

@@ -40,7 +40,7 @@ Object.keys(_typing).forEach(function (key) {
   });
 });
 var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "autoWidth", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps", "bindUrlProps", "bindUrl", "autoRedirect", "useMaxData"],
-  _excluded2 = ["onChange"];
+  _excluded2 = ["onChange", "onPageSizeChange"];
 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; }
@@ -169,7 +169,7 @@ var ProTable = function ProTable(props) {
     disableSelectAll = props.disableSelectAll,
     context = props.context,
     _props$autoWidth = props.autoWidth,
-    autoWidth = _props$autoWidth === void 0 ? false : _props$autoWidth,
+    autoWidthProp = _props$autoWidth === void 0 ? false : _props$autoWidth,
     _props$fixedTableBody = props.fixedTableBody,
     fixedTableBody = _props$fixedTableBody === void 0 ? false : _props$fixedTableBody,
     isTree = props.isTree,
@@ -233,6 +233,11 @@ var ProTable = function ProTable(props) {
     _useState16 = _slicedToArray(_useState15, 2),
     filteredColumns = _useState16[0],
     setFilteredColumns = _useState16[1];
+  // 全局状态 ： 自适应表格
+  var autoWidth = (0, _react.useMemo)(function () {
+    var _getGlobalConfig2;
+    return ((_getGlobalConfig2 = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.autoWidth) || autoWidthProp;
+  }, [autoWidthProp]);
   // 判断是否有操作列，有的话则渲染一个 shadow dom
   var hasActionColumn = false;
   if (autoWidth) {
@@ -421,8 +426,8 @@ var ProTable = function ProTable(props) {
   });
   // 全局状态 ： 大数据截断
   var globalUseMaxData = (0, _react.useMemo)(function () {
-    var _getGlobalConfig2;
-    return (_getGlobalConfig2 = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig2 === void 0 ? void 0 : _getGlobalConfig2.useMaxData;
+    var _getGlobalConfig3;
+    return (_getGlobalConfig3 = (0, _utils.getGlobalConfig)('ProTable')) === null || _getGlobalConfig3 === void 0 ? void 0 : _getGlobalConfig3.useMaxData;
   }, []);
   // 非全屏状态下的
   var normalDataFilterFormRef = (0, _react.useRef)();
@@ -602,7 +607,7 @@ var ProTable = function ProTable(props) {
         (0, _utils2.emit)('refreshFilterState', newColumns);
       }
       if (autoWidth) {
-        reGenFilteredColumnsByAutoWidth();
+        reGenFilteredColumnsByAutoWidth(columns);
       }
     },
     size: size,
@@ -674,6 +679,9 @@ var ProTable = function ProTable(props) {
     filterEnableRef: filterEnableRef,
     setData: function setData(data) {
       _setData(data);
+      if (autoWidth) {
+        reGenFilteredColumnsByAutoWidth();
+      }
     },
     resetTableMaxBodyHeight: function resetTableMaxBodyHeight(offset) {
       getHeaderHeight(fullscreenState, offset);
@@ -720,12 +728,12 @@ var ProTable = function ProTable(props) {
   if (propsActionRef) {
     propsActionRef.current = actionRef.current;
   }
-  function reGenFilteredColumnsByAutoWidth() {
+  function reGenFilteredColumnsByAutoWidth(columns) {
     if (!autoWidth) {
       return;
     }
     setShowShadowContainer(true);
-    var authWidthedColumns = (0, _genAutoWidthColumns.genAutoWidthColumns)(filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
+    var authWidthedColumns = (0, _genAutoWidthColumns.genAutoWidthColumns)(columns !== null && columns !== void 0 ? columns : filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
     setFilteredColumns(authWidthedColumns);
     // 移除 shadow dom
     // setTimeout(() => {
@@ -947,7 +955,7 @@ var ProTable = function ProTable(props) {
           if (Number.isInteger(time) && time >= 1000) {
             autoRefreshTimerRef.current = setTimeout(function () {
               // 自动刷新不显示 loading
-              _request({}, true);
+              _request(params, true);
             }, Number(time));
             (0, _utils2.emit)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
           }
@@ -1154,6 +1162,7 @@ var ProTable = function ProTable(props) {
       var _props$paginationProp3;
       var _ref8 = (_props$paginationProp3 = props === null || props === void 0 ? void 0 : props.paginationProps) !== null && _props$paginationProp3 !== void 0 ? _props$paginationProp3 : {},
         onPaginationPropsChange = _ref8.onChange,
+        onPageSizeChangeProp = _ref8.onPageSizeChange,
         othersPaginationProps = _objectWithoutProperties(_ref8, _excluded2);
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer', {
@@ -1178,7 +1187,8 @@ var ProTable = function ProTable(props) {
         pageSizeSelector: total > (props.pageSize || 10) * 2 ? 'dropdown' : false,
         type: total / pageSize <= 2 ? 'simple' : 'normal',
         onPageSizeChange: function onPageSizeChange(number) {
-          return onChangePaginationSize(number);
+          onChangePaginationSize(number);
+          onPageSizeChangeProp === null || onPageSizeChangeProp === void 0 ? void 0 : onPageSizeChangeProp(number);
         },
         useMaxData: globalUseMaxData !== null && globalUseMaxData !== void 0 ? globalUseMaxData : useMaxData
       }, othersPaginationProps)))));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamix/pro",
-  "version": "1.5.26",
+  "version": "1.5.27",
   "description": "TeamixPro大包",
   "keywords": [
     "aliyun",