@teamias/rex-design 0.0.37 → 0.0.38

package/dist/components/base-table/base-table.d.ts

@@ -33,8 +33,12 @@ export interface IBaseTableProps<T extends object = object> extends Omit<TRawTab
     useDataCellConfig?: boolean;
     /** dataCell 组件配置项, 通过这种方式来配置单元格内容,简化bff层的逻辑 */
     dataCellConfig?: TDataCellConfig;
-    /** dataCell组件中的点击回调 */
+    /**
+     * @desc dataCell组件中的点击回调
+     * @deprecated 请使用 onDataCellClickV2
+     */
     onDataCellClick?: (item: IDataCellItem, dataIndex: string, record: T, index: number) => void;
+    /** dataCell组件中的点击回调 */
     onDataCellClickV2?: (data: {
         item: IDataCellItem;
         subItem?: Exclude<TGroupV2['props'], undefined>['items'][number];

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

@@ -4,7 +4,12 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default (function () {
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(DataCell, {
+    children: [/*#__PURE__*/_jsx("a", {
+      href: "http://baidu.com",
+      target: "_blank",
+      rel: "noreferrer",
+      children: "baidu"
+    }), /*#__PURE__*/_jsx(DataCell, {
       items: [{
         type: 'text',
         props: {
@@ -26,8 +31,16 @@ export default (function () {
       }, {
         type: 'link',
         props: {
-          label: 'ssss',
-          value: 'http://'
+          label: 'link-baidu-blank',
+          value: 'http://baidu.com'
+          // urlTarget: '_self',
+        }
+      }, {
+        type: 'link',
+        props: {
+          label: 'link-baidu-self',
+          value: 'http://baidu.com',
+          urlTarget: '_self'
         }
       }, {
         type: 'icon',

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

@@ -13,6 +13,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 import { Icons, MediaViewer } 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";
@@ -26,7 +27,6 @@ var isEmpty = function isEmpty(val) {
 
 /** 动作块渲染 */
 var actionRender = function actionRender(item, action, node, click) {
-  var _item$urlTarget;
   var tooltipBox = function tooltipBox(content) {
     if (item.tooltip) {
       return /*#__PURE__*/_jsx(Tooltip, {
@@ -43,15 +43,9 @@ var actionRender = function actionRender(item, action, node, click) {
     }
     return content;
   };
-  if (action === 'default') {
-    return tooltipBox( /*#__PURE__*/_jsx("span", {
-      style: item.style,
-      children: node
-    }));
-  }
 
-  // 自定义
-  if (action === 'custom') {
+  /** 创建自定义 node */
+  var createCustomNode = function createCustomNode() {
     return tooltipBox( /*#__PURE__*/_jsx("a", {
       href: "void",
       style: item.style,
@@ -61,21 +55,49 @@ var actionRender = function actionRender(item, action, node, click) {
       },
       children: node
     }));
+  };
+
+  /** 创建 link node */
+  var createLinkNode = function createLinkNode() {
+    var _item$urlTarget;
+    var target = (_item$urlTarget = item.urlTarget) !== null && _item$urlTarget !== void 0 ? _item$urlTarget : '_blank';
+    return tooltipBox( /*#__PURE__*/_jsx("a", {
+      style: item.style,
+      href: target === '_blank' ? item.value : 'void',
+      target: target,
+      rel: "noreferrer",
+      onClick: function onClick(e) {
+        if (target !== '_blank') {
+          e.preventDefault();
+          try {
+            Navigate({
+              to: item.value || '',
+              replace: false
+            });
+          } catch (error) {
+            window.location.href = item.value || '';
+          }
+        }
+      },
+      children: node
+    }));
+  };
+  if (action === 'default') {
+    return tooltipBox( /*#__PURE__*/_jsx("span", {
+      style: item.style,
+      children: node
+    }));
+  }
+
+  // 自定义
+  if (action === 'custom') {
+    return createCustomNode();
   }
 
   // TODO: 窗口-未实现
-  // if (action === 'modal') {
-  //   return <a href="javascript:void;" onClick={() => click?.()}>{node}</a>
-  // }
 
   // 默认url
-  return tooltipBox( /*#__PURE__*/_jsx("a", {
-    style: item.style,
-    href: item.value,
-    target: (_item$urlTarget = item.urlTarget) !== null && _item$urlTarget !== void 0 ? _item$urlTarget : '_blank',
-    rel: "noreferrer",
-    children: node
-  }));
+  return createLinkNode();
 };
 export var cellItemMap = {
   /** 文本块 */

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

@@ -176,7 +176,7 @@ export type TCellActionExtend = {
      * - custom 透传出去
      * - default 什么都不做
      */
-    action: 'url' | 'modal-form' | 'modal-search' | 'custom' | 'default';
+    action: 'url' | 'custom' | 'default';
     /**
      * url 跳转类型
      * - a 标签的 target 属性

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",
@@ -76,6 +76,7 @@
     "radash": "^12.1.1",
     "rc-virtual-list": "^3.19.1",
     "react-intl": "^7.1.11",
+    "react-router": "6",
     "styled-components": "^6.1.19"
   },
   "devDependencies": {
@@ -107,7 +108,8 @@
     "antd": ">=5.0.0",
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0",
-    "react-intl": ">=3.0.0"
+    "react-intl": ">=3.0.0",
+    "react-router": ">=6.0.0"
   },
   "publishConfig": {
     "access": "public"