@zat-design/sisyphus-react 3.1.4 → 3.1.5-beta.10

package/lib/ProTable/components/RenderColumn/index.js

@@ -9,33 +9,51 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _icons = require("@ant-design/icons");
 var _reactSvg = require("react-svg");
-var _ProForm = _interopRequireDefault(require("../../../ProForm"));
-var _getEnumLabel = _interopRequireDefault(require("../../../ProEnum/utils/getEnumLabel"));
 var _copy = _interopRequireDefault(require("../../../assets/copy.svg"));
 var Paragraph = _antd.Typography.Paragraph,
   Text = _antd.Typography.Text;
 // @ts-ignore
 var RenderColumn = function RenderColumn(props) {
   var valueType = props.valueType,
-    code = props.code,
     value = props.value,
-    record = props.record,
+    node = props.node,
+    currentValue = props.currentValue,
     copyable = props.copyable,
     ellipsis = props.ellipsis,
     width = props.width,
-    transform = props.transform;
-  if (valueType === 'address') {
-    var _newValue$filter;
-    var newValue = transform ? transform(value, record) : value;
-    if (!newValue || Array.isArray(newValue) && (newValue === null || newValue === void 0 ? void 0 : (_newValue$filter = newValue.filter(function (item) {
-      return !!item;
-    })) === null || _newValue$filter === void 0 ? void 0 : _newValue$filter.length) === 0) {
-      return '-';
+    originalValue = props.originalValue,
+    originalTip = props.originalTip;
+  if (originalValue !== undefined) {
+    var renderNode = value ? node : '-';
+    if (ellipsis || originalTip) {
+      if (ellipsis) {
+        renderNode = (0, _jsxRuntime.jsx)(Text, {
+          style: {
+            width: currentValue === '-' ? 32.5 : width
+          },
+          ellipsis: {
+            tooltip: false
+          },
+          children: ellipsis ? currentValue : renderNode
+        });
+      }
+      return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+        className: "varied-cell",
+        style: {
+          width: width
+        },
+        title: originalTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
+        }) : node,
+        children: renderNode
+      });
     }
-    return (0, _jsxRuntime.jsx)(_ProForm.default.ProAddressBar, {
-      isView: true,
-      code: code,
-      value: newValue
+    return (0, _jsxRuntime.jsx)("span", {
+      className: "varied-cell",
+      style: {
+        width: width
+      },
+      children: renderNode
     });
   }
   if (copyable) {
@@ -46,25 +64,21 @@ var RenderColumn = function RenderColumn(props) {
           width: width
         } : undefined,
         ellipsis: ellipsis ? {
-          tooltip: value
+          tooltip: node
         } : false,
         copyable: {
-          text: value,
+          text: node,
           icon: [(0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
             className: "drag-icon",
             src: _copy.default
           }, "copy-icon"), (0, _jsxRuntime.jsx)(_icons.CheckOutlined, {}, "copied-icon")],
           tooltips: ['复制', '复制成功']
         },
-        children: value
+        children: node
       })
     });
   }
   if (ellipsis) {
-    var node = value;
-    if (['enumName', 'enumCodeName'].includes(valueType)) {
-      node = (0, _getEnumLabel.default)(typeof code === 'function' ? code() : code, value, valueType === 'enumCodeName');
-    }
     return value ? (0, _jsxRuntime.jsx)(Text, {
       style: {
         width: width
@@ -76,6 +90,6 @@ var RenderColumn = function RenderColumn(props) {
       children: node
     }) : '-';
   }
-  return null;
+  return value ? node : '-';
 };
 var _default = exports.default = RenderColumn;

package/lib/ProTable/index.js

@@ -27,7 +27,7 @@ var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _reset = _interopRequireDefault(require("../assets/reset.svg"));
 var _customColumn = _interopRequireDefault(require("../assets/customColumn.svg"));
 var _utils3 = require("./utils");
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "summary", "emptyText"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "summary", "emptyText", "originalDataSource"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
@@ -55,6 +55,7 @@ function ProTable(props) {
     summary = props.summary,
     _props$emptyText = props.emptyText,
     emptyText = _props$emptyText === void 0 ? '暂无数据' : _props$emptyText,
+    originalDataSource = props.originalDataSource,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var quickTableConfig = quickConfig ? (0, _objectSpread4.default)({
     // resizeColumn: true,
@@ -165,7 +166,7 @@ function ProTable(props) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
     newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item) {
-      (0, _utils3.formatColumn)(item);
+      (0, _utils3.formatColumn)(item, originalDataSource);
     });
     return newColumns;
   }, [curColumns, handleResize]);

package/lib/ProTable/propsType.d.ts

@@ -26,6 +26,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     precision?: number;
     code?: string | string[] | (() => string);
     copyable?: boolean;
+    originalTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {
@@ -53,6 +54,7 @@ export interface ProTableProps extends Omit<TableProps<any>, 'summary' | 'column
      */
     stripe?: boolean;
     columns: ProTableColumn[];
+    originalDataSource?: any[];
 }
 export type ProTableValueType = 'percentage' | 'permillage' | 'thousandth' | 'datePicker' | 'enumName' | 'enumCodeName' | 'address' | 'thousandthCNY' | 'date' | 'dateTime' | 'dateStartTime' | 'dateEndTime' | 'dateStartEndTime';
 export interface Response<T = any> {

package/lib/ProTable/style/index.less

@@ -54,6 +54,19 @@
     }
   }
 
+  .ant-table-body {
+    .ant-table-cell .varied-cell {
+      margin-left: -8px;
+      background: var(--zaui-contract-bg, #fffaa1);
+      padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+      border-radius: var(--zaui-border-radius, 4px);
+    }
+
+    .varied-cell.empty-cell {
+      width: 24.5px;
+    }
+  }
+
   .copyable-table-cell {
 
 
@@ -140,7 +153,7 @@
   .column-config {
     display        : flex;
     justify-content: space-between;
-    margin-bottom  : var(--zaui-space-size-md, 16px);
+    margin-bottom  : calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
 
     .right-actions {
       display    : flex;

package/lib/ProTable/utils.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { ProTableColumn } from './propsType';
-export declare const formatColumn: (column: ProTableColumn) => void;
+export declare const formatColumn: (column: ProTableColumn, originalDataSource: any[]) => void;
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 查找最近的父级className