@teamix/pro 1.5.46 → 1.5.47

package/dist/pro.js

@@ -78316,7 +78316,7 @@ var PreviewPassword = function PreviewPassword(props) {
   }, password), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, {
     className: "teamix-pro-field-password-icon",
     size: "small",
-    type: passwordMode ? 'eye-line' : 'hide-line',
+    type: passwordMode ? 'hide-line' : 'eye-line',
     onClick: function onClick() {
       setPasswordText(!passwordMode);
       setPasswordMode(!passwordMode);
@@ -97873,7 +97873,7 @@ var parseValueType = function parseValueType(values, valueType, mode) {
  * 基于 ahooks 的 useUrlState，增加默认配置和额外参数，以及幂等判断避免重复 update 的能力
  * @param initialState 同useUrlState
  * @param urlStateOptions 新增beforeStringify、beforeParse、valueType参数和默认配置
- * @returns `[urlState, setUrlState, queryFromUrl, stringify]` 注意 queryFromUrl 完全对应 url 中参数的情况、用于幂等判断，而 urlState 包含不在 url 中的（初次 use 时提供的）默认值；stringify 是根据 options 柯里化得到的参数转字符串函数，也用于幂等判断。
+ * @returns `[urlState, setUrlState, queryFromUrl, teamixStringify, rawStringify]` 注意 queryFromUrl 完全对应 url 中参数的情况、用于幂等判断，而 urlState 包含不在 url 中的（初次 use 时提供的）默认值；stringify 是根据 options 柯里化得到的参数转字符串函数，也用于幂等判断。其中，teamixStringify 包含 teamix 层面配置的预处理，rawStringify 不包含预处理。
  */
 var useUrlState = function useUrlState(initialState, urlStateOptions) {
   var _getGlobalConfig;
@@ -97910,6 +97910,13 @@ var useUrlState = function useUrlState(initialState, urlStateOptions) {
     setState = _useUrlStateAhooks[1],
     queryFromUrl = _useUrlStateAhooks[2],
     stringify = _useUrlStateAhooks[3];
+
+  /**
+   * @param input 字段名的命名必须和 useUrlState 时候指定的匹配，否则无法完成预处理
+   */
+  function teamixStringify(input) {
+    return stringify(parseValueType(mergedBeforeStringify(input), mergedValueType, 'pre'));
+  }
   var setUrlStateCalls = (0,react__WEBPACK_IMPORTED_MODULE_2__.useRef)([]);
 
   // 配置url参数
@@ -97929,7 +97936,7 @@ var useUrlState = function useUrlState(initialState, urlStateOptions) {
 
   // 输出url参数
   var urlState = parseValueType(mergedBeforeParse(state), mergedValueType, 'post');
-  return [urlState, setUrlState, queryFromUrl, stringify];
+  return [urlState, setUrlState, parseValueType(mergedBeforeParse(queryFromUrl), mergedValueType, 'post'), teamixStringify, stringify];
 };
 
 
@@ -102637,7 +102644,7 @@ function useBindUrl(bindUrl, functions, formRef) {
           var field = form == null ? void 0 : (_form$query = form.query(key)) == null ? void 0 : _form$query.take();
           var component = field == null ? void 0 : field.component;
           if (component instanceof Array && component[0] === 'SelectGroup') {
-            newValues[key] = value.map(function (_ref2) {
+            newValues[key] = (value != null ? value : []).map(function (_ref2) {
               var key = _ref2.key,
                 value = _ref2.value;
               return key && value ? key + "||" + (value == null ? void 0 : value.join('|')) : '';
@@ -102645,21 +102652,48 @@ function useBindUrl(bindUrl, functions, formRef) {
           }
         });
         return beforeStringify ? beforeStringify(newValues) : newValues;
+      },
+      beforeParse: function beforeParse(values) {
+        var _Object$entries2;
+        var beforeParse = options.beforeParse;
+        var newValues = _extends({}, values);
+        (_Object$entries2 = Object.entries(values)) == null ? void 0 : _Object$entries2.forEach(function (_ref3) {
+          var _form$query2;
+          var key = _ref3[0],
+            value = _ref3[1];
+          var form = formRef.current;
+          var field = form == null ? void 0 : (_form$query2 = form.query(key)) == null ? void 0 : _form$query2.take();
+          var component = field == null ? void 0 : field.component;
+          if (component instanceof Array && component[0] === 'SelectGroup') {
+            newValues[key] = (value != null ? value : []).map(function (item) {
+              var _item$split = item == null ? void 0 : item.split('||'),
+                key = _item$split[0],
+                value = _item$split[1];
+              return {
+                key: key,
+                value: value == null ? void 0 : value.split('|')
+              };
+            });
+          }
+        });
+        return beforeParse ? beforeParse(newValues) : newValues;
       }
     }) : options;
   };
 
   // 通过 useUrlState 获取 url 上的参数和 url 配置方法
-  var _ref3 = bindUrl ? (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_0__.useUrlState)(undefined, initializeBindUrl((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isPlainObj)(bindUrl) ? bindUrl : {})) : [],
-    urlState = _ref3[0],
-    setUrlState = _ref3[1],
-    queryFromUrl = _ref3[2],
-    stringify = _ref3[3];
+  var _ref4 = bindUrl ? (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_0__.useUrlState)(undefined, _extends({}, initializeBindUrl((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isPlainObj)(bindUrl) ? bindUrl : {}), {
+      navigateMode: 'replace'
+    })) : [],
+    urlState = _ref4[0],
+    setUrlState = _ref4[1],
+    queryFromUrl = _ref4[2],
+    stringify = _ref4[3];
 
   // 输出配置url参数的函数
-  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref4) {
-    var listenerKey = _ref4[0],
-      originalFunction = _ref4[1];
+  var initializedFunctions = Object.entries(functions).reduce(function (prev, _ref5) {
+    var listenerKey = _ref5[0],
+      originalFunction = _ref5[1];
     prev[listenerKey] = function (values) {
       originalFunction == null ? void 0 : originalFunction(values);
       if (bindUrl) {
@@ -102668,17 +102702,14 @@ function useBindUrl(bindUrl, functions, formRef) {
         var hasValuesDiff = false;
         for (var paramName in values) {
           if (Object.hasOwn(values, paramName)) {
+            var _stringify, _stringify2;
             var oldValue = queryFromUrl == null ? void 0 : queryFromUrl[paramName];
             var newValue = values[paramName];
             // 这里我们必须使用 stringify 来判断是否有变化，因为 special case 太多。例如，默认配置下：
             // { 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((_stringify = {}, _stringify[paramName] = newValue, _stringify)) !== stringify((_stringify2 = {}, _stringify2[paramName] = oldValue, _stringify2))) {
               hasStringifiedDiff = true;
               break;
             } else if (oldValue !== newValue) {
@@ -102700,28 +102731,24 @@ function useBindUrl(bindUrl, functions, formRef) {
   // 使用 url 参数配置 QueryFilter 默认值（移除非表单值，兼容数组数据，兼容 SelectGroup 组件）
   var setValuesByUrlState = function setValuesByUrlState(form) {
     if (urlState) {
-      var _Object$entries2;
-      (_Object$entries2 = Object.entries(urlState)) == null ? void 0 : _Object$entries2.forEach(function (_ref5) {
-        var _form$query2;
-        var key = _ref5[0],
-          value = _ref5[1];
-        var field = (_form$query2 = form.query(key)) == null ? void 0 : _form$query2.take();
+      var _Object$entries3;
+      (_Object$entries3 = Object.entries(urlState)) == null ? void 0 : _Object$entries3.forEach(function (_ref6) {
+        var _form$query3;
+        var key = _ref6[0],
+          value = _ref6[1];
+        var field = (_form$query3 = form.query(key)) == null ? void 0 : _form$query3.take();
         if (field) {
           var newValue = value;
           if (field.displayName === 'ArrayField') {
             newValue = [].concat((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.isUsable)(newValue) ? newValue : []);
           }
-          if (field.component[0] === 'SelectGroup') {
-            newValue = newValue.map(function (item) {
-              var _item$split = item == null ? void 0 : item.split('||'),
-                key = _item$split[0],
-                value = _item$split[1];
-              return {
-                key: key,
-                value: value == null ? 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);
         }
       });
@@ -105603,6 +105630,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "useForm": () => (/* reexport safe */ _form__WEBPACK_IMPORTED_MODULE_3__.cI),
 /* harmony export */   "usePageContainer": () => (/* reexport safe */ _page_container__WEBPACK_IMPORTED_MODULE_6__.Oy),
 /* harmony export */   "usePrefixCls": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.F8),
+/* harmony export */   "useReactHistory": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.xg),
 /* harmony export */   "useRealHistory": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.iw),
 /* harmony export */   "useRequest": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.QT),
 /* harmony export */   "utils": () => (/* reexport safe */ _utils__WEBPACK_IMPORTED_MODULE_10__.ZP),
@@ -105665,7 +105693,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
 
 
 
-var version = '1.5.46';
+var version = '1.5.47';
 
 // By TeamixTest
 window.postMessage({
@@ -108583,7 +108611,7 @@ var ProPageHeader = function ProPageHeader(props) {
     style = props.style,
     tabs = props.tabs,
     others = _objectWithoutPropertiesLoose(props, _excluded3);
-  var history = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.useRealHistory)();
+  var history = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.useReactHistory)();
   var backgroundImage = image ? "url('" + image + "')" : undefined;
   var showList = function showList(list) {
     var _list$actions;
@@ -110832,7 +110860,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,_teamix_hooks__WEBPACK_IMPORTED_MODULE_4__.useUrlState)() : [],
+  var _ref = bindUrl ? (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_4__.useUrlState)({}, {
+      navigateMode: 'replace'
+    }) : [],
     urlState = _ref[0],
     setUrlState = _ref[1];
 
@@ -112997,7 +113027,9 @@ var ProTable = function ProTable(props) {
   var targetPageKey = pageKey || globalPageKey;
   var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
   var targetFormatSort = formatSort || globalFormatSort;
-  var _ref = bindUrl ? (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_16__.useUrlState)() : [],
+  var _ref = bindUrl ? (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_16__.useUrlState)({}, {
+      navigateMode: 'replace'
+    }) : [],
     urlState = _ref[0],
     setUrlState = _ref[1];
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)((_urlState$currentPage = urlState == null ? void 0 : urlState.currentPage) != null ? _urlState$currentPage : 1),
@@ -114089,7 +114121,8 @@ var ProTable = function ProTable(props) {
   }, [fullscreenState, fixedTableBody, footerSuction, footerSuctionState]);
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_ToolBar_Fullscreen__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z, {
     visible: fullscreenState,
-    actionRef: actionRef
+    actionRef: actionRef,
+    key: props.key
   }, function (isFullScreen) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: cls({
@@ -116186,6 +116219,7 @@ ProTimeline.Item = _ProTimeLineItem__WEBPACK_IMPORTED_MODULE_2__/* ["default"] *
 /* harmony export */   "wz": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.autoWidthBySpace),
 /* harmony export */   "xL": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getSourceLocale),
 /* harmony export */   "xZ": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.INTERNET_DOMAIN),
+/* harmony export */   "xg": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.useReactHistory),
 /* harmony export */   "yD": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.setLocalStorage),
 /* harmony export */   "yI": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.cls),
 /* harmony export */   "yn": () => (/* reexport safe */ _teamix_utils__WEBPACK_IMPORTED_MODULE_0__.isWeakMap),
@@ -116595,6 +116629,7 @@ function getFoldDateFormat(date, type) {
 /* harmony export */   "vZ": () => (/* reexport safe */ _type__WEBPACK_IMPORTED_MODULE_7__.vZ),
 /* harmony export */   "vc": () => (/* reexport safe */ _date__WEBPACK_IMPORTED_MODULE_0__.vc),
 /* harmony export */   "wz": () => (/* reexport safe */ _intelligent__WEBPACK_IMPORTED_MODULE_1__.w),
+/* harmony export */   "xg": () => (/* reexport safe */ _useRealHistory__WEBPACK_IMPORTED_MODULE_9__.R),
 /* harmony export */   "yn": () => (/* reexport safe */ _type__WEBPACK_IMPORTED_MODULE_7__.yn)
 /* harmony export */ });
 /* harmony import */ var _date__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97144);
@@ -117550,6 +117585,10 @@ var numberFormat = function numberFormat(number, maximumFractionDigits) {
 /* harmony export */   "iF": () => (/* binding */ goToLink),
 /* harmony export */   "s1": () => (/* binding */ getHistory)
 /* harmony export */ });
+/**
+ * as-layout-app 修改后的 History。会被其设置为 window.history
+ */
+
 var baseHistory = window.history;
 function setHistory(nextHistory) {
   baseHistory = nextHistory;
@@ -117587,7 +117626,8 @@ function goToLink(link, history) {
     state: state,
     key: key
   };
-  historyPushMethod(locationDescriptorObject); // state is already stored in locationDescriptorObject
+  // @ts-ignore second argument is for react-router v6 compatibility
+  historyPushMethod(locationDescriptorObject, state);
 }
 
 /***/ }),
@@ -118160,15 +118200,25 @@ var isUsable = function isUsable(val) {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "R": () => (/* binding */ useReactHistory),
 /* harmony export */   "i": () => (/* binding */ useRealHistory)
 /* harmony export */ });
 /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(18944);
 /* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_router_dom__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _path_link__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4353);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(59787);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_2__);
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 // 兼容 react-router-dom v5&v6，拿到真正的 history
 // v6 版本没有 useHistory
 
 
+
+
+/**
+ * 在 as-layout-app 环境下，这个函数会通过 getHistory 获取到微前端服务外面的那个 history。
+ * 使用 useReactHistory 来获取微前端服务 React 内部使用的 history
+ */
 var useRealHistory = function useRealHistory() {
   var history = (0,_path_link__WEBPACK_IMPORTED_MODULE_1__/* .getHistory */ .s1)();
   if (history === window.history) {
@@ -118177,8 +118227,48 @@ var useRealHistory = function useRealHistory() {
       history = (0,react_router_dom__WEBPACK_IMPORTED_MODULE_0__.useHistory)();
     }
   }
+  if (!history) {
+    // 说明是 react-router-dom v6
+    console.error('useRealHistory: Neither useHistory nor window.history is available. Please check if you are using react-router-dom v6. Consider using useReactHistory instead.');
+  }
   return history;
 };
+/**
+ * 获取 React 内部使用的 history。注意 basename 属性仅仅在 react-router-dom v6 下才有。
+ */
+var useReactHistory = function useReactHistory() {
+  // 因为是要去拿 React 内部的 history，所以这里无视全局的那个 history（也就是 as-layout-app 设置的那个 history）
+  if (react_router_dom__WEBPACK_IMPORTED_MODULE_0__.useHistory) {
+    // 说明是 react-router-dom v5
+    return (0,react_router_dom__WEBPACK_IMPORTED_MODULE_0__.useHistory)();
+  } else {
+    // 说明是 react-router-dom v6 --> history v5
+    // @ts-ignore react-router v6
+    var _useContext = (0,react__WEBPACK_IMPORTED_MODULE_2__.useContext)(
+      // @ts-ignore react-router v6
+      react_router_dom__WEBPACK_IMPORTED_MODULE_0__.UNSAFE_LocationContext),
+      _location = _useContext.location;
+    // @ts-ignore react-router v6
+    var _useContext2 = (0,react__WEBPACK_IMPORTED_MODULE_2__.useContext)(
+      // @ts-ignore react-router v6
+      react_router_dom__WEBPACK_IMPORTED_MODULE_0__.UNSAFE_NavigationContext),
+      basename = _useContext2.basename,
+      navigator = _useContext2.navigator;
+    return _extends({}, _location, navigator, {
+      basename: basename,
+      goBack: navigator.back,
+      goForward: navigator.forward,
+      get length() {
+        console.error('history.length is not supported in react-router-dom v6.');
+        return window.history.length;
+      },
+      block: function block(_) {
+        console.error('history.block is not supported in react-router-dom v6.');
+        return function () {};
+      }
+    });
+  }
+};
 
 /***/ }),
 
@@ -121251,7 +121341,6 @@ var setCookieWidthDomain = function setCookieWidthDomain(name, value, options) {
 /* harmony export */   "Sv": () => (/* binding */ performance),
 /* harmony export */   "Vn": () => (/* binding */ recordRouteChangeTime)
 /* harmony export */ });
-/* harmony import */ var query_string__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(49586);
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 // 微前端加载时序
 // 1. 访问页面，在子应用内切换路由
@@ -121276,15 +121365,17 @@ var recordAppLoadedTime = function recordAppLoadedTime() {
 };
 
 // 通用埋点API，参考 https://yuque.antfin.com/ascmdoc/dldm9k/vfgntm#HaZSA
-function getRequestUrl() {
-  // TODO 三方如何获取
-  return window.AS_CONSOLE_CONFIG.CDN_DOMAIN + "/unimanager/tracking/perf.gif";
-}
 function doTrack(params) {
-  var url = getRequestUrl();
-  var img = new Image();
-  var query = query_string__WEBPACK_IMPORTED_MODULE_0__.stringify(params);
-  img.src = url + "?ASD_ID=jiankunisstupdi&body=" + query;
+  // @ts-ignore
+  if (window._dpa) {
+    // @ts-ignore
+    window._dpa.track('pagePerformance', 'perf', {
+      featureId: '',
+      body: JSON.stringify(params)
+    });
+  } else {
+    console.warn('window._dpa is not exist, pagePerformance data cannot be track');
+  }
 }
 function getChildAppLoadedTime(start, end) {
   if (routeChangeTime) {
@@ -121542,6 +121633,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "urlParamsInterceptor": () => (/* reexport safe */ _console__WEBPACK_IMPORTED_MODULE_2__.M5),
 /* harmony export */   "useFeatureRule": () => (/* reexport safe */ _console__WEBPACK_IMPORTED_MODULE_2__.wr),
 /* harmony export */   "usePrefixCls": () => (/* reexport safe */ _console__WEBPACK_IMPORTED_MODULE_2__.F8),
+/* harmony export */   "useReactHistory": () => (/* reexport safe */ _base__WEBPACK_IMPORTED_MODULE_0__.xg),
 /* harmony export */   "useRealHistory": () => (/* reexport safe */ _base__WEBPACK_IMPORTED_MODULE_0__.iw),
 /* harmony export */   "useRequest": () => (/* reexport safe */ _base__WEBPACK_IMPORTED_MODULE_0__.QT)
 /* harmony export */ });