@teamias/rex-design 0.1.8 → 0.1.9

package/dist/components/base-table/base-table.js

@@ -9,7 +9,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { useRequestFields, useRequestFieldsConfig, useRexProConfigProvider, useStateData } from "../..";
 import { useDebounceEffect } from 'ahooks';
-import { ConfigProvider, Empty, Skeleton, Table } from 'antd';
+import { Alert, ConfigProvider, Empty, Skeleton, Table } from 'antd';
 import classNames from 'classnames';
 import { useMemo } from 'react';
 import { dataToDataCellData } from "../data-cell";
@@ -145,8 +145,12 @@ export var BaseTable = function BaseTable(_ref) {
               render: function render(value, record, index) {
                 if (item.render) return item.render(value, record, index);
                 if (!state.useDataCellRender) return _typeof(value) === 'object' && value !== null ? JSON.stringify(value) : value;
-                try {
-                  return Array.isArray(value) ? /*#__PURE__*/_jsx(DataCell, {
+                return Array.isArray(value) ? /*#__PURE__*/_jsx(Alert.ErrorBoundary, {
+                  message: /*#__PURE__*/_jsxs(_Fragment, {
+                    children: ["field: ", item.dataIndex]
+                  }),
+                  description: "DataCell render error",
+                  children: /*#__PURE__*/_jsx(DataCell, {
                     items: value,
                     onClick: function onClick(cellItem, subItem) {
                       cellClick({
@@ -157,11 +161,8 @@ export var BaseTable = function BaseTable(_ref) {
                         subItem: subItem
                       });
                     }
-                  }) : JSON.stringify(value);
-                } catch (error) {
-                  console.error("DataCell render error key:".concat(item.dataIndex, "-value:").concat(value, "-index:").concat(index, "-error:").concat(error));
-                  return JSON.stringify(value);
-                }
+                  })
+                }) : JSON.stringify(value);
               },
               onCell: function onCell(rawRecord) {
                 var record = rawRecord;

package/dist/components/base-table/components/BaseTableRow.js

@@ -8,6 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 /* eslint-disable react/destructuring-assignment */
+import { Alert } from 'antd';
 import classNames from 'classnames';
 import React from 'react';
 import { DataCell } from "../../data-cell/data-cell";
@@ -17,9 +18,9 @@ import { TableParentRow, TableParentRowCell } from "../style";
  * 判断是否为左侧固定列
  * 兼容 antd 5.x (fixLeft) 和 antd 6.x (fixStart)
  */
-import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 var isFixedLeft = function isFixedLeft(props) {
   return typeof (props === null || props === void 0 ? void 0 : props.fixLeft) === 'number' || typeof (props === null || props === void 0 ? void 0 : props.fixStart) === 'number';
 };
@@ -88,18 +89,24 @@ export var BaseTableRow = function BaseTableRow(outProps) {
                 width: width
               },
               children: Object.keys(record).map(function (key) {
-                return Array.isArray(record[key]) ? /*#__PURE__*/_jsx(DataCell, {
-                  items: record[key],
-                  onClick: function onClick(cellItem, subItem) {
-                    // cellClick({dataIndex: 'parent'}, record, 0, cellItem, subItem);
-                    cellClick({
-                      dataIndex: 'parent',
-                      record: record,
-                      index: index,
-                      cellItem: cellItem,
-                      subItem: subItem
-                    });
-                  }
+                return Array.isArray(record[key]) ? /*#__PURE__*/_jsx(Alert.ErrorBoundary, {
+                  message: /*#__PURE__*/_jsxs(_Fragment, {
+                    children: ["field: ", key]
+                  }),
+                  description: "DataCell render error",
+                  children: /*#__PURE__*/_jsx(DataCell, {
+                    items: record[key],
+                    onClick: function onClick(cellItem, subItem) {
+                      // cellClick({dataIndex: 'parent'}, record, 0, cellItem, subItem);
+                      cellClick({
+                        dataIndex: 'parent',
+                        record: record,
+                        index: index,
+                        cellItem: cellItem,
+                        subItem: subItem
+                      });
+                    }
+                  }, key)
                 }, key) : /*#__PURE__*/_jsx("span", {
                   style: {
                     display: 'none'

package/dist/components/base-table/demo/BaseTableBasic.js

@@ -4,6 +4,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
 export default (function () {
   return /*#__PURE__*/_jsx(BaseTable, {
     fieldsConfig: [{
+      title: 'qweqwe',
+      dataIndex: 'qweqwe'
+    }, {
       title: '编号/状态',
       dataIndex: 'status_name',
       key: 'status_name'

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

@@ -1,6 +1,10 @@
 export declare const tableData: {
     items: ({
         key: string;
+        qweqwe: {
+            type: string;
+            props: never[];
+        }[];
         id: {
             type: string;
             props: {
@@ -79,6 +83,10 @@ export declare const tableData: {
         key: string;
         id: number;
         detail_id: number;
+        qweqwe: {
+            type: string;
+            props: never[];
+        }[];
         is_checkbox: number;
         status_name: ({
             type: string;

package/dist/components/base-table/demo/tableData.js

@@ -1,6 +1,10 @@
 export var tableData = {
   items: [{
     key: 'parent_1075',
+    qweqwe: [{
+      type: 'group',
+      props: []
+    }],
     id: [{
       type: 'text',
       props: {
@@ -51,6 +55,10 @@ export var tableData = {
     key: '1075_1102',
     id: 1075,
     detail_id: 1102,
+    qweqwe: [{
+      type: 'group',
+      props: []
+    }],
     is_checkbox: 2,
     status_name: [{
       type: 'text',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/rex-design",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",