@teamix/pro 1.5.44 → 1.5.45

package/es/form/Filter/useBindUrl.d.ts

@@ -1,2 +1,14 @@
-declare const _default: (bindUrl: any, functions: any, formRef: any) => any;
-export default _default;
+/// <reference types="react" />
+import { UrlStateOptions } from '@teamix/hooks';
+import type { Form } from '@formily/core';
+export interface BindUrlInitFunctions {
+    onInit?: (values: Record<string, any>) => void;
+    onFilter?: (values: Record<string, any>) => void;
+    onReset?: (values: Record<string, any>) => void;
+}
+export default function useBindUrl(bindUrl: boolean | UrlStateOptions | undefined, functions: BindUrlInitFunctions, formRef: React.MutableRefObject<Form<any> | undefined>): {
+    onInit?: ((values: Record<string, any>) => void) | undefined;
+    onFilter?: ((values: Record<string, any>) => void) | undefined;
+    onReset?: ((values: Record<string, any>) => void) | undefined;
+    setValuesByUrlState: (form: any) => void;
+};

package/es/form/Filter/useBindUrl.js

@@ -9,7 +9,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 import { useUrlState } from '@teamix/hooks';
 import { isUsable, isPlainObj } from '@teamix/utils';
-export default (function (bindUrl, functions, formRef) {
+export default function useBindUrl(bindUrl, functions, formRef) {
   // 预处理 bindUrl 参数（主要兼容 SelectGroup 组件）
   var initializeBindUrl = function initializeBindUrl(options) {
     return options ? _objectSpread(_objectSpread({}, options), {}, {
@@ -23,8 +23,9 @@ export default (function (bindUrl, functions, formRef) {
             key = _ref2[0],
             value = _ref2[1];
           var form = formRef.current;
-          var field = (_form$query = form.query(key)) === null || _form$query === void 0 ? void 0 : _form$query.take();
-          if ((field === null || field === void 0 ? void 0 : field.component[0]) === 'SelectGroup') {
+          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) {
               var key = _ref3.key,
                 value = _ref3.value;
@@ -38,17 +39,46 @@ export default (function (bindUrl, functions, formRef) {
   };
   // 通过 useUrlState 获取 url 上的参数和 url 配置方法
   var _ref4 = bindUrl ? useUrlState(undefined, initializeBindUrl(isPlainObj(bindUrl) ? bindUrl : {})) : [],
-    _ref5 = _slicedToArray(_ref4, 2),
+    _ref5 = _slicedToArray(_ref4, 3),
     urlState = _ref5[0],
-    setUrlState = _ref5[1];
+    setUrlState = _ref5[1],
+    queryFromUrl = _ref5[2];
   // 输出配置url参数的函数
   var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref6) {
     var _ref7 = _slicedToArray(_ref6, 2),
-      key = _ref7[0],
-      fun = _ref7[1];
-    prev[key] = function (values) {
-      fun === null || fun === void 0 ? void 0 : fun(values);
-      setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(values);
+      listenerKey = _ref7[0],
+      originalFunction = _ref7[1];
+    prev[listenerKey] = function (values) {
+      originalFunction === null || originalFunction === void 0 ? void 0 : originalFunction(values);
+      if (bindUrl) {
+        // guard: onInit 会在 mount 时被自动调用，需要避免其在任何情况下都调用 setUrlState。故增加幂等判断
+        var hasDifference = false;
+        for (var paramName in values) {
+          if (Object.hasOwn(values, paramName)) {
+            var simpleTransform = function simpleTransform(value) {
+              if (value instanceof Array) {
+                return value.join(',');
+              }
+              if (value === undefined || value === null) {
+                return '';
+              }
+              if (value instanceof Object) {
+                console.warn('useBindUrl: 无法处理对象类型的 url 参数');
+              }
+              return value;
+            };
+            var oldValue = queryFromUrl === null || queryFromUrl === void 0 ? void 0 : queryFromUrl[paramName];
+            var newValue = values[paramName];
+            if (simpleTransform(newValue) !== simpleTransform(oldValue)) {
+              hasDifference = true;
+              break;
+            }
+          }
+        }
+        if (hasDifference) {
+          setUrlState(values);
+        }
+      }
     };
     return prev;
   }, {});
@@ -87,4 +117,4 @@ export default (function (bindUrl, functions, formRef) {
   return _objectSpread({
     setValuesByUrlState: setValuesByUrlState
   }, initializedFunctions);
-});
+}

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

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

@@ -189,11 +189,31 @@ var processBuriedPoint = function processBuriedPoint() {
   }))));
 };
 var equalColumns = function equalColumns(prevProps, nextProps) {
-  var preValue = prevProps.value;
+  var preValue = prevProps.value,
+    preItem = prevProps.item,
+    preRecord = prevProps.record,
+    preContext = prevProps.context;
   var nextValue = nextProps.value,
-    item = nextProps.item;
+    nextItem = nextProps.item,
+    nextRecord = nextProps.record,
+    nextContext = nextProps.context;
+  // if (nextItem?.render) {
+  //   let renderCache = true;
+  //   Object.keys(nextItem?.render).forEach((key) => {
+  //     // 如果 preItem 不包含 render 的属性，则强制刷新
+  //     if (!preItem?.render[key]) {
+  //       renderCache = false;
+  //       return false
+  //     }
+  //     let preRenderValue = getTargetValue(preItem?.render[key], {...preRecord, ...preContext});
+  //     let nextRenderValue = getTargetValue(nextItem?.render[key], {...nextRecord, ...nextContext})
+  //     if (preRenderValue !== nextRenderValue) {
+  //       renderCache = false;
+  //     }
+  //   })
+  // }
   // columns 强制更新参数
-  if (item === null || item === void 0 ? void 0 : item.forcedUpdate) {
+  if (nextItem === null || nextItem === void 0 ? void 0 : nextItem.forcedUpdate) {
     return false;
   }
   // 操作列的时候强制刷新 || 当 value 值拿不到的时候

package/es/table/index.js

@@ -337,9 +337,9 @@ var ProTable = function ProTable(props) {
           setFooterSuctionState(false);
         }
         // 如果有切换区tab，那么重新计算
-        if (headerFixedTopSectionDom.clientHeight) {
+        if (headerFixedTopSectionDom === null || headerFixedTopSectionDom === void 0 ? void 0 : headerFixedTopSectionDom.clientHeight) {
           var _headerFixedTopSectio;
-          var headerFixedTopSectionHeight = (_headerFixedTopSectio = headerFixedTopSectionDom.clientHeight) !== null && _headerFixedTopSectio !== void 0 ? _headerFixedTopSectio : 0;
+          var headerFixedTopSectionHeight = (_headerFixedTopSectio = headerFixedTopSectionDom === null || headerFixedTopSectionDom === void 0 ? void 0 : headerFixedTopSectionDom.clientHeight) !== null && _headerFixedTopSectio !== void 0 ? _headerFixedTopSectio : 0;
           // const clientTableBodyHeight =
           //   document.body.clientHeight - offsetHeaderHeight;
           setHeaderHeight(headerFixedTopSectionHeight + teamixNavHeight + footerRowSelectionHeight + tableHeaderHeight + 1);

package/es/table/utils/useTableSelection.js

@@ -41,6 +41,10 @@ function useTableSelection() {
   var dataRef = useRef({
     selectedRowKeys: config.selectedRowKeys || defaultSelectedRowKeys
   });
+  var onSetSelectedRowKeys = function onSetSelectedRowKeys(keys) {
+    setSelectedRowKeys(keys);
+    dataRef.current.selectedRowKeys = keys;
+  };
   useEffect(function () {
     var _config$selectedRowKe, _config$selectedRowKe2;
     setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
@@ -148,7 +152,7 @@ function useTableSelection() {
   return {
     rowSelection: rowSelection,
     selectedRowKeys: selectedRowKeys,
-    setSelectedRowKeys: setSelectedRowKeys,
+    setSelectedRowKeys: onSetSelectedRowKeys,
     selectedRecords: selectedRecords,
     setSelectedRecords: setSelectedRecords
   };

package/lib/form/Filter/useBindUrl.d.ts

@@ -1,2 +1,14 @@
-declare const _default: (bindUrl: any, functions: any, formRef: any) => any;
-export default _default;
+/// <reference types="react" />
+import { UrlStateOptions } from '@teamix/hooks';
+import type { Form } from '@formily/core';
+export interface BindUrlInitFunctions {
+    onInit?: (values: Record<string, any>) => void;
+    onFilter?: (values: Record<string, any>) => void;
+    onReset?: (values: Record<string, any>) => void;
+}
+export default function useBindUrl(bindUrl: boolean | UrlStateOptions | undefined, functions: BindUrlInitFunctions, formRef: React.MutableRefObject<Form<any> | undefined>): {
+    onInit?: ((values: Record<string, any>) => void) | undefined;
+    onFilter?: ((values: Record<string, any>) => void) | undefined;
+    onReset?: ((values: Record<string, any>) => void) | undefined;
+    setValuesByUrlState: (form: any) => void;
+};

package/lib/form/Filter/useBindUrl.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.default = useBindUrl;
 var _hooks = require("@teamix/hooks");
 var _utils = require("@teamix/utils");
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -15,7 +15,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-var _default = function _default(bindUrl, functions, formRef) {
+function useBindUrl(bindUrl, functions, formRef) {
   // 预处理 bindUrl 参数（主要兼容 SelectGroup 组件）
   var initializeBindUrl = function initializeBindUrl(options) {
     return options ? _objectSpread(_objectSpread({}, options), {}, {
@@ -29,8 +29,9 @@ var _default = function _default(bindUrl, functions, formRef) {
             key = _ref2[0],
             value = _ref2[1];
           var form = formRef.current;
-          var field = (_form$query = form.query(key)) === null || _form$query === void 0 ? void 0 : _form$query.take();
-          if ((field === null || field === void 0 ? void 0 : field.component[0]) === 'SelectGroup') {
+          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) {
               var key = _ref3.key,
                 value = _ref3.value;
@@ -44,17 +45,46 @@ var _default = function _default(bindUrl, functions, formRef) {
   };
   // 通过 useUrlState 获取 url 上的参数和 url 配置方法
   var _ref4 = bindUrl ? (0, _hooks.useUrlState)(undefined, initializeBindUrl((0, _utils.isPlainObj)(bindUrl) ? bindUrl : {})) : [],
-    _ref5 = _slicedToArray(_ref4, 2),
+    _ref5 = _slicedToArray(_ref4, 3),
     urlState = _ref5[0],
-    setUrlState = _ref5[1];
+    setUrlState = _ref5[1],
+    queryFromUrl = _ref5[2];
   // 输出配置url参数的函数
   var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref6) {
     var _ref7 = _slicedToArray(_ref6, 2),
-      key = _ref7[0],
-      fun = _ref7[1];
-    prev[key] = function (values) {
-      fun === null || fun === void 0 ? void 0 : fun(values);
-      setUrlState === null || setUrlState === void 0 ? void 0 : setUrlState(values);
+      listenerKey = _ref7[0],
+      originalFunction = _ref7[1];
+    prev[listenerKey] = function (values) {
+      originalFunction === null || originalFunction === void 0 ? void 0 : originalFunction(values);
+      if (bindUrl) {
+        // guard: onInit 会在 mount 时被自动调用，需要避免其在任何情况下都调用 setUrlState。故增加幂等判断
+        var hasDifference = false;
+        for (var paramName in values) {
+          if (Object.hasOwn(values, paramName)) {
+            var simpleTransform = function simpleTransform(value) {
+              if (value instanceof Array) {
+                return value.join(',');
+              }
+              if (value === undefined || value === null) {
+                return '';
+              }
+              if (value instanceof Object) {
+                console.warn('useBindUrl: 无法处理对象类型的 url 参数');
+              }
+              return value;
+            };
+            var oldValue = queryFromUrl === null || queryFromUrl === void 0 ? void 0 : queryFromUrl[paramName];
+            var newValue = values[paramName];
+            if (simpleTransform(newValue) !== simpleTransform(oldValue)) {
+              hasDifference = true;
+              break;
+            }
+          }
+        }
+        if (hasDifference) {
+          setUrlState(values);
+        }
+      }
     };
     return prev;
   }, {});
@@ -93,5 +123,4 @@ var _default = function _default(bindUrl, functions, formRef) {
   return _objectSpread({
     setValuesByUrlState: setValuesByUrlState
   }, initializedFunctions);
-};
-exports.default = _default;
+}

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

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

@@ -193,11 +193,31 @@ var processBuriedPoint = function processBuriedPoint() {
   }))));
 };
 var equalColumns = function equalColumns(prevProps, nextProps) {
-  var preValue = prevProps.value;
+  var preValue = prevProps.value,
+    preItem = prevProps.item,
+    preRecord = prevProps.record,
+    preContext = prevProps.context;
   var nextValue = nextProps.value,
-    item = nextProps.item;
+    nextItem = nextProps.item,
+    nextRecord = nextProps.record,
+    nextContext = nextProps.context;
+  // if (nextItem?.render) {
+  //   let renderCache = true;
+  //   Object.keys(nextItem?.render).forEach((key) => {
+  //     // 如果 preItem 不包含 render 的属性，则强制刷新
+  //     if (!preItem?.render[key]) {
+  //       renderCache = false;
+  //       return false
+  //     }
+  //     let preRenderValue = getTargetValue(preItem?.render[key], {...preRecord, ...preContext});
+  //     let nextRenderValue = getTargetValue(nextItem?.render[key], {...nextRecord, ...nextContext})
+  //     if (preRenderValue !== nextRenderValue) {
+  //       renderCache = false;
+  //     }
+  //   })
+  // }
   // columns 强制更新参数
-  if (item === null || item === void 0 ? void 0 : item.forcedUpdate) {
+  if (nextItem === null || nextItem === void 0 ? void 0 : nextItem.forcedUpdate) {
     return false;
   }
   // 操作列的时候强制刷新 || 当 value 值拿不到的时候

package/lib/table/index.js

@@ -358,9 +358,9 @@ var ProTable = function ProTable(props) {
           setFooterSuctionState(false);
         }
         // 如果有切换区tab，那么重新计算
-        if (headerFixedTopSectionDom.clientHeight) {
+        if (headerFixedTopSectionDom === null || headerFixedTopSectionDom === void 0 ? void 0 : headerFixedTopSectionDom.clientHeight) {
           var _headerFixedTopSectio;
-          var headerFixedTopSectionHeight = (_headerFixedTopSectio = headerFixedTopSectionDom.clientHeight) !== null && _headerFixedTopSectio !== void 0 ? _headerFixedTopSectio : 0;
+          var headerFixedTopSectionHeight = (_headerFixedTopSectio = headerFixedTopSectionDom === null || headerFixedTopSectionDom === void 0 ? void 0 : headerFixedTopSectionDom.clientHeight) !== null && _headerFixedTopSectio !== void 0 ? _headerFixedTopSectio : 0;
           // const clientTableBodyHeight =
           //   document.body.clientHeight - offsetHeaderHeight;
           setHeaderHeight(headerFixedTopSectionHeight + teamixNavHeight + footerRowSelectionHeight + tableHeaderHeight + 1);

package/lib/table/utils/useTableSelection.js

@@ -46,6 +46,10 @@ function useTableSelection() {
   var dataRef = (0, _react.useRef)({
     selectedRowKeys: config.selectedRowKeys || defaultSelectedRowKeys
   });
+  var onSetSelectedRowKeys = function onSetSelectedRowKeys(keys) {
+    setSelectedRowKeys(keys);
+    dataRef.current.selectedRowKeys = keys;
+  };
   (0, _react.useEffect)(function () {
     var _config$selectedRowKe, _config$selectedRowKe2;
     setSelectedRowKeys((_config$selectedRowKe = config === null || config === void 0 ? void 0 : config.selectedRowKeys) !== null && _config$selectedRowKe !== void 0 ? _config$selectedRowKe : []);
@@ -153,7 +157,7 @@ function useTableSelection() {
   return {
     rowSelection: rowSelection,
     selectedRowKeys: selectedRowKeys,
-    setSelectedRowKeys: setSelectedRowKeys,
+    setSelectedRowKeys: onSetSelectedRowKeys,
     selectedRecords: selectedRecords,
     setSelectedRecords: setSelectedRecords
   };

package/package.json

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