@teamix/pro 1.5.15 → 1.5.16

package/es/index.d.ts

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

package/es/index.js

@@ -35,7 +35,7 @@ export * from './table';
 export * from './sidebar';
 export * from './utils';
 export * from './timeline';
-var version = '1.5.15';
+var version = '1.5.16';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

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

@@ -30,10 +30,10 @@ var Filter = function Filter(props) {
     bindUrl = props.bindUrl;
   var _column$filtersWidth = column.filtersWidth,
     filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth;
-  var _useUrlState = useUrlState(),
-    _useUrlState2 = _slicedToArray(_useUrlState, 2),
-    urlState = _useUrlState2[0],
-    setUrlState = _useUrlState2[1];
+  var _ref = bindUrl ? useUrlState() : [],
+    _ref2 = _slicedToArray(_ref, 2),
+    urlState = _ref2[0],
+    setUrlState = _ref2[1];
   // 选中过滤项
   var _useState = useState((_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : []),
     _useState2 = _slicedToArray(_useState, 2),
@@ -60,11 +60,11 @@ var Filter = function Filter(props) {
     var filters = column.dataSource;
     // 转换 valueEnum 为 options
     if (!Array.isArray(column.dataSource)) {
-      filters = Object.entries(column.dataSource).map(function (_ref) {
+      filters = Object.entries(column.dataSource).map(function (_ref3) {
         var _nv$label, _nv$color;
-        var _ref2 = _slicedToArray(_ref, 2),
-          k = _ref2[0],
-          v = _ref2[1];
+        var _ref4 = _slicedToArray(_ref3, 2),
+          k = _ref4[0],
+          v = _ref4[1];
         var nv = v;
         return _objectSpread(_objectSpread({
           value: k
@@ -113,7 +113,7 @@ var Filter = function Filter(props) {
     setVisible(false);
     // 设置 url
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false && (urlState === null || urlState === void 0 ? void 0 : urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) !== selected.join(',')) {
-      setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), selected.join(',')));
+      setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), selected.join(',')));
     }
   };
   // 重置回调
@@ -139,16 +139,16 @@ var Filter = function Filter(props) {
       // 清空表格选择
       (_actionRef$current16 = actionRef.current) === null || _actionRef$current16 === void 0 ? void 0 : (_actionRef$current16$ = _actionRef$current16.clearRowSelection) === null || _actionRef$current16$ === void 0 ? void 0 : _actionRef$current16$.call(_actionRef$current16);
       if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false) {
-        setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), undefined));
+        setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), undefined));
       }
     }
   };
   // 渲染单选
   var renderSingle = function renderSingle() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref3) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref5) {
       var _value$toString;
-      var label = _ref3.label,
-        value = _ref3.value;
+      var label = _ref5.label,
+        value = _ref5.value;
       var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
       return /*#__PURE__*/React.createElement(RadioItem, {
         id: valueStr,
@@ -162,10 +162,10 @@ var Filter = function Filter(props) {
   };
   // 渲染多选
   var renderMultiple = function renderMultiple() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref4) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
       var _value$toString2;
-      var label = _ref4.label,
-        value = _ref4.value;
+      var label = _ref6.label,
+        value = _ref6.value;
       var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
       return /*#__PURE__*/React.createElement(CheckboxItem, {
         key: valueStr,

package/es/table/index.js

@@ -164,10 +164,10 @@ var ProTable = function ProTable(props) {
   var targetPageKey = pageKey || globalPageKey;
   var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
   var targetFormatSort = formatSort || globalFormatSort;
-  var _useUrlState = useUrlState(),
-    _useUrlState2 = _slicedToArray(_useUrlState, 2),
-    urlState = _useUrlState2[0],
-    setUrlState = _useUrlState2[1];
+  var _ref = bindUrl ? useUrlState() : [],
+    _ref2 = _slicedToArray(_ref, 2),
+    urlState = _ref2[0],
+    setUrlState = _ref2[1];
   var _useState = useState((_urlState$currentPage = urlState === null || urlState === void 0 ? void 0 : urlState.currentPage) !== null && _urlState$currentPage !== void 0 ? _urlState$currentPage : 1),
     _useState2 = _slicedToArray(_useState, 2),
     currentPage = _useState2[0],
@@ -221,12 +221,12 @@ var ProTable = function ProTable(props) {
   useEffect(function () {
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.pagination) !== false) {
       if ((urlState === null || urlState === void 0 ? void 0 : urlState.currentPage) !== currentPage) {
-        setUrlState({
+        setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState({
           currentPage: currentPage
         });
       }
       if ((urlState === null || urlState === void 0 ? void 0 : urlState.pageSize) !== pageSize) {
-        setUrlState({
+        setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState({
           pageSize: pageSize
         });
       }
@@ -518,13 +518,13 @@ var ProTable = function ProTable(props) {
       actionRefCallback[state][name] = fun;
     },
     off: function off(name) {
-      actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          k = _ref2[0],
-          v = _ref2[1];
-        var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref3) {
-          var _ref4 = _slicedToArray(_ref3, 1),
-            k = _ref4[0];
+      actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          k = _ref4[0],
+          v = _ref4[1];
+        var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref5) {
+          var _ref6 = _slicedToArray(_ref5, 1),
+            k = _ref6[0];
           return k !== name;
         }));
         return [k, filterV];
@@ -762,7 +762,7 @@ var ProTable = function ProTable(props) {
     var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current6$g, _objectSpread3;
     // 首次渲染表格，获取 urlState 上的 表头 filter 数据
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false && dataRef.current.flag) {
-      getUrlStateFilter(urlState, actionRef);
+      getUrlStateFilter(urlState !== null && urlState !== void 0 ? urlState : {}, actionRef);
       dataRef.current.flag = false;
     }
     // 如果没有传 url 且没有 customRequest，直接返回
@@ -820,11 +820,11 @@ var ProTable = function ProTable(props) {
             success = res.success;
           if (success === true) {
             // 设置 dataSource、total
-            if (switchViewState === 'table' || params['targetPageKey'] === 1 || isReset || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
+            if (switchViewState === 'table' || params[targetPageKey] === 1 || isReset || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
               _setData(dataRes || []);
               setTotal(totalRes || (dataRes === null || dataRes === void 0 ? void 0 : dataRes.length));
             }
-            if (switchViewState === 'card' && params['targetPageKey'] !== 1 && !isReset && !(cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
+            if (switchViewState === 'card' && params[targetPageKey] !== 1 && !isReset && !(cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
               _setData([].concat(_toConsumableArray(data), _toConsumableArray(dataRes || [])));
               setTotal(total + (totalRes || (dataRes === null || dataRes === void 0 ? void 0 : dataRes.length)));
             }
@@ -1055,9 +1055,9 @@ var ProTable = function ProTable(props) {
     }
     if (showPagination && switchViewState === 'table' || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination) && switchViewState === 'card') {
       var _props$paginationProp3;
-      var _ref6 = (_props$paginationProp3 = props === null || props === void 0 ? void 0 : props.paginationProps) !== null && _props$paginationProp3 !== void 0 ? _props$paginationProp3 : {},
-        onPaginationPropsChange = _ref6.onChange,
-        othersPaginationProps = _objectWithoutProperties(_ref6, _excluded2);
+      var _ref8 = (_props$paginationProp3 = props === null || props === void 0 ? void 0 : props.paginationProps) !== null && _props$paginationProp3 !== void 0 ? _props$paginationProp3 : {},
+        onPaginationPropsChange = _ref8.onChange,
+        othersPaginationProps = _objectWithoutProperties(_ref8, _excluded2);
       return /*#__PURE__*/React.createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection,

package/lib/index.d.ts

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

package/lib/index.js

@@ -280,7 +280,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.15';
+var version = '1.5.16';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

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

@@ -39,10 +39,10 @@ var Filter = function Filter(props) {
     bindUrl = props.bindUrl;
   var _column$filtersWidth = column.filtersWidth,
     filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth;
-  var _useUrlState = (0, _hooks.useUrlState)(),
-    _useUrlState2 = _slicedToArray(_useUrlState, 2),
-    urlState = _useUrlState2[0],
-    setUrlState = _useUrlState2[1];
+  var _ref = bindUrl ? (0, _hooks.useUrlState)() : [],
+    _ref2 = _slicedToArray(_ref, 2),
+    urlState = _ref2[0],
+    setUrlState = _ref2[1];
   // 选中过滤项
   var _useState = (0, _react.useState)((_urlState$split = urlState === null || urlState === void 0 ? void 0 : (_urlState = urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) === null || _urlState === void 0 ? void 0 : (_urlState$split2 = _urlState.split) === null || _urlState$split2 === void 0 ? void 0 : _urlState$split2.call(_urlState, ',')) !== null && _urlState$split !== void 0 ? _urlState$split : []),
     _useState2 = _slicedToArray(_useState, 2),
@@ -69,11 +69,11 @@ var Filter = function Filter(props) {
     var filters = column.dataSource;
     // 转换 valueEnum 为 options
     if (!Array.isArray(column.dataSource)) {
-      filters = Object.entries(column.dataSource).map(function (_ref) {
+      filters = Object.entries(column.dataSource).map(function (_ref3) {
         var _nv$label, _nv$color;
-        var _ref2 = _slicedToArray(_ref, 2),
-          k = _ref2[0],
-          v = _ref2[1];
+        var _ref4 = _slicedToArray(_ref3, 2),
+          k = _ref4[0],
+          v = _ref4[1];
         var nv = v;
         return _objectSpread(_objectSpread({
           value: k
@@ -122,7 +122,7 @@ var Filter = function Filter(props) {
     setVisible(false);
     // 设置 url
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false && (urlState === null || urlState === void 0 ? void 0 : urlState["filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex)]) !== selected.join(',')) {
-      setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), selected.join(',')));
+      setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), selected.join(',')));
     }
   };
   // 重置回调
@@ -148,16 +148,16 @@ var Filter = function Filter(props) {
       // 清空表格选择
       (_actionRef$current16 = actionRef.current) === null || _actionRef$current16 === void 0 ? void 0 : (_actionRef$current16$ = _actionRef$current16.clearRowSelection) === null || _actionRef$current16$ === void 0 ? void 0 : _actionRef$current16$.call(_actionRef$current16);
       if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false) {
-        setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), undefined));
+        setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(_defineProperty({}, "filter".concat(column === null || column === void 0 ? void 0 : column.dataIndex), undefined));
       }
     }
   };
   // 渲染单选
   var renderSingle = function renderSingle() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref3) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref5) {
       var _value$toString;
-      var label = _ref3.label,
-        value = _ref3.value;
+      var label = _ref5.label,
+        value = _ref5.value;
       var valueStr = (_value$toString = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString !== void 0 ? _value$toString : '';
       return /*#__PURE__*/_react.default.createElement(RadioItem, {
         id: valueStr,
@@ -171,10 +171,10 @@ var Filter = function Filter(props) {
   };
   // 渲染多选
   var renderMultiple = function renderMultiple() {
-    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref4) {
+    return filters === null || filters === void 0 ? void 0 : filters.map(function (_ref6) {
       var _value$toString2;
-      var label = _ref4.label,
-        value = _ref4.value;
+      var label = _ref6.label,
+        value = _ref6.value;
       var valueStr = (_value$toString2 = value === null || value === void 0 ? void 0 : value.toString()) !== null && _value$toString2 !== void 0 ? _value$toString2 : '';
       return /*#__PURE__*/_react.default.createElement(CheckboxItem, {
         key: valueStr,

package/lib/table/index.js

@@ -185,10 +185,10 @@ var ProTable = function ProTable(props) {
   var targetPageKey = pageKey || globalPageKey;
   var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
   var targetFormatSort = formatSort || globalFormatSort;
-  var _useUrlState = (0, _hooks.useUrlState)(),
-    _useUrlState2 = _slicedToArray(_useUrlState, 2),
-    urlState = _useUrlState2[0],
-    setUrlState = _useUrlState2[1];
+  var _ref = bindUrl ? (0, _hooks.useUrlState)() : [],
+    _ref2 = _slicedToArray(_ref, 2),
+    urlState = _ref2[0],
+    setUrlState = _ref2[1];
   var _useState = (0, _react.useState)((_urlState$currentPage = urlState === null || urlState === void 0 ? void 0 : urlState.currentPage) !== null && _urlState$currentPage !== void 0 ? _urlState$currentPage : 1),
     _useState2 = _slicedToArray(_useState, 2),
     currentPage = _useState2[0],
@@ -242,12 +242,12 @@ var ProTable = function ProTable(props) {
   (0, _react.useEffect)(function () {
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.pagination) !== false) {
       if ((urlState === null || urlState === void 0 ? void 0 : urlState.currentPage) !== currentPage) {
-        setUrlState({
+        setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState({
           currentPage: currentPage
         });
       }
       if ((urlState === null || urlState === void 0 ? void 0 : urlState.pageSize) !== pageSize) {
-        setUrlState({
+        setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState({
           pageSize: pageSize
         });
       }
@@ -539,13 +539,13 @@ var ProTable = function ProTable(props) {
       actionRefCallback[state][name] = fun;
     },
     off: function off(name) {
-      actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref) {
-        var _ref2 = _slicedToArray(_ref, 2),
-          k = _ref2[0],
-          v = _ref2[1];
-        var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref3) {
-          var _ref4 = _slicedToArray(_ref3, 1),
-            k = _ref4[0];
+      actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref3) {
+        var _ref4 = _slicedToArray(_ref3, 2),
+          k = _ref4[0],
+          v = _ref4[1];
+        var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref5) {
+          var _ref6 = _slicedToArray(_ref5, 1),
+            k = _ref6[0];
           return k !== name;
         }));
         return [k, filterV];
@@ -783,7 +783,7 @@ var ProTable = function ProTable(props) {
     var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _actionRef$current6$g, _objectSpread3;
     // 首次渲染表格，获取 urlState 上的 表头 filter 数据
     if (bindUrl && (bindUrlProps === null || bindUrlProps === void 0 ? void 0 : bindUrlProps.headerFilters) !== false && dataRef.current.flag) {
-      (0, _util.getUrlStateFilter)(urlState, actionRef);
+      (0, _util.getUrlStateFilter)(urlState !== null && urlState !== void 0 ? urlState : {}, actionRef);
       dataRef.current.flag = false;
     }
     // 如果没有传 url 且没有 customRequest，直接返回
@@ -841,11 +841,11 @@ var ProTable = function ProTable(props) {
             success = res.success;
           if (success === true) {
             // 设置 dataSource、total
-            if (switchViewState === 'table' || params['targetPageKey'] === 1 || isReset || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
+            if (switchViewState === 'table' || params[targetPageKey] === 1 || isReset || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
               _setData(dataRes || []);
               setTotal(totalRes || (dataRes === null || dataRes === void 0 ? void 0 : dataRes.length));
             }
-            if (switchViewState === 'card' && params['targetPageKey'] !== 1 && !isReset && !(cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
+            if (switchViewState === 'card' && params[targetPageKey] !== 1 && !isReset && !(cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination)) {
               _setData([].concat(_toConsumableArray(data), _toConsumableArray(dataRes || [])));
               setTotal(total + (totalRes || (dataRes === null || dataRes === void 0 ? void 0 : dataRes.length)));
             }
@@ -1076,9 +1076,9 @@ var ProTable = function ProTable(props) {
     }
     if (showPagination && switchViewState === 'table' || (cardViewProps === null || cardViewProps === void 0 ? void 0 : cardViewProps.useTablePagination) && switchViewState === 'card') {
       var _props$paginationProp3;
-      var _ref6 = (_props$paginationProp3 = props === null || props === void 0 ? void 0 : props.paginationProps) !== null && _props$paginationProp3 !== void 0 ? _props$paginationProp3 : {},
-        onPaginationPropsChange = _ref6.onChange,
-        othersPaginationProps = _objectWithoutProperties(_ref6, _excluded2);
+      var _ref8 = (_props$paginationProp3 = props === null || props === void 0 ? void 0 : props.paginationProps) !== null && _props$paginationProp3 !== void 0 ? _props$paginationProp3 : {},
+        onPaginationPropsChange = _ref8.onChange,
+        othersPaginationProps = _objectWithoutProperties(_ref8, _excluded2);
       return /*#__PURE__*/_react.default.createElement("div", {
         className: cls('footer', {
           'footer-has-rowSelection': rowSelection,

package/package.json

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