@xfe-repo/web-components 1.2.3 → 1.2.6

package/dist/index.js

@@ -472,14 +472,7 @@ var TabItem = (0, import_react2.memo)(function(props) {
     var collectionSelect = (0, import_react2.useMemo)(function() {
         var _data_searchCollection;
         if (!(data === null || data === void 0 ? void 0 : (_data_searchCollection = data.searchCollection) === null || _data_searchCollection === void 0 ? void 0 : _data_searchCollection.length)) return null;
-        if (!isActivated) {
-            return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_antd2.Badge, {
-                className: MultiWindow_module_default.collection,
-                count: data.searchCollection.length,
-                color: "var(--ant-color-primary)",
-                size: "small"
-            }, data.key);
-        }
+        if (!isActivated) return null;
         var options = data.searchCollection.map(function(item) {
             return {
                 label: item,
@@ -492,6 +485,7 @@ var TabItem = (0, import_react2.memo)(function(props) {
             options: options,
             value: currentKey,
             onChange: handleCollectionChange,
+            popupMatchSelectWidth: false,
             size: "small",
             showSearch: true,
             placeholder: "请选择"
@@ -642,46 +636,44 @@ var MultiWindow = (0, import_react5.memo)(function(props) {
         var currentIsFromInternalRouter = isFromInternalNavigate.current;
         isFromInternalNavigate.current = false;
         if (currentStateRef.current.fullPath === fullPath) return;
-        var _fullPath_split = _sliced_to_array(fullPath.split("?"), 2), path = _fullPath_split[0], tmp = _fullPath_split[1], search = tmp === void 0 ? "" : tmp;
-        if (!path || path === "/") return;
+        var _fullPath_split = _sliced_to_array(fullPath.split("?"), 2), newPathKey = _fullPath_split[0], tmp = _fullPath_split[1], newPathSearch = tmp === void 0 ? "" : tmp;
+        if (!newPathKey || newPathKey === "/") return;
         var _currentStateRef_current = currentStateRef.current, pathKey2 = _currentStateRef_current.pathKey, prev = _currentStateRef_current.pagePaths;
         var newPagePaths = _to_consumable_array(prev);
         var newPagePath = {
             label: "加载中",
-            key: path,
+            key: newPathKey,
             fullPath: fullPath
         };
         var pagePathIndex = prev.findIndex(function(item) {
-            return item.key === path;
+            return item.key === newPathKey;
         });
         if (pagePathIndex !== -1) {
-            var _contentRef_current;
             var prevPagePath = prev[pagePathIndex];
             Object.assign(newPagePath, prevPagePath || {});
             newPagePath.fullPath = fullPath;
             newPagePaths.splice(pagePathIndex, 1);
-            if ((prevPagePath === null || prevPagePath === void 0 ? void 0 : prevPagePath.fullPath) !== fullPath) contentRef === null || contentRef === void 0 ? void 0 : (_contentRef_current = contentRef.current) === null || _contentRef_current === void 0 ? void 0 : _contentRef_current.refresh(path);
         }
         var targetPagePathIndex = pagePathIndex === -1 ? newPagePaths.length : pagePathIndex;
-        if (!currentIsFromInternalRouter) {
-            var currentPathIndex = prev.findIndex(function(item) {
+        if (!currentIsFromInternalRouter && pathKey2 !== newPathKey) {
+            var currentPathIndex = newPagePaths.findIndex(function(item) {
                 return item.key === pathKey2;
             });
             if (currentPathIndex !== -1) targetPagePathIndex = currentPathIndex + 1;
         }
         newPagePaths.splice(targetPagePathIndex, 0, newPagePath);
-        currentStateRef.current.pathKey = path;
+        currentStateRef.current.pathKey = newPathKey;
         currentStateRef.current.fullPath = fullPath;
         currentStateRef.current.collectionKey = "";
-        var enableCollection = checkCanEnableCollection(path, collectionBlackList);
+        var enableCollection = checkCanEnableCollection(newPathKey, collectionBlackList);
         if (!enableCollection) {
             newPagePath.searchCollection = [];
             return handleUpdatePagePaths(newPagePaths);
         }
         var collection = newPagePath.searchCollection || [];
-        var queryJson = import_tools.queryString.parse(search);
+        var queryJson = import_tools.queryString.parse(newPathSearch);
         if (queryJson.ts) delete queryJson.ts;
-        var collectionKey2 = createSearchCollectionKey(search);
+        var collectionKey2 = createSearchCollectionKey(newPathSearch);
         if (!collectionKey2) return handleUpdatePagePaths(newPagePaths);
         var queryIndex = collection.findIndex(function(item) {
             return item === collectionKey2;
@@ -690,7 +682,7 @@ var MultiWindow = (0, import_react5.memo)(function(props) {
         collection.unshift(collectionKey2);
         if (collection.length > 10) collection.pop();
         newPagePath.searchCollection = collection;
-        currentStateRef.current.collectionKey = "".concat(path, "?").concat(collectionKey2);
+        currentStateRef.current.collectionKey = "".concat(newPathKey, "?").concat(collectionKey2);
         handleUpdatePagePaths(newPagePaths);
     }, []);
     (0, import_react5.useEffect)(function() {

package/dist/index.mjs

@@ -276,7 +276,7 @@ import { Button as Button2, ConfigProvider, Popconfirm, Tooltip as Tooltip2 } fr
 import { CloseOutlined, QuestionCircleOutlined, RedoOutlined } from "@ant-design/icons";
 // src/MultiWindow/MultiWindowTabs.tsx
 import React2, { memo, useCallback, useMemo } from "react";
-import { Tabs, Select, Badge } from "antd";
+import { Tabs, Select } from "antd";
 import { closestCenter, DndContext, PointerSensor, useSensor } from "@dnd-kit/core";
 import { arrayMove, horizontalListSortingStrategy, SortableContext, useSortable } from "@dnd-kit/sortable";
 import { restrictToHorizontalAxis } from "@dnd-kit/modifiers";
@@ -397,14 +397,7 @@ var TabItem = memo(function(props) {
     var collectionSelect = useMemo(function() {
         var _data_searchCollection;
         if (!(data === null || data === void 0 ? void 0 : (_data_searchCollection = data.searchCollection) === null || _data_searchCollection === void 0 ? void 0 : _data_searchCollection.length)) return null;
-        if (!isActivated) {
-            return /* @__PURE__ */ jsx2(Badge, {
-                className: MultiWindow_module_default.collection,
-                count: data.searchCollection.length,
-                color: "var(--ant-color-primary)",
-                size: "small"
-            }, data.key);
-        }
+        if (!isActivated) return null;
         var options = data.searchCollection.map(function(item) {
             return {
                 label: item,
@@ -417,6 +410,7 @@ var TabItem = memo(function(props) {
             options: options,
             value: currentKey,
             onChange: handleCollectionChange,
+            popupMatchSelectWidth: false,
             size: "small",
             showSearch: true,
             placeholder: "请选择"
@@ -567,46 +561,44 @@ var MultiWindow = memo3(function(props) {
         var currentIsFromInternalRouter = isFromInternalNavigate.current;
         isFromInternalNavigate.current = false;
         if (currentStateRef.current.fullPath === fullPath) return;
-        var _fullPath_split = _sliced_to_array(fullPath.split("?"), 2), path = _fullPath_split[0], tmp = _fullPath_split[1], search = tmp === void 0 ? "" : tmp;
-        if (!path || path === "/") return;
+        var _fullPath_split = _sliced_to_array(fullPath.split("?"), 2), newPathKey = _fullPath_split[0], tmp = _fullPath_split[1], newPathSearch = tmp === void 0 ? "" : tmp;
+        if (!newPathKey || newPathKey === "/") return;
         var _currentStateRef_current = currentStateRef.current, pathKey2 = _currentStateRef_current.pathKey, prev = _currentStateRef_current.pagePaths;
         var newPagePaths = _to_consumable_array(prev);
         var newPagePath = {
             label: "加载中",
-            key: path,
+            key: newPathKey,
             fullPath: fullPath
         };
         var pagePathIndex = prev.findIndex(function(item) {
-            return item.key === path;
+            return item.key === newPathKey;
         });
         if (pagePathIndex !== -1) {
-            var _contentRef_current;
             var prevPagePath = prev[pagePathIndex];
             Object.assign(newPagePath, prevPagePath || {});
             newPagePath.fullPath = fullPath;
             newPagePaths.splice(pagePathIndex, 1);
-            if ((prevPagePath === null || prevPagePath === void 0 ? void 0 : prevPagePath.fullPath) !== fullPath) contentRef === null || contentRef === void 0 ? void 0 : (_contentRef_current = contentRef.current) === null || _contentRef_current === void 0 ? void 0 : _contentRef_current.refresh(path);
         }
         var targetPagePathIndex = pagePathIndex === -1 ? newPagePaths.length : pagePathIndex;
-        if (!currentIsFromInternalRouter) {
-            var currentPathIndex = prev.findIndex(function(item) {
+        if (!currentIsFromInternalRouter && pathKey2 !== newPathKey) {
+            var currentPathIndex = newPagePaths.findIndex(function(item) {
                 return item.key === pathKey2;
             });
             if (currentPathIndex !== -1) targetPagePathIndex = currentPathIndex + 1;
         }
         newPagePaths.splice(targetPagePathIndex, 0, newPagePath);
-        currentStateRef.current.pathKey = path;
+        currentStateRef.current.pathKey = newPathKey;
         currentStateRef.current.fullPath = fullPath;
         currentStateRef.current.collectionKey = "";
-        var enableCollection = checkCanEnableCollection(path, collectionBlackList);
+        var enableCollection = checkCanEnableCollection(newPathKey, collectionBlackList);
         if (!enableCollection) {
             newPagePath.searchCollection = [];
             return handleUpdatePagePaths(newPagePaths);
         }
         var collection = newPagePath.searchCollection || [];
-        var queryJson = queryString.parse(search);
+        var queryJson = queryString.parse(newPathSearch);
         if (queryJson.ts) delete queryJson.ts;
-        var collectionKey2 = createSearchCollectionKey(search);
+        var collectionKey2 = createSearchCollectionKey(newPathSearch);
         if (!collectionKey2) return handleUpdatePagePaths(newPagePaths);
         var queryIndex = collection.findIndex(function(item) {
             return item === collectionKey2;
@@ -615,7 +607,7 @@ var MultiWindow = memo3(function(props) {
         collection.unshift(collectionKey2);
         if (collection.length > 10) collection.pop();
         newPagePath.searchCollection = collection;
-        currentStateRef.current.collectionKey = "".concat(path, "?").concat(collectionKey2);
+        currentStateRef.current.collectionKey = "".concat(newPathKey, "?").concat(collectionKey2);
         handleUpdatePagePaths(newPagePaths);
     }, []);
     useEffect(function() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfe-repo/web-components",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "sideEffects": [
@@ -43,8 +43,8 @@
     "antd": "^5.24.5",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "@xfe-repo/web-micro": "1.2.5",
-    "@xfe-repo/web-utils": "1.3.7"
+    "@xfe-repo/web-utils": "1.3.7",
+    "@xfe-repo/web-micro": "1.2.5"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"