@teamias/rex-design 0.1.3 → 0.1.4

package/dist/components/data-cell/data-cell.js

@@ -1,18 +1,25 @@
+import { useRexProConfigProvider } from "../../context";
 import React from 'react';
 import { cellItemMap } from "./modules/cellItemMap";
 import { Wrapper } from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var DataCell = function DataCell(_ref) {
   var items = _ref.items,
-    onClick = _ref.onClick;
-  // const arr = items.map(ii => cellItemMap[ii.type](ii, onClick));
-  // return arr.map((node, index) => <div key={index} className={`data-cell-row-item ${ii.type}`}>{node}</div>);
+    onClick = _ref.onClick,
+    propSystemHistory = _ref.systemHistory;
+  var _useRexProConfigProvi = useRexProConfigProvider(),
+    contextSystemHistory = _useRexProConfigProvi.systemHistory;
+  var systemHistory = propSystemHistory !== null && propSystemHistory !== void 0 ? propSystemHistory : contextSystemHistory;
   return items.map(function (item, index) {
     var _cellItemMap$item$typ;
     return /*#__PURE__*/_jsx(Wrapper, {
       style: item.rootStyle,
       className: "data-cell-row-item ".concat(item.type),
-      children: (_cellItemMap$item$typ = cellItemMap[item.type]) === null || _cellItemMap$item$typ === void 0 ? void 0 : _cellItemMap$item$typ.call(cellItemMap, item, onClick)
+      children: (_cellItemMap$item$typ = cellItemMap[item.type]) === null || _cellItemMap$item$typ === void 0 ? void 0 : _cellItemMap$item$typ.call(cellItemMap, {
+        item: item,
+        click: onClick,
+        systemHistory: systemHistory
+      })
     }, index);
   });
 };

package/dist/components/data-cell/modules/cellItemMap.d.ts

@@ -1,3 +1,11 @@
+import { useRexProConfigProvider } from "../../..";
 import React from 'react';
 import { IDataCellProps, TDataCellType, TGroupV2 } from '../types';
-export declare const cellItemMap: Record<TDataCellType, (item: IDataCellProps['items'][number], click?: (rawItem: IDataCellProps['items'][number], subItem?: Exclude<TGroupV2['props'], undefined>['items'][number]) => void) => React.ReactNode>;
+export declare const cellItemMap: TCellItemMap;
+type TCellItemFnData = {
+    item: IDataCellProps['items'][number];
+    click?: (rawItem: IDataCellProps['items'][number], subItem?: Exclude<TGroupV2['props'], undefined>['items'][number]) => void;
+    systemHistory?: ReturnType<typeof useRexProConfigProvider>['systemHistory'];
+};
+type TCellItemMap = Record<TDataCellType, (data: TCellItemFnData) => React.ReactNode>;
+export {};

package/dist/components/data-cell/modules/cellItemMap.js

@@ -14,7 +14,6 @@ import { EyeOutlined } from '@ant-design/icons';
 import { downloadResourceFile, Icons, MediaViewer, showFileViewer } from "../../..";
 import { Tag, Tooltip, Typography } from 'antd';
 import React from 'react';
-import { Navigate } from 'react-router';
 import { DataCell } from "../data-cell";
 import { DataCellRowText, DataCellRowTextLabel, DataCellRowTextValue } from "../style";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -27,7 +26,7 @@ var isEmpty = function isEmpty(val) {
 };
 
 /** 动作块渲染 */
