@teamix/pro 1.5.46 → 1.5.47

package/es/form/Components/SelectTable2/index.d.ts

@@ -93,5 +93,6 @@ declare const SelectTable2: React.ForwardRefExoticComponent<Partial<{
         columnProps?: (() => any) | undefined;
         titleAddons?: (() => any) | undefined;
     }) | undefined;
+    key?: React.Key | null | undefined;
 } & Omit<import("@alifd/next/types/table").TableProps, "rowSelection" | "columns"> & import("../../../table").ProTableTopAreaProps> & React.RefAttributes<unknown>>;
 export default SelectTable2;

package/es/form/Filter/useBindUrl.js

@@ -27,7 +27,7 @@ export default function useBindUrl(bindUrl, functions, formRef) {
           var field = form === null || form === void 0 ? void 0 : (_form$query = form.query(key)) === null || _form$query === void 0 ? void 0 : _form$query.take();
           var component = field === null || field === void 0 ? void 0 : field.component;
           if (component instanceof Array && component[0] === 'SelectGroup') {
-            newValues[key] = value.map(function (_ref3) {
+            newValues[key] = (value !== null && value !== void 0 ? value : []).map(function (_ref3) {
               var key = _ref3.key,
                 value = _ref3.value;
               return key && value ? "".concat(key, "||").concat(value === null || value === void 0 ? void 0 : value.join('|')) : '';
@@ -35,21 +35,50 @@ export default function useBindUrl(bindUrl, functions, formRef) {
           }
         });
         return beforeStringify ? beforeStringify(newValues) : newValues;
+      },
+      beforeParse: function beforeParse(values) {
+        var _Object$entries2;
+        var beforeParse = options.beforeParse;
+        var newValues = _objectSpread({}, values);
+        (_Object$entries2 = Object.entries(values)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref4) {
+          var _form$query2;
+          var _ref5 = _slicedToArray(_ref4, 2),
+            key = _ref5[0],
+            value = _ref5[1];
+          var form = formRef.current;
+          var field = form === null || form === void 0 ? void 0 : (_form$query2 = form.query(key)) === null || _form$query2 === void 0 ? void 0 : _form$query2.take();
+          var component = field === null || field === void 0 ? void 0 : field.component;
+          if (component instanceof Array && component[0] === 'SelectGroup') {
+            newValues[key] = (value !== null && value !== void 0 ? value : []).map(function (item) {
+              var _item$split = item === null || item === void 0 ? void 0 : item.split('||'),
+                _item$split2 = _slicedToArray(_item$split, 2),
+                key = _item$split2[0],
+                value = _item$split2[1];
+              return {
+                key: key,
+                value: value === null || value === void 0 ? void 0 : value.split('|')
+              };
+            });
+          }
+        });
+        return beforeParse ? beforeParse(newValues) : newValues;
       }
     }) : options;
   };
   // 通过 useUrlState 获取 url 上的参数和 url 配置方法
-  var _ref4 = bindUrl ? useUrlState(undefined, initializeBindUrl(isPlainObj(bindUrl) ? bindUrl : {})) : [],
-    _ref5 = _slicedToArray(_ref4, 4),
-    urlState = _ref5[0],
-    setUrlState = _ref5[1],
-    queryFromUrl = _ref5[2],
-    stringify = _ref5[3];
+  var _ref6 = bindUrl ? useUrlState(undefined, _objectSpread(_objectSpread({}, initializeBindUrl(isPlainObj(bindUrl) ? bindUrl : {})), {}, {
+      navigateMode: 'replace'
+    })) : [],
+    _ref7 = _slicedToArray(_ref6, 4),
+    urlState = _ref7[0],
+    setUrlState = _ref7[1],
+    queryFromUrl = _ref7[2],
+    stringify = _ref7[3];
   // 输出配置url参数的函数
-  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref6) {
-    var _ref7 = _slicedToArray(_ref6, 2),
-      listenerKey = _ref7[0],
-      originalFunction = _ref7[1];
+  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref8) {
+    var _ref9 = _slicedToArray(_ref8, 2),
+      listenerKey = _ref9[0],
+      originalFunction = _ref9[1];
     prev[listenerKey] = function (values) {
       originalFunction === null || originalFunction === void 0 ? void 0 : originalFunction(values);
       if (bindUrl) {
@@ -64,11 +93,7 @@ export default function useBindUrl(bindUrl, functions, formRef) {
             // { a: [undefined, undefined], b: undefined, c: [], d: null, e: ''} 会生成 'd=&e='
             // 类似地，{ a: [''], b: [null], c: [undefined] } 会生成 'a=&b='。更不用说还有非默认配置的情况
             // 想要避免这种 hazard，我们必须使用钩子内部导出的、经过柯里化的 stringify 来判断生成的字符串是否无变化。
-            if (stringify({
-              v: newValue
-            }) !== stringify({
-              v: oldValue
-            })) {
+            if (stringify(_defineProperty({}, paramName, newValue)) !== stringify(_defineProperty({}, paramName, oldValue))) {
               hasStringifiedDiff = true;
               break;
             } else if (oldValue !== newValue) {
@@ -89,30 +114,25 @@ export default function useBindUrl(bindUrl, functions, formRef) {
   // 使用 url 参数配置 QueryFilter 默认值（移除非表单值，兼容数组数据，兼容 SelectGroup 组件）
   var setValuesByUrlState = function setValuesByUrlState(form) {
     if (urlState) {
-      var _Object$entries2;
-      (_Object$entries2 = Object.entries(urlState)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref8) {
-        var _form$query2;
-        var _ref9 = _slicedToArray(_ref8, 2),
-          key = _ref9[0],
-          value = _ref9[1];
-        var field = (_form$query2 = form.query(key)) === null || _form$query2 === void 0 ? void 0 : _form$query2.take();
+      var _Object$entries3;
+      (_Object$entries3 = Object.entries(urlState)) === null || _Object$entries3 === void 0 ? void 0 : _Object$entries3.forEach(function (_ref10) {
+        var _form$query3;
+        var _ref11 = _slicedToArray(_ref10, 2),
+          key = _ref11[0],
+          value = _ref11[1];
+        var field = (_form$query3 = form.query(key)) === null || _form$query3 === void 0 ? void 0 : _form$query3.take();
         if (field) {
           var newValue = value;
           if (field.displayName === 'ArrayField') {
             newValue = [].concat(isUsable(newValue) ? newValue : []);
           }
-          if (field.component[0] === 'SelectGroup') {
-            newValue = newValue.map(function (item) {
-              var _item$split = item === null || item === void 0 ? void 0 : item.split('||'),
-                _item$split2 = _slicedToArray(_item$split, 2),
-                key = _item$split2[0],
-                value = _item$split2[1];
-              return {
-                key: key,
-                value: value === null || value === void 0 ? void 0 : value.split('|')
-              };
-            });
-          }
+          // 这部分应该挪到上面的 beforeParse 里面做，beforeParse 和 beforeStringify 应该是互逆的
+          // if (field.component[0] === 'SelectGroup') {
+          //   newValue = newValue.map((item: any) => {
+          //     const [key, value] = item?.split('||');
+          //     return { key, value: value?.split('|') };
+          //   });
+          // }
           form.setValuesIn(key, newValue);
         }
       });

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.46";
+declare const version = "1.5.47";
 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.46';
+var version = '1.5.47';
 // By TeamixTest
 window.postMessage({
   source: 'teamix-test-devtools',

package/es/page-header/index.js

@@ -8,7 +8,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React from 'react';
 // import { useHistory } from 'react-router-dom';
-import { useRealHistory } from '@teamix/utils';
+import { useReactHistory } from '@teamix/utils';
 import classnames from 'classnames';
 import TeamixIcon from '@teamix/icon';
 import { Breadcrumb, Balloon } from '@alicloudfe/components';
@@ -132,7 +132,7 @@ var ProPageHeader = function ProPageHeader(props) {
     style = props.style,
     tabs = props.tabs,
     others = _objectWithoutProperties(props, _excluded3);
-  var history = useRealHistory();
+  var history = useReactHistory();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;
   var showList = function showList(list) {
     var _list$actions;

package/es/sidebar/utils/index.d.ts

@@ -152,7 +152,7 @@ export declare function getTreeNodeProps(item: ProSidebarDataSourceItem): {
         'aria-colindex'?: number | undefined;
         'aria-colspan'?: number | undefined;
         'aria-controls'?: string | undefined;
-        'aria-current'?: boolean | "date" | "time" | "page" | "false" | "true" | "step" | "location" | undefined;
+        'aria-current'?: boolean | "location" | "date" | "time" | "page" | "false" | "true" | "step" | undefined;
         'aria-describedby'?: string | undefined;
         'aria-details'?: string | undefined;
         'aria-disabled'?: (boolean | "false" | "true") | undefined;

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

@@ -33,7 +33,9 @@ var Filter = function Filter(props) {
     filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth,
     _column$defaultFilter = column.defaultFilterSelectedKeys,
     defaultFilterSelectedKeys = _column$defaultFilter === void 0 ? [] : _column$defaultFilter;
-  var _ref = bindUrl ? useUrlState() : [],
+  var _ref = bindUrl ? useUrlState({}, {
+      navigateMode: 'replace'
+    }) : [],
     _ref2 = _slicedToArray(_ref, 2),
     urlState = _ref2[0],
     setUrlState = _ref2[1];

package/es/table/index.js

@@ -135,7 +135,9 @@ var ProTable = function ProTable(props) {
   var targetPageKey = pageKey || globalPageKey;
   var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
   var targetFormatSort = formatSort || globalFormatSort;
-  var _ref = bindUrl ? useUrlState() : [],
+  var _ref = bindUrl ? useUrlState({}, {
+      navigateMode: 'replace'
+    }) : [],
     _ref2 = _slicedToArray(_ref, 2),
     urlState = _ref2[0],
     setUrlState = _ref2[1];
@@ -1199,7 +1201,8 @@ var ProTable = function ProTable(props) {
   }, [fullscreenState, fixedTableBody, footerSuction, footerSuctionState]);
   return /*#__PURE__*/React.createElement(FullScreen, {
     visible: fullscreenState,
-    actionRef: actionRef
+    actionRef: actionRef,
+    key: props.key
   }, function (isFullScreen) {
     return /*#__PURE__*/React.createElement("div", {
       className: cls({

package/es/table/typing.d.ts

@@ -189,6 +189,8 @@ export declare type ProTableProps = {
     /** 使用超大数据模式 **/
     useMaxData?: boolean;
     rowSelection?: rowSelectionType;
+    /** React Key **/
+    key?: React.Key | null;
 } & Omit<TableProps, 'columns' | 'rowSelection'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;

package/lib/form/Components/SelectTable2/index.d.ts

@@ -93,5 +93,6 @@ declare const SelectTable2: React.ForwardRefExoticComponent<Partial<{
         columnProps?: (() => any) | undefined;
         titleAddons?: (() => any) | undefined;
     }) | undefined;
+    key?: React.Key | null | undefined;
 } & Omit<import("@alifd/next/types/table").TableProps, "rowSelection" | "columns"> & import("../../../table").ProTableTopAreaProps> & React.RefAttributes<unknown>>;
 export default SelectTable2;

package/lib/form/Filter/useBindUrl.js

@@ -33,7 +33,7 @@ function useBindUrl(bindUrl, functions, formRef) {
           var field = form === null || form === void 0 ? void 0 : (_form$query = form.query(key)) === null || _form$query === void 0 ? void 0 : _form$query.take();
           var component = field === null || field === void 0 ? void 0 : field.component;
           if (component instanceof Array && component[0] === 'SelectGroup') {
-            newValues[key] = value.map(function (_ref3) {
+            newValues[key] = (value !== null && value !== void 0 ? value : []).map(function (_ref3) {
               var key = _ref3.key,
                 value = _ref3.value;
               return key && value ? "".concat(key, "||").concat(value === null || value === void 0 ? void 0 : value.join('|')) : '';
@@ -41,21 +41,50 @@ function useBindUrl(bindUrl, functions, formRef) {
           }
         });
         return beforeStringify ? beforeStringify(newValues) : newValues;
+      },
+      beforeParse: function beforeParse(values) {
+        var _Object$entries2;
+        var beforeParse = options.beforeParse;
+        var newValues = _objectSpread({}, values);
+        (_Object$entries2 = Object.entries(values)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref4) {
+          var _form$query2;
+          var _ref5 = _slicedToArray(_ref4, 2),
+            key = _ref5[0],
+            value = _ref5[1];
+          var form = formRef.current;
+          var field = form === null || form === void 0 ? void 0 : (_form$query2 = form.query(key)) === null || _form$query2 === void 0 ? void 0 : _form$query2.take();
+          var component = field === null || field === void 0 ? void 0 : field.component;
+          if (component instanceof Array && component[0] === 'SelectGroup') {
+            newValues[key] = (value !== null && value !== void 0 ? value : []).map(function (item) {
+              var _item$split = item === null || item === void 0 ? void 0 : item.split('||'),
+                _item$split2 = _slicedToArray(_item$split, 2),
+                key = _item$split2[0],
+                value = _item$split2[1];
+              return {
+                key: key,
+                value: value === null || value === void 0 ? void 0 : value.split('|')
+              };
+            });
+          }
+        });
+        return beforeParse ? beforeParse(newValues) : newValues;
       }
     }) : options;
   };
   // 通过 useUrlState 获取 url 上的参数和 url 配置方法
-  var _ref4 = bindUrl ? (0, _hooks.useUrlState)(undefined, initializeBindUrl((0, _utils.isPlainObj)(bindUrl) ? bindUrl : {})) : [],
-    _ref5 = _slicedToArray(_ref4, 4),
-    urlState = _ref5[0],
-    setUrlState = _ref5[1],
-    queryFromUrl = _ref5[2],
-    stringify = _ref5[3];
+  var _ref6 = bindUrl ? (0, _hooks.useUrlState)(undefined, _objectSpread(_objectSpread({}, initializeBindUrl((0, _utils.isPlainObj)(bindUrl) ? bindUrl : {})), {}, {
+      navigateMode: 'replace'
+    })) : [],
+    _ref7 = _slicedToArray(_ref6, 4),
+    urlState = _ref7[0],
+    setUrlState = _ref7[1],
+    queryFromUrl = _ref7[2],
+    stringify = _ref7[3];
   // 输出配置url参数的函数
-  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref6) {
-    var _ref7 = _slicedToArray(_ref6, 2),
-      listenerKey = _ref7[0],
-      originalFunction = _ref7[1];
+  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref8) {
+    var _ref9 = _slicedToArray(_ref8, 2),
+      listenerKey = _ref9[0],
+      originalFunction = _ref9[1];
     prev[listenerKey] = function (values) {
       originalFunction === null || originalFunction === void 0 ? void 0 : originalFunction(values);
       if (bindUrl) {
@@ -70,11 +99,7 @@ function useBindUrl(bindUrl, functions, formRef) {
             // { a: [undefined, undefined], b: undefined, c: [], d: null, e: ''} 会生成 'd=&e='
             // 类似地，{ a: [''], b: [null], c: [undefined] } 会生成 'a=&b='。更不用说还有非默认配置的情况
             // 想要避免这种 hazard，我们必须使用钩子内部导出的、经过柯里化的 stringify 来判断生成的字符串是否无变化。
-            if (stringify({
-              v: newValue
-            }) !== stringify({
-              v: oldValue
-            })) {
+            if (stringify(_defineProperty({}, paramName, newValue)) !== stringify(_defineProperty({}, paramName, oldValue))) {
               hasStringifiedDiff = true;
               break;
             } else if (oldValue !== newValue) {
@@ -95,30 +120,25 @@ function useBindUrl(bindUrl, functions, formRef) {
   // 使用 url 参数配置 QueryFilter 默认值（移除非表单值，兼容数组数据，兼容 SelectGroup 组件）
   var setValuesByUrlState = function setValuesByUrlState(form) {
     if (urlState) {
-      var _Object$entries2;
-      (_Object$entries2 = Object.entries(urlState)) === null || _Object$entries2 === void 0 ? void 0 : _Object$entries2.forEach(function (_ref8) {
-        var _form$query2;
-        var _ref9 = _slicedToArray(_ref8, 2),
-          key = _ref9[0],
-          value = _ref9[1];
-        var field = (_form$query2 = form.query(key)) === null || _form$query2 === void 0 ? void 0 : _form$query2.take();
+      var _Object$entries3;
+      (_Object$entries3 = Object.entries(urlState)) === null || _Object$entries3 === void 0 ? void 0 : _Object$entries3.forEach(function (_ref10) {
+        var _form$query3;
+        var _ref11 = _slicedToArray(_ref10, 2),
+          key = _ref11[0],
+          value = _ref11[1];
+        var field = (_form$query3 = form.query(key)) === null || _form$query3 === void 0 ? void 0 : _form$query3.take();
         if (field) {
           var newValue = value;
           if (field.displayName === 'ArrayField') {
             newValue = [].concat((0, _utils.isUsable)(newValue) ? newValue : []);
           }
-          if (field.component[0] === 'SelectGroup') {
-            newValue = newValue.map(function (item) {
-              var _item$split = item === null || item === void 0 ? void 0 : item.split('||'),
-                _item$split2 = _slicedToArray(_item$split, 2),
-                key = _item$split2[0],
-                value = _item$split2[1];
-              return {
-                key: key,
-                value: value === null || value === void 0 ? void 0 : value.split('|')
-              };
-            });
-          }
+          // 这部分应该挪到上面的 beforeParse 里面做，beforeParse 和 beforeStringify 应该是互逆的
+          // if (field.component[0] === 'SelectGroup') {
+          //   newValue = newValue.map((item: any) => {
+          //     const [key, value] = item?.split('||');
+          //     return { key, value: value?.split('|') };
+          //   });
+          // }
           form.setValuesIn(key, newValue);
         }
       });

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.46";
+declare const version = "1.5.47";
 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.46';
+var version = '1.5.47';
 // By TeamixTest
 exports.version = version;
 window.postMessage({

package/lib/page-header/index.js

@@ -137,7 +137,7 @@ var ProPageHeader = function ProPageHeader(props) {
     style = props.style,
     tabs = props.tabs,
     others = _objectWithoutProperties(props, _excluded3);
-  var history = (0, _utils.useRealHistory)();
+  var history = (0, _utils.useReactHistory)();
   var backgroundImage = image ? "url('".concat(image, "')") : undefined;
   var showList = function showList(list) {
     var _list$actions;

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

@@ -152,7 +152,7 @@ export declare function getTreeNodeProps(item: ProSidebarDataSourceItem): {
         'aria-colindex'?: number | undefined;
         'aria-colspan'?: number | undefined;
         'aria-controls'?: string | undefined;
-        'aria-current'?: boolean | "date" | "time" | "page" | "false" | "true" | "step" | "location" | undefined;
+        'aria-current'?: boolean | "location" | "date" | "time" | "page" | "false" | "true" | "step" | undefined;
         'aria-describedby'?: string | undefined;
         'aria-details'?: string | undefined;
         'aria-disabled'?: (boolean | "false" | "true") | undefined;

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

@@ -42,7 +42,9 @@ var Filter = function Filter(props) {
     filtersWidth = _column$filtersWidth === void 0 ? 130 : _column$filtersWidth,
     _column$defaultFilter = column.defaultFilterSelectedKeys,
     defaultFilterSelectedKeys = _column$defaultFilter === void 0 ? [] : _column$defaultFilter;
-  var _ref = bindUrl ? (0, _hooks.useUrlState)() : [],
+  var _ref = bindUrl ? (0, _hooks.useUrlState)({}, {
+      navigateMode: 'replace'
+    }) : [],
     _ref2 = _slicedToArray(_ref, 2),
     urlState = _ref2[0],
     setUrlState = _ref2[1];

package/lib/table/index.js

@@ -156,7 +156,9 @@ var ProTable = function ProTable(props) {
   var targetPageKey = pageKey || globalPageKey;
   var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
   var targetFormatSort = formatSort || globalFormatSort;
-  var _ref = bindUrl ? (0, _hooks.useUrlState)() : [],
+  var _ref = bindUrl ? (0, _hooks.useUrlState)({}, {
+      navigateMode: 'replace'
+    }) : [],
     _ref2 = _slicedToArray(_ref, 2),
     urlState = _ref2[0],
     setUrlState = _ref2[1];
@@ -1220,7 +1222,8 @@ var ProTable = function ProTable(props) {
   }, [fullscreenState, fixedTableBody, footerSuction, footerSuctionState]);
   return /*#__PURE__*/_react.default.createElement(_Fullscreen.default, {
     visible: fullscreenState,
-    actionRef: actionRef
+    actionRef: actionRef,
+    key: props.key
   }, function (isFullScreen) {
     return /*#__PURE__*/_react.default.createElement("div", {
       className: cls({

package/lib/table/typing.d.ts

@@ -189,6 +189,8 @@ export declare type ProTableProps = {
     /** 使用超大数据模式 **/
     useMaxData?: boolean;
     rowSelection?: rowSelectionType;
+    /** React Key **/
+    key?: React.Key | null;
 } & Omit<TableProps, 'columns' | 'rowSelection'> & ProTableTopAreaProps;
 export declare type rowSelectionType = {
     getProps?: (record: any, index: number) => any;

package/package.json

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