-var actionRender = function actionRender(item, action, node, click) {
+var actionRender = function actionRender(item, action, node, click, systemHistory) {
   var tooltipBox = function tooltipBox(content) {
     if (item.tooltip) {
       return /*#__PURE__*/_jsx(Tooltip, {
@@ -70,12 +69,9 @@ var actionRender = function actionRender(item, action, node, click) {
       onClick: function onClick(e) {
         if (target !== '_blank') {
           e.preventDefault();
-          try {
-            Navigate({
-              to: item.value || '',
-              replace: false
-            });
-          } catch (error) {
+          if (systemHistory) {
+            systemHistory === null || systemHistory === void 0 || systemHistory.push(item.value || '');
+          } else {
             window.location.href = item.value || '';
           }
         }
@@ -132,7 +128,10 @@ var actionRender = function actionRender(item, action, node, click) {
 };
 export var cellItemMap = {
   /** 文本块 */
-  text: function text(item, click) {
+  text: function text(_ref) {
+    var item = _ref.item,
+      click = _ref.click,
+      systemHistory = _ref.systemHistory;
     var props = item.props;
     if (!props) return undefined;
     return !isEmpty(props.label) || !isEmpty(props.value) ? /*#__PURE__*/_jsxs(DataCellRowText, {
@@ -154,7 +153,11 @@ export var cellItemMap = {
           return /*#__PURE__*/_jsx(DataCellRowTextValue, {
             className: "data-cell-row-text-value",
             style: props === null || props === void 0 ? void 0 : props.valueStyle,
-            children: cellItemMap[props.value.type](props.value, click)
+            children: cellItemMap[props.value.type]({
+              item: props.value,
+              click: click,
+              systemHistory: systemHistory
+            })
           });
         }
         return /*#__PURE__*/_jsx(DataCellRowTextValue, {
@@ -172,7 +175,8 @@ export var cellItemMap = {
     }) : undefined;
   },
   /** 图片块 */
-  img: function img(item) {
+  img: function img(_ref2) {
+    var item = _ref2.item;
     var props = item.props;
     return /*#__PURE__*/_jsx(MediaViewer, _objectSpread({
       src: props === null || props === void 0 ? void 0 : props.value,
@@ -180,11 +184,12 @@ export var cellItemMap = {
     }, props));
   },
   /** 链接块 */
-  link: function link(item, click) {
+  link: function link(_ref3) {
+    var item = _ref3.item,
+      click = _ref3.click,
+      systemHistory = _ref3.systemHistory;
     var props = item.props;
     if (!props) return undefined;
-
-    // return actionRender(props, props.action, props.label, () => click?.(item));
     return /*#__PURE__*/_jsxs(DataCellRowText, {
       className: "data-cell-row-text link",
       children: [/*#__PURE__*/_jsx(DataCellRowTextValue, {
@@ -196,7 +201,7 @@ export var cellItemMap = {
         },
         children: actionRender(props, props.action, props.label, function () {
           return click === null || click === void 0 ? void 0 : click(item);
-        })
+        }, systemHistory)
       }), props.copyable ? /*#__PURE__*/_jsx(Typography.Paragraph, {
         copyable: {
           text: typeof props.copyable === 'string' ? props.copyable : "".concat(props.label)
@@ -205,7 +210,10 @@ export var cellItemMap = {
     });
   },
   /** 链接组 */
-  'link-group': function linkGroup(item, click) {
+  'link-group': function linkGroup(_ref4) {
+    var item = _ref4.item,
+      click = _ref4.click,
+      systemHistory = _ref4.systemHistory;
     var props = item.props;
     if (!props) return undefined;
     return /*#__PURE__*/_jsx("div", {
@@ -219,9 +227,13 @@ export var cellItemMap = {
             display: 'inline-flex'
           },
           children: [cellItemMap.link({
-            props: child,
-            type: 'link'
-          }, click), (props === null || props === void 0 ? void 0 : props.items.length) - 1 === index ? '' : /*#__PURE__*/_jsx("span", {
+            item: {
+              props: child,
+              type: 'link'
+            },
+            click: click,
+            systemHistory: systemHistory
+          }), (props === null || props === void 0 ? void 0 : props.items.length) - 1 === index ? '' : /*#__PURE__*/_jsx("span", {
             style: {
               paddingInline: 2
             },
@@ -232,7 +244,9 @@ export var cellItemMap = {
     });
   },
   /** tag块 */
-  tag: function tag(item, click) {
+  tag: function tag(_ref5) {
+    var item = _ref5.item,
+      click = _ref5.click;
     var props = item.props;
     if (!props) return undefined;
     var color = function () {
@@ -264,8 +278,12 @@ export var cellItemMap = {
       }) : '']
     })) : undefined;
   },
-  icon: function icon(item, click) {
+  /** 图标块 */
+  icon: function icon(_ref6) {
     var _props$action;
+    var item = _ref6.item,
+      click = _ref6.click,
+      systemHistory = _ref6.systemHistory;
     var props = item.props;
     if (!props) return undefined;
     return actionRender(props, (_props$action = props.action) !== null && _props$action !== void 0 ? _props$action : 'default', /*#__PURE__*/_jsx(Icons, {
@@ -273,32 +291,39 @@ export var cellItemMap = {
       name: props.value
     }), function () {
       return click === null || click === void 0 ? void 0 : click(item);
-    });
+    }, systemHistory);
   },
   /** 块组 */
-  group: function group(item, click) {
+  group: function group(_ref7) {
+    var item = _ref7.item,
+      click = _ref7.click,
+      systemHistory = _ref7.systemHistory;
     var props = item.props;
     if (!props) return undefined;
     return /*#__PURE__*/_jsx("div", {
       style: props.style,
       children: /*#__PURE__*/_jsx(DataCell, {
         items: props.items,
-        onClick: click
+        onClick: click,
+        systemHistory: systemHistory
       })
     });
   },
-  'group-v2': function groupV2(item, click) {
+  /** 块组v2 */
+  'group-v2': function groupV2(_ref8) {
     var _props$items;
+    var item = _ref8.item,
+      click = _ref8.click,
+      systemHistory = _ref8.systemHistory;
     var props = item.props;
     if (!props) return undefined;
-    // itemsSeparator itemsStyle itemsDirection itemsGap
-    // ellipsis tooltip copyable action urlTarget url style
     var renderItem = function renderItem(subItem, index) {
       var count = 0;
       if (subItem.type === 'group-v2') {
         return /*#__PURE__*/_jsx(DataCell, {
           items: [subItem],
-          onClick: click
+          onClick: click,
+          systemHistory: systemHistory
         }, "renderItem-".concat(index, "-").concat(count++));
       }
       var ellipsis = subItem.ellipsis,
@@ -312,9 +337,7 @@ export var cellItemMap = {
         other = _objectWithoutProperties(subItem, _excluded);
       var renderBox = function renderBox(content) {
         var afterContent = /*#__PURE__*/_jsx(DataCellRowTextValue, {
-          className: "data-cell-group-v2-value-item"
-          // title={typeof content === 'string' ? content : ''}
-          ,
+          className: "data-cell-group-v2-value-item",
           ellipsis: ellipsis,
           children: content
         }, "renderItem-".concat(index, "-").concat(count++));
@@ -341,12 +364,24 @@ export var cellItemMap = {
           });
         }
         if (action === 'url') {
+          var target = urlTarget !== null && urlTarget !== void 0 ? urlTarget : '_blank';
           return /*#__PURE__*/_jsx("a", {
-            href: url,
-            target: urlTarget !== null && urlTarget !== void 0 ? urlTarget : '_blank',
+            href: target === '_blank' ? url : 'void',
+            target: target,
+            rel: "noreferrer",
             style: _objectSpread({
               display: 'inline-flex'
             }, style),
+            onClick: function onClick(e) {
+              if (target !== '_blank') {
+                e.preventDefault();
+                try {
+                  systemHistory === null || systemHistory === void 0 || systemHistory.push(url || '');
+                } catch (_unused) {
+                  window.location.href = url || '';
+                }
+              }
+            },
             children: afterContent
           }, "renderItem-".concat(index, "-").concat(count++));
         }
@@ -400,18 +435,18 @@ export var cellItemMap = {
           return renderBox(subItem.value);
         case 'img':
           {
-            var _ref = other,
-              mediaViewerType = _ref.mediaViewerType,
-              otherProps = _objectWithoutProperties(_ref, _excluded2);
+            var _ref9 = other,
+              mediaViewerType = _ref9.mediaViewerType,
+              otherProps = _objectWithoutProperties(_ref9, _excluded2);
             return renderBox( /*#__PURE__*/_jsx(MediaViewer, _objectSpread({
               type: mediaViewerType
             }, otherProps)));
           }
         case 'tag':
           {
-            var _ref2 = other,
-              value = _ref2.value,
-              _otherProps = _objectWithoutProperties(_ref2, _excluded3);
+            var _ref10 = other,
+              value = _ref10.value,
+              _otherProps = _objectWithoutProperties(_ref10, _excluded3);
             var color = function () {
               if (subItem.color !== null && _typeof(subItem.color) === 'object') {
                 var _subItem$color, _subItem$color$toHexS;
@@ -429,9 +464,9 @@ export var cellItemMap = {
           }
         case 'icon':
           {
-            var _ref3 = other,
-              iconsType = _ref3.iconsType,
-              _otherProps2 = _objectWithoutProperties(_ref3, _excluded4);
+            var _ref11 = other,
+              iconsType = _ref11.iconsType,
+              _otherProps2 = _objectWithoutProperties(_ref11, _excluded4);
             return renderBox( /*#__PURE__*/_jsx(Icons, _objectSpread({
               type: iconsType
             }, _otherProps2)));

package/dist/components/data-cell/types.d.ts

@@ -1,4 +1,4 @@
-import { Icons, MediaViewer } from "../..";
+import { Icons, MediaViewer, useRexProConfigProvider } from "../..";
 import { GetProps, Tag } from 'antd';
 import { HTMLAttributeAnchorTarget } from 'react';
 /** 组件props */
@@ -7,6 +7,8 @@ export interface IDataCellProps {
     items: Array<TGroupV2 | IDataCellItem<TDataCellType>>;
     /** 点击回调 */
     onClick?: (item: IDataCellItem, subItem?: Exclude<TGroupV2['props'], undefined>['items'][number]) => void;
+    /** 系统路由历史对象，用于内部跳转 */
+    systemHistory?: ReturnType<typeof useRexProConfigProvider>['systemHistory'];
 }
 export interface IDataCellItem<T extends TDataCellType = TDataCellType> {
     /** 组件类型 */

package/dist/context/rex-pro-config-provider/rex-pro-config-context.d.ts

@@ -19,6 +19,11 @@ export interface RexProConfigContextType {
             }>;
         };
     }>>;
+    /** 系统路由,外部传入 */
+    systemHistory?: History & {
+        push: (to: string, state?: unknown) => void;
+        replace: (to: string, state?: unknown) => void;
+    };
     /** 支持一些自定义属性 */
     [key: string]: unknown | undefined;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -80,7 +80,6 @@
     "react-dom": "^18.3.1",
     "react-intl": "^7.1.11",
     "react-quick-pinch-zoom": "^5.1.1",
-    "react-router": "6",
     "styled-components": "^6.1.19"
   },
   "devDependencies": {
@@ -110,8 +109,7 @@
     "antd": ">=5.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
-    "react-intl": ">=3.0.0",
-    "react-router": ">=6.0.0"
+    "react-intl": ">=3.0.0"
   },
   "publishConfig": {
     "access": "public